Consolidate FM deconfiguration to avoid duplicate calls. Move the fm_deconfig call to a single location and remove redundant checks in the device close path.
Signed-off-by: Hemant Agrawal <[email protected]> --- drivers/net/dpaa/dpaa_ethdev.c | 42 +++++++++++++++------------------- drivers/net/dpaa/dpaa_flow.c | 9 ++++---- 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index 7318cd7f34..1c42fa0c1c 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -524,15 +524,6 @@ static int dpaa_eth_dev_close(struct rte_eth_dev *dev) return -ENOENT; } - /* DPAA FM deconfig */ - if (!(default_q || fmc_q)) { - ret = dpaa_fm_deconfig(dpaa_intf, dev->process_private); - if (ret) { - DPAA_PMD_WARN("%s: FM deconfig failed(%d)", - dev->data->name, ret); - } - } - dpaa_dev = RTE_CLASS_TO_BUS_DEVICE(dev, *dpaa_dev); intr_handle = dpaa_dev->intr_handle; __fif = container_of(fif, struct __fman_if, __if); @@ -573,7 +564,26 @@ static int dpaa_eth_dev_close(struct rte_eth_dev *dev) /* release configuration memory */ rte_free(dpaa_intf->fc_conf); + dpaa_intf->fc_conf = NULL; + /* For FMCLESS mode of share MAC, deconfig FM to direct + * ingress traffic to kernel before fq shutdown. + */ + if (!(default_q || fmc_q) && dpaa_intf->port_handle) { + ret = dpaa_fm_deconfig(dpaa_intf, dev->process_private); + if (ret) { + DPAA_PMD_WARN("%s: FM deconfig failed(%d)", + dev->data->name, ret); + } + } + if (fif->num_profiles) { + ret = dpaa_port_vsp_cleanup(dpaa_intf, fif); + if (ret) { + DPAA_PMD_WARN("%s: cleanup VSP failed(%d)", + dev->data->name, ret); + } + } + /* Release congestion Groups after releasing FQIDs */ /* Release RX congestion Groups */ if (dpaa_intf->cgr_rx) { for (loop = 0; loop < dpaa_intf->nb_rx_queues; loop++) { @@ -617,20 +627,6 @@ static int dpaa_eth_dev_close(struct rte_eth_dev *dev) rte_free(dpaa_intf->tx_queues); dpaa_intf->tx_queues = NULL; - if (dpaa_intf->port_handle) { - ret = dpaa_fm_deconfig(dpaa_intf, fif); - if (ret) { - DPAA_PMD_WARN("%s: FM deconfig failed(%d)", - dev->data->name, ret); - } - } - if (fif->num_profiles) { - ret = dpaa_port_vsp_cleanup(dpaa_intf, fif); - if (ret) { - DPAA_PMD_WARN("%s: cleanup VSP failed(%d)", - dev->data->name, ret); - } - } return ret; } diff --git a/drivers/net/dpaa/dpaa_flow.c b/drivers/net/dpaa/dpaa_flow.c index f21950f64d..bfe294d21d 100644 --- a/drivers/net/dpaa/dpaa_flow.c +++ b/drivers/net/dpaa/dpaa_flow.c @@ -728,6 +728,9 @@ int dpaa_fm_deconfig(struct dpaa_if *dpaa_intf, PMD_INIT_FUNC_TRACE(); + if (!dpaa_intf->port_handle) + return 0; + /* FM PORT Disable */ ret = fm_port_disable(dpaa_intf->port_handle); if (ret != E_OK) { @@ -787,10 +790,8 @@ int dpaa_fm_config(struct rte_eth_dev *dev, uint64_t req_dist_set) unsigned int i = 0; PMD_INIT_FUNC_TRACE(); - if (dpaa_intf->port_handle) { - if (dpaa_fm_deconfig(dpaa_intf, fif)) - DPAA_PMD_ERR("DPAA FM deconfig failed"); - } + if (dpaa_fm_deconfig(dpaa_intf, fif)) + DPAA_PMD_ERR("DPAA FM deconfig failed"); if (!dev->data->nb_rx_queues) return 0; -- 2.25.1
