pci: introduce PCI address parsing function

[dpdk.git] / lib / librte_eal / common / eal_common_pci.c

diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c
index 54931d1..d01b0f9 100644 (file)
--- a/lib/librte_eal/common/eal_common_pci.c
+++ b/lib/librte_eal/common/eal_common_pci.c
@@ -87,41 +87,78 @@ static struct rte_devargs *pci_devargs_lookup(struct rte_pci_device *dev)
        return NULL;
 }
 
-/* Macro used by pci addr parsing functions. **/
-#define GET_PCIADDR_FIELD(in, fd, lim, dlm)                     \
-do {                                                            \
-       unsigned long val;                                      \
-       char *end;                                              \
-       errno = 0;                                              \
-       val = strtoul((in), &end, 16);                          \
-       if (errno != 0 || end[0] != (dlm) || val > (lim))       \
-               return -EINVAL;                                 \
-       (fd) = (typeof (fd))val;                                \
-       (in) = end + 1;                                         \
-} while(0)
+static inline const char *
+get_u8_pciaddr_field(const char *in, void *_u8, char dlm)
+{
+       unsigned long val;
+       uint8_t *u8 = _u8;
+       char *end;
+
+       errno = 0;
+       val = strtoul(in, &end, 16);
+       if (errno != 0 || end[0] != dlm || val > UINT8_MAX) {
+               errno = errno ? errno : EINVAL;
+               return NULL;
+       }
+       *u8 = (uint8_t)val;
+       return end + 1;
+}
 
 
 int
-eal_parse_pci_BDF(const char *input, struct rte_pci_addr *dev_addr)
+rte_pci_bdf_parse(const char *input, struct rte_pci_addr *dev_addr)
 {
+       const char *in = input;
+
        dev_addr->domain = 0;
-       GET_PCIADDR_FIELD(input, dev_addr->bus, UINT8_MAX, ':');
-       GET_PCIADDR_FIELD(input, dev_addr->devid, UINT8_MAX, '.');
-       GET_PCIADDR_FIELD(input, dev_addr->function, UINT8_MAX, 0);
+       in = get_u8_pciaddr_field(in, &dev_addr->bus, ':');
+       if (in == NULL)
+               return -EINVAL;
+       in = get_u8_pciaddr_field(in, &dev_addr->devid, '.');
+       if (in == NULL)
+               return -EINVAL;
+       in = get_u8_pciaddr_field(in, &dev_addr->function, '\0');
+       if (in == NULL)
+               return -EINVAL;
        return 0;
 }
 
 int
-eal_parse_pci_DomBDF(const char *input, struct rte_pci_addr *dev_addr)
+eal_parse_pci_BDF(const char *input, struct rte_pci_addr *dev_addr)
 {
-       GET_PCIADDR_FIELD(input, dev_addr->domain, UINT16_MAX, ':');
-       GET_PCIADDR_FIELD(input, dev_addr->bus, UINT8_MAX, ':');
-       GET_PCIADDR_FIELD(input, dev_addr->devid, UINT8_MAX, '.');
-       GET_PCIADDR_FIELD(input, dev_addr->function, UINT8_MAX, 0);
+       return rte_pci_bdf_parse(input, dev_addr);
+}
+
+int
+rte_pci_dbdf_parse(const char *input, struct rte_pci_addr *dev_addr)
+{
+       const char *in = input;
+       unsigned long val;
+       char *end;
+
+       errno = 0;
+       val = strtoul(in, &end, 16);
+       if (errno != 0 || end[0] != ':' || val > UINT16_MAX)
+               return -EINVAL;
+       dev_addr->domain = (uint16_t)val;
+       in = end + 1;
+       in = get_u8_pciaddr_field(in, &dev_addr->bus, ':');
+       if (in == NULL)
+               return -EINVAL;
+       in = get_u8_pciaddr_field(in, &dev_addr->devid, '.');
+       if (in == NULL)
+               return -EINVAL;
+       in = get_u8_pciaddr_field(in, &dev_addr->function, '\0');
+       if (in == NULL)
+               return -EINVAL;
        return 0;
 }
 
-#undef GET_PCIADDR_FIELD
+int
+eal_parse_pci_DomBDF(const char *input, struct rte_pci_addr *dev_addr)
+{
+       return rte_pci_dbdf_parse(input, dev_addr);
+}
 
 void
 rte_pci_device_name(const struct rte_pci_addr *addr,
@@ -134,8 +171,8 @@ rte_pci_device_name(const struct rte_pci_addr *addr,
 }
 
 int
-rte_eal_compare_pci_addr(const struct rte_pci_addr *addr,
-                          const struct rte_pci_addr *addr2)
+rte_pci_addr_cmp(const struct rte_pci_addr *addr,
+                const struct rte_pci_addr *addr2)
 {
        uint64_t dev_addr, dev_addr2;
 
@@ -155,6 +192,22 @@ rte_eal_compare_pci_addr(const struct rte_pci_addr *addr,
                 return 0;
 }
 
+int
+rte_eal_compare_pci_addr(const struct rte_pci_addr *addr,
+                          const struct rte_pci_addr *addr2)
+{
+       return rte_pci_addr_cmp(addr, addr2);
+}
+
+int
+rte_pci_addr_parse(const char *str, struct rte_pci_addr *addr)
+{
+       if (rte_pci_bdf_parse(str, addr) == 0 ||
+           rte_pci_dbdf_parse(str, addr) == 0)
+               return 0;
+       return -1;
+}
+
 void
 pci_name_set(struct rte_pci_device *dev)
 {