On 10/22/15, 7:28 AM, "Bernard Iremonger" <bernard.iremonger at intel.com>
wrote:
>Signed-off-by: Bernard Iremonger <bernard.iremonger at intel.com>
Acked-by: Yong Wang <yongwang at vmware.com>
Any specific reason you changed assignment of adapter_stopped from TRUE/FALSE
to 1/0?
I saw mixed uses of TRUE/FALSE, true/false and 1/0 all over the DPDK code base.
>---
> doc/guides/rel_notes/release_2_2.rst | 1 +
> drivers/net/vmxnet3/vmxnet3_ethdev.c | 33 +++++++++++++++++++++++++++++----
> 2 files changed, 30 insertions(+), 4 deletions(-)
>
>diff --git a/doc/guides/rel_notes/release_2_2.rst
>b/doc/guides/rel_notes/release_2_2.rst
>index 4f75cff..9b0c046 100644
>--- a/doc/guides/rel_notes/release_2_2.rst
>+++ b/doc/guides/rel_notes/release_2_2.rst
>@@ -9,6 +9,7 @@ New Features
> * Added support for Jumbo Frames.
> * Optimize forwarding performance for Chelsio T5 40GbE cards.
>
>+* **Added port hotplug support to the vmxnet3 PMD.**
>
> Resolved Issues
> ---------------
>diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c
>b/drivers/net/vmxnet3/vmxnet3_ethdev.c
>index a70be5c..d5337ac 100644
>--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
>+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
>@@ -70,6 +70,7 @@
> #define PROCESS_SYS_EVENTS 0
>
> static int eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev);
>+static int eth_vmxnet3_dev_uninit(struct rte_eth_dev *eth_dev);
> static int vmxnet3_dev_configure(struct rte_eth_dev *dev);
> static int vmxnet3_dev_start(struct rte_eth_dev *dev);
> static void vmxnet3_dev_stop(struct rte_eth_dev *dev);
>@@ -294,13 +295,37 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev)
> return 0;
> }
>
>+static int
>+eth_vmxnet3_dev_uninit(struct rte_eth_dev *eth_dev)
>+{
>+ struct vmxnet3_hw *hw = eth_dev->data->dev_private;
>+
>+ PMD_INIT_FUNC_TRACE();
>+
>+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
>+ return 0;
>+
>+ if (hw->adapter_stopped == 0)
>+ vmxnet3_dev_close(eth_dev);
>+
>+ eth_dev->dev_ops = NULL;
>+ eth_dev->rx_pkt_burst = NULL;
>+ eth_dev->tx_pkt_burst = NULL;
>+
>+ rte_free(eth_dev->data->mac_addrs);
>+ eth_dev->data->mac_addrs = NULL;
>+
>+ return 0;
>+}
>+
> static struct eth_driver rte_vmxnet3_pmd = {
> .pci_drv = {
> .name = "rte_vmxnet3_pmd",
> .id_table = pci_id_vmxnet3_map,
>- .drv_flags = RTE_PCI_DRV_NEED_MAPPING,
>+ .drv_flags = RTE_PCI_DRV_NEED_MAPPING | RTE_PCI_DRV_DETACHABLE,
> },
> .eth_dev_init = eth_vmxnet3_dev_init,
>+ .eth_dev_uninit = eth_vmxnet3_dev_uninit,
> .dev_private_size = sizeof(struct vmxnet3_hw),
> };
>
>@@ -579,7 +604,7 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev)
>
> PMD_INIT_FUNC_TRACE();
>
>- if (hw->adapter_stopped == TRUE) {
>+ if (hw->adapter_stopped == 1) {
> PMD_INIT_LOG(DEBUG, "Device already closed.");
> return;
> }
>@@ -595,7 +620,7 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev)
> /* reset the device */
> VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD, VMXNET3_CMD_RESET_DEV);
> PMD_INIT_LOG(DEBUG, "Device reset.");
>- hw->adapter_stopped = FALSE;
>+ hw->adapter_stopped = 0;
>
> vmxnet3_dev_clear_queues(dev);
>
>@@ -615,7 +640,7 @@ vmxnet3_dev_close(struct rte_eth_dev *dev)
> PMD_INIT_FUNC_TRACE();
>
> vmxnet3_dev_stop(dev);
>- hw->adapter_stopped = TRUE;
>+ hw->adapter_stopped = 1;
> }
>
> static void
>--
>1.9.1
>
