From patchwork Mon Mar 29 11:41:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vaittinen, Matti" X-Patchwork-Id: 411014 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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS 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 267DEC433C1 for ; Mon, 29 Mar 2021 11:42:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EE5CC6193A for ; Mon, 29 Mar 2021 11:42:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230297AbhC2Llc (ORCPT ); Mon, 29 Mar 2021 07:41:32 -0400 Received: from mail-lj1-f177.google.com ([209.85.208.177]:43663 "EHLO mail-lj1-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230167AbhC2LlT (ORCPT ); Mon, 29 Mar 2021 07:41:19 -0400 Received: by mail-lj1-f177.google.com with SMTP id y1so15499884ljm.10; Mon, 29 Mar 2021 04:41:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=DuIPGQD/Ekez1kZGizx8nUHGdnGihW0Vg6tpYb7UMwo=; b=VPzBPUx7KDFXskAY00NBANEq8upHAdqZ/4WKh+FyE0gVY/jMfFWfpteSjKuRdsl7Tz P6ChX6/Mej3hnVUEQyHl083RbUm4dEP0OtIWt9/fx/WCHAeW2zBmtxMA2eGIq1DQ5rx+ D/g9g4maBEOYgGxgcZChKeu0PkuzVXJEMNm0Ce4AmQTx2YRtK/uRf9wdl/67z6cXxJ3Q 6nR2oxziUFUi/ohDWK9D2mXLU/oGHpxPKVyMHtzxFkIHoUnQbTiTACCAUcq9ICZZGKYV EYy+/SV6UHJ4crEj0Va6GG7jA/N0NUx9peeiYddUna4Z8u2xg3P3NAOKx/ioIxaESqIn 2QjA== X-Gm-Message-State: AOAM531byC+pWX7xqdUZk04du2mtjafrJVYp+nYkK2NUN20elyu9PTy3 8I6W5T7evbIxx5Pb/MA02+c= X-Google-Smtp-Source: ABdhPJztmsJn5FM5DJhB6xLbYoR5N8QZv5nTi1FeSCIXoCdE822eOg8zpr2IRdVEQNIULt/Y8cu/Ww== X-Received: by 2002:a2e:9715:: with SMTP id r21mr17870769lji.224.1617018078135; Mon, 29 Mar 2021 04:41:18 -0700 (PDT) Received: from dc7vkhyh15000m40t6jht-3.rev.dnainternet.fi (dc7vkhyyyyyyyyyyyyyby-3.rev.dnainternet.fi. [2001:14ba:16e2:8300::2]) by smtp.gmail.com with ESMTPSA id a17sm1748598lfr.204.2021.03.29.04.41.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 04:41:17 -0700 (PDT) Date: Mon, 29 Mar 2021 14:41:12 +0300 From: Matti Vaittinen To: matti.vaittinen@fi.rohmeurope.com, mazziesaccount@gmail.com Cc: Linus Walleij , Bartosz Golaszewski , Stephen Boyd , Andy Shevchenko , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] gpio: sysfs: Obey valid_mask Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Do not allow exporting GPIOs which are set invalid by the driver's valid mask. Fixes: 726cb3ba49692bdae6caff457755e7cdb432efa4 Signed-off-by: Matti Vaittinen --- drivers/gpio/gpiolib-sysfs.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpio/gpiolib-sysfs.c b/drivers/gpio/gpiolib-sysfs.c index 26c5466b8179..ae49bb23c6ed 100644 --- a/drivers/gpio/gpiolib-sysfs.c +++ b/drivers/gpio/gpiolib-sysfs.c @@ -458,6 +458,8 @@ static ssize_t export_store(struct class *class, long gpio; struct gpio_desc *desc; int status; + struct gpio_chip *gc; + int offset; status = kstrtol(buf, 0, &gpio); if (status < 0) @@ -469,6 +471,12 @@ static ssize_t export_store(struct class *class, pr_warn("%s: invalid GPIO %ld\n", __func__, gpio); return -EINVAL; } + gc = desc->gdev->chip; + offset = gpio_chip_hwgpio(desc); + if (!gpiochip_line_is_valid(gc, offset)) { + pr_warn("%s: GPIO %ld masked\n", __func__, gpio); + return -EINVAL; + } /* No extra locking here; FLAG_SYSFS just signifies that the * request and export were done by on behalf of userspace, so From patchwork Mon Mar 29 11:41:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vaittinen, Matti" X-Patchwork-Id: 411013 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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 DD67FC433C1 for ; Mon, 29 Mar 2021 11:42:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 937506193A for ; Mon, 29 Mar 2021 11:42:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231317AbhC2LmG (ORCPT ); Mon, 29 Mar 2021 07:42:06 -0400 Received: from mail-lj1-f177.google.com ([209.85.208.177]:41691 "EHLO mail-lj1-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231219AbhC2Llj (ORCPT ); Mon, 29 Mar 2021 07:41:39 -0400 Received: by mail-lj1-f177.google.com with SMTP id f26so15526705ljp.8; Mon, 29 Mar 2021 04:41:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=uzzBZzKSh0uKl45q2UqHsjLSh2lEI+XdSkO4BJlUPus=; b=CntSlwy+2CwPDmM+89ZJNmfQz/tJjpp6z+1pS5km9BOW9IajVj3VpRrp48rSi3Zh73 WIbMB2jLDpsSKP21p5jp1Zz65nEj4xdjmZbDFYCKusmm39qHrpKHmYEdfQcWGj4RgnQp I40rBBqFeZstHKkP/pwAo/Ce6i2JN6o6vbDJQxUqkUaWsh4En/bwll5diZPAUNfSzIyh rONjHvfg9ininLaY0mu+XoXDFZuCYhxqYpIBwnNREcSBDic8cPpc57FEqVUrpS3w6oI5 puYXluUQWmfnZMjhcUuvlvJxxVcHV8jSAjimG+K8GM0S1+bmjDLVzfAbNIQ8+ZkSIyU+ +/SQ== X-Gm-Message-State: AOAM53003s1qpwO534a4YWU8SaQ2MzlLYxcfwXWGB+5ov8QVaiqEawKq ld2kp4+SVFVAH8j2r6vqquyOqMrp5DTeiQ== X-Google-Smtp-Source: ABdhPJwBzTv/bSfcMTTjPl3RbfBy5JY0KZf+i3hKzVc/blLmEU44IQq/kRyZsQnQRLWoSJ4K13qucg== X-Received: by 2002:a2e:7a11:: with SMTP id v17mr18071884ljc.403.1617018097908; Mon, 29 Mar 2021 04:41:37 -0700 (PDT) Received: from dc7vkhyh15000m40t6jht-3.rev.dnainternet.fi (dc7vkhyyyyyyyyyyyyyby-3.rev.dnainternet.fi. [2001:14ba:16e2:8300::2]) by smtp.gmail.com with ESMTPSA id z13sm1809648lfh.144.2021.03.29.04.41.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 04:41:37 -0700 (PDT) Date: Mon, 29 Mar 2021 14:41:31 +0300 From: Matti Vaittinen To: matti.vaittinen@fi.rohmeurope.com, mazziesaccount@gmail.com Cc: Linus Walleij , Bartosz Golaszewski , Stephen Boyd , Andy Shevchenko , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] gpiolib: Allow drivers to return EOPNOTSUPP from config Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org The checkpacth instructs to switch from ENOSUPP to EOPNOTSUPP. > WARNING: ENOTSUPP is not a SUSV4 error code, prefer EOPNOTSUPP Make the gpiolib allow drivers to return both so driver developers can avoid one of the checkpatch complaints. Signed-off-by: Matti Vaittinen --- drivers/gpio/gpiolib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 6367646dce83..60d61a6314b0 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -2134,7 +2134,7 @@ static int gpio_set_config_with_argument_optional(struct gpio_desc *desc, int ret; ret = gpio_set_config_with_argument(desc, mode, argument); - if (ret != -ENOTSUPP) + if (ret != -ENOTSUPP && ret != -EOPNOTSUPP) return ret; switch (mode) {