Commit cbf2f249 authored by Subbaraya Sundeep's avatar Subbaraya Sundeep Committed by David S. Miller
Browse files

octeontx2-pf: Wait till detach_resources msg is complete 



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: 05fcc9e0 ("octeontx2-pf: Attach NIX and NPA block LFs")
Signed-off-by: default avatarSubbaraya Sundeep <sbhatta@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a88e0f93

drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c

+1 −1
Original line number Diff line number Diff line
@@ -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);