bus/pci: change IOVA as VA flag name

[dpdk.git] / drivers / net / axgbe / axgbe_ethdev.c

diff --git a/drivers/net/axgbe/axgbe_ethdev.c b/drivers/net/axgbe/axgbe_ethdev.c
index 4b84b50..cfb1720 100644 (file)
--- a/drivers/net/axgbe/axgbe_ethdev.c
+++ b/drivers/net/axgbe/axgbe_ethdev.c
@@ -157,7 +157,7 @@ axgbe_dev_configure(struct rte_eth_dev *dev)
 static int
 axgbe_dev_rx_mq_config(struct rte_eth_dev *dev)
 {
-       struct axgbe_port *pdata = (struct axgbe_port *)dev->data->dev_private;
+       struct axgbe_port *pdata = dev->data->dev_private;
 
        if (dev->data->dev_conf.rxmode.mq_mode == ETH_MQ_RX_RSS)
                pdata->rss_enable = 1;
@@ -171,10 +171,11 @@ axgbe_dev_rx_mq_config(struct rte_eth_dev *dev)
 static int
 axgbe_dev_start(struct rte_eth_dev *dev)
 {
-       PMD_INIT_FUNC_TRACE();
-       struct axgbe_port *pdata = (struct axgbe_port *)dev->data->dev_private;
+       struct axgbe_port *pdata = dev->data->dev_private;
        int ret;
 
+       PMD_INIT_FUNC_TRACE();
+
        /* Multiqueue RSS */
        ret = axgbe_dev_rx_mq_config(dev);
        if (ret) {
@@ -209,9 +210,10 @@ axgbe_dev_start(struct rte_eth_dev *dev)
 static void
 axgbe_dev_stop(struct rte_eth_dev *dev)
 {
-       PMD_INIT_FUNC_TRACE();
        struct axgbe_port *pdata = dev->data->dev_private;
 
+       PMD_INIT_FUNC_TRACE();
+
        rte_intr_disable(&pdata->pci_dev->intr_handle);
 
        if (axgbe_test_bit(AXGBE_STOPPED, &pdata->dev_state))
@@ -237,27 +239,30 @@ axgbe_dev_close(struct rte_eth_dev *dev)
 static void
 axgbe_dev_promiscuous_enable(struct rte_eth_dev *dev)
 {
-       PMD_INIT_FUNC_TRACE();
        struct axgbe_port *pdata = dev->data->dev_private;
 
+       PMD_INIT_FUNC_TRACE();
+
        AXGMAC_IOWRITE_BITS(pdata, MAC_PFR, PR, 1);
 }
 
 static void
 axgbe_dev_promiscuous_disable(struct rte_eth_dev *dev)
 {
-       PMD_INIT_FUNC_TRACE();
        struct axgbe_port *pdata = dev->data->dev_private;
 
+       PMD_INIT_FUNC_TRACE();
+
        AXGMAC_IOWRITE_BITS(pdata, MAC_PFR, PR, 0);
 }
 
 static void
 axgbe_dev_allmulticast_enable(struct rte_eth_dev *dev)
 {
-       PMD_INIT_FUNC_TRACE();
        struct axgbe_port *pdata = dev->data->dev_private;
 
+       PMD_INIT_FUNC_TRACE();
+
        if (AXGMAC_IOREAD_BITS(pdata, MAC_PFR, PM))
                return;
        AXGMAC_IOWRITE_BITS(pdata, MAC_PFR, PM, 1);
@@ -266,9 +271,10 @@ axgbe_dev_allmulticast_enable(struct rte_eth_dev *dev)
 static void
 axgbe_dev_allmulticast_disable(struct rte_eth_dev *dev)
 {
-       PMD_INIT_FUNC_TRACE();
        struct axgbe_port *pdata = dev->data->dev_private;
 
+       PMD_INIT_FUNC_TRACE();
+
        if (!AXGMAC_IOREAD_BITS(pdata, MAC_PFR, PM))
                return;
        AXGMAC_IOWRITE_BITS(pdata, MAC_PFR, PM, 0);
@@ -578,7 +584,7 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
        if (rte_eal_process_type() != RTE_PROC_PRIMARY)
                return 0;
 
-       pdata = (struct axgbe_port *)eth_dev->data->dev_private;
+       pdata = eth_dev->data->dev_private;
        /* initial state */
        axgbe_set_bit(AXGBE_DOWN, &pdata->dev_state);
        axgbe_set_bit(AXGBE_STOPPED, &pdata->dev_state);
@@ -626,19 +632,19 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
        pdata->mac_addr.addr_bytes[5] = (mac_hi >> 8)  &  0xff;
 
        eth_dev->data->mac_addrs = rte_zmalloc("axgbe_mac_addr",
-                                              ETHER_ADDR_LEN, 0);
+                                              RTE_ETHER_ADDR_LEN, 0);
        if (!eth_dev->data->mac_addrs) {
                PMD_INIT_LOG(ERR,
                             "Failed to alloc %u bytes needed to store MAC addr tbl",
-                            ETHER_ADDR_LEN);
+                            RTE_ETHER_ADDR_LEN);
                return -ENOMEM;
        }
 
-       if (!is_valid_assigned_ether_addr(&pdata->mac_addr))
-               eth_random_addr(pdata->mac_addr.addr_bytes);
+       if (!rte_is_valid_assigned_ether_addr(&pdata->mac_addr))
+               rte_eth_random_addr(pdata->mac_addr.addr_bytes);
 
        /* Copy the permanent MAC address */
-       ether_addr_copy(&pdata->mac_addr, &eth_dev->data->mac_addrs[0]);
+       rte_ether_addr_copy(&pdata->mac_addr, &eth_dev->data->mac_addrs[0]);
 
        /* Clock settings */
        pdata->sysclk_rate = AXGBE_V2_DMA_CLOCK_FREQ;
@@ -694,6 +700,7 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev)
        ret = pdata->phy_if.phy_init(pdata);
        if (ret) {
                rte_free(eth_dev->data->mac_addrs);
+               eth_dev->data->mac_addrs = NULL;
                return ret;
        }
 
@@ -718,9 +725,6 @@ eth_axgbe_dev_uninit(struct rte_eth_dev *eth_dev)
                return 0;
 
        pci_dev = RTE_DEV_TO_PCI(eth_dev->device);
-       /*Free macaddres*/
-       rte_free(eth_dev->data->mac_addrs);
-       eth_dev->data->mac_addrs = NULL;
        eth_dev->dev_ops = NULL;
        eth_dev->rx_pkt_burst = NULL;
        eth_dev->tx_pkt_burst = NULL;