[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20251210155249.bpjm2hkvujstxt4i@skbuf>
Date: Wed, 10 Dec 2025 17:52:49 +0200
From: Vladimir Oltean <olteanv@...il.com>
To: Daniel Golle <daniel@...rotopia.org>
Cc: Hauke Mehrtens <hauke@...ke-m.de>, Andrew Lunn <andrew@...n.ch>,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>,
Russell King <linux@...linux.org.uk>, netdev@...r.kernel.org,
linux-kernel@...r.kernel.org, Rasmus Villemoes <ravi@...vas.dk>,
"Benny (Ying-Tsan) Weng" <yweng@...linear.com>,
John Crispin <john@...ozen.org>
Subject: Re: [PATCH net v4 4/4] net: dsa: mxl-gsw1xx: manually clear RANEG bit
On Tue, Dec 09, 2025 at 01:29:34AM +0000, Daniel Golle wrote:
> Despite being documented as self-clearing, the RANEG bit sometimes
> remains set, preventing auto-negotiation from happening.
>
> Manually clear the RANEG bit after 10ms as advised by MaxLinear.
> In order to not hold RTNL during the 10ms of waiting schedule
> delayed work to take care of clearing the bit asynchronously, which
> is similar to the self-clearing behavior.
>
> Fixes: 22335939ec90 ("net: dsa: add driver for MaxLinear GSW1xx switch family")
> Reported-by: Rasmus Villemoes <ravi@...vas.dk>
> Signed-off-by: Daniel Golle <daniel@...rotopia.org>
> ---
> v4:
> * fix order of operations in remove and shutdown functions
>
> v3:
> * fix wrong parameter name in call of cancel_delayed_work_sync
>
> v2:
> * cancel pending work before setting RANEG bit
> * cancel pending work on remove and shutdown
> * document that GSW1XX_RST_REQ_SGMII_SHELL also clears RANEG bit
> * improve commit message
>
> drivers/net/dsa/lantiq/mxl-gsw1xx.c | 34 ++++++++++++++++++++++++++++-
> 1 file changed, 33 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/dsa/lantiq/mxl-gsw1xx.c b/drivers/net/dsa/lantiq/mxl-gsw1xx.c
> index 4dc287ad141e1..f8ff8a604bf53 100644
> --- a/drivers/net/dsa/lantiq/mxl-gsw1xx.c
> +++ b/drivers/net/dsa/lantiq/mxl-gsw1xx.c
> @@ -11,10 +11,12 @@
>
> #include <linux/bits.h>
> #include <linux/delay.h>
> +#include <linux/jiffies.h>
> #include <linux/module.h>
> #include <linux/of_device.h>
> #include <linux/of_mdio.h>
> #include <linux/regmap.h>
> +#include <linux/workqueue.h>
> #include <net/dsa.h>
>
> #include "lantiq_gswip.h"
> @@ -29,6 +31,7 @@ struct gsw1xx_priv {
> struct regmap *clk;
> struct regmap *shell;
> struct phylink_pcs pcs;
> + struct delayed_work clear_raneg;
> phy_interface_t tbi_interface;
> struct gswip_priv gswip;
> };
> @@ -145,7 +148,9 @@ static void gsw1xx_pcs_disable(struct phylink_pcs *pcs)
> {
> struct gsw1xx_priv *priv = pcs_to_gsw1xx(pcs);
>
> - /* Assert SGMII shell reset */
> + cancel_delayed_work_sync(&priv->clear_raneg);
> +
> + /* Assert SGMII shell reset (will also clear RANEG bit) */
> regmap_set_bits(priv->shell, GSW1XX_SHELL_RST_REQ,
> GSW1XX_RST_REQ_SGMII_SHELL);
>
> @@ -428,12 +433,29 @@ static int gsw1xx_pcs_config(struct phylink_pcs *pcs, unsigned int neg_mode,
> return 0;
> }
>
> +static void gsw1xx_pcs_clear_raneg(struct work_struct *work)
> +{
> + struct gsw1xx_priv *priv =
> + container_of(work, struct gsw1xx_priv, clear_raneg.work);
> +
> + regmap_clear_bits(priv->sgmii, GSW1XX_SGMII_TBI_ANEGCTL,
> + GSW1XX_SGMII_TBI_ANEGCTL_RANEG);
> +}
> +
> static void gsw1xx_pcs_an_restart(struct phylink_pcs *pcs)
> {
> struct gsw1xx_priv *priv = pcs_to_gsw1xx(pcs);
>
> + cancel_delayed_work_sync(&priv->clear_raneg);
> +
> regmap_set_bits(priv->sgmii, GSW1XX_SGMII_TBI_ANEGCTL,
> GSW1XX_SGMII_TBI_ANEGCTL_RANEG);
> +
> + /* despite being documented as self-clearing, the RANEG bit
> + * sometimes remains set, preventing auto-negotiation from happening.
> + * MaxLinear advises to manually clear the bit after 10ms.
> + */
> + schedule_delayed_work(&priv->clear_raneg, msecs_to_jiffies(10));
> }
>
> static void gsw1xx_pcs_link_up(struct phylink_pcs *pcs,
> @@ -636,6 +658,8 @@ static int gsw1xx_probe(struct mdio_device *mdiodev)
> if (ret)
> return ret;
>
> + INIT_DELAYED_WORK(&priv->clear_raneg, gsw1xx_pcs_clear_raneg);
> +
> ret = gswip_probe_common(&priv->gswip, version);
> if (ret)
> return ret;
> @@ -648,16 +672,21 @@ static int gsw1xx_probe(struct mdio_device *mdiodev)
> static void gsw1xx_remove(struct mdio_device *mdiodev)
> {
> struct gswip_priv *priv = dev_get_drvdata(&mdiodev->dev);
> + struct gsw1xx_priv *gsw1xx_priv;
>
> if (!priv)
> return;
>
> dsa_unregister_switch(priv->ds);
> +
> + gsw1xx_priv = container_of(priv, struct gsw1xx_priv, gswip);
> + cancel_delayed_work_sync(&gsw1xx_priv->clear_raneg);
> }
>
> static void gsw1xx_shutdown(struct mdio_device *mdiodev)
> {
> struct gswip_priv *priv = dev_get_drvdata(&mdiodev->dev);
> + struct gsw1xx_priv *gsw1xx_priv;
>
> if (!priv)
> return;
> @@ -665,6 +694,9 @@ static void gsw1xx_shutdown(struct mdio_device *mdiodev)
> dsa_switch_shutdown(priv->ds);
>
> dev_set_drvdata(&mdiodev->dev, NULL);
> +
> + gsw1xx_priv = container_of(priv, struct gsw1xx_priv, gswip);
> + cancel_delayed_work_sync(&gsw1xx_priv->clear_raneg);
Nitpick: why did you place this after dev_set_drvdata(dev, NULL) and not before?
The work item doesn't call dev_get_drvdata(), true, but it's one more refactoring
step that needs to be taken care of if it should.
> }
>
> static const struct gswip_hw_info gsw12x_data = {
> --
> 2.52.0
Powered by blists - more mailing lists