/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2017-2018 Broadcom
+ * Copyright(c) 2017-2021 Broadcom
* All rights reserved.
*/
#include <unistd.h>
#include <rte_dev.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
#include <rte_malloc.h>
#include <rte_cycles.h>
#include <rte_byteorder.h>
ret_param.vf_id = vf_id;
ret_param.msg = msg;
- _rte_eth_dev_callback_process(bp->eth_dev, RTE_ETH_EVENT_VF_MBOX,
- &ret_param);
+ rte_eth_dev_callback_process(bp->eth_dev, RTE_ETH_EVENT_VF_MBOX,
+ &ret_param);
/* Default to approve */
if (ret_param.retval == RTE_PMD_BNXT_MB_EVENT_PROCEED)
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,
}
if (on)
- bp->pf.evb_mode = BNXT_EVB_MODE_VEB;
+ bp->pf->evb_mode = BNXT_EVB_MODE_VEB;
else
- bp->pf.evb_mode = BNXT_EVB_MODE_VEPA;
+ bp->pf->evb_mode = BNXT_EVB_MODE_VEPA;
rc = bnxt_hwrm_pf_evb_mode(bp);
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,
}
/* Stall all active VFs */
- for (i = 0; i < bp->pf.active_vfs; i++) {
+ for (i = 0; i < bp->pf->active_vfs; i++) {
rc = bnxt_hwrm_func_vf_vnic_query_and_config(bp, i,
rte_pmd_bnxt_set_all_queues_drop_en_cb, &on,
bnxt_hwrm_vnic_cfg);
}
int rte_pmd_bnxt_set_vf_mac_addr(uint16_t port, uint16_t vf,
- struct ether_addr *mac_addr)
+ struct rte_ether_addr *mac_addr)
{
struct rte_eth_dev *dev;
struct rte_eth_dev_info dev_info;
if (!is_bnxt_supported(dev))
return -ENOTSUP;
- rte_eth_dev_info_get(port, &dev_info);
- bp = (struct bnxt *)dev->data->dev_private;
+ rc = rte_eth_dev_info_get(port, &dev_info);
+ if (rc != 0) {
+ PMD_DRV_LOG(ERR,
+ "Error during getting device (port %u) info: %s\n",
+ port, strerror(-rc));
+
+ return rc;
+ }
+
+ bp = dev->data->dev_private;
if (vf >= dev_info.max_vfs || mac_addr == NULL)
return -EINVAL;
if (!is_bnxt_supported(eth_dev))
return -ENOTSUP;
- rte_eth_dev_info_get(port, &dev_info);
- bp = (struct bnxt *)eth_dev->data->dev_private;
+ rc = rte_eth_dev_info_get(port, &dev_info);
+ if (rc != 0) {
+ PMD_DRV_LOG(ERR,
+ "Error during getting device (port %u) info: %s\n",
+ port, strerror(-rc));
- if (!bp->pf.active_vfs)
+ return rc;
+ }
+ bp = eth_dev->data->dev_private;
+
+ if (!bp->pf->active_vfs)
return -EINVAL;
- if (vf >= bp->pf.max_vfs)
+ if (vf >= bp->pf->max_vfs)
return -EINVAL;
/* Add up the per queue BW and configure MAX BW of the VF */
}
/* Requested BW already configured */
- if (tot_rate == bp->pf.vf_info[vf].max_tx_rate)
+ if (tot_rate == bp->pf->vf_info[vf].max_tx_rate)
return 0;
rc = bnxt_hwrm_func_bw_cfg(bp, vf, tot_rate,
HWRM_FUNC_CFG_INPUT_ENABLES_MAX_BW);
if (!rc)
- bp->pf.vf_info[vf].max_tx_rate = tot_rate;
+ bp->pf->vf_info[vf].max_tx_rate = tot_rate;
return rc;
}
if (!is_bnxt_supported(dev))
return -ENOTSUP;
- rte_eth_dev_info_get(port, &dev_info);
- bp = (struct bnxt *)dev->data->dev_private;
+ rc = rte_eth_dev_info_get(port, &dev_info);
+ if (rc != 0) {
+ PMD_DRV_LOG(ERR,
+ "Error during getting device (port %u) info: %s\n",
+ port, strerror(-rc));
+
+ return rc;
+ }
+ bp = dev->data->dev_private;
if (!BNXT_PF(bp)) {
PMD_DRV_LOG(ERR,
return -EINVAL;
/* Prev setting same as new setting. */
- if (on == bp->pf.vf_info[vf].mac_spoof_en)
+ if (on == bp->pf->vf_info[vf].mac_spoof_en)
return 0;
- func_flags = bp->pf.vf_info[vf].func_cfg_flags;
+ func_flags = bp->pf->vf_info[vf].func_cfg_flags;
func_flags &= ~(HWRM_FUNC_CFG_INPUT_FLAGS_SRC_MAC_ADDR_CHECK_ENABLE |
HWRM_FUNC_CFG_INPUT_FLAGS_SRC_MAC_ADDR_CHECK_DISABLE);
rc = bnxt_hwrm_func_cfg_vf_set_flags(bp, vf, func_flags);
if (!rc) {
- bp->pf.vf_info[vf].mac_spoof_en = on;
- bp->pf.vf_info[vf].func_cfg_flags = func_flags;
+ bp->pf->vf_info[vf].mac_spoof_en = on;
+ bp->pf->vf_info[vf].func_cfg_flags = func_flags;
}
return rc;
if (!is_bnxt_supported(dev))
return -ENOTSUP;
- rte_eth_dev_info_get(port, &dev_info);
- bp = (struct bnxt *)dev->data->dev_private;
+ rc = rte_eth_dev_info_get(port, &dev_info);
+ if (rc != 0) {
+ PMD_DRV_LOG(ERR,
+ "Error during getting device (port %u) info: %s\n",
+ port, strerror(-rc));
+
+ return rc;
+ }
+ bp = dev->data->dev_private;
if (!BNXT_PF(bp)) {
PMD_DRV_LOG(ERR,
rc = bnxt_hwrm_func_cfg_vf_set_vlan_anti_spoof(bp, vf, on);
if (!rc) {
- bp->pf.vf_info[vf].vlan_spoof_en = on;
+ bp->pf->vf_info[vf].vlan_spoof_en = on;
if (on) {
if (bnxt_hwrm_cfa_vlan_antispoof_cfg(bp,
- bp->pf.first_vf_id + vf,
- bp->pf.vf_info[vf].vlan_count,
- bp->pf.vf_info[vf].vlan_as_table))
+ bp->pf->first_vf_id + vf,
+ bp->pf->vf_info[vf].vlan_count,
+ bp->pf->vf_info[vf].vlan_as_table))
rc = -1;
}
} else {
if (!is_bnxt_supported(dev))
return -ENOTSUP;
- rte_eth_dev_info_get(port, &dev_info);
- bp = (struct bnxt *)dev->data->dev_private;
+ rc = rte_eth_dev_info_get(port, &dev_info);
+ if (rc != 0) {
+ PMD_DRV_LOG(ERR,
+ "Error during getting device (port %u) info: %s\n",
+ port, strerror(-rc));
+
+ return rc;
+ }
+ bp = dev->data->dev_private;
if (vf >= dev_info.max_vfs)
return -EINVAL;
if (!is_bnxt_supported(dev))
return -ENOTSUP;
- rte_eth_dev_info_get(port, &dev_info);
- bp = (struct bnxt *)dev->data->dev_private;
+ rc = rte_eth_dev_info_get(port, &dev_info);
+ if (rc != 0) {
+ PMD_DRV_LOG(ERR,
+ "Error during getting device (port %u) info: %s\n",
+ port, strerror(-rc));
- if (!bp->pf.vf_info)
+ return rc;
+ }
+ bp = dev->data->dev_private;
+
+ if (!bp->pf->vf_info)
return -EINVAL;
if (vf >= bp->pdev->max_vfs)
return -EINVAL;
- if (rx_mask & ETH_VMDQ_ACCEPT_UNTAG) {
+ if (rx_mask & RTE_ETH_VMDQ_ACCEPT_UNTAG) {
PMD_DRV_LOG(ERR, "Currently cannot toggle this setting\n");
return -ENOTSUP;
}
/* Is this really the correct mapping? VFd seems to think it is. */
- if (rx_mask & ETH_VMDQ_ACCEPT_HASH_UC)
+ if (rx_mask & RTE_ETH_VMDQ_ACCEPT_HASH_UC)
flag |= BNXT_VNIC_INFO_PROMISC;
- if (rx_mask & ETH_VMDQ_ACCEPT_BROADCAST)
+ if (rx_mask & RTE_ETH_VMDQ_ACCEPT_BROADCAST)
flag |= BNXT_VNIC_INFO_BCAST;
- if (rx_mask & ETH_VMDQ_ACCEPT_MULTICAST)
+ if (rx_mask & RTE_ETH_VMDQ_ACCEPT_MULTICAST)
flag |= BNXT_VNIC_INFO_ALLMULTI | BNXT_VNIC_INFO_MCAST;
if (on)
- bp->pf.vf_info[vf].l2_rx_mask |= flag;
+ bp->pf->vf_info[vf].l2_rx_mask |= flag;
else
- bp->pf.vf_info[vf].l2_rx_mask &= ~flag;
+ bp->pf->vf_info[vf].l2_rx_mask &= ~flag;
rc = bnxt_hwrm_func_vf_vnic_query_and_config(bp, vf,
vf_vnic_set_rxmask_cb,
- &bp->pf.vf_info[vf].l2_rx_mask,
+ &bp->pf->vf_info[vf].l2_rx_mask,
bnxt_set_rx_mask_no_vlan);
if (rc)
PMD_DRV_LOG(ERR, "bnxt_hwrm_func_vf_vnic_set_rxmask failed\n");
memset(&vnic, 0, sizeof(vnic));
vnic.fw_vnic_id = dflt_vnic;
if (bnxt_hwrm_vnic_qcfg(bp, &vnic,
- bp->pf.first_vf_id + vf) == 0) {
+ bp->pf->first_vf_id + vf) == 0) {
if (bnxt_hwrm_cfa_l2_set_rx_mask(bp, &vnic,
- bp->pf.vf_info[vf].vlan_count,
- bp->pf.vf_info[vf].vlan_table))
+ bp->pf->vf_info[vf].vlan_count,
+ bp->pf->vf_info[vf].vlan_table))
rc = -1;
} else {
rc = -1;
if (!is_bnxt_supported(dev))
return -ENOTSUP;
- bp = (struct bnxt *)dev->data->dev_private;
- if (!bp->pf.vf_info)
+ bp = dev->data->dev_private;
+ if (!bp->pf->vf_info)
return -EINVAL;
for (i = 0; vf_mask; i++, vf_mask >>= 1) {
- cnt = bp->pf.vf_info[i].vlan_count;
+ cnt = bp->pf->vf_info[i].vlan_count;
if ((vf_mask & 1) == 0)
continue;
- if (bp->pf.vf_info[i].vlan_table == NULL) {
+ if (bp->pf->vf_info[i].vlan_table == NULL) {
rc = -1;
continue;
}
- if (bp->pf.vf_info[i].vlan_as_table == NULL) {
+ if (bp->pf->vf_info[i].vlan_as_table == NULL) {
rc = -1;
continue;
}
/* First, search for a duplicate... */
for (j = 0; j < cnt; j++) {
if (rte_be_to_cpu_16(
- bp->pf.vf_info[i].vlan_table[j].vid) == vlan)
+ bp->pf->vf_info[i].vlan_table[j].vid) ==
+ vlan)
break;
}
if (j == cnt) {
}
/* cnt is one less than vlan_count */
- cnt = bp->pf.vf_info[i].vlan_count++;
+ cnt = bp->pf->vf_info[i].vlan_count++;
/*
* And finally, add to the
* end of the table
*/
- vase = &bp->pf.vf_info[i].vlan_as_table[cnt];
+ vase = &bp->pf->vf_info[i].vlan_as_table[cnt];
// TODO: Hardcoded TPID
vase->tpid = rte_cpu_to_be_16(0x8100);
vase->vid = rte_cpu_to_be_16(vlan);
vase->mask = rte_cpu_to_be_16(0xfff);
- ve = &bp->pf.vf_info[i].vlan_table[cnt];
+ ve = &bp->pf->vf_info[i].vlan_table[cnt];
/* TODO: Hardcoded TPID */
ve->tpid = rte_cpu_to_be_16(0x8100);
ve->vid = rte_cpu_to_be_16(vlan);
} else {
for (j = 0; j < cnt; j++) {
if (rte_be_to_cpu_16(
- bp->pf.vf_info[i].vlan_table[j].vid) != vlan)
+ bp->pf->vf_info[i].vlan_table[j].vid) !=
+ vlan)
continue;
- memmove(&bp->pf.vf_info[i].vlan_table[j],
- &bp->pf.vf_info[i].vlan_table[j + 1],
+ memmove(&bp->pf->vf_info[i].vlan_table[j],
+ &bp->pf->vf_info[i].vlan_table[j + 1],
getpagesize() - ((j + 1) *
sizeof(struct bnxt_vlan_table_entry)));
- memmove(&bp->pf.vf_info[i].vlan_as_table[j],
- &bp->pf.vf_info[i].vlan_as_table[j + 1],
+ memmove(&bp->pf->vf_info[i].vlan_as_table[j],
+ &bp->pf->vf_info[i].vlan_as_table[j + 1],
getpagesize() - ((j + 1) * sizeof(struct
bnxt_vlan_antispoof_table_entry)));
j--;
- cnt = --bp->pf.vf_info[i].vlan_count;
+ cnt = --bp->pf->vf_info[i].vlan_count;
}
}
bnxt_set_vf_table(bp, i);
struct rte_eth_dev *dev;
struct rte_eth_dev_info dev_info;
struct bnxt *bp;
+ int rc;
dev = &rte_eth_devices[port];
if (!is_bnxt_supported(dev))
return -ENOTSUP;
- rte_eth_dev_info_get(port, &dev_info);
- bp = (struct bnxt *)dev->data->dev_private;
+ rc = rte_eth_dev_info_get(port, &dev_info);
+ if (rc != 0) {
+ PMD_DRV_LOG(ERR,
+ "Error during getting device (port %u) info: %s\n",
+ port, strerror(-rc));
+
+ return rc;
+ }
+ bp = dev->data->dev_private;
if (vf_id >= dev_info.max_vfs)
return -EINVAL;
return -ENOTSUP;
}
- return bnxt_hwrm_func_qstats(bp, bp->pf.first_vf_id + vf_id, stats);
+ return bnxt_hwrm_func_qstats(bp, bp->pf->first_vf_id + vf_id, stats,
+ NULL);
}
int rte_pmd_bnxt_reset_vf_stats(uint16_t port,
struct rte_eth_dev *dev;
struct rte_eth_dev_info dev_info;
struct bnxt *bp;
+ int rc;
dev = &rte_eth_devices[port];
if (!is_bnxt_supported(dev))
return -ENOTSUP;
- rte_eth_dev_info_get(port, &dev_info);
- bp = (struct bnxt *)dev->data->dev_private;
+ rc = rte_eth_dev_info_get(port, &dev_info);
+ if (rc != 0) {
+ PMD_DRV_LOG(ERR,
+ "Error during getting device (port %u) info: %s\n",
+ port, strerror(-rc));
+
+ return rc;
+ }
+ bp = dev->data->dev_private;
if (vf_id >= dev_info.max_vfs)
return -EINVAL;
return -ENOTSUP;
}
- return bnxt_hwrm_func_clr_stats(bp, bp->pf.first_vf_id + vf_id);
+ return bnxt_hwrm_func_clr_stats(bp, bp->pf->first_vf_id + vf_id);
}
int rte_pmd_bnxt_get_vf_rx_status(uint16_t port, uint16_t vf_id)
struct rte_eth_dev *dev;
struct rte_eth_dev_info dev_info;
struct bnxt *bp;
+ int rc;
dev = &rte_eth_devices[port];
if (!is_bnxt_supported(dev))
return -ENOTSUP;
- rte_eth_dev_info_get(port, &dev_info);
- bp = (struct bnxt *)dev->data->dev_private;
+ rc = rte_eth_dev_info_get(port, &dev_info);
+ if (rc != 0) {
+ PMD_DRV_LOG(ERR,
+ "Error during getting device (port %u) info: %s\n",
+ port, strerror(-rc));
+
+ return rc;
+ }
+ bp = dev->data->dev_private;
if (vf_id >= dev_info.max_vfs)
return -EINVAL;
struct rte_eth_dev *dev;
struct rte_eth_dev_info dev_info;
struct bnxt *bp;
+ int rc;
dev = &rte_eth_devices[port];
if (!is_bnxt_supported(dev))
return -ENOTSUP;
- rte_eth_dev_info_get(port, &dev_info);
- bp = (struct bnxt *)dev->data->dev_private;
+ rc = rte_eth_dev_info_get(port, &dev_info);
+ if (rc != 0) {
+ PMD_DRV_LOG(ERR,
+ "Error during getting device (port %u) info: %s\n",
+ port, strerror(-rc));
+
+ return rc;
+ }
+ bp = dev->data->dev_private;
if (vf_id >= dev_info.max_vfs)
return -EINVAL;
return -ENOTSUP;
}
- return bnxt_hwrm_func_qstats_tx_drop(bp, bp->pf.first_vf_id + vf_id,
+ return bnxt_hwrm_func_qstats_tx_drop(bp, bp->pf->first_vf_id + vf_id,
count);
}
-int rte_pmd_bnxt_mac_addr_add(uint16_t port, struct ether_addr *addr,
+int rte_pmd_bnxt_mac_addr_add(uint16_t port, struct rte_ether_addr *addr,
uint32_t vf_id)
{
struct rte_eth_dev *dev;
struct bnxt *bp;
struct bnxt_filter_info *filter;
struct bnxt_vnic_info vnic;
- struct ether_addr dflt_mac;
+ struct rte_ether_addr dflt_mac;
int rc;
dev = &rte_eth_devices[port];
if (!is_bnxt_supported(dev))
return -ENOTSUP;
- rte_eth_dev_info_get(port, &dev_info);
- bp = (struct bnxt *)dev->data->dev_private;
+ rc = rte_eth_dev_info_get(port, &dev_info);
+ if (rc != 0) {
+ PMD_DRV_LOG(ERR,
+ "Error during getting device (port %u) info: %s\n",
+ port, strerror(-rc));
+
+ return rc;
+ }
+ bp = dev->data->dev_private;
if (vf_id >= dev_info.max_vfs)
return -EINVAL;
}
/* If the VF currently uses a random MAC, update default to this one */
- if (bp->pf.vf_info[vf_id].random_mac) {
+ if (bp->pf->vf_info[vf_id].random_mac) {
if (rte_pmd_bnxt_get_vf_rx_status(port, vf_id) <= 0)
bnxt_hwrm_func_vf_mac(bp, vf_id, (uint8_t *)addr);
}
memset(&vnic, 0, sizeof(struct bnxt_vnic_info));
vnic.fw_vnic_id = rte_le_to_cpu_16(rc);
- rc = bnxt_hwrm_vnic_qcfg(bp, &vnic, bp->pf.first_vf_id + vf_id);
+ rc = bnxt_hwrm_vnic_qcfg(bp, &vnic, bp->pf->first_vf_id + vf_id);
if (rc < 0)
goto exit;
- STAILQ_FOREACH(filter, &bp->pf.vf_info[vf_id].filter, next) {
+ STAILQ_FOREACH(filter, &bp->pf->vf_info[vf_id].filter, next) {
if (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) &&
- 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;
}
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:
if (!is_bnxt_supported(dev))
return -ENOTSUP;
- rte_eth_dev_info_get(port, &dev_info);
- bp = (struct bnxt *)dev->data->dev_private;
+ rc = rte_eth_dev_info_get(port, &dev_info);
+ if (rc != 0) {
+ PMD_DRV_LOG(ERR,
+ "Error during getting device (port %u) info: %s\n",
+ port, strerror(-rc));
+
+ return rc;
+ }
+ bp = dev->data->dev_private;
if (vf >= dev_info.max_vfs)
return -EINVAL;
return -ENOTSUP;
}
- bp->pf.vf_info[vf].dflt_vlan = vlan_id;
+ bp->pf->vf_info[vf].dflt_vlan = vlan_id;
if (bnxt_hwrm_func_qcfg_current_vf_vlan(bp, vf) ==
- bp->pf.vf_info[vf].dflt_vlan)
+ bp->pf->vf_info[vf].dflt_vlan)
return 0;
rc = bnxt_hwrm_set_vf_vlan(bp, vf);
return -EINVAL;
dev = &rte_eth_devices[port];
- rte_eth_dev_info_get(port, &dev_info);
- bp = (struct bnxt *)dev->data->dev_private;
+ rc = rte_eth_dev_info_get(port, &dev_info);
+ if (rc != 0) {
+ PMD_DRV_LOG(ERR,
+ "Error during getting device (port %u) info: %s\n",
+ port, strerror(-rc));
+
+ return rc;
+ }
+ bp = dev->data->dev_private;
if (!BNXT_PF(bp)) {
PMD_DRV_LOG(ERR,
return -EINVAL;
/* Prev setting same as new setting. */
- if (on == bp->pf.vf_info[vf].persist_stats)
+ if (on == bp->pf->vf_info[vf].persist_stats)
return 0;
- func_flags = bp->pf.vf_info[vf].func_cfg_flags;
+ func_flags = bp->pf->vf_info[vf].func_cfg_flags;
if (on)
func_flags |=
rc = bnxt_hwrm_func_cfg_vf_set_flags(bp, vf, func_flags);
if (!rc) {
- bp->pf.vf_info[vf].persist_stats = on;
- bp->pf.vf_info[vf].func_cfg_flags = func_flags;
+ bp->pf->vf_info[vf].persist_stats = on;
+ bp->pf->vf_info[vf].func_cfg_flags = func_flags;
}
return rc;
git.droids-corp.org / dpdk.git / blobdiff