mirror of
https://github.com/openwrt/openwrt.git
synced 2025-02-21 09:42:09 +00:00
e4d840b312
b11bff90f2ad r8169: add support for RTL8125BP rev.b b3593df26ab1 r8169: add support for RTL8125D rev.b b299ea006928 r8169: adjust version numbering for RTL8126 bb18265c3aba r8169: remove support for chip version 11 2e20bf8cc057 r8169: remove unused flag RTL_FLAG_TASK_RESET_NO_QUEUE_WAKE e340bff27e63 r8169: copy vendor driver 2.5G/5G EEE advertisement constraints The EEE advertisement patch has been reworked for linux v6.6 because phy_set_eee_broken() is only present on linux >= v6.13 and eee_broken_modes declaration has been converted to a bitmap, so linkmode_set_bit() can't be used either.e340bff27eed623fb8e3721aa69e70Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> (cherry picked from commit 084618f8db7d0e413b47bab3e0ea70804bf84ee2)
91 lines
3.5 KiB
Diff
91 lines
3.5 KiB
Diff
From b3593df26ab19f114d613693fa8a92ab202803d0 Mon Sep 17 00:00:00 2001
|
|
From: ChunHao Lin <hau@realtek.com>
|
|
Date: Fri, 13 Dec 2024 20:02:58 +0100
|
|
Subject: [PATCH] r8169: add support for RTL8125D rev.b
|
|
|
|
Add support for RTL8125D rev.b. Its XID is 0x689. It is basically
|
|
based on the one with XID 0x688, but with different firmware file.
|
|
|
|
Signed-off-by: ChunHao Lin <hau@realtek.com>
|
|
[hkallweit1@gmail.com: rebased after adjusted version numbering]
|
|
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
Link: https://patch.msgid.link/75e5e9ec-d01f-43ac-b0f4-e7456baf18d1@gmail.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/realtek/r8169.h | 1 +
|
|
drivers/net/ethernet/realtek/r8169_main.c | 6 ++++++
|
|
drivers/net/ethernet/realtek/r8169_phy_config.c | 1 +
|
|
3 files changed, 8 insertions(+)
|
|
|
|
--- a/drivers/net/ethernet/realtek/r8169.h
|
|
+++ b/drivers/net/ethernet/realtek/r8169.h
|
|
@@ -69,6 +69,7 @@ enum mac_version {
|
|
RTL_GIGA_MAC_VER_61,
|
|
RTL_GIGA_MAC_VER_63,
|
|
RTL_GIGA_MAC_VER_64,
|
|
+ RTL_GIGA_MAC_VER_65,
|
|
RTL_GIGA_MAC_VER_70,
|
|
RTL_GIGA_MAC_VER_71,
|
|
RTL_GIGA_MAC_NONE
|
|
--- a/drivers/net/ethernet/realtek/r8169_main.c
|
|
+++ b/drivers/net/ethernet/realtek/r8169_main.c
|
|
@@ -56,6 +56,7 @@
|
|
#define FIRMWARE_8125A_3 "rtl_nic/rtl8125a-3.fw"
|
|
#define FIRMWARE_8125B_2 "rtl_nic/rtl8125b-2.fw"
|
|
#define FIRMWARE_8125D_1 "rtl_nic/rtl8125d-1.fw"
|
|
+#define FIRMWARE_8125D_2 "rtl_nic/rtl8125d-2.fw"
|
|
#define FIRMWARE_8126A_2 "rtl_nic/rtl8126a-2.fw"
|
|
#define FIRMWARE_8126A_3 "rtl_nic/rtl8126a-3.fw"
|
|
|
|
@@ -139,6 +140,7 @@ static const struct {
|
|
/* reserve 62 for CFG_METHOD_4 in the vendor driver */
|
|
[RTL_GIGA_MAC_VER_63] = {"RTL8125B", FIRMWARE_8125B_2},
|
|
[RTL_GIGA_MAC_VER_64] = {"RTL8125D", FIRMWARE_8125D_1},
|
|
+ [RTL_GIGA_MAC_VER_65] = {"RTL8125D", FIRMWARE_8125D_2},
|
|
[RTL_GIGA_MAC_VER_70] = {"RTL8126A", FIRMWARE_8126A_2},
|
|
[RTL_GIGA_MAC_VER_71] = {"RTL8126A", FIRMWARE_8126A_3},
|
|
};
|
|
@@ -706,6 +708,7 @@ MODULE_FIRMWARE(FIRMWARE_8107E_2);
|
|
MODULE_FIRMWARE(FIRMWARE_8125A_3);
|
|
MODULE_FIRMWARE(FIRMWARE_8125B_2);
|
|
MODULE_FIRMWARE(FIRMWARE_8125D_1);
|
|
+MODULE_FIRMWARE(FIRMWARE_8125D_2);
|
|
MODULE_FIRMWARE(FIRMWARE_8126A_2);
|
|
MODULE_FIRMWARE(FIRMWARE_8126A_3);
|
|
|
|
@@ -2260,6 +2263,7 @@ static enum mac_version rtl8169_get_mac_
|
|
{ 0x7cf, 0x649, RTL_GIGA_MAC_VER_70 },
|
|
|
|
/* 8125D family. */
|
|
+ { 0x7cf, 0x689, RTL_GIGA_MAC_VER_65 },
|
|
{ 0x7cf, 0x688, RTL_GIGA_MAC_VER_64 },
|
|
|
|
/* 8125B family. */
|
|
@@ -3840,6 +3844,7 @@ static void rtl_hw_config(struct rtl8169
|
|
[RTL_GIGA_MAC_VER_61] = rtl_hw_start_8125a_2,
|
|
[RTL_GIGA_MAC_VER_63] = rtl_hw_start_8125b,
|
|
[RTL_GIGA_MAC_VER_64] = rtl_hw_start_8125d,
|
|
+ [RTL_GIGA_MAC_VER_65] = rtl_hw_start_8125d,
|
|
[RTL_GIGA_MAC_VER_70] = rtl_hw_start_8126a,
|
|
[RTL_GIGA_MAC_VER_71] = rtl_hw_start_8126a,
|
|
};
|
|
@@ -3858,6 +3863,7 @@ static void rtl_hw_start_8125(struct rtl
|
|
switch (tp->mac_version) {
|
|
case RTL_GIGA_MAC_VER_61:
|
|
case RTL_GIGA_MAC_VER_64:
|
|
+ case RTL_GIGA_MAC_VER_65:
|
|
for (i = 0xa00; i < 0xb00; i += 4)
|
|
RTL_W32(tp, i, 0);
|
|
break;
|
|
--- a/drivers/net/ethernet/realtek/r8169_phy_config.c
|
|
+++ b/drivers/net/ethernet/realtek/r8169_phy_config.c
|
|
@@ -1162,6 +1162,7 @@ void r8169_hw_phy_config(struct rtl8169_
|
|
[RTL_GIGA_MAC_VER_61] = rtl8125a_2_hw_phy_config,
|
|
[RTL_GIGA_MAC_VER_63] = rtl8125b_hw_phy_config,
|
|
[RTL_GIGA_MAC_VER_64] = rtl8125d_hw_phy_config,
|
|
+ [RTL_GIGA_MAC_VER_65] = rtl8125d_hw_phy_config,
|
|
[RTL_GIGA_MAC_VER_70] = rtl8126a_hw_phy_config,
|
|
[RTL_GIGA_MAC_VER_71] = rtl8126a_hw_phy_config,
|
|
};
|