net: add rte prefix to ether structures

[dpdk.git] / drivers / net / vmxnet3 / vmxnet3_ethdev.c

diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c
index 41bcd45..3ad1e9e 100644 (file)
--- a/drivers/net/vmxnet3/vmxnet3_ethdev.c
+++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c
@@ -52,6 +52,7 @@
 
 #define VMXNET3_RX_OFFLOAD_CAP         \
        (DEV_RX_OFFLOAD_VLAN_STRIP |    \
+        DEV_RX_OFFLOAD_VLAN_FILTER |   \
         DEV_RX_OFFLOAD_SCATTER |       \
         DEV_RX_OFFLOAD_IPV4_CKSUM |    \
         DEV_RX_OFFLOAD_UDP_CKSUM |     \
@@ -91,7 +92,7 @@ static int vmxnet3_dev_vlan_filter_set(struct rte_eth_dev *dev,
                                       uint16_t vid, int on);
 static int vmxnet3_dev_vlan_offload_set(struct rte_eth_dev *dev, int mask);
 static int vmxnet3_mac_addr_set(struct rte_eth_dev *dev,
-                                struct ether_addr *mac_addr);
+                                struct rte_ether_addr *mac_addr);
 static void vmxnet3_interrupt_handler(void *param);
 
 int vmxnet3_logtype_init;
@@ -266,7 +267,11 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev)
        ver = VMXNET3_READ_BAR1_REG(hw, VMXNET3_REG_VRRS);
        PMD_INIT_LOG(DEBUG, "Hardware version : %d", ver);
 
-       if (ver & (1 << VMXNET3_REV_3)) {
+       if (ver & (1 << VMXNET3_REV_4)) {
+               VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_VRRS,
+                                      1 << VMXNET3_REV_4);
+               hw->version = VMXNET3_REV_4 + 1;
+       } else if (ver & (1 << VMXNET3_REV_3)) {
                VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_VRRS,
                                       1 << VMXNET3_REV_3);
                hw->version = VMXNET3_REV_3 + 1;
@@ -311,13 +316,16 @@ eth_vmxnet3_dev_init(struct rte_eth_dev *eth_dev)
                return -ENOMEM;
        }
        /* Copy the permanent MAC address */
-       ether_addr_copy((struct ether_addr *) hw->perm_addr,
+       ether_addr_copy((struct rte_ether_addr *)hw->perm_addr,
                        &eth_dev->data->mac_addrs[0]);
 
        PMD_INIT_LOG(DEBUG, "MAC Address : %02x:%02x:%02x:%02x:%02x:%02x",
                     hw->perm_addr[0], hw->perm_addr[1], hw->perm_addr[2],
                     hw->perm_addr[3], hw->perm_addr[4], hw->perm_addr[5]);
 
+       /* Flag to call rte_eth_dev_release_port() in rte_eth_dev_close(). */
+       eth_dev->data->dev_flags |= RTE_ETH_DEV_CLOSE_REMOVE;
+
        /* Put device in Quiesce Mode */
        VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD, VMXNET3_CMD_QUIESCE_DEV);
 
@@ -360,8 +368,10 @@ eth_vmxnet3_dev_uninit(struct rte_eth_dev *eth_dev)
        if (rte_eal_process_type() != RTE_PROC_PRIMARY)
                return 0;
 
-       if (hw->adapter_stopped == 0)
-               vmxnet3_dev_close(eth_dev);
+       if (hw->adapter_stopped == 0) {
+               PMD_INIT_LOG(DEBUG, "Device has not been closed.");
+               return -EBUSY;
+       }
 
        eth_dev->dev_ops = NULL;
        eth_dev->rx_pkt_burst = NULL;
@@ -759,6 +769,15 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)
                PMD_INIT_LOG(DEBUG, "Failed to setup memory region\n");
        }
 
+       if (VMXNET3_VERSION_GE_4(hw)) {
+               /* Check for additional RSS  */
+               ret = vmxnet3_v4_rss_configure(dev);
+               if (ret != VMXNET3_SUCCESS) {
+                       PMD_INIT_LOG(ERR, "Failed to configure v4 RSS");
+                       return ret;
+               }
+       }
+
        /* Disable interrupts */
        vmxnet3_disable_intr(hw);
 
@@ -805,7 +824,7 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev)
        PMD_INIT_FUNC_TRACE();
 
        if (hw->adapter_stopped == 1) {
-               PMD_INIT_LOG(DEBUG, "Device already closed.");
+               PMD_INIT_LOG(DEBUG, "Device already stopped.");
                return;
        }
 
@@ -829,7 +848,6 @@ 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 = 0;
 
        vmxnet3_dev_clear_queues(dev);
 
@@ -839,6 +857,30 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev)
        link.link_speed = ETH_SPEED_NUM_10G;
        link.link_autoneg = ETH_LINK_FIXED;
        rte_eth_linkstatus_set(dev, &link);
+
+       hw->adapter_stopped = 1;
+}
+
+static void
+vmxnet3_free_queues(struct rte_eth_dev *dev)
+{
+       int i;
+
+       PMD_INIT_FUNC_TRACE();
+
+       for (i = 0; i < dev->data->nb_rx_queues; i++) {
+               void *rxq = dev->data->rx_queues[i];
+
+               vmxnet3_dev_rx_queue_release(rxq);
+       }
+       dev->data->nb_rx_queues = 0;
+
+       for (i = 0; i < dev->data->nb_tx_queues; i++) {
+               void *txq = dev->data->tx_queues[i];
+
+               vmxnet3_dev_tx_queue_release(txq);
+       }
+       dev->data->nb_tx_queues = 0;
 }
 
 /*
@@ -847,12 +889,10 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev)
 static void
 vmxnet3_dev_close(struct rte_eth_dev *dev)
 {
-       struct vmxnet3_hw *hw = dev->data->dev_private;
-
        PMD_INIT_FUNC_TRACE();
 
        vmxnet3_dev_stop(dev);
-       hw->adapter_stopped = 1;
+       vmxnet3_free_queues(dev);
 }
 
 static void
@@ -1115,6 +1155,8 @@ static void
 vmxnet3_dev_info_get(struct rte_eth_dev *dev __rte_unused,
                     struct rte_eth_dev_info *dev_info)
 {
+       struct vmxnet3_hw *hw = dev->data->dev_private;
+
        dev_info->max_rx_queues = VMXNET3_MAX_RX_QUEUES;
        dev_info->max_tx_queues = VMXNET3_MAX_TX_QUEUES;
        dev_info->min_rx_bufsize = 1518 + RTE_PKTMBUF_HEADROOM;
@@ -1124,6 +1166,10 @@ vmxnet3_dev_info_get(struct rte_eth_dev *dev __rte_unused,
 
        dev_info->flow_type_rss_offloads = VMXNET3_RSS_OFFLOAD_ALL;
 
+       if (VMXNET3_VERSION_GE_4(hw)) {
+               dev_info->flow_type_rss_offloads |= VMXNET3_V4_RSS_MASK;
+       }
+
        dev_info->rx_desc_lim = (struct rte_eth_desc_lim) {
                .nb_max = VMXNET3_RX_RING_MAX_SIZE,
                .nb_min = VMXNET3_DEF_RX_RING_SIZE,
@@ -1159,11 +1205,11 @@ vmxnet3_dev_supported_ptypes_get(struct rte_eth_dev *dev)
 }
 
 static int
-vmxnet3_mac_addr_set(struct rte_eth_dev *dev, struct ether_addr *mac_addr)
+vmxnet3_mac_addr_set(struct rte_eth_dev *dev, struct rte_ether_addr *mac_addr)
 {
        struct vmxnet3_hw *hw = dev->data->dev_private;
 
-       ether_addr_copy(mac_addr, (struct ether_addr *)(hw->perm_addr));
+       ether_addr_copy(mac_addr, (struct rte_ether_addr *)(hw->perm_addr));
        vmxnet3_write_mac(hw, mac_addr->addr_bytes);
        return 0;
 }