Skip to contentSkip to conversation

r8169: improve jumbo configuration

PATCH Applied Heiner Kallweit 2 participants 4 messages Jan 9, 2021 – Jan 12, 2021

Subsystems (3)
lore
Share & tools
lore

Heiner Kallweit

author maintainer
#0 lore raw

cover r8169: improve jumbo configuration

Small improvements to jumbo configuration.

Heiner Kallweit (2):
r8169: align RTL8168e jumbo pcie read request size with vendor driver
r8169: tweak max read request size for newer chips also in jumbo mtu
mode

 drivers/net/ethernet/realtek/r8169_main.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
Signature · 1 line
2.30.0
author maintainer
#1 lore raw

PATCH 1/2 r8169: align RTL8168e jumbo pcie read request size with vendor driver

Align behavior with r8168 vendor driver and don't reduce max read request size for RTL8168e in jumbo mode.

---
 drivers/net/ethernet/realtek/r8169_main.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/net/ethernet/realtek/r8169_main.c +2 -4
index 74c8248ba..8336f1434 100644
@@ -2342,12 +2342,10 @@ static void rtl_jumbo_config(struct rtl8169_private *tp)
 			r8168dp_hw_jumbo_disable(tp);
 		break;
 	case RTL_GIGA_MAC_VER_31 ... RTL_GIGA_MAC_VER_33:
-		if (jumbo) {
-			pcie_set_readrq(tp->pci_dev, 512);
+		if (jumbo)
 			r8168e_hw_jumbo_enable(tp);
-		} else {
+		else
 			r8168e_hw_jumbo_disable(tp);
-		}
 		break;
 	default:
 		break;
Signature · 1 line
2.30.0
author maintainer
#2 lore raw

PATCH 2/2 r8169: tweak max read request size for newer chips also in jumbo mtu mode

In reply to Heiner Kallweit

So far we don't increase the max read request size if we switch to jumbo mode before bringing up the interface for the first time. Let's change this.

---
 drivers/net/ethernet/realtek/r8169_main.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/net/ethernet/realtek/r8169_main.c +5 -4
index 8336f1434..6e4c60185 100644
@@ -2315,13 +2315,14 @@ static void r8168b_1_hw_jumbo_disable(struct rtl8169_private *tp)
 static void rtl_jumbo_config(struct rtl8169_private *tp)
 {
 	bool jumbo = tp->dev->mtu > ETH_DATA_LEN;
+	int readrq = 4096;
 
 	rtl_unlock_config_regs(tp);
 	switch (tp->mac_version) {
 	case RTL_GIGA_MAC_VER_12:
 	case RTL_GIGA_MAC_VER_17:
 		if (jumbo) {
-			pcie_set_readrq(tp->pci_dev, 512);
+			readrq = 512;
 			r8168b_1_hw_jumbo_enable(tp);
 		} else {
 			r8168b_1_hw_jumbo_disable(tp);
@@ -2329,7 +2330,7 @@ static void rtl_jumbo_config(struct rtl8169_private *tp)
 		break;
 	case RTL_GIGA_MAC_VER_18 ... RTL_GIGA_MAC_VER_26:
 		if (jumbo) {
-			pcie_set_readrq(tp->pci_dev, 512);
+			readrq = 512;
 			r8168c_hw_jumbo_enable(tp);
 		} else {
 			r8168c_hw_jumbo_disable(tp);
@@ -2352,8 +2353,8 @@ static void rtl_jumbo_config(struct rtl8169_private *tp)
 	}
 	rtl_lock_config_regs(tp);
 
-	if (!jumbo && pci_is_pcie(tp->pci_dev) && tp->supports_gmii)
-		pcie_set_readrq(tp->pci_dev, 4096);
+	if (pci_is_pcie(tp->pci_dev) && tp->supports_gmii)
+		pcie_set_readrq(tp->pci_dev, readrq);
 }
 
 DECLARE_RTL_COND(rtl_chipcmd_cond)
Signature · 1 line
2.30.0
#3 lore raw
In reply to Heiner Kallweit
This series was applied to netdev/net-next.git (refs/heads/master):

Hello:

This series was applied to netdev/net-next.git (refs/heads/master):

Quoted 8 lines · On Sat, 9 Jan 2021 22:59:08 +0100 you wrote:

Small improvements to jumbo configuration.

Heiner Kallweit (2):
r8169: align RTL8168e jumbo pcie read request size with vendor driver
r8169: tweak max read request size for newer chips also in jumbo mtu
mode

[...]

Here is the summary with links:
- [net-next,1/2] r8169: align RTL8168e jumbo pcie read request size with vendor driver

    https://git.kernel.org/netdev/net-next/c/2007317e15cd
  - [net-next,2/2] r8169: tweak max read request size for newer chips also in jumbo mtu mode
    https://git.kernel.org/netdev/net-next/c/5e00e16cb989

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html