Skip to content

Commit

Permalink
realtek: Fix bug when accessing external PHYs on SoCs older than Revi…
Browse files Browse the repository at this point in the history
…sion 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@birger-koblitz.de>
  • Loading branch information
Birger Koblitz authored and blogic committed Oct 9, 2021
1 parent 88936e7 commit 76f6047
Showing 1 changed file with 22 additions and 3 deletions.
25 changes: 22 additions & 3 deletions target/linux/realtek/files-5.10/drivers/net/dsa/rtl83xx/rtl839x.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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)
Expand Down

0 comments on commit 76f6047

Please sign in to comment.