octeontx2-pf: Fix PFC TX scheduler free

[ Upstream commit a9ac2e18779597f280d68a5b5f5bdd51a34080fa ]

During PFC TX schedulers free, flag TXSCHQ_FREE_ALL was being set
which caused free up all schedulers other than the PFC schedulers.
This patch fixes that to free only the PFC Tx schedulers.

Fixes: 99c969a83d82 ("octeontx2-pf: Add egress PFC support")
Signed-off-by: Suman Ghosh <sumang@marvell.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/20230824081032.436432-2-sumang@marvell.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
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 dd97731f8169834f932bee513c4c54b8e3c7f8d3..011355e73696e05d66b229ce171cdbbb5007a8d2 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c
@@ -773,6 +773,7 @@ void otx2_txschq_free_one(struct otx2_nic *pfvf, u16 lvl, u16 schq)
 
        mutex_unlock(&pfvf->mbox.lock);
 }
+EXPORT_SYMBOL(otx2_txschq_free_one);
 
 void otx2_txschq_stop(struct otx2_nic *pfvf)
 {

diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c
index ccaf97bb1ce03e84dc4edd3a7e76469eb5d80768..6492749dd7c8955cdf3463d2539b7bac30c8b43c 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c
+++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_dcbnl.c
@@ -125,19 +125,12 @@ int otx2_pfc_txschq_alloc(struct otx2_nic *pfvf)
 
 static int otx2_pfc_txschq_stop_one(struct otx2_nic *pfvf, u8 prio)
 {
-       struct nix_txsch_free_req *free_req;
+       int lvl;
 
-       mutex_lock(&pfvf->mbox.lock);
        /* free PFC TLx nodes */
-       free_req = otx2_mbox_alloc_msg_nix_txsch_free(&pfvf->mbox);
-       if (!free_req) {
-               mutex_unlock(&pfvf->mbox.lock);
-               return -ENOMEM;
-       }
-
-       free_req->flags = TXSCHQ_FREE_ALL;
-       otx2_sync_mbox_msg(&pfvf->mbox);
-       mutex_unlock(&pfvf->mbox.lock);
+       for (lvl = 0; lvl < pfvf->hw.txschq_link_cfg_lvl; lvl++)
+               otx2_txschq_free_one(pfvf, lvl,
+                                    pfvf->pfc_schq_list[lvl][prio]);
 
        pfvf->pfc_alloc_status[prio] = false;
        return 0;