[openwrt/openwrt] realtek: Fix bug when accessing external PHYs on SoCs older than Revision C

[LEDE Commits]

blogic pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/76f60470a192f8ce585ac3289d3037b54d98ba11

commit 76f60470a192f8ce585ac3289d3037b54d98ba11
Author: Birger Koblitz <git at birger-koblitz.de>
AuthorDate: Mon Sep 13 20:44:43 2021 +0200

    realtek: Fix bug when accessing external PHYs on SoCs older than Revision C
    
    RTL8393 SoCs older than Revision C hang on accesses to PHYs with PHY address
    larger or equal to the CPU-port (52). This will make scanning the MDIO bus
    hang forever. Since the RTL8390 platform does not support more than
    52 PHYs, return -EIO for phy addresses >= 52. Note that the RTL8390 family
    of SoCs has a fixed mapping between port number and PHY-address.
    
    Signed-off-by: Birger Koblitz <git at birger-koblitz.de>
---
 .../files-5.10/drivers/net/dsa/rtl83xx/rtl839x.c   | 25 +++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/target/linux/realtek/files-5.10/drivers/net/dsa/rtl83xx/rtl839x.c b/target/linux/realtek/files-5.10/drivers/net/dsa/rtl83xx/rtl839x.c
index cca8824ce5..3c85e736c9 100644
--- a/target/linux/realtek/files-5.10/drivers/net/dsa/rtl83xx/rtl839x.c
+++ b/target/linux/realtek/files-5.10/drivers/net/dsa/rtl83xx/rtl839x.c
@@ -608,6 +608,10 @@ int rtl839x_read_phy(u32 port, u32 page, u32 reg, u32 *val)
 	if (port > 63 || page > 4095 || reg > 31)
 		return -ENOTSUPP;
 
+	// Take bug on RTL839x Rev <= C into account
+	if (port >= RTL839X_CPU_PORT)
+		return -EIO;
+
 	mutex_lock(&smi_lock);
 
 	sw_w32_mask(0xffff0000, port << 16, RTL839X_PHYREG_DATA_CTRL);
@@ -637,6 +641,10 @@ int rtl839x_write_phy(u32 port, u32 page, u32 reg, u32 val)
 	if (port > 63 || page > 4095 || reg > 31)
 		return -ENOTSUPP;
 
+	// Take bug on RTL839x Rev <= C into account
+	if (port >= RTL839X_CPU_PORT)
+		return -EIO;
+
 	mutex_lock(&smi_lock);
 
 	// Set PHY to access
@@ -670,6 +678,10 @@ int rtl839x_read_mmd_phy(u32 port, u32 devnum, u32 regnum, u32 *val)
 	int err = 0;
 	u32 v;
 
+	// Take bug on RTL839x Rev <= C into account
+	if (port >= RTL839X_CPU_PORT)
+		return -EIO;
+
 	mutex_lock(&smi_lock);
 
 	// Set PHY to access
@@ -701,6 +713,10 @@ int rtl839x_write_mmd_phy(u32 port, u32 devnum, u32 regnum, u32 val)
 	int err = 0;
 	u32 v;
 
+	// Take bug on RTL839x Rev <= C into account
+	if (port >= RTL839X_CPU_PORT)
+		return -EIO;
+
 	mutex_lock(&smi_lock);
 
 	// Set PHY to access
@@ -726,12 +742,15 @@ int rtl839x_write_mmd_phy(u32 port, u32 devnum, u32 regnum, u32 val)
 
 void rtl8390_get_version(struct rtl838x_switch_priv *priv)
 {
-	u32 info;
+	u32 info, model;
 
 	sw_w32_mask(0xf << 28, 0xa << 28, RTL839X_CHIP_INFO);
 	info = sw_r32(RTL839X_CHIP_INFO);
-	pr_debug("Chip-Info: %x\n", info);
-	priv->version = RTL8390_VERSION_A;
+
+	model = sw_r32(RTL839X_MODEL_NAME_INFO);
+	priv->version = RTL8390_VERSION_A + ((model & 0x3f) >> 1);
+
+	pr_info("RTL839X Chip-Info: %x, version %c\n", info, priv->version);
 }
 
 void rtl839x_vlan_profile_dump(int profile)