2020-06-05 14:06:17

by Antoine Tenart

Subject: [PATCH net] 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: deb04e9c0ff2 ("net: phy: mscc: use phy_package_shared")
Signed-off-by: Antoine Tenart <[email protected]>
---
drivers/net/phy/mscc/mscc_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/phy/mscc/mscc_main.c b/drivers/net/phy/mscc/mscc_main.c
index 7ed0285206d0..24687ac5ee14 100644
--- a/drivers/net/phy/mscc/mscc_main.c
+++ b/drivers/net/phy/mscc/mscc_main.c
@@ -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);
--
2.26.2

2020-06-05 16:35:27

by Florian Fainelli

Subject: Re: [PATCH net] net: phy: mscc: fix Serdes configuration in vsc8584_config_init

On 6/5/2020 7:00 AM, Antoine Tenart wrote:
> 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: deb04e9c0ff2 ("net: phy: mscc: use phy_package_shared")
> Signed-off-by: Antoine Tenart <[email protected]>

Reviewed-by: Florian Fainelli <[email protected]>
--
Florian

2020-06-05 20:18:57

by David Miller

Subject: Re: [PATCH net] net: phy: mscc: fix Serdes configuration in vsc8584_config_init

From: Antoine Tenart <[email protected]>
Date: Fri, 5 Jun 2020 16:00:09 +0200

> 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: deb04e9c0ff2 ("net: phy: mscc: use phy_package_shared")
> Signed-off-by: Antoine Tenart <[email protected]>

Applied, thank you.