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>
117 lines
3.5 KiB
Diff
117 lines
3.5 KiB
Diff
From 7a3bcd39ae1f0e3ab896d9df62339ab4297a0bfd Mon Sep 17 00:00:00 2001
|
|
From: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Date: Sat, 9 Nov 2024 23:12:12 +0100
|
|
Subject: [PATCH] r8169: use helper r8169_mod_reg8_cond to simplify
|
|
rtl_jumbo_config
|
|
|
|
Use recently added helper r8169_mod_reg8_cond() to simplify jumbo
|
|
mode configuration.
|
|
|
|
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
|
|
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
Link: https://patch.msgid.link/3df1d484-a02e-46e7-8f75-db5b428e422e@gmail.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/realtek/r8169_main.c | 77 ++++-------------------
|
|
1 file changed, 11 insertions(+), 66 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/realtek/r8169_main.c
|
|
+++ b/drivers/net/ethernet/realtek/r8169_main.c
|
|
@@ -2542,86 +2542,31 @@ static void rtl8169_init_ring_indexes(st
|
|
tp->dirty_tx = tp->cur_tx = tp->cur_rx = 0;
|
|
}
|
|
|
|
-static void r8168c_hw_jumbo_enable(struct rtl8169_private *tp)
|
|
-{
|
|
- RTL_W8(tp, Config3, RTL_R8(tp, Config3) | Jumbo_En0);
|
|
- RTL_W8(tp, Config4, RTL_R8(tp, Config4) | Jumbo_En1);
|
|
-}
|
|
-
|
|
-static void r8168c_hw_jumbo_disable(struct rtl8169_private *tp)
|
|
-{
|
|
- RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Jumbo_En0);
|
|
- RTL_W8(tp, Config4, RTL_R8(tp, Config4) & ~Jumbo_En1);
|
|
-}
|
|
-
|
|
-static void r8168dp_hw_jumbo_enable(struct rtl8169_private *tp)
|
|
-{
|
|
- RTL_W8(tp, Config3, RTL_R8(tp, Config3) | Jumbo_En0);
|
|
-}
|
|
-
|
|
-static void r8168dp_hw_jumbo_disable(struct rtl8169_private *tp)
|
|
-{
|
|
- RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Jumbo_En0);
|
|
-}
|
|
-
|
|
-static void r8168e_hw_jumbo_enable(struct rtl8169_private *tp)
|
|
-{
|
|
- RTL_W8(tp, MaxTxPacketSize, 0x24);
|
|
- RTL_W8(tp, Config3, RTL_R8(tp, Config3) | Jumbo_En0);
|
|
- RTL_W8(tp, Config4, RTL_R8(tp, Config4) | 0x01);
|
|
-}
|
|
-
|
|
-static void r8168e_hw_jumbo_disable(struct rtl8169_private *tp)
|
|
-{
|
|
- RTL_W8(tp, MaxTxPacketSize, 0x3f);
|
|
- RTL_W8(tp, Config3, RTL_R8(tp, Config3) & ~Jumbo_En0);
|
|
- RTL_W8(tp, Config4, RTL_R8(tp, Config4) & ~0x01);
|
|
-}
|
|
-
|
|
-static void r8168b_1_hw_jumbo_enable(struct rtl8169_private *tp)
|
|
-{
|
|
- RTL_W8(tp, Config4, RTL_R8(tp, Config4) | (1 << 0));
|
|
-}
|
|
-
|
|
-static void r8168b_1_hw_jumbo_disable(struct rtl8169_private *tp)
|
|
-{
|
|
- RTL_W8(tp, Config4, RTL_R8(tp, Config4) & ~(1 << 0));
|
|
-}
|
|
-
|
|
static void rtl_jumbo_config(struct rtl8169_private *tp)
|
|
{
|
|
bool jumbo = tp->dev->mtu > ETH_DATA_LEN;
|
|
int readrq = 4096;
|
|
|
|
+ if (jumbo && tp->mac_version >= RTL_GIGA_MAC_VER_17 &&
|
|
+ tp->mac_version <= RTL_GIGA_MAC_VER_26)
|
|
+ readrq = 512;
|
|
+
|
|
rtl_unlock_config_regs(tp);
|
|
switch (tp->mac_version) {
|
|
case RTL_GIGA_MAC_VER_17:
|
|
- if (jumbo) {
|
|
- readrq = 512;
|
|
- r8168b_1_hw_jumbo_enable(tp);
|
|
- } else {
|
|
- r8168b_1_hw_jumbo_disable(tp);
|
|
- }
|
|
+ r8169_mod_reg8_cond(tp, Config4, BIT(0), jumbo);
|
|
break;
|
|
case RTL_GIGA_MAC_VER_18 ... RTL_GIGA_MAC_VER_26:
|
|
- if (jumbo) {
|
|
- readrq = 512;
|
|
- r8168c_hw_jumbo_enable(tp);
|
|
- } else {
|
|
- r8168c_hw_jumbo_disable(tp);
|
|
- }
|
|
+ r8169_mod_reg8_cond(tp, Config3, Jumbo_En0, jumbo);
|
|
+ r8169_mod_reg8_cond(tp, Config4, Jumbo_En1, jumbo);
|
|
break;
|
|
case RTL_GIGA_MAC_VER_28:
|
|
- if (jumbo)
|
|
- r8168dp_hw_jumbo_enable(tp);
|
|
- else
|
|
- r8168dp_hw_jumbo_disable(tp);
|
|
+ r8169_mod_reg8_cond(tp, Config3, Jumbo_En0, jumbo);
|
|
break;
|
|
case RTL_GIGA_MAC_VER_31 ... RTL_GIGA_MAC_VER_33:
|
|
- if (jumbo)
|
|
- r8168e_hw_jumbo_enable(tp);
|
|
- else
|
|
- r8168e_hw_jumbo_disable(tp);
|
|
+ RTL_W8(tp, MaxTxPacketSize, jumbo ? 0x24 : 0x3f);
|
|
+ r8169_mod_reg8_cond(tp, Config3, Jumbo_En0, jumbo);
|
|
+ r8169_mod_reg8_cond(tp, Config4, BIT(0), jumbo);
|
|
break;
|
|
default:
|
|
break;
|