Skip to contentSkip to conversation

r8169: fix PHY driver check on platforms w/o module softdeps

PATCH Applied Heiner Kallweit 3 participants 8 messages Mar 27, 2020 – Mar 30, 2020

Subsystems (3)
lore
Share & tools
lore

Heiner Kallweit

author maintainer
#0 lore raw

PATCH 1/1 r8169: fix PHY driver check on platforms w/o module softdeps

On Android/x86 the module loading infrastructure can't deal with softdeps. Therefore the check for presence of the Realtek PHY driver module fails. mdiobus_register() will try to load the PHY driver module, therefore move the check to after this call and explicitly check that a dedicated PHY driver is bound to the PHY device.

Fixes f32593773549 ("r8169: check that Realtek PHY driver module is loaded")

---
Please apply fix back to 5.4 only. On 4.19 it would break processing.

---
 drivers/net/ethernet/realtek/r8169_main.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)
drivers/net/ethernet/realtek/r8169_main.c +7 -9
index a9bdafd15..791d99b9e 100644
@@ -5285,6 +5285,13 @@ static int r8169_mdio_register(struct rtl8169_private *tp)
 	if (!tp->phydev) {
 		mdiobus_unregister(new_bus);
 		return -ENODEV;
+	} else if (!tp->phydev->drv) {
+		/* Most chip versions fail with the genphy driver.
+		 * Therefore ensure that the dedicated PHY driver is loaded.
+		 */
+		dev_err(&pdev->dev, "realtek.ko not loaded, maybe it needs to be added to initramfs?\n");
+		mdiobus_unregister(new_bus);
+		return -EUNATCH;
 	}
 
 	/* PHY will be woken up in rtl_open() */
@@ -5446,15 +5453,6 @@ 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;
Signature · 1 line
2.26.0
maintainer Applied
#1 lore raw

From: Heiner Kallweit <[email protected]>
Date: Fri, 27 Mar 2020 17:33:32 +0100

Quoted 11 lines

On Android/x86 the module loading infrastructure can't deal with softdeps. Therefore the check for presence of the Realtek PHY driver module fails. mdiobus_register() will try to load the PHY driver module, therefore move the check to after this call and explicitly check that a dedicated PHY driver is bound to the PHY device.

Fixes f32593773549 ("r8169: check that Realtek PHY driver module is loaded")

---
Please apply fix back to 5.4 only. On 4.19 it would break processing.

Applied, but am I missing something here? The Fixes: tag is a v5.6 change which was not sent to -stable.

author maintainer
#2 lore raw
Quoted 9 lines · David Miller

From: Heiner Kallweit <[email protected]>
Date: Fri, 27 Mar 2020 17:33:32 +0100

Quoted 6 lines

On Android/x86 the module loading infrastructure can't deal with softdeps. Therefore the check for presence of the Realtek PHY driver module fails. mdiobus_register() will try to load the PHY driver module, therefore move the check to after this call and explicitly check that a dedicated PHY driver is bound to the PHY device.

Quoted 9 lines
Quoted 5 lines
Fixes f32593773549 ("r8169: check that Realtek PHY driver module is loaded")

---
Please apply fix back to 5.4 only. On 4.19 it would break processing.

Applied, but am I missing something here? The Fixes: tag is a v5.6 change which was not sent to -stable.

Somehow that change made it to -stable. See e.g. commit 85a19b0e31e256e77fd4124804b9cec10619de5e for 4.19.

maintainer
#3 lore raw

From: Heiner Kallweit <[email protected]>
Date: Sat, 28 Mar 2020 00:10:57 +0100

Quoted 2 lines

Somehow that change made it to -stable. See e.g. commit 85a19b0e31e256e77fd4124804b9cec10619de5e for 4.19.

This is a serious issue in that it seems that the people maintaining the older stable release integrate arbitrary patches even if they haven't been sent to v5.4 and v5.5

And I don't handle -stable backport submissions that far back anyways.

Therefore, I'm not going ot participate in that ongoing problem, so feel free to contact the folks who integrated those changes into -stable and ask them to revert.

Thanks.

author maintainer
#4 lore raw

Re: issue with 85a19b0e31e2 on 4.19 -> revert

Quoted 10 lines · David Miller

From: Heiner Kallweit <[email protected]>
Date: Sat, 28 Mar 2020 00:10:57 +0100

Quoted 2 lines

Somehow that change made it to -stable. See e.g. commit 85a19b0e31e256e77fd4124804b9cec10619de5e for 4.19.

This is a serious issue in that it seems that the people maintaining the older stable release integrate arbitrary patches even if they haven't been sent to v5.4 and v5.5

Quoted 8 lines

And I don't handle -stable backport submissions that far back anyways.

Therefore, I'm not going to participate in that ongoing problem, so feel free to contact the folks who integrated those changes into -stable and ask them to revert.

Thanks.

Greg,

commit 85a19b0e31e2 ("r8169: check that Realtek PHY driver module is loaded") made it accidentally to 4.19 and causes an issue with Android/x86. Could you please revert it?

Thanks, Heiner

#5 lore raw

Re: issue with 85a19b0e31e2 on 4.19 -> revert

Quoted 17 lines · Heiner Kallweit
Quoted 16 lines · David Miller

From: Heiner Kallweit <[email protected]>
Date: Sat, 28 Mar 2020 00:10:57 +0100

Quoted 2 lines

Somehow that change made it to -stable. See e.g. commit 85a19b0e31e256e77fd4124804b9cec10619de5e for 4.19.

This is a serious issue in that it seems that the people maintaining the older stable release integrate arbitrary patches even if they haven't been sent to v5.4 and v5.5

And I don't handle -stable backport submissions that far back anyways.

Therefore, I'm not going to participate in that ongoing problem, so feel free to contact the folks who integrated those changes into -stable and ask them to revert.

Quoted 7 lines
Quoted 2 lines

Thanks.

Greg,

commit 85a19b0e31e2 ("r8169: check that Realtek PHY driver module is loaded") made it accidentally to 4.19 and causes an issue with Android/x86. Could you please revert it?

Now reverted. Should I also drop this from 5.4.y and 5.5.y?

thanks,

greg k-h

author maintainer
#6 lore raw

Re: issue with 85a19b0e31e2 on 4.19 -> revert

Quoted 20 lines · Greg Kroah-Hartman
Quoted 19 lines · Heiner Kallweit
Quoted 18 lines · David Miller

From: Heiner Kallweit <[email protected]>
Date: Sat, 28 Mar 2020 00:10:57 +0100

Quoted 2 lines

Somehow that change made it to -stable. See e.g. commit 85a19b0e31e256e77fd4124804b9cec10619de5e for 4.19.

This is a serious issue in that it seems that the people maintaining the older stable release integrate arbitrary patches even if they haven't been sent to v5.4 and v5.5

And I don't handle -stable backport submissions that far back anyways.

Therefore, I'm not going to participate in that ongoing problem, so feel free to contact the folks who integrated those changes into -stable and ask them to revert.

Thanks.

Quoted 8 lines
Quoted 5 lines

Greg,

commit 85a19b0e31e2 ("r8169: check that Realtek PHY driver module is loaded") made it accidentally to 4.19 and causes an issue with Android/x86. Could you please revert it?

Now reverted. Should I also drop this from 5.4.y and 5.5.y?

Thanks! On 5.4 and 5.5 it's not needed to revert. The following fix from 5.6 should make it to 5.4 and 5.5 soon.

2e8c339b4946 ("r8169: fix PHY driver check on platforms w/o module softdeps")

Quoted 4 lines

thanks,

greg k-h

Heiner

#7 lore raw

Re: issue with 85a19b0e31e2 on 4.19 -> revert

Quoted 27 lines · Heiner Kallweit
Quoted 26 lines · Greg Kroah-Hartman
Quoted 24 lines · Heiner Kallweit
Quoted 10 lines · David Miller

From: Heiner Kallweit <[email protected]>
Date: Sat, 28 Mar 2020 00:10:57 +0100

Quoted 2 lines

Somehow that change made it to -stable. See e.g. commit 85a19b0e31e256e77fd4124804b9cec10619de5e for 4.19.

This is a serious issue in that it seems that the people maintaining the older stable release integrate arbitrary patches even if they haven't been sent to v5.4 and v5.5

Quoted 8 lines

And I don't handle -stable backport submissions that far back anyways.

Therefore, I'm not going to participate in that ongoing problem, so feel free to contact the folks who integrated those changes into -stable and ask them to revert.

Thanks.

Greg,

commit 85a19b0e31e2 ("r8169: check that Realtek PHY driver module is loaded") made it accidentally to 4.19 and causes an issue with Android/x86. Could you please revert it?

Quoted 6 lines
Quoted 2 lines

Now reverted. Should I also drop this from 5.4.y and 5.5.y?

Thanks! On 5.4 and 5.5 it's not needed to revert. The following fix from 5.6 should make it to 5.4 and 5.5 soon.

2e8c339b4946 ("r8169: fix PHY driver check on platforms w/o module softdeps")

I don't see it in David's queue, so I'll go take it now for those trees.

thanks,

greg k-h