octeontx2-pf: Wait till detach_resources msg is complete

[ Upstream commit cbf2f24939a5dafce6de4dd4422e543ce8f610cf ]

During VF driver remove, a message is sent to detach VF
resources to PF but VF is not waiting until message is
complete. Also mailbox interrupts need to be turned off
after the detach resource message is complete. This patch
fixes that problem.

Fixes: 05fcc9e08955 ("octeontx2-pf: Attach NIX and NPA block LFs")
Signed-off-by: Subbaraya Sundeep <sbhatta@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
index e6df4e6a78ab76407d8021d790b3e5e6cfe20124..af62d66470d5e2c45d8baa4b2e2293ba4aa55c49 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
@@ -1592,7 +1592,7 @@ int otx2_detach_resources(struct mbox *mbox)
        detach->partial = false;
 
        /* Send detach request to AF */
-       otx2_mbox_msg_send(&mbox->mbox, 0);
+       otx2_sync_mbox_msg(mbox);
        mutex_unlock(&mbox->lock);
        return 0;
 }

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c
index ced456cec8baf037445eb061d792c4855156f59d..cf0aa16d754070ebf2d9e05e7146b604674bcbfd 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c
@@ -775,8 +775,8 @@ static void otx2vf_remove(struct pci_dev *pdev)
        otx2_mcam_flow_del(vf);
        otx2_shutdown_tc(vf);
        otx2_shutdown_qos(vf);
-       otx2vf_disable_mbox_intr(vf);
        otx2_detach_resources(&vf->mbox);
+       otx2vf_disable_mbox_intr(vf);
        free_percpu(vf->hw.lmt_info);
        if (test_bit(CN10K_LMTST, &vf->hw.cap_flag))
                qmem_free(vf->dev, vf->dync_lmt);