octeontx2-af: Fix depth of cam and mem table.

[ Upstream commit 60999cb83554ebcf6cfff8894bc2c3d99ea858ba ]

In current driver, NPC cam and mem table sizes are read from wrong
register offset. This patch fixes the register offset so that correct
values are populated on read.

Fixes: b747923afff8 ("octeontx2-af: Exact match support")
Signed-off-by: Ratheesh Kannoth <rkannoth@marvell.com>
Signed-off-by: Sunil Kovvuri Goutham <sgoutham@marvell.com>
Signed-off-by: Sai Krishna <saikrishnag@marvell.com>
Reviewed-by: Simon Horman <simon.horman@corigine.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/af/rvu_npc_hash.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c
index f69102d20c903d6eedbe9240ff01b32bd3631ea7..f2d7156262ff140a78d885fa24110a7db3211414 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c
@@ -1878,9 +1878,9 @@ int rvu_npc_exact_init(struct rvu *rvu)
        rvu->hw->table = table;
 
        /* Read table size, ways and depth */
-       table->mem_table.depth = FIELD_GET(GENMASK_ULL(31, 24), npc_const3);
        table->mem_table.ways = FIELD_GET(GENMASK_ULL(19, 16), npc_const3);
-       table->cam_table.depth = FIELD_GET(GENMASK_ULL(15, 0), npc_const3);
+       table->mem_table.depth = FIELD_GET(GENMASK_ULL(15, 0), npc_const3);
+       table->cam_table.depth = FIELD_GET(GENMASK_ULL(31, 24), npc_const3);
 
        dev_dbg(rvu->dev, "%s: NPC exact match 4way_2k table(ways=%d, depth=%d)\n",
                __func__,  table->mem_table.ways, table->cam_table.depth);