git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
net/txgbe: support ntuple filter add and delete
[dpdk.git] / drivers / net / ice / ice_ethdev.c
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 1e15cd3..587f485 100644 (file)
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -1128,28 +1128,28 @@ ice_vsi_config_qinq_insertion(struct ice_vsi *vsi, bool on)
        if (vsi->info.valid_sections &
                rte_cpu_to_le_16(ICE_AQ_VSI_PROP_OUTER_TAG_VALID)) {
                if (on) {
-                       if ((vsi->info.outer_tag_flags &
-                            ICE_AQ_VSI_OUTER_TAG_ACCEPT_HOST) ==
-                           ICE_AQ_VSI_OUTER_TAG_ACCEPT_HOST)
+                       if ((vsi->info.outer_vlan_flags &
+                            ICE_AQ_VSI_OUTER_VLAN_PORT_BASED_ACCEPT_HOST) ==
+                           ICE_AQ_VSI_OUTER_VLAN_PORT_BASED_ACCEPT_HOST)
                                return 0; /* already on */
                } else {
-                       if (!(vsi->info.outer_tag_flags &
-                             ICE_AQ_VSI_OUTER_TAG_ACCEPT_HOST))
+                       if (!(vsi->info.outer_vlan_flags &
+                             ICE_AQ_VSI_OUTER_VLAN_PORT_BASED_ACCEPT_HOST))
                                return 0; /* already off */
                }
        }
 
        if (on)
-               qinq_flags = ICE_AQ_VSI_OUTER_TAG_ACCEPT_HOST;
+               qinq_flags = ICE_AQ_VSI_OUTER_VLAN_PORT_BASED_ACCEPT_HOST;
        else
                qinq_flags = 0;
        /* clear global insertion and use per packet insertion */
-       vsi->info.outer_tag_flags &= ~(ICE_AQ_VSI_OUTER_TAG_INSERT);
-       vsi->info.outer_tag_flags &= ~(ICE_AQ_VSI_OUTER_TAG_ACCEPT_HOST);
-       vsi->info.outer_tag_flags |= qinq_flags;
+       vsi->info.outer_vlan_flags &= ~(ICE_AQ_VSI_OUTER_VLAN_PORT_BASED_INSERT);
+       vsi->info.outer_vlan_flags &= ~(ICE_AQ_VSI_OUTER_VLAN_PORT_BASED_ACCEPT_HOST);
+       vsi->info.outer_vlan_flags |= qinq_flags;
        /* use default vlan type 0x8100 */
-       vsi->info.outer_tag_flags &= ~(ICE_AQ_VSI_OUTER_TAG_TYPE_M);
-       vsi->info.outer_tag_flags |= ICE_DFLT_OUTER_TAG_TYPE <<
+       vsi->info.outer_vlan_flags &= ~(ICE_AQ_VSI_OUTER_TAG_TYPE_M);
+       vsi->info.outer_vlan_flags |= ICE_DFLT_OUTER_TAG_TYPE <<
                                     ICE_AQ_VSI_OUTER_TAG_TYPE_S;
        (void)rte_memcpy(&ctxt.info, &vsi->info, sizeof(vsi->info));
        ctxt.info.valid_sections =
@@ -1181,27 +1181,27 @@ ice_vsi_config_qinq_stripping(struct ice_vsi *vsi, bool on)
        if (vsi->info.valid_sections &
                rte_cpu_to_le_16(ICE_AQ_VSI_PROP_OUTER_TAG_VALID)) {
                if (on) {
-                       if ((vsi->info.outer_tag_flags &
-                            ICE_AQ_VSI_OUTER_TAG_MODE_M) ==
-                           ICE_AQ_VSI_OUTER_TAG_COPY)
+                       if ((vsi->info.outer_vlan_flags &
+                            ICE_AQ_VSI_OUTER_VLAN_EMODE_M) ==
+                           ICE_AQ_VSI_OUTER_VLAN_EMODE_SHOW)
                                return 0; /* already on */
                } else {
-                       if ((vsi->info.outer_tag_flags &
-                            ICE_AQ_VSI_OUTER_TAG_MODE_M) ==
-                           ICE_AQ_VSI_OUTER_TAG_NOTHING)
+                       if ((vsi->info.outer_vlan_flags &
+                            ICE_AQ_VSI_OUTER_VLAN_EMODE_M) ==
+                           ICE_AQ_VSI_OUTER_VLAN_EMODE_SHOW_BOTH)
                                return 0; /* already off */
                }
        }
 
        if (on)
-               qinq_flags = ICE_AQ_VSI_OUTER_TAG_COPY;
+               qinq_flags = ICE_AQ_VSI_OUTER_VLAN_EMODE_SHOW;
        else
-               qinq_flags = ICE_AQ_VSI_OUTER_TAG_NOTHING;
-       vsi->info.outer_tag_flags &= ~(ICE_AQ_VSI_OUTER_TAG_MODE_M);
-       vsi->info.outer_tag_flags |= qinq_flags;
+               qinq_flags = ICE_AQ_VSI_OUTER_VLAN_EMODE_SHOW_BOTH;
+       vsi->info.outer_vlan_flags &= ~(ICE_AQ_VSI_OUTER_VLAN_EMODE_M);
+       vsi->info.outer_vlan_flags |= qinq_flags;
        /* use default vlan type 0x8100 */
-       vsi->info.outer_tag_flags &= ~(ICE_AQ_VSI_OUTER_TAG_TYPE_M);
-       vsi->info.outer_tag_flags |= ICE_DFLT_OUTER_TAG_TYPE <<
+       vsi->info.outer_vlan_flags &= ~(ICE_AQ_VSI_OUTER_TAG_TYPE_M);
+       vsi->info.outer_vlan_flags |= ICE_DFLT_OUTER_TAG_TYPE <<
                                     ICE_AQ_VSI_OUTER_TAG_TYPE_S;
        (void)rte_memcpy(&ctxt.info, &vsi->info, sizeof(vsi->info));
        ctxt.info.valid_sections =
@@ -1579,8 +1579,8 @@ ice_setup_vsi(struct ice_pf *pf, enum ice_vsi_type type)
                vsi_ctx.info.sw_id = hw->port_info->sw_id;
                vsi_ctx.info.sw_flags2 = ICE_AQ_VSI_SW_FLAG_LAN_ENA;
                /* Allow all untagged or tagged packets */
-               vsi_ctx.info.vlan_flags = ICE_AQ_VSI_VLAN_MODE_ALL;
-               vsi_ctx.info.vlan_flags |= ICE_AQ_VSI_VLAN_EMOD_NOTHING;
+               vsi_ctx.info.inner_vlan_flags = ICE_AQ_VSI_INNER_VLAN_TX_MODE_ALL;
+               vsi_ctx.info.inner_vlan_flags |= ICE_AQ_VSI_INNER_VLAN_EMODE_NOTHING;
                vsi_ctx.info.q_opt_rss = ICE_AQ_VSI_Q_OPT_RSS_LUT_PF |
                                         ICE_AQ_VSI_Q_OPT_RSS_TPLZ;
 
@@ -3068,7 +3068,7 @@ ice_rss_hash_set(struct ice_pf *pf, uint64_t rss_hf)
        if (rss_hf & ETH_RSS_NONFRAG_IPV4_UDP) {
                cfg.addl_hdrs = ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_UDP |
                                ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER;
-               cfg.hash_flds = ICE_FLOW_HASH_IPV4;
+               cfg.hash_flds = ICE_HASH_UDP_IPV4;
                ret = ice_add_rss_cfg_wrap(pf, vsi->idx, &cfg);
                if (ret)
                        PMD_DRV_LOG(ERR, "%s GTPU_IPV4_UDP rss flow fail %d",
@@ -3092,7 +3092,7 @@ ice_rss_hash_set(struct ice_pf *pf, uint64_t rss_hf)
        if (rss_hf & ETH_RSS_NONFRAG_IPV6_UDP) {
                cfg.addl_hdrs = ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_UDP |
                                ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER;
-               cfg.hash_flds = ICE_FLOW_HASH_IPV6;
+               cfg.hash_flds = ICE_HASH_UDP_IPV6;
                ret = ice_add_rss_cfg_wrap(pf, vsi->idx, &cfg);
                if (ret)
                        PMD_DRV_LOG(ERR, "%s GTPU_IPV6_UDP rss flow fail %d",
@@ -3116,7 +3116,7 @@ ice_rss_hash_set(struct ice_pf *pf, uint64_t rss_hf)
        if (rss_hf & ETH_RSS_NONFRAG_IPV4_TCP) {
                cfg.addl_hdrs = ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_TCP |
                                ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER;
-               cfg.hash_flds = ICE_FLOW_HASH_IPV4;
+               cfg.hash_flds = ICE_HASH_TCP_IPV4;
                ret = ice_add_rss_cfg_wrap(pf, vsi->idx, &cfg);
                if (ret)
                        PMD_DRV_LOG(ERR, "%s GTPU_IPV4_TCP rss flow fail %d",
@@ -3140,7 +3140,7 @@ ice_rss_hash_set(struct ice_pf *pf, uint64_t rss_hf)
        if (rss_hf & ETH_RSS_NONFRAG_IPV6_TCP) {
                cfg.addl_hdrs = ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_TCP |
                                ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER;
-               cfg.hash_flds = ICE_FLOW_HASH_IPV6;
+               cfg.hash_flds = ICE_HASH_TCP_IPV6;
                ret = ice_add_rss_cfg_wrap(pf, vsi->idx, &cfg);
                if (ret)
                        PMD_DRV_LOG(ERR, "%s GTPU_IPV6_TCP rss flow fail %d",
@@ -3182,6 +3182,12 @@ static int ice_init_rss(struct ice_pf *pf)
        vsi->rss_key_size = ICE_AQC_GET_SET_RSS_KEY_DATA_RSS_KEY_SIZE;
        vsi->rss_lut_size = pf->hash_lut_size;
 
+       if (nb_q == 0) {
+               PMD_DRV_LOG(WARNING,
+                       "RSS is not supported as rx queues number is zero\n");
+               return 0;
+       }
+
        if (is_safe_mode) {
                PMD_DRV_LOG(WARNING, "RSS is not supported in safe mode\n");
                return 0;
@@ -3840,8 +3846,8 @@ ice_force_phys_link_state(struct ice_hw *hw, bool link_up)
        if (!pcaps)
                return ICE_ERR_NO_MEMORY;
 
-       status = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_SW_CFG, pcaps,
-                                    NULL);
+       status = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_ACTIVE_CFG,
+                                    pcaps, NULL);
        if (status)
                goto out;
 
@@ -4084,24 +4090,24 @@ ice_vsi_config_vlan_stripping(struct ice_vsi *vsi, bool on)
        if (vsi->info.valid_sections &
                rte_cpu_to_le_16(ICE_AQ_VSI_PROP_VLAN_VALID)) {
                if (on) {
-                       if ((vsi->info.vlan_flags &
-                            ICE_AQ_VSI_VLAN_EMOD_M) ==
-                           ICE_AQ_VSI_VLAN_EMOD_STR_BOTH)
+                       if ((vsi->info.inner_vlan_flags &
+                            ICE_AQ_VSI_INNER_VLAN_EMODE_M) ==
+                           ICE_AQ_VSI_INNER_VLAN_EMODE_STR_BOTH)
                                return 0; /* already on */
                } else {
-                       if ((vsi->info.vlan_flags &
-                            ICE_AQ_VSI_VLAN_EMOD_M) ==
-                           ICE_AQ_VSI_VLAN_EMOD_NOTHING)
+                       if ((vsi->info.inner_vlan_flags &
+                            ICE_AQ_VSI_INNER_VLAN_EMODE_M) ==
+                           ICE_AQ_VSI_INNER_VLAN_EMODE_NOTHING)
                                return 0; /* already off */
                }
        }
 
        if (on)
-               vlan_flags = ICE_AQ_VSI_VLAN_EMOD_STR_BOTH;
+               vlan_flags = ICE_AQ_VSI_INNER_VLAN_EMODE_STR_BOTH;
        else
-               vlan_flags = ICE_AQ_VSI_VLAN_EMOD_NOTHING;
-       vsi->info.vlan_flags &= ~(ICE_AQ_VSI_VLAN_EMOD_M);
-       vsi->info.vlan_flags |= vlan_flags;
+               vlan_flags = ICE_AQ_VSI_INNER_VLAN_EMODE_NOTHING;
+       vsi->info.inner_vlan_flags &= ~(ICE_AQ_VSI_INNER_VLAN_EMODE_M);
+       vsi->info.inner_vlan_flags |= vlan_flags;
        (void)rte_memcpy(&ctxt.info, &vsi->info, sizeof(vsi->info));
        ctxt.info.valid_sections =
                rte_cpu_to_le_16(ICE_AQ_VSI_PROP_VLAN_VALID);
@@ -4580,24 +4586,24 @@ ice_vsi_vlan_pvid_set(struct ice_vsi *vsi, struct ice_vsi_vlan_pvid_info *info)
        }
 
        if (info->on) {
-               vsi->info.pvid = info->config.pvid;
+               vsi->info.port_based_inner_vlan = info->config.pvid;
                /**
                 * If insert pvid is enabled, only tagged pkts are
                 * allowed to be sent out.
                 */
-               vlan_flags = ICE_AQ_VSI_PVLAN_INSERT_PVID |
-                            ICE_AQ_VSI_VLAN_MODE_UNTAGGED;
+               vlan_flags = ICE_AQ_VSI_INNER_VLAN_INSERT_PVID |
+                            ICE_AQ_VSI_INNER_VLAN_TX_MODE_ACCEPTUNTAGGED;
        } else {
-               vsi->info.pvid = 0;
+               vsi->info.port_based_inner_vlan = 0;
                if (info->config.reject.tagged == 0)
-                       vlan_flags |= ICE_AQ_VSI_VLAN_MODE_TAGGED;
+                       vlan_flags |= ICE_AQ_VSI_INNER_VLAN_TX_MODE_ACCEPTTAGGED;
 
                if (info->config.reject.untagged == 0)
-                       vlan_flags |= ICE_AQ_VSI_VLAN_MODE_UNTAGGED;
+                       vlan_flags |= ICE_AQ_VSI_INNER_VLAN_TX_MODE_ACCEPTUNTAGGED;
        }
-       vsi->info.vlan_flags &= ~(ICE_AQ_VSI_PVLAN_INSERT_PVID |
-                                 ICE_AQ_VSI_VLAN_MODE_M);
-       vsi->info.vlan_flags |= vlan_flags;
+       vsi->info.inner_vlan_flags &= ~(ICE_AQ_VSI_INNER_VLAN_INSERT_PVID |
+                                 ICE_AQ_VSI_INNER_VLAN_EMODE_M);
+       vsi->info.inner_vlan_flags |= vlan_flags;
        memset(&ctxt, 0, sizeof(ctxt));
        rte_memcpy(&ctxt.info, &vsi->info, sizeof(vsi->info));
        ctxt.info.valid_sections =
DPDK repo used for reviews