octeontx2-af: Fix max NPC MCAM entry check while validating ref_entry

[ Upstream commit 4ebb1f95e0c3c3e0eec5bb21aa43097580c4b6e4 ]

As of today, the last MCAM entry was not getting allocated because of
a <= check with the max_bmap count. This patch modifies that and if the
requested entry is greater than the available entries then set it to the
max value.

Signed-off-by: Suman Ghosh <sumang@marvell.com>
Link: https://lore.kernel.org/r/20240101145042.419697-1-sumang@marvell.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Suman Ghosh 2024-01-01 20:20:42 +05:30 коммит произвёл Greg Kroah-Hartman
Родитель 28764fab4d
Коммит 315d966df2
1 изменённых файлов: 6 добавлений и 7 удалений

Просмотреть файл

@ -2625,18 +2625,17 @@ int rvu_mbox_handler_npc_mcam_alloc_entry(struct rvu *rvu,
rsp->entry = NPC_MCAM_ENTRY_INVALID; rsp->entry = NPC_MCAM_ENTRY_INVALID;
rsp->free_count = 0; rsp->free_count = 0;
/* Check if ref_entry is within range */ /* Check if ref_entry is greater that the range
if (req->priority && req->ref_entry >= mcam->bmap_entries) { * then set it to max value.
dev_err(rvu->dev, "%s: reference entry %d is out of range\n", */
__func__, req->ref_entry); if (req->ref_entry > mcam->bmap_entries)
return NPC_MCAM_INVALID_REQ; req->ref_entry = mcam->bmap_entries;
}
/* ref_entry can't be '0' if requested priority is high. /* ref_entry can't be '0' if requested priority is high.
* Can't be last entry if requested priority is low. * Can't be last entry if requested priority is low.
*/ */
if ((!req->ref_entry && req->priority == NPC_MCAM_HIGHER_PRIO) || if ((!req->ref_entry && req->priority == NPC_MCAM_HIGHER_PRIO) ||
((req->ref_entry == (mcam->bmap_entries - 1)) && ((req->ref_entry == mcam->bmap_entries) &&
req->priority == NPC_MCAM_LOWER_PRIO)) req->priority == NPC_MCAM_LOWER_PRIO))
return NPC_MCAM_INVALID_REQ; return NPC_MCAM_INVALID_REQ;