octeontx2-af: Update/Fix NPC field hash extract feature

[ Upstream commit 406bed11fb91a0b35c26fe633d8700febaec6439 ]

1. As per previous implementation, mask and control parameter to
generate the field hash value was not passed to the caller program.
Updated the secret key mbox to share that information as well,
as a part of the fix.
2. Earlier implementation did not consider hash reduction of both
source and destination IPv6 addresses. Only source IPv6 address
was considered. This fix solves that and provides option to hash

Fixes: 56d9f5fd2246 ("octeontx2-af: Use hashed field in MCAM key")
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/mbox.h b/drivers/net/ethernet/marvell/octeontx2/af/mbox.h
index c7c92c7510fa6f11065a237cbcc4ed0de7007642..5921a78661e41a14e34210f21e6096f03223b4c2 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/mbox.h
+++ b/drivers/net/ethernet/marvell/octeontx2/af/mbox.h
@@ -242,9 +242,9 @@ M(NPC_MCAM_READ_BASE_RULE, 0x6011, npc_read_base_steer_rule,            \
 M(NPC_MCAM_GET_STATS, 0x6012, npc_mcam_entry_stats,                     \
                                   npc_mcam_get_stats_req,              \
                                   npc_mcam_get_stats_rsp)              \
-M(NPC_GET_SECRET_KEY, 0x6013, npc_get_secret_key,                     \
-                                  npc_get_secret_key_req,              \
-                                  npc_get_secret_key_rsp)              \
+M(NPC_GET_FIELD_HASH_INFO, 0x6013, npc_get_field_hash_info,                     \
+                                  npc_get_field_hash_info_req,              \
+                                  npc_get_field_hash_info_rsp)              \
 M(NPC_GET_FIELD_STATUS, 0x6014, npc_get_field_status,                     \
                                   npc_get_field_status_req,              \
                                   npc_get_field_status_rsp)              \
@@ -1513,14 +1513,20 @@ struct npc_mcam_get_stats_rsp {
        u8 stat_ena; /* enabled */
 };
 
-struct npc_get_secret_key_req {
+struct npc_get_field_hash_info_req {
        struct mbox_msghdr hdr;
        u8 intf;
 };
 
-struct npc_get_secret_key_rsp {
+struct npc_get_field_hash_info_rsp {
        struct mbox_msghdr hdr;
        u64 secret_key[3];
+#define NPC_MAX_HASH 2
+#define NPC_MAX_HASH_MASK 2
+       /* NPC_AF_INTF(0..1)_HASH(0..1)_MASK(0..1) */
+       u64 hash_mask[NPC_MAX_INTF][NPC_MAX_HASH][NPC_MAX_HASH_MASK];
+       /* NPC_AF_INTF(0..1)_HASH(0..1)_RESULT_CTRL */
+       u64 hash_ctrl[NPC_MAX_INTF][NPC_MAX_HASH];
 };
 
 enum ptp_op {

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 5aed3dbf3b9910ac6f0cb0cb4a2da47bf542b069..18f12f9156544c3f9dc605ae95a547b56db1ccdb 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.c
@@ -110,8 +110,8 @@ static u64 npc_update_use_hash(int lt, int ld)
                 * in KEX_LD_CFG
                 */
                cfg = KEX_LD_CFG_USE_HASH(0x1, 0x03,
-                                         ld ? 0x8 : 0x18,
-                                         0x1, 0x0, 0x10);
+                                         ld ? 0x18 : 0x8,
+                                         0x1, 0x0, ld ? 0x14 : 0x10);
                break;
        }
 
@@ -134,7 +134,6 @@ static void npc_program_mkex_hash_rx(struct rvu *rvu, int blkaddr,
                                if (mkex_hash->lid_lt_ld_hash_en[intf][lid][lt][ld]) {
                                        u64 cfg = npc_update_use_hash(lt, ld);
 
-                                       hash_cnt++;
                                        if (hash_cnt == NPC_MAX_HASH)
                                                return;
 
@@ -149,6 +148,8 @@ static void npc_program_mkex_hash_rx(struct rvu *rvu, int blkaddr,
                                                             mkex_hash->hash_mask[intf][ld][1]);
                                        SET_KEX_LD_HASH_CTRL(intf, ld,
                                                             mkex_hash->hash_ctrl[intf][ld]);
+
+                                       hash_cnt++;
                                }
                        }
                }
@@ -171,7 +172,6 @@ static void npc_program_mkex_hash_tx(struct rvu *rvu, int blkaddr,
                                if (mkex_hash->lid_lt_ld_hash_en[intf][lid][lt][ld]) {
                                        u64 cfg = npc_update_use_hash(lt, ld);
 
-                                       hash_cnt++;
                                        if (hash_cnt == NPC_MAX_HASH)
                                                return;
 
@@ -187,8 +187,6 @@ static void npc_program_mkex_hash_tx(struct rvu *rvu, int blkaddr,
                                        SET_KEX_LD_HASH_CTRL(intf, ld,
                                                             mkex_hash->hash_ctrl[intf][ld]);
                                        hash_cnt++;
-                                       if (hash_cnt == NPC_MAX_HASH)
-                                               return;
                                }
                }
        }
@@ -242,8 +240,8 @@ void npc_update_field_hash(struct rvu *rvu, u8 intf,
                           struct flow_msg *omask)
 {
        struct npc_mcam_kex_hash *mkex_hash = rvu->kpu.mkex_hash;
-       struct npc_get_secret_key_req req;
-       struct npc_get_secret_key_rsp rsp;
+       struct npc_get_field_hash_info_req req;
+       struct npc_get_field_hash_info_rsp rsp;
        u64 ldata[2], cfg;
        u32 field_hash;
        u8 hash_idx;
@@ -254,7 +252,7 @@ void npc_update_field_hash(struct rvu *rvu, u8 intf,
        }
 
        req.intf = intf;
-       rvu_mbox_handler_npc_get_secret_key(rvu, &req, &rsp);
+       rvu_mbox_handler_npc_get_field_hash_info(rvu, &req, &rsp);
 
        for (hash_idx = 0; hash_idx < NPC_MAX_HASH; hash_idx++) {
                cfg = rvu_read64(rvu, blkaddr, NPC_AF_INTFX_HASHX_CFG(intf, hash_idx));
@@ -315,13 +313,13 @@ void npc_update_field_hash(struct rvu *rvu, u8 intf,
        }
 }
 
-int rvu_mbox_handler_npc_get_secret_key(struct rvu *rvu,
-                                       struct npc_get_secret_key_req *req,
-                                       struct npc_get_secret_key_rsp *rsp)
+int rvu_mbox_handler_npc_get_field_hash_info(struct rvu *rvu,
+                                            struct npc_get_field_hash_info_req *req,
+                                            struct npc_get_field_hash_info_rsp *rsp)
 {
        u64 *secret_key = rsp->secret_key;
        u8 intf = req->intf;
-       int blkaddr;
+       int i, j, blkaddr;
 
        blkaddr = rvu_get_blkaddr(rvu, BLKTYPE_NPC, 0);
        if (blkaddr < 0) {
@@ -333,6 +331,19 @@ int rvu_mbox_handler_npc_get_secret_key(struct rvu *rvu,
        secret_key[1] = rvu_read64(rvu, blkaddr, NPC_AF_INTFX_SECRET_KEY1(intf));
        secret_key[2] = rvu_read64(rvu, blkaddr, NPC_AF_INTFX_SECRET_KEY2(intf));
 
+       for (i = 0; i < NPC_MAX_HASH; i++) {
+               for (j = 0; j < NPC_MAX_HASH_MASK; j++) {
+                       rsp->hash_mask[NIX_INTF_RX][i][j] =
+                               GET_KEX_LD_HASH_MASK(NIX_INTF_RX, i, j);
+                       rsp->hash_mask[NIX_INTF_TX][i][j] =
+                               GET_KEX_LD_HASH_MASK(NIX_INTF_TX, i, j);
+               }
+       }
+
+       for (i = 0; i < NPC_MAX_INTF; i++)
+               for (j = 0; j < NPC_MAX_HASH; j++)
+                       rsp->hash_ctrl[i][j] = GET_KEX_LD_HASH_CTRL(i, j);
+
        return 0;
 }
 

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.h b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.h
index 3efeb09c58dec3cbbb5c4001fd84fd2ec2b9d256..65936f4aeaacf0747f101ce353de4d47be6c5280 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.h
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_hash.h
@@ -31,6 +31,12 @@
        rvu_write64(rvu, blkaddr,       \
                    NPC_AF_INTFX_HASHX_MASKX(intf, ld, mask_idx), cfg)
 
+#define GET_KEX_LD_HASH_CTRL(intf, ld) \
+       rvu_read64(rvu, blkaddr, NPC_AF_INTFX_HASHX_RESULT_CTRL(intf, ld))
+
+#define GET_KEX_LD_HASH_MASK(intf, ld, mask_idx)       \
+       rvu_read64(rvu, blkaddr, NPC_AF_INTFX_HASHX_MASKX(intf, ld, mask_idx))
+
 #define SET_KEX_LD_HASH_CTRL(intf, ld, cfg) \
        rvu_write64(rvu, blkaddr,       \
                    NPC_AF_INTFX_HASHX_RESULT_CTRL(intf, ld), cfg)