selftests: gpio: port to GPIO uAPI v2

Add a port to the GPIO uAPI v2 interface and make it the default.

Signed-off-by: Kent Gibson <warthog618@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>

diff --git a/tools/testing/selftests/gpio/gpio-mockup-cdev.c b/tools/testing/selftests/gpio/gpio-mockup-cdev.c
index 3a7fc3ac13494279bab4f9dada293abf4b8c746b..e83eac71621a0e2d7913f056b7a8d35c41912e8e 100644 (file)
--- a/tools/testing/selftests/gpio/gpio-mockup-cdev.c
+++ b/tools/testing/selftests/gpio/gpio-mockup-cdev.c
@@ -18,6 +18,44 @@
 
 #define CONSUMER       "gpio-mockup-cdev"
 
+static int request_line_v2(int cfd, unsigned int offset,
+                          uint64_t flags, unsigned int val)
+{
+       struct gpio_v2_line_request req;
+       int ret;
+
+       memset(&req, 0, sizeof(req));
+       req.num_lines = 1;
+       req.offsets[0] = offset;
+       req.config.flags = flags;
+       strcpy(req.consumer, CONSUMER);
+       if (flags & GPIO_V2_LINE_FLAG_OUTPUT) {
+               req.config.num_attrs = 1;
+               req.config.attrs[0].mask = 1;
+               req.config.attrs[0].attr.id = GPIO_V2_LINE_ATTR_ID_OUTPUT_VALUES;
+               if (val)
+                       req.config.attrs[0].attr.values = 1;
+       }
+       ret = ioctl(cfd, GPIO_V2_GET_LINE_IOCTL, &req);
+       if (ret == -1)
+               return -errno;
+       return req.fd;
+}
+
+
+static int get_value_v2(int lfd)
+{
+       struct gpio_v2_line_values vals;
+       int ret;
+
+       memset(&vals, 0, sizeof(vals));
+       vals.mask = 1;
+       ret = ioctl(lfd, GPIO_V2_LINE_GET_VALUES_IOCTL, &vals);
+       if (ret == -1)
+               return -errno;
+       return vals.bits & 0x1;
+}
+
 static int request_line_v1(int cfd, unsigned int offset,
                           uint32_t flags, unsigned int val)
 {
@@ -57,6 +95,7 @@ static void usage(char *prog)
        printf("               (default is to leave bias unchanged):\n");
        printf("        -l: set line active low (default is active high)\n");
        printf("        -s: set line value (default is to get line value)\n");
+       printf("        -u: uAPI version to use (default is 2)\n");
        exit(-1);
 }
 
@@ -78,29 +117,42 @@ int main(int argc, char *argv[])
 {
        char *chip;
        int opt, ret, cfd, lfd;
-       unsigned int offset, val;
+       unsigned int offset, val, abiv;
        uint32_t flags_v1;
+       uint64_t flags_v2;
 
+       abiv = 2;
        ret = 0;
        flags_v1 = GPIOHANDLE_REQUEST_INPUT;
+       flags_v2 = GPIO_V2_LINE_FLAG_INPUT;
 
        while ((opt = getopt(argc, argv, "lb:s:u:")) != -1) {
                switch (opt) {
                case 'l':
                        flags_v1 |= GPIOHANDLE_REQUEST_ACTIVE_LOW;
+                       flags_v2 |= GPIO_V2_LINE_FLAG_ACTIVE_LOW;
                        break;
                case 'b':
-                       if (strcmp("pull-up", optarg) == 0)
+                       if (strcmp("pull-up", optarg) == 0) {
                                flags_v1 |= GPIOHANDLE_REQUEST_BIAS_PULL_UP;
-                       else if (strcmp("pull-down", optarg) == 0)
+                               flags_v2 |= GPIO_V2_LINE_FLAG_BIAS_PULL_UP;
+                       } else if (strcmp("pull-down", optarg) == 0) {
                                flags_v1 |= GPIOHANDLE_REQUEST_BIAS_PULL_DOWN;
-                       else if (strcmp("disabled", optarg) == 0)
+                               flags_v2 |= GPIO_V2_LINE_FLAG_BIAS_PULL_DOWN;
+                       } else if (strcmp("disabled", optarg) == 0) {
                                flags_v1 |= GPIOHANDLE_REQUEST_BIAS_DISABLE;
+                               flags_v2 |= GPIO_V2_LINE_FLAG_BIAS_DISABLED;
+                       }
                        break;
                case 's':
                        val = atoi(optarg);
                        flags_v1 &= ~GPIOHANDLE_REQUEST_INPUT;
                        flags_v1 |= GPIOHANDLE_REQUEST_OUTPUT;
+                       flags_v2 &= ~GPIO_V2_LINE_FLAG_INPUT;
+                       flags_v2 |= GPIO_V2_LINE_FLAG_OUTPUT;
+                       break;
+               case 'u':
+                       abiv = atoi(optarg);
                        break;
                default:
                        usage(argv[0]);
@@ -119,7 +171,10 @@ int main(int argc, char *argv[])
                return -errno;
        }
 
-       lfd = request_line_v1(cfd, offset, flags_v1, val);
+       if (abiv == 1)
+               lfd = request_line_v1(cfd, offset, flags_v1, val);
+       else
+               lfd = request_line_v2(cfd, offset, flags_v2, val);
 
        close(cfd);
 
@@ -128,10 +183,14 @@ int main(int argc, char *argv[])
                return lfd;
        }
 
-       if (flags_v1 & GPIOHANDLE_REQUEST_OUTPUT)
+       if (flags_v2 & GPIO_V2_LINE_FLAG_OUTPUT) {
                wait_signal();
-       else
-               ret = get_value_v1(lfd);
+       } else {
+               if (abiv == 1)
+                       ret = get_value_v1(lfd);
+               else
+                       ret = get_value_v2(lfd);
+       }
 
        close(lfd);
 

diff --git a/tools/testing/selftests/gpio/gpio-mockup.sh b/tools/testing/selftests/gpio/gpio-mockup.sh
index 0aa8e4294de1fd84b1a924bb3e0621cb0dcf5530..0d6c5f7f95d2a7f537615e95a1e53c005f9ddfa2 100755 (executable)
--- a/tools/testing/selftests/gpio/gpio-mockup.sh
+++ b/tools/testing/selftests/gpio/gpio-mockup.sh
@@ -14,6 +14,7 @@ module="gpio-mockup"
 verbose=
 full_test=
 random=
+uapi_opt=
 active_opt=
 bias_opt=
 line_set_pid=
@@ -30,6 +31,7 @@ usage()
        echo "-r:  test random lines as well as fence posts"
        echo "-t:  interface type:"
        echo "      cdev (character device ABI) - default"
+       echo "      cdev_v1 (deprecated character device ABI)"
        echo "      sysfs (deprecated SYSFS ABI)"
        echo "-v:  verbose progress reporting"
        exit $ksft_fail
@@ -100,7 +102,8 @@ get_line()
 {
        release_line
 
-       $BASE/gpio-mockup-cdev $active_opt /dev/$chip $offset
+       local cdev_opts=${uapi_opt}${active_opt}
+       $BASE/gpio-mockup-cdev $cdev_opts /dev/$chip $offset
        echo $?
 }
 
@@ -142,7 +145,7 @@ set_line()
                esac
        done
 
-       local cdev_opts=${active_opt}
+       local cdev_opts=${uapi_opt}${active_opt}
        if [ "$val" ]; then
                $BASE/gpio-mockup-cdev $cdev_opts -s$val /dev/$chip $offset &
                # failure to set is detected by reading mockup and toggling values
@@ -340,6 +343,10 @@ sysfs)
        source $BASE/gpio-mockup-sysfs.sh
        echo "WARNING: gpio sysfs ABI is deprecated."
        ;;
+cdev_v1)
+       echo "WARNING: gpio cdev ABI v1 is deprecated."
+       uapi_opt="-u1 "
+       ;;
 cdev)
        ;;
 *)