[EXT] [PATCH RFC net-next 7/9] net: prestera: switch PCS driver to use phylink_pcs_neg_mode()

[Elad Nachman]

> -----Original Message-----
> From: Russell King <rmk at armlinux.org.uk> On Behalf Of Russell King (Oracle)
> Sent: Tuesday, May 23, 2023 6:56 PM
> To: Andrew Lunn <andrew at lunn.ch>; Heiner Kallweit
> <hkallweit1 at gmail.com>
> Cc: Daniel Machon <daniel.machon at microchip.com>; David S. Miller
> <davem at davemloft.net>; 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>; Lars Povlsen
> <lars.povlsen at microchip.com>; linux-arm-kernel at lists.infradead.org;
> Madalin Bucur <madalin.bucur at nxp.com>; Marcin Wojtas
> <mw at semihalf.com>; Michal Simek <michal.simek at amd.com>;
> netdev at vger.kernel.org; Paolo Abeni <pabeni at redhat.com>; Radhey Shyam
> Pandey <radhey.shyam.pandey at xilinx.com>; Sean Anderson
> <sean.anderson at seco.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 7/9] net: prestera: switch PCS driver to
> use phylink_pcs_neg_mode()
> 
> External Email
> 
> ----------------------------------------------------------------------
> Use the newly introduced phylink_pcs_neg_mode() to configure whether
> inband-AN should be used.
> 
> Signed-off-by: Russell King (Oracle) <rmk+kernel at armlinux.org.uk>
> ---
>  drivers/net/ethernet/marvell/prestera/prestera_main.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/net/ethernet/marvell/prestera/prestera_main.c
> b/drivers/net/ethernet/marvell/prestera/prestera_main.c
> index 9d504142e51a..2a26f96fbed2 100644
> --- a/drivers/net/ethernet/marvell/prestera/prestera_main.c
> +++ b/drivers/net/ethernet/marvell/prestera/prestera_main.c
> @@ -308,38 +308,36 @@ static int prestera_pcs_config(struct phylink_pcs
> *pcs,  {
>  	struct prestera_port *port = prestera_pcs_to_port(pcs);
>  	struct prestera_port_mac_config cfg_mac;
> +	unsigned int neg_mode;
>  	int err;
> 
> +	neg_mode = phylink_pcs_neg_mode(mode, interface, advertising);
> +
>  	err = prestera_port_cfg_mac_read(port, &cfg_mac);
>  	if (err)
>  		return err;
> 
>  	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;
>  	}
> --
> 2.30.2
> 

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