mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-06-15 06:05:31 +08:00
107 lines
4.1 KiB
Diff
107 lines
4.1 KiB
Diff
From 4dec0702b8627c364a0e1f2c5b249e06709a1c24 Mon Sep 17 00:00:00 2001
|
|
From: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Date: Fri, 18 Apr 2025 11:23:45 +0200
|
|
Subject: [PATCH] r8169: merge chip versions 70 and 71 (RTL8126A)
|
|
|
|
Handling of both chip versions is the same, only difference is
|
|
the firmware. So we can merge handling of both chip versions.
|
|
|
|
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
Link: https://patch.msgid.link/97d7ae79-d021-4b6b-b424-89e5e305b029@gmail.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/realtek/r8169.h | 1 -
|
|
drivers/net/ethernet/realtek/r8169_main.c | 15 ++++-----------
|
|
drivers/net/ethernet/realtek/r8169_phy_config.c | 1 -
|
|
3 files changed, 4 insertions(+), 13 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/realtek/r8169.h
|
|
+++ b/drivers/net/ethernet/realtek/r8169.h
|
|
@@ -72,7 +72,6 @@ enum mac_version {
|
|
RTL_GIGA_MAC_VER_65,
|
|
RTL_GIGA_MAC_VER_66,
|
|
RTL_GIGA_MAC_VER_70,
|
|
- RTL_GIGA_MAC_VER_71,
|
|
RTL_GIGA_MAC_NONE,
|
|
RTL_GIGA_MAC_VER_LAST = RTL_GIGA_MAC_NONE - 1
|
|
};
|
|
--- a/drivers/net/ethernet/realtek/r8169_main.c
|
|
+++ b/drivers/net/ethernet/realtek/r8169_main.c
|
|
@@ -99,7 +99,7 @@ static const struct rtl_chip_info {
|
|
const char *fw_name;
|
|
} rtl_chip_infos[] = {
|
|
/* 8126A family. */
|
|
- { 0x7cf, 0x64a, RTL_GIGA_MAC_VER_71, "RTL8126A", FIRMWARE_8126A_3 },
|
|
+ { 0x7cf, 0x64a, RTL_GIGA_MAC_VER_70, "RTL8126A", FIRMWARE_8126A_3 },
|
|
{ 0x7cf, 0x649, RTL_GIGA_MAC_VER_70, "RTL8126A", FIRMWARE_8126A_2 },
|
|
|
|
/* 8125BP family. */
|
|
@@ -2939,7 +2939,6 @@ static void rtl_hw_aspm_clkreq_enable(st
|
|
rtl_mod_config5(tp, 0, ASPM_en);
|
|
switch (tp->mac_version) {
|
|
case RTL_GIGA_MAC_VER_70:
|
|
- case RTL_GIGA_MAC_VER_71:
|
|
val8 = RTL_R8(tp, INT_CFG0_8125) | INT_CFG0_CLKREQEN;
|
|
RTL_W8(tp, INT_CFG0_8125, val8);
|
|
break;
|
|
@@ -2971,7 +2970,6 @@ static void rtl_hw_aspm_clkreq_enable(st
|
|
|
|
switch (tp->mac_version) {
|
|
case RTL_GIGA_MAC_VER_70:
|
|
- case RTL_GIGA_MAC_VER_71:
|
|
val8 = RTL_R8(tp, INT_CFG0_8125) & ~INT_CFG0_CLKREQEN;
|
|
RTL_W8(tp, INT_CFG0_8125, val8);
|
|
break;
|
|
@@ -3691,12 +3689,10 @@ static void rtl_hw_start_8125_common(str
|
|
/* disable new tx descriptor format */
|
|
r8168_mac_ocp_modify(tp, 0xeb58, 0x0001, 0x0000);
|
|
|
|
- if (tp->mac_version == RTL_GIGA_MAC_VER_70 ||
|
|
- tp->mac_version == RTL_GIGA_MAC_VER_71)
|
|
+ if (tp->mac_version == RTL_GIGA_MAC_VER_70)
|
|
RTL_W8(tp, 0xD8, RTL_R8(tp, 0xD8) & ~0x02);
|
|
|
|
- if (tp->mac_version == RTL_GIGA_MAC_VER_70 ||
|
|
- tp->mac_version == RTL_GIGA_MAC_VER_71)
|
|
+ if (tp->mac_version == RTL_GIGA_MAC_VER_70)
|
|
r8168_mac_ocp_modify(tp, 0xe614, 0x0700, 0x0400);
|
|
else if (tp->mac_version == RTL_GIGA_MAC_VER_63)
|
|
r8168_mac_ocp_modify(tp, 0xe614, 0x0700, 0x0200);
|
|
@@ -3714,8 +3710,7 @@ static void rtl_hw_start_8125_common(str
|
|
r8168_mac_ocp_modify(tp, 0xe056, 0x00f0, 0x0030);
|
|
r8168_mac_ocp_modify(tp, 0xe040, 0x1000, 0x0000);
|
|
r8168_mac_ocp_modify(tp, 0xea1c, 0x0003, 0x0001);
|
|
- if (tp->mac_version == RTL_GIGA_MAC_VER_70 ||
|
|
- tp->mac_version == RTL_GIGA_MAC_VER_71)
|
|
+ if (tp->mac_version == RTL_GIGA_MAC_VER_70)
|
|
r8168_mac_ocp_modify(tp, 0xea1c, 0x0300, 0x0000);
|
|
else
|
|
r8168_mac_ocp_modify(tp, 0xea1c, 0x0004, 0x0000);
|
|
@@ -3838,7 +3833,6 @@ static void rtl_hw_config(struct rtl8169
|
|
[RTL_GIGA_MAC_VER_65] = rtl_hw_start_8125d,
|
|
[RTL_GIGA_MAC_VER_66] = rtl_hw_start_8125d,
|
|
[RTL_GIGA_MAC_VER_70] = rtl_hw_start_8126a,
|
|
- [RTL_GIGA_MAC_VER_71] = rtl_hw_start_8126a,
|
|
};
|
|
|
|
if (hw_configs[tp->mac_version])
|
|
@@ -3862,7 +3856,6 @@ static void rtl_hw_start_8125(struct rtl
|
|
break;
|
|
case RTL_GIGA_MAC_VER_63:
|
|
case RTL_GIGA_MAC_VER_70:
|
|
- case RTL_GIGA_MAC_VER_71:
|
|
for (i = 0xa00; i < 0xa80; i += 4)
|
|
RTL_W32(tp, i, 0);
|
|
RTL_W16(tp, INT_CFG1_8125, 0x0000);
|
|
--- a/drivers/net/ethernet/realtek/r8169_phy_config.c
|
|
+++ b/drivers/net/ethernet/realtek/r8169_phy_config.c
|
|
@@ -1183,7 +1183,6 @@ void r8169_hw_phy_config(struct rtl8169_
|
|
[RTL_GIGA_MAC_VER_65] = rtl8125d_hw_phy_config,
|
|
[RTL_GIGA_MAC_VER_66] = rtl8125bp_hw_phy_config,
|
|
[RTL_GIGA_MAC_VER_70] = rtl8126a_hw_phy_config,
|
|
- [RTL_GIGA_MAC_VER_71] = rtl8126a_hw_phy_config,
|
|
};
|
|
|
|
if (phy_configs[ver])
|