From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 9 Apr 2020 11:05:19 +0000 (+0200)
Subject: 5.4-stable patches
X-Git-Tag: v4.4.219~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4488ec82655a9bc14963a79578ea85dded64d01a;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

added patches:
	net-phy-realtek-fix-handling-of-rtl8105e-integrated-phy.patch
---

diff --git a/queue-5.4/net-phy-realtek-fix-handling-of-rtl8105e-integrated-phy.patch b/queue-5.4/net-phy-realtek-fix-handling-of-rtl8105e-integrated-phy.patch
new file mode 100644
index 00000000000..2820a3c4de9
--- /dev/null
+++ b/queue-5.4/net-phy-realtek-fix-handling-of-rtl8105e-integrated-phy.patch
@@ -0,0 +1,43 @@
+From foo@baz Thu 09 Apr 2020 12:19:25 PM CEST
+From: Heiner Kallweit <hkallweit1@gmail.com>
+Subject: net: phy: realtek: fix handling of RTL8105e-integrated PHY
+To: David Miller <davem@davemloft.net>, Realtek linux nic maintainers <nic_swsd@realtek.com>
+Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>
+Date: Wed, 8 Apr 2020 00:01:42 +0200
+
+From: Heiner Kallweit <hkallweit1@gmail.com>
+
+[ No applicable upstream commit ]
+
+After the referenced fix it turned out that one particular RTL8168
+chip version (RTL8105e) does not work on 5.4 because no dedicated PHY
+driver exists. Adding this PHY driver was done for fixing a different
+issue for versions from 5.5 already. I re-send the same change for 5.4
+because the commit message differs.
+
+Fixes: 2e8c339b4946 ("r8169: fix PHY driver check on platforms w/o module softdeps")
+Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/phy/realtek.c |    9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+--- a/drivers/net/phy/realtek.c
++++ b/drivers/net/phy/realtek.c
+@@ -457,6 +457,15 @@ static struct phy_driver realtek_drvs[]
+ 		.read_page	= rtl821x_read_page,
+ 		.write_page	= rtl821x_write_page,
+ 	}, {
++		PHY_ID_MATCH_MODEL(0x001cc880),
++		.name		= "RTL8208 Fast Ethernet",
++		.read_mmd	= genphy_read_mmd_unsupported,
++		.write_mmd	= genphy_write_mmd_unsupported,
++		.suspend	= genphy_suspend,
++		.resume		= genphy_resume,
++		.read_page	= rtl821x_read_page,
++		.write_page	= rtl821x_write_page,
++	}, {
+ 		PHY_ID_MATCH_EXACT(0x001cc910),
+ 		.name		= "RTL8211 Gigabit Ethernet",
+ 		.config_aneg	= rtl8211_config_aneg,
diff --git a/queue-5.4/series b/queue-5.4/series
new file mode 100644
index 00000000000..26067224306
--- /dev/null
+++ b/queue-5.4/series
@@ -0,0 +1 @@
+net-phy-realtek-fix-handling-of-rtl8105e-integrated-phy.patch