git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/bnxt: update HWRM prep to use pointer
[dpdk.git]
/
drivers
/
net
/
bnxt
/
bnxt_ethdev.c
diff --git
a/drivers/net/bnxt/bnxt_ethdev.c
b/drivers/net/bnxt/bnxt_ethdev.c
index
267a361
..
93d0062
100644
(file)
--- a/
drivers/net/bnxt/bnxt_ethdev.c
+++ b/
drivers/net/bnxt/bnxt_ethdev.c
@@
-133,6
+133,7
@@
static int bnxt_init_resources(struct bnxt *bp, bool reconfig_dev);
static int bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev);
static void bnxt_cancel_fw_health_check(struct bnxt *bp);
static int bnxt_restore_vlan_filters(struct bnxt *bp);
static int bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev);
static void bnxt_cancel_fw_health_check(struct bnxt *bp);
static int bnxt_restore_vlan_filters(struct bnxt *bp);
+static void bnxt_dev_recover(void *arg);
int is_bnxt_in_error(struct bnxt *bp)
{
int is_bnxt_in_error(struct bnxt *bp)
{
@@
-150,7
+151,7
@@
int is_bnxt_in_error(struct bnxt *bp)
* High level utility functions
*/
* High level utility functions
*/
-uint16_t bnxt_rss_ctxts(const struct bnxt *bp)
+
static
uint16_t bnxt_rss_ctxts(const struct bnxt *bp)
{
if (!BNXT_CHIP_THOR(bp))
return 1;
{
if (!BNXT_CHIP_THOR(bp))
return 1;
@@
-872,9
+873,9
@@
static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
goto error;
eth_dev->data->scattered_rx = bnxt_scattered_rx(eth_dev);
goto error;
eth_dev->data->scattered_rx = bnxt_scattered_rx(eth_dev);
+ eth_dev->data->dev_started = 1;
bnxt_link_update(eth_dev, 1, ETH_LINK_UP);
bnxt_link_update(eth_dev, 1, ETH_LINK_UP);
- bp->dev_stopped = 0;
if (rx_offloads & DEV_RX_OFFLOAD_VLAN_FILTER)
vlan_mask |= ETH_VLAN_FILTER_MASK;
if (rx_offloads & DEV_RX_OFFLOAD_VLAN_FILTER)
vlan_mask |= ETH_VLAN_FILTER_MASK;
@@
-887,8
+888,6
@@
static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
eth_dev->rx_pkt_burst = bnxt_receive_function(eth_dev);
eth_dev->tx_pkt_burst = bnxt_transmit_function(eth_dev);
eth_dev->rx_pkt_burst = bnxt_receive_function(eth_dev);
eth_dev->tx_pkt_burst = bnxt_transmit_function(eth_dev);
- bp->flags |= BNXT_FLAG_INIT_DONE;
- eth_dev->data->dev_started = 1;
pthread_mutex_lock(&bp->def_cp_lock);
bnxt_schedule_fw_health_check(bp);
pthread_mutex_unlock(&bp->def_cp_lock);
pthread_mutex_lock(&bp->def_cp_lock);
bnxt_schedule_fw_health_check(bp);
pthread_mutex_unlock(&bp->def_cp_lock);
@@
-899,7
+898,7
@@
error:
bnxt_shutdown_nic(bp);
bnxt_free_tx_mbufs(bp);
bnxt_free_rx_mbufs(bp);
bnxt_shutdown_nic(bp);
bnxt_free_tx_mbufs(bp);
bnxt_free_rx_mbufs(bp);
-
bp->dev_stopped = 1
;
+
eth_dev->data->dev_started = 0
;
return rc;
}
return rc;
}
@@
-947,13
+946,13
@@
static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
bnxt_cancel_fw_health_check(bp);
bnxt_cancel_fw_health_check(bp);
- bp->flags &= ~BNXT_FLAG_INIT_DONE;
bnxt_dev_set_link_down_op(eth_dev);
/* Wait for link to be reset and the async notification to process.
bnxt_dev_set_link_down_op(eth_dev);
/* Wait for link to be reset and the async notification to process.
- * During reset recovery, there is no need to wait
+ * During reset recovery, there is no need to wait and
+ * VF/NPAR functions do not have privilege to change PHY config.
*/
*/
- if (!is_bnxt_in_error(bp))
+ if (!is_bnxt_in_error(bp)
&& BNXT_SINGLE_PF(bp)
)
bnxt_link_update(eth_dev, 1, ETH_LINK_DOWN);
/* Clean queue intr-vector mapping */
bnxt_link_update(eth_dev, 1, ETH_LINK_DOWN);
/* Clean queue intr-vector mapping */
@@
-975,7
+974,6
@@
static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)
bp->mark_table = NULL;
bp->flags &= ~BNXT_FLAG_RX_VECTOR_PKT_MODE;
bp->mark_table = NULL;
bp->flags &= ~BNXT_FLAG_RX_VECTOR_PKT_MODE;
- bp->dev_stopped = 1;
bp->rx_cosq_cnt = 0;
}
bp->rx_cosq_cnt = 0;
}
@@
-983,7
+981,11
@@
static void bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
{
struct bnxt *bp = eth_dev->data->dev_private;
{
struct bnxt *bp = eth_dev->data->dev_private;
- if (bp->dev_stopped == 0)
+ /* cancel the recovery handler before remove dev */
+ rte_eal_alarm_cancel(bnxt_dev_reset_and_resume, (void *)bp);
+ rte_eal_alarm_cancel(bnxt_dev_recover, (void *)bp);
+
+ if (eth_dev->data->dev_started)
bnxt_dev_stop_op(eth_dev);
bnxt_uninit_resources(bp, false);
bnxt_dev_stop_op(eth_dev);
bnxt_uninit_resources(bp, false);
@@
-1106,6
+1108,10
@@
static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev,
return -EINVAL;
}
return -EINVAL;
}
+ /* Filter settings will get applied when port is started */
+ if (!eth_dev->data->dev_started)
+ return 0;
+
rc = bnxt_add_mac_filter(bp, vnic, mac_addr, index, pool);
return rc;
rc = bnxt_add_mac_filter(bp, vnic, mac_addr, index, pool);
return rc;
@@
-1176,7
+1182,7
@@
static int bnxt_promiscuous_enable_op(struct rte_eth_dev *eth_dev)
return rc;
/* Filter settings will get applied when port is started */
return rc;
/* Filter settings will get applied when port is started */
- if (
bp->dev_stopped == 1
)
+ if (
!eth_dev->data->dev_started
)
return 0;
if (bp->vnic_info == NULL)
return 0;
if (bp->vnic_info == NULL)
@@
-1205,7
+1211,7
@@
static int bnxt_promiscuous_disable_op(struct rte_eth_dev *eth_dev)
return rc;
/* Filter settings will get applied when port is started */
return rc;
/* Filter settings will get applied when port is started */
- if (
bp->dev_stopped == 1
)
+ if (
!eth_dev->data->dev_started
)
return 0;
if (bp->vnic_info == NULL)
return 0;
if (bp->vnic_info == NULL)
@@
-1234,7
+1240,7
@@
static int bnxt_allmulticast_enable_op(struct rte_eth_dev *eth_dev)
return rc;
/* Filter settings will get applied when port is started */
return rc;
/* Filter settings will get applied when port is started */
- if (
bp->dev_stopped == 1
)
+ if (
!eth_dev->data->dev_started
)
return 0;
if (bp->vnic_info == NULL)
return 0;
if (bp->vnic_info == NULL)
@@
-1263,7
+1269,7
@@
static int bnxt_allmulticast_disable_op(struct rte_eth_dev *eth_dev)
return rc;
/* Filter settings will get applied when port is started */
return rc;
/* Filter settings will get applied when port is started */
- if (
bp->dev_stopped == 1
)
+ if (
!eth_dev->data->dev_started
)
return 0;
if (bp->vnic_info == NULL)
return 0;
if (bp->vnic_info == NULL)
@@
-1960,9
+1966,15
@@
bnxt_config_vlan_hw_stripping(struct bnxt *bp, uint64_t rx_offloads)
if (bp->eth_dev->data->dev_conf.rxmode.offloads &
DEV_RX_OFFLOAD_VLAN_FILTER) {
rc = bnxt_add_vlan_filter(bp, 0);
if (bp->eth_dev->data->dev_conf.rxmode.offloads &
DEV_RX_OFFLOAD_VLAN_FILTER) {
rc = bnxt_add_vlan_filter(bp, 0);
- bnxt_restore_vlan_filters(bp);
+ if (rc)
+ return rc;
+ rc = bnxt_restore_vlan_filters(bp);
+ if (rc)
+ return rc;
} else {
rc = bnxt_add_mac_filter(bp, vnic, NULL, 0, 0);
} else {
rc = bnxt_add_mac_filter(bp, vnic, NULL, 0, 0);
+ if (rc)
+ return rc;
}
rc = bnxt_hwrm_cfa_l2_set_rx_mask(bp, vnic, 0, NULL);
}
rc = bnxt_hwrm_cfa_l2_set_rx_mask(bp, vnic, 0, NULL);
@@
-1987,7
+1999,7
@@
bnxt_vlan_offload_set_op(struct rte_eth_dev *dev, int mask)
return rc;
/* Filter settings will get applied when port is started */
return rc;
/* Filter settings will get applied when port is started */
- if (
bp->dev_stopped == 1
)
+ if (
!dev->data->dev_started
)
return 0;
if (mask & ETH_VLAN_FILTER_MASK) {
return 0;
if (mask & ETH_VLAN_FILTER_MASK) {
@@
-2091,6
+2103,10
@@
bnxt_set_default_mac_addr_op(struct rte_eth_dev *dev,
if (rte_is_zero_ether_addr(addr))
return -EINVAL;
if (rte_is_zero_ether_addr(addr))
return -EINVAL;
+ /* Filter settings will get applied when port is started */
+ if (!dev->data->dev_started)
+ return 0;
+
/* Check if the requested MAC is already added */
if (memcmp(addr, bp->mac_addr, RTE_ETHER_ADDR_LEN) == 0)
return 0;
/* Check if the requested MAC is already added */
if (memcmp(addr, bp->mac_addr, RTE_ETHER_ADDR_LEN) == 0)
return 0;
@@
-3889,7
+3905,7
@@
static void bnxt_dev_cleanup(struct bnxt *bp)
{
bnxt_set_hwrm_link_config(bp, false);
bp->link_info.link_up = 0;
{
bnxt_set_hwrm_link_config(bp, false);
bp->link_info.link_up = 0;
- if (bp->
dev_stopped == 0
)
+ if (bp->
eth_dev->data->dev_started
)
bnxt_dev_stop_op(bp->eth_dev);
bnxt_uninit_resources(bp, true);
bnxt_dev_stop_op(bp->eth_dev);
bnxt_uninit_resources(bp, true);
@@
-3965,10
+3981,16
@@
static int bnxt_restore_filters(struct bnxt *bp)
struct rte_eth_dev *dev = bp->eth_dev;
int ret = 0;
struct rte_eth_dev *dev = bp->eth_dev;
int ret = 0;
- if (dev->data->all_multicast)
+ if (dev->data->all_multicast)
{
ret = bnxt_allmulticast_enable_op(dev);
ret = bnxt_allmulticast_enable_op(dev);
- if (dev->data->promiscuous)
+ if (ret)
+ return ret;
+ }
+ if (dev->data->promiscuous) {
ret = bnxt_promiscuous_enable_op(dev);
ret = bnxt_promiscuous_enable_op(dev);
+ if (ret)
+ return ret;
+ }
ret = bnxt_restore_mac_filters(bp);
if (ret)
ret = bnxt_restore_mac_filters(bp);
if (ret)
@@
-3989,7
+4011,7
@@
static void bnxt_dev_recover(void *arg)
bp->flags &= ~BNXT_FLAG_FATAL_ERROR;
do {
bp->flags &= ~BNXT_FLAG_FATAL_ERROR;
do {
- rc = bnxt_hwrm_ver_get(bp);
+ rc = bnxt_hwrm_ver_get(bp
, SHORT_HWRM_CMD_TIMEOUT
);
if (rc == 0)
break;
rte_delay_ms(BNXT_FW_READY_WAIT_INTERVAL);
if (rc == 0)
break;
rte_delay_ms(BNXT_FW_READY_WAIT_INTERVAL);
@@
-4013,15
+4035,17
@@
static void bnxt_dev_recover(void *arg)
rc = bnxt_dev_start_op(bp->eth_dev);
if (rc) {
PMD_DRV_LOG(ERR, "Failed to start port after reset\n");
rc = bnxt_dev_start_op(bp->eth_dev);
if (rc) {
PMD_DRV_LOG(ERR, "Failed to start port after reset\n");
- goto err;
+ goto err
_start
;
}
rc = bnxt_restore_filters(bp);
if (rc)
}
rc = bnxt_restore_filters(bp);
if (rc)
- goto err;
+ goto err
_start
;
PMD_DRV_LOG(INFO, "Recovered from FW reset\n");
return;
PMD_DRV_LOG(INFO, "Recovered from FW reset\n");
return;
+err_start:
+ bnxt_dev_stop_op(bp->eth_dev);
err:
bp->flags |= BNXT_FLAG_FATAL_ERROR;
bnxt_uninit_resources(bp, false);
err:
bp->flags |= BNXT_FLAG_FATAL_ERROR;
bnxt_uninit_resources(bp, false);
@@
-4679,7
+4703,7
@@
static int bnxt_init_fw(struct bnxt *bp)
bp->fw_cap = 0;
bp->fw_cap = 0;
- rc = bnxt_hwrm_ver_get(bp);
+ rc = bnxt_hwrm_ver_get(bp
, DFLT_HWRM_CMD_TIMEOUT
);
if (rc)
return rc;
if (rc)
return rc;
@@
-4826,7
+4850,6
@@
bnxt_dev_init(struct rte_eth_dev *eth_dev)
bp = eth_dev->data->dev_private;
bp = eth_dev->data->dev_private;
- bp->dev_stopped = 1;
bp->flags &= ~BNXT_FLAG_RX_VECTOR_PKT_MODE;
if (bnxt_vf_pciid(pci_dev->id.device_id))
bp->flags &= ~BNXT_FLAG_RX_VECTOR_PKT_MODE;
if (bnxt_vf_pciid(pci_dev->id.device_id))