FAILED: patch "[PATCH] octeontx2-pf: clear stale mailbox IRQ state before" failed to apply to 5.15-stable tree
[email protected]
maintainerThe patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x f918554fb7246e89b98ef90abe80801f038258b3
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026072014-obscure-tattoo-f4b2@gregkh' --subject-prefix 'PATCH 5.15.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From f918554fb7246e89b98ef90abe80801f038258b3 Mon Sep 17 00:00:00 2001
From: Runyu Xiao <[email protected]>
Date: Fri, 12 Jun 2026 00:00:13 +0800
Subject: [PATCH] octeontx2-pf: clear stale mailbox IRQ state before
request_irq()
otx2_register_mbox_intr() currently installs the PF mailbox IRQ handler before clearing stale mailbox interrupt state. The function itself then comments that the local interrupt bits must be cleared first to avoid spurious interrupts, but that clear happens only after request_irq() has already exposed the handler to irq delivery.
A running system can reach this during PF mailbox interrupt registration while stale or latched RVU_PF_INT state is still present. If delivery happens in the request_irq()-to-clear window, otx2_pfaf_mbox_intr_handler() can run before local quiesce and touch the same pf->mbox and pf->mbox_wq carrier that probe and teardown later reuse or destroy.
Move the stale mailbox interrupt clear ahead of request_irq(), but keep interrupt enabling after the handler is installed. This closes the pre-clear early-IRQ window without creating a new enable-before-handler window.
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +9 -11
@@ -1119,9 +1119,16 @@ int otx2_register_mbox_intr(struct otx2_nic *pf, bool probe_af) {struct otx2_hw *hw = &pf->hw;struct msg_req *req; +u64 mbox_int_mask;char *irq_name;int err; + mbox_int_mask = !is_cn20k (pf->pdev) ?BIT_ULL (0 ) : +BIT_ULL (0 ) |BIT_ULL (1 ); + +/* Clear stale mailbox interrupt state before installing the handler. */ +otx2_write64 (pf,RVU_PF_INT , mbox_int_mask); +/* Register mailbox interrupt handler */ if (!is_cn20k (pf->pdev)) { irq_name = &hw->irq_name[RVU_PF_INT_VEC_AFPF_MBOX *NAME_SIZE ];
@@ -1147,17 +1154,8 @@ int otx2_register_mbox_intr(struct otx2_nic *pf, bool probe_af)return err; } -/* Enable mailbox interrupt for msgs coming from AF. -* First clear to avoid spurious interrupts, if any. -*/ -if (!is_cn20k (pf->pdev)) { -otx2_write64 (pf,RVU_PF_INT ,BIT_ULL (0 )); -otx2_write64 (pf,RVU_PF_INT_ENA_W1S ,BIT_ULL (0 )); - }else { -otx2_write64 (pf,RVU_PF_INT ,BIT_ULL (0 ) |BIT_ULL (1 )); -otx2_write64 (pf,RVU_PF_INT_ENA_W1S ,BIT_ULL (0 ) | -BIT_ULL (1 )); - } +/* Enable mailbox interrupt for msgs coming from AF. */ +otx2_write64 (pf,RVU_PF_INT_ENA_W1S , mbox_int_mask);if (!probe_af)return 0 ;
Sasha Levin
maintainerPATCH 1/3 octeontx2-af: Fix APR entry mapping based on APR_LMT_CFG
From: Geetha sowjanya <[email protected]>
[ Upstream commit a6ae7129819ad20788e610261246e71736543b8b ]
The current implementation maps the APR table using a fixed size, which can lead to incorrect mapping when the number of PFs and VFs varies.
This patch corrects the mapping by calculating the APR table size dynamically based on the values configured in the APR_LMT_CFG register, ensuring accurate representation of APR entries in debugfs.
Stable-dep-of: f918554fb724 ("octeontx2-pf: clear stale mailbox IRQ state before request_irq()")
--- drivers/net/ethernet/marvell/octeontx2/af/rvu_cn10k.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu_cn10k.c +6 -3
@@ -13,7 +13,6 @@/* RVU LMTST */ #define LMT_TBL_OP_READ 0#define LMT_TBL_OP_WRITE 1 -#define LMT_MAP_TABLE_SIZE (128 * 1024)#define LMT_MAPTBL_ENTRY_SIZE 16#define LMT_MAX_VFS 256
@@ -26,10 +25,14 @@ static int lmtst_map_table_ops(struct rvu *rvu, u32 index, u64 *val, {void __iomem *lmt_map_base;u64 tbl_base, cfg; +int pfs, vfs; tbl_base =rvu_read64 (rvu,BLKADDR_APR ,APR_AF_LMT_MAP_BASE ); + cfg =rvu_read64 (rvu,BLKADDR_APR ,APR_AF_LMT_CFG ); + vfs =1 << (cfg &0xF ); + pfs =1 << ((cfg >>4 ) &0x7 ); - lmt_map_base =ioremap_wc (tbl_base,LMT_MAP_TABLE_SIZE ); + lmt_map_base =ioremap_wc (tbl_base, pfs * vfs *LMT_MAPTBL_ENTRY_SIZE );if (!lmt_map_base) {dev_err (rvu->dev,"Failed to setup lmt map table mapping!!\n" );return -ENOMEM ;
@@ -80,7 +83,7 @@ static int rvu_get_lmtaddr(struct rvu *rvu, u16 pcifunc,mutex_lock (&rvu->rsrc_lock);rvu_write64 (rvu,BLKADDR_RVUM ,RVU_AF_SMMU_ADDR_REQ , iova); - pf =rvu_get_pf (pcifunc) &0x1F ; + pf =rvu_get_pf (pcifunc) &RVU_PFVF_PF_MASK ; val =BIT_ULL (63 ) |BIT_ULL (14 ) |BIT_ULL (13 ) | pf <<8 | ((pcifunc &RVU_PFVF_FUNC_MASK ) &0xFF );rvu_write64 (rvu,BLKADDR_RVUM ,RVU_AF_SMMU_TXN_REQ , val);
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/3 octeontx2: Annotate mmio regions as __iomem
From: Subbaraya Sundeep <[email protected]>
[ Upstream commit d0976b43956ee8c8bd093223df9115bfcf63dfe5 ]
This patch removes unnecessary typecasts by marking the mbox_regions array as __iomem since it is used to store pointers to memory-mapped I/O (MMIO) regions. Also simplified the call to readq() in PF driver by removing redundant type casts.
Stable-dep-of: f918554fb724 ("octeontx2-pf: clear stale mailbox IRQ state before request_irq()")
--- drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 12 ++++++------ drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu.c +6 -6
@@ -2237,7 +2237,7 @@ static inline void rvu_afvf_mbox_up_handler(struct work_struct *work)__rvu_mbox_up_handler (mwork,TYPE_AFVF ); } -static int rvu_get_mbox_regions (struct rvu *rvu,void **mbox_addr, +static int rvu_get_mbox_regions (struct rvu *rvu,void __iomem **mbox_addr,int num,int type,unsigned long *pf_bmap) {struct rvu_hwinfo *hw = rvu->hw;
@@ -2262,7 +2262,7 @@ static int rvu_get_mbox_regions(struct rvu *rvu, void **mbox_addr, bar4 =rvupf_read64 (rvu,RVU_PF_VF_BAR4_ADDR ); bar4 += region *MBOX_SIZE ; } - mbox_addr[region] = (void *)ioremap_wc (bar4,MBOX_SIZE ); + mbox_addr[region] =ioremap_wc (bar4,MBOX_SIZE );if (!mbox_addr[region]) goto error; }
@@ -2285,7 +2285,7 @@ static int rvu_get_mbox_regions(struct rvu *rvu, void **mbox_addr, RVU_AF_PF_BAR4_ADDR); bar4 += region *MBOX_SIZE ; } - mbox_addr[region] = (void *)ioremap_wc (bar4,MBOX_SIZE ); + mbox_addr[region] =ioremap_wc (bar4,MBOX_SIZE );if (!mbox_addr[region]) goto error; }
@@ -2293,7 +2293,7 @@ static int rvu_get_mbox_regions(struct rvu *rvu, void **mbox_addr, error:while (region--) -iounmap ((void __iomem *)mbox_addr[region]); +iounmap (mbox_addr[region]);return -ENOMEM ; }
@@ -2303,10 +2303,10 @@ static int rvu_mbox_init(struct rvu *rvu, struct mbox_wq_info *mw, void (mbox_up_handler)(struct work_struct *)) {int err = -EINVAL , i, dir, dir_up; +void __iomem **mbox_regions;void __iomem *reg_base;struct rvu_work *mwork;unsigned long *pf_bmap; -void **mbox_regions;const char *name;u64 cfg;
@@ -2327,7 +2327,7 @@ static int rvu_mbox_init(struct rvu *rvu, struct mbox_wq_info *mw, } } - mbox_regions =kcalloc (num,sizeof (void *),GFP_KERNEL ); + mbox_regions =kcalloc (num,sizeof (void __iomem *),GFP_KERNEL );if (!mbox_regions) { err = -ENOMEM ; goto free_bitmap;
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +1 -2
@@ -601,8 +601,7 @@ static int otx2_pfvf_mbox_init(struct otx2_nic *pf, int numvfs) base =pci_resource_start (pf->pdev,PCI_MBOX_BAR_NUM ) +MBOX_SIZE ; else - base =readq ((void __iomem *)((u64 )pf->reg_base + -RVU_PF_VF_BAR4_ADDR )); + base =readq (pf->reg_base +RVU_PF_VF_BAR4_ADDR ); hwbase =ioremap_wc (base,MBOX_SIZE * pf->total_vfs);if (!hwbase) {
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 3/3 octeontx2-pf: clear stale mailbox IRQ state before request_irq()
In reply to Sasha LevinFrom: Runyu Xiao <[email protected]>
[ Upstream commit f918554fb7246e89b98ef90abe80801f038258b3 ]
otx2_register_mbox_intr() currently installs the PF mailbox IRQ handler before clearing stale mailbox interrupt state. The function itself then comments that the local interrupt bits must be cleared first to avoid spurious interrupts, but that clear happens only after request_irq() has already exposed the handler to irq delivery.
A running system can reach this during PF mailbox interrupt registration while stale or latched RVU_PF_INT state is still present. If delivery happens in the request_irq()-to-clear window, otx2_pfaf_mbox_intr_handler() can run before local quiesce and touch the same pf->mbox and pf->mbox_wq carrier that probe and teardown later reuse or destroy.
Move the stale mailbox interrupt clear ahead of request_irq(), but keep interrupt enabling after the handler is installed. This closes the pre-clear early-IRQ window without creating a new enable-before-handler window.
--- drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +4 -4
@@ -987,6 +987,9 @@ static int otx2_register_mbox_intr(struct otx2_nic *pf, bool probe_af)char *irq_name;int err; +/* Clear stale mailbox interrupt state before installing the handler. */ +otx2_write64 (pf,RVU_PF_INT ,BIT_ULL (0 )); +/* Register mailbox interrupt handler */ irq_name = &hw->irq_name[RVU_PF_INT_VEC_AFPF_MBOX *NAME_SIZE ];snprintf (irq_name,NAME_SIZE ,"RVUPFAF Mbox" );
@@ -998,10 +1001,7 @@ static int otx2_register_mbox_intr(struct otx2_nic *pf, bool probe_af)return err; } -/* Enable mailbox interrupt for msgs coming from AF. -* First clear to avoid spurious interrupts, if any. -*/ -otx2_write64 (pf,RVU_PF_INT ,BIT_ULL (0 )); +/* Enable mailbox interrupt for msgs coming from AF. */ otx2_write64 (pf,RVU_PF_INT_ENA_W1S ,BIT_ULL (0 ));if (!probe_af)
Signature · 1 line
2.53.0