diff mbox series

[5.10,096/103] r8169: dont advertise pause in jumbo mode

Message ID	20210419130531.086618533@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Roman Mamedov <rm+bko@romanrm.net>, Heiner Kallweit <hkallweit1@gmail.com>, "David S. Miller" <davem@davemloft.net>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.10 096/103] r8169: dont advertise pause in jumbo mode Date: Mon, 19 Apr 2021 15:06:47 +0200 Message-Id: <20210419130531.086618533@linuxfoundation.org> In-Reply-To: <20210419130527.791982064@linuxfoundation.org> References: <20210419130527.791982064@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.10,002/103] mtd: rawnand: mtk: Fix WAITRDY break condition and timeout [5.10,003/103] Input: nspire-keypad - enable interrupts only when opened [5.10,004/103] gpio: sysfs: Obey valid_mask [5.10,005/103] dmaengine: idxd: Fix clobbering of SWERR overflow bit on writeback [5.10,006/103] dmaengine: idxd: fix delta_rec and crc size field for completion record [5.10,007/103] dmaengine: idxd: fix opcap sysfs attribute output [5.10,008/103] dmaengine: idxd: fix wq size store permission state [5.10,009/103] dmaengine: dw: Make it dependent to HAS_IOMEM [5.10,010/103] dmaengine: Fix a double free in dma_async_device_register [5.10,011/103] dmaengine: plx_dma: add a missing put_device() on error path [5.10,012/103] dmaengine: idxd: fix wq cleanup of WQCFG registers [5.10,013/103] ACPI: x86: Call acpi_boot_table_init() after acpi_table_upgrade() [5.10,014/103] ARM: dts: Drop duplicate sha2md5_fck to fix clk_disable race [5.10,015/103] ARM: dts: Fix moving mmc devices with aliases for omap4 & 5 [5.10,016/103] lockdep: Add a missing initialization hint to the "INFO: Trying to register non-st... [5.10,017/103] arc: kernel: Return -EFAULT if copy_to_user() fails [5.10,018/103] iwlwifi: Fix softirq/hardirq disabling in iwl_pcie_enqueue_hcmd() [5.10,019/103] xfrm: BEET mode doesnt support fragments for inner packets [5.10,020/103] ASoC: max98373: Changed amp shutdown register as volatile [5.10,021/103] ASoC: max98373: Added 30ms turn on/off time delay [5.10,022/103] gpu/xen: Fix a use after free in xen_drm_drv_init [5.10,023/103] neighbour: Disregard DEAD dst in neigh_update [5.10,024/103] ARM: keystone: fix integer overflow warning [5.10,025/103] ARM: omap1: fix building with clang IAS [5.10,026/103] drm/msm: Fix a5xx/a6xx timestamps [5.10,027/103] ASoC: fsl_esai: Fix TDM slot setup for I2S mode [5.10,028/103] scsi: scsi_transport_srp: Dont block target in SRP_PORT_LOST state [5.10,029/103] iwlwifi: add support for Qu with AX201 device [5.10,030/103] net: ieee802154: stop dump llsec keys for monitors [5.10,031/103] net: ieee802154: forbid monitor for add llsec key [5.10,032/103] net: ieee802154: forbid monitor for del llsec key [5.10,033/103] net: ieee802154: stop dump llsec devs for monitors [5.10,034/103] net: ieee802154: forbid monitor for add llsec dev [5.10,035/103] net: ieee802154: forbid monitor for del llsec dev [5.10,036/103] net: ieee802154: stop dump llsec devkeys for monitors [5.10,037/103] net: ieee802154: forbid monitor for add llsec devkey [5.10,038/103] net: ieee802154: forbid monitor for del llsec devkey [5.10,039/103] net: ieee802154: stop dump llsec seclevels for monitors [5.10,040/103] net: ieee802154: forbid monitor for add llsec seclevel [5.10,041/103] pcnet32: Use pci_resource_len to validate PCI resource [5.10,042/103] net/rds: Avoid potential use after free in rds_send_remove_from_sock [5.10,043/103] net: tipc: Fix spelling errors in net/tipc module [5.10,044/103] mac80211: clear sta->fast_rx when STA removed from 4-addr VLAN [5.10,045/103] virt_wifi: Return micros for BSS TSF values [5.10,046/103] lib: fix kconfig dependency on ARCH_WANT_FRAME_POINTERS [5.10,047/103] Input: s6sy761 - fix coordinate read bit shift [5.10,048/103] Input: i8042 - fix Pegatron C15B ID entry [5.10,049/103] HID: wacom: set EV_KEY and EV_ABS only for non-HID_GENERIC type of devices [5.10,050/103] dm verity fec: fix misaligned RS roots IO [5.10,051/103] readdir: make sure to verify directory entry for legacy interfaces too [5.10,052/103] arm64: fix inline asm in load_unaligned_zeropad() [5.10,053/103] arm64: alternatives: Move length validation in alternative_{insn, endif} [5.10,054/103] vfio/pci: Add missing range check in vfio_pci_mmap [5.10,055/103] riscv: Fix spelling mistake "SPARSEMEM" to "SPARSMEM" [5.10,056/103] scsi: libsas: Reset num_scatter if libata marks qc as NODATA [5.10,057/103] ixgbe: fix unbalanced device enable/disable in suspend/resume [5.10,058/103] netfilter: flowtable: fix NAT IPv6 offload mangling [5.10,059/103] netfilter: conntrack: do not print icmpv6 as unknown via /proc [5.10,060/103] ice: Fix potential infinite loop when using u8 loop counter [5.10,061/103] libnvdimm/region: Fix nvdimm_has_flush() to handle ND_REGION_ASYNC [5.10,062/103] netfilter: bridge: add pre_exit hooks for ebtable unregistration [5.10,063/103] netfilter: arp_tables: add pre_exit hook for table unregister [5.10,064/103] libbpf: Fix potential NULL pointer dereference [5.10,065/103] net: macb: fix the restore of cmp registers [5.10,066/103] net/mlx5e: fix ingress_ifindex check in mlx5e_flower_parse_meta [5.10,067/103] netfilter: nft_limit: avoid possible divide error in nft_limit_init [5.10,068/103] net/mlx5e: Fix setting of RS FEC mode [5.10,069/103] net: davicom: Fix regulator not turned off on failed probe [5.10,070/103] net: sit: Unregister catch-all devices [5.10,071/103] net: ip6_tunnel: Unregister catch-all devices [5.10,072/103] mm: ptdump: fix build failure [5.10,073/103] net: Make tcp_allowed_congestion_control readonly in non-init netns [5.10,074/103] i40e: fix the panic when running bpf in xdpdrv mode [5.10,075/103] ethtool: pause: make sure we init driver stats [5.10,076/103] ia64: remove duplicate entries in generic_defconfig [5.10,077/103] ia64: tools: remove inclusion of ia64-specific version of errno.h header [5.10,078/103] ibmvnic: avoid calling napi_disable() twice [5.10,079/103] ibmvnic: remove duplicate napi_schedule call in do_reset function [5.10,080/103] ibmvnic: remove duplicate napi_schedule call in open function [5.10,081/103] ch_ktls: Fix kernel panic [5.10,082/103] ch_ktls: fix device connection close [5.10,083/103] ch_ktls: tcb close causes tls connection failure [5.10,084/103] ch_ktls: do not send snd_una update to TCB in middle [5.10,085/103] gro: ensure frag0 meets IP header alignment [5.10,086/103] ARM: OMAP2+: Fix warning for omap_init_time_of() [5.10,087/103] ARM: 9069/1: NOMMU: Fix conversion for_each_membock() to for_each_mem_range() [5.10,088/103] ARM: footbridge: fix PCI interrupt mapping [5.10,089/103] ARM: OMAP2+: Fix uninitialized sr_inst [5.10,090/103] arm64: dts: allwinner: Fix SD card CD GPIO for SOPine systems [5.10,091/103] arm64: dts: allwinner: h6: beelink-gs1: Remove ext. 32 kHz osc reference [5.10,092/103] bpf: Use correct permission flag for mixed signed bounds arithmetic [5.10,093/103] KVM: VMX: Convert vcpu_vmx.exit_reason to a union [5.10,094/103] KVM: VMX: Dont use vcpu->run->internal.ndata as an array index [5.10,095/103] r8169: tweak max read request size for newer chips also in jumbo mtu mode [5.10,096/103] r8169: dont advertise pause in jumbo mode [5.10,097/103] bpf: Ensure off_reg has no mixed signed bounds for all types [5.10,098/103] bpf: Move off_reg into sanitize_ptr_alu [5.10,099/103] ARM: 9071/1: uprobes: Dont hook on thumb instructions [5.10,100/103] arm64: mte: Ensure TIF_MTE_ASYNC_FAULT is set atomically [5.10,101/103] bpf: Rework ptr_limit into alu_limit and add common error path [5.10,102/103] bpf: Improve verifier error messages for users [5.10,103/103] bpf: Move sanitize_val_alu out of op switch

Commit Message

Greg Kroah-Hartman April 19, 2021, 1:06 p.m. UTC

From: Heiner Kallweit <hkallweit1@gmail.com>

[ Upstream commit 453a77894efa4d9b6ef9644d74b9419c47ac427c ]

It has been reported [0] that using pause frames in jumbo mode impacts
performance. There's no available chip documentation, but vendor
drivers r8168 and r8125 don't advertise pause in jumbo mode. So let's
do the same, according to Roman it fixes the issue.

[0] https://bugzilla.kernel.org/show_bug.cgi?id=212617

Fixes: 9cf9b84cc701 ("r8169: make use of phy_set_asym_pause")
Reported-by: Roman Mamedov <rm+bko@romanrm.net>
Tested-by: Roman Mamedov <rm+bko@romanrm.net>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/net/ethernet/realtek/r8169_main.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index f981aa899c82..3bb36f4a984e 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -2420,6 +2420,13 @@  static void rtl_jumbo_config(struct rtl8169_private *tp)
 
 	if (pci_is_pcie(tp->pci_dev) && tp->supports_gmii)
 		pcie_set_readrq(tp->pci_dev, readrq);
+
+	/* Chip doesn't support pause in jumbo mode */
+	linkmode_mod_bit(ETHTOOL_LINK_MODE_Pause_BIT,
+			 tp->phydev->advertising, !jumbo);
+	linkmode_mod_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT,
+			 tp->phydev->advertising, !jumbo);
+	phy_start_aneg(tp->phydev);
 }
 
 DECLARE_RTL_COND(rtl_chipcmd_cond)
@@ -4711,8 +4718,6 @@  static int r8169_phy_connect(struct rtl8169_private *tp)
 	if (!tp->supports_gmii)
 		phy_set_max_speed(phydev, SPEED_100);
 
-	phy_support_asym_pause(phydev);
-
 	phy_attached_info(phydev);
 
 	return 0;