From patchwork Sat Jan 2 02:29:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kent Gibson X-Patchwork-Id: 356028 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57107C4332D for ; Sat, 2 Jan 2021 02:31:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3F7B822241 for ; Sat, 2 Jan 2021 02:31:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727377AbhABCbO (ORCPT ); Fri, 1 Jan 2021 21:31:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39002 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726424AbhABCbN (ORCPT ); Fri, 1 Jan 2021 21:31:13 -0500 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18C99C0613C1; Fri, 1 Jan 2021 18:30:33 -0800 (PST) Received: by mail-pl1-x631.google.com with SMTP id r4so11644327pls.11; Fri, 01 Jan 2021 18:30:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zFyAPNF606II1Uc+nCSNRIgbt9L7f65aZLfNbZ+vGNU=; b=a3DujrJJPpvOcWDzHSOtnL7g7TiZgTTDmBO6TaM2GnuidJNDRDeLqHb85IowNFLLnv MSXLoFU9nrN/QDI00PAS5HKjNkzjiplsXbnIbBJUAbFzgATbW2Vo7A8qokaOslyKeUJQ Vi4uNRnkcyWmnHiIxY29wwS/P8uPBguVDRa/UISVP9VkITasaLYJbmGOt8KL7hBmpFu9 vDXXYs3odkDrmAvLCcN84zarQyot2407CJQhuzwOhNHGn0oIqfPfm+L6lW3iKR8ndQux 1EYzpczzqG3kRdfvN1ObPic0FoQ6u+Bn9AslAZknyDZ9ybtpoFqmxI+Tfuil/S74COzY 4O/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zFyAPNF606II1Uc+nCSNRIgbt9L7f65aZLfNbZ+vGNU=; b=ey8/xBX1AFvv0afCNa3rOC4aH7W1LtHmwd0ZgE4Ad1v4EyNO/WHp+2EE9Lq+T2vCpJ 4oUvBnDuhOMxGzDyfaKN++F34BzRO6h/uZ/XtqMnDcl5QphQ/asC3+C60/bCOiQ+FsnI fG7uaF47w4fwlrmDsI0vLvZyOyLmlbIJiq3r7fQV7ErEzDTN4lbezD2sC2IyIUfb6B63 ZBtB9IvWZ1LTr9Eb2pzy4x1KO/xtZ5dDsBNWOsP4pV7/ONIAVcGP7OQ2UD/cA3pN4d/x ezdE0Tqq2EtbKzY2l3cGKDKMbPPwUD/eT5ca44UYuGBAJG0uryYbJRSNniYQwfo3oB8d 17YQ== X-Gm-Message-State: AOAM531tqd9u+vF+/zkAYElxrYGVKcheIVllHtuWF31QkZss32va8R1K xgq1E0hsehAUD0m3HyyZURvaAIFUWa4D+A== X-Google-Smtp-Source: ABdhPJyngr6vB0gCIkL/Fq/2JeKMyztkNo9xb3wDssrch6dLxGsmhPCu3Zz0Y2E8+iw64i9hmws9QA== X-Received: by 2002:a17:90a:c82:: with SMTP id v2mr19889262pja.171.1609554631837; Fri, 01 Jan 2021 18:30:31 -0800 (PST) Received: from sol.lan (106-69-181-20.dyn.iinet.net.au. [106.69.181.20]) by smtp.gmail.com with ESMTPSA id cl23sm13995664pjb.23.2021.01.01.18.30.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Jan 2021 18:30:31 -0800 (PST) From: Kent Gibson To: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, linux-kselftest@vger.kernel.org, bgolaszewski@baylibre.com, linus.walleij@linaro.org, shuah@kernel.org, bamv2005@gmail.com Cc: Kent Gibson Subject: [PATCH 1/7] selftests: gpio: rework and simplify test implementation Date: Sat, 2 Jan 2021 10:29:43 +0800 Message-Id: <20210102022949.92304-2-warthog618@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210102022949.92304-1-warthog618@gmail.com> References: <20210102022949.92304-1-warthog618@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org The GPIO mockup selftests are overly complicated with separate implementations of the tests for sysfs and cdev uAPI, and with the cdev implementation being dependent on tools/gpio and libmount. Rework the test implementation to provide a common test suite with a simplified pluggable uAPI interface. The cdev implementation utilises the GPIO uAPI directly to remove the dependence on tools/gpio. The simplified uAPI interface removes the need for any file system mount checks in C, and so removes the dependence on libmount. The rework also fixes the sysfs test implementation which has been broken since the device created in the multiple gpiochip case was split into separate devices. Fixes: commit 8a39f597bcfd ("gpio: mockup: rework device probing") Signed-off-by: Kent Gibson --- tools/testing/selftests/gpio/Makefile | 26 +- .../testing/selftests/gpio/gpio-mockup-cdev.c | 139 ++++++ .../selftests/gpio/gpio-mockup-sysfs.sh | 168 ++----- tools/testing/selftests/gpio/gpio-mockup.sh | 462 ++++++++++++------ 4 files changed, 505 insertions(+), 290 deletions(-) create mode 100644 tools/testing/selftests/gpio/gpio-mockup-cdev.c diff --git a/tools/testing/selftests/gpio/Makefile b/tools/testing/selftests/gpio/Makefile index 32bdc978a711..e4363c64d40d 100644 --- a/tools/testing/selftests/gpio/Makefile +++ b/tools/testing/selftests/gpio/Makefile @@ -1,32 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 -VAR_CFLAGS := $(shell pkg-config --cflags mount 2>/dev/null) -VAR_LDLIBS := $(shell pkg-config --libs mount 2>/dev/null) -ifeq ($(VAR_LDLIBS),) -VAR_LDLIBS := -lmount -I/usr/include/libmount -endif - -CFLAGS += -O2 -g -std=gnu99 -Wall -I../../../../usr/include/ $(VAR_CFLAGS) -LDLIBS += $(VAR_LDLIBS) - TEST_PROGS := gpio-mockup.sh TEST_FILES := gpio-mockup-sysfs.sh -TEST_PROGS_EXTENDED := gpio-mockup-chardev - -GPIODIR := $(realpath ../../../gpio) -GPIOOBJ := gpio-utils.o +TEST_GEN_PROGS_EXTENDED := gpio-mockup-cdev -all: $(TEST_PROGS_EXTENDED) - -override define CLEAN - $(RM) $(TEST_PROGS_EXTENDED) - $(MAKE) -C $(GPIODIR) OUTPUT=$(GPIODIR)/ clean -endef - -KSFT_KHDR_INSTALL := 1 include ../lib.mk -$(TEST_PROGS_EXTENDED): $(GPIODIR)/$(GPIOOBJ) - -$(GPIODIR)/$(GPIOOBJ): - $(MAKE) OUTPUT=$(GPIODIR)/ -C $(GPIODIR) diff --git a/tools/testing/selftests/gpio/gpio-mockup-cdev.c b/tools/testing/selftests/gpio/gpio-mockup-cdev.c new file mode 100644 index 000000000000..3bfd876a8b6a --- /dev/null +++ b/tools/testing/selftests/gpio/gpio-mockup-cdev.c @@ -0,0 +1,139 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * GPIO mockup cdev test helper + * + * Copyright (C) 2020 Kent Gibson + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define CONSUMER "gpio-mockup-cdev" + +static int request_line_v1(int cfd, unsigned int offset, + uint32_t flags, unsigned int val) +{ + struct gpiohandle_request req; + int ret; + + memset(&req, 0, sizeof(req)); + req.lines = 1; + req.lineoffsets[0] = offset; + req.flags = flags; + strcpy(req.consumer_label, CONSUMER); + if (flags & GPIOHANDLE_REQUEST_OUTPUT) + req.default_values[0] = val; + + ret = ioctl(cfd, GPIO_GET_LINEHANDLE_IOCTL, &req); + if (ret == -1) + return -errno; + return req.fd; +} + +static int get_value_v1(int lfd) +{ + struct gpiohandle_data vals; + int ret; + + memset(&vals, 0, sizeof(vals)); + ret = ioctl(lfd, GPIOHANDLE_GET_LINE_VALUES_IOCTL, &vals); + if (ret == -1) + return -errno; + return vals.values[0]; +} + +static void usage(char *prog) +{ + printf("Usage: %s [-l] [-b ] [-s ] [-u ] \n", prog); + printf(" -b: set line bias to one of pull-down, pull-up, disabled\n"); + 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"); + exit(-1); +} + +static int wait_signal(void) +{ + int sig; + sigset_t wset; + + sigemptyset(&wset); + sigaddset(&wset, SIGHUP); + sigaddset(&wset, SIGINT); + sigaddset(&wset, SIGTERM); + sigwait(&wset, &sig); + + return sig; +} + +int main(int argc, char *argv[]) +{ + char *chip; + int opt, ret, cfd, lfd; + unsigned int offset, val; + uint32_t flags_v1; + + ret = 0; + flags_v1 = GPIOHANDLE_REQUEST_INPUT; + + while ((opt = getopt(argc, argv, "lb:s:u:")) != -1) { + switch (opt) { + case 'l': + flags_v1 |= GPIOHANDLE_REQUEST_ACTIVE_LOW; + break; + case 'b': + if (strcmp("pull-up", optarg) == 0) + flags_v1 |= GPIOHANDLE_REQUEST_BIAS_PULL_UP; + else if (strcmp("pull-down", optarg) == 0) + flags_v1 |= GPIOHANDLE_REQUEST_BIAS_PULL_DOWN; + else if (strcmp("disabled", optarg) == 0) + flags_v1 |= GPIOHANDLE_REQUEST_BIAS_DISABLE; + break; + case 's': + val = atoi(optarg); + flags_v1 &= ~GPIOHANDLE_REQUEST_INPUT; + flags_v1 |= GPIOHANDLE_REQUEST_OUTPUT; + break; + default: + usage(argv[0]); + } + } + + if (argc < optind + 2) + usage(argv[0]); + + chip = argv[optind]; + offset = atoi(argv[optind+1]); + + cfd = open(chip, 0); + if (cfd == -1) { + fprintf(stderr, "Failed to open %s: %s\n", chip, strerror(errno)); + return -errno; + } + + lfd = request_line_v1(cfd, offset, flags_v1, val); + + close(cfd); + + if (lfd < 0) { + fprintf(stderr, "Failed to request %s:%d: %s\n", chip, offset, strerror(-lfd)); + return lfd; + } + + if (flags_v1 & GPIOHANDLE_REQUEST_OUTPUT) + wait_signal(); + else + ret = get_value_v1(lfd); + + close(lfd); + + return ret; +} diff --git a/tools/testing/selftests/gpio/gpio-mockup-sysfs.sh b/tools/testing/selftests/gpio/gpio-mockup-sysfs.sh index dd269d877562..8ec99b4b12e5 100755 --- a/tools/testing/selftests/gpio/gpio-mockup-sysfs.sh +++ b/tools/testing/selftests/gpio/gpio-mockup-sysfs.sh @@ -1,135 +1,71 @@ # SPDX-License-Identifier: GPL-2.0 -is_consistent() -{ - val= - - active_low_sysfs=`cat $GPIO_SYSFS/gpio$nr/active_low` - val_sysfs=`cat $GPIO_SYSFS/gpio$nr/value` - dir_sysfs=`cat $GPIO_SYSFS/gpio$nr/direction` - - gpio_this_debugfs=`cat $GPIO_DEBUGFS |grep "gpio-$nr" | sed "s/(.*)//g"` - dir_debugfs=`echo $gpio_this_debugfs | awk '{print $2}'` - val_debugfs=`echo $gpio_this_debugfs | awk '{print $3}'` - if [ $val_debugfs = "lo" ]; then - val=0 - elif [ $val_debugfs = "hi" ]; then - val=1 - fi - - if [ $active_low_sysfs = "1" ]; then - if [ $val = "0" ]; then - val="1" - else - val="0" - fi - fi - - if [ $val_sysfs = $val ] && [ $dir_sysfs = $dir_debugfs ]; then - echo -n "." - else - echo "test fail, exit" - die - fi -} - -test_pin_logic() -{ - nr=$1 - direction=$2 - active_low=$3 - value=$4 - - echo $direction > $GPIO_SYSFS/gpio$nr/direction - echo $active_low > $GPIO_SYSFS/gpio$nr/active_low - if [ $direction = "out" ]; then - echo $value > $GPIO_SYSFS/gpio$nr/value - fi - is_consistent $nr -} - -test_one_pin() -{ - nr=$1 - - echo -n "test pin<$nr>" - - echo $nr > $GPIO_SYSFS/export 2>/dev/null - - if [ X$? != X0 ]; then - echo "test GPIO pin $nr failed" - die - fi - #"Checking if the sysfs is consistent with debugfs: " - is_consistent $nr +# Overrides functions in gpio-mockup.sh to test using the GPIO SYSFS uAPI - #"Checking the logic of active_low: " - test_pin_logic $nr out 1 1 - test_pin_logic $nr out 1 0 - test_pin_logic $nr out 0 1 - test_pin_logic $nr out 0 0 +SYSFS=`mount -t sysfs | head -1 | awk '{ print $3 }'` +[ ! -d "$SYSFS" ] && skip "sysfs is not mounted" - #"Checking the logic of direction: " - test_pin_logic $nr in 1 1 - test_pin_logic $nr out 1 0 - test_pin_logic $nr low 0 1 - test_pin_logic $nr high 0 0 +GPIO_SYSFS="${SYSFS}/class/gpio" +[ ! -d "$GPIO_SYSFS" ] && skip "CONFIG_GPIO_SYSFS is not selected" - echo $nr > $GPIO_SYSFS/unexport +sysfs_nr= +sysfs_ldir= - echo "successful" -} - -test_one_pin_fail() +# determines the sysfs GPIO number given the $chip and $offset +find_sysfs_nr() { - nr=$1 - - echo $nr > $GPIO_SYSFS/export 2>/dev/null - - if [ X$? != X0 ]; then - echo "test invalid pin $nr successful" - else - echo "test invalid pin $nr failed" - echo $nr > $GPIO_SYSFS/unexport 2>/dev/null - die - fi + # e.g. gpiochip0: GPIOs 508-511, parent: platform/gpio-mockup.0, gpio-mockup-A: + local platform=`cat $SYSFS/kernel/debug/gpio | grep "$chip:" | tr -d ',' | awk '{print $5}'` + # e.g. /sys/class/gpio/gpiochip508/device/gpiochip0/dev + local syschip=`ls -d $GPIO_SYSFS/gpiochip*/device/$chip/dev` + syschip=${syschip#$GPIO_SYSFS} + syschip=${syschip%/device/$chip/dev} + sysfs_nr=`cat $SYSFS/devices/$platform/gpio/$syschip/base` + sysfs_nr=$(($sysfs_nr + $offset)) + sysfs_ldir=$GPIO_SYSFS/gpio$sysfs_nr } -list_chip() +# The helpers being overridden... +get_line() { - echo `ls -d $GPIO_DRV_SYSFS/gpiochip* 2>/dev/null` + [ -z "$sysfs_nr" ] && fail "sysfs line $chip:$offset not exported" + cat $sysfs_ldir/value } -test_chip() +set_line() { - chip=$1 - name=`basename $chip` - base=`cat $chip/base` - ngpio=`cat $chip/ngpio` - printf "%-10s %-5s %-5s\n" $name $base $ngpio - if [ $ngpio = "0" ]; then - echo "number of gpio is zero is not allowed". + if [ -z "$sysfs_nr" ]; then + find_sysfs_nr + echo $sysfs_nr > $GPIO_SYSFS/export fi - test_one_pin $base - test_one_pin $(($base + $ngpio - 1)) - test_one_pin $((( RANDOM % $ngpio ) + $base )) + for option in $*; do + case $option in + active-high) + echo 0 > $sysfs_ldir/active_low + ;; + active-low) + echo 1 > $sysfs_ldir/active_low + ;; + input) + echo "in" > $sysfs_ldir/direction + ;; + 0) + echo "out" > $sysfs_ldir/direction + echo 0 > $sysfs_ldir/value + ;; + 1) + echo "out" > $sysfs_ldir/direction + echo 1 > $sysfs_ldir/value + ;; + esac + done } -test_chips_sysfs() +release_line() { - gpiochip=`list_chip $module` - if [ X"$gpiochip" = X ]; then - if [ X"$valid" = Xfalse ]; then - echo "successful" - else - echo "fail" - die - fi - else - for chip in $gpiochip; do - test_chip $chip - done - fi + [ -z "$sysfs_nr" ] && return + echo $sysfs_nr > $GPIO_SYSFS/unexport + sysfs_nr= + sysfs_ldir= } - diff --git a/tools/testing/selftests/gpio/gpio-mockup.sh b/tools/testing/selftests/gpio/gpio-mockup.sh index 7f35b9880485..66eed9b60963 100755 --- a/tools/testing/selftests/gpio/gpio-mockup.sh +++ b/tools/testing/selftests/gpio/gpio-mockup.sh @@ -2,71 +2,55 @@ # SPDX-License-Identifier: GPL-2.0 #exit status -#1: Internal error -#2: sysfs/debugfs not mount -#3: insert module fail when gpio-mockup is a module. -#4: Skip test including run as non-root user. -#5: other reason. - -SYSFS= -GPIO_SYSFS= -GPIO_DRV_SYSFS= +#0: success +#1: fail +#4: skip test - including run as non-root user + +BASE=`dirname $0` DEBUGFS= GPIO_DEBUGFS= -dev_type= -module= +dev_type="cdev" +module="gpio-mockup" +verbose= +random= +active_opt= +bias_opt= +line_set_pid= -# Kselftest framework requirement - SKIP code is 4. +# Kselftest return codes +ksft_fail=1 ksft_skip=4 usage() { echo "Usage:" - echo "$0 [-f] [-m name] [-t type]" - echo "-f: full test. It maybe conflict with existence gpio device." - echo "-m: module name, default name is gpio-mockup. It could also test" - echo " other gpio device." - echo "-t: interface type: chardev(char device) and sysfs(being" - echo " deprecated). The first one is default" - echo "" - echo "$0 -h" - echo "This usage" + echo "$0 [-frv] [-t type]" + echo "-f: full test (minimal set run by default)" + echo "-r: test random lines as well as fence posts" + echo "-t: interface type:" + echo " cdev (character device ABI) - default" + echo " sysfs (deprecated SYSFS ABI)" + echo "-v: verbose progress reporting" + exit $ksft_fail } -prerequisite() +skip() { - msg="skip all tests:" - if [ $UID != 0 ]; then - echo $msg must be run as root >&2 - exit $ksft_skip - fi - SYSFS=`mount -t sysfs | head -1 | awk '{ print $3 }'` - if [ ! -d "$SYSFS" ]; then - echo $msg sysfs is not mounted >&2 - exit 2 - fi - GPIO_SYSFS=`echo $SYSFS/class/gpio` - GPIO_DRV_SYSFS=`echo $SYSFS/devices/platform/$module/gpio` - DEBUGFS=`mount -t debugfs | head -1 | awk '{ print $3 }'` - if [ ! -d "$DEBUGFS" ]; then - echo $msg debugfs is not mounted >&2 - exit 2 - fi - GPIO_DEBUGFS=`echo $DEBUGFS/gpio` - source gpio-mockup-sysfs.sh + echo $* >&2 + echo GPIO $module test SKIP + exit $ksft_skip } -try_insert_module() +prerequisite() { - if [ -d "$GPIO_DRV_SYSFS" ]; then - echo "$GPIO_DRV_SYSFS exist. Skip insert module" - else - modprobe -q $module $1 - if [ X$? != X0 ]; then - echo $msg insmod $module failed >&2 - exit 3 - fi - fi + [ $(id -u) -ne 0 ] && skip "must be run as root" + + [ ! which modprobe > /dev/null 2>&1 ] && skip "need modprobe installed" + + DEBUGFS=`mount -t debugfs | head -1 | awk '{ print $3 }'` + [ ! -d "$DEBUGFS" ] && skip "debugfs is not mounted" + + GPIO_DEBUGFS=$DEBUGFS/$module } remove_module() @@ -74,133 +58,313 @@ remove_module() modprobe -r -q $module } -die() +cleanup() { + release_line remove_module - exit 5 } -test_chips() +fail() { - if [ X$dev_type = Xsysfs ]; then - echo "WARNING: sysfs ABI of gpio is going to deprecated." - test_chips_sysfs $* - else - $BASE/gpio-mockup-chardev $* - fi + echo "test failed: $*" >&2 + echo GPIO $module test FAIL + exit $ksft_fail +} + +try_insert_module() +{ + modprobe -q $module $1 + err=$? + [ $err -ne 0 ] && fail "insert $module failed with error $err" +} + +log() +{ + [ "$verbose" ] && echo $* +} + +# The following line helpers, release_Line, get_line and set_line, all +# make use of the global $chip and $offset variables. +# +# This implementation drives the GPIO character device (cdev) uAPI. +# Other implementations may override these to test different uAPIs. + +# Release any resources related to the line +release_line() +{ + [ -z "$line_set_pid" ] && return + kill $line_set_pid + line_set_pid= } -gpio_test() +# Read the current value of the line +get_line() { - param=$1 - valid=$2 + release_line + + $BASE/gpio-mockup-cdev $active_opt /dev/$chip $offset > /dev/null 2>&1 + echo $? +} - if [ X"$param" = X ]; then - die +# Set the state of the line +# +# Changes to line configuration are provided as parameters. +# The line is assumed to be an output if the line value 0 or 1 is +# specified, else an input. +set_line() +{ + local val= + + release_line + + # parse config options... + for option in $*; do + case $option in + active-low) + active_opt="-l " + ;; + active-high) + active_opt= + ;; + bias-none) + bias_opt= + ;; + pull-down) + bias_opt="-bpull-down " + ;; + pull-up) + bias_opt="-bpull-up " + ;; + 0) + val=0 + ;; + 1) + val=1 + ;; + esac + done + + local cdev_opts=${active_opt} + if [ "$val" ]; then + $BASE/gpio-mockup-cdev $cdev_opts -s$val /dev/$chip $offset 2>&1 >/dev/null & + # failure to set is detected by reading mock and toggling values + line_set_pid=$! + # wait for line to be set... + sleep 0.05 + elif [ "$bias_opt" ]; then + cdev_opts=${cdev_opts}${bias_opt} + $BASE/gpio-mockup-cdev $cdev_opts /dev/$chip $offset 2>&1 >/dev/null fi - try_insert_module "gpio_mockup_ranges=$param" - echo -n "GPIO $module test with ranges: <" - echo "$param>: " - printf "%-10s %s\n" $param - test_chips $module $valid - remove_module } -BASE=`dirname $0` +assert_line() +{ + local val=`get_line` + [ "$val" -ne $1 ] && fail "line value is $val when $1 was expected" +} + +# The following mock helpers all make use of the $mock_line +set_mock() +{ + echo $1 > $mock_line +} -dev_type= -TEMP=`getopt -o fhm:t: -n '$0' -- "$@"` +assert_mock() +{ + local val=`cat $mock_line` + [ "$val" -ne $1 ] && fail "mock $mock_line value $val when $1 expected" +} -if [ "$?" != "0" ]; then - echo "Parameter process failed, Terminating..." >&2 - exit 1 -fi +# test the functionality of a line +# +# The line is set from the mockup side and is read from the userspace side +# (input), and is set from the userspace side and is read from the mockup side +# (output). +# +# Setting the mockup pull using the userspace interface bias settings is +# tested where supported by the userspace interface (cdev). +test_line() +{ + chip=$1 + offset=$2 + log "test_line $chip $offset" + mock_line=$GPIO_DEBUGFS/$chip/$offset + [ ! -e "$mock_line" ] && fail "missing line $chip:$offset" -# Note the quotes around `$TEMP': they are essential! -eval set -- "$TEMP" + # test as input + set_mock 1 + set_line input active-high + assert_line 1 + set_mock 0 + assert_line 0 -while true; do - case $1 in - -f) - full_test=true + if [ "$full_test" ]; then + # test as input + if [ "$dev_type" != "sysfs" ]; then + set_mock 0 + set_line input pull-up + assert_line 1 + set_mock 0 + assert_line 0 + + set_mock 1 + set_line input pull-down + assert_line 0 + set_mock 1 + assert_line 1 + + set_line bias-none + fi + + set_mock 0 + set_line active-low + assert_line 1 + set_mock 1 + assert_line 0 + + # test as output + set_mock 1 + set_line active-low 1 + assert_mock 0 + set_line 0 + assert_mock 1 + fi + + # test as output + set_mock 1 + set_line active-high 0 + assert_mock 0 + set_line 1 + assert_mock 1 + + release_line +} + +test_no_line() +{ + log test_no_line $* + [ -e "$GPIO_DEBUGFS/$1/$2" ] && fail "unexpected line $1:$2" +} + +# Load the module and check that the expected number of gpiochips, with the +# expected number of lines, are created and are functional. +# +# $1 is the gpio_mockup_ranges parameter for the module +# The remaining parameters are the number of lines, n, expected for each of +# the gpiochips expected to be created. +# +# For each gpiochip the fence post lines, 0 and n-1, are tested, and the +# line on the far side of the fence post, n, is tested to not exist. +# +# If the $random flag is set then a random line in the middle of the +# gpiochip is tested as well. +insmod_test() +{ + local ranges=$1 + local gc= + shift + + [ -z "$ranges" ] && fail "missing ranges" + try_insert_module "gpio_mockup_ranges=$ranges" + log "GPIO $module test with ranges: <$ranges>: " + gpiochip=`ls -d $DEBUGFS/$module/gpiochip* 2>/dev/null` + for chip in $gpiochip; do + gc=`basename $chip` + [ -z "$1" ] && fail "unexpected chip - $gc" + test_line $gc 0 + if [ "$random" ] && [ $1 -gt 2 ]; then + test_line $gc $((( RANDOM % ($1 - 2) + 1))) + fi + test_line $gc $(($1 - 1)) + test_no_line $gc $1 shift + done + [ "$1" ] && fail "missing expected chip of width $1" + remove_module +} + +while getopts ":frvt:" opt; do + case $opt in + f) + full_test=true ;; - -h) - usage - exit + r) + random=true ;; - -m) - module=$2 - shift 2 + t) + dev_type=$OPTARG ;; - -t) - dev_type=$2 - shift 2 - ;; - --) - shift - break + v) + verbose=true ;; *) - echo "Internal error!" - exit 1 + usage ;; esac done +shift $((OPTIND-1)) -if [ X"$module" = X ]; then - module="gpio-mockup" -fi +prerequisite -if [ X$dev_type != Xsysfs ]; then - dev_type="chardev" -fi +trap exit SIGTERM SIGINT +trap cleanup EXIT -prerequisite +case "$dev_type" in +sysfs) + source $BASE/gpio-mockup-sysfs.sh + echo "WARNING: gpio sysfs ABI is deprecated." + ;; +cdev) + ;; +*) + fail "unknown interface type: $dev_type" + ;; +esac + +remove_module -echo "1. Test dynamic allocation of gpio successful means insert gpiochip and" -echo " manipulate gpio pin successful" -gpio_test "-1,32" true -gpio_test "-1,32,-1,32" true -gpio_test "-1,32,-1,32,-1,32" true -if [ X$full_test = Xtrue ]; then - gpio_test "-1,32,32,64" true - gpio_test "-1,32,40,64,-1,5" true - gpio_test "-1,32,32,64,-1,32" true - gpio_test "0,32,32,64,-1,32,-1,32" true - gpio_test "-1,32,-1,32,0,32,32,64" true - echo "2. Do basic test: successful means insert gpiochip and" - echo " manipulate gpio pin successful" - gpio_test "0,32" true - gpio_test "0,32,32,64" true - gpio_test "0,32,40,64,64,96" true +# manual gpio allocation tests fail if a physical chip already exists +[ "$full_test" ] && [ -e "/dev/gpiochip0" ] && skip "full tests conflict with gpiochip0" + +echo "1. Module load tests" +echo "1.1. dynamic allocation of gpio" +insmod_test "-1,32" 32 +insmod_test "-1,32,-1,32" 32 32 +insmod_test "-1,32,-1,32,-1,32" 32 32 32 +if [ "$full_test" ]; then + echo "1.2. manual allocation of gpio" + insmod_test "0,32" 32 + insmod_test "0,32,32,64" 32 32 + insmod_test "0,32,40,64,64,96" 32 24 32 + echo "1.3. dynamic and manual allocation of gpio" + insmod_test "-1,32,32,64" 32 32 + insmod_test "-1,32,-1,32,0,32,32,64" 32 32 32 32 + insmod_test "-1,32,32,64,-1,32" 32 32 32 + insmod_test "-1,32,40,64,-1,5" 32 24 5 + insmod_test "0,32,32,64,-1,32,-1,32" 32 32 32 32 fi -echo "3. Error test: successful means insert gpiochip failed" -echo "3.1 Test number of gpio overflow" -#Currently: The max number of gpio(1024) is defined in arm architecture. -gpio_test "-1,32,-1,1024" false -if [ X$full_test = Xtrue ]; then - echo "3.2 Test zero line of gpio" - gpio_test "0,0" false - echo "3.3 Test range overlap" - echo "3.3.1 Test corner case" - gpio_test "0,32,0,1" false - gpio_test "0,32,32,64,32,40" false - gpio_test "0,32,35,64,35,45" false - gpio_test "0,32,31,32" false - gpio_test "0,32,32,64,36,37" false - gpio_test "0,32,35,64,34,36" false - echo "3.3.2 Test inserting invalid second gpiochip" - gpio_test "0,32,30,35" false - gpio_test "0,32,1,5" false - gpio_test "10,32,9,14" false - gpio_test "10,32,30,35" false - echo "3.3.3 Test others" - gpio_test "0,32,40,56,39,45" false - gpio_test "0,32,40,56,30,33" false - gpio_test "0,32,40,56,30,41" false - gpio_test "0,32,40,56,20,21" false +echo "2. Module load error tests" +echo "2.1 gpio overflow" +# Currently: The max number of gpio(1024) is defined in arm architecture. +insmod_test "-1,1024" +if [ "$full_test" ]; then + echo "2.2 no lines defined" + insmod_test "0,0" + echo "2.3 ignore range overlap" + insmod_test "0,32,0,1" 32 + insmod_test "0,32,1,5" 32 + insmod_test "0,32,30,35" 32 + insmod_test "0,32,31,32" 32 + insmod_test "10,32,30,35" 22 + insmod_test "10,32,9,14" 22 + insmod_test "0,32,20,21,40,56" 32 16 + insmod_test "0,32,32,64,32,40" 32 32 + insmod_test "0,32,32,64,36,37" 32 32 + insmod_test "0,32,35,64,34,36" 32 29 + insmod_test "0,32,35,64,35,45" 32 29 + insmod_test "0,32,40,56,30,33" 32 16 + insmod_test "0,32,40,56,30,41" 32 16 + insmod_test "0,32,40,56,39,45" 32 16 fi -echo GPIO test PASS - +echo GPIO $module test PASS From patchwork Sat Jan 2 02:29:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kent Gibson X-Patchwork-Id: 356225 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9D01C433DB for ; Sat, 2 Jan 2021 02:31:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 75D8F22241 for ; Sat, 2 Jan 2021 02:31:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727415AbhABCbW (ORCPT ); Fri, 1 Jan 2021 21:31:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726424AbhABCbT (ORCPT ); Fri, 1 Jan 2021 21:31:19 -0500 Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3EAFC0613CF; Fri, 1 Jan 2021 18:30:39 -0800 (PST) Received: by mail-pg1-x52e.google.com with SMTP id c22so15231500pgg.13; Fri, 01 Jan 2021 18:30:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=p1pm++rKujuLrrLISgy3rkLqZrTiXDDvlro6rhzJ6Uo=; b=shW8e8wkb/g6qXBJ1fLSjjf3XnGhE84tv8MeCeyLef88Zl1OmxlEssPbKnTyOOxSr/ V4a1TPsv3WLhIPyYfn0vLya6AKeakOvZi0+2betUDmcHgMTUmVYq2VGwHRGFbAaa934i n+QWvw6Dir9aqdcYHJSMUGEBgBlCa5HQfOdtx7V9pqcvwMyAzB0E5L+rDNxB6yB+w8o9 BNe4Jzw3AXpVXUqAt9dWyma4HBLM2gtc3AxDh1TZ1ltVDkt6gfIuxzmujPO3Gma5JDSD ZcSRmCxTNOnJrYct9VgtcYgp9Mnfsusp7R5ofyIPBSWwIM+XnGKF7U76fXUBHFoDck1a 65lA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=p1pm++rKujuLrrLISgy3rkLqZrTiXDDvlro6rhzJ6Uo=; b=A2/2eKV9Ys4PQoCrkfmxIpf4ChjBwEIkwEgtxieVzwJgGHw1UWn9m1x88t0uWFgmy4 NFgOLCwSM8tty0uLtUWN143QviOy2jozlat4kcNlyOro8R2z9UEt+hwuhtj0gizcrGjF AmqUVIaXS5ubTrXfSaCUsRXm0br/GF7ZIMhb9586jISRGF5at2nJ7RN1nrTA+7Jj2oGR /UZ7IpdgNT9z589J7rvZSNvJnKoMlzwqWUP9yC/rt3AScs8CUNKff5Gt+UrpKBSvevTb JwiU2EfjRROGSwIAjfUFmHS5ZrzMEuUtMHxnsnZCRjclP0rYzuY6KMS337Uln6BJLRrI YVDQ== X-Gm-Message-State: AOAM530r8iyCkfGioV9a7jF+Rf0wgY5BDZblld58kvPgRrOu6v9cQ655 /qY90q5oIeCyFCnEHgRtFF3lzGHcyykiyQ== X-Google-Smtp-Source: ABdhPJwJRSrk401ef5yHgK4ADh2OAgvvKAz3hkL6OAJvXQWCLvs1IyxAmXbs0lqIXFsH3TuyAIV3mw== X-Received: by 2002:a62:7fc1:0:b029:19f:1dab:5029 with SMTP id a184-20020a627fc10000b029019f1dab5029mr56974919pfd.13.1609554638673; Fri, 01 Jan 2021 18:30:38 -0800 (PST) Received: from sol.lan (106-69-181-20.dyn.iinet.net.au. [106.69.181.20]) by smtp.gmail.com with ESMTPSA id cl23sm13995664pjb.23.2021.01.01.18.30.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Jan 2021 18:30:38 -0800 (PST) From: Kent Gibson To: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, linux-kselftest@vger.kernel.org, bgolaszewski@baylibre.com, linus.walleij@linaro.org, shuah@kernel.org, bamv2005@gmail.com Cc: Kent Gibson Subject: [PATCH 2/7] selftests: gpio: remove obsolete gpio-mockup-chardev.c Date: Sat, 2 Jan 2021 10:29:44 +0800 Message-Id: <20210102022949.92304-3-warthog618@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210102022949.92304-1-warthog618@gmail.com> References: <20210102022949.92304-1-warthog618@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org GPIO selftests have changed to new gpio-mockup-cdev helper, so remove old gpio-mockup-chardev helper. Signed-off-by: Kent Gibson --- .../selftests/gpio/gpio-mockup-chardev.c | 323 ------------------ 1 file changed, 323 deletions(-) delete mode 100644 tools/testing/selftests/gpio/gpio-mockup-chardev.c diff --git a/tools/testing/selftests/gpio/gpio-mockup-chardev.c b/tools/testing/selftests/gpio/gpio-mockup-chardev.c deleted file mode 100644 index 73ead8828d3a..000000000000 --- a/tools/testing/selftests/gpio/gpio-mockup-chardev.c +++ /dev/null @@ -1,323 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * GPIO chardev test helper - * - * Copyright (C) 2016 Bamvor Jian Zhang - */ - -#define _GNU_SOURCE -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "../../../gpio/gpio-utils.h" - -#define CONSUMER "gpio-selftest" -#define GC_NUM 10 -enum direction { - OUT, - IN -}; - -static int get_debugfs(char **path) -{ - struct libmnt_context *cxt; - struct libmnt_table *tb; - struct libmnt_iter *itr = NULL; - struct libmnt_fs *fs; - int found = 0, ret; - - cxt = mnt_new_context(); - if (!cxt) - err(EXIT_FAILURE, "libmount context allocation failed"); - - itr = mnt_new_iter(MNT_ITER_FORWARD); - if (!itr) - err(EXIT_FAILURE, "failed to initialize libmount iterator"); - - if (mnt_context_get_mtab(cxt, &tb)) - err(EXIT_FAILURE, "failed to read mtab"); - - while (mnt_table_next_fs(tb, itr, &fs) == 0) { - const char *type = mnt_fs_get_fstype(fs); - - if (!strcmp(type, "debugfs")) { - found = 1; - break; - } - } - if (found) { - ret = asprintf(path, "%s/gpio", mnt_fs_get_target(fs)); - if (ret < 0) - err(EXIT_FAILURE, "failed to format string"); - } - - mnt_free_iter(itr); - mnt_free_context(cxt); - - if (!found) - return -1; - - return 0; -} - -static int gpio_debugfs_get(const char *consumer, int *dir, int *value) -{ - char *debugfs; - FILE *f; - char *line = NULL; - size_t len = 0; - char *cur; - int found = 0; - - if (get_debugfs(&debugfs) != 0) - err(EXIT_FAILURE, "debugfs is not mounted"); - - f = fopen(debugfs, "r"); - if (!f) - err(EXIT_FAILURE, "read from gpio debugfs failed"); - - /* - * gpio-2 ( |gpio-selftest ) in lo - */ - while (getline(&line, &len, f) != -1) { - cur = strstr(line, consumer); - if (cur == NULL) - continue; - - cur = strchr(line, ')'); - if (!cur) - continue; - - cur += 2; - if (!strncmp(cur, "out", 3)) { - *dir = OUT; - cur += 4; - } else if (!strncmp(cur, "in", 2)) { - *dir = IN; - cur += 4; - } - - if (!strncmp(cur, "hi", 2)) - *value = 1; - else if (!strncmp(cur, "lo", 2)) - *value = 0; - - found = 1; - break; - } - free(debugfs); - fclose(f); - free(line); - - if (!found) - return -1; - - return 0; -} - -static struct gpiochip_info *list_gpiochip(const char *gpiochip_name, int *ret) -{ - struct gpiochip_info *cinfo; - struct gpiochip_info *current; - const struct dirent *ent; - DIR *dp; - char *chrdev_name; - int fd; - int i = 0; - - cinfo = calloc(sizeof(struct gpiochip_info) * 4, GC_NUM + 1); - if (!cinfo) - err(EXIT_FAILURE, "gpiochip_info allocation failed"); - - current = cinfo; - dp = opendir("/dev"); - if (!dp) { - *ret = -errno; - goto error_out; - } else { - *ret = 0; - } - - while (ent = readdir(dp), ent) { - if (check_prefix(ent->d_name, "gpiochip")) { - *ret = asprintf(&chrdev_name, "/dev/%s", ent->d_name); - if (*ret < 0) - goto error_out; - - fd = open(chrdev_name, 0); - if (fd == -1) { - *ret = -errno; - fprintf(stderr, "Failed to open %s\n", - chrdev_name); - goto error_close_dir; - } - *ret = ioctl(fd, GPIO_GET_CHIPINFO_IOCTL, current); - if (*ret == -1) { - perror("Failed to issue CHIPINFO IOCTL\n"); - goto error_close_dir; - } - close(fd); - if (strcmp(current->label, gpiochip_name) == 0 - || check_prefix(current->label, gpiochip_name)) { - *ret = 0; - current++; - i++; - } - } - } - - if ((!*ret && i == 0) || *ret < 0) { - free(cinfo); - cinfo = NULL; - } - if (!*ret && i > 0) { - cinfo = realloc(cinfo, sizeof(struct gpiochip_info) * 4 * i); - *ret = i; - } - -error_close_dir: - closedir(dp); -error_out: - if (*ret < 0) - err(EXIT_FAILURE, "list gpiochip failed: %s", strerror(*ret)); - - return cinfo; -} - -int gpio_pin_test(struct gpiochip_info *cinfo, int line, int flag, int value) -{ - struct gpiohandle_data data; - unsigned int lines[] = {line}; - int fd; - int debugfs_dir = IN; - int debugfs_value = 0; - int ret; - - data.values[0] = value; - ret = gpiotools_request_linehandle(cinfo->name, lines, 1, flag, &data, - CONSUMER); - if (ret < 0) - goto fail_out; - else - fd = ret; - - ret = gpio_debugfs_get(CONSUMER, &debugfs_dir, &debugfs_value); - if (ret) { - ret = -EINVAL; - goto fail_out; - } - if (flag & GPIOHANDLE_REQUEST_INPUT) { - if (debugfs_dir != IN) { - errno = -EINVAL; - ret = -errno; - } - } else if (flag & GPIOHANDLE_REQUEST_OUTPUT) { - if (flag & GPIOHANDLE_REQUEST_ACTIVE_LOW) - debugfs_value = !debugfs_value; - - if (!(debugfs_dir == OUT && value == debugfs_value)) { - errno = -EINVAL; - ret = -errno; - } - } - gpiotools_release_linehandle(fd); - -fail_out: - if (ret) - err(EXIT_FAILURE, "gpio<%s> line<%d> test flag<0x%x> value<%d>", - cinfo->name, line, flag, value); - - return ret; -} - -void gpio_pin_tests(struct gpiochip_info *cinfo, unsigned int line) -{ - printf("line<%d>", line); - gpio_pin_test(cinfo, line, GPIOHANDLE_REQUEST_OUTPUT, 0); - printf("."); - gpio_pin_test(cinfo, line, GPIOHANDLE_REQUEST_OUTPUT, 1); - printf("."); - gpio_pin_test(cinfo, line, - GPIOHANDLE_REQUEST_OUTPUT | GPIOHANDLE_REQUEST_ACTIVE_LOW, - 0); - printf("."); - gpio_pin_test(cinfo, line, - GPIOHANDLE_REQUEST_OUTPUT | GPIOHANDLE_REQUEST_ACTIVE_LOW, - 1); - printf("."); - gpio_pin_test(cinfo, line, GPIOHANDLE_REQUEST_INPUT, 0); - printf("."); -} - -/* - * ./gpio-mockup-chardev gpio_chip_name_prefix is_valid_gpio_chip - * Return 0 if successful or exit with EXIT_FAILURE if test failed. - * gpio_chip_name_prefix: The prefix of gpiochip you want to test. E.g. - * gpio-mockup - * is_valid_gpio_chip: Whether the gpio_chip is valid. 1 means valid, - * 0 means invalid which could not be found by - * list_gpiochip. - */ -int main(int argc, char *argv[]) -{ - char *prefix; - int valid; - struct gpiochip_info *cinfo; - struct gpiochip_info *current; - int i; - int ret; - - if (argc < 3) { - printf("Usage: %s prefix is_valid", argv[0]); - exit(EXIT_FAILURE); - } - - prefix = argv[1]; - valid = strcmp(argv[2], "true") == 0 ? 1 : 0; - - printf("Test gpiochip %s: ", prefix); - cinfo = list_gpiochip(prefix, &ret); - if (!cinfo) { - if (!valid && ret == 0) { - printf("Invalid test successful\n"); - ret = 0; - goto out; - } else { - ret = -EINVAL; - goto out; - } - } else if (cinfo && !valid) { - ret = -EINVAL; - goto out; - } - current = cinfo; - for (i = 0; i < ret; i++) { - gpio_pin_tests(current, 0); - gpio_pin_tests(current, current->lines - 1); - gpio_pin_tests(current, random() % current->lines); - current++; - } - ret = 0; - printf("successful\n"); - -out: - if (ret) - fprintf(stderr, "gpio<%s> test failed\n", prefix); - - if (cinfo) - free(cinfo); - - if (ret) - exit(EXIT_FAILURE); - - return ret; -} From patchwork Sat Jan 2 02:29:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kent Gibson X-Patchwork-Id: 356027 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32279C4332B for ; Sat, 2 Jan 2021 02:31:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 06E6922241 for ; Sat, 2 Jan 2021 02:31:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727446AbhABCb2 (ORCPT ); Fri, 1 Jan 2021 21:31:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39046 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726424AbhABCb1 (ORCPT ); Fri, 1 Jan 2021 21:31:27 -0500 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 729BEC0613ED; Fri, 1 Jan 2021 18:30:47 -0800 (PST) Received: by mail-pf1-x42d.google.com with SMTP id 11so13117031pfu.4; Fri, 01 Jan 2021 18:30:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Nyvt7pFCSbmO3hBXQ6BbIkgIhUbkWIr3HmW21pocJGE=; b=g22l5FbIr+rd3inrzR1bwzDmzw9tnxs4F/ho3pjOUoKRkw0TIOA0XlTys6KSt+7YlM X2zdk6Dm0orCwrUTcRPr+Ftel33IpedOEOn6aa//Hem+s6q3QQAc6dCn/51PQZ8xslWY T3rgXzLPnzmJx1I6vHgJB/r2gtNhvFNivumRems8mJnkE0eNjIUrDZEAu6n5MZES6A3W xl7ftYm9jAgGAb2KBdcmZHjtrNK1zFCWoND33hRCkHX3oiXrEyhOjpQ9pVssGcYkDF61 3nZ7q5SOv7TFttRq9LaMASwoIV4Z95tTH+ABOd1JSe9Y8Bxklzqt/tqNaSImORoDltRM NQFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Nyvt7pFCSbmO3hBXQ6BbIkgIhUbkWIr3HmW21pocJGE=; b=QRrfZPAQni18Ur8t9C/0EPV4C6LZT5pVn/YFjXUzgR/E2r2HRc4Lja81pncwtfVBf/ +y3LrbF/nEEORLT80ljMpykQUe67Kqz+wbHLIo+g7t/CbLck1NN5irp6VNWAkHNqgjJf 2GLO5P5L1K4fh0RJ998QMYOn59m/CZIA1VY/a2/sNtuOThIgLdBfRR7Qv2ANEGqi8mg4 hCav5bMrnMBSbG4mIAayGekzfPu0ExqoAETJ1xH95jcD9heeBWU5n140hkf/kerzXN8S rxSBTNU+e+1A2LrLjxW/YtVBk4gFv3A5+OMqtmQodYS8s26doKIS1O+bw2oMH+qxVSol eMCQ== X-Gm-Message-State: AOAM531bicSHezKhQOJcHc9O6BNR3QF1qKPgHLqLkXaBqWvNe/79EH5i e31f2kiBLAs5lqdumQW6iYnn7abg+OjJNw== X-Google-Smtp-Source: ABdhPJxlW03422xwhWlMryeNFqs6RIzhcFGb7ywNsxuVdkDPWS1tiCUlO8JTdDLqUWxblpfrauObvQ== X-Received: by 2002:a63:e14a:: with SMTP id h10mr44461868pgk.297.1609554646186; Fri, 01 Jan 2021 18:30:46 -0800 (PST) Received: from sol.lan (106-69-181-20.dyn.iinet.net.au. [106.69.181.20]) by smtp.gmail.com with ESMTPSA id cl23sm13995664pjb.23.2021.01.01.18.30.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Jan 2021 18:30:45 -0800 (PST) From: Kent Gibson To: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, linux-kselftest@vger.kernel.org, bgolaszewski@baylibre.com, linus.walleij@linaro.org, shuah@kernel.org, bamv2005@gmail.com Cc: Kent Gibson Subject: [PATCH 3/7] selftests: remove obsolete build restriction for gpio Date: Sat, 2 Jan 2021 10:29:45 +0800 Message-Id: <20210102022949.92304-4-warthog618@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210102022949.92304-1-warthog618@gmail.com> References: <20210102022949.92304-1-warthog618@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Build restrictions related to the gpio-mockup-chardev helper are no longer relevant so remove them. Signed-off-by: Kent Gibson --- tools/testing/selftests/Makefile | 9 --------- 1 file changed, 9 deletions(-) diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index d9c283503159..5411041e63a0 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -121,15 +121,6 @@ ARCH ?= $(SUBARCH) export KSFT_KHDR_INSTALL_DONE := 1 export BUILD -# build and run gpio when output directory is the src dir. -# gpio has dependency on tools/gpio and builds tools/gpio -# objects in the src directory in all cases making the src -# repo dirty even when objects are relocated. -ifneq (1,$(DEFAULT_INSTALL_HDR_PATH)) - TMP := $(filter-out gpio, $(TARGETS)) - TARGETS := $(TMP) -endif - # set default goal to all, so make without a target runs all, even when # all isn't the first target in the file. .DEFAULT_GOAL := all From patchwork Sat Jan 2 02:29:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kent Gibson X-Patchwork-Id: 356224 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B478C433E0 for ; Sat, 2 Jan 2021 02:31:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1216222248 for ; Sat, 2 Jan 2021 02:31:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727473AbhABCbf (ORCPT ); Fri, 1 Jan 2021 21:31:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727468AbhABCbe (ORCPT ); Fri, 1 Jan 2021 21:31:34 -0500 Received: from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com [IPv6:2607:f8b0:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62CA5C06179E; Fri, 1 Jan 2021 18:30:54 -0800 (PST) Received: by mail-pg1-x52b.google.com with SMTP id c22so15231713pgg.13; Fri, 01 Jan 2021 18:30:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0uunf8NCDFYvIPUJR9RE23lPSlk2ARFIdjDyptH+ntU=; b=A+U6R5xXbDaY0aUJ2BXA7vdrsm9YxgrgzXISWgRGhEa3ePI8FIi41nZCKecp07iplC qKai7f1i6uygpJmEwduyYNoDOur7w3NuOtpBJorkfgTsWdMFlmnB7s+QnsruEPEUmXGC NU+VD9TIcd9a0VoT94c/IP6jcMFOvM1Rw6GouDqYvzbtyaOY0CiSQPHQMlRs26Uj3gBq kuY5LKpQdqmqQsD1tc1Bu66loS+PvnuwiXAuG69oLv14vi6R5+dUE2hYWqX2qOYzPPO8 QJE5p1RWnGEv0KsdjuA6df3+IDOq5jxQ3tbLd0ckOeqvXdATG+K3CXbQPTAbKJO7pAZ4 RB+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0uunf8NCDFYvIPUJR9RE23lPSlk2ARFIdjDyptH+ntU=; b=YDNeR55yFnn+gNFb30rbzJ5xi8xhiaQeOcdeuY/iJHPQjMqphDfVbZwd1qNPCd7+g6 WeiyDSuTOZxQlMyA244Gr+KTnQe7TZXHW3BVIHHNNYnoiLx68rE49APDK0ipS38M72jp UqEd22RRJYiFALhsiv6TYqwPFg5cVOanO9I0AG97PwTsSVauuNSGhv2qHREU1+vXAqKV EABvSCtuHpLc072K9a8yJny5lN1RQGYkTOGzkLomZaS2jskpsP4CESZ00ElfXw868BNu mG5cPLne7Q2wgvssyPjQgh6iF1s0mIXOfjojJUGGLiq4Uu0I8EbNQ8bF+POqfFTQ0CZ/ Bb1g== X-Gm-Message-State: AOAM531eZALSp+80Bcj8+czf+3vCQtgoRAvDOXR3nuHuBnnukhi+CTMO OyqFZ3L1zmSMelovXFMA0sSpS+mwAAn3YQ== X-Google-Smtp-Source: ABdhPJz9hoTCtx82k3/2qjdbVJ/fzCknDUJwlZSgi27rlCQ1rdgSf9wRUp/YY6XmLGIz6wLLHG0Exg== X-Received: by 2002:a63:130b:: with SMTP id i11mr19193274pgl.300.1609554653685; Fri, 01 Jan 2021 18:30:53 -0800 (PST) Received: from sol.lan (106-69-181-20.dyn.iinet.net.au. [106.69.181.20]) by smtp.gmail.com with ESMTPSA id cl23sm13995664pjb.23.2021.01.01.18.30.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Jan 2021 18:30:53 -0800 (PST) From: Kent Gibson To: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, linux-kselftest@vger.kernel.org, bgolaszewski@baylibre.com, linus.walleij@linaro.org, shuah@kernel.org, bamv2005@gmail.com Cc: Kent Gibson Subject: [PATCH 4/7] selftests: remove obsolete gpio references from kselftest_deps.sh Date: Sat, 2 Jan 2021 10:29:46 +0800 Message-Id: <20210102022949.92304-5-warthog618@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210102022949.92304-1-warthog618@gmail.com> References: <20210102022949.92304-1-warthog618@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org GPIO Makefile has been greatly simplified so remove references to lines which no longer exist. Signed-off-by: Kent Gibson --- tools/testing/selftests/kselftest_deps.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/testing/selftests/kselftest_deps.sh b/tools/testing/selftests/kselftest_deps.sh index bbc04646346b..00e60d6eb16b 100755 --- a/tools/testing/selftests/kselftest_deps.sh +++ b/tools/testing/selftests/kselftest_deps.sh @@ -129,13 +129,11 @@ l2_tests=$(grep -r --include=Makefile ": LDLIBS" | \ grep -v "VAR_LDLIBS" | awk -F: '{print $1}') # Level 3 -# gpio, memfd and others use pkg-config to find mount and fuse libs +# memfd and others use pkg-config to find mount and fuse libs # respectively and save it in VAR_LDLIBS. If pkg-config doesn't find # any, VAR_LDLIBS set to default. # Use the default value and filter out pkg-config for dependency check. # e.g: -# gpio/Makefile -# VAR_LDLIBS := $(shell pkg-config --libs mount) 2>/dev/null) # memfd/Makefile # VAR_LDLIBS := $(shell pkg-config fuse --libs 2>/dev/null) From patchwork Sat Jan 2 02:29:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kent Gibson X-Patchwork-Id: 356026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50C07C433DB for ; Sat, 2 Jan 2021 02:31:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2A3EB22285 for ; Sat, 2 Jan 2021 02:31:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727466AbhABCbo (ORCPT ); Fri, 1 Jan 2021 21:31:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39086 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726424AbhABCbm (ORCPT ); Fri, 1 Jan 2021 21:31:42 -0500 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF6A1C06179F; Fri, 1 Jan 2021 18:31:00 -0800 (PST) Received: by mail-pl1-x62a.google.com with SMTP id v3so11633555plz.13; Fri, 01 Jan 2021 18:31:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5ZWwPxQwthfPLOud5M1vvgnEdHUhBjOY3GOowC8y3/s=; b=DUODYccX3oPjWTeSjUoi1GC3mgdreCnthEZTKSQFL2a7xN1gkyXGGdIQFUUSfIVWfN UCRHwUwbkYPjBI3uFBQhyUO/emv11dv8ZIMoqZaU0ObDv7iV37QSjUYVqgfTnciS/6oe GfF84RWSGZMcUPfA7Q7qE96soSg9glGqpKC75Nue/+pueLBpSV8BCpxuIrlZ4Vyfb0mK qpJZULGTxKwaYG5sOsj9oPsAVReGYN33dZamjeRei5G9wbtZeAkj2AQrOQ62ZisOiV3/ AcAZF8QVEk1akD6MJbhkQMS5lXCsz600JFIZRVdRim7iiHXaz62l+pPLxoHjPSP/fn/Z I9kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5ZWwPxQwthfPLOud5M1vvgnEdHUhBjOY3GOowC8y3/s=; b=M4bK0UrRZK7YxN2rHsNVXf3OBRCUQEug2z5AkzSXMCNCqFD2bUAzSi0SoMuD3pZsms X4+NIvXJc1HSzcjGx8cgY3dSE9rByEZgpxb5pj/Mmbjp9jO84AGj0d5GxgCBcM13yZFJ Aj7ZsZdvhmFbreZxjpJxxSktgIKE5racuLH+GLObAApu2sC/QohNgtzeyEbGuSDLKn3x vn4PVA9glXBT/cLEbhbh+MMFYRzWa1/VQHrXEmPnrOJOXQJNfGeDVxKTJXEZFd+svZ7e OJMHtUJfr05cbL9X/uNInr2OoIfen4u1IIHeSmFqwD6zsK+uHJLf2Byyw0mfrPUKzjTl 3W6Q== X-Gm-Message-State: AOAM531nIrt8CGQwxwaEzWxQKrEbfKe99LQevzgCS6yCEnnjgtAXK274 Vo8u5rWVdOimGZJIGSpbA0jLxVPHE8SdgA== X-Google-Smtp-Source: ABdhPJyDPC9wWyqyvBmpKeIo5cRBQ94EMALZniCVPET8ql/s9CJuWIn2Izus/Kwg94CHm7uT0AhU5Q== X-Received: by 2002:a17:90a:2b88:: with SMTP id u8mr20445909pjd.161.1609554660123; Fri, 01 Jan 2021 18:31:00 -0800 (PST) Received: from sol.lan (106-69-181-20.dyn.iinet.net.au. [106.69.181.20]) by smtp.gmail.com with ESMTPSA id cl23sm13995664pjb.23.2021.01.01.18.30.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Jan 2021 18:30:59 -0800 (PST) From: Kent Gibson To: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, linux-kselftest@vger.kernel.org, bgolaszewski@baylibre.com, linus.walleij@linaro.org, shuah@kernel.org, bamv2005@gmail.com Cc: Kent Gibson Subject: [PATCH 5/7] tools: gpio: remove uAPI v1 code no longer used by selftests Date: Sat, 2 Jan 2021 10:29:47 +0800 Message-Id: <20210102022949.92304-6-warthog618@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210102022949.92304-1-warthog618@gmail.com> References: <20210102022949.92304-1-warthog618@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org gpio-mockup-chardev helper has been obsoleted and removed, so also remove the tools/gpio code that it, and nothing else, was using. Signed-off-by: Kent Gibson --- tools/gpio/gpio-utils.c | 89 ----------------------------------------- tools/gpio/gpio-utils.h | 6 --- 2 files changed, 95 deletions(-) diff --git a/tools/gpio/gpio-utils.c b/tools/gpio/gpio-utils.c index 37187e056c8b..1639b4d832cd 100644 --- a/tools/gpio/gpio-utils.c +++ b/tools/gpio/gpio-utils.c @@ -32,74 +32,6 @@ * following api will request gpio lines, do the operation and then * release these lines. */ -/** - * gpiotools_request_linehandle() - request gpio lines in a gpiochip - * @device_name: The name of gpiochip without prefix "/dev/", - * such as "gpiochip0" - * @lines: An array desired lines, specified by offset - * index for the associated GPIO device. - * @num_lines: The number of lines to request. - * @flag: The new flag for requsted gpio. Reference - * "linux/gpio.h" for the meaning of flag. - * @data: Default value will be set to gpio when flag is - * GPIOHANDLE_REQUEST_OUTPUT. - * @consumer_label: The name of consumer, such as "sysfs", - * "powerkey". This is useful for other users to - * know who is using. - * - * Request gpio lines through the ioctl provided by chardev. User - * could call gpiotools_set_values() and gpiotools_get_values() to - * read and write respectively through the returned fd. Call - * gpiotools_release_linehandle() to release these lines after that. - * - * Return: On success return the fd; - * On failure return the errno. - */ -int gpiotools_request_linehandle(const char *device_name, unsigned int *lines, - unsigned int num_lines, unsigned int flag, - struct gpiohandle_data *data, - const char *consumer_label) -{ - struct gpiohandle_request req; - char *chrdev_name; - int fd; - int i; - int ret; - - ret = asprintf(&chrdev_name, "/dev/%s", device_name); - if (ret < 0) - return -ENOMEM; - - fd = open(chrdev_name, 0); - if (fd == -1) { - ret = -errno; - fprintf(stderr, "Failed to open %s, %s\n", - chrdev_name, strerror(errno)); - goto exit_free_name; - } - - for (i = 0; i < num_lines; i++) - req.lineoffsets[i] = lines[i]; - - req.flags = flag; - strcpy(req.consumer_label, consumer_label); - req.lines = num_lines; - if (flag & GPIOHANDLE_REQUEST_OUTPUT) - memcpy(req.default_values, data, sizeof(req.default_values)); - - ret = ioctl(fd, GPIO_GET_LINEHANDLE_IOCTL, &req); - if (ret == -1) { - ret = -errno; - fprintf(stderr, "Failed to issue %s (%d), %s\n", - "GPIO_GET_LINEHANDLE_IOCTL", ret, strerror(errno)); - } - - if (close(fd) == -1) - perror("Failed to close GPIO character device file"); -exit_free_name: - free(chrdev_name); - return ret < 0 ? ret : req.fd; -} /** * gpiotools_request_line() - request gpio lines in a gpiochip @@ -215,27 +147,6 @@ int gpiotools_get_values(const int fd, struct gpio_v2_line_values *values) return ret; } -/** - * gpiotools_release_linehandle(): Release the line(s) of gpiochip - * @fd: The fd returned by - * gpiotools_request_linehandle(). - * - * Return: On success return 0; - * On failure return the errno. - */ -int gpiotools_release_linehandle(const int fd) -{ - int ret; - - ret = close(fd); - if (ret == -1) { - perror("Failed to close GPIO LINEHANDLE device file"); - ret = -errno; - } - - return ret; -} - /** * gpiotools_release_line(): Release the line(s) of gpiochip * @fd: The fd returned by diff --git a/tools/gpio/gpio-utils.h b/tools/gpio/gpio-utils.h index 6c69a9f1c253..8af7c8ee19ce 100644 --- a/tools/gpio/gpio-utils.h +++ b/tools/gpio/gpio-utils.h @@ -24,12 +24,6 @@ static inline int check_prefix(const char *str, const char *prefix) strncmp(str, prefix, strlen(prefix)) == 0; } -int gpiotools_request_linehandle(const char *device_name, unsigned int *lines, - unsigned int num_lines, unsigned int flag, - struct gpiohandle_data *data, - const char *consumer_label); -int gpiotools_release_linehandle(const int fd); - int gpiotools_request_line(const char *device_name, unsigned int *lines, unsigned int num_lines, From patchwork Sat Jan 2 02:29:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kent Gibson X-Patchwork-Id: 356223 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA18DC4332B for ; Sat, 2 Jan 2021 02:31:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8F75E22248 for ; Sat, 2 Jan 2021 02:31:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727525AbhABCbr (ORCPT ); Fri, 1 Jan 2021 21:31:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726424AbhABCbr (ORCPT ); Fri, 1 Jan 2021 21:31:47 -0500 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 329F6C061573; Fri, 1 Jan 2021 18:31:07 -0800 (PST) Received: by mail-pf1-x42d.google.com with SMTP id x126so13101547pfc.7; Fri, 01 Jan 2021 18:31:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4k/oKFi0UoGvgNKJiNffJyyWwVXy9f67MkS0lyxKXfk=; b=nzEhXGBFxuAXTL/S0I3Aj2pNqnBbcUGhVGdLW+UMPx5erkxbb2iavWarWNP6wlo+zy JwZMhIIkrBwOnqynEQlJpv0hagzzYnM9wU24wHYF/AGsCvTcex+7GrIpzIspiGpbdLWT JjTEMV17rjXH3tVr3ZYlLix8gbtf0Eu3SkgtsXL1ZBQTgxnjTS+4p9sIJg5bkCR0rOyP p4OXEoPDJR04DYhEWGaznekfG4R1yWKCmZXEEz+83TM0lGHrwMsd7unrLOlL9bfXzoLY Lz/EyAquqzwsJzjsu0NPr2VM95IQgmjI6XjcGt7Om6NfpLaoBMn3zrEV2K1yMzkYvw4g PVEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4k/oKFi0UoGvgNKJiNffJyyWwVXy9f67MkS0lyxKXfk=; b=WR5Bfj0SF6gfdZnHsG9L0BfwInZmTF7yr/srmNkYbZWUplgjNtfpITdVnoE9DZUGgZ p55MiM7n0rmDNN+YvvTy6KydisDOuZvTlz7CIILAj4dYgKntruraugaGv5wETbvqzMQM Im93TIP49Z9Lvn8uzLGgpiWt+0LNhADN5DeANkCdbTQbC8tUGI/ZIx8UM2BbozDWZBcn Ts30fOa/IH21Cgbrb3RZdcVZnUVVUFhx8pSDwXWLaCCXfvrx68qhKtb1B9GExwCxM0mM UsBhyk8naqhdBy0rjP0MHjI5oaAprvnIBB0SdF2fk33XEscYajX4iKmi9FhCLOFI7O2h PPPw== X-Gm-Message-State: AOAM530kbQKiWui6QN1gnFimEr4gKlF5g1zn7eT4iDTtQTKVHQpbNrHy N3Tk5xZxOtPQj3lY3Sl4uAdXLYfssfTbGw== X-Google-Smtp-Source: ABdhPJz85vlur6XQ5quCbOm1vcLRiFIfWYNopVTzE8czR0TroIKNARmji73V/bSmWZ4SIdBEDKuX9Q== X-Received: by 2002:a63:1f4b:: with SMTP id q11mr50969764pgm.310.1609554666357; Fri, 01 Jan 2021 18:31:06 -0800 (PST) Received: from sol.lan (106-69-181-20.dyn.iinet.net.au. [106.69.181.20]) by smtp.gmail.com with ESMTPSA id cl23sm13995664pjb.23.2021.01.01.18.31.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Jan 2021 18:31:05 -0800 (PST) From: Kent Gibson To: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, linux-kselftest@vger.kernel.org, bgolaszewski@baylibre.com, linus.walleij@linaro.org, shuah@kernel.org, bamv2005@gmail.com Cc: Kent Gibson Subject: [PATCH 6/7] selftests: gpio: port to GPIO uAPI v2 Date: Sat, 2 Jan 2021 10:29:48 +0800 Message-Id: <20210102022949.92304-7-warthog618@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210102022949.92304-1-warthog618@gmail.com> References: <20210102022949.92304-1-warthog618@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Add a port to the GPIO uAPI v2 interface and make it the default. Signed-off-by: Kent Gibson --- .../testing/selftests/gpio/gpio-mockup-cdev.c | 75 +++++++++++++++++-- tools/testing/selftests/gpio/gpio-mockup.sh | 11 ++- 2 files changed, 76 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/gpio/gpio-mockup-cdev.c b/tools/testing/selftests/gpio/gpio-mockup-cdev.c index 3bfd876a8b6a..e8e3d2ec662c 100644 --- 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 66eed9b60963..843f829b3dd8 100755 --- a/tools/testing/selftests/gpio/gpio-mockup.sh +++ b/tools/testing/selftests/gpio/gpio-mockup.sh @@ -13,6 +13,7 @@ dev_type="cdev" module="gpio-mockup" verbose= random= +uapi_opt= active_opt= bias_opt= line_set_pid= @@ -29,6 +30,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 @@ -102,7 +104,8 @@ get_line() { release_line - $BASE/gpio-mockup-cdev $active_opt /dev/$chip $offset > /dev/null 2>&1 + local cdev_opts=${uapi_opt}${active_opt} + $BASE/gpio-mockup-cdev $cdev_opts /dev/$chip $offset > /dev/null 2>&1 echo $? } @@ -144,7 +147,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 2>&1 >/dev/null & # failure to set is detected by reading mock and toggling values @@ -314,6 +317,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) ;; *) From patchwork Sat Jan 2 02:29:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kent Gibson X-Patchwork-Id: 356025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 07C7EC4332E for ; Sat, 2 Jan 2021 02:31:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D21E022473 for ; Sat, 2 Jan 2021 02:31:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727558AbhABCby (ORCPT ); Fri, 1 Jan 2021 21:31:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726424AbhABCby (ORCPT ); Fri, 1 Jan 2021 21:31:54 -0500 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 305D0C0617A0; Fri, 1 Jan 2021 18:31:13 -0800 (PST) Received: by mail-pj1-x102f.google.com with SMTP id v1so6730324pjr.2; Fri, 01 Jan 2021 18:31:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zR1/aMb5vn8qgmpb6q7ElMkFnsSKmzZ0BJxomysAHCE=; b=LU44yvR32x3PpGXFBI0z7JTzB3cnMWiIICMy3c6V5dk4OA3M6Xa1v/z35t2LOwC/aO Q0BOPbnZFko4UVvTZua4HvOQX+IaAl2yB5EGVZ6DdrhQx7jwdv9TT//xD3uvRSzaDK1d 03zCqywAgGoMRvrfuHwSpM0rPuljn3kjdoBLf82EW1Erc28M4lOIN8dmIwJX/AtQyoau QE6snfV4+15iyGLPWw3THIrZLHAikQBHc2ZYlHNnHoqJzbObN76X8y4C1RjPgoiV334X OTArmleTEcuNvAI5bYZXSONULVyzz2zagmpA0uZVeB/vWREDBr44G1ntANmarJYDxZp/ JsiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zR1/aMb5vn8qgmpb6q7ElMkFnsSKmzZ0BJxomysAHCE=; b=hWQbUsdxXs+IgW7A37Up3O336zKmymdtaMEzeym3jpsBNlllyoT9DDaGm4itFET8F3 FsKhb1DL9+uwAX3nvy+OolxS5o+AoTZxx4V/O1uUiCjDtYpiIkb4G9G8SV+ZS79TH8EB tGY1v36TygH9aM8zwx6rIl5UJTDA4ejvqTj5WsK9S0Zr/kYDUm3pVBwFM6AhzWXhy1jZ a+LL4AqRWbPsh0SJWOVYSdNg558TtXbUkvwe6nr5GGMel61ip1p6tUG2FpfoK2t1XYJx Z1ZctJzKsWAfjW3VXfN+ShZZEXQ7oKBti5Zf0yQDvWBfdhly3ZCVfpDlGOrMW7Slco0O bNFw== X-Gm-Message-State: AOAM532kJbRX5xB6L9Lg8knhKntoqs0umuMUrlYYkCuYSBRSCsZcy05e KJ9Jj77kAcSb4xlnwg70/AapNBSe/gRr7Q== X-Google-Smtp-Source: ABdhPJxCItGcUiUOnZUii8r/2g+w1e5ZyuHiSLyhFC3fm1lzAxapR1RmlJ6OIuPFzZf0UrrInrCIvg== X-Received: by 2002:a17:902:9342:b029:dc:4868:d9af with SMTP id g2-20020a1709029342b02900dc4868d9afmr43447197plp.33.1609554672474; Fri, 01 Jan 2021 18:31:12 -0800 (PST) Received: from sol.lan (106-69-181-20.dyn.iinet.net.au. [106.69.181.20]) by smtp.gmail.com with ESMTPSA id cl23sm13995664pjb.23.2021.01.01.18.31.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Jan 2021 18:31:11 -0800 (PST) From: Kent Gibson To: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, linux-kselftest@vger.kernel.org, bgolaszewski@baylibre.com, linus.walleij@linaro.org, shuah@kernel.org, bamv2005@gmail.com Cc: Kent Gibson Subject: [PATCH 7/7] selftests: gpio: add CONFIG_GPIO_CDEV to config Date: Sat, 2 Jan 2021 10:29:49 +0800 Message-Id: <20210102022949.92304-8-warthog618@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210102022949.92304-1-warthog618@gmail.com> References: <20210102022949.92304-1-warthog618@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org GPIO CDEV is now optional and required for the selftests so add it to the config. Signed-off-by: Kent Gibson --- tools/testing/selftests/gpio/config | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/gpio/config b/tools/testing/selftests/gpio/config index abaa6902b7b6..ce100342c20b 100644 --- a/tools/testing/selftests/gpio/config +++ b/tools/testing/selftests/gpio/config @@ -1,2 +1,3 @@ CONFIG_GPIOLIB=y +CONFIG_GPIO_CDEV=y CONFIG_GPIO_MOCKUP=m