dsa: lan9303: Fix mapping between DSA port number and PHY address
Subsystems (3)
PATCH 1/2 dsa: lan9303: Fix mapping between DSA port number and PHY address
The 'phy' parameter supplied to lan9303_phy_read/_write was sometimes a DSA port number and sometimes a PHY address. This isn't a problem as long as they are equal. But if the external phy_addr_sel_strap pin is wired to 'high', the PHY addresses change from 0-1-2 to 1-2-3 (CPU, slave0, slave1). In this case, lan9303_phy_read/_write must translate between DSA port numbers and the corresponding PHY address.
--- drivers/net/dsa/lan9303-core.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)
drivers/net/dsa/lan9303-core.c +10 -13
@@ -1047,31 +1047,31 @@ static int lan9303_get_sset_count(struct dsa_switch *ds, int port, int sset)return ARRAY_SIZE (lan9303_mib); } -static int lan9303_phy_read (struct dsa_switch *ds,int phy,int regnum) +static int lan9303_phy_read (struct dsa_switch *ds,int port,int regnum) {struct lan9303 *chip = ds->priv;int phy_base = chip->phy_addr_base; -if (phy == phy_base) +if (port ==0 )return lan9303_virt_phy_reg_read (chip, regnum); -if (phy > phy_base +2 ) +if (port >2 )return -ENODEV ; -return chip->ops->phy_read (chip, phy, regnum); +return chip->ops->phy_read (chip, phy_base + port, regnum); } -static int lan9303_phy_write (struct dsa_switch *ds,int phy,int regnum, +static int lan9303_phy_write (struct dsa_switch *ds,int port,int regnum,u16 val) {struct lan9303 *chip = ds->priv;int phy_base = chip->phy_addr_base; -if (phy == phy_base) +if (port ==0 )return lan9303_virt_phy_reg_write (chip, regnum, val); -if (phy > phy_base +2 ) +if (port >2 )return -ENODEV ; -return chip->ops->phy_write (chip, phy, regnum, val); +return chip->ops->phy_write (chip, phy_base + port, regnum, val); } static int lan9303_port_enable(struct dsa_switch *ds, int port,
@@ -1099,7 +1099,7 @@ static void lan9303_port_disable(struct dsa_switch *ds, int port)vlan_vid_del (dsa_port_to_conduit (dp),htons (ETH_P_8021Q ), port);lan9303_disable_processing_port (chip, port); -lan9303_phy_write (ds, chip->phy_addr_base + port,MII_BMCR ,BMCR_PDOWN ); +lan9303_phy_write (ds, port,MII_BMCR ,BMCR_PDOWN ); } static int lan9303_port_bridge_join(struct dsa_switch *ds, int port,
@@ -1374,8 +1374,6 @@ static const struct dsa_switch_ops lan9303_switch_ops = {static int lan9303_register_switch (struct lan9303 *chip) { -int base; - chip->ds =devm_kzalloc (chip->dev,sizeof (*chip->ds),GFP_KERNEL );if (!chip->ds)return -ENOMEM ;
@@ -1385,8 +1383,7 @@ static int lan9303_register_switch(struct lan9303 *chip) chip->ds->priv = chip; chip->ds->ops = &lan9303_switch_ops; chip->ds->phylink_mac_ops = &lan9303_phylink_mac_ops; - base = chip->phy_addr_base; - chip->ds->phys_mii_mask =GENMASK (LAN9303_NUM_PORTS -1 + base, base); + chip->ds->phys_mii_mask =GENMASK (LAN9303_NUM_PORTS -1 ,0 );return dsa_register_switch (chip->ds); }
Signature · 1 line
2.43.0
PATCH 2/2 dsa: lan9303: consistent naming for PHY address parameter
Name it 'addr' instead of 'port' or 'phy'.
--- drivers/net/dsa/lan9303_mdio.c | 8 ++++---- include/linux/dsa/lan9303.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/net/dsa/lan9303_mdio.c +4 -4
@@ -58,19 +58,19 @@ static int lan9303_mdio_read(void *ctx, uint32_t reg, uint32_t *val)return 0 ; } -static int lan9303_mdio_phy_write (struct lan9303 *chip,int phy,int reg, +static int lan9303_mdio_phy_write (struct lan9303 *chip,int addr,int reg,u16 val) {struct lan9303_mdio *sw_dev =dev_get_drvdata (chip->dev); -return mdiobus_write_nested (sw_dev->device->bus, phy, reg, val); +return mdiobus_write_nested (sw_dev->device->bus, addr, reg, val); } -static int lan9303_mdio_phy_read (struct lan9303 *chip,int phy,int reg) +static int lan9303_mdio_phy_read (struct lan9303 *chip,int addr,int reg) {struct lan9303_mdio *sw_dev =dev_get_drvdata (chip->dev); -return mdiobus_read_nested (sw_dev->device->bus, phy, reg); +return mdiobus_read_nested (sw_dev->device->bus, addr, reg); }static const struct lan9303_phy_ops lan9303_mdio_phy_ops = {
include/linux/dsa/lan9303.h +2 -2
@@ -5,8 +5,8 @@ struct lan9303;struct lan9303_phy_ops {/* PHY 1 and 2 access*/ -int (*phy_read)(struct lan9303 *chip,int port,int regnum); -int (*phy_write)(struct lan9303 *chip,int port, +int (*phy_read)(struct lan9303 *chip,int addr,int regnum); +int (*phy_write)(struct lan9303 *chip,int addr,int regnum,u16 val); };
Signature · 1 line
2.43.0
Re: [PATCH net 2/2] dsa: lan9303: consistent naming for PHY address parameter
Quoted 55 lines · Christian Eggers
Name it 'addr' instead of 'port' or 'phy'.
Signed-off-by Christian Eggers <[email protected]>--- drivers/net/dsa/lan9303_mdio.c | 8 ++++---- include/linux/dsa/lan9303.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-)drivers/net/dsa/lan9303_mdio.c +4
-4@@ -58,19 +58,19 @@ static int lan9303_mdio_read(void *ctx, uint32_t reg, uint32_t *val)return 0 ; } -static int lan9303_mdio_phy_write (struct lan9303 *chip,int phy,int reg, +static int lan9303_mdio_phy_write (struct lan9303 *chip,int addr,int reg,u16 val) {struct lan9303_mdio *sw_dev =dev_get_drvdata (chip->dev); -return mdiobus_write_nested (sw_dev->device->bus, phy, reg, val); +return mdiobus_write_nested (sw_dev->device->bus, addr, reg, val); } -static int lan9303_mdio_phy_read (struct lan9303 *chip,int phy,int reg) +static int lan9303_mdio_phy_read (struct lan9303 *chip,int addr,int reg) {struct lan9303_mdio *sw_dev =dev_get_drvdata (chip->dev); -return mdiobus_read_nested (sw_dev->device->bus, phy, reg); +return mdiobus_read_nested (sw_dev->device->bus, addr, reg); }static const struct lan9303_phy_ops lan9303_mdio_phy_ops = {include/linux/dsa/lan9303.h +2
-2@@ -5,8 +5,8 @@ struct lan9303;struct lan9303_phy_ops {/* PHY 1 and 2 access*/ -int (*phy_read)(struct lan9303 *chip,int port,int regnum); -int (*phy_write)(struct lan9303 *chip,int port, +int (*phy_read)(struct lan9303 *chip,int addr,int regnum); +int (*phy_write)(struct lan9303 *chip,int addr,int regnum,u16 val); };Signature · 1 line
2.43.0
Re: [PATCH net 2/2] dsa: lan9303: consistent naming for PHY address parameter
In reply to Christian EggersQuoted 3 lines · Christian Eggers
Name it 'addr' instead of 'port' or 'phy'.
Signed-off-by Christian Eggers <[email protected]>
Signature · 1 line
Florian
Jakub Kicinski
maintainerRe: [PATCH net 2/2] dsa: lan9303: consistent naming for PHY address parameter
In reply to Christian EggersQuoted 1 line · On Wed, 3 Jul 2024 16:57:18 +0200 Christian Eggers wrote:
Name it 'addr' instead of 'port' or 'phy'.
Unfortunately the fix has narrowly missed today's PR. Please resend this for net-next in a week+.
Vladimir Oltean
maintainerRe: [PATCH net 2/2] dsa: lan9303: consistent naming for PHY address parameter
Quoted 5 lines · Jakub Kicinski
Quoted 1 line · On Wed, 3 Jul 2024 16:57:18 +0200 Christian Eggers wrote:
Name it 'addr' instead of 'port' or 'phy'.
Unfortunately the fix has narrowly missed today's PR. Please resend this for net-next in a week+.
How does this work? You're no longer taking 'net' patches through the 'net' tree in the last week before the net-next pull request?
Jakub Kicinski
maintainerRe: [PATCH net 2/2] dsa: lan9303: consistent naming for PHY address parameter
Quoted 9 lines · On Mon, 8 Jul 2024 15:13:52 +0300 Vladimir Oltean wrote:
Quoted 5 lines · Jakub Kicinski
Quoted 1 line · On Wed, 3 Jul 2024 16:57:18 +0200 Christian Eggers wrote:
Name it 'addr' instead of 'port' or 'phy'.
Unfortunately the fix has narrowly missed today's PR. Please resend this for net-next in a week+.
How does this work? You're no longer taking 'net' patches through the 'net' tree in the last week before the net-next pull request?
The fix has narrowly missed the PR, IOW patch 1 has missed the PR. Patch 2 is not a fix.
Quoted 89 lines · Christian Eggers
The 'phy' parameter supplied to lan9303_phy_read/_write was sometimes a DSA port number and sometimes a PHY address. This isn't a problem as long as they are equal. But if the external
phy_addr_sel_strappin is wired to 'high', the PHY addresses change from 0-1-2 to 1-2-3 (CPU, slave0, slave1). In this case, lan9303_phy_read/_write must translate between DSA port numbers and the corresponding PHY address.Fixes a1292595e006 ("net: dsa: add new DSA switch driver for the SMSC-LAN9303")Signed-off-by Christian Eggers <[email protected]>--- drivers/net/dsa/lan9303-core.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)drivers/net/dsa/lan9303-core.c +10
-13@@ -1047,31 +1047,31 @@ static int lan9303_get_sset_count(struct dsa_switch *ds, int port, int sset)return ARRAY_SIZE (lan9303_mib); } -static int lan9303_phy_read (struct dsa_switch *ds,int phy,int regnum) +static int lan9303_phy_read (struct dsa_switch *ds,int port,int regnum) {struct lan9303 *chip = ds->priv;int phy_base = chip->phy_addr_base; -if (phy == phy_base) +if (port ==0 )return lan9303_virt_phy_reg_read (chip, regnum); -if (phy > phy_base +2 ) +if (port >2 )return -ENODEV ; -return chip->ops->phy_read (chip, phy, regnum); +return chip->ops->phy_read (chip, phy_base + port, regnum); } -static int lan9303_phy_write (struct dsa_switch *ds,int phy,int regnum, +static int lan9303_phy_write (struct dsa_switch *ds,int port,int regnum,u16 val) {struct lan9303 *chip = ds->priv;int phy_base = chip->phy_addr_base; -if (phy == phy_base) +if (port ==0 )return lan9303_virt_phy_reg_write (chip, regnum, val); -if (phy > phy_base +2 ) +if (port >2 )return -ENODEV ; -return chip->ops->phy_write (chip, phy, regnum, val); +return chip->ops->phy_write (chip, phy_base + port, regnum, val); } static int lan9303_port_enable(struct dsa_switch *ds, int port,@@ -1099,7 +1099,7 @@ static void lan9303_port_disable(struct dsa_switch *ds, int port)vlan_vid_del (dsa_port_to_conduit (dp),htons (ETH_P_8021Q ), port);lan9303_disable_processing_port (chip, port); -lan9303_phy_write (ds, chip->phy_addr_base + port,MII_BMCR ,BMCR_PDOWN ); +lan9303_phy_write (ds, port,MII_BMCR ,BMCR_PDOWN ); } static int lan9303_port_bridge_join(struct dsa_switch *ds, int port,@@ -1374,8 +1374,6 @@ static const struct dsa_switch_ops lan9303_switch_ops = {static int lan9303_register_switch (struct lan9303 *chip) { -int base; - chip->ds =devm_kzalloc (chip->dev,sizeof (*chip->ds),GFP_KERNEL );if (!chip->ds)return -ENOMEM ;@@ -1385,8 +1383,7 @@ static int lan9303_register_switch(struct lan9303 *chip) chip->ds->priv = chip; chip->ds->ops = &lan9303_switch_ops; chip->ds->phylink_mac_ops = &lan9303_phylink_mac_ops; - base = chip->phy_addr_base; - chip->ds->phys_mii_mask =GENMASK (LAN9303_NUM_PORTS -1 + base, base); + chip->ds->phys_mii_mask =GENMASK (LAN9303_NUM_PORTS -1 ,0 );return dsa_register_switch (chip->ds); }Signature · 1 line
2.43.0
The patch looks OK.
Thanks,
Quoted 9 lines · Christian Eggers
The 'phy' parameter supplied to lan9303_phy_read/_write was sometimes a DSA port number and sometimes a PHY address. This isn't a problem as long as they are equal. But if the external
phy_addr_sel_strappin is wired to 'high', the PHY addresses change from 0-1-2 to 1-2-3 (CPU, slave0, slave1). In this case, lan9303_phy_read/_write must translate between DSA port numbers and the corresponding PHY address.Fixes a1292595e006 ("net: dsa: add new DSA switch driver for the SMSC-LAN9303")Signed-off-by Christian Eggers <[email protected]>
Signature · 1 line
Florian
Quoted 10 lines · Christian Eggers
The 'phy' parameter supplied to lan9303_phy_read/_write was sometimes a DSA port number and sometimes a PHY address. This isn't a problem as long as they are equal. But if the external
phy_addr_sel_strappin is wired to 'high', the PHY addresses change from 0-1-2 to 1-2-3 (CPU, slave0, slave1). In this case, lan9303_phy_read/_write must translate between DSA port numbers and the corresponding PHY address.Fixes a1292595e006 ("net: dsa: add new DSA switch driver for the SMSC-LAN9303")Signed-off-by Christian Eggers <[email protected]>---
This series was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Wed, 3 Jul 2024 16:57:17 +0200 you wrote:
The 'phy' parameter supplied to lan9303_phy_read/_write was sometimes a DSA port number and sometimes a PHY address. This isn't a problem as long as they are equal. But if the external
phy_addr_sel_strappin is wired to 'high', the PHY addresses change from 0-1-2 to 1-2-3 (CPU, slave0, slave1). In this case, lan9303_phy_read/_write must translate between DSA port numbers and the corresponding PHY address.[...]
Here is the summary with links:
- [net,1/2] dsa: lan9303: Fix mapping between DSA port number and PHY address
https://git.kernel.org/netdev/net/c/0005b2dc43f9
- [net,2/2] dsa: lan9303: consistent naming for PHY address parameter (no matching commit)
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html