drivers/net: add generic ethdev macro to get PCI device

[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 c6032bc..5c45038 100644 (file)
--- a/drivers/net/ark/ark_ethdev.c
+++ b/drivers/net/ark/ark_ethdev.c
@@ -71,10 +71,10 @@ static void eth_ark_dev_stats_get(struct rte_eth_dev *dev,
 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 void eth_ark_macaddr_add(struct rte_eth_dev *dev,
-                               struct ether_addr *mac_addr,
-                               uint32_t index,
-                               uint32_t pool);
+static int eth_ark_macaddr_add(struct rte_eth_dev *dev,
+                              struct ether_addr *mac_addr,
+                              uint32_t index,
+                              uint32_t pool);
 static void eth_ark_macaddr_remove(struct rte_eth_dev *dev,
                                   uint32_t index);
 
@@ -278,7 +278,7 @@ eth_ark_dev_init(struct rte_eth_dev *dev)
        ret = check_for_ext(ark);
        if (ret)
                return ret;
-       pci_dev = ARK_DEV_TO_PCI(dev);
+       pci_dev = RTE_ETH_DEV_TO_PCI(dev);
        rte_eth_copy_pci_info(dev, pci_dev);
 
        /* Use dummy function until setup */
@@ -318,6 +318,15 @@ eth_ark_dev_init(struct rte_eth_dev *dev)
                            ark->sysctrl.t32[4], __func__);
                return -1;
        }
+       if (ark->sysctrl.t32[3] != 0) {
+               if (ark_rqp_lasped(ark->rqpacing)) {
+                       PMD_DRV_LOG(ERR, "Arkville Evaluation System - "
+                                   "Timer has Expired\n");
+                       return -1;
+               }
+               PMD_DRV_LOG(WARNING, "Arkville Evaluation System - "
+                           "Timer is Running\n");
+       }
 
        PMD_DRV_LOG(INFO,
                    "HW Sanity test has PASSED, expected constant"
@@ -742,7 +751,7 @@ 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 = ARK_DEV_TO_PCI(dev);
+       dev_info->pci_dev = RTE_ETH_DEV_TO_PCI(dev);
 }
 
 static int
@@ -822,7 +831,7 @@ eth_ark_dev_stats_reset(struct rte_eth_dev *dev)
                ark->user_ext.stats_reset(dev, ark->user_data);
 }
 
-static void
+static int
 eth_ark_macaddr_add(struct rte_eth_dev *dev,
                    struct ether_addr *mac_addr,
                    uint32_t index,
@@ -831,12 +840,15 @@ eth_ark_macaddr_add(struct rte_eth_dev *dev,
        struct ark_adapter *ark =
                (struct ark_adapter *)dev->data->dev_private;
 
-       if (ark->user_ext.mac_addr_add)
+       if (ark->user_ext.mac_addr_add) {
                ark->user_ext.mac_addr_add(dev,
                                           mac_addr,
                                           index,
                                           pool,
                                           ark->user_data);
+               return 0;
+       }
+       return -ENOTSUP;
 }
 
 static void
@@ -913,6 +925,7 @@ eth_ark_check_args(struct ark_adapter *ark, const char *params)
        struct rte_kvargs *kvlist;
        unsigned int k_idx;
        struct rte_kvargs_pair *pair = NULL;
+       int ret = -1;
 
        kvlist = rte_kvargs_parse(params, valid_arguments);
        if (kvlist == NULL)
@@ -933,7 +946,7 @@ eth_ark_check_args(struct ark_adapter *ark, const char *params)
                               &process_pktdir_arg,
                               ark) != 0) {
                PMD_DRV_LOG(ERR, "Unable to parse arg %s\n", ARK_PKTDIR_ARG);
-               return -1;
+               goto free_kvlist;
        }
 
        if (rte_kvargs_process(kvlist,
@@ -941,7 +954,7 @@ eth_ark_check_args(struct ark_adapter *ark, const char *params)
                               &process_file_args,
                               ark->pkt_gen_args) != 0) {
                PMD_DRV_LOG(ERR, "Unable to parse arg %s\n", ARK_PKTGEN_ARG);
-               return -1;
+               goto free_kvlist;
        }
 
        if (rte_kvargs_process(kvlist,
@@ -949,7 +962,7 @@ eth_ark_check_args(struct ark_adapter *ark, const char *params)
                               &process_file_args,
                               ark->pkt_chkr_args) != 0) {
                PMD_DRV_LOG(ERR, "Unable to parse arg %s\n", ARK_PKTCHKR_ARG);
-               return -1;
+               goto free_kvlist;
        }
 
        PMD_DRV_LOG(INFO, "packet director set to 0x%x\n", ark->pkt_dir_v);
@@ -971,7 +984,12 @@ eth_ark_check_args(struct ark_adapter *ark, const char *params)
                ark_pktchkr_setup(ark->pc);
        }
 
-       return 0;
+       ret = 0;
+
+free_kvlist:
+       rte_kvargs_free(kvlist);
+
+       return ret;
 }
 
 RTE_PMD_REGISTER_PCI(net_ark, rte_ark_pmd);