mirror of
https://github.com/immortalwrt/immortalwrt.git
synced 2025-10-30 07:49:55 +08:00
8103b79776
https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.114 Removed upstreamed: /target/linux/generic/backport-6.6/540-v6.12-ksmbd-browse-interfaces-list-on-FSCTL_QUERY_INTERFACE_INFO.patch merged upstream with commit: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.114&id=499089376206f3f7f09d6852b3ec92f2674d24bb All other patches automatically rebased. Build system: bcm4908 Build system: bcm53xx Signed-off-by: Zxl hhyccc <zxlhhy@gmail.com> Link: https://github.com/openwrt/openwrt/pull/20434 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
115 lines
4.2 KiB
Diff
115 lines
4.2 KiB
Diff
From bb18265c3aba92b91a1355609769f3e967b65dee Mon Sep 17 00:00:00 2001
|
|
From: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Date: Mon, 2 Dec 2024 21:20:02 +0100
|
|
Subject: [PATCH] r8169: remove support for chip version 11
|
|
|
|
This is a follow-up to 982300c115d2 ("r8169: remove detection of chip
|
|
version 11 (early RTL8168b)"). Nobody complained yet, so remove
|
|
support for this chip version.
|
|
|
|
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
Link: https://patch.msgid.link/b689ab6d-20b5-4b64-bd7e-531a0a972ba3@gmail.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/realtek/r8169.h | 2 +-
|
|
drivers/net/ethernet/realtek/r8169_main.c | 14 +-------------
|
|
drivers/net/ethernet/realtek/r8169_phy_config.c | 10 ----------
|
|
3 files changed, 2 insertions(+), 24 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/realtek/r8169.h
|
|
+++ b/drivers/net/ethernet/realtek/r8169.h
|
|
@@ -23,7 +23,7 @@ enum mac_version {
|
|
RTL_GIGA_MAC_VER_08,
|
|
RTL_GIGA_MAC_VER_09,
|
|
RTL_GIGA_MAC_VER_10,
|
|
- RTL_GIGA_MAC_VER_11,
|
|
+ /* support for RTL_GIGA_MAC_VER_11 has been removed */
|
|
/* RTL_GIGA_MAC_VER_12 was handled the same as VER_17 */
|
|
/* RTL_GIGA_MAC_VER_13 was merged with VER_10 */
|
|
RTL_GIGA_MAC_VER_14,
|
|
--- a/drivers/net/ethernet/realtek/r8169_main.c
|
|
+++ b/drivers/net/ethernet/realtek/r8169_main.c
|
|
@@ -103,7 +103,6 @@ static const struct {
|
|
[RTL_GIGA_MAC_VER_08] = {"RTL8102e" },
|
|
[RTL_GIGA_MAC_VER_09] = {"RTL8102e/RTL8103e" },
|
|
[RTL_GIGA_MAC_VER_10] = {"RTL8101e/RTL8100e" },
|
|
- [RTL_GIGA_MAC_VER_11] = {"RTL8168b/8111b" },
|
|
[RTL_GIGA_MAC_VER_14] = {"RTL8401" },
|
|
[RTL_GIGA_MAC_VER_17] = {"RTL8168b/8111b" },
|
|
[RTL_GIGA_MAC_VER_18] = {"RTL8168cp/8111cp" },
|
|
@@ -2336,7 +2335,7 @@ static enum mac_version rtl8169_get_mac_
|
|
|
|
/* 8168B family. */
|
|
{ 0x7c8, 0x380, RTL_GIGA_MAC_VER_17 },
|
|
- /* This one is very old and rare, let's see if anybody complains.
|
|
+ /* This one is very old and rare, support has been removed.
|
|
* { 0x7c8, 0x300, RTL_GIGA_MAC_VER_11 },
|
|
*/
|
|
|
|
@@ -3806,7 +3805,6 @@ static void rtl_hw_config(struct rtl8169
|
|
[RTL_GIGA_MAC_VER_08] = rtl_hw_start_8102e_3,
|
|
[RTL_GIGA_MAC_VER_09] = rtl_hw_start_8102e_2,
|
|
[RTL_GIGA_MAC_VER_10] = NULL,
|
|
- [RTL_GIGA_MAC_VER_11] = rtl_hw_start_8168b,
|
|
[RTL_GIGA_MAC_VER_14] = rtl_hw_start_8401,
|
|
[RTL_GIGA_MAC_VER_17] = rtl_hw_start_8168b,
|
|
[RTL_GIGA_MAC_VER_18] = rtl_hw_start_8168cp_1,
|
|
@@ -4682,12 +4680,6 @@ static irqreturn_t rtl8169_interrupt(int
|
|
if (status & LinkChg)
|
|
phy_mac_interrupt(tp->phydev);
|
|
|
|
- if (unlikely(status & RxFIFOOver &&
|
|
- tp->mac_version == RTL_GIGA_MAC_VER_11)) {
|
|
- netif_stop_queue(tp->dev);
|
|
- rtl_schedule_task(tp, RTL_FLAG_TASK_RESET_PENDING);
|
|
- }
|
|
-
|
|
rtl_irq_disable(tp);
|
|
napi_schedule(&tp->napi);
|
|
out:
|
|
@@ -5108,9 +5100,6 @@ static void rtl_set_irq_mask(struct rtl8
|
|
|
|
if (tp->mac_version <= RTL_GIGA_MAC_VER_06)
|
|
tp->irq_mask |= SYSErr | RxFIFOOver;
|
|
- else if (tp->mac_version == RTL_GIGA_MAC_VER_11)
|
|
- /* special workaround needed */
|
|
- tp->irq_mask |= RxFIFOOver;
|
|
}
|
|
|
|
static int rtl_alloc_irq(struct rtl8169_private *tp)
|
|
@@ -5306,7 +5295,6 @@ static int rtl_jumbo_max(struct rtl8169_
|
|
case RTL_GIGA_MAC_VER_02 ... RTL_GIGA_MAC_VER_06:
|
|
return JUMBO_7K;
|
|
/* RTL8168b */
|
|
- case RTL_GIGA_MAC_VER_11:
|
|
case RTL_GIGA_MAC_VER_17:
|
|
return JUMBO_4K;
|
|
/* RTL8168c */
|
|
--- a/drivers/net/ethernet/realtek/r8169_phy_config.c
|
|
+++ b/drivers/net/ethernet/realtek/r8169_phy_config.c
|
|
@@ -276,15 +276,6 @@ static void rtl8169sce_hw_phy_config(str
|
|
rtl_writephy_batch(phydev, phy_reg_init);
|
|
}
|
|
|
|
-static void rtl8168bb_hw_phy_config(struct rtl8169_private *tp,
|
|
- struct phy_device *phydev)
|
|
-{
|
|
- phy_write(phydev, 0x1f, 0x0001);
|
|
- phy_set_bits(phydev, 0x16, BIT(0));
|
|
- phy_write(phydev, 0x10, 0xf41b);
|
|
- phy_write(phydev, 0x1f, 0x0000);
|
|
-}
|
|
-
|
|
static void rtl8168bef_hw_phy_config(struct rtl8169_private *tp,
|
|
struct phy_device *phydev)
|
|
{
|
|
@@ -1136,7 +1127,6 @@ void r8169_hw_phy_config(struct rtl8169_
|
|
[RTL_GIGA_MAC_VER_08] = rtl8102e_hw_phy_config,
|
|
[RTL_GIGA_MAC_VER_09] = rtl8102e_hw_phy_config,
|
|
[RTL_GIGA_MAC_VER_10] = NULL,
|
|
- [RTL_GIGA_MAC_VER_11] = rtl8168bb_hw_phy_config,
|
|
[RTL_GIGA_MAC_VER_14] = rtl8401_hw_phy_config,
|
|
[RTL_GIGA_MAC_VER_17] = rtl8168bef_hw_phy_config,
|
|
[RTL_GIGA_MAC_VER_18] = rtl8168cp_1_hw_phy_config,
|