mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2025-05-20 21:27:55 +00:00
94dbbe3496
Upstream e2015942e90a couldn't be backported to 6.6 because the following symbols were missing: - disable_work - disable_work_sync - enable_work Seee2015942e9Upstream 34e5ededf4b8 couldn't be backported to 6.6 because the following symbol was missing: - pcim_iomap_region See34e5ededf4Reorganize patch numbers now that < 6.12 patches are no longer needed. The following patches still differ from upstream: - e340bff27e63 phy_set_eee_broken symbol is missing in 6.12 https://github.com/torvalds/linux/commit/e340bff27e63 The following patches can't be backported to 6.12 due to missing symbols: - 5e7a74b6a357 phy_disable_eee_mode symbol is missing in 6.12 https://github.com/torvalds/linux/commit/5e7a74b6a357 Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
144 lines
5.1 KiB
Diff
144 lines
5.1 KiB
Diff
From f75d1fbe7809bc5ed134204b920fd9e2fc5db1df Mon Sep 17 00:00:00 2001
|
|
From: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Date: Thu, 24 Oct 2024 22:42:33 +0200
|
|
Subject: [PATCH] r8169: add support for RTL8125D
|
|
|
|
This adds support for new chip version RTL8125D, which can be found on
|
|
boards like Gigabyte X870E AORUS ELITE WIFI7. Firmware rtl8125d-1.fw
|
|
for this chip version is available in linux-firmware already.
|
|
|
|
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
Link: https://patch.msgid.link/d0306912-e88e-4c25-8b5d-545ae8834c0c@gmail.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/realtek/r8169.h | 1 +
|
|
drivers/net/ethernet/realtek/r8169_main.c | 23 +++++++++++++------
|
|
.../net/ethernet/realtek/r8169_phy_config.c | 10 ++++++++
|
|
3 files changed, 27 insertions(+), 7 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/realtek/r8169.h
|
|
+++ b/drivers/net/ethernet/realtek/r8169.h
|
|
@@ -68,6 +68,7 @@ enum mac_version {
|
|
/* support for RTL_GIGA_MAC_VER_60 has been removed */
|
|
RTL_GIGA_MAC_VER_61,
|
|
RTL_GIGA_MAC_VER_63,
|
|
+ RTL_GIGA_MAC_VER_64,
|
|
RTL_GIGA_MAC_VER_65,
|
|
RTL_GIGA_MAC_VER_66,
|
|
RTL_GIGA_MAC_NONE
|
|
--- a/drivers/net/ethernet/realtek/r8169_main.c
|
|
+++ b/drivers/net/ethernet/realtek/r8169_main.c
|
|
@@ -55,6 +55,7 @@
|
|
#define FIRMWARE_8107E_2 "rtl_nic/rtl8107e-2.fw"
|
|
#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_8126A_2 "rtl_nic/rtl8126a-2.fw"
|
|
#define FIRMWARE_8126A_3 "rtl_nic/rtl8126a-3.fw"
|
|
|
|
@@ -138,6 +139,7 @@ static const struct {
|
|
[RTL_GIGA_MAC_VER_61] = {"RTL8125A", FIRMWARE_8125A_3},
|
|
/* 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] = {"RTL8126A", FIRMWARE_8126A_2},
|
|
[RTL_GIGA_MAC_VER_66] = {"RTL8126A", FIRMWARE_8126A_3},
|
|
};
|
|
@@ -706,6 +708,7 @@ MODULE_FIRMWARE(FIRMWARE_8168FP_3);
|
|
MODULE_FIRMWARE(FIRMWARE_8107E_2);
|
|
MODULE_FIRMWARE(FIRMWARE_8125A_3);
|
|
MODULE_FIRMWARE(FIRMWARE_8125B_2);
|
|
+MODULE_FIRMWARE(FIRMWARE_8125D_1);
|
|
MODULE_FIRMWARE(FIRMWARE_8126A_2);
|
|
MODULE_FIRMWARE(FIRMWARE_8126A_3);
|
|
|
|
@@ -2078,10 +2081,7 @@ static void rtl_set_eee_txidle_timer(str
|
|
tp->tx_lpi_timer = timer_val;
|
|
r8168_mac_ocp_write(tp, 0xe048, timer_val);
|
|
break;
|
|
- case RTL_GIGA_MAC_VER_61:
|
|
- case RTL_GIGA_MAC_VER_63:
|
|
- case RTL_GIGA_MAC_VER_65:
|
|
- case RTL_GIGA_MAC_VER_66:
|
|
+ case RTL_GIGA_MAC_VER_61 ... RTL_GIGA_MAC_VER_66:
|
|
tp->tx_lpi_timer = timer_val;
|
|
RTL_W16(tp, EEE_TXIDLE_TIMER_8125, timer_val);
|
|
break;
|
|
@@ -2292,6 +2292,9 @@ static enum mac_version rtl8169_get_mac_
|
|
{ 0x7cf, 0x64a, RTL_GIGA_MAC_VER_66 },
|
|
{ 0x7cf, 0x649, RTL_GIGA_MAC_VER_65 },
|
|
|
|
+ /* 8125D family. */
|
|
+ { 0x7cf, 0x688, RTL_GIGA_MAC_VER_64 },
|
|
+
|
|
/* 8125B family. */
|
|
{ 0x7cf, 0x641, RTL_GIGA_MAC_VER_63 },
|
|
|
|
@@ -2557,9 +2560,7 @@ static void rtl_init_rxcfg(struct rtl816
|
|
case RTL_GIGA_MAC_VER_61:
|
|
RTL_W32(tp, RxConfig, RX_FETCH_DFLT_8125 | RX_DMA_BURST);
|
|
break;
|
|
- case RTL_GIGA_MAC_VER_63:
|
|
- case RTL_GIGA_MAC_VER_65:
|
|
- case RTL_GIGA_MAC_VER_66:
|
|
+ case RTL_GIGA_MAC_VER_63 ... RTL_GIGA_MAC_VER_66:
|
|
RTL_W32(tp, RxConfig, RX_FETCH_DFLT_8125 | RX_DMA_BURST |
|
|
RX_PAUSE_SLOT_ON);
|
|
break;
|
|
@@ -3871,6 +3872,12 @@ static void rtl_hw_start_8125b(struct rt
|
|
rtl_hw_start_8125_common(tp);
|
|
}
|
|
|
|
+static void rtl_hw_start_8125d(struct rtl8169_private *tp)
|
|
+{
|
|
+ rtl_set_def_aspm_entry_latency(tp);
|
|
+ rtl_hw_start_8125_common(tp);
|
|
+}
|
|
+
|
|
static void rtl_hw_start_8126a(struct rtl8169_private *tp)
|
|
{
|
|
rtl_set_def_aspm_entry_latency(tp);
|
|
@@ -3919,6 +3926,7 @@ static void rtl_hw_config(struct rtl8169
|
|
[RTL_GIGA_MAC_VER_53] = rtl_hw_start_8117,
|
|
[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_8126a,
|
|
[RTL_GIGA_MAC_VER_66] = rtl_hw_start_8126a,
|
|
};
|
|
@@ -3936,6 +3944,7 @@ static void rtl_hw_start_8125(struct rtl
|
|
/* disable interrupt coalescing */
|
|
switch (tp->mac_version) {
|
|
case RTL_GIGA_MAC_VER_61:
|
|
+ case RTL_GIGA_MAC_VER_64:
|
|
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
|
|
@@ -1103,6 +1103,15 @@ static void rtl8125b_hw_phy_config(struc
|
|
rtl8125b_config_eee_phy(phydev);
|
|
}
|
|
|
|
+static void rtl8125d_hw_phy_config(struct rtl8169_private *tp,
|
|
+ struct phy_device *phydev)
|
|
+{
|
|
+ r8169_apply_firmware(tp);
|
|
+ rtl8125_legacy_force_mode(phydev);
|
|
+ rtl8168g_disable_aldps(phydev);
|
|
+ rtl8125b_config_eee_phy(phydev);
|
|
+}
|
|
+
|
|
static void rtl8126a_hw_phy_config(struct rtl8169_private *tp,
|
|
struct phy_device *phydev)
|
|
{
|
|
@@ -1159,6 +1168,7 @@ void r8169_hw_phy_config(struct rtl8169_
|
|
[RTL_GIGA_MAC_VER_53] = rtl8117_hw_phy_config,
|
|
[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] = rtl8126a_hw_phy_config,
|
|
[RTL_GIGA_MAC_VER_66] = rtl8126a_hw_phy_config,
|
|
};
|