diff mbox series

[5.4,24/78] ice: write register with correct offset

Message ID	20210608175936.078963999@linuxfoundation.org
State	New
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, Mitch Williams <mitch.a.williams@intel.com>, Andrew Bowers <andrewx.bowers@intel.com>, Jeff Kirsher <jeffrey.t.kirsher@intel.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.4 24/78] ice: write register with correct offset Date: Tue, 8 Jun 2021 20:26:53 +0200 Message-Id: <20210608175936.078963999@linuxfoundation.org> In-Reply-To: <20210608175935.254388043@linuxfoundation.org> References: <20210608175935.254388043@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.4,02/78] net: usb: cdc_ncm: dont spew notifications [5.4,03/78] ALSA: usb: update old-style static const declaration [5.4,04/78] nl80211: validate key indexes for cfg80211_registered_device [5.4,05/78] hwmon: (dell-smm-hwmon) Fix index values [5.4,06/78] netfilter: conntrack: unregister ipv4 sockopts on error unwind [5.4,07/78] efi: Allow EFI_MEMORY_XP and EFI_MEMORY_RO both to be cleared [5.4,08/78] efi: cper: fix snprintf() use in cper_dimm_err_location() [5.4,09/78] vfio/pci: Fix error return code in vfio_ecap_init() [5.4,10/78] vfio/pci: zap_vma_ptes() needs MMU [5.4,11/78] samples: vfio-mdev: fix error handing in mdpy_fb_probe() [5.4,12/78] vfio/platform: fix module_put call in error flow [5.4,13/78] ipvs: ignore IP_VS_SVC_F_HASHED flag when adding service [5.4,14/78] HID: pidff: fix error return code in hid_pidff_init() [5.4,15/78] HID: i2c-hid: fix format string mismatch [5.4,16/78] net/sched: act_ct: Fix ct template allocation for zone 0 [5.4,17/78] ACPICA: Clean up context mutex during object deletion [5.4,18/78] netfilter: nft_ct: skip expectations for confirmed conntrack [5.4,19/78] netfilter: nfnetlink_cthelper: hit EBUSY on updates if size mismatches [5.4,20/78] ieee802154: fix error return code in ieee802154_add_iface() [5.4,21/78] ieee802154: fix error return code in ieee802154_llsec_getparams() [5.4,22/78] ixgbevf: add correct exception tracing for XDP [5.4,23/78] ipv6: Fix KASAN: slab-out-of-bounds Read in fib6_nh_flush_exceptions [5.4,24/78] ice: write register with correct offset [5.4,25/78] ice: Fix VFR issues for AVF drivers that expect ATQLEN cleared [5.4,26/78] ice: Allow all LLDP packets from PF to Tx [5.4,27/78] i2c: qcom-geni: Add shutdown callback for i2c [5.4,28/78] i40e: optimize for XDP_REDIRECT in xsk path [5.4,29/78] i40e: add correct exception tracing for XDP [5.4,30/78] arm64: dts: ls1028a: fix memory node [5.4,31/78] arm64: dts: zii-ultra: fix 12V_MAIN voltage [5.4,32/78] ARM: dts: imx7d-meerkat96: Fix the tuning-step property [5.4,33/78] ARM: dts: imx7d-pico: Fix the tuning-step property [5.4,34/78] ARM: dts: imx: emcon-avari: Fix nxp,pca8574 #gpio-cells [5.4,35/78] bus: ti-sysc: Fix flakey idling of uarts and stop using swsup_sidle_act [5.4,36/78] tipc: add extack messages for bearer/media failure [5.4,37/78] tipc: fix unique bearer names sanity check [5.4,38/78] Bluetooth: fix the erroneous flush_work() order [5.4,39/78] Bluetooth: use correct lock to prevent UAF of hdev object [5.4,40/78] net: caif: added cfserl_release function [5.4,41/78] net: caif: add proper error handling [5.4,42/78] net: caif: fix memory leak in caif_device_notify [5.4,43/78] net: caif: fix memory leak in cfusbl_device_notify [5.4,44/78] HID: i2c-hid: Skip ELAN power-on command after reset [5.4,45/78] HID: magicmouse: fix NULL-deref on disconnect [5.4,46/78] HID: multitouch: require Finger field to mark Win8 reports as MT [5.4,47/78] ALSA: timer: Fix master timer notification [5.4,48/78] ALSA: hda: Fix for mute key LED for HP Pavilion 15-CK0xx [5.4,49/78] ARM: dts: imx6dl-yapp4: Fix RGMII connection to QCA8334 switch [5.4,50/78] ARM: dts: imx6q-dhcom: Add PU,VDD1P1,VDD2P5 regulators [5.4,51/78] ext4: fix bug on in ext4_es_cache_extent as ext4_split_extent_at failed [5.4,52/78] usb: dwc2: Fix build in periphal-only mode [5.4,53/78] pid: take a reference when initializing `cad_pid` [5.4,54/78] ocfs2: fix data corruption by fallocate [5.4,55/78] nfc: fix NULL ptr dereference in llcp_sock_getname() after failed connect [5.4,56/78] drm/amdgpu: Dont query CE and UE errors [5.4,57/78] drm/amdgpu: make sure we unpin the UVD BO [5.4,58/78] x86/apic: Mark _all_ legacy interrupts when IO/APIC is missing [5.4,59/78] btrfs: mark ordered extent and inode with error if we fail to finish [5.4,60/78] btrfs: fix error handling in btrfs_del_csums [5.4,61/78] btrfs: return errors from btrfs_del_csums in cleanup_ref_head [5.4,62/78] btrfs: fixup error handling in fixup_inode_link_counts [5.4,63/78] mm, hugetlb: fix simple resv_huge_pages underflow on UFFDIO_COPY [5.4,64/78] bnxt_en: Remove the setting of dev_port. [5.4,65/78] mm: add thp_order [5.4,66/78] XArray: add xa_get_order [5.4,67/78] XArray: add xas_split [5.4,68/78] mm/filemap: fix storing to a THP shadow entry [5.4,69/78] btrfs: fix unmountable seed device after fstrim [5.4,70/78] KVM: SVM: Truncate GPR value for DR and CR accesses in !64-bit mode [5.4,71/78] KVM: arm64: Fix debug register indexing [5.4,72/78] x86/kvm: Teardown PV features on boot CPU as well [5.4,73/78] x86/kvm: Disable kvmclock on all CPUs on shutdown [5.4,74/78] x86/kvm: Disable all PV features on crash [5.4,75/78] lib/lz4: explicitly support in-place decompression [5.4,76/78] xen-pciback: redo VF placement in the virtual topology [5.4,77/78] i2c: qcom-geni: Suspend and resume the bus during SYSTEM_SLEEP_PM ops [5.4,78/78] neighbour: allow NUD_NOARP entries to be forced GCed

Commit Message

Greg Kroah-Hartman June 8, 2021, 6:26 p.m. UTC

From: Mitch Williams <mitch.a.williams@intel.com>

[ Upstream commit 395594563b29fbcd8d9a4f0a642484e5d3bb6db1 ]

The VF_MBX_ARQLEN register array is per-PF, not global, so we should not
use the absolute VF ID as an index. Instead, use the per-PF VF ID.

This fixes an issue with VFs on PFs other than 0 not seeing reset.

Signed-off-by: Mitch Williams <mitch.a.williams@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
index e92a00a61755..360c0f7e0384 100644
--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
@@ -390,7 +390,7 @@  static void ice_trigger_vf_reset(struct ice_vf *vf, bool is_vflr, bool is_pfr)
 	 * by the time we get here.
 	 */
 	if (!is_pfr)
-		wr32(hw, VF_MBX_ARQLEN(vf_abs_id), 0);
+		wr32(hw, VF_MBX_ARQLEN(vf->vf_id), 0);
 
 	/* In the case of a VFLR, the HW has already reset the VF and we
 	 * just need to clean up, so don't hit the VFRTRIG register.