X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fbnxt%2Fhcapi%2Fhcapi_cfa_p4.c;h=3a0476a33d0fc2fef91da578a213dcb9cc0f352c;hb=21b1677d87a23a9695be0cbcbdf38607a2d58f84;hp=42b37da0f964711b9ce46c9a616229cae8596304;hpb=77805a17a3e082f1ae1366ea59f61035985446cc;p=dpdk.git

diff --git a/drivers/net/bnxt/hcapi/hcapi_cfa_p4.c b/drivers/net/bnxt/hcapi/hcapi_cfa_p4.c
index 42b37da0f9..3a0476a33d 100644
--- a/drivers/net/bnxt/hcapi/hcapi_cfa_p4.c
+++ b/drivers/net/bnxt/hcapi/hcapi_cfa_p4.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2019-2020 Broadcom
+ * Copyright(c) 2019-2021 Broadcom
  * All rights reserved.
  */
 #include <inttypes.h>
@@ -13,7 +13,6 @@
 #include "hcapi_cfa_defs.h"
 
 #define HCAPI_CFA_LKUP_SEED_MEM_SIZE 512
-#define TF_EM_PAGE_SIZE (1 << 21)
 uint32_t hcapi_cfa_lkup_lkup3_init_cfg;
 uint32_t hcapi_cfa_lkup_em_seed_mem[HCAPI_CFA_LKUP_SEED_MEM_SIZE];
 bool hcapi_cfa_lkup_init;
@@ -199,10 +198,9 @@ static uint32_t hcapi_cfa_lookup3_hash(uint8_t *in_key)
 
 
 uint64_t hcapi_get_table_page(struct hcapi_cfa_em_table *mem,
-			      uint32_t offset)
+			      uint32_t page)
 {
 	int level = 0;
-	int page = offset / TF_EM_PAGE_SIZE;
 	uint64_t addr;
 
 	if (mem == NULL)
@@ -362,7 +360,9 @@ int hcapi_cfa_key_hw_op(struct hcapi_cfa_hwop *op,
 	op->hw.base_addr =
 		hcapi_get_table_page((struct hcapi_cfa_em_table *)
 				     key_tbl->base0,
-				     key_obj->offset);
+				     key_obj->offset / key_tbl->page_size);
+	/* Offset is adjusted to be the offset into the page */
+	key_obj->offset = key_obj->offset % key_tbl->page_size;
 
 	if (op->hw.base_addr == 0)
 		return -1;