common/cnxk: correct ROC naming conventions

Corrected some names to follow ROC naming convention in ROC NPC code.

Signed-off-by: Satheesh Paul <psatheesh@marvell.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>

diff --git a/drivers/common/cnxk/roc_npc.h b/drivers/common/cnxk/roc_npc.h
index aecea37b3d45e8825a45f6a90522c95dc164d693..723eadc649a307bca0be6ec873af6c39cea3c00f 100644 (file)
--- a/drivers/common/cnxk/roc_npc.h
+++ b/drivers/common/cnxk/roc_npc.h
@@ -61,7 +61,7 @@ struct roc_npc_flow_item_raw {
 
 struct roc_ether_addr {
        uint8_t addr_bytes[PLT_ETHER_ADDR_LEN]; /**< Addr bytes in tx order */
-} plt_aligned(2);
+} __plt_aligned(2);
 
 struct roc_ether_hdr {
        struct roc_ether_addr d_addr; /**< Destination address. */
@@ -73,7 +73,7 @@ struct roc_ether_hdr {
                } S_un; /**< Do not use directly; use s_addr instead.*/
        };
        uint16_t ether_type; /**< Frame type. */
-} plt_aligned(2);
+} __plt_aligned(2);
 
 PLT_STD_C11
 struct roc_npc_flow_item_eth {
@@ -255,7 +255,7 @@ enum roc_npc_rss_hash_function {
 struct roc_npc_action_rss {
        enum roc_npc_rss_hash_function func;
        uint32_t level;
-       uint64_t types;        /**< Specific RSS hash types (see RTE_ETH_RSS_*). */
+       uint64_t types;        /**< Specific RSS hash types (see ETH_RSS_*). */
        uint32_t key_len;      /**< Hash key length in bytes. */
        uint32_t queue_num;    /**< Number of entries in @p queue. */
        const uint8_t *key;    /**< Hash key. */

diff --git a/drivers/common/cnxk/roc_npc_mcam.c b/drivers/common/cnxk/roc_npc_mcam.c
index 3447b593449abdb9413b1c7030206e10e2b9c405..bccbaaa51f968dfcab4e99ce36096ea65bf525e5 100644 (file)
--- a/drivers/common/cnxk/roc_npc_mcam.c
+++ b/drivers/common/cnxk/roc_npc_mcam.c
@@ -268,8 +268,8 @@ npc_get_kex_capability(struct npc *npc)
        kex_cap.bit.dip_addr = npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_IP,
                                                  14 * 8, 4 * 8);
        /* IP6 SIP: offset 8B, len 16B */
-       kex_cap.bit.sip6_addr = npc_is_kex_enabled(
-               npc, NPC_LID_LC, NPC_LT_LC_IP6, 8 * 8, 16 * 8);
+       kex_cap.bit.sip6_addr = npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_IP6,
+                                       8 * 8, 16 * 8);
        /* IP6 DIP: offset 24B, len 16B */
        kex_cap.bit.dip6_addr = npc_is_kex_enabled(
                npc, NPC_LID_LC, NPC_LT_LC_IP6, 24 * 8, 16 * 8);
@@ -283,8 +283,8 @@ npc_get_kex_capability(struct npc *npc)
        /* Custom L3 frame: varied offset and lengths */
        kex_cap.bit.custom_l3 =
                npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_CUSTOM0, 0, 0);
-       kex_cap.bit.custom_l3 |=
-               npc_is_kex_enabled(npc, NPC_LID_LC, NPC_LT_LC_CUSTOM1, 0, 0);
+       kex_cap.bit.custom_l3 |= (uint64_t)npc_is_kex_enabled(npc, NPC_LID_LC,
+                                       NPC_LT_LC_CUSTOM1, 0, 0);
        /* SCTP sport : offset 0B, len 2B */
        kex_cap.bit.sctp_sport = npc_is_kex_enabled(
                npc, NPC_LID_LD, NPC_LT_LD_SCTP, 0 * 8, 2 * 8);

diff --git a/drivers/common/cnxk/roc_platform.h b/drivers/common/cnxk/roc_platform.h
index 86987aea3b11806f9a826e03bf430f4c78038f0d..c30b76adf3a742bfec1a2fccd4b0d1e530de94db 100644 (file)
--- a/drivers/common/cnxk/roc_platform.h
+++ b/drivers/common/cnxk/roc_platform.h
@@ -98,7 +98,7 @@
 #define plt_cpu_to_be_64 rte_cpu_to_be_64
 #define plt_be_to_cpu_64 rte_be_to_cpu_64
 
-#define plt_aligned        __rte_aligned
+#define __plt_aligned      __rte_aligned
 #define plt_align32pow2            rte_align32pow2
 #define plt_align32prevpow2 rte_align32prevpow2