octeontx2-af: Change the order of queue work and interrupt disable

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.

Signed-off-by: Nithin Dabilpuram <ndabilpuram@marvell.com>
Signed-off-by: Sunil Goutham <sgoutham@marvell.com>
Signed-off-by: Geetha sowjanya <gakula@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
index 84f0aaa8665dca6a83bf02e2f01afe9acc546752..5bdeed2500899390a99aad7aac635102a064a15a 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu.c
@@ -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);
                }
        }