eal: fix IOVA mode selection as VA for PCI drivers

[dpdk.git] / drivers / net / bnxt / rte_pmd_bnxt.c

diff --git a/drivers/net/bnxt/rte_pmd_bnxt.c b/drivers/net/bnxt/rte_pmd_bnxt.c
index 5e3d1bf..fbd2dd4 100644 (file)
--- a/drivers/net/bnxt/rte_pmd_bnxt.c
+++ b/drivers/net/bnxt/rte_pmd_bnxt.c
@@ -54,7 +54,7 @@ int rte_pmd_bnxt_set_tx_loopback(uint16_t port, uint8_t on)
        if (!is_bnxt_supported(eth_dev))
                return -ENOTSUP;
 
-       bp = (struct bnxt *)eth_dev->data->dev_private;
+       bp = eth_dev->data->dev_private;
 
        if (!BNXT_PF(bp)) {
                PMD_DRV_LOG(ERR,
@@ -96,7 +96,7 @@ int rte_pmd_bnxt_set_all_queues_drop_en(uint16_t port, uint8_t on)
        if (!is_bnxt_supported(eth_dev))
                return -ENOTSUP;
 
-       bp = (struct bnxt *)eth_dev->data->dev_private;
+       bp = eth_dev->data->dev_private;
 
        if (!BNXT_PF(bp)) {
                PMD_DRV_LOG(ERR,
@@ -146,7 +146,7 @@ int rte_pmd_bnxt_set_vf_mac_addr(uint16_t port, uint16_t vf,
                return -ENOTSUP;
 
        rte_eth_dev_info_get(port, &dev_info);
-       bp = (struct bnxt *)dev->data->dev_private;
+       bp = dev->data->dev_private;
 
        if (vf >= dev_info.max_vfs || mac_addr == NULL)
                return -EINVAL;
@@ -180,7 +180,7 @@ int rte_pmd_bnxt_set_vf_rate_limit(uint16_t port, uint16_t vf,
                return -ENOTSUP;
 
        rte_eth_dev_info_get(port, &dev_info);
-       bp = (struct bnxt *)eth_dev->data->dev_private;
+       bp = eth_dev->data->dev_private;
 
        if (!bp->pf.active_vfs)
                return -EINVAL;
@@ -231,7 +231,7 @@ int rte_pmd_bnxt_set_vf_mac_anti_spoof(uint16_t port, uint16_t vf, uint8_t on)
                return -ENOTSUP;
 
        rte_eth_dev_info_get(port, &dev_info);
-       bp = (struct bnxt *)dev->data->dev_private;
+       bp = dev->data->dev_private;
 
        if (!BNXT_PF(bp)) {
                PMD_DRV_LOG(ERR,
@@ -283,7 +283,7 @@ int rte_pmd_bnxt_set_vf_vlan_anti_spoof(uint16_t port, uint16_t vf, uint8_t on)
                return -ENOTSUP;
 
        rte_eth_dev_info_get(port, &dev_info);
-       bp = (struct bnxt *)dev->data->dev_private;
+       bp = dev->data->dev_private;
 
        if (!BNXT_PF(bp)) {
                PMD_DRV_LOG(ERR,
@@ -333,7 +333,7 @@ rte_pmd_bnxt_set_vf_vlan_stripq(uint16_t port, uint16_t vf, uint8_t on)
                return -ENOTSUP;
 
        rte_eth_dev_info_get(port, &dev_info);
-       bp = (struct bnxt *)dev->data->dev_private;
+       bp = dev->data->dev_private;
 
        if (vf >= dev_info.max_vfs)
                return -EINVAL;
@@ -370,7 +370,7 @@ int rte_pmd_bnxt_set_vf_rxmode(uint16_t port, uint16_t vf,
                return -ENOTSUP;
 
        rte_eth_dev_info_get(port, &dev_info);
-       bp = (struct bnxt *)dev->data->dev_private;
+       bp = dev->data->dev_private;
 
        if (!bp->pf.vf_info)
                return -EINVAL;
@@ -462,7 +462,7 @@ int rte_pmd_bnxt_set_vf_vlan_filter(uint16_t port, uint16_t vlan,
        if (!is_bnxt_supported(dev))
                return -ENOTSUP;
 
-       bp = (struct bnxt *)dev->data->dev_private;
+       bp = dev->data->dev_private;
        if (!bp->pf.vf_info)
                return -EINVAL;
 
@@ -551,7 +551,7 @@ int rte_pmd_bnxt_get_vf_stats(uint16_t port,
                return -ENOTSUP;
 
        rte_eth_dev_info_get(port, &dev_info);
-       bp = (struct bnxt *)dev->data->dev_private;
+       bp = dev->data->dev_private;
 
        if (vf_id >= dev_info.max_vfs)
                return -EINVAL;
@@ -578,7 +578,7 @@ int rte_pmd_bnxt_reset_vf_stats(uint16_t port,
                return -ENOTSUP;
 
        rte_eth_dev_info_get(port, &dev_info);
-       bp = (struct bnxt *)dev->data->dev_private;
+       bp = dev->data->dev_private;
 
        if (vf_id >= dev_info.max_vfs)
                return -EINVAL;
@@ -604,7 +604,7 @@ int rte_pmd_bnxt_get_vf_rx_status(uint16_t port, uint16_t vf_id)
                return -ENOTSUP;
 
        rte_eth_dev_info_get(port, &dev_info);
-       bp = (struct bnxt *)dev->data->dev_private;
+       bp = dev->data->dev_private;
 
        if (vf_id >= dev_info.max_vfs)
                return -EINVAL;
@@ -631,7 +631,7 @@ int rte_pmd_bnxt_get_vf_tx_drop_count(uint16_t port, uint16_t vf_id,
                return -ENOTSUP;
 
        rte_eth_dev_info_get(port, &dev_info);
-       bp = (struct bnxt *)dev->data->dev_private;
+       bp = dev->data->dev_private;
 
        if (vf_id >= dev_info.max_vfs)
                return -EINVAL;
@@ -663,7 +663,7 @@ int rte_pmd_bnxt_mac_addr_add(uint16_t port, struct rte_ether_addr *addr,
                return -ENOTSUP;
 
        rte_eth_dev_info_get(port, &dev_info);
-       bp = (struct bnxt *)dev->data->dev_private;
+       bp = dev->data->dev_private;
 
        if (vf_id >= dev_info.max_vfs)
                return -EINVAL;
@@ -698,7 +698,7 @@ int rte_pmd_bnxt_mac_addr_add(uint16_t port, struct rte_ether_addr *addr,
                    filter->enables ==
                    (HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR |
                     HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR_MASK) &&
-                   memcmp(addr, filter->l2_addr, ETHER_ADDR_LEN) == 0) {
+                   memcmp(addr, filter->l2_addr, RTE_ETHER_ADDR_LEN) == 0) {
                        bnxt_hwrm_clear_l2_filter(bp, filter);
                        break;
                }
@@ -711,12 +711,12 @@ int rte_pmd_bnxt_mac_addr_add(uint16_t port, struct rte_ether_addr *addr,
        filter->flags = HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_PATH_RX;
        filter->enables = HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR |
                        HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR_MASK;
-       memcpy(filter->l2_addr, addr, ETHER_ADDR_LEN);
-       memset(filter->l2_addr_mask, 0xff, ETHER_ADDR_LEN);
+       memcpy(filter->l2_addr, addr, RTE_ETHER_ADDR_LEN);
+       memset(filter->l2_addr_mask, 0xff, RTE_ETHER_ADDR_LEN);
 
        /* Do not add a filter for the default MAC */
        if (bnxt_hwrm_func_qcfg_vf_default_mac(bp, vf_id, &dflt_mac) ||
-           memcmp(filter->l2_addr, dflt_mac.addr_bytes, ETHER_ADDR_LEN))
+           memcmp(filter->l2_addr, dflt_mac.addr_bytes, RTE_ETHER_ADDR_LEN))
                rc = bnxt_hwrm_set_l2_filter(bp, vnic.fw_vnic_id, filter);
 
 exit:
@@ -739,7 +739,7 @@ rte_pmd_bnxt_set_vf_vlan_insert(uint16_t port, uint16_t vf,
                return -ENOTSUP;
 
        rte_eth_dev_info_get(port, &dev_info);
-       bp = (struct bnxt *)dev->data->dev_private;
+       bp = dev->data->dev_private;
 
        if (vf >= dev_info.max_vfs)
                return -EINVAL;
@@ -776,7 +776,7 @@ int rte_pmd_bnxt_set_vf_persist_stats(uint16_t port, uint16_t vf, uint8_t on)
 
        dev = &rte_eth_devices[port];
        rte_eth_dev_info_get(port, &dev_info);
-       bp = (struct bnxt *)dev->data->dev_private;
+       bp = dev->data->dev_private;
 
        if (!BNXT_PF(bp)) {
                PMD_DRV_LOG(ERR,