diff mbox series

[net-next] r8169: check that Realtek PHY driver module is loaded

Message ID be869014-21a1-a2e3-5a9b-93ddb01200f5@gmail.com
State Accepted
Delegated to: David Miller
Headers show
Series [net-next] r8169: check that Realtek PHY driver module is loaded | expand

Commit Message

Heiner Kallweit Dec. 13, 2019, 3:53 p.m. UTC
Some users complained about problems with r8169 and it turned out that
the generic PHY driver was used instead instead of the dedicated one.
In all cases reason was that r8169.ko was in initramfs, but realtek.ko
not. Manually adding realtek.ko to initramfs fixed the issues.
Root cause seems to be that tools like dracut and genkernel don't
consider softdeps. Add a check for loaded Realtek PHY driver module
and provide the user with a hint if it's not loaded.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 drivers/net/ethernet/realtek/r8169_main.c | 9 +++++++++
 1 file changed, 9 insertions(+)

Comments

David Miller Dec. 17, 2019, midnight UTC | #1
From: Heiner Kallweit <hkallweit1@gmail.com>
Date: Fri, 13 Dec 2019 16:53:37 +0100

> Some users complained about problems with r8169 and it turned out that
> the generic PHY driver was used instead instead of the dedicated one.
> In all cases reason was that r8169.ko was in initramfs, but realtek.ko
> not. Manually adding realtek.ko to initramfs fixed the issues.
> Root cause seems to be that tools like dracut and genkernel don't
> consider softdeps. Add a check for loaded Realtek PHY driver module
> and provide the user with a hint if it's not loaded.
> 
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>

Applied but this really is a failure of the dependency system and tooling.

I don't know if tools like dracut is where this has to happen or
something closer to the kernel module dep system itself, but what's
happening right now obviously does not work.
diff mbox series

Patch

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 67a4d5d45..f27e4da10 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -6825,6 +6825,15 @@  static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 	int chipset, region;
 	int jumbo_max, rc;
 
+	/* Some tools for creating an initramfs don't consider softdeps, then
+	 * r8169.ko may be in initramfs, but realtek.ko not. Then the generic
+	 * PHY driver is used that doesn't work with most chip versions.
+	 */
+	if (!driver_find("RTL8201CP Ethernet", &mdio_bus_type)) {
+		dev_err(&pdev->dev, "realtek.ko not loaded, maybe it needs to be added to initramfs?\n");
+		return -ENOENT;
+	}
+
 	dev = devm_alloc_etherdev(&pdev->dev, sizeof (*tp));
 	if (!dev)
 		return -ENOMEM;