generic: 6.6: fix early RTL8221B detection

Fixes the issue of RTL8221B-VB-CG not being detected correctly after ca44690.

Fixes: ca4469045f6a ("generic: 6.6: backport upstream RealTek PHY patches")
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>

diff --git a/target/linux/generic/pending-6.6/730-net-phy-realtek-detect-early-version-of-RTL8221B.patch b/target/linux/generic/pending-6.6/730-net-phy-realtek-detect-early-version-of-RTL8221B.patch
new file mode 100644 (file)
index 0000000..698b544
--- /dev/null
+++ b/target/linux/generic/pending-6.6/730-net-phy-realtek-detect-early-version-of-RTL8221B.patch
@@ -0,0 +1,52 @@
+From 0de82310d2b32e78ff79d42c08b1122a6ede3778 Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
+Date: Sun, 30 Apr 2023 00:15:41 +0100
+Subject: [PATCH] net: phy: realtek: detect early version of RTL8221B
+
+Early versions (?) of the RTL8221B PHY cannot be identified in a regular
+Clause-45 bus scan as the PHY doesn't report the implemented MMDs
+correctly but returns 0 instead.
+Implement custom identify function using the PKGID instead of iterating
+over the implemented MMDs.
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+[forward-port by @namiltd]
+Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
+--- a/drivers/net/phy/realtek.c
++++ b/drivers/net/phy/realtek.c
+@@ -1084,10 +1084,32 @@ static int rtl8226_match_phy_device(stru
+ static int rtlgen_is_c45_match(struct phy_device *phydev, unsigned int id,
+                              bool is_c45)
+ {
+-      if (phydev->is_c45)
+-              return is_c45 && (id == phydev->c45_ids.device_ids[1]);
+-      else
++      if (phydev->is_c45) {
++              u32 rid;
++
++              if (!is_c45)
++                      return 0;
++
++              rid = phydev->c45_ids.device_ids[1];
++              if ((rid == 0xffffffff) && phydev->mdio.bus->read_c45) {
++                      int val;
++
++                      val = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_PKGID1);
++                      if (val < 0)
++                              return 0;
++
++                      rid = val << 16;
++                      val = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_PKGID2);
++                      if (val < 0)
++                              return 0;
++
++                      rid |= val;
++              }
++
++              return (id == rid);
++      } else {
+               return !is_c45 && (id == phydev->phy_id);
++      }
+ }
+ 
+ static int rtl8221b_vb_cg_c22_match_phy_device(struct phy_device *phydev)

diff --git a/target/linux/generic/pending-6.6/741-net-phy-realtek-support-interrupt-of-RTL8221B.patch b/target/linux/generic/pending-6.6/741-net-phy-realtek-support-interrupt-of-RTL8221B.patch
index b0728b6db9735068c2e369d928028c371659970b..f75dbc9e8575208f14bb8e13f92d133db390fc7b 100644 (file)
--- a/target/linux/generic/pending-6.6/741-net-phy-realtek-support-interrupt-of-RTL8221B.patch
+++ b/target/linux/generic/pending-6.6/741-net-phy-realtek-support-interrupt-of-RTL8221B.patch
@@ -12,7 +12,7 @@ Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
 
 --- a/drivers/net/phy/realtek.c
 +++ b/drivers/net/phy/realtek.c
-@@ -1264,6 +1264,51 @@ static irqreturn_t rtl9000a_handle_inter
+@@ -1286,6 +1286,51 @@ static irqreturn_t rtl9000a_handle_inter
        return IRQ_HANDLED;
  }
  
@@ -64,7 +64,7 @@ Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
  static struct phy_driver realtek_drvs[] = {
        {
                PHY_ID_MATCH_EXACT(0x00008201),
-@@ -1430,6 +1475,8 @@ static struct phy_driver realtek_drvs[]
+@@ -1452,6 +1497,8 @@ static struct phy_driver realtek_drvs[]
        }, {
                .match_phy_device = rtl8221b_vb_cg_c22_match_phy_device,
                .name           = "RTL8221B-VB-CG 2.5Gbps PHY (C22)",
@@ -73,7 +73,7 @@ Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
                .probe          = rtl822x_probe,
                .soft_reset     = genphy_soft_reset,
                .get_features   = rtl822x_get_features,
-@@ -1444,6 +1491,8 @@ static struct phy_driver realtek_drvs[]
+@@ -1466,6 +1513,8 @@ static struct phy_driver realtek_drvs[]
        }, {
                .match_phy_device = rtl8221b_vb_cg_c45_match_phy_device,
                .name           = "RTL8221B-VB-CG 2.5Gbps PHY (C45)",
@@ -82,7 +82,7 @@ Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
                .probe          = rtl822x_probe,
                .soft_reset     = genphy_soft_reset,
                .config_init    = rtl822xb_config_init,
-@@ -1456,6 +1505,8 @@ static struct phy_driver realtek_drvs[]
+@@ -1478,6 +1527,8 @@ static struct phy_driver realtek_drvs[]
        }, {
                .match_phy_device = rtl8221b_vn_cg_c22_match_phy_device,
                .name           = "RTL8221B-VM-CG 2.5Gbps PHY (C22)",
@@ -91,7 +91,7 @@ Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
                .probe          = rtl822x_probe,
                .soft_reset     = genphy_soft_reset,
                .get_features   = rtl822x_get_features,
-@@ -1470,6 +1521,8 @@ static struct phy_driver realtek_drvs[]
+@@ -1492,6 +1543,8 @@ static struct phy_driver realtek_drvs[]
        }, {
                .match_phy_device = rtl8221b_vn_cg_c45_match_phy_device,
                .name           = "RTL8221B-VN-CG 2.5Gbps PHY (C45)",