| From 60062f6eb37fb568d4d9e58d3d8056683864d209 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 20 Jul 2021 17:17:40 +0100 |
| Subject: r8169: Avoid duplicate sysfs entry creation error |
| |
| From: Sayanta Pattanayak <sayanta.pattanayak@arm.com> |
| |
| [ Upstream commit e9a72f874d5b95cef0765bafc56005a50f72c5fe ] |
| |
| When registering the MDIO bus for a r8169 device, we use the PCI |
| bus/device specifier as a (seemingly) unique device identifier. |
| However the very same BDF number can be used on another PCI segment, |
| which makes the driver fail probing: |
| |
| [ 27.544136] r8169 0002:07:00.0: enabling device (0000 -> 0003) |
| [ 27.559734] sysfs: cannot create duplicate filename '/class/mdio_bus/r8169-700' |
| .... |
| [ 27.684858] libphy: mii_bus r8169-700 failed to register |
| [ 27.695602] r8169: probe of 0002:07:00.0 failed with error -22 |
| |
| Add the segment number to the device name to make it more unique. |
| |
| This fixes operation on ARM N1SDP boards, with two boards connected |
| together to form an SMP system, and all on-board devices showing up |
| twice, just on different PCI segments. A similar issue would occur on |
| large systems with many PCI slots and multiple RTL8169 NICs. |
| |
| Fixes: f1e911d5d0dfd ("r8169: add basic phylib support") |
| Signed-off-by: Sayanta Pattanayak <sayanta.pattanayak@arm.com> |
| [Andre: expand commit message, use pci_domain_nr()] |
| Signed-off-by: Andre Przywara <andre.przywara@arm.com> |
| Acked-by: Heiner Kallweit <hkallweit1@gmail.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/realtek/r8169_main.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c |
| index a0d4e052a79e..b8eb1b2a8de3 100644 |
| --- a/drivers/net/ethernet/realtek/r8169_main.c |
| +++ b/drivers/net/ethernet/realtek/r8169_main.c |
| @@ -5085,7 +5085,8 @@ static int r8169_mdio_register(struct rtl8169_private *tp) |
| new_bus->priv = tp; |
| new_bus->parent = &pdev->dev; |
| new_bus->irq[0] = PHY_MAC_INTERRUPT; |
| - snprintf(new_bus->id, MII_BUS_ID_SIZE, "r8169-%x", pci_dev_id(pdev)); |
| + snprintf(new_bus->id, MII_BUS_ID_SIZE, "r8169-%x-%x", |
| + pci_domain_nr(pdev->bus), pci_dev_id(pdev)); |
| |
| new_bus->read = r8169_mdio_read_reg; |
| new_bus->write = r8169_mdio_write_reg; |
| -- |
| 2.30.2 |
| |