octeontx2-af: Always allocate PF entries from low prioriy zone

PF mcam entries has to be at low priority always so that VF
can install longest prefix match rules at higher priority.
This was taken care currently but when priority allocation
wrt reference entry is requested then entries are allocated
from mid-zone instead of low priority zone. Fix this and
always allocate entries from low priority zone for PFs.

Fixes: 7df5b4b260dd ("octeontx2-af: Allocate low priority entries for PF")
Signed-off-by: Subbaraya Sundeep <sbhatta@marvell.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
index e8b73b9d75e3118f56ee42a322d05491b0c325f0..97722ce8c4cb34e2fac06adfb08c189d18989a5b 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc.c
@@ -2519,7 +2519,17 @@ static int npc_mcam_alloc_entries(struct npc_mcam *mcam, u16 pcifunc,
         * - when available free entries are less.
         * Lower priority ones out of avaialble free entries are always
         * chosen when 'high vs low' question arises.
+        *
+        * For a VF base MCAM match rule is set by its PF. And all the
+        * further MCAM rules installed by VF on its own are
+        * concatenated with the base rule set by its PF. Hence PF entries
+        * should be at lower priority compared to VF entries. Otherwise
+        * base rule is hit always and rules installed by VF will be of
+        * no use. Hence if the request is from PF then allocate low
+        * priority entries.
         */
+       if (!(pcifunc & RVU_PFVF_FUNC_MASK))
+               goto lprio_alloc;
 
        /* Get the search range for priority allocation request */
        if (req->priority) {
@@ -2528,17 +2538,6 @@ static int npc_mcam_alloc_entries(struct npc_mcam *mcam, u16 pcifunc,
                goto alloc;
        }
 
-       /* For a VF base MCAM match rule is set by its PF. And all the
-        * further MCAM rules installed by VF on its own are
-        * concatenated with the base rule set by its PF. Hence PF entries
-        * should be at lower priority compared to VF entries. Otherwise
-        * base rule is hit always and rules installed by VF will be of
-        * no use. Hence if the request is from PF and NOT a priority
-        * allocation request then allocate low priority entries.
-        */
-       if (!(pcifunc & RVU_PFVF_FUNC_MASK))
-               goto lprio_alloc;
-
        /* Find out the search range for non-priority allocation request
         *
         * Get MCAM free entry count in middle zone.
@@ -2568,6 +2567,18 @@ lprio_alloc:
                reverse = true;
                start = 0;
                end = mcam->bmap_entries;
+               /* Ensure PF requests are always at bottom and if PF requests
+                * for higher/lower priority entry wrt reference entry then
+                * honour that criteria and start search for entries from bottom
+                * and not in mid zone.
+                */
+               if (!(pcifunc & RVU_PFVF_FUNC_MASK) &&
+                   req->priority == NPC_MCAM_HIGHER_PRIO)
+                       end = req->ref_entry;
+
+               if (!(pcifunc & RVU_PFVF_FUNC_MASK) &&
+                   req->priority == NPC_MCAM_LOWER_PRIO)
+                       start = req->ref_entry;
        }
 
 alloc: