common/mlx5: move to formal ASO action API
[dpdk.git] / drivers / net / bnxt / bnxt_ethdev.c
index b4c1dae..81c8f8d 100644 (file)
@@ -848,6 +848,10 @@ uint32_t bnxt_get_speed_capabilities(struct bnxt *bp)
        uint32_t link_speed = bp->link_info->support_speeds;
        uint32_t speed_capa = 0;
 
+       /* If PAM4 is configured, use PAM4 supported speed */
+       if (link_speed == 0 && bp->link_info->support_pam4_speeds > 0)
+               link_speed = bp->link_info->support_pam4_speeds;
+
        if (link_speed & HWRM_PORT_PHY_QCFG_OUTPUT_LINK_SPEED_100MB)
                speed_capa |= ETH_LINK_SPEED_100M;
        if (link_speed & HWRM_PORT_PHY_QCFG_OUTPUT_SUPPORT_SPEEDS_100MBHD)
@@ -1346,8 +1350,14 @@ static int bnxt_dev_set_link_down_op(struct rte_eth_dev *eth_dev)
 
 static void bnxt_free_switch_domain(struct bnxt *bp)
 {
-       if (bp->switch_domain_id)
-               rte_eth_switch_domain_free(bp->switch_domain_id);
+       int rc = 0;
+
+       if (bp->switch_domain_id) {
+               rc = rte_eth_switch_domain_free(bp->switch_domain_id);
+               if (rc)
+                       PMD_DRV_LOG(ERR, "free switch domain:%d fail: %d\n",
+                                   bp->switch_domain_id, rc);
+       }
 }
 
 /* Unload the driver, release resources */
@@ -2993,795 +3003,6 @@ bnxt_tx_descriptor_status_op(void *tx_queue, uint16_t offset)
        return RTE_ETH_TX_DESC_FULL;
 }
 
-static struct bnxt_filter_info *
-bnxt_match_and_validate_ether_filter(struct bnxt *bp,
-                               struct rte_eth_ethertype_filter *efilter,
-                               struct bnxt_vnic_info *vnic0,
-                               struct bnxt_vnic_info *vnic,
-                               int *ret)
-{
-       struct bnxt_filter_info *mfilter = NULL;
-       int match = 0;
-       *ret = 0;
-
-       if (efilter->ether_type == RTE_ETHER_TYPE_IPV4 ||
-               efilter->ether_type == RTE_ETHER_TYPE_IPV6) {
-               PMD_DRV_LOG(ERR, "invalid ether_type(0x%04x) in"
-                       " ethertype filter.", efilter->ether_type);
-               *ret = -EINVAL;
-               goto exit;
-       }
-       if (efilter->queue >= bp->rx_nr_rings) {
-               PMD_DRV_LOG(ERR, "Invalid queue %d\n", efilter->queue);
-               *ret = -EINVAL;
-               goto exit;
-       }
-
-       vnic0 = BNXT_GET_DEFAULT_VNIC(bp);
-       vnic = &bp->vnic_info[efilter->queue];
-       if (vnic == NULL) {
-               PMD_DRV_LOG(ERR, "Invalid queue %d\n", efilter->queue);
-               *ret = -EINVAL;
-               goto exit;
-       }
-
-       if (efilter->flags & RTE_ETHTYPE_FLAGS_DROP) {
-               STAILQ_FOREACH(mfilter, &vnic0->filter, next) {
-                       if ((!memcmp(efilter->mac_addr.addr_bytes,
-                                    mfilter->l2_addr, RTE_ETHER_ADDR_LEN) &&
-                            mfilter->flags ==
-                            HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_FLAGS_DROP &&
-                            mfilter->ethertype == efilter->ether_type)) {
-                               match = 1;
-                               break;
-                       }
-               }
-       } else {
-               STAILQ_FOREACH(mfilter, &vnic->filter, next)
-                       if ((!memcmp(efilter->mac_addr.addr_bytes,
-                                    mfilter->l2_addr, RTE_ETHER_ADDR_LEN) &&
-                            mfilter->ethertype == efilter->ether_type &&
-                            mfilter->flags ==
-                            HWRM_CFA_L2_FILTER_CFG_INPUT_FLAGS_PATH_RX)) {
-                               match = 1;
-                               break;
-                       }
-       }
-
-       if (match)
-               *ret = -EEXIST;
-
-exit:
-       return mfilter;
-}
-
-static int
-bnxt_ethertype_filter(struct rte_eth_dev *dev,
-                       enum rte_filter_op filter_op,
-                       void *arg)
-{
-       struct bnxt *bp = dev->data->dev_private;
-       struct rte_eth_ethertype_filter *efilter =
-                       (struct rte_eth_ethertype_filter *)arg;
-       struct bnxt_filter_info *bfilter, *filter1;
-       struct bnxt_vnic_info *vnic, *vnic0;
-       int ret;
-
-       if (filter_op == RTE_ETH_FILTER_NOP)
-               return 0;
-
-       if (arg == NULL) {
-               PMD_DRV_LOG(ERR, "arg shouldn't be NULL for operation %u.",
-                           filter_op);
-               return -EINVAL;
-       }
-
-       vnic0 = BNXT_GET_DEFAULT_VNIC(bp);
-       vnic = &bp->vnic_info[efilter->queue];
-
-       switch (filter_op) {
-       case RTE_ETH_FILTER_ADD:
-               bnxt_match_and_validate_ether_filter(bp, efilter,
-                                                       vnic0, vnic, &ret);
-               if (ret < 0)
-                       return ret;
-
-               bfilter = bnxt_get_unused_filter(bp);
-               if (bfilter == NULL) {
-                       PMD_DRV_LOG(ERR,
-                               "Not enough resources for a new filter.\n");
-                       return -ENOMEM;
-               }
-               bfilter->filter_type = HWRM_CFA_NTUPLE_FILTER;
-               memcpy(bfilter->l2_addr, efilter->mac_addr.addr_bytes,
-                      RTE_ETHER_ADDR_LEN);
-               memcpy(bfilter->dst_macaddr, efilter->mac_addr.addr_bytes,
-                      RTE_ETHER_ADDR_LEN);
-               bfilter->enables |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_MACADDR;
-               bfilter->ethertype = efilter->ether_type;
-               bfilter->enables |= NTUPLE_FLTR_ALLOC_INPUT_EN_ETHERTYPE;
-
-               filter1 = bnxt_get_l2_filter(bp, bfilter, vnic0);
-               if (filter1 == NULL) {
-                       ret = -EINVAL;
-                       goto cleanup;
-               }
-               bfilter->enables |=
-                       HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_ENABLES_L2_FILTER_ID;
-               bfilter->fw_l2_filter_id = filter1->fw_l2_filter_id;
-
-               bfilter->dst_id = vnic->fw_vnic_id;
-
-               if (efilter->flags & RTE_ETHTYPE_FLAGS_DROP) {
-                       bfilter->flags =
-                               HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_FLAGS_DROP;
-               }
-
-               ret = bnxt_hwrm_set_ntuple_filter(bp, bfilter->dst_id, bfilter);
-               if (ret)
-                       goto cleanup;
-               STAILQ_INSERT_TAIL(&vnic->filter, bfilter, next);
-               break;
-       case RTE_ETH_FILTER_DELETE:
-               filter1 = bnxt_match_and_validate_ether_filter(bp, efilter,
-                                                       vnic0, vnic, &ret);
-               if (ret == -EEXIST) {
-                       ret = bnxt_hwrm_clear_ntuple_filter(bp, filter1);
-
-                       STAILQ_REMOVE(&vnic->filter, filter1, bnxt_filter_info,
-                                     next);
-                       bnxt_free_filter(bp, filter1);
-               } else if (ret == 0) {
-                       PMD_DRV_LOG(ERR, "No matching filter found\n");
-               }
-               break;
-       default:
-               PMD_DRV_LOG(ERR, "unsupported operation %u.", filter_op);
-               ret = -EINVAL;
-               goto error;
-       }
-       return ret;
-cleanup:
-       bnxt_free_filter(bp, bfilter);
-error:
-       return ret;
-}
-
-static inline int
-parse_ntuple_filter(struct bnxt *bp,
-                   struct rte_eth_ntuple_filter *nfilter,
-                   struct bnxt_filter_info *bfilter)
-{
-       uint32_t en = 0;
-
-       if (nfilter->queue >= bp->rx_nr_rings) {
-               PMD_DRV_LOG(ERR, "Invalid queue %d\n", nfilter->queue);
-               return -EINVAL;
-       }
-
-       switch (nfilter->dst_port_mask) {
-       case UINT16_MAX:
-               bfilter->dst_port_mask = -1;
-               bfilter->dst_port = nfilter->dst_port;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_PORT |
-                       NTUPLE_FLTR_ALLOC_INPUT_EN_DST_PORT_MASK;
-               break;
-       default:
-               PMD_DRV_LOG(ERR, "invalid dst_port mask.");
-               return -EINVAL;
-       }
-
-       bfilter->ip_addr_type = NTUPLE_FLTR_ALLOC_INPUT_IP_ADDR_TYPE_IPV4;
-       en |= NTUPLE_FLTR_ALLOC_IN_EN_IP_PROTO;
-
-       switch (nfilter->proto_mask) {
-       case UINT8_MAX:
-               if (nfilter->proto == 17) /* IPPROTO_UDP */
-                       bfilter->ip_protocol = 17;
-               else if (nfilter->proto == 6) /* IPPROTO_TCP */
-                       bfilter->ip_protocol = 6;
-               else
-                       return -EINVAL;
-               en |= NTUPLE_FLTR_ALLOC_IN_EN_IP_PROTO;
-               break;
-       default:
-               PMD_DRV_LOG(ERR, "invalid protocol mask.");
-               return -EINVAL;
-       }
-
-       switch (nfilter->dst_ip_mask) {
-       case UINT32_MAX:
-               bfilter->dst_ipaddr_mask[0] = -1;
-               bfilter->dst_ipaddr[0] = nfilter->dst_ip;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_IPADDR |
-                       NTUPLE_FLTR_ALLOC_INPUT_EN_DST_IPADDR_MASK;
-               break;
-       default:
-               PMD_DRV_LOG(ERR, "invalid dst_ip mask.");
-               return -EINVAL;
-       }
-
-       switch (nfilter->src_ip_mask) {
-       case UINT32_MAX:
-               bfilter->src_ipaddr_mask[0] = -1;
-               bfilter->src_ipaddr[0] = nfilter->src_ip;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_IPADDR |
-                       NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_IPADDR_MASK;
-               break;
-       default:
-               PMD_DRV_LOG(ERR, "invalid src_ip mask.");
-               return -EINVAL;
-       }
-
-       switch (nfilter->src_port_mask) {
-       case UINT16_MAX:
-               bfilter->src_port_mask = -1;
-               bfilter->src_port = nfilter->src_port;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_PORT |
-                       NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_PORT_MASK;
-               break;
-       default:
-               PMD_DRV_LOG(ERR, "invalid src_port mask.");
-               return -EINVAL;
-       }
-
-       bfilter->enables = en;
-       return 0;
-}
-
-static struct bnxt_filter_info*
-bnxt_match_ntuple_filter(struct bnxt *bp,
-                        struct bnxt_filter_info *bfilter,
-                        struct bnxt_vnic_info **mvnic)
-{
-       struct bnxt_filter_info *mfilter = NULL;
-       int i;
-
-       for (i = bp->nr_vnics - 1; i >= 0; i--) {
-               struct bnxt_vnic_info *vnic = &bp->vnic_info[i];
-               STAILQ_FOREACH(mfilter, &vnic->filter, next) {
-                       if (bfilter->src_ipaddr[0] == mfilter->src_ipaddr[0] &&
-                           bfilter->src_ipaddr_mask[0] ==
-                           mfilter->src_ipaddr_mask[0] &&
-                           bfilter->src_port == mfilter->src_port &&
-                           bfilter->src_port_mask == mfilter->src_port_mask &&
-                           bfilter->dst_ipaddr[0] == mfilter->dst_ipaddr[0] &&
-                           bfilter->dst_ipaddr_mask[0] ==
-                           mfilter->dst_ipaddr_mask[0] &&
-                           bfilter->dst_port == mfilter->dst_port &&
-                           bfilter->dst_port_mask == mfilter->dst_port_mask &&
-                           bfilter->flags == mfilter->flags &&
-                           bfilter->enables == mfilter->enables) {
-                               if (mvnic)
-                                       *mvnic = vnic;
-                               return mfilter;
-                       }
-               }
-       }
-       return NULL;
-}
-
-static int
-bnxt_cfg_ntuple_filter(struct bnxt *bp,
-                      struct rte_eth_ntuple_filter *nfilter,
-                      enum rte_filter_op filter_op)
-{
-       struct bnxt_filter_info *bfilter, *mfilter, *filter1;
-       struct bnxt_vnic_info *vnic, *vnic0, *mvnic;
-       int ret;
-
-       if (nfilter->flags != RTE_5TUPLE_FLAGS) {
-               PMD_DRV_LOG(ERR, "only 5tuple is supported.");
-               return -EINVAL;
-       }
-
-       if (nfilter->flags & RTE_NTUPLE_FLAGS_TCP_FLAG) {
-               PMD_DRV_LOG(ERR, "Ntuple filter: TCP flags not supported\n");
-               return -EINVAL;
-       }
-
-       bfilter = bnxt_get_unused_filter(bp);
-       if (bfilter == NULL) {
-               PMD_DRV_LOG(ERR,
-                       "Not enough resources for a new filter.\n");
-               return -ENOMEM;
-       }
-       ret = parse_ntuple_filter(bp, nfilter, bfilter);
-       if (ret < 0)
-               goto free_filter;
-
-       vnic = &bp->vnic_info[nfilter->queue];
-       vnic0 = BNXT_GET_DEFAULT_VNIC(bp);
-       filter1 = STAILQ_FIRST(&vnic0->filter);
-       if (filter1 == NULL) {
-               ret = -EINVAL;
-               goto free_filter;
-       }
-
-       bfilter->dst_id = vnic->fw_vnic_id;
-       bfilter->fw_l2_filter_id = filter1->fw_l2_filter_id;
-       bfilter->enables |=
-               HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_ENABLES_L2_FILTER_ID;
-       bfilter->ethertype = 0x800;
-       bfilter->enables |= NTUPLE_FLTR_ALLOC_INPUT_EN_ETHERTYPE;
-
-       mfilter = bnxt_match_ntuple_filter(bp, bfilter, &mvnic);
-
-       if (mfilter != NULL && filter_op == RTE_ETH_FILTER_ADD &&
-           bfilter->dst_id == mfilter->dst_id) {
-               PMD_DRV_LOG(ERR, "filter exists.\n");
-               ret = -EEXIST;
-               goto free_filter;
-       } else if (mfilter != NULL && filter_op == RTE_ETH_FILTER_ADD &&
-                  bfilter->dst_id != mfilter->dst_id) {
-               mfilter->dst_id = vnic->fw_vnic_id;
-               ret = bnxt_hwrm_set_ntuple_filter(bp, mfilter->dst_id, mfilter);
-               STAILQ_REMOVE(&mvnic->filter, mfilter, bnxt_filter_info, next);
-               STAILQ_INSERT_TAIL(&vnic->filter, mfilter, next);
-               PMD_DRV_LOG(ERR, "filter with matching pattern exists.\n");
-               PMD_DRV_LOG(ERR, " Updated it to the new destination queue\n");
-               goto free_filter;
-       }
-       if (mfilter == NULL && filter_op == RTE_ETH_FILTER_DELETE) {
-               PMD_DRV_LOG(ERR, "filter doesn't exist.");
-               ret = -ENOENT;
-               goto free_filter;
-       }
-
-       if (filter_op == RTE_ETH_FILTER_ADD) {
-               bfilter->filter_type = HWRM_CFA_NTUPLE_FILTER;
-               ret = bnxt_hwrm_set_ntuple_filter(bp, bfilter->dst_id, bfilter);
-               if (ret)
-                       goto free_filter;
-               STAILQ_INSERT_TAIL(&vnic->filter, bfilter, next);
-       } else {
-               if (mfilter == NULL) {
-                       /* This should not happen. But for Coverity! */
-                       ret = -ENOENT;
-                       goto free_filter;
-               }
-               ret = bnxt_hwrm_clear_ntuple_filter(bp, mfilter);
-
-               STAILQ_REMOVE(&vnic->filter, mfilter, bnxt_filter_info, next);
-               bnxt_free_filter(bp, mfilter);
-               bnxt_free_filter(bp, bfilter);
-       }
-
-       return 0;
-free_filter:
-       bnxt_free_filter(bp, bfilter);
-       return ret;
-}
-
-static int
-bnxt_ntuple_filter(struct rte_eth_dev *dev,
-                       enum rte_filter_op filter_op,
-                       void *arg)
-{
-       struct bnxt *bp = dev->data->dev_private;
-       int ret;
-
-       if (filter_op == RTE_ETH_FILTER_NOP)
-               return 0;
-
-       if (arg == NULL) {
-               PMD_DRV_LOG(ERR, "arg shouldn't be NULL for operation %u.",
-                           filter_op);
-               return -EINVAL;
-       }
-
-       switch (filter_op) {
-       case RTE_ETH_FILTER_ADD:
-               ret = bnxt_cfg_ntuple_filter(bp,
-                       (struct rte_eth_ntuple_filter *)arg,
-                       filter_op);
-               break;
-       case RTE_ETH_FILTER_DELETE:
-               ret = bnxt_cfg_ntuple_filter(bp,
-                       (struct rte_eth_ntuple_filter *)arg,
-                       filter_op);
-               break;
-       default:
-               PMD_DRV_LOG(ERR, "unsupported operation %u.", filter_op);
-               ret = -EINVAL;
-               break;
-       }
-       return ret;
-}
-
-static int
-bnxt_parse_fdir_filter(struct bnxt *bp,
-                      struct rte_eth_fdir_filter *fdir,
-                      struct bnxt_filter_info *filter)
-{
-       enum rte_fdir_mode fdir_mode =
-               bp->eth_dev->data->dev_conf.fdir_conf.mode;
-       struct bnxt_vnic_info *vnic0, *vnic;
-       struct bnxt_filter_info *filter1;
-       uint32_t en = 0;
-       int i;
-
-       if (fdir_mode == RTE_FDIR_MODE_PERFECT_TUNNEL)
-               return -EINVAL;
-
-       filter->l2_ovlan = fdir->input.flow_ext.vlan_tci;
-       en |= EM_FLOW_ALLOC_INPUT_EN_OVLAN_VID;
-
-       switch (fdir->input.flow_type) {
-       case RTE_ETH_FLOW_IPV4:
-       case RTE_ETH_FLOW_NONFRAG_IPV4_OTHER:
-               /* FALLTHROUGH */
-               filter->src_ipaddr[0] = fdir->input.flow.ip4_flow.src_ip;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_IPADDR;
-               filter->dst_ipaddr[0] = fdir->input.flow.ip4_flow.dst_ip;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_IPADDR;
-               filter->ip_protocol = fdir->input.flow.ip4_flow.proto;
-               en |= NTUPLE_FLTR_ALLOC_IN_EN_IP_PROTO;
-               filter->ip_addr_type =
-                       NTUPLE_FLTR_ALLOC_INPUT_IP_ADDR_TYPE_IPV4;
-               filter->src_ipaddr_mask[0] = 0xffffffff;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_IPADDR_MASK;
-               filter->dst_ipaddr_mask[0] = 0xffffffff;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_IPADDR_MASK;
-               filter->ethertype = 0x800;
-               filter->enables |= NTUPLE_FLTR_ALLOC_INPUT_EN_ETHERTYPE;
-               break;
-       case RTE_ETH_FLOW_NONFRAG_IPV4_TCP:
-               filter->src_port = fdir->input.flow.tcp4_flow.src_port;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_PORT;
-               filter->dst_port = fdir->input.flow.tcp4_flow.dst_port;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_PORT;
-               filter->dst_port_mask = 0xffff;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_PORT_MASK;
-               filter->src_port_mask = 0xffff;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_PORT_MASK;
-               filter->src_ipaddr[0] = fdir->input.flow.tcp4_flow.ip.src_ip;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_IPADDR;
-               filter->dst_ipaddr[0] = fdir->input.flow.tcp4_flow.ip.dst_ip;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_IPADDR;
-               filter->ip_protocol = 6;
-               en |= NTUPLE_FLTR_ALLOC_IN_EN_IP_PROTO;
-               filter->ip_addr_type =
-                       NTUPLE_FLTR_ALLOC_INPUT_IP_ADDR_TYPE_IPV4;
-               filter->src_ipaddr_mask[0] = 0xffffffff;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_IPADDR_MASK;
-               filter->dst_ipaddr_mask[0] = 0xffffffff;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_IPADDR_MASK;
-               filter->ethertype = 0x800;
-               filter->enables |= NTUPLE_FLTR_ALLOC_INPUT_EN_ETHERTYPE;
-               break;
-       case RTE_ETH_FLOW_NONFRAG_IPV4_UDP:
-               filter->src_port = fdir->input.flow.udp4_flow.src_port;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_PORT;
-               filter->dst_port = fdir->input.flow.udp4_flow.dst_port;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_PORT;
-               filter->dst_port_mask = 0xffff;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_PORT_MASK;
-               filter->src_port_mask = 0xffff;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_PORT_MASK;
-               filter->src_ipaddr[0] = fdir->input.flow.udp4_flow.ip.src_ip;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_IPADDR;
-               filter->dst_ipaddr[0] = fdir->input.flow.udp4_flow.ip.dst_ip;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_IPADDR;
-               filter->ip_protocol = 17;
-               en |= NTUPLE_FLTR_ALLOC_IN_EN_IP_PROTO;
-               filter->ip_addr_type =
-                       NTUPLE_FLTR_ALLOC_INPUT_IP_ADDR_TYPE_IPV4;
-               filter->src_ipaddr_mask[0] = 0xffffffff;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_IPADDR_MASK;
-               filter->dst_ipaddr_mask[0] = 0xffffffff;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_IPADDR_MASK;
-               filter->ethertype = 0x800;
-               filter->enables |= NTUPLE_FLTR_ALLOC_INPUT_EN_ETHERTYPE;
-               break;
-       case RTE_ETH_FLOW_IPV6:
-       case RTE_ETH_FLOW_NONFRAG_IPV6_OTHER:
-               /* FALLTHROUGH */
-               filter->ip_addr_type =
-                       NTUPLE_FLTR_ALLOC_INPUT_IP_ADDR_TYPE_IPV6;
-               filter->ip_protocol = fdir->input.flow.ipv6_flow.proto;
-               en |= NTUPLE_FLTR_ALLOC_IN_EN_IP_PROTO;
-               rte_memcpy(filter->src_ipaddr,
-                          fdir->input.flow.ipv6_flow.src_ip, 16);
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_IPADDR;
-               rte_memcpy(filter->dst_ipaddr,
-                          fdir->input.flow.ipv6_flow.dst_ip, 16);
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_IPADDR;
-               memset(filter->dst_ipaddr_mask, 0xff, 16);
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_IPADDR_MASK;
-               memset(filter->src_ipaddr_mask, 0xff, 16);
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_IPADDR_MASK;
-               filter->ethertype = 0x86dd;
-               filter->enables |= NTUPLE_FLTR_ALLOC_INPUT_EN_ETHERTYPE;
-               break;
-       case RTE_ETH_FLOW_NONFRAG_IPV6_TCP:
-               filter->src_port = fdir->input.flow.tcp6_flow.src_port;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_PORT;
-               filter->dst_port = fdir->input.flow.tcp6_flow.dst_port;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_PORT;
-               filter->dst_port_mask = 0xffff;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_PORT_MASK;
-               filter->src_port_mask = 0xffff;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_PORT_MASK;
-               filter->ip_addr_type =
-                       NTUPLE_FLTR_ALLOC_INPUT_IP_ADDR_TYPE_IPV6;
-               filter->ip_protocol = fdir->input.flow.tcp6_flow.ip.proto;
-               en |= NTUPLE_FLTR_ALLOC_IN_EN_IP_PROTO;
-               rte_memcpy(filter->src_ipaddr,
-                          fdir->input.flow.tcp6_flow.ip.src_ip, 16);
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_IPADDR;
-               rte_memcpy(filter->dst_ipaddr,
-                          fdir->input.flow.tcp6_flow.ip.dst_ip, 16);
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_IPADDR;
-               memset(filter->dst_ipaddr_mask, 0xff, 16);
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_IPADDR_MASK;
-               memset(filter->src_ipaddr_mask, 0xff, 16);
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_IPADDR_MASK;
-               filter->ethertype = 0x86dd;
-               filter->enables |= NTUPLE_FLTR_ALLOC_INPUT_EN_ETHERTYPE;
-               break;
-       case RTE_ETH_FLOW_NONFRAG_IPV6_UDP:
-               filter->src_port = fdir->input.flow.udp6_flow.src_port;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_PORT;
-               filter->dst_port = fdir->input.flow.udp6_flow.dst_port;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_PORT;
-               filter->dst_port_mask = 0xffff;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_PORT_MASK;
-               filter->src_port_mask = 0xffff;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_PORT_MASK;
-               filter->ip_addr_type =
-                       NTUPLE_FLTR_ALLOC_INPUT_IP_ADDR_TYPE_IPV6;
-               filter->ip_protocol = fdir->input.flow.udp6_flow.ip.proto;
-               en |= NTUPLE_FLTR_ALLOC_IN_EN_IP_PROTO;
-               rte_memcpy(filter->src_ipaddr,
-                          fdir->input.flow.udp6_flow.ip.src_ip, 16);
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_IPADDR;
-               rte_memcpy(filter->dst_ipaddr,
-                          fdir->input.flow.udp6_flow.ip.dst_ip, 16);
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_IPADDR;
-               memset(filter->dst_ipaddr_mask, 0xff, 16);
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_IPADDR_MASK;
-               memset(filter->src_ipaddr_mask, 0xff, 16);
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_SRC_IPADDR_MASK;
-               filter->ethertype = 0x86dd;
-               filter->enables |= NTUPLE_FLTR_ALLOC_INPUT_EN_ETHERTYPE;
-               break;
-       case RTE_ETH_FLOW_L2_PAYLOAD:
-               filter->ethertype = fdir->input.flow.l2_flow.ether_type;
-               en |= NTUPLE_FLTR_ALLOC_INPUT_EN_ETHERTYPE;
-               break;
-       case RTE_ETH_FLOW_VXLAN:
-               if (fdir->action.behavior == RTE_ETH_FDIR_REJECT)
-                       return -EINVAL;
-               filter->vni = fdir->input.flow.tunnel_flow.tunnel_id;
-               filter->tunnel_type =
-                       CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_VXLAN;
-               en |= HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_ENABLES_TUNNEL_TYPE;
-               break;
-       case RTE_ETH_FLOW_NVGRE:
-               if (fdir->action.behavior == RTE_ETH_FDIR_REJECT)
-                       return -EINVAL;
-               filter->vni = fdir->input.flow.tunnel_flow.tunnel_id;
-               filter->tunnel_type =
-                       CFA_NTUPLE_FILTER_ALLOC_REQ_TUNNEL_TYPE_NVGRE;
-               en |= HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_ENABLES_TUNNEL_TYPE;
-               break;
-       case RTE_ETH_FLOW_UNKNOWN:
-       case RTE_ETH_FLOW_RAW:
-       case RTE_ETH_FLOW_FRAG_IPV4:
-       case RTE_ETH_FLOW_NONFRAG_IPV4_SCTP:
-       case RTE_ETH_FLOW_FRAG_IPV6:
-       case RTE_ETH_FLOW_NONFRAG_IPV6_SCTP:
-       case RTE_ETH_FLOW_IPV6_EX:
-       case RTE_ETH_FLOW_IPV6_TCP_EX:
-       case RTE_ETH_FLOW_IPV6_UDP_EX:
-       case RTE_ETH_FLOW_GENEVE:
-               /* FALLTHROUGH */
-       default:
-               return -EINVAL;
-       }
-
-       vnic0 = BNXT_GET_DEFAULT_VNIC(bp);
-       vnic = &bp->vnic_info[fdir->action.rx_queue];
-       if (vnic == NULL) {
-               PMD_DRV_LOG(ERR, "Invalid queue %d\n", fdir->action.rx_queue);
-               return -EINVAL;
-       }
-
-       if (fdir_mode == RTE_FDIR_MODE_PERFECT_MAC_VLAN) {
-               rte_memcpy(filter->dst_macaddr,
-                       fdir->input.flow.mac_vlan_flow.mac_addr.addr_bytes, 6);
-                       en |= NTUPLE_FLTR_ALLOC_INPUT_EN_DST_MACADDR;
-       }
-
-       if (fdir->action.behavior == RTE_ETH_FDIR_REJECT) {
-               filter->flags = HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_FLAGS_DROP;
-               filter1 = STAILQ_FIRST(&vnic0->filter);
-               //filter1 = bnxt_get_l2_filter(bp, filter, vnic0);
-       } else {
-               filter->dst_id = vnic->fw_vnic_id;
-               for (i = 0; i < RTE_ETHER_ADDR_LEN; i++)
-                       if (filter->dst_macaddr[i] == 0x00)
-                               filter1 = STAILQ_FIRST(&vnic0->filter);
-                       else
-                               filter1 = bnxt_get_l2_filter(bp, filter, vnic);
-       }
-
-       if (filter1 == NULL)
-               return -EINVAL;
-
-       en |= HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_ENABLES_L2_FILTER_ID;
-       filter->fw_l2_filter_id = filter1->fw_l2_filter_id;
-
-       filter->enables = en;
-
-       return 0;
-}
-
-static struct bnxt_filter_info *
-bnxt_match_fdir(struct bnxt *bp, struct bnxt_filter_info *nf,
-               struct bnxt_vnic_info **mvnic)
-{
-       struct bnxt_filter_info *mf = NULL;
-       int i;
-
-       for (i = bp->nr_vnics - 1; i >= 0; i--) {
-               struct bnxt_vnic_info *vnic = &bp->vnic_info[i];
-
-               STAILQ_FOREACH(mf, &vnic->filter, next) {
-                       if (mf->filter_type == nf->filter_type &&
-                           mf->flags == nf->flags &&
-                           mf->src_port == nf->src_port &&
-                           mf->src_port_mask == nf->src_port_mask &&
-                           mf->dst_port == nf->dst_port &&
-                           mf->dst_port_mask == nf->dst_port_mask &&
-                           mf->ip_protocol == nf->ip_protocol &&
-                           mf->ip_addr_type == nf->ip_addr_type &&
-                           mf->ethertype == nf->ethertype &&
-                           mf->vni == nf->vni &&
-                           mf->tunnel_type == nf->tunnel_type &&
-                           mf->l2_ovlan == nf->l2_ovlan &&
-                           mf->l2_ovlan_mask == nf->l2_ovlan_mask &&
-                           mf->l2_ivlan == nf->l2_ivlan &&
-                           mf->l2_ivlan_mask == nf->l2_ivlan_mask &&
-                           !memcmp(mf->l2_addr, nf->l2_addr,
-                                   RTE_ETHER_ADDR_LEN) &&
-                           !memcmp(mf->l2_addr_mask, nf->l2_addr_mask,
-                                   RTE_ETHER_ADDR_LEN) &&
-                           !memcmp(mf->src_macaddr, nf->src_macaddr,
-                                   RTE_ETHER_ADDR_LEN) &&
-                           !memcmp(mf->dst_macaddr, nf->dst_macaddr,
-                                   RTE_ETHER_ADDR_LEN) &&
-                           !memcmp(mf->src_ipaddr, nf->src_ipaddr,
-                                   sizeof(nf->src_ipaddr)) &&
-                           !memcmp(mf->src_ipaddr_mask, nf->src_ipaddr_mask,
-                                   sizeof(nf->src_ipaddr_mask)) &&
-                           !memcmp(mf->dst_ipaddr, nf->dst_ipaddr,
-                                   sizeof(nf->dst_ipaddr)) &&
-                           !memcmp(mf->dst_ipaddr_mask, nf->dst_ipaddr_mask,
-                                   sizeof(nf->dst_ipaddr_mask))) {
-                               if (mvnic)
-                                       *mvnic = vnic;
-                               return mf;
-                       }
-               }
-       }
-       return NULL;
-}
-
-static int
-bnxt_fdir_filter(struct rte_eth_dev *dev,
-                enum rte_filter_op filter_op,
-                void *arg)
-{
-       struct bnxt *bp = dev->data->dev_private;
-       struct rte_eth_fdir_filter *fdir  = (struct rte_eth_fdir_filter *)arg;
-       struct bnxt_filter_info *filter, *match;
-       struct bnxt_vnic_info *vnic, *mvnic;
-       int ret = 0, i;
-
-       if (filter_op == RTE_ETH_FILTER_NOP)
-               return 0;
-
-       if (arg == NULL && filter_op != RTE_ETH_FILTER_FLUSH)
-               return -EINVAL;
-
-       switch (filter_op) {
-       case RTE_ETH_FILTER_ADD:
-       case RTE_ETH_FILTER_DELETE:
-               /* FALLTHROUGH */
-               filter = bnxt_get_unused_filter(bp);
-               if (filter == NULL) {
-                       PMD_DRV_LOG(ERR,
-                               "Not enough resources for a new flow.\n");
-                       return -ENOMEM;
-               }
-
-               ret = bnxt_parse_fdir_filter(bp, fdir, filter);
-               if (ret != 0)
-                       goto free_filter;
-               filter->filter_type = HWRM_CFA_NTUPLE_FILTER;
-
-               if (fdir->action.behavior == RTE_ETH_FDIR_REJECT)
-                       vnic = &bp->vnic_info[0];
-               else
-                       vnic = &bp->vnic_info[fdir->action.rx_queue];
-
-               match = bnxt_match_fdir(bp, filter, &mvnic);
-               if (match != NULL && filter_op == RTE_ETH_FILTER_ADD) {
-                       if (match->dst_id == vnic->fw_vnic_id) {
-                               PMD_DRV_LOG(ERR, "Flow already exists.\n");
-                               ret = -EEXIST;
-                               goto free_filter;
-                       } else {
-                               match->dst_id = vnic->fw_vnic_id;
-                               ret = bnxt_hwrm_set_ntuple_filter(bp,
-                                                                 match->dst_id,
-                                                                 match);
-                               STAILQ_REMOVE(&mvnic->filter, match,
-                                             bnxt_filter_info, next);
-                               STAILQ_INSERT_TAIL(&vnic->filter, match, next);
-                               PMD_DRV_LOG(ERR,
-                                       "Filter with matching pattern exist\n");
-                               PMD_DRV_LOG(ERR,
-                                       "Updated it to new destination q\n");
-                               goto free_filter;
-                       }
-               }
-               if (match == NULL && filter_op == RTE_ETH_FILTER_DELETE) {
-                       PMD_DRV_LOG(ERR, "Flow does not exist.\n");
-                       ret = -ENOENT;
-                       goto free_filter;
-               }
-
-               if (filter_op == RTE_ETH_FILTER_ADD) {
-                       ret = bnxt_hwrm_set_ntuple_filter(bp,
-                                                         filter->dst_id,
-                                                         filter);
-                       if (ret)
-                               goto free_filter;
-                       STAILQ_INSERT_TAIL(&vnic->filter, filter, next);
-               } else {
-                       ret = bnxt_hwrm_clear_ntuple_filter(bp, match);
-                       STAILQ_REMOVE(&vnic->filter, match,
-                                     bnxt_filter_info, next);
-                       bnxt_free_filter(bp, match);
-                       bnxt_free_filter(bp, filter);
-               }
-               break;
-       case RTE_ETH_FILTER_FLUSH:
-               for (i = bp->nr_vnics - 1; i >= 0; i--) {
-                       struct bnxt_vnic_info *vnic = &bp->vnic_info[i];
-
-                       STAILQ_FOREACH(filter, &vnic->filter, next) {
-                               if (filter->filter_type ==
-                                   HWRM_CFA_NTUPLE_FILTER) {
-                                       ret =
-                                       bnxt_hwrm_clear_ntuple_filter(bp,
-                                                                     filter);
-                                       STAILQ_REMOVE(&vnic->filter, filter,
-                                                     bnxt_filter_info, next);
-                               }
-                       }
-               }
-               return ret;
-       case RTE_ETH_FILTER_UPDATE:
-       case RTE_ETH_FILTER_STATS:
-       case RTE_ETH_FILTER_INFO:
-               PMD_DRV_LOG(ERR, "operation %u not implemented", filter_op);
-               break;
-       default:
-               PMD_DRV_LOG(ERR, "unknown operation %u", filter_op);
-               ret = -EINVAL;
-               break;
-       }
-       return ret;
-
-free_filter:
-       bnxt_free_filter(bp, filter);
-       return ret;
-}
-
 int
 bnxt_filter_ctrl_op(struct rte_eth_dev *dev,
                    enum rte_filter_type filter_type,
@@ -3811,19 +3032,6 @@ bnxt_filter_ctrl_op(struct rte_eth_dev *dev,
                return ret;
 
        switch (filter_type) {
-       case RTE_ETH_FILTER_TUNNEL:
-               PMD_DRV_LOG(ERR,
-                       "filter type: %d: To be implemented\n", filter_type);
-               break;
-       case RTE_ETH_FILTER_FDIR:
-               ret = bnxt_fdir_filter(dev, filter_op, arg);
-               break;
-       case RTE_ETH_FILTER_NTUPLE:
-               ret = bnxt_ntuple_filter(dev, filter_op, arg);
-               break;
-       case RTE_ETH_FILTER_ETHERTYPE:
-               ret = bnxt_ethertype_filter(dev, filter_op, arg);
-               break;
        case RTE_ETH_FILTER_GENERIC:
                if (filter_op != RTE_ETH_FILTER_GET)
                        return -EINVAL;
@@ -5943,21 +5151,21 @@ bnxt_parse_dev_args(struct bnxt *bp, struct rte_devargs *devargs)
 
        /*
         * Handler for "truflow" devarg.
-        * Invoked as for ex: "-w 0000:00:0d.0,host-based-truflow=1"
+        * Invoked as for ex: "-a 0000:00:0d.0,host-based-truflow=1"
         */
        rte_kvargs_process(kvlist, BNXT_DEVARG_TRUFLOW,
                           bnxt_parse_devarg_truflow, bp);
 
        /*
         * Handler for "flow_xstat" devarg.
-        * Invoked as for ex: "-w 0000:00:0d.0,flow_xstat=1"
+        * Invoked as for ex: "-a 0000:00:0d.0,flow_xstat=1"
         */
        rte_kvargs_process(kvlist, BNXT_DEVARG_FLOW_XSTAT,
                           bnxt_parse_devarg_flow_xstat, bp);
 
        /*
         * Handler for "max_num_kflows" devarg.
-        * Invoked as for ex: "-w 000:00:0d.0,max_num_kflows=32"
+        * Invoked as for ex: "-a 000:00:0d.0,max_num_kflows=32"
         */
        rte_kvargs_process(kvlist, BNXT_DEVARG_MAX_NUM_KFLOWS,
                           bnxt_parse_devarg_max_num_kflows, bp);
@@ -6301,7 +5509,7 @@ static int bnxt_init_rep_info(struct bnxt *bp)
 }
 
 static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,
-                              struct rte_eth_devargs eth_da,
+                              struct rte_eth_devargs *eth_da,
                               struct rte_eth_dev *backing_eth_dev,
                               const char *dev_args)
 {
@@ -6312,7 +5520,7 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,
        int i, ret = 0;
        struct rte_kvargs *kvlist = NULL;
 
-       num_rep = eth_da.nb_representor_ports;
+       num_rep = eth_da->nb_representor_ports;
        if (num_rep > BNXT_MAX_VF_REPS) {
                PMD_DRV_LOG(ERR, "nb_representor_ports = %d > %d MAX VF REPS\n",
                            num_rep, BNXT_MAX_VF_REPS);
@@ -6342,7 +5550,7 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,
 
        for (i = 0; i < num_rep; i++) {
                struct bnxt_representor representor = {
-                       .vf_id = eth_da.representor_ports[i],
+                       .vf_id = eth_da->representor_ports[i],
                        .switch_domain_id = backing_bp->switch_domain_id,
                        .parent_dev = backing_eth_dev
                };
@@ -6355,13 +5563,13 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,
 
                /* representor port net_bdf_port */
                snprintf(name, sizeof(name), "net_%s_representor_%d",
-                        pci_dev->device.name, eth_da.representor_ports[i]);
+                        pci_dev->device.name, eth_da->representor_ports[i]);
 
                kvlist = rte_kvargs_parse(dev_args, bnxt_dev_args);
                if (kvlist) {
                        /*
                         * Handler for "rep_is_pf" devarg.
-                        * Invoked as for ex: "-w 000:00:0d.0,
+                        * Invoked as for ex: "-a 000:00:0d.0,
                         * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>"
                         */
                        ret = rte_kvargs_process(kvlist, BNXT_DEVARG_REP_IS_PF,
@@ -6373,7 +5581,7 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,
                        }
                        /*
                         * Handler for "rep_based_pf" devarg.
-                        * Invoked as for ex: "-w 000:00:0d.0,
+                        * Invoked as for ex: "-a 000:00:0d.0,
                         * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>"
                         */
                        ret = rte_kvargs_process(kvlist,
@@ -6386,7 +5594,7 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,
                        }
                        /*
                         * Handler for "rep_based_pf" devarg.
-                        * Invoked as for ex: "-w 000:00:0d.0,
+                        * Invoked as for ex: "-a 000:00:0d.0,
                         * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>"
                         */
                        ret = rte_kvargs_process(kvlist, BNXT_DEVARG_REP_Q_R2F,
@@ -6398,7 +5606,7 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,
                        }
                        /*
                         * Handler for "rep_based_pf" devarg.
-                        * Invoked as for ex: "-w 000:00:0d.0,
+                        * Invoked as for ex: "-a 000:00:0d.0,
                         * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>"
                         */
                        ret = rte_kvargs_process(kvlist, BNXT_DEVARG_REP_Q_F2R,
@@ -6410,7 +5618,7 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,
                        }
                        /*
                         * Handler for "rep_based_pf" devarg.
-                        * Invoked as for ex: "-w 000:00:0d.0,
+                        * Invoked as for ex: "-a 000:00:0d.0,
                         * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>"
                         */
                        ret = rte_kvargs_process(kvlist, BNXT_DEVARG_REP_FC_R2F,
@@ -6422,7 +5630,7 @@ static int bnxt_rep_port_probe(struct rte_pci_device *pci_dev,
                        }
                        /*
                         * Handler for "rep_based_pf" devarg.
-                        * Invoked as for ex: "-w 000:00:0d.0,
+                        * Invoked as for ex: "-a 000:00:0d.0,
                         * rep-based-pf=<pf index> rep-is-pf=<VF=0 or PF=1>"
                         */
                        ret = rte_kvargs_process(kvlist, BNXT_DEVARG_REP_FC_F2R,
@@ -6518,7 +5726,7 @@ static int bnxt_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
                return ret;
 
        /* probe representor ports now */
-       ret = bnxt_rep_port_probe(pci_dev, eth_da, backing_eth_dev,
+       ret = bnxt_rep_port_probe(pci_dev, &eth_da, backing_eth_dev,
                                  pci_dev->device.devargs->args);
 
        return ret;