[PATCH 6.12.y] net: phy: micrel: fix LAN8814 QSGMII soft reset

[PATCH 6.12.y] net: phy: micrel: fix LAN8814 QSGMII soft reset

[Joël ESPONDE]

From: Robert Marko <robert.marko@sartura.hr>

[ Upstream commit e027c218c482c6a0ae1948129ccda3b0a2033368 ]

LAN8814 QSGMII soft reset was moved into the probe function to avoid
triggering it for each of 4 PHY-s in the package.

However, that broke QSGMII link between the MAC and PHY on most LAN8814
PHY-s, specificaly for us on the Microchip LAN969x switch.
Reading the QSGMII status registers it was visible that lanes were only
partially synced.

It looks like the reset timing is crucial, so lets move the reset back
into the .config_init function but guard it with phy_package_init_once()
to avoid it being triggered on each of 4 PHY-s in the package.
Change the probe function to use phy_package_probe_once() for coma and PtP
setup.

Fixes: 347bf638d39ff92 ("net: phy: micrel: lan8814 fix reset of the
QSGMII interface")
Signed-off-by: Robert Marko <robert.marko@sartura.hr>
Link:
https://patch.msgid.link/20260428134138.1741253-1-robert.marko@sartura.hr
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Joël Esponde <joel.esponde@leroy-agon.com>
---
  drivers/net/phy/micrel.c | 15 ++++++++-------
  1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'drivers/net/phy/micrel.c')

diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 2aa1dedd21b8eb..e211a523c2584e 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -4099,6 +4099,13 @@ static int lan8814_config_init(struct phy_device
*phydev)
  {
      struct kszphy_priv *lan8814 = phydev->priv;

+    if (phy_package_init_once(phydev))
+        /* Reset the PHY */
+        lanphy_modify_page_reg(phydev, LAN8814_PAGE_COMMON_REGS,
+                       LAN8814_QSGMII_SOFT_RESET,
+                       LAN8814_QSGMII_SOFT_RESET_BIT,
+                       LAN8814_QSGMII_SOFT_RESET_BIT);
+
      /* Disable ANEG with QSGMII PCS Host side */
      lanphy_modify_page_reg(phydev, LAN8814_PAGE_PORT_REGS,
                     LAN8814_QSGMII_PCS1G_ANEG_CONFIG,
@@ -4190,13 +4190,7 @@ static int lan8814_probe(struct phy_device *phydev)
      devm_phy_package_join(&phydev->mdio.dev, phydev,
                    addr, sizeof(struct lan8814_shared_priv));

-    if (phy_package_init_once(phydev)) {
-        /* Reset the PHY */
-        lanphy_modify_page_reg(phydev, LAN8814_PAGE_COMMON_REGS,
-                       LAN8814_QSGMII_SOFT_RESET,
-                       LAN8814_QSGMII_SOFT_RESET_BIT,
-                       LAN8814_QSGMII_SOFT_RESET_BIT);
-
+    if (phy_package_probe_once(phydev)) {
          err = lan8814_release_coma_mode(phydev);
          if (err)
              return err;
--
cgit 1.3-korg

Ce message électronique et ses pièces jointes sont confidentiels. Ils sont destinés exclusivement à la personne ou à l'entité à qui ils sont adressés.
Si vous avez reçu ce message par erreur, veuillez en informer immédiatement l'expéditeur et le supprimer de votre système.
Toute divulgation, distribution ou copie non autorisée de ce message ou de son contenu est interdite.
L'entreprise décline toute responsabilité en cas de transmission de virus ou de toute autre contamination liée à cet email.

Re: [PATCH 6.12.y] net: phy: micrel: fix LAN8814 QSGMII soft reset

[Sasha Levin]

> [PATCH 6.12.y] net: phy: micrel: fix LAN8814 QSGMII soft reset
> [ Upstream commit e027c218c482c6a0ae1948129ccda3b0a2033368 ]

Thanks. This doesn't apply to 6.12.y as submitted: the hunk depends on
feature commit 19f1d6c7230b7d, which isn't present in 6.12.y.

-- 
Thanks,
Sasha

Re: [PATCH 6.12.y] net: phy: micrel: fix LAN8814 QSGMII soft reset

[Joël ESPONDE]

>> [PATCH 6.12.y] net: phy: micrel: fix LAN8814 QSGMII soft reset
>> [ Upstream commit e027c218c482c6a0ae1948129ccda3b0a2033368 ]
> Thanks. This doesn't apply to 6.12.y as submitted: the hunk depends on
> feature commit 19f1d6c7230b7d, which isn't present in 6.12.y.

Hi Sasha,
I tried to find a reference to the commit 19f1d6c7230b7d in my patch proposal,
but I didn't find any.
Not sure to see what I could do to fix this.
I also tried to patch a pristine checkout of the current state of the branch
6.12.y in linux stable, ie on top of b5b356af5b98, the patch applies successfully :
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/log/?h=linux-6.12.y
If you have any other idea or proposal, I'll have a look on it.
Regards,
Joël
Ce message électronique et ses pièces jointes sont confidentiels. Ils sont destinés exclusivement à la personne ou à l'entité à qui ils sont adressés.
Si vous avez reçu ce message par erreur, veuillez en informer immédiatement l'expéditeur et le supprimer de votre système.
Toute divulgation, distribution ou copie non autorisée de ce message ou de son contenu est interdite.
L'entreprise décline toute responsabilité en cas de transmission de virus ou de toute autre contamination liée à cet email.

Re: [PATCH 6.12.y] net: phy: micrel: fix LAN8814 QSGMII soft reset

[Sasha Levin]

> [PATCH 6.12.y] net: phy: micrel: fix LAN8814 QSGMII soft reset

I've queued the upstream fix for 7.0.y and 6.18.y.

For 6.12.y I'd like to use your hand-adapted backport, but the copy on
the list is whitespace-mangled (the hunk header got line-wrapped) and
git am rejects it as a corrupt patch. Could you resend it with
git send-email (or attach the raw patch)? It looks correct otherwise,
and I'll queue it for 6.12.y once it applies cleanly.

-- 
Thanks,
Sasha