[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID:
<BN9PR18MB425185F922147EA09B303ED0DB55A@BN9PR18MB4251.namprd18.prod.outlook.com>
Date: Tue, 13 Jun 2023 16:17:10 +0000
From: Elad Nachman <enachman@...vell.com>
To: "Russell King (Oracle)" <rmk+kernel@...linux.org.uk>,
Andrew Lunn
<andrew@...n.ch>, Heiner Kallweit <hkallweit1@...il.com>
CC: Alexander Couzens <lynxis@...0.eu>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@...labora.com>,
Alexander Couzens
<lynxis@...0.eu>,
Claudiu Beznea <claudiu.beznea@...rochip.com>,
Daniel Golle
<daniel@...rotopia.org>,
Daniel Machon <daniel.machon@...rochip.com>,
"David
S. Miller" <davem@...emloft.net>,
DENG Qingfang <dqfext@...il.com>, Eric
Dumazet <edumazet@...gle.com>,
Florian Fainelli <f.fainelli@...il.com>,
Horatiu Vultur <horatiu.vultur@...rochip.com>,
Ioana Ciornei
<ioana.ciornei@....com>,
Jakub Kicinski <kuba@...nel.org>,
Jose Abreu
<Jose.Abreu@...opsys.com>,
Landen Chao <Landen.Chao@...iatek.com>,
Lars
Povlsen <lars.povlsen@...rochip.com>,
"linux-arm-kernel@...ts.infradead.org"
<linux-arm-kernel@...ts.infradead.org>,
"linux-mediatek@...ts.infradead.org"
<linux-mediatek@...ts.infradead.org>,
Madalin Bucur <madalin.bucur@....com>, Marcin Wojtas <mw@...ihalf.com>,
Matthias Brugger <matthias.bgg@...il.com>,
Michal Simek <michal.simek@....com>,
"netdev@...r.kernel.org"
<netdev@...r.kernel.org>,
Nicolas Ferre <nicolas.ferre@...rochip.com>,
Paolo
Abeni <pabeni@...hat.com>,
Radhey Shyam Pandey
<radhey.shyam.pandey@...inx.com>,
Sean Anderson <sean.anderson@...o.com>,
Sean Wang <sean.wang@...iatek.com>,
Steen Hegelund
<Steen.Hegelund@...rochip.com>,
Taras Chornyi <taras.chornyi@...ision.eu>,
Thomas Petazzoni <thomas.petazzoni@...tlin.com>,
"UNGLinuxDriver@...rochip.com" <UNGLinuxDriver@...rochip.com>,
Vladimir
Oltean <olteanv@...il.com>
Subject: RE: [EXT] [PATCH RFC net-next 10/15] net: prestera: update PCS driver
to use neg_mode
> -----Original Message-----
> From: Russell King <rmk@...linux.org.uk> On Behalf Of Russell King (Oracle)
> Sent: Tuesday, June 13, 2023 5:38 PM
> To: Andrew Lunn <andrew@...n.ch>; Heiner Kallweit
> <hkallweit1@...il.com>
> Cc: Alexander Couzens <lynxis@...0.eu>; AngeloGioacchino Del Regno
> <angelogioacchino.delregno@...labora.com>; Alexander Couzens
> <lynxis@...0.eu>; Claudiu Beznea <claudiu.beznea@...rochip.com>; Daniel
> Golle <daniel@...rotopia.org>; Daniel Machon
> <daniel.machon@...rochip.com>; David S. Miller <davem@...emloft.net>;
> DENG Qingfang <dqfext@...il.com>; Eric Dumazet
> <edumazet@...gle.com>; Florian Fainelli <f.fainelli@...il.com>; Horatiu
> Vultur <horatiu.vultur@...rochip.com>; Ioana Ciornei
> <ioana.ciornei@....com>; Jakub Kicinski <kuba@...nel.org>; Jose Abreu
> <Jose.Abreu@...opsys.com>; Landen Chao <Landen.Chao@...iatek.com>;
> Lars Povlsen <lars.povlsen@...rochip.com>; linux-arm-
> kernel@...ts.infradead.org; linux-mediatek@...ts.infradead.org; Madalin
> Bucur <madalin.bucur@....com>; Marcin Wojtas <mw@...ihalf.com>;
> Matthias Brugger <matthias.bgg@...il.com>; Michal Simek
> <michal.simek@....com>; netdev@...r.kernel.org; Nicolas Ferre
> <nicolas.ferre@...rochip.com>; Paolo Abeni <pabeni@...hat.com>;
> Radhey Shyam Pandey <radhey.shyam.pandey@...inx.com>; Sean Anderson
> <sean.anderson@...o.com>; Sean Wang <sean.wang@...iatek.com>;
> Steen Hegelund <Steen.Hegelund@...rochip.com>; Taras Chornyi
> <taras.chornyi@...ision.eu>; Thomas Petazzoni
> <thomas.petazzoni@...tlin.com>; UNGLinuxDriver@...rochip.com;
> Vladimir Oltean <olteanv@...il.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@...linux.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@...vell.com>
Powered by blists - more mailing lists