git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
net: add rte prefix to ether defines
[dpdk.git] / drivers / net / ark / ark_ethdev.c
diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c
index ff87c20..7692aa2 100644 (file)
--- a/drivers/net/ark/ark_ethdev.c
+++ b/drivers/net/ark/ark_ethdev.c
@@ -1,34 +1,5 @@
-/*-
- * BSD LICENSE
- *
- * Copyright (c) 2015-2017 Atomic Rules LLC
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- * * Neither the name of copyright holder nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright (c) 2015-2018 Atomic Rules LLC
  */
 
 #include <unistd.h>
@@ -69,10 +40,10 @@ static int eth_ark_dev_set_link_down(struct rte_eth_dev *dev);
 static int eth_ark_dev_stats_get(struct rte_eth_dev *dev,
                                  struct rte_eth_stats *stats);
 static void eth_ark_dev_stats_reset(struct rte_eth_dev *dev);
-static void eth_ark_set_default_mac_addr(struct rte_eth_dev *dev,
-                                        struct ether_addr *mac_addr);
+static int eth_ark_set_default_mac_addr(struct rte_eth_dev *dev,
+                                        struct rte_ether_addr *mac_addr);
 static int eth_ark_macaddr_add(struct rte_eth_dev *dev,
-                              struct ether_addr *mac_addr,
+                              struct rte_ether_addr *mac_addr,
                               uint32_t index,
                               uint32_t pool);
 static void eth_ark_macaddr_remove(struct rte_eth_dev *dev,
@@ -249,14 +220,14 @@ check_for_ext(struct ark_adapter *ark)
                (void (*)(struct rte_eth_dev *, void *))
                dlsym(ark->d_handle, "stats_reset");
        ark->user_ext.mac_addr_add =
-               (void (*)(struct rte_eth_dev *, struct ether_addr *, uint32_t,
-                         uint32_t, void *))
+               (void (*)(struct rte_eth_dev *, struct rte_ether_addr *,
+                       uint32_t, uint32_t, void *))
                dlsym(ark->d_handle, "mac_addr_add");
        ark->user_ext.mac_addr_remove =
                (void (*)(struct rte_eth_dev *, uint32_t, void *))
                dlsym(ark->d_handle, "mac_addr_remove");
        ark->user_ext.mac_addr_set =
-               (void (*)(struct rte_eth_dev *, struct ether_addr *,
+               (void (*)(struct rte_eth_dev *, struct rte_ether_addr *,
                          void *))
                dlsym(ark->d_handle, "mac_addr_set");
        ark->user_ext.set_mtu =
@@ -342,9 +313,12 @@ eth_ark_dev_init(struct rte_eth_dev *dev)
 
        /* We are a single function multi-port device. */
        ret = ark_config_device(dev);
+       if (ret)
+               return -1;
+
        dev->dev_ops = &ark_eth_dev_ops;
 
-       dev->data->mac_addrs = rte_zmalloc("ark", ETHER_ADDR_LEN, 0);
+       dev->data->mac_addrs = rte_zmalloc("ark", RTE_ETHER_ADDR_LEN, 0);
        if (!dev->data->mac_addrs) {
                PMD_DRV_LOG(ERR,
                            "Failed to allocated memory for storing mac address"
@@ -390,6 +364,7 @@ eth_ark_dev_init(struct rte_eth_dev *dev)
                if (p == 0) {
                        /* First port is already allocated by DPDK */
                        eth_dev = ark->eth_dev;
+                       rte_eth_dev_probing_finish(eth_dev);
                        continue;
                }
 
@@ -410,7 +385,8 @@ eth_ark_dev_init(struct rte_eth_dev *dev)
 
                rte_eth_copy_pci_info(eth_dev, pci_dev);
 
-               eth_dev->data->mac_addrs = rte_zmalloc(name, ETHER_ADDR_LEN, 0);
+               eth_dev->data->mac_addrs = rte_zmalloc(name,
+                                               RTE_ETHER_ADDR_LEN, 0);
                if (!eth_dev->data->mac_addrs) {
                        PMD_DRV_LOG(ERR,
                                    "Memory allocation for MAC failed!"
@@ -422,6 +398,8 @@ eth_ark_dev_init(struct rte_eth_dev *dev)
                        ark->user_data[eth_dev->data->port_id] =
                                ark->user_ext.dev_init(dev, ark->a_bar, p);
                }
+
+               rte_eth_dev_probing_finish(eth_dev);
        }
 
        return ret;
@@ -532,7 +510,6 @@ eth_ark_dev_uninit(struct rte_eth_dev *dev)
        dev->dev_ops = NULL;
        dev->rx_pkt_burst = NULL;
        dev->tx_pkt_burst = NULL;
-       rte_free(dev->data->mac_addrs);
        return 0;
 }
 
@@ -771,7 +748,6 @@ eth_ark_dev_info_get(struct rte_eth_dev *dev,
                                ETH_LINK_SPEED_40G |
                                ETH_LINK_SPEED_50G |
                                ETH_LINK_SPEED_100G);
-       dev_info->pci_dev = RTE_ETH_DEV_TO_PCI(dev);
 }
 
 static int
@@ -858,7 +834,7 @@ eth_ark_dev_stats_reset(struct rte_eth_dev *dev)
 
 static int
 eth_ark_macaddr_add(struct rte_eth_dev *dev,
-                   struct ether_addr *mac_addr,
+                   struct rte_ether_addr *mac_addr,
                    uint32_t index,
                    uint32_t pool)
 {
@@ -887,16 +863,19 @@ eth_ark_macaddr_remove(struct rte_eth_dev *dev, uint32_t index)
                              ark->user_data[dev->data->port_id]);
 }
 
-static void
+static int
 eth_ark_set_default_mac_addr(struct rte_eth_dev *dev,
-                            struct ether_addr *mac_addr)
+                            struct rte_ether_addr *mac_addr)
 {
        struct ark_adapter *ark =
                (struct ark_adapter *)dev->data->dev_private;
 
-       if (ark->user_ext.mac_addr_set)
+       if (ark->user_ext.mac_addr_set) {
                ark->user_ext.mac_addr_set(dev, mac_addr,
                           ark->user_data[dev->data->port_id]);
+               return 0;
+       }
+       return -ENOTSUP;
 }
 
 static int
DPDK repo used for reviews