net/bonding: use local prefix namespace

[dpdk.git] / drivers / net / bonding / rte_eth_bond_args.c

diff --git a/drivers/net/bonding/rte_eth_bond_args.c b/drivers/net/bonding/rte_eth_bond_args.c
index e3bdad9..ebbcc5b 100644 (file)
--- a/drivers/net/bonding/rte_eth_bond_args.c
+++ b/drivers/net/bonding/rte_eth_bond_args.c
@@ -32,6 +32,7 @@
  */
 
 #include <rte_devargs.h>
+#include <rte_pci.h>
 #include <rte_kvargs.h>
 
 #include <cmdline_parse.h>
@@ -47,6 +48,7 @@ const char *pmd_bond_init_valid_arguments[] = {
        PMD_BOND_XMIT_POLICY_KVARG,
        PMD_BOND_SOCKET_ID_KVARG,
        PMD_BOND_MAC_ADDR_KVARG,
+       PMD_BOND_AGG_MODE_KVARG,
        "driver",
        NULL
 };
@@ -59,17 +61,7 @@ find_port_id_by_pci_addr(const struct rte_pci_addr *pci_addr)
        unsigned i;
 
        for (i = 0; i < rte_eth_dev_count(); i++) {
-
-               /* Currently populated by rte_eth_copy_pci_info().
-                *
-                * TODO: Once the PCI bus has arrived we should have a better
-                * way to test for being a PCI device or not.
-                */
-               if (rte_eth_devices[i].data->kdrv == RTE_KDRV_UNKNOWN ||
-                   rte_eth_devices[i].data->kdrv == RTE_KDRV_NONE)
-                       continue;
-
-               pci_dev = RTE_DEV_TO_PCI(rte_eth_devices[i].device);
+               pci_dev = RTE_ETH_DEV_TO_PCI(&rte_eth_devices[i]);
                eth_pci_addr = &pci_dev->addr;
 
                if (pci_addr->bus == eth_pci_addr->bus &&
@@ -90,12 +82,22 @@ find_port_id_by_dev_name(const char *name)
                if (rte_eth_devices[i].data == NULL)
                        continue;
 
-               if (strcmp(rte_eth_devices[i].data->name, name) == 0)
+               if (strcmp(rte_eth_devices[i].device->name, name) == 0)
                        return i;
        }
        return -1;
 }
 
+static inline int
+bond_pci_addr_cmp(const struct rte_device *dev, const void *_pci_addr)
+{
+       struct rte_pci_device *pdev;
+       const struct rte_pci_addr *paddr = _pci_addr;
+
+       pdev = RTE_DEV_TO_PCI(*(struct rte_device **)(void *)&dev);
+       return rte_eal_compare_pci_addr(&pdev->addr, paddr);
+}
+
 /**
  * Parses a port identifier string to a port id by pci address, then by name,
  * and finally port id.
@@ -104,10 +106,23 @@ static inline int
 parse_port_id(const char *port_str)
 {
        struct rte_pci_addr dev_addr;
+       struct rte_bus *pci_bus;
+       struct rte_device *dev;
        int port_id;
 
+       pci_bus = rte_bus_find_by_name("pci");
+       if (pci_bus == NULL) {
+               RTE_LOG(ERR, PMD, "unable to find PCI bus\n");
+               return -1;
+       }
+
        /* try parsing as pci address, physical devices */
-       if (eal_parse_pci_DomBDF(port_str, &dev_addr) == 0) {
+       if (pci_bus->parse(port_str, &dev_addr) == 0) {
+               dev = pci_bus->find_device(NULL, bond_pci_addr_cmp, &dev_addr);
+               if (dev == NULL) {
+                       RTE_LOG(ERR, PMD, "unable to find PCI device\n");
+                       return -1;
+               }
                port_id = find_port_id_by_pci_addr(&dev_addr);
                if (port_id < 0)
                        return -1;
@@ -134,7 +149,7 @@ parse_port_id(const char *port_str)
 }
 
 int
-bond_ethdev_parse_slave_port_kvarg(const char *key __rte_unused,
+bond_ethdev_parse_slave_port_kvarg(const char *key,
                const char *value, void *extra_args)
 {
        struct bond_ethdev_slave_ports *slave_ports;
@@ -151,7 +166,7 @@ bond_ethdev_parse_slave_port_kvarg(const char *key __rte_unused,
                        return -1;
                } else
                        slave_ports->slaves[slave_ports->slave_count++] =
-                                       (uint8_t)port_id;
+                                       port_id;
        }
        return 0;
 }
@@ -189,6 +204,38 @@ bond_ethdev_parse_slave_mode_kvarg(const char *key __rte_unused,
        }
 }
 
+int
+bond_ethdev_parse_slave_agg_mode_kvarg(const char *key __rte_unused,
+               const char *value, void *extra_args)
+{
+       uint8_t *agg_mode;
+
+       if (value == NULL || extra_args == NULL)
+               return -1;
+
+       agg_mode = extra_args;
+
+       errno = 0;
+       if (strncmp(value, "stable", 6) == 0)
+               *agg_mode = AGG_STABLE;
+
+       if (strncmp(value, "bandwidth", 9) == 0)
+               *agg_mode = AGG_BANDWIDTH;
+
+       if (strncmp(value, "count", 5) == 0)
+               *agg_mode = AGG_COUNT;
+
+       switch (*agg_mode) {
+       case AGG_STABLE:
+       case AGG_BANDWIDTH:
+       case AGG_COUNT:
+               return 0;
+       default:
+               RTE_BOND_LOG(ERR, "Invalid agg mode value stable/bandwidth/count");
+               return -1;
+       }
+}
+
 int
 bond_ethdev_parse_socket_id_kvarg(const char *key __rte_unused,
                const char *value, void *extra_args)
@@ -204,8 +251,8 @@ bond_ethdev_parse_socket_id_kvarg(const char *key __rte_unused,
        if (*endptr != 0 || errno != 0)
                return -1;
 
-       /* validate mode value */
-       if (socket_id >= 0 && socket_id < number_of_sockets()) {
+       /* validate socket id value */
+       if (socket_id >= 0) {
                *(uint8_t *)extra_args = (uint8_t)socket_id;
                return 0;
        }