30cdc48360
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.31 Remove upstreamed patches: backport-6.12/780-27-v6.15-r8169-don-t-scan-PHY-addresses-0.patch [1] backport-6.12/780-33-v6.15-r8169-disable-RTL8126-ZRX-DC-timeout.patch [2] bcm27xx/patches-6.12/950-0315-media-i2c-imx219-Correct-the-minimum-vblanking-value.patch [3] bcm27xx/patches-6.12/950-0857-drm-v3d-Add-clock-handling.patch [4] bcm27xx/patches-6.12/950-0874-PCI-brcmstb-Expand-inbound-window-size-up-to-64GB.patch [5] bcm27xx/patches-6.12/950-0877-PCI-brcmstb-Adding-a-softdep-to-MIP-MSI-X-driver.patch [6] bcm27xx/patches-6.12/950-0960-media-imx335-Set-vblank-immediately.patch [7] Manually rebased patches: d1/patches-6.12/0009-ASoC-sunxi-sun4i-codec-add-basic-support-for-D1-audi.patch [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.31&id=ba59747562c49974cbace989d76b94a8331da442 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.31&id=2780aa8394415df0a69e3b908d6dd8c79e1d1bcc [3] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.31&id=9a981079097bee6a0583877798de0b240717bdde [4] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.31&id=bbd6dc1fb6c56267ad1d58810d92287fcd5b0058 [5] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.31&id=3ffaa2e999380477774e76680ff4cef247451168 [6] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.31&id=12153e3948c596737853c3ec4ff7e4e3f4a9f9a6 [7] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.31&id=8d7e13c31c52690655883dff604238b0760a3644 Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Link: https://github.com/openwrt/openwrt/pull/18953 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
90 lines
3.5 KiB
Diff
90 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},
|
|
};
|
|
@@ -705,6 +707,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);
|
|
|
|
@@ -2258,6 +2261,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. */
|
|
@@ -3863,6 +3867,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,
|
|
};
|
|
@@ -3881,6 +3886,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,
|
|
};
|