diff mbox series

[5.15,121/171] octeontx2-af: Fix LBK backpressure id count

Message ID	20220131105234.134819720@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, Sunil Goutham <sgoutham@marvell.com>, "David S. Miller" <davem@davemloft.net>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.15 121/171] octeontx2-af: Fix LBK backpressure id count Date: Mon, 31 Jan 2022 11:56:26 +0100 Message-Id: <20220131105234.134819720@linuxfoundation.org> In-Reply-To: <20220131105229.959216821@linuxfoundation.org> References: <20220131105229.959216821@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.15,004/171] net: stmmac: skip only stmmac_ptp_register when resume from suspend [5.15,005/171] ARM: 9179/1: uaccess: avoid alignment faults in copy_[from\|to]_kernel_nofault [5.15,006/171] ARM: 9180/1: Thumb2: align ALT_UP() sections in modules sufficiently [5.15,007/171] KVM: arm64: Use shadow SPSR_EL1 when injecting exceptions on !VHE [5.15,010/171] s390/nmi: handle guarded storage validity failures for KVM guests [5.15,012/171] bpf: Guard against accessing NULL pt_regs in bpf_get_task_stack() [5.15,014/171] powerpc/bpf: Update ldimm64 instructions during extra pass [5.15,016/171] scsi: zfcp: Fix failed recovery on gone remote port with non-NPIV FCP devices [5.15,018/171] udf: Fix NULL ptr deref when converting from inline format [5.15,020/171] PM: wakeup: simplify the output logic of pm_show_wakelocks() [5.15,021/171] tracing/histogram: Fix a potential memory leak for kstrdup() [5.15,023/171] ceph: properly put ceph_string reference after async create attempt [5.15,025/171] fsnotify: fix fsnotify hooks in pseudo filesystems [5.15,027/171] psi: Fix uaf issue when psi trigger is destroyed while being polled [5.15,029/171] perf/x86/intel/uncore: Fix CAS_COUNT_WRITE issue for ICX [5.15,030/171] perf/x86/intel: Add a quirk for the calculation of the number of counters on Alder... [5.15,032/171] drm/atomic: Add the crtc to affected crtc only if uapi.enable = true [5.15,033/171] drm/amd/display: Fix FP start/end for dcn30_internal_validate_bw. [5.15,034/171] KVM: LAPIC: Also cancel preemption timer during SET_LAPIC [5.15,035/171] KVM: SVM: Never reject emulation due to SMAP errata for !SEV guests [5.15,037/171] KVM: x86: nSVM: skip eax alignment check for non-SVM instructions [5.15,039/171] KVM: x86: Keep MSR_IA32_XSS unchanged for INIT [5.15,040/171] KVM: x86: Update vCPUs runtime CPUID on write to MSR_IA32_XSS [5.15,042/171] KVM: PPC: Book3S HV Nested: Fix nested HFSCR being clobbered with multiple vCPUs [5.15,046/171] serial: pl011: Fix incorrect rs485 RTS polarity on set_mctrl [5.15,048/171] serial: stm32: fix software flow control transfer [5.15,052/171] kbuild: remove include/linux/cyclades.h from header file check [5.15,055/171] usb: common: ulpi: Fix crash in ulpi_match() [5.15,057/171] usb: cdnsp: Fix segmentation fault in cdns_lost_power function [5.15,059/171] usb: dwc3: xilinx: Fix error handling when getting USB3 PHY [5.15,060/171] USB: core: Fix hang in usb_kill_urb by adding memory barriers [5.15,065/171] mm, kasan: use compare-exchange operation to set KASAN page tag [5.15,066/171] jbd2: export jbd2_journal_[grab\|put]_journal_head [5.15,067/171] ocfs2: fix a deadlock when commit trans [5.15,068/171] sched/membarrier: Fix membarrier-rseq fence command missing from query bitmask [5.15,072/171] powerpc/32s: Allocate one 256k IBAT instead of two consecutives 128k IBATs [5.15,075/171] i40e: Increase delay to 1 s after global EMP reset [5.15,076/171] i40e: Fix issue when maximum queues is exceeded [5.15,077/171] i40e: Fix queues reservation for XDP [5.15,080/171] usb: roles: fix include/linux/usb/role.h compile issue [5.15,081/171] rpmsg: char: Fix race between the release of rpmsg_ctrldev and cdev [5.15,082/171] rpmsg: char: Fix race between the release of rpmsg_eptdev and cdev [5.15,084/171] scsi: bnx2fc: Flush destroy_work queue before calling bnx2fc_interface_put() [5.15,087/171] net: fix information leakage in /proc/net/ptype [5.15,089/171] hwmon: (lm90) Mark alert as broken for MAX6680 [5.15,090/171] ping: fix the sk_bound_dev_if match in ping_lookup [5.15,091/171] ipv4: avoid using shared IP generator for connected sockets [5.15,094/171] NFSv4: nfs_atomic_open() can race when looking up a non-regular file [5.15,096/171] drm/msm: Fix wrong size calculation [5.15,098/171] drm/msm/dsi: invalid parameter check in msm_dsi_phy_enable [5.15,101/171] NFS: Ensure the server has an up to date ctime before renaming [5.15,104/171] SUNRPC: Dont dereference xprt->snd_task if its a cookie [5.15,106/171] netfilter: conntrack: dont increment invalid counter on NF_REPEAT [5.15,108/171] perf: Fix perf_event_read_local() time [5.15,109/171] sched/pelt: Relax the sync of util_sum with util_avg [5.15,110/171] net: phy: broadcom: hook up soft_reset for BCM54616S [5.15,112/171] net: stmmac: dwmac-visconti: Fix clock configuration for RMII mode [5.15,113/171] phylib: fix potential use-after-free [5.15,119/171] selftests: mptcp: fix ipv6 routing setup [5.15,121/171] octeontx2-af: Fix LBK backpressure id count [5.15,123/171] octeontx2-pf: cn10k: Ensure valid pointers are freed to aura [5.15,124/171] octeontx2-af: verify CQ context updates [5.15,125/171] octeontx2-af: Increase link credit restore polling timeout [5.15,128/171] rxrpc: Adjust retransmission backoff [5.15,130/171] io_uring: fix bug in slow unregistering of nodes [5.15,131/171] Drivers: hv: balloon: account for vmbus packet header in max_pkt_size [5.15,132/171] hwmon: (lm90) Re-enable interrupts after alert clears [5.15,133/171] hwmon: (lm90) Mark alert as broken for MAX6654 [5.15,134/171] hwmon: (lm90) Fix sysfs and udev notifications [5.15,136/171] powerpc/perf: Fix power_pmu_disable to call clear_pmi_irq_pending only if PMI is p... [5.15,137/171] ipv4: fix ip option filtering for locally generated fragments [5.15,138/171] ibmvnic: Allow extra failures before disabling [5.15,140/171] ibmvnic: dont spin in tasklet [5.15,143/171] can: tcan4x5x: regmap: fix max register value [5.15,144/171] drm/msm/hdmi: Fix missing put_device() call in msm_hdmi_get_phy [5.15,145/171] drm/msm/dpu: invalid parameter check in dpu_setup_dspp_pcc [5.15,146/171] drm/msm/a6xx: Add missing suspend_count increment [5.15,149/171] net: hns3: handle empty unknown interrupt for VF [5.15,152/171] KVM: selftests: Dont skip L2s VMCALL in SMM test for SVM guest [5.15,155/171] Revert "ipv6: Honor all IPv6 PIO Valid Lifetime values" [5.15,156/171] net: bridge: vlan: fix single net device option dumping [5.15,157/171] ipv4: raw: lock the socket in raw_bind() [5.15,161/171] Bluetooth: refactor malicious adv data check [5.15,162/171] irqchip/realtek-rtl: Map control data to virq [5.15,164/171] dt-bindings: can: tcan4x5x: fix mram-cfg RX FIFO config [5.15,165/171] perf/core: Fix cgroup event list management [5.15,166/171] psi: fix "no previous prototype" warnings when CONFIG_CGROUPS=n [5.15,169/171] usr/include/Makefile: add linux/nfc.h to the compile-test coverage [5.15,170/171] fsnotify: invalidate dcache before IN_DELETE event

Commit Message

Greg KH Jan. 31, 2022, 10:56 a.m. UTC

From: Sunil Goutham <sgoutham@marvell.com>

[ Upstream commit 00bfe94e388fe12bfd0d4f6361b1b1343374ff5b ]

In rvu_nix_get_bpid() lbk_bpid_cnt is being read from
wrong register. Due to this backpressure enable is failing
for LBK VF32 onwards. This patch fixes that.

Fixes: fe1939bb2340 ("octeontx2-af: Add SDP interface support")
Signed-off-by: Sunil Goutham <sgoutham@marvell.com>
Signed-off-by: Subbaraya Sundeep <sgoutham@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
index 6970540dc4709..8ee324aabf2d6 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
@@ -511,11 +511,11 @@  static int rvu_nix_get_bpid(struct rvu *rvu, struct nix_bp_cfg_req *req,
 	cfg = rvu_read64(rvu, blkaddr, NIX_AF_CONST);
 	lmac_chan_cnt = cfg & 0xFF;
 
-	cfg = rvu_read64(rvu, blkaddr, NIX_AF_CONST1);
-	sdp_chan_cnt = cfg & 0xFFF;
-
 	cgx_bpid_cnt = hw->cgx_links * lmac_chan_cnt;
 	lbk_bpid_cnt = hw->lbk_links * ((cfg >> 16) & 0xFF);
+
+	cfg = rvu_read64(rvu, blkaddr, NIX_AF_CONST1);
+	sdp_chan_cnt = cfg & 0xFFF;
 	sdp_bpid_cnt = hw->sdp_links * sdp_chan_cnt;
 
 	pfvf = rvu_get_pfvf(rvu, req->hdr.pcifunc);