From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Heiner Kallweit <hkallweit1@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Sasha Levin <sashal@kernel.org>
Subject: [PATCH 5.4 69/73] r8169: improve rtl_jumbo_config
Date: Mon, 19 Apr 2021 15:07:00 +0200 [thread overview]
Message-ID: <20210419130526.068041797@linuxfoundation.org> (raw)
In-Reply-To: <20210419130523.802169214@linuxfoundation.org>
From: Heiner Kallweit <hkallweit1@gmail.com>
[ Upstream commit 9db0ac57bd3286fedcf43a86b29b847cea281cc7 ]
Merge enabling and disabling jumbo packets to one function to make
the code a little simpler.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/net/ethernet/realtek/r8169_main.c | 69 +++++++++--------------
1 file changed, 27 insertions(+), 42 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 19ebde91555d..1352dd0b69e9 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -4093,66 +4093,52 @@ static void r8168b_1_hw_jumbo_disable(struct rtl8169_private *tp)
RTL_W8(tp, Config4, RTL_R8(tp, Config4) & ~(1 << 0));
}
-static void rtl_hw_jumbo_enable(struct rtl8169_private *tp)
+static void rtl_jumbo_config(struct rtl8169_private *tp)
{
- rtl_unlock_config_regs(tp);
- switch (tp->mac_version) {
- case RTL_GIGA_MAC_VER_12:
- case RTL_GIGA_MAC_VER_17:
- pcie_set_readrq(tp->pci_dev, 512);
- r8168b_1_hw_jumbo_enable(tp);
- break;
- case RTL_GIGA_MAC_VER_18 ... RTL_GIGA_MAC_VER_26:
- pcie_set_readrq(tp->pci_dev, 512);
- r8168c_hw_jumbo_enable(tp);
- break;
- case RTL_GIGA_MAC_VER_27 ... RTL_GIGA_MAC_VER_28:
- r8168dp_hw_jumbo_enable(tp);
- break;
- case RTL_GIGA_MAC_VER_31 ... RTL_GIGA_MAC_VER_33:
- pcie_set_readrq(tp->pci_dev, 512);
- r8168e_hw_jumbo_enable(tp);
- break;
- default:
- break;
- }
- rtl_lock_config_regs(tp);
-}
+ bool jumbo = tp->dev->mtu > ETH_DATA_LEN;
-static void rtl_hw_jumbo_disable(struct rtl8169_private *tp)
-{
rtl_unlock_config_regs(tp);
switch (tp->mac_version) {
case RTL_GIGA_MAC_VER_12:
case RTL_GIGA_MAC_VER_17:
- r8168b_1_hw_jumbo_disable(tp);
+ if (jumbo) {
+ pcie_set_readrq(tp->pci_dev, 512);
+ r8168b_1_hw_jumbo_enable(tp);
+ } else {
+ r8168b_1_hw_jumbo_disable(tp);
+ }
break;
case RTL_GIGA_MAC_VER_18 ... RTL_GIGA_MAC_VER_26:
- r8168c_hw_jumbo_disable(tp);
+ if (jumbo) {
+ pcie_set_readrq(tp->pci_dev, 512);
+ r8168c_hw_jumbo_enable(tp);
+ } else {
+ r8168c_hw_jumbo_disable(tp);
+ }
break;
case RTL_GIGA_MAC_VER_27 ... RTL_GIGA_MAC_VER_28:
- r8168dp_hw_jumbo_disable(tp);
+ if (jumbo)
+ r8168dp_hw_jumbo_enable(tp);
+ else
+ r8168dp_hw_jumbo_disable(tp);
break;
case RTL_GIGA_MAC_VER_31 ... RTL_GIGA_MAC_VER_33:
- r8168e_hw_jumbo_disable(tp);
+ if (jumbo) {
+ pcie_set_readrq(tp->pci_dev, 512);
+ r8168e_hw_jumbo_enable(tp);
+ } else {
+ r8168e_hw_jumbo_disable(tp);
+ }
break;
default:
break;
}
rtl_lock_config_regs(tp);
- if (pci_is_pcie(tp->pci_dev) && tp->supports_gmii)
+ if (!jumbo && pci_is_pcie(tp->pci_dev) && tp->supports_gmii)
pcie_set_readrq(tp->pci_dev, 4096);
}
-static void rtl_jumbo_config(struct rtl8169_private *tp, int mtu)
-{
- if (mtu > ETH_DATA_LEN)
- rtl_hw_jumbo_enable(tp);
- else
- rtl_hw_jumbo_disable(tp);
-}
-
DECLARE_RTL_COND(rtl_chipcmd_cond)
{
return RTL_R8(tp, ChipCmd) & CmdReset;
@@ -5458,7 +5444,7 @@ static void rtl_hw_start(struct rtl8169_private *tp)
rtl_set_rx_tx_desc_registers(tp);
rtl_lock_config_regs(tp);
- rtl_jumbo_config(tp, tp->dev->mtu);
+ rtl_jumbo_config(tp);
/* Initially a 10 us delay. Turned it into a PCI commit. - FR */
RTL_R16(tp, CPlusCmd);
@@ -5473,10 +5459,9 @@ static int rtl8169_change_mtu(struct net_device *dev, int new_mtu)
{
struct rtl8169_private *tp = netdev_priv(dev);
- rtl_jumbo_config(tp, new_mtu);
-
dev->mtu = new_mtu;
netdev_update_features(dev);
+ rtl_jumbo_config(tp);
/* Reportedly at least Asus X453MA truncates packets otherwise */
if (tp->mac_version == RTL_GIGA_MAC_VER_37)
--
2.30.2
next prev parent reply other threads:[~2021-04-19 13:27 UTC|newest]
Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-19 13:05 [PATCH 5.4 00/73] 5.4.114-rc1 review Greg Kroah-Hartman
2021-04-19 13:05 ` [PATCH 5.4 01/73] Revert "scsi: qla2xxx: Retry PLOGI on FC-NVMe PRLI failure" Greg Kroah-Hartman
2021-04-19 13:05 ` [PATCH 5.4 02/73] Revert "scsi: qla2xxx: Fix stuck login session using prli_pend_timer" Greg Kroah-Hartman
2021-04-19 13:05 ` [PATCH 5.4 03/73] scsi: qla2xxx: Dual FCP-NVMe target port support Greg Kroah-Hartman
2021-04-19 13:05 ` [PATCH 5.4 04/73] scsi: qla2xxx: Fix device connect issues in P2P configuration Greg Kroah-Hartman
2021-04-19 13:05 ` [PATCH 5.4 05/73] scsi: qla2xxx: Retry PLOGI on FC-NVMe PRLI failure Greg Kroah-Hartman
2021-04-19 13:05 ` [PATCH 5.4 06/73] scsi: qla2xxx: Add a shadow variable to hold disc_state history of fcport Greg Kroah-Hartman
2021-04-19 13:05 ` [PATCH 5.4 07/73] scsi: qla2xxx: Fix stuck login session using prli_pend_timer Greg Kroah-Hartman
2021-04-19 13:05 ` [PATCH 5.4 08/73] scsi: qla2xxx: Fix fabric scan hang Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 09/73] net/sctp: fix race condition in sctp_destroy_sock Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 10/73] Input: nspire-keypad - enable interrupts only when opened Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 11/73] gpio: sysfs: Obey valid_mask Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 12/73] dmaengine: dw: Make it dependent to HAS_IOMEM Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 13/73] ARM: dts: Drop duplicate sha2md5_fck to fix clk_disable race Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 14/73] ARM: dts: Fix moving mmc devices with aliases for omap4 & 5 Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 15/73] lockdep: Add a missing initialization hint to the "INFO: Trying to register non-static key" message Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 16/73] arc: kernel: Return -EFAULT if copy_to_user() fails Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 17/73] ASoC: max98373: Added 30ms turn on/off time delay Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 18/73] neighbour: Disregard DEAD dst in neigh_update Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 19/73] ARM: keystone: fix integer overflow warning Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 20/73] ARM: omap1: fix building with clang IAS Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 21/73] drm/msm: Fix a5xx/a6xx timestamps Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 22/73] ASoC: fsl_esai: Fix TDM slot setup for I2S mode Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 23/73] scsi: scsi_transport_srp: Dont block target in SRP_PORT_LOST state Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 24/73] net: ieee802154: stop dump llsec keys for monitors Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 25/73] net: ieee802154: forbid monitor for add llsec key Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 26/73] net: ieee802154: forbid monitor for del " Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 27/73] net: ieee802154: stop dump llsec devs for monitors Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 28/73] net: ieee802154: forbid monitor for add llsec dev Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 29/73] net: ieee802154: forbid monitor for del " Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 30/73] net: ieee802154: stop dump llsec devkeys for monitors Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 31/73] net: ieee802154: forbid monitor for add llsec devkey Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 32/73] net: ieee802154: forbid monitor for del " Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 33/73] net: ieee802154: stop dump llsec seclevels for monitors Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 34/73] net: ieee802154: forbid monitor for add llsec seclevel Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 35/73] pcnet32: Use pci_resource_len to validate PCI resource Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 36/73] net/rds: Avoid potential use after free in rds_send_remove_from_sock Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 37/73] net: tipc: Fix spelling errors in net/tipc module Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 38/73] mac80211: clear sta->fast_rx when STA removed from 4-addr VLAN Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 39/73] virt_wifi: Return micros for BSS TSF values Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 40/73] Input: s6sy761 - fix coordinate read bit shift Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 41/73] Input: i8042 - fix Pegatron C15B ID entry Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 42/73] HID: wacom: set EV_KEY and EV_ABS only for non-HID_GENERIC type of devices Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 43/73] dm verity fec: fix misaligned RS roots IO Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 44/73] readdir: make sure to verify directory entry for legacy interfaces too Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 45/73] arm64: fix inline asm in load_unaligned_zeropad() Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 46/73] arm64: alternatives: Move length validation in alternative_{insn, endif} Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 47/73] vfio/pci: Add missing range check in vfio_pci_mmap Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 48/73] riscv: Fix spelling mistake "SPARSEMEM" to "SPARSMEM" Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 49/73] scsi: libsas: Reset num_scatter if libata marks qc as NODATA Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 50/73] netfilter: conntrack: do not print icmpv6 as unknown via /proc Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 51/73] libnvdimm/region: Fix nvdimm_has_flush() to handle ND_REGION_ASYNC Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 52/73] netfilter: bridge: add pre_exit hooks for ebtable unregistration Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 53/73] netfilter: arp_tables: add pre_exit hook for table unregister Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 54/73] net: macb: fix the restore of cmp registers Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 55/73] netfilter: nft_limit: avoid possible divide error in nft_limit_init Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 56/73] net: davicom: Fix regulator not turned off on failed probe Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 57/73] net: sit: Unregister catch-all devices Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 58/73] net: ip6_tunnel: " Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 59/73] i40e: fix the panic when running bpf in xdpdrv mode Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 60/73] ibmvnic: avoid calling napi_disable() twice Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 61/73] ibmvnic: remove duplicate napi_schedule call in do_reset function Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 62/73] ibmvnic: remove duplicate napi_schedule call in open function Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 63/73] gro: ensure frag0 meets IP header alignment Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 64/73] ARM: footbridge: fix PCI interrupt mapping Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 65/73] arm64: dts: allwinner: Fix SD card CD GPIO for SOPine systems Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 66/73] r8169: remove fiddling with the PCIe max read request size Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 67/73] r8169: simplify setting PCI_EXP_DEVCTL_NOSNOOP_EN Greg Kroah-Hartman
2021-04-19 13:06 ` [PATCH 5.4 68/73] r8169: fix performance regression related to PCIe max read request size Greg Kroah-Hartman
2021-04-19 13:07 ` Greg Kroah-Hartman [this message]
2021-04-19 13:07 ` [PATCH 5.4 70/73] r8169: tweak max read request size for newer chips also in jumbo mtu mode Greg Kroah-Hartman
2021-04-19 13:07 ` [PATCH 5.4 71/73] r8169: dont advertise pause in jumbo mode Greg Kroah-Hartman
2021-04-19 13:07 ` [PATCH 5.4 72/73] ARM: 9071/1: uprobes: Dont hook on thumb instructions Greg Kroah-Hartman
2021-04-19 13:07 ` [PATCH 5.4 73/73] net: phy: marvell: fix detection of PHY on Topaz switches Greg Kroah-Hartman
2021-04-19 21:17 ` [PATCH 5.4 00/73] 5.4.114-rc1 review Florian Fainelli
2021-04-20 0:09 ` Shuah Khan
2021-04-20 0:17 ` Guenter Roeck
2021-04-20 6:13 ` Jon Hunter
2021-04-20 8:26 ` Naresh Kamboju
2021-04-20 9:11 ` Sudip Mukherjee
2021-04-20 11:26 ` Samuel Zou
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210419130526.068041797@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=davem@davemloft.net \
--cc=hkallweit1@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).