Commit 49113d5e authored by Antoine Tenart's avatar Antoine Tenart Committed by David S. Miller
Browse files

net: phy: mscc: fix Serdes configuration in vsc8584_config_init 



When converting the MSCC PHY driver to shared PHY packages, the Serdes
configuration in vsc8584_config_init was modified to use 'base_addr'
instead of 'base' as the port number. But 'base_addr' isn't equal to
'addr' for all PHYs inside the package, which leads to the Serdes still
being enabled on those ports. This patch fixes it.

Fixes: deb04e9c ("net: phy: mscc: use phy_package_shared")
Signed-off-by: default avatarAntoine Tenart <antoine.tenart@bootlin.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ba3823ca

drivers/net/phy/mscc/mscc_main.c

+2 −2
Original line number Diff line number Diff line
@@ -1396,7 +1396,7 @@ static int vsc8584_config_init(struct phy_device *phydev) 


	/* Disable SerDes for 100Base-FX */

	ret = vsc8584_cmd(phydev, PROC_CMD_FIBER_MEDIA_CONF |

			  PROC_CMD_FIBER_PORT(vsc8531->base_addr) |

			  PROC_CMD_FIBER_PORT(vsc8531->addr) |

			  PROC_CMD_FIBER_DISABLE |

			  PROC_CMD_READ_MOD_WRITE_PORT |

			  PROC_CMD_RST_CONF_PORT | PROC_CMD_FIBER_100BASE_FX);
@@ -1405,7 +1405,7 @@ static int vsc8584_config_init(struct phy_device *phydev) 


	/* Disable SerDes for 1000Base-X */

	ret = vsc8584_cmd(phydev, PROC_CMD_FIBER_MEDIA_CONF |

			  PROC_CMD_FIBER_PORT(vsc8531->base_addr) |

			  PROC_CMD_FIBER_PORT(vsc8531->addr) |

			  PROC_CMD_FIBER_DISABLE |

			  PROC_CMD_READ_MOD_WRITE_PORT |

			  PROC_CMD_RST_CONF_PORT | PROC_CMD_FIBER_1000BASE_X);

CRA Git | Maintained and supported by SUSTech CRA and CCSE