diff options
| author | Jesse Van Gavere <[email protected]> | 2024-12-06 20:42:02 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2024-12-09 22:32:00 +0000 |
| commit | ca7858880590d4f1dfe73b2cbf372b8ed80a6d81 (patch) | |
| tree | da14cde685dade669ae41aef1bb86380d234d8e8 /drivers/net/dsa/microchip/ksz_common.c | |
| parent | mctp: no longer rely on net->dev_index_head[] (diff) | |
| download | kernel-ca7858880590d4f1dfe73b2cbf372b8ed80a6d81.tar.gz kernel-ca7858880590d4f1dfe73b2cbf372b8ed80a6d81.zip | |
net: dsa: microchip: Make MDIO bus name unique
In configurations with 2 or more DSA clusters it will fail to allocate
unique MDIO bus names as only the switch ID is used, fix this by using
a combination of the tree ID and switch ID when needed
Signed-off-by: Jesse Van Gavere <[email protected]>
Reviewed-by: Andrew Lunn <[email protected]>
Link: https://patch.msgid.link/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'drivers/net/dsa/microchip/ksz_common.c')
| -rw-r--r-- | drivers/net/dsa/microchip/ksz_common.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/dsa/microchip/ksz_common.c b/drivers/net/dsa/microchip/ksz_common.c index 920443ee8ffd..f5822c57be32 100644 --- a/drivers/net/dsa/microchip/ksz_common.c +++ b/drivers/net/dsa/microchip/ksz_common.c @@ -2550,7 +2550,11 @@ static int ksz_mdio_register(struct ksz_device *dev) bus->read = ksz_sw_mdio_read; bus->write = ksz_sw_mdio_write; bus->name = "ksz user smi"; - snprintf(bus->id, MII_BUS_ID_SIZE, "SMI-%d", ds->index); + if (ds->dst->index != 0) { + snprintf(bus->id, MII_BUS_ID_SIZE, "SMI-%d-%d", ds->dst->index, ds->index); + } else { + snprintf(bus->id, MII_BUS_ID_SIZE, "SMI-%d", ds->index); + } } ret = ksz_parse_dt_phy_config(dev, bus, mdio_np); |