i40e: support port hotplug

This patch depends on the Port Hotplug Framework.
It implements the eth_dev_uninit functions for rte_i40e_pmd and
rte_i40evf_pmd.

Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
Acked-by: Helin Zhang <helin.zhang@intel.com>

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index db642a5..ca435d8 100644 (file)
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -114,6 +114,7 @@
 #define I40E_PRTTSYN_TSYNTYPE 0x0e000000
 
 static int eth_i40e_dev_init(struct rte_eth_dev *eth_dev);
+static int eth_i40e_dev_uninit(struct rte_eth_dev *eth_dev);
 static int i40e_dev_configure(struct rte_eth_dev *dev);
 static int i40e_dev_start(struct rte_eth_dev *dev);
 static void i40e_dev_stop(struct rte_eth_dev *dev);
@@ -294,9 +295,11 @@ static struct eth_driver rte_i40e_pmd = {
        .pci_drv = {
                .name = "rte_i40e_pmd",
                .id_table = pci_id_i40e_map,
-               .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC,
+               .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_INTR_LSC |
+                       RTE_PCI_DRV_DETACHABLE,
        },
        .eth_dev_init = eth_i40e_dev_init,
+       .eth_dev_uninit = eth_i40e_dev_uninit,
        .dev_private_size = sizeof(struct i40e_adapter),
 };
 
@@ -431,6 +434,7 @@ eth_i40e_dev_init(struct rte_eth_dev *dev)
        hw->subsystem_device_id = pci_dev->id.subsystem_device_id;
        hw->bus.device = pci_dev->addr.devid;
        hw->bus.func = pci_dev->addr.function;
+       hw->adapter_stopped = 0;
 
        /* Make sure all is clean before doing PF reset */
        i40e_clear_hw(hw);
@@ -612,6 +616,65 @@ err_get_capabilities:
        return ret;
 }
 
+static int
+eth_i40e_dev_uninit(struct rte_eth_dev *dev)
+{
+       struct rte_pci_device *pci_dev;
+       struct i40e_hw *hw;
+       struct i40e_filter_control_settings settings;
+       int ret;
+       uint8_t aq_fail = 0;
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return 0;
+
+       hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       pci_dev = dev->pci_dev;
+
+       if (hw->adapter_stopped == 0)
+               i40e_dev_close(dev);
+
+       dev->dev_ops = NULL;
+       dev->rx_pkt_burst = NULL;
+       dev->tx_pkt_burst = NULL;
+
+       /* Disable LLDP */
+       ret = i40e_aq_stop_lldp(hw, true, NULL);
+       if (ret != I40E_SUCCESS) /* Its failure can be ignored */
+               PMD_INIT_LOG(INFO, "Failed to stop lldp");
+
+       /* Clear PXE mode */
+       i40e_clear_pxe_mode(hw);
+
+       /* Unconfigure filter control */
+       memset(&settings, 0, sizeof(settings));
+       ret = i40e_set_filter_control(hw, &settings);
+       if (ret)
+               PMD_INIT_LOG(WARNING, "setup_pf_filter_control failed: %d",
+                                       ret);
+
+       /* Disable flow control */
+       hw->fc.requested_mode = I40E_FC_NONE;
+       i40e_set_fc(hw, &aq_fail, TRUE);
+
+       /* uninitialize pf host driver */
+       i40e_pf_host_uninit(dev);
+
+       rte_free(dev->data->mac_addrs);
+       dev->data->mac_addrs = NULL;
+
+       /* disable uio intr before callback unregister */
+       rte_intr_disable(&(pci_dev->intr_handle));
+
+       /* register callback func to eal lib */
+       rte_intr_callback_unregister(&(pci_dev->intr_handle),
+               i40e_dev_interrupt_handler, (void *)dev);
+
+       return 0;
+}
+
 static int
 i40e_dev_configure(struct rte_eth_dev *dev)
 {
@@ -887,6 +950,8 @@ i40e_dev_start(struct rte_eth_dev *dev)
        struct i40e_vsi *main_vsi = pf->main_vsi;
        int ret, i;
 
+       hw->adapter_stopped = 0;
+
        if ((dev->data->dev_conf.link_duplex != ETH_LINK_AUTONEG_DUPLEX) &&
                (dev->data->dev_conf.link_duplex != ETH_LINK_FULL_DUPLEX)) {
                PMD_INIT_LOG(ERR, "Invalid link_duplex (%hu) for port %hhu",
@@ -1002,6 +1067,7 @@ i40e_dev_close(struct rte_eth_dev *dev)
        PMD_INIT_FUNC_TRACE();
 
        i40e_dev_stop(dev);
+       hw->adapter_stopped = 1;
 
        /* Disable interrupt */
        i40e_pf_disable_irq0(hw);

diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index b150b62..22d6099 100644 (file)
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -1145,6 +1145,22 @@ err:
        return -1;
 }
 
+static int
+i40evf_uninit_vf(struct rte_eth_dev *dev)
+{
+       struct i40e_vf *vf = I40EVF_DEV_PRIVATE_TO_VF(dev->data->dev_private);
+       struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+
+       PMD_INIT_FUNC_TRACE();
+
+       if (hw->adapter_stopped == 0)
+               i40evf_dev_close(dev);
+       rte_free(vf->vf_res);
+       vf->vf_res = NULL;
+
+       return 0;
+}
+
 static int
 i40evf_dev_init(struct rte_eth_dev *eth_dev)
 {
@@ -1175,6 +1191,7 @@ i40evf_dev_init(struct rte_eth_dev *eth_dev)
        hw->bus.device = eth_dev->pci_dev->addr.devid;
        hw->bus.func = eth_dev->pci_dev->addr.function;
        hw->hw_addr = (void *)eth_dev->pci_dev->mem_resource[0].addr;
+       hw->adapter_stopped = 0;
 
        if(i40evf_init_vf(eth_dev) != 0) {
                PMD_INIT_LOG(ERR, "Init vf failed");
@@ -1195,6 +1212,28 @@ i40evf_dev_init(struct rte_eth_dev *eth_dev)
        return 0;
 }
 
+static int
+i40evf_dev_uninit(struct rte_eth_dev *eth_dev)
+{
+       PMD_INIT_FUNC_TRACE();
+
+       if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+               return -EPERM;
+
+       eth_dev->dev_ops = NULL;
+       eth_dev->rx_pkt_burst = NULL;
+       eth_dev->tx_pkt_burst = NULL;
+
+       if (i40evf_uninit_vf(eth_dev) != 0) {
+               PMD_INIT_LOG(ERR, "i40evf_uninit_vf failed");
+               return -1;
+       }
+
+       rte_free(eth_dev->data->mac_addrs);
+       eth_dev->data->mac_addrs = NULL;
+
+       return 0;
+}
 /*
  * virtual function driver struct
  */
@@ -1202,9 +1241,10 @@ static struct eth_driver rte_i40evf_pmd = {
        .pci_drv = {
                .name = "rte_i40evf_pmd",
                .id_table = pci_id_i40evf_map,
-               .drv_flags = RTE_PCI_DRV_NEED_MAPPING,
+               .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_DETACHABLE,
        },
        .eth_dev_init = i40evf_dev_init,
+       .eth_dev_uninit = i40evf_dev_uninit,
        .dev_private_size = sizeof(struct i40e_vf),
 };
 
@@ -1524,6 +1564,8 @@ i40evf_dev_start(struct rte_eth_dev *dev)
 
        PMD_INIT_FUNC_TRACE();
 
+       hw->adapter_stopped = 0;
+
        vf->max_pkt_len = dev->data->dev_conf.rxmode.max_rx_pkt_len;
        vf->num_queue_pairs = RTE_MAX(dev->data->nb_rx_queues,
                                        dev->data->nb_tx_queues);
@@ -1723,6 +1765,7 @@ i40evf_dev_close(struct rte_eth_dev *dev)
        struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
        i40evf_dev_stop(dev);
+       hw->adapter_stopped = 1;
        i40evf_reset_vf(hw);
        i40e_shutdown_adminq(hw);
 }

diff --git a/drivers/net/i40e/i40e_pf.c b/drivers/net/i40e/i40e_pf.c
index b89a1e2..95c960c 100644 (file)
--- a/drivers/net/i40e/i40e_pf.c
+++ b/drivers/net/i40e/i40e_pf.c
@@ -1061,3 +1061,37 @@ fail:
 
        return ret;
 }
+
+int
+i40e_pf_host_uninit(struct rte_eth_dev *dev)
+{
+       struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+       struct i40e_hw *hw = I40E_PF_TO_HW(pf);
+       uint32_t val;
+
+       PMD_INIT_FUNC_TRACE();
+
+       /**
+        * return if SRIOV not enabled, VF number not configured or
+        * no queue assigned.
+        */
+       if ((!hw->func_caps.sr_iov_1_1) ||
+               (pf->vf_num == 0) ||
+               (pf->vf_nb_qps == 0))
+               return I40E_SUCCESS;
+
+       /* free memory to store VF structure */
+       rte_free(pf->vfs);
+       pf->vfs = NULL;
+
+       /* Disable irq0 for VFR event */
+       i40e_pf_disable_irq0(hw);
+
+       /* Disable VF link status interrupt */
+       val = I40E_READ_REG(hw, I40E_PFGEN_PORTMDIO_NUM);
+       val &= ~I40E_PFGEN_PORTMDIO_NUM_VFLINK_STAT_ENA_MASK;
+       I40E_WRITE_REG(hw, I40E_PFGEN_PORTMDIO_NUM, val);
+       I40E_WRITE_FLUSH(hw);
+
+       return I40E_SUCCESS;
+}

diff --git a/drivers/net/i40e/i40e_pf.h b/drivers/net/i40e/i40e_pf.h
index e08ba49..9c01829 100644 (file)
--- a/drivers/net/i40e/i40e_pf.h
+++ b/drivers/net/i40e/i40e_pf.h
@@ -123,5 +123,6 @@ void i40e_pf_host_handle_vf_msg(struct rte_eth_dev *dev,
                                __rte_unused uint32_t retval,
                                uint8_t *msg, uint16_t msglen);
 int i40e_pf_host_init(struct rte_eth_dev *dev);
+int i40e_pf_host_uninit(struct rte_eth_dev *dev);
 
 #endif /* _I40E_PF_H_ */