5.4-stable patches

added patches:
	r8169-fix-phy-driver-check-on-platforms-w-o-module-softdeps.patch

diff --git a/queue-5.4/r8169-fix-phy-driver-check-on-platforms-w-o-module-softdeps.patch b/queue-5.4/r8169-fix-phy-driver-check-on-platforms-w-o-module-softdeps.patch
new file mode 100644 (file)
index 0000000..7741e02
--- /dev/null
+++ b/queue-5.4/r8169-fix-phy-driver-check-on-platforms-w-o-module-softdeps.patch
@@ -0,0 +1,57 @@
+From 2e8c339b4946490a922a21aa8cd869c6cfad2023 Mon Sep 17 00:00:00 2001
+From: Heiner Kallweit <hkallweit1@gmail.com>
+Date: Fri, 27 Mar 2020 17:33:32 +0100
+Subject: r8169: fix PHY driver check on platforms w/o module softdeps
+
+From: Heiner Kallweit <hkallweit1@gmail.com>
+
+commit 2e8c339b4946490a922a21aa8cd869c6cfad2023 upstream.
+
+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")
+Reported-by: Chih-Wei Huang <cwhuang@android-x86.org>
+Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/ethernet/realtek/r8169_main.c |   16 +++++++---------
+ 1 file changed, 7 insertions(+), 9 deletions(-)
+
+--- a/drivers/net/ethernet/realtek/r8169_main.c
++++ b/drivers/net/ethernet/realtek/r8169_main.c
+@@ -6903,6 +6903,13 @@ static int r8169_mdio_register(struct rt
+       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() */
+@@ -7064,15 +7071,6 @@ static int rtl_init_one(struct pci_dev *
+       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;

diff --git a/queue-5.4/series b/queue-5.4/series
index c53a3b92c12f85574aaff8b3e07e2c545eba930e..d4bb382a3024c35f36880aaa190d75aa01aae0af 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -131,3 +131,4 @@ bpf-btf-fix-btf-verification-of-enum-members-in-struct-union.patch
 bpf-sockmap-remove-bucket-lock-from-sock_-hash-map-_free.patch
 arm-dts-sun8i-a83t-tbs-a711-fix-usb-otg-mode-detection.patch
 vti6-fix-memory-leak-of-skb-if-input-policy-check-fails.patch
+r8169-fix-phy-driver-check-on-platforms-w-o-module-softdeps.patch