Please queue up the following networking bug fixes for v5.5 and v5.6 -stable, respectively. Also, there is a Realtek PHY patch attached which should be queued up for v5.4. Thank you.
Attachment:
net_55.mbox
Description: Binary data
Attachment:
net_56.mbox
Description: Binary data
Subject: [PATCH 5.4 net] net: phy: realtek: fix handling of RTL8105e-integrated PHY
From: Heiner Kallweit <hkallweit1@xxxxxxxxx>
To: David Miller <davem@xxxxxxxxxxxxx>,
Realtek linux nic maintainers <nic_swsd@xxxxxxxxxxx>
Cc: "netdev@xxxxxxxxxxxxxxx" <netdev@xxxxxxxxxxxxxxx>
Date: Wed, 8 Apr 2020 00:01:42 +0200
User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0
[ 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@xxxxxxxxx>
---
Please apply on 5.4 only.
---
drivers/net/phy/realtek.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
index c76df51dd..879ca37c8 100644
--- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c
@@ -456,6 +456,15 @@ static struct phy_driver realtek_drvs[] = {
.resume = genphy_resume,
.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",
--
2.26.0
