Skip to contentSkip to conversation

r8169: re-establish support for RTL8401 chip version

PATCH Applied Heiner Kallweit 2 participants 3 messages May 8, 2020 – May 9, 2020

Subsystems (3)
lore
Share & tools
lore

Heiner Kallweit

author maintainer
#0 lore raw

PATCH 1/1 r8169: re-establish support for RTL8401 chip version

r8169 never had native support for the RTL8401, however it reportedly worked with the fallback to RTL8101e [0]. Therefore let's add this as an explicit assignment.

[0] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=956868

Fixes b4cc2dcc9c7c ("r8169: remove default chip versions")

---
This fix doesn't apply cleanly on 4.19, let me know whether you can adjust it, or whether I should send a separate patch.

---
 drivers/net/ethernet/realtek/r8169_main.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/net/ethernet/realtek/r8169_main.c +2 -0
index f06dbc9a0..8c41f6848 100644
@@ -2055,6 +2055,8 @@ static enum mac_version rtl8169_get_mac_version(u16 xid, bool gmii)
 		{ 0x7cf, 0x348,	RTL_GIGA_MAC_VER_07 },
 		{ 0x7cf, 0x248,	RTL_GIGA_MAC_VER_07 },
 		{ 0x7cf, 0x340,	RTL_GIGA_MAC_VER_13 },
+		/* RTL8401, reportedly works if treated as RTL8101e */
+		{ 0x7cf, 0x240,	RTL_GIGA_MAC_VER_13 },
 		{ 0x7cf, 0x343,	RTL_GIGA_MAC_VER_10 },
 		{ 0x7cf, 0x342,	RTL_GIGA_MAC_VER_16 },
 		{ 0x7c8, 0x348,	RTL_GIGA_MAC_VER_09 },
Signature · 1 line
2.26.2
maintainer Applied
#1 lore raw
Quoted 9 lines · On Fri, 8 May 2020 08:24:14 +0200 Heiner Kallweit wrote:

r8169 never had native support for the RTL8401, however it reportedly worked with the fallback to RTL8101e [0]. Therefore let's add this as an explicit assignment.

[0] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=956868

Fixes b4cc2dcc9c7c ("r8169: remove default chip versions")

Applied, thanks!

Quoted 2 lines

This fix doesn't apply cleanly on 4.19, let me know whether you can adjust it, or whether I should send a separate patch.

I don't see b4cc2dcc9c7c in v4.19, looks like it landed in v5.0. No?

author maintainer
#2 lore raw
Quoted 11 lines · Jakub Kicinski
Quoted 9 lines · On Fri, 8 May 2020 08:24:14 +0200 Heiner Kallweit wrote:

r8169 never had native support for the RTL8401, however it reportedly worked with the fallback to RTL8101e [0]. Therefore let's add this as an explicit assignment.

[0] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=956868

Fixes b4cc2dcc9c7c ("r8169: remove default chip versions")
Quoted 7 lines

Applied, thanks!

Quoted 2 lines

This fix doesn't apply cleanly on 4.19, let me know whether you can adjust it, or whether I should send a separate patch.

I don't see b4cc2dcc9c7c in v4.19, looks like it landed in v5.0. No?

Uups, you're right. Even better, then you can ignore the comment. Thanks for pointing out.