Commit 6e5bb3da authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski

net: sparx5: update PCS driver to use neg_mode

Update Sparx5's embedded PCS driver to use neg_mode rather than the
mode argument. As there is no pcs_link_up() method, this only affects
the pcs_config() method.
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://lore.kernel.org/r/E1qA8EZ-00EaGF-6F@rmk-PC.armlinux.org.ukSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent bfa0a3ac
...@@ -281,6 +281,7 @@ static int sparx5_create_port(struct sparx5 *sparx5, ...@@ -281,6 +281,7 @@ static int sparx5_create_port(struct sparx5 *sparx5,
spx5_port->custom_etype = 0x8880; /* Vitesse */ spx5_port->custom_etype = 0x8880; /* Vitesse */
spx5_port->phylink_pcs.poll = true; spx5_port->phylink_pcs.poll = true;
spx5_port->phylink_pcs.ops = &sparx5_phylink_pcs_ops; spx5_port->phylink_pcs.ops = &sparx5_phylink_pcs_ops;
spx5_port->phylink_pcs.neg_mode = true;
spx5_port->is_mrouter = false; spx5_port->is_mrouter = false;
INIT_LIST_HEAD(&spx5_port->tc_templates); INIT_LIST_HEAD(&spx5_port->tc_templates);
sparx5->ports[config->portno] = spx5_port; sparx5->ports[config->portno] = spx5_port;
......
...@@ -91,8 +91,7 @@ static void sparx5_pcs_get_state(struct phylink_pcs *pcs, ...@@ -91,8 +91,7 @@ static void sparx5_pcs_get_state(struct phylink_pcs *pcs,
state->pause = status.pause; state->pause = status.pause;
} }
static int sparx5_pcs_config(struct phylink_pcs *pcs, static int sparx5_pcs_config(struct phylink_pcs *pcs, unsigned int neg_mode,
unsigned int mode,
phy_interface_t interface, phy_interface_t interface,
const unsigned long *advertising, const unsigned long *advertising,
bool permit_pause_to_mac) bool permit_pause_to_mac)
...@@ -104,8 +103,9 @@ static int sparx5_pcs_config(struct phylink_pcs *pcs, ...@@ -104,8 +103,9 @@ static int sparx5_pcs_config(struct phylink_pcs *pcs,
conf = port->conf; conf = port->conf;
conf.power_down = false; conf.power_down = false;
conf.portmode = interface; conf.portmode = interface;
conf.inband = phylink_autoneg_inband(mode); conf.inband = neg_mode == PHYLINK_PCS_NEG_INBAND_DISABLED ||
conf.autoneg = phylink_test(advertising, Autoneg); neg_mode == PHYLINK_PCS_NEG_INBAND_ENABLED;
conf.autoneg = neg_mode == PHYLINK_PCS_NEG_INBAND_ENABLED;
conf.pause_adv = 0; conf.pause_adv = 0;
if (phylink_test(advertising, Pause)) if (phylink_test(advertising, Pause))
conf.pause_adv |= ADVERTISE_1000XPAUSE; conf.pause_adv |= ADVERTISE_1000XPAUSE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment