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

net: lan966x: update PCS driver to use neg_mode

Update lan966x'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/E1qA8E9-00EaFl-GN@rmk-PC.armlinux.org.ukSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent c689a652
...@@ -818,6 +818,7 @@ static int lan966x_probe_port(struct lan966x *lan966x, u32 p, ...@@ -818,6 +818,7 @@ static int lan966x_probe_port(struct lan966x *lan966x, u32 p,
port->phylink_config.type = PHYLINK_NETDEV; port->phylink_config.type = PHYLINK_NETDEV;
port->phylink_pcs.poll = true; port->phylink_pcs.poll = true;
port->phylink_pcs.ops = &lan966x_phylink_pcs_ops; port->phylink_pcs.ops = &lan966x_phylink_pcs_ops;
port->phylink_pcs.neg_mode = true;
port->phylink_config.mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE | port->phylink_config.mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
MAC_10 | MAC_100 | MAC_1000FD | MAC_2500FD; MAC_10 | MAC_100 | MAC_1000FD | MAC_2500FD;
......
...@@ -95,8 +95,7 @@ static void lan966x_pcs_get_state(struct phylink_pcs *pcs, ...@@ -95,8 +95,7 @@ static void lan966x_pcs_get_state(struct phylink_pcs *pcs,
lan966x_port_status_get(port, state); lan966x_port_status_get(port, state);
} }
static int lan966x_pcs_config(struct phylink_pcs *pcs, static int lan966x_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)
...@@ -107,8 +106,8 @@ static int lan966x_pcs_config(struct phylink_pcs *pcs, ...@@ -107,8 +106,8 @@ static int lan966x_pcs_config(struct phylink_pcs *pcs,
config = port->config; config = port->config;
config.portmode = interface; config.portmode = interface;
config.inband = phylink_autoneg_inband(mode); config.inband = neg_mode & PHYLINK_PCS_NEG_INBAND;
config.autoneg = phylink_test(advertising, Autoneg); config.autoneg = neg_mode == PHYLINK_PCS_NEG_INBAND_ENABLED;
config.advertising = advertising; config.advertising = advertising;
ret = lan966x_port_pcs_set(port, &config); ret = lan966x_port_pcs_set(port, &config);
......
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