diff mbox series

[5.10,21/71] ice: Fix curr_link_speed advertised speed

Message ID	20220314112738.525866564@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, Grzegorz Siwik <grzegorz.siwik@intel.com>, Jedrzej Jagielski <jedrzej.jagielski@intel.com>, Tony Nguyen <anthony.l.nguyen@intel.com>, Sasha Levin <sashal@kernel.org>, Gurucharan <gurucharanx.g@intel.com> Subject: [PATCH 5.10 21/71] ice: Fix curr_link_speed advertised speed Date: Mon, 14 Mar 2022 12:53:14 +0100 Message-Id: <20220314112738.525866564@linuxfoundation.org> In-Reply-To: <20220314112737.929694832@linuxfoundation.org> References: <20220314112737.929694832@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,02/71] clk: qcom: gdsc: Add support to update GDSC transition delay [5.10,03/71] HID: vivaldi: fix sysfs attributes leak [5.10,04/71] arm64: dts: armada-3720-turris-mox: Add missing ethernet0 alias [5.10,05/71] tipc: fix kernel panic when enabling bearer [5.10,06/71] mISDN: Remove obsolete PIPELINE_DEBUG debugging information [5.10,07/71] mISDN: Fix memory leak in dsp_pipeline_build() [5.10,08/71] virtio-blk: Dont use MAX_DISCARD_SEGMENTS if max_discard_seg is zero [5.10,09/71] isdn: hfcpci: check the return value of dma_set_mask() in setup_hw() [5.10,10/71] net: qlogic: check the return value of dma_alloc_coherent() in qed_vf_hw_prepare() [5.10,11/71] esp: Fix BEET mode inter address family tunneling on GSO [5.10,12/71] qed: return status of qed_iov_get_link [5.10,13/71] drm/sun4i: mixer: Fix P010 and P210 format numbers [5.10,14/71] net: dsa: mt7530: fix incorrect test in mt753x_phylink_validate() [5.10,15/71] ARM: dts: aspeed: Fix AST2600 quad spi group [5.10,16/71] i40e: stop disabling VFs due to PF error responses [5.10,17/71] ice: stop disabling VFs due to PF error responses [5.10,18/71] ice: Align macro names to the specification [5.10,19/71] ice: Remove unnecessary checker loop [5.10,20/71] ice: Rename a couple of variables [5.10,21/71] ice: Fix curr_link_speed advertised speed [5.10,22/71] ethernet: Fix error handling in xemaclite_of_probe [5.10,23/71] tipc: fix incorrect order of state message data sanity check [5.10,24/71] net: ethernet: ti: cpts: Handle error for clk_enable [5.10,25/71] net: ethernet: lpc_eth: Handle error for clk_enable [5.10,26/71] ax25: Fix NULL pointer dereference in ax25_kill_by_device [5.10,27/71] net/mlx5: Fix size field in bufferx_reg struct [5.10,28/71] net/mlx5: Fix a race on command flush flow [5.10,29/71] net/mlx5e: Lag, Only handle events from highest priority multipath entry [5.10,30/71] NFC: port100: fix use-after-free in port100_send_complete [5.10,31/71] selftests: pmtu.sh: Kill tcpdump processes launched by subshell. [5.10,32/71] gpio: ts4900: Do not set DAT and OE together [5.10,33/71] gianfar: ethtool: Fix refcount leak in gfar_get_ts_info [5.10,34/71] net: phy: DP83822: clear MISR2 register to disable interrupts [5.10,35/71] sctp: fix kernel-infoleak for SCTP sockets [5.10,36/71] net: bcmgenet: Dont claim WOL when its not available [5.10,37/71] selftests/bpf: Add test for bpf_timer overwriting crash [5.10,38/71] spi: rockchip: Fix error in getting num-cs property [5.10,39/71] spi: rockchip: terminate dma transmission when slave abort [5.10,40/71] net-sysfs: add check for netdevice being present to speed_show [5.10,41/71] hwmon: (pmbus) Clear pmbus fault/warning bits after read [5.10,42/71] gpio: Return EPROBE_DEFER if gc->to_irq is NULL [5.10,43/71] Revert "xen-netback: remove hotplug-status once it has served its purpose" [5.10,44/71] Revert "xen-netback: Check for hotplug-status existence before watching" [5.10,45/71] ipv6: prevent a possible race condition with lifetimes [5.10,46/71] tracing: Ensure trace buffer is at least 4096 bytes large [5.10,47/71] selftest/vm: fix map_fixed_noreplace test failure [5.10,48/71] selftests/memfd: clean up mapping in mfd_fail_write [5.10,49/71] ARM: Spectre-BHB: provide empty stub for non-config [5.10,50/71] fuse: fix pipe buffer lifetime for direct_io [5.10,51/71] staging: rtl8723bs: Fix access-point mode deadlock [5.10,52/71] staging: gdm724x: fix use after free in gdm_lte_rx() [5.10,53/71] net: macb: Fix lost RX packet wakeup race in NAPI receive [5.10,54/71] mmc: meson: Fix usage of meson_mmc_post_req() [5.10,55/71] riscv: Fix auipc+jalr relocation range checks [5.10,56/71] arm64: dts: marvell: armada-37xx: Remap IO space to bus address 0x0 [5.10,57/71] virtio: unexport virtio_finalize_features [5.10,58/71] virtio: acknowledge all features before access [5.10,59/71] watch_queue, pipe: Free watchqueue state after clearing pipe ring [5.10,60/71] watch_queue: Fix to release page in ->release() [5.10,61/71] watch_queue: Fix to always request a pow-of-2 pipe ring size [5.10,62/71] watch_queue: Fix the alloc bitmap size to reflect notes allocated [5.10,63/71] watch_queue: Free the alloc bitmap when the watch_queue is torn down [5.10,64/71] watch_queue: Fix lack of barrier/sync/lock between post and read [5.10,65/71] watch_queue: Make comment about setting ->defunct more accurate [5.10,66/71] x86/boot: Fix memremap of setup_indirect structures [5.10,67/71] x86/boot: Add setup_indirect support in early_memremap_is_setup_data() [5.10,68/71] x86/traps: Mark do_int3() NOKPROBE_SYMBOL [5.10,69/71] ext4: add check to prevent attempting to resize an fs with sparse_super2 [5.10,70/71] ARM: fix Thumb2 regression with Spectre BHB [5.10,71/71] watch_queue: Fix filter limit check

Commit Message

gregkh@linuxfoundation.org March 14, 2022, 11:53 a.m. UTC

From: Jedrzej Jagielski <jedrzej.jagielski@intel.com>

[ Upstream commit ad35ffa252af67d4cc7c744b9377a2b577748e3f ]

Change curr_link_speed advertised speed, due to
link_info.link_speed is not equal phy.curr_user_speed_req.
Without this patch it is impossible to set advertised
speed to same as link_speed.

Testing Hints: Try to set advertised speed
to 25G only with 25G default link (use ethtool -s 0x80000000)

Fixes: 48cb27f2fd18 ("ice: Implement handlers for ethtool PHY/link operations")
Signed-off-by: Grzegorz Siwik <grzegorz.siwik@intel.com>
Signed-off-by: Jedrzej Jagielski <jedrzej.jagielski@intel.com>
Tested-by: Gurucharan <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/net/ethernet/intel/ice/ice_ethtool.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c
index 0582fca5e07f..421fc707f80a 100644
--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c
+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c
@@ -2299,7 +2299,7 @@  ice_set_link_ksettings(struct net_device *netdev,
 		goto done;
 	}
 
-	curr_link_speed = pi->phy.link_info.link_speed;
+	curr_link_speed = pi->phy.curr_user_speed_req;
 	adv_link_speed = ice_ksettings_find_adv_link_speed(ks);
 
 	/* If speed didn't get set, set it to what it currently is.