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

net: prestera: update PCS driver to use neg_mode

Update prestera'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.
Acked-by: default avatarElad Nachman <enachman@marvell.com>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://lore.kernel.org/r/E1qA8EO-00EaG3-TR@rmk-PC.armlinux.org.ukSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d5b16264
...@@ -300,8 +300,7 @@ static void prestera_pcs_get_state(struct phylink_pcs *pcs, ...@@ -300,8 +300,7 @@ static void prestera_pcs_get_state(struct phylink_pcs *pcs,
} }
} }
static int prestera_pcs_config(struct phylink_pcs *pcs, static int prestera_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)
...@@ -316,30 +315,25 @@ static int prestera_pcs_config(struct phylink_pcs *pcs, ...@@ -316,30 +315,25 @@ static int prestera_pcs_config(struct phylink_pcs *pcs,
cfg_mac.admin = true; cfg_mac.admin = true;
cfg_mac.fec = PRESTERA_PORT_FEC_OFF; cfg_mac.fec = PRESTERA_PORT_FEC_OFF;
cfg_mac.inband = neg_mode == PHYLINK_PCS_NEG_INBAND_ENABLED;
switch (interface) { switch (interface) {
case PHY_INTERFACE_MODE_10GBASER: case PHY_INTERFACE_MODE_10GBASER:
cfg_mac.speed = SPEED_10000; cfg_mac.speed = SPEED_10000;
cfg_mac.inband = 0;
cfg_mac.mode = PRESTERA_MAC_MODE_SR_LR; cfg_mac.mode = PRESTERA_MAC_MODE_SR_LR;
break; break;
case PHY_INTERFACE_MODE_2500BASEX: case PHY_INTERFACE_MODE_2500BASEX:
cfg_mac.speed = SPEED_2500; cfg_mac.speed = SPEED_2500;
cfg_mac.duplex = DUPLEX_FULL; cfg_mac.duplex = DUPLEX_FULL;
cfg_mac.inband = test_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,
advertising);
cfg_mac.mode = PRESTERA_MAC_MODE_SGMII; cfg_mac.mode = PRESTERA_MAC_MODE_SGMII;
break; break;
case PHY_INTERFACE_MODE_SGMII: case PHY_INTERFACE_MODE_SGMII:
cfg_mac.inband = 1;
cfg_mac.mode = PRESTERA_MAC_MODE_SGMII; cfg_mac.mode = PRESTERA_MAC_MODE_SGMII;
break; break;
case PHY_INTERFACE_MODE_1000BASEX: case PHY_INTERFACE_MODE_1000BASEX:
default: default:
cfg_mac.speed = SPEED_1000; cfg_mac.speed = SPEED_1000;
cfg_mac.duplex = DUPLEX_FULL; cfg_mac.duplex = DUPLEX_FULL;
cfg_mac.inband = test_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,
advertising);
cfg_mac.mode = PRESTERA_MAC_MODE_1000BASE_X; cfg_mac.mode = PRESTERA_MAC_MODE_1000BASE_X;
break; break;
} }
...@@ -401,6 +395,7 @@ static int prestera_port_sfp_bind(struct prestera_port *port) ...@@ -401,6 +395,7 @@ static int prestera_port_sfp_bind(struct prestera_port *port)
continue; continue;
port->phylink_pcs.ops = &prestera_pcs_ops; port->phylink_pcs.ops = &prestera_pcs_ops;
port->phylink_pcs.neg_mode = true;
port->phy_config.dev = &port->dev->dev; port->phy_config.dev = &port->dev->dev;
port->phy_config.type = PHYLINK_NETDEV; port->phy_config.type = PHYLINK_NETDEV;
......
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