[EXT] [PATCH RFC net-next 10/15] net: prestera: update PCS driver to use neg_mode

[Elad Nachman]

> -----Original Message-----
> From: Russell King <rmk at armlinux.org.uk> On Behalf Of Russell King (Oracle)
> Sent: Tuesday, June 13, 2023 5:38 PM
> To: Andrew Lunn <andrew at lunn.ch>; Heiner Kallweit
> <hkallweit1 at gmail.com>
> Cc: Alexander Couzens <lynxis at fe80.eu>; AngeloGioacchino Del Regno
> <angelogioacchino.delregno at collabora.com>; Alexander Couzens
> <lynxis at fe80.eu>; Claudiu Beznea <claudiu.beznea at microchip.com>; Daniel
> Golle <daniel at makrotopia.org>; Daniel Machon
> <daniel.machon at microchip.com>; David S. Miller <davem at davemloft.net>;
> DENG Qingfang <dqfext at gmail.com>; Eric Dumazet
> <edumazet at google.com>; Florian Fainelli <f.fainelli at gmail.com>; Horatiu
> Vultur <horatiu.vultur at microchip.com>; Ioana Ciornei
> <ioana.ciornei at nxp.com>; Jakub Kicinski <kuba at kernel.org>; Jose Abreu
> <Jose.Abreu at synopsys.com>; Landen Chao <Landen.Chao at mediatek.com>;
> Lars Povlsen <lars.povlsen at microchip.com>; linux-arm-
> kernel at lists.infradead.org; linux-mediatek at lists.infradead.org; Madalin
> Bucur <madalin.bucur at nxp.com>; Marcin Wojtas <mw at semihalf.com>;
> Matthias Brugger <matthias.bgg at gmail.com>; Michal Simek
> <michal.simek at amd.com>; netdev at vger.kernel.org; Nicolas Ferre
> <nicolas.ferre at microchip.com>; Paolo Abeni <pabeni at redhat.com>;
> Radhey Shyam Pandey <radhey.shyam.pandey at xilinx.com>; Sean Anderson
> <sean.anderson at seco.com>; Sean Wang <sean.wang at mediatek.com>;
> Steen Hegelund <Steen.Hegelund at microchip.com>; Taras Chornyi
> <taras.chornyi at plvision.eu>; Thomas Petazzoni
> <thomas.petazzoni at bootlin.com>; UNGLinuxDriver at microchip.com;
> Vladimir Oltean <olteanv at gmail.com>
> Subject: [EXT] [PATCH RFC net-next 10/15] net: prestera: update PCS driver to
> use neg_mode
> 
> External Email
> 
> ----------------------------------------------------------------------
> 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.
> 
> Signed-off-by: Russell King (Oracle) <rmk+kernel at armlinux.org.uk>
> ---
>  drivers/net/ethernet/marvell/prestera/prestera_main.c | 11 +++--------
>  1 file changed, 3 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/net/ethernet/marvell/prestera/prestera_main.c
> b/drivers/net/ethernet/marvell/prestera/prestera_main.c
> index 9d504142e51a..4fb886c57cd7 100644
> --- a/drivers/net/ethernet/marvell/prestera/prestera_main.c
> +++ b/drivers/net/ethernet/marvell/prestera/prestera_main.c
> @@ -300,8 +300,7 @@ static void prestera_pcs_get_state(struct phylink_pcs
> *pcs,
>  	}
>  }
> 
> -static int prestera_pcs_config(struct phylink_pcs *pcs,
> -			       unsigned int mode,
> +static int prestera_pcs_config(struct phylink_pcs *pcs, unsigned int
> +neg_mode,
>  			       phy_interface_t interface,
>  			       const unsigned long *advertising,
>  			       bool permit_pause_to_mac)
> @@ -316,30 +315,25 @@ static int prestera_pcs_config(struct phylink_pcs
> *pcs,
> 
>  	cfg_mac.admin = true;
>  	cfg_mac.fec = PRESTERA_PORT_FEC_OFF;
> +	cfg_mac.inband = neg_mode ==
> PHYLINK_PCS_NEG_INBAND_ENABLED;
> 
>  	switch (interface) {
>  	case PHY_INTERFACE_MODE_10GBASER:
>  		cfg_mac.speed = SPEED_10000;
> -		cfg_mac.inband = 0;
>  		cfg_mac.mode = PRESTERA_MAC_MODE_SR_LR;
>  		break;
>  	case PHY_INTERFACE_MODE_2500BASEX:
>  		cfg_mac.speed = SPEED_2500;
>  		cfg_mac.duplex = DUPLEX_FULL;
> -		cfg_mac.inband =
> test_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,
> -					  advertising);
>  		cfg_mac.mode = PRESTERA_MAC_MODE_SGMII;
>  		break;
>  	case PHY_INTERFACE_MODE_SGMII:
> -		cfg_mac.inband = 1;
>  		cfg_mac.mode = PRESTERA_MAC_MODE_SGMII;
>  		break;
>  	case PHY_INTERFACE_MODE_1000BASEX:
>  	default:
>  		cfg_mac.speed = SPEED_1000;
>  		cfg_mac.duplex = DUPLEX_FULL;
> -		cfg_mac.inband =
> test_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,
> -					  advertising);
>  		cfg_mac.mode = PRESTERA_MAC_MODE_1000BASE_X;
>  		break;
>  	}
> @@ -401,6 +395,7 @@ static int prestera_port_sfp_bind(struct
> prestera_port *port)
>  			continue;
> 
>  		port->phylink_pcs.ops = &prestera_pcs_ops;
> +		port->phylink_pcs.neg_mode = true;
> 
>  		port->phy_config.dev = &port->dev->dev;
>  		port->phy_config.type = PHYLINK_NETDEV;
> --
> 2.30.2
> 

Acked-by: Elad Nachman <enachman at marvell.com>