[PATCH net] r8169: re-establish support for RTL8401 chip version

[PATCH net] r8169: re-establish support for RTL8401 chip version

[Heiner Kallweit]

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")
Reported-by: Camaleón <noelamac@gmail.com>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
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(+)

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index f06dbc9a0..8c41f6848 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -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 },
-- 
2.26.2

Re: [PATCH net] r8169: re-establish support for RTL8401 chip version

[Jakub Kicinski]

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")
> Reported-by: Camaleón <noelamac@gmail.com>
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>

Applied, thanks!

> 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?

Re: [PATCH net] r8169: re-establish support for RTL8401 chip version

[Heiner Kallweit]

On 09.05.2020 03:38, Jakub Kicinski wrote:
> 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")
>> Reported-by: Camaleón <noelamac@gmail.com>
>> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
> 
> Applied, thanks!
> 
>> 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.