raw/cnxk_gpio: add option to select subset of GPIOs

Add PMD parameter that allows one to select only subset of available
GPIOs.

This might be useful in cases where some GPIOs are already reserved yet
still available for userspace access but particular app should not touch
them.

Signed-off-by: Tomasz Duszynski <tduszynski@marvell.com>
Reviewed-by: Jerin Jacob <jerinj@marvell.com>

diff --git a/doc/guides/rawdevs/cnxk_gpio.rst b/doc/guides/rawdevs/cnxk_gpio.rst
index c03a5b937c7731e635456ff3fd02e898316acf13..adff535a77eebaff68ce140dcac67fd549c8b3ad 100644 (file)
--- a/doc/guides/rawdevs/cnxk_gpio.rst
+++ b/doc/guides/rawdevs/cnxk_gpio.rst
@@ -57,6 +57,11 @@ former returns number GPIOs available in the system irrespective of GPIOs
 being controllable or not. Thus it is user responsibility to pick the proper
 ones. The latter call simply returns queue capacity.
 
+In order to allow using only subset of available GPIOs `allowlist` PMD param may
+be used. For example passing `--vdev=cnxk_gpio,gpiochip=448,allowlist=[0,1,2,3]`
+to EAL will deny using all GPIOs except those specified explicitly in the
+`allowlist`.
+
 Respective queue needs to be configured with ``rte_rawdev_queue_setup()``. This
 call barely exports GPIO to userspace.
 

diff --git a/drivers/raw/cnxk_gpio/cnxk_gpio.c b/drivers/raw/cnxk_gpio/cnxk_gpio.c
index 230016b078d0b990eebbeb31d65eeb09c121c04d..4ff132861dbae04b70ebc88fd0f28901cb82f44e 100644 (file)
--- a/drivers/raw/cnxk_gpio/cnxk_gpio.c
+++ b/drivers/raw/cnxk_gpio/cnxk_gpio.c
@@ -22,9 +22,13 @@
 static const char *const cnxk_gpio_args[] = {
 #define CNXK_GPIO_ARG_GPIOCHIP "gpiochip"
        CNXK_GPIO_ARG_GPIOCHIP,
+#define CNXK_GPIO_ARG_ALLOWLIST "allowlist"
+       CNXK_GPIO_ARG_ALLOWLIST,
        NULL
 };
 
+static char *allowlist;
+
 static void
 cnxk_gpio_format_name(char *name, size_t len)
 {
@@ -73,13 +77,23 @@ cnxk_gpio_parse_arg_gpiochip(const char *key __rte_unused, const char *value,
 }
 
 static int
-cnxk_gpio_parse_args(struct cnxk_gpiochip *gpiochip,
-                    struct rte_devargs *devargs)
+cnxk_gpio_parse_arg_allowlist(const char *key __rte_unused, const char *value,
+                             void *extra_args __rte_unused)
+{
+       allowlist = strdup(value);
+       if (!allowlist)
+               return -ENOMEM;
+
+       return 0;
+}
+
+static int
+cnxk_gpio_parse_args(struct cnxk_gpiochip *gpiochip, const char *args)
 {
        struct rte_kvargs *kvlist;
        int ret;
 
-       kvlist = rte_kvargs_parse(devargs->args, cnxk_gpio_args);
+       kvlist = rte_kvargs_parse(args, cnxk_gpio_args);
        if (!kvlist)
                return 0;
 
@@ -92,6 +106,14 @@ cnxk_gpio_parse_args(struct cnxk_gpiochip *gpiochip,
                        goto out;
        }
 
+       ret = rte_kvargs_count(kvlist, CNXK_GPIO_ARG_ALLOWLIST);
+       if (ret == 1) {
+               ret = rte_kvargs_process(kvlist, CNXK_GPIO_ARG_ALLOWLIST,
+                                        cnxk_gpio_parse_arg_allowlist, NULL);
+               if (ret)
+                       goto out;
+       }
+
        ret = 0;
 out:
        rte_kvargs_free(kvlist);
@@ -99,6 +121,60 @@ out:
        return ret;
 }
 
+static int
+cnxk_gpio_parse_allowlist(struct cnxk_gpiochip *gpiochip)
+{
+       int i, ret, val, queue = 0;
+       char *token;
+       int *list;
+
+       list = rte_calloc(NULL, gpiochip->num_gpios, sizeof(*list), 0);
+       if (!list)
+               return -ENOMEM;
+
+       /* replace brackets with something meaningless for strtol() */
+       allowlist[0] = ' ';
+       allowlist[strlen(allowlist) - 1] = ' ';
+
+       /* quiesce -Wcast-qual */
+       token = strtok((char *)(uintptr_t)allowlist, ",");
+       do {
+               errno = 0;
+               val = strtol(token, NULL, 10);
+               if (errno) {
+                       RTE_LOG(ERR, PMD, "failed to parse %s\n", token);
+                       ret = -errno;
+                       goto out;
+               }
+
+               if (val < 0 || val >= gpiochip->num_gpios) {
+                       RTE_LOG(ERR, PMD, "gpio%d out of 0-%d range\n", val,
+                               gpiochip->num_gpios - 1);
+                       ret = -EINVAL;
+                       goto out;
+               }
+
+               for (i = 0; i < queue; i++) {
+                       if (list[i] != val)
+                               continue;
+
+                       RTE_LOG(WARNING, PMD, "gpio%d already allowed\n", val);
+                       break;
+               }
+               if (i == queue)
+                       list[queue++] = val;
+       } while ((token = strtok(NULL, ",")));
+
+       gpiochip->allowlist = list;
+       gpiochip->num_queues = queue;
+
+       return 0;
+out:
+       rte_free(list);
+
+       return ret;
+}
+
 static int
 cnxk_gpio_read_attr(char *attr, char *val)
 {
@@ -175,13 +251,24 @@ cnxk_gpio_write_attr_int(const char *attr, int val)
        return cnxk_gpio_write_attr(attr, buf);
 }
 
+static bool
+cnxk_gpio_queue_valid(struct cnxk_gpiochip *gpiochip, uint16_t queue)
+{
+       return queue < gpiochip->num_queues;
+}
+
+static int
+cnxk_queue_to_gpio(struct cnxk_gpiochip *gpiochip, uint16_t queue)
+{
+       return gpiochip->allowlist ? gpiochip->allowlist[queue] : queue;
+}
+
 static struct cnxk_gpio *
 cnxk_gpio_lookup(struct cnxk_gpiochip *gpiochip, uint16_t queue)
 {
-       if (queue >= gpiochip->num_gpios)
-               return NULL;
+       int gpio = cnxk_queue_to_gpio(gpiochip, queue);
 
-       return gpiochip->gpios[queue];
+       return gpiochip->gpios[gpio];
 }
 
 static int
@@ -191,11 +278,14 @@ cnxk_gpio_queue_setup(struct rte_rawdev *dev, uint16_t queue_id,
        struct cnxk_gpiochip *gpiochip = dev->dev_private;
        char buf[CNXK_GPIO_BUFSZ];
        struct cnxk_gpio *gpio;
-       int ret;
+       int num, ret;
 
        RTE_SET_USED(queue_conf);
        RTE_SET_USED(queue_conf_size);
 
+       if (!cnxk_gpio_queue_valid(gpiochip, queue_id))
+               return -EINVAL;
+
        gpio = cnxk_gpio_lookup(gpiochip, queue_id);
        if (gpio)
                return -EEXIST;
@@ -203,7 +293,9 @@ cnxk_gpio_queue_setup(struct rte_rawdev *dev, uint16_t queue_id,
        gpio = rte_zmalloc(NULL, sizeof(*gpio), 0);
        if (!gpio)
                return -ENOMEM;
-       gpio->num = queue_id + gpiochip->base;
+
+       num = cnxk_queue_to_gpio(gpiochip, queue_id);
+       gpio->num = num + gpiochip->base;
        gpio->gpiochip = gpiochip;
 
        snprintf(buf, sizeof(buf), "%s/export", CNXK_GPIO_CLASS_PATH);
@@ -213,7 +305,7 @@ cnxk_gpio_queue_setup(struct rte_rawdev *dev, uint16_t queue_id,
                return ret;
        }
 
-       gpiochip->gpios[queue_id] = gpio;
+       gpiochip->gpios[num] = gpio;
 
        return 0;
 }
@@ -224,18 +316,22 @@ cnxk_gpio_queue_release(struct rte_rawdev *dev, uint16_t queue_id)
        struct cnxk_gpiochip *gpiochip = dev->dev_private;
        char buf[CNXK_GPIO_BUFSZ];
        struct cnxk_gpio *gpio;
-       int ret;
+       int num, ret;
+
+       if (!cnxk_gpio_queue_valid(gpiochip, queue_id))
+               return -EINVAL;
 
        gpio = cnxk_gpio_lookup(gpiochip, queue_id);
        if (!gpio)
                return -ENODEV;
 
        snprintf(buf, sizeof(buf), "%s/unexport", CNXK_GPIO_CLASS_PATH);
-       ret = cnxk_gpio_write_attr_int(buf, gpiochip->base + queue_id);
+       ret = cnxk_gpio_write_attr_int(buf, gpio->num);
        if (ret)
                return ret;
 
-       gpiochip->gpios[queue_id] = NULL;
+       num = cnxk_queue_to_gpio(gpiochip, queue_id);
+       gpiochip->gpios[num] = NULL;
        rte_free(gpio);
 
        return 0;
@@ -245,16 +341,17 @@ static int
 cnxk_gpio_queue_def_conf(struct rte_rawdev *dev, uint16_t queue_id,
                         rte_rawdev_obj_t queue_conf, size_t queue_conf_size)
 {
-       unsigned int *conf;
+       struct cnxk_gpiochip *gpiochip = dev->dev_private;
+       struct cnxk_gpio_queue_conf *conf = queue_conf;
 
-       RTE_SET_USED(dev);
-       RTE_SET_USED(queue_id);
+       if (!cnxk_gpio_queue_valid(gpiochip, queue_id))
+               return -EINVAL;
 
        if (queue_conf_size != sizeof(*conf))
                return -EINVAL;
 
-       conf = (unsigned int *)queue_conf;
-       *conf = 1;
+       conf->size = 1;
+       conf->gpio = cnxk_queue_to_gpio(gpiochip, queue_id);
 
        return 0;
 }
@@ -264,7 +361,7 @@ cnxk_gpio_queue_count(struct rte_rawdev *dev)
 {
        struct cnxk_gpiochip *gpiochip = dev->dev_private;
 
-       return gpiochip->num_gpios;
+       return gpiochip->num_queues;
 }
 
 static const struct {
@@ -463,21 +560,27 @@ cnxk_gpio_process_buf(struct cnxk_gpio *gpio, struct rte_rawdev_buf *rbuf)
        return ret;
 }
 
+static bool
+cnxk_gpio_valid(struct cnxk_gpiochip *gpiochip, int gpio)
+{
+       return gpio < gpiochip->num_gpios && gpiochip->gpios[gpio];
+}
+
 static int
 cnxk_gpio_enqueue_bufs(struct rte_rawdev *dev, struct rte_rawdev_buf **buffers,
                       unsigned int count, rte_rawdev_obj_t context)
 {
        struct cnxk_gpiochip *gpiochip = dev->dev_private;
-       unsigned int queue = (size_t)context;
+       unsigned int gpio_num = (size_t)context;
        struct cnxk_gpio *gpio;
        int ret;
 
        if (count == 0)
                return 0;
 
-       gpio = cnxk_gpio_lookup(gpiochip, queue);
-       if (!gpio)
-               return -ENODEV;
+       if (!cnxk_gpio_valid(gpiochip, gpio_num))
+               return -EINVAL;
+       gpio = gpiochip->gpios[gpio_num];
 
        ret = cnxk_gpio_process_buf(gpio, buffers[0]);
        if (ret)
@@ -491,15 +594,15 @@ cnxk_gpio_dequeue_bufs(struct rte_rawdev *dev, struct rte_rawdev_buf **buffers,
                       unsigned int count, rte_rawdev_obj_t context)
 {
        struct cnxk_gpiochip *gpiochip = dev->dev_private;
-       unsigned int queue = (size_t)context;
+       unsigned int gpio_num = (size_t)context;
        struct cnxk_gpio *gpio;
 
        if (count == 0)
                return 0;
 
-       gpio = cnxk_gpio_lookup(gpiochip, queue);
-       if (!gpio)
-               return -ENODEV;
+       if (!cnxk_gpio_valid(gpiochip, gpio_num))
+               return -EINVAL;
+       gpio = gpiochip->gpios[gpio_num];
 
        if (gpio->rsp) {
                buffers[0]->buf_addr = gpio->rsp;
@@ -558,7 +661,7 @@ cnxk_gpio_probe(struct rte_vdev_device *dev)
        cnxk_gpio_set_defaults(gpiochip);
 
        /* defaults may be overwritten by this call */
-       ret = cnxk_gpio_parse_args(gpiochip, dev->device.devargs);
+       ret = cnxk_gpio_parse_args(gpiochip, rte_vdev_device_args(dev));
        if (ret)
                goto out;
 
@@ -583,6 +686,15 @@ cnxk_gpio_probe(struct rte_vdev_device *dev)
                RTE_LOG(ERR, PMD, "failed to read %s", buf);
                goto out;
        }
+       gpiochip->num_queues = gpiochip->num_gpios;
+
+       if (allowlist) {
+               ret = cnxk_gpio_parse_allowlist(gpiochip);
+               free(allowlist);
+               allowlist = NULL;
+               if (ret)
+                       goto out;
+       }
 
        gpiochip->gpios = rte_calloc(NULL, gpiochip->num_gpios,
                                     sizeof(struct cnxk_gpio *), 0);
@@ -594,6 +706,8 @@ cnxk_gpio_probe(struct rte_vdev_device *dev)
 
        return 0;
 out:
+       free(allowlist);
+       rte_free(gpiochip->allowlist);
        rte_rawdev_pmd_release(rawdev);
 
        return ret;
@@ -630,6 +744,7 @@ cnxk_gpio_remove(struct rte_vdev_device *dev)
                cnxk_gpio_queue_release(rawdev, gpio->num);
        }
 
+       rte_free(gpiochip->allowlist);
        rte_free(gpiochip->gpios);
        cnxk_gpio_irq_fini();
        rte_rawdev_pmd_release(rawdev);
@@ -643,4 +758,6 @@ static struct rte_vdev_driver cnxk_gpio_drv = {
 };
 
 RTE_PMD_REGISTER_VDEV(cnxk_gpio, cnxk_gpio_drv);
-RTE_PMD_REGISTER_PARAM_STRING(cnxk_gpio, "gpiochip=<int>");
+RTE_PMD_REGISTER_PARAM_STRING(cnxk_gpio,
+               "gpiochip=<int> "
+               "allowlist=<list>");

diff --git a/drivers/raw/cnxk_gpio/cnxk_gpio.h b/drivers/raw/cnxk_gpio/cnxk_gpio.h
index 1b31b5a4866b9390f57951ec771b8905e125904e..e62f78a7604a801635cc3774235aeb8e42f40d9f 100644 (file)
--- a/drivers/raw/cnxk_gpio/cnxk_gpio.h
+++ b/drivers/raw/cnxk_gpio/cnxk_gpio.h
@@ -20,7 +20,9 @@ struct cnxk_gpiochip {
        int num;
        int base;
        int num_gpios;
+       int num_queues;
        struct cnxk_gpio **gpios;
+       int *allowlist;
 };
 
 int cnxk_gpio_selftest(uint16_t dev_id);

diff --git a/drivers/raw/cnxk_gpio/cnxk_gpio_selftest.c b/drivers/raw/cnxk_gpio/cnxk_gpio_selftest.c
index 6502902f863b1c30b88de83535b2eb2f29637dfd..7fccc48f30927108c6596eff79b163899de501e5 100644 (file)
--- a/drivers/raw/cnxk_gpio/cnxk_gpio_selftest.c
+++ b/drivers/raw/cnxk_gpio/cnxk_gpio_selftest.c
@@ -302,12 +302,13 @@ out:
 int
 cnxk_gpio_selftest(uint16_t dev_id)
 {
+       struct cnxk_gpio_queue_conf conf;
        struct cnxk_gpiochip *gpiochip;
-       unsigned int queues, i, size;
        char buf[CNXK_GPIO_BUFSZ];
        struct rte_rawdev *rawdev;
+       unsigned int queues, i;
        struct cnxk_gpio *gpio;
-       int ret;
+       int ret, ret2;
 
        rawdev = rte_rawdev_pmd_get_named_dev("cnxk_gpio");
        gpiochip = rawdev->dev_private;
@@ -325,62 +326,68 @@ cnxk_gpio_selftest(uint16_t dev_id)
                return -errno;
 
        for (i = 0; i < queues; i++) {
-               RTE_LOG(INFO, PMD, "testing queue %d (gpio%d)\n", i,
-                       gpiochip->base + i);
-
-               ret = rte_rawdev_queue_conf_get(dev_id, i, &size, sizeof(size));
+               ret = rte_rawdev_queue_conf_get(dev_id, i, &conf, sizeof(conf));
                if (ret) {
                        RTE_LOG(ERR, PMD,
                                "failed to read queue configuration (%d)\n",
                                ret);
-                       continue;
+                       goto out;
                }
 
-               if (size != 1) {
+               RTE_LOG(INFO, PMD, "testing queue%d (gpio%d)\n", i, conf.gpio);
+
+               if (conf.size != 1) {
                        RTE_LOG(ERR, PMD, "wrong queue size received\n");
-                       continue;
+                       ret = -EIO;
+                       goto out;
                }
 
                ret = rte_rawdev_queue_setup(dev_id, i, NULL, 0);
                if (ret) {
                        RTE_LOG(ERR, PMD, "failed to setup queue (%d)\n", ret);
-                       continue;
+                       goto out;
                }
 
-               gpio = gpiochip->gpios[i];
+               gpio = gpiochip->gpios[conf.gpio];
                snprintf(buf, sizeof(buf), CNXK_GPIO_PATH_FMT, gpio->num);
                if (!cnxk_gpio_attr_exists(buf)) {
                        RTE_LOG(ERR, PMD, "%s does not exist\n", buf);
-                       continue;
-               }
-
-               ret = cnxk_gpio_test_input(dev_id, gpiochip->base, i);
-               if (ret)
+                       ret = -ENOENT;
                        goto release;
+               }
 
-               ret = cnxk_gpio_test_irq(dev_id, i);
+               ret = cnxk_gpio_test_input(dev_id, gpiochip->base, conf.gpio);
                if (ret)
                        goto release;
 
-               ret = cnxk_gpio_test_output(dev_id, gpiochip->base, i);
+               ret = cnxk_gpio_test_irq(dev_id, conf.gpio);
                if (ret)
                        goto release;
 
+               ret = cnxk_gpio_test_output(dev_id, gpiochip->base, conf.gpio);
 release:
+               ret2 = ret;
                ret = rte_rawdev_queue_release(dev_id, i);
                if (ret) {
                        RTE_LOG(ERR, PMD, "failed to release queue (%d)\n",
                                ret);
-                       continue;
+                       break;
                }
 
                if (cnxk_gpio_attr_exists(buf)) {
                        RTE_LOG(ERR, PMD, "%s still exists\n", buf);
-                       continue;
+                       ret = -EIO;
+                       break;
+               }
+
+               if (ret2) {
+                       ret = ret2;
+                       break;
                }
        }
 
+out:
        close(fd);
 
-       return 0;
+       return ret;
 }

diff --git a/drivers/raw/cnxk_gpio/rte_pmd_cnxk_gpio.h b/drivers/raw/cnxk_gpio/rte_pmd_cnxk_gpio.h
index e3096dc14f7b3cee5113341eb35342f3dc5e13a8..80a37be9c7488512d655f4b192528902943af1d4 100644 (file)
--- a/drivers/raw/cnxk_gpio/rte_pmd_cnxk_gpio.h
+++ b/drivers/raw/cnxk_gpio/rte_pmd_cnxk_gpio.h
@@ -22,6 +22,14 @@
 extern "C" {
 #endif
 
+/* Queue default configuration */
+struct cnxk_gpio_queue_conf {
+       /** Queue size */
+       int size;
+       /** GPIO number as seen by hardware */
+       int gpio;
+};
+
 /** Available message types */
 enum cnxk_gpio_msg_type {
        /** Type used to set output value */