git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ethdev: add namespace
[dpdk.git] / drivers / net / hns3 / hns3_rss.c
diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c
index 3a81e90..85495bb 100644 (file)
--- a/drivers/net/hns3/hns3_rss.c
+++ b/drivers/net/hns3/hns3_rss.c
@@ -76,69 +76,69 @@ static const struct {
        uint64_t rss_types;
        uint64_t rss_field;
 } hns3_set_tuple_table[] = {
-       { ETH_RSS_FRAG_IPV4 | ETH_RSS_L3_SRC_ONLY,
+       { RTE_ETH_RSS_FRAG_IPV4 | RTE_ETH_RSS_L3_SRC_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_FRAG_IP_S) },
-       { ETH_RSS_FRAG_IPV4 | ETH_RSS_L3_DST_ONLY,
+       { RTE_ETH_RSS_FRAG_IPV4 | RTE_ETH_RSS_L3_DST_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_FRAG_IP_D) },
-       { ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY,
+       { RTE_ETH_RSS_NONFRAG_IPV4_TCP | RTE_ETH_RSS_L3_SRC_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV4_TCP_EN_IP_S) },
-       { ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY,
+       { RTE_ETH_RSS_NONFRAG_IPV4_TCP | RTE_ETH_RSS_L3_DST_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV4_TCP_EN_IP_D) },
-       { ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_SRC_ONLY,
+       { RTE_ETH_RSS_NONFRAG_IPV4_TCP | RTE_ETH_RSS_L4_SRC_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV4_TCP_EN_TCP_S) },
-       { ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_DST_ONLY,
+       { RTE_ETH_RSS_NONFRAG_IPV4_TCP | RTE_ETH_RSS_L4_DST_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV4_TCP_EN_TCP_D) },
-       { ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY,
+       { RTE_ETH_RSS_NONFRAG_IPV4_UDP | RTE_ETH_RSS_L3_SRC_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV4_UDP_EN_IP_S) },
-       { ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY,
+       { RTE_ETH_RSS_NONFRAG_IPV4_UDP | RTE_ETH_RSS_L3_DST_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV4_UDP_EN_IP_D) },
-       { ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_SRC_ONLY,
+       { RTE_ETH_RSS_NONFRAG_IPV4_UDP | RTE_ETH_RSS_L4_SRC_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV4_UDP_EN_UDP_S) },
-       { ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_DST_ONLY,
+       { RTE_ETH_RSS_NONFRAG_IPV4_UDP | RTE_ETH_RSS_L4_DST_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV4_UDP_EN_UDP_D) },
-       { ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY,
+       { RTE_ETH_RSS_NONFRAG_IPV4_SCTP | RTE_ETH_RSS_L3_SRC_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_IP_S) },
-       { ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY,
+       { RTE_ETH_RSS_NONFRAG_IPV4_SCTP | RTE_ETH_RSS_L3_DST_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_IP_D) },
-       { ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_SRC_ONLY,
+       { RTE_ETH_RSS_NONFRAG_IPV4_SCTP | RTE_ETH_RSS_L4_SRC_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_SCTP_S) },
-       { ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_DST_ONLY,
+       { RTE_ETH_RSS_NONFRAG_IPV4_SCTP | RTE_ETH_RSS_L4_DST_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_SCTP_D) },
-       { ETH_RSS_NONFRAG_IPV4_OTHER | ETH_RSS_L3_SRC_ONLY,
+       { RTE_ETH_RSS_NONFRAG_IPV4_OTHER | RTE_ETH_RSS_L3_SRC_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_S) },
-       { ETH_RSS_NONFRAG_IPV4_OTHER | ETH_RSS_L3_DST_ONLY,
+       { RTE_ETH_RSS_NONFRAG_IPV4_OTHER | RTE_ETH_RSS_L3_DST_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_D) },
-       { ETH_RSS_FRAG_IPV6 | ETH_RSS_L3_SRC_ONLY,
+       { RTE_ETH_RSS_FRAG_IPV6 | RTE_ETH_RSS_L3_SRC_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV6_FRAG_IP_S) },
-       { ETH_RSS_FRAG_IPV6 | ETH_RSS_L3_DST_ONLY,
+       { RTE_ETH_RSS_FRAG_IPV6 | RTE_ETH_RSS_L3_DST_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV6_FRAG_IP_D) },
-       { ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY,
+       { RTE_ETH_RSS_NONFRAG_IPV6_TCP | RTE_ETH_RSS_L3_SRC_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV6_TCP_EN_IP_S) },
-       { ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY,
+       { RTE_ETH_RSS_NONFRAG_IPV6_TCP | RTE_ETH_RSS_L3_DST_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV6_TCP_EN_IP_D) },
-       { ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_SRC_ONLY,
+       { RTE_ETH_RSS_NONFRAG_IPV6_TCP | RTE_ETH_RSS_L4_SRC_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV6_TCP_EN_TCP_S) },
-       { ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_DST_ONLY,
+       { RTE_ETH_RSS_NONFRAG_IPV6_TCP | RTE_ETH_RSS_L4_DST_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV6_TCP_EN_TCP_D) },
-       { ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY,
+       { RTE_ETH_RSS_NONFRAG_IPV6_UDP | RTE_ETH_RSS_L3_SRC_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV6_UDP_EN_IP_S) },
-       { ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY,
+       { RTE_ETH_RSS_NONFRAG_IPV6_UDP | RTE_ETH_RSS_L3_DST_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV6_UDP_EN_IP_D) },
-       { ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_SRC_ONLY,
+       { RTE_ETH_RSS_NONFRAG_IPV6_UDP | RTE_ETH_RSS_L4_SRC_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV6_UDP_EN_UDP_S) },
-       { ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_DST_ONLY,
+       { RTE_ETH_RSS_NONFRAG_IPV6_UDP | RTE_ETH_RSS_L4_DST_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV6_UDP_EN_UDP_D) },
-       { ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY,
+       { RTE_ETH_RSS_NONFRAG_IPV6_SCTP | RTE_ETH_RSS_L3_SRC_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_IP_S) },
-       { ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY,
+       { RTE_ETH_RSS_NONFRAG_IPV6_SCTP | RTE_ETH_RSS_L3_DST_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_IP_D) },
-       { ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_SRC_ONLY,
+       { RTE_ETH_RSS_NONFRAG_IPV6_SCTP | RTE_ETH_RSS_L4_SRC_ONLY,
          BIT_ULL(HNS3_RSS_FILED_IPV6_SCTP_EN_SCTP_S) },
-       { ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_DST_ONLY,
+       { RTE_ETH_RSS_NONFRAG_IPV6_SCTP | RTE_ETH_RSS_L4_DST_ONLY,
          BIT_ULL(HNS3_RSS_FILED_IPV6_SCTP_EN_SCTP_D) },
-       { ETH_RSS_NONFRAG_IPV6_OTHER | ETH_RSS_L3_SRC_ONLY,
+       { RTE_ETH_RSS_NONFRAG_IPV6_OTHER | RTE_ETH_RSS_L3_SRC_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_S) },
-       { ETH_RSS_NONFRAG_IPV6_OTHER | ETH_RSS_L3_DST_ONLY,
+       { RTE_ETH_RSS_NONFRAG_IPV6_OTHER | RTE_ETH_RSS_L3_DST_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_D) },
 };
 
@@ -146,44 +146,44 @@ static const struct {
        uint64_t rss_types;
        uint64_t rss_field;
 } hns3_set_rss_types[] = {
-       { ETH_RSS_FRAG_IPV4, BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_FRAG_IP_D) |
+       { RTE_ETH_RSS_FRAG_IPV4, BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_FRAG_IP_D) |
          BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_FRAG_IP_S) },
-       { ETH_RSS_NONFRAG_IPV4_TCP, BIT_ULL(HNS3_RSS_FIELD_IPV4_TCP_EN_IP_S) |
+       { RTE_ETH_RSS_NONFRAG_IPV4_TCP, BIT_ULL(HNS3_RSS_FIELD_IPV4_TCP_EN_IP_S) |
          BIT_ULL(HNS3_RSS_FIELD_IPV4_TCP_EN_IP_D) |
          BIT_ULL(HNS3_RSS_FIELD_IPV4_TCP_EN_TCP_S) |
          BIT_ULL(HNS3_RSS_FIELD_IPV4_TCP_EN_TCP_D) },
-       { ETH_RSS_NONFRAG_IPV4_TCP, BIT_ULL(HNS3_RSS_FIELD_IPV4_TCP_EN_IP_S) |
+       { RTE_ETH_RSS_NONFRAG_IPV4_TCP, BIT_ULL(HNS3_RSS_FIELD_IPV4_TCP_EN_IP_S) |
          BIT_ULL(HNS3_RSS_FIELD_IPV4_TCP_EN_IP_D) |
          BIT_ULL(HNS3_RSS_FIELD_IPV4_TCP_EN_TCP_S) |
          BIT_ULL(HNS3_RSS_FIELD_IPV4_TCP_EN_TCP_D) },
-       { ETH_RSS_NONFRAG_IPV4_UDP, BIT_ULL(HNS3_RSS_FIELD_IPV4_UDP_EN_IP_S) |
+       { RTE_ETH_RSS_NONFRAG_IPV4_UDP, BIT_ULL(HNS3_RSS_FIELD_IPV4_UDP_EN_IP_S) |
          BIT_ULL(HNS3_RSS_FIELD_IPV4_UDP_EN_IP_D) |
          BIT_ULL(HNS3_RSS_FIELD_IPV4_UDP_EN_UDP_S) |
          BIT_ULL(HNS3_RSS_FIELD_IPV4_UDP_EN_UDP_D) },
-       { ETH_RSS_NONFRAG_IPV4_SCTP, BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_IP_S) |
+       { RTE_ETH_RSS_NONFRAG_IPV4_SCTP, BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_IP_S) |
          BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_IP_D) |
          BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_SCTP_S) |
          BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_SCTP_D) |
          BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_SCTP_VER) },
-       { ETH_RSS_NONFRAG_IPV4_OTHER,
+       { RTE_ETH_RSS_NONFRAG_IPV4_OTHER,
          BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_S) |
          BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_D) },
-       { ETH_RSS_FRAG_IPV6, BIT_ULL(HNS3_RSS_FIELD_IPV6_FRAG_IP_S) |
+       { RTE_ETH_RSS_FRAG_IPV6, BIT_ULL(HNS3_RSS_FIELD_IPV6_FRAG_IP_S) |
          BIT_ULL(HNS3_RSS_FIELD_IPV6_FRAG_IP_D) },
-       { ETH_RSS_NONFRAG_IPV6_TCP, BIT_ULL(HNS3_RSS_FIELD_IPV6_TCP_EN_IP_S) |
+       { RTE_ETH_RSS_NONFRAG_IPV6_TCP, BIT_ULL(HNS3_RSS_FIELD_IPV6_TCP_EN_IP_S) |
          BIT_ULL(HNS3_RSS_FIELD_IPV6_TCP_EN_IP_D) |
          BIT_ULL(HNS3_RSS_FIELD_IPV6_TCP_EN_TCP_S) |
          BIT_ULL(HNS3_RSS_FIELD_IPV6_TCP_EN_TCP_D) },
-       { ETH_RSS_NONFRAG_IPV6_UDP, BIT_ULL(HNS3_RSS_FIELD_IPV6_UDP_EN_IP_S) |
+       { RTE_ETH_RSS_NONFRAG_IPV6_UDP, BIT_ULL(HNS3_RSS_FIELD_IPV6_UDP_EN_IP_S) |
          BIT_ULL(HNS3_RSS_FIELD_IPV6_UDP_EN_IP_D) |
          BIT_ULL(HNS3_RSS_FIELD_IPV6_UDP_EN_UDP_S) |
          BIT_ULL(HNS3_RSS_FIELD_IPV6_UDP_EN_UDP_D) },
-       { ETH_RSS_NONFRAG_IPV6_SCTP, BIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_IP_S) |
+       { RTE_ETH_RSS_NONFRAG_IPV6_SCTP, BIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_IP_S) |
          BIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_IP_D) |
          BIT_ULL(HNS3_RSS_FILED_IPV6_SCTP_EN_SCTP_D) |
          BIT_ULL(HNS3_RSS_FILED_IPV6_SCTP_EN_SCTP_S) |
          BIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_SCTP_VER) },
-       { ETH_RSS_NONFRAG_IPV6_OTHER,
+       { RTE_ETH_RSS_NONFRAG_IPV6_OTHER,
          BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_S) |
          BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_D) }
 };
@@ -365,10 +365,10 @@ hns3_set_rss_tuple_by_rss_hf(struct hns3_hw *hw,
         * When user does not specify the following types or a combination of
         * the following types, it enables all fields for the supported RSS
         * types. the following types as:
-        * - ETH_RSS_L3_SRC_ONLY
-        * - ETH_RSS_L3_DST_ONLY
-        * - ETH_RSS_L4_SRC_ONLY
-        * - ETH_RSS_L4_DST_ONLY
+        * - RTE_ETH_RSS_L3_SRC_ONLY
+        * - RTE_ETH_RSS_L3_DST_ONLY
+        * - RTE_ETH_RSS_L4_SRC_ONLY
+        * - RTE_ETH_RSS_L4_DST_ONLY
         */
        if (fields_count == 0) {
                for (i = 0; i < RTE_DIM(hns3_set_rss_types); i++) {
@@ -520,8 +520,8 @@ hns3_dev_rss_reta_update(struct rte_eth_dev *dev,
        memcpy(indirection_tbl, rss_cfg->rss_indirection_tbl,
               sizeof(rss_cfg->rss_indirection_tbl));
        for (i = 0; i < reta_size; i++) {
-               idx = i / RTE_RETA_GROUP_SIZE;
-               shift = i % RTE_RETA_GROUP_SIZE;
+               idx = i / RTE_ETH_RETA_GROUP_SIZE;
+               shift = i % RTE_ETH_RETA_GROUP_SIZE;
                if (reta_conf[idx].reta[shift] >= hw->alloc_rss_size) {
                        rte_spinlock_unlock(&hw->lock);
                        hns3_err(hw, "queue id(%u) set to redirection table "
@@ -572,8 +572,8 @@ hns3_dev_rss_reta_query(struct rte_eth_dev *dev,
        }
        rte_spinlock_lock(&hw->lock);
        for (i = 0; i < reta_size; i++) {
-               idx = i / RTE_RETA_GROUP_SIZE;
-               shift = i % RTE_RETA_GROUP_SIZE;
+               idx = i / RTE_ETH_RETA_GROUP_SIZE;
+               shift = i % RTE_ETH_RETA_GROUP_SIZE;
                if (reta_conf[idx].mask & (1ULL << shift))
                        reta_conf[idx].reta[shift] =
                                                rss_cfg->rss_indirection_tbl[i];
@@ -692,7 +692,7 @@ hns3_config_rss(struct hns3_adapter *hns)
        }
 
        /* When RSS is off, redirect the packet queue 0 */
-       if (((uint32_t)mq_mode & ETH_MQ_RX_RSS_FLAG) == 0)
+       if (((uint32_t)mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) == 0)
                hns3_rss_uninit(hns);
 
        /* Configure RSS hash algorithm and hash key offset */
@@ -709,7 +709,7 @@ hns3_config_rss(struct hns3_adapter *hns)
         * When RSS is off, it doesn't need to configure rss redirection table
         * to hardware.
         */
-       if (((uint32_t)mq_mode & ETH_MQ_RX_RSS_FLAG)) {
+       if (((uint32_t)mq_mode & RTE_ETH_MQ_RX_RSS_FLAG)) {
                ret = hns3_set_rss_indir_table(hw, rss_cfg->rss_indirection_tbl,
                                               hw->rss_ind_tbl_size);
                if (ret)
@@ -723,7 +723,7 @@ hns3_config_rss(struct hns3_adapter *hns)
        return ret;
 
 rss_indir_table_uninit:
-       if (((uint32_t)mq_mode & ETH_MQ_RX_RSS_FLAG)) {
+       if (((uint32_t)mq_mode & RTE_ETH_MQ_RX_RSS_FLAG)) {
                ret1 = hns3_rss_reset_indir_table(hw);
                if (ret1 != 0)
                        return ret;
DPDK repo used for reviews