octeontx2-af: Change the order of queue work and interrupt disable
Geetha sowjanya
maintainerPATCH 1/1 octeontx2-af: Change the order of queue work and interrupt disable
From: Nithin Dabilpuram <[email protected]>
Clear and disable interrupt before queueing work as there might be a chance that work gets completed on other core faster and interrupt enable as a part of the work completes before interrupt disable in the interrupt context. This leads to permanent disable of interrupt.
--- drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/net/ethernet/marvell/octeontx2/af/rvu.c +5 -4
@@ -2447,11 +2447,12 @@ static void rvu_afvf_queue_flr_work(struct rvu *rvu, int start_vf, int numvfs)for (vf =0 ; vf < numvfs; vf++) {if (!(intr &BIT_ULL (vf)))continue ; - dev = vf + start_vf + rvu->hw->total_pfs; -queue_work (rvu->flr_wq, &rvu->flr_wrk[dev].work);/* Clear and disable the interrupt */ rvupf_write64 (rvu,RVU_PF_VFFLR_INTX (reg),BIT_ULL (vf));rvupf_write64 (rvu,RVU_PF_VFFLR_INT_ENA_W1CX (reg),BIT_ULL (vf)); + + dev = vf + start_vf + rvu->hw->total_pfs; +queue_work (rvu->flr_wq, &rvu->flr_wrk[dev].work); } }
@@ -2467,14 +2468,14 @@ static irqreturn_t rvu_flr_intr_handler(int irq, void *rvu_irq)for (pf =0 ; pf < rvu->hw->total_pfs; pf++) {if (intr & (1ULL << pf)) { -/* PF is already dead do only AF related operations */ -queue_work (rvu->flr_wq, &rvu->flr_wrk[pf].work);/* clear interrupt */ rvu_write64 (rvu,BLKADDR_RVUM ,RVU_AF_PFFLR_INT ,BIT_ULL (pf));/* Disable the interrupt */ rvu_write64 (rvu,BLKADDR_RVUM ,RVU_AF_PFFLR_INT_ENA_W1C ,BIT_ULL (pf)); +/* PF is already dead do only AF related operations */ +queue_work (rvu->flr_wq, &rvu->flr_wrk[pf].work); } }
Signature · 1 line
2.17.1
This patch was applied to netdev/net-next.git (refs/heads/master):
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
Quoted 9 lines · On Wed, 25 Aug 2021 11:09:04 +0530 you wrote:
From: Nithin Dabilpuram <[email protected]>
Clear and disable interrupt before queueing work as there might be a chance that work gets completed on other core faster and interrupt enable as a part of the work completes before interrupt disable in the interrupt context. This leads to permanent disable of interrupt.
[...]
Here is the summary with links:
- octeontx2-af: Change the order of queue work and interrupt disable
https://git.kernel.org/netdev/net-next/c/906999c9b653
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html