Skip to content

Commit

Permalink
net/bnxt: refactor init/uninit
Browse files Browse the repository at this point in the history 
[ upstream commit 3127f99 ]

Move all the individual driver fields allocation routines to one
routine - bnxt_drv_init(). This houses all such routines where
memory needs to be allocated once during the driver's lifetime
and does not need to be torn down during error recovery.

Rename some function names in accordance with their functionality.
bnxt_init_board() is doing nothing more than mapping the PCI bars,
so rename it as such.

Given that there is a bnxt_shutdown_nic that is called in dev_stop_op,
rename it's counterpart - bnxt_init_chip() that is called in
dev_start_op, to bnxt_start_nic. Also helps avoid confusion with some of
the other bnxt_init_xxx routines.
Rename bnxt_init_fw() to bnxt_get_config() as that is what that routine
is doing mostly functionality wise.

Signed-off-by: Somnath Kotur <somnath.kotur@broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
  • Loading branch information
@skotur-brcm @bluca
skotur-brcm authored and bluca committed Feb 4, 2021
1 parent 436effd commit b3d3810
Showing 1 changed file with 88 additions and 62 deletions.
150 changes: 88 additions & 62 deletions drivers/net/bnxt/bnxt_ethdev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ static int bnxt_update_phy_setting(struct bnxt *bp)
return rc;
}

static int bnxt_init_chip(struct bnxt *bp)
static int bnxt_start_nic(struct bnxt *bp)
{
struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(bp->eth_dev);
struct rte_intr_handle *intr_handle = &pci_dev->intr_handle;
Expand Down Expand Up @@ -1395,7 +1395,7 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)

bnxt_enable_int(bp);

rc = bnxt_init_chip(bp);
rc = bnxt_start_nic(bp);
if (rc)
goto error;

Expand Down Expand Up @@ -1441,26 +1441,9 @@ bnxt_uninit_locks(struct bnxt *bp)
}
}

static int bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
static void bnxt_drv_uninit(struct bnxt *bp)
{
struct bnxt *bp = eth_dev->data->dev_private;
int ret = 0;

if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 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);
bnxt_cancel_fc_thread(bp);

if (eth_dev->data->dev_started)
ret = bnxt_dev_stop_op(eth_dev);

bnxt_free_switch_domain(bp);

bnxt_uninit_resources(bp, false);

bnxt_free_leds_info(bp);
bnxt_free_cos_queues(bp);
bnxt_free_link_info(bp);
Expand All @@ -1477,6 +1460,27 @@ static int bnxt_dev_close_op(struct rte_eth_dev *eth_dev)

rte_free(bp->grp_info);
bp->grp_info = NULL;
}

static int bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
{
struct bnxt *bp = eth_dev->data->dev_private;
int ret = 0;

if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 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);
bnxt_cancel_fc_thread(bp);

if (eth_dev->data->dev_started)
ret = bnxt_dev_stop_op(eth_dev);

bnxt_uninit_resources(bp, false);

bnxt_drv_uninit(bp);

return ret;
}
Expand Down Expand Up @@ -4045,7 +4049,7 @@ bool bnxt_stratus_device(struct bnxt *bp)
}
}

static int bnxt_init_board(struct rte_eth_dev *eth_dev)
static int bnxt_map_pci_bars(struct rte_eth_dev *eth_dev)
{
struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
struct bnxt *bp = eth_dev->data->dev_private;
Expand Down Expand Up @@ -4670,7 +4674,11 @@ static int bnxt_map_hcomm_fw_status_reg(struct bnxt *bp)
return 0;
}

static int bnxt_init_fw(struct bnxt *bp)
/* This function gets the FW version along with the
* capabilities(MAX and current) of the function, vnic,
* error recovery, phy and other chip related info
*/
static int bnxt_get_config(struct bnxt *bp)
{
uint16_t mtu;
int rc = 0;
Expand Down Expand Up @@ -4755,7 +4763,7 @@ static int bnxt_init_resources(struct bnxt *bp, bool reconfig_dev)
{
int rc = 0;

rc = bnxt_init_fw(bp);
rc = bnxt_get_config(bp);
if (rc)
return rc;

Expand Down Expand Up @@ -5202,38 +5210,14 @@ static int bnxt_alloc_switch_domain(struct bnxt *bp)
return rc;
}

static int
bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused)
/* Allocate and initialize various fields in bnxt struct that
* need to be allocated/destroyed only once in the lifetime of the driver
*/
static int bnxt_drv_init(struct rte_eth_dev *eth_dev)
{
struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
static int version_printed;
struct bnxt *bp;
int rc;

if (version_printed++ == 0)
PMD_DRV_LOG(INFO, "%s\n", bnxt_version);

eth_dev->dev_ops = &bnxt_dev_ops;
eth_dev->rx_queue_count = bnxt_rx_queue_count_op;
eth_dev->rx_descriptor_status = bnxt_rx_descriptor_status_op;
eth_dev->tx_descriptor_status = bnxt_tx_descriptor_status_op;
eth_dev->rx_pkt_burst = &bnxt_recv_pkts;
eth_dev->tx_pkt_burst = &bnxt_xmit_pkts;

/*
* For secondary processes, we don't initialise any further
* as primary has already done this work.
*/
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;

rte_eth_copy_pci_info(eth_dev, pci_dev);
eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;

bp = eth_dev->data->dev_private;

/* Parse dev arguments passed on when starting the DPDK application. */
bnxt_parse_dev_args(bp, pci_dev->device.devargs);
struct bnxt *bp = eth_dev->data->dev_private;
int rc = 0;

bp->flags &= ~BNXT_FLAG_RX_VECTOR_PKT_MODE;

Expand Down Expand Up @@ -5265,7 +5249,7 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused)
}
}

rc = bnxt_init_board(eth_dev);
rc = bnxt_map_pci_bars(eth_dev);
if (rc) {
PMD_DRV_LOG(ERR,
"Failed to initialize board rc: %x\n", rc);
Expand All @@ -5274,31 +5258,75 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused)

rc = bnxt_alloc_pf_info(bp);
if (rc)
goto error_free;
return rc;

rc = bnxt_alloc_link_info(bp);
if (rc)
goto error_free;
return rc;

rc = bnxt_alloc_parent_info(bp);
if (rc)
goto error_free;
return rc;

rc = bnxt_alloc_hwrm_resources(bp);
if (rc) {
PMD_DRV_LOG(ERR,
"Failed to allocate hwrm resource rc: %x\n", rc);
goto error_free;
return rc;
}
rc = bnxt_alloc_leds_info(bp);
if (rc)
goto error_free;
return rc;

rc = bnxt_alloc_cos_queues(bp);
if (rc)
goto error_free;
return rc;

rc = bnxt_init_locks(bp);
if (rc)
return rc;

rc = bnxt_alloc_switch_domain(bp);
if (rc)
return rc;

return rc;
}

static int
bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused)
{
struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev);
static int version_printed;
struct bnxt *bp;
int rc;

if (version_printed++ == 0)
PMD_DRV_LOG(INFO, "%s\n", bnxt_version);

eth_dev->dev_ops = &bnxt_dev_ops;
eth_dev->rx_queue_count = bnxt_rx_queue_count_op;
eth_dev->rx_descriptor_status = bnxt_rx_descriptor_status_op;
eth_dev->tx_descriptor_status = bnxt_tx_descriptor_status_op;
eth_dev->rx_pkt_burst = &bnxt_recv_pkts;
eth_dev->tx_pkt_burst = &bnxt_xmit_pkts;

/*
* For secondary processes, we don't initialise any further
* as primary has already done this work.
*/
if (rte_eal_process_type() != RTE_PROC_PRIMARY)
return 0;

rte_eth_copy_pci_info(eth_dev, pci_dev);
eth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;

bp = eth_dev->data->dev_private;

/* Parse dev arguments passed on when starting the DPDK application. */
bnxt_parse_dev_args(bp, pci_dev->device.devargs);

rc = bnxt_drv_init(eth_dev);
if (rc)
goto error_free;

Expand All @@ -5310,8 +5338,6 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused)
if (rc)
goto error_free;

bnxt_alloc_switch_domain(bp);

PMD_DRV_LOG(INFO,
DRV_MODULE_NAME "found at mem %" PRIX64 ", node addr %pM\n",
pci_dev->mem_resource[0].phys_addr,
Expand Down

0 comments on commit b3d3810

Please sign in to comment.