From: Alexandre Courbot <acourbot@nvidia.com>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: <linux-gpio@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<gnurou@gmail.com>, Alexandre Courbot <acourbot@nvidia.com>
Subject: [PATCH 2/5] gpio: simplify gpiochip_export()
Date: Tue, 22 Jul 2014 16:17:40 +0900 [thread overview]
Message-ID: <1406013463-19218-3-git-send-email-acourbot@nvidia.com> (raw)
In-Reply-To: <1406013463-19218-1-git-send-email-acourbot@nvidia.com>
For some reason gpiochip_export() would invalidate all the descriptors
of a chip if exporting it to sysfs failed. This does not appear as
necessary. Remove that part of the code.
While we are at it, add a note about the non-safety of temporarily
releasing a spinlock in the middle of the loop that protects its
iterator, and explain why this is done.
Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
---
drivers/gpio/gpiolib-sysfs.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/drivers/gpio/gpiolib-sysfs.c b/drivers/gpio/gpiolib-sysfs.c
index 3516502059f2..f150aa288fa1 100644
--- a/drivers/gpio/gpiolib-sysfs.c
+++ b/drivers/gpio/gpiolib-sysfs.c
@@ -760,18 +760,8 @@ int gpiochip_export(struct gpio_chip *chip)
chip->exported = (status == 0);
mutex_unlock(&sysfs_lock);
- if (status) {
- unsigned long flags;
- unsigned gpio;
-
- spin_lock_irqsave(&gpio_lock, flags);
- gpio = 0;
- while (gpio < chip->ngpio)
- chip->desc[gpio++].chip = NULL;
- spin_unlock_irqrestore(&gpio_lock, flags);
-
+ if (status)
chip_dbg(chip, "%s: status %d\n", __func__, status);
- }
return status;
}
@@ -817,6 +807,14 @@ static int __init gpiolib_sysfs_init(void)
if (!chip || chip->exported)
continue;
+ /*
+ * TODO we yield gpio_lock here because gpiochip_export()
+ * acquires a mutex. This is unsafe and needs to be fixed.
+ *
+ * Also it would be nice to use gpiochip_find() here so we
+ * can keep gpio_chips local to gpiolib.c, but the yield of
+ * gpio_lock prevents us from doing this.
+ */
spin_unlock_irqrestore(&gpio_lock, flags);
status = gpiochip_export(chip);
spin_lock_irqsave(&gpio_lock, flags);
--
2.0.1
next prev parent reply other threads:[~2014-07-22 7:18 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-22 7:17 [PATCH 0/5] gpio: a few cleanup patches Alexandre Courbot
2014-07-22 7:17 ` [PATCH 1/5] gpio: remove export of private of_get_named_gpio_flags() Alexandre Courbot
2014-07-23 15:36 ` Linus Walleij
2014-07-22 7:17 ` Alexandre Courbot [this message]
2014-07-23 15:38 ` [PATCH 2/5] gpio: simplify gpiochip_export() Linus Walleij
2014-07-22 7:17 ` [PATCH 3/5] gpio: make gpiochip_get_desc() gpiolib-private Alexandre Courbot
2014-07-22 20:17 ` Guenter Roeck
2014-07-23 3:10 ` Alexandre Courbot
2014-07-23 3:47 ` Guenter Roeck
2014-07-23 5:39 ` Alexandre Courbot
2014-07-23 6:21 ` Guenter Roeck
2014-07-23 14:48 ` Alexandre Courbot
2014-07-23 15:41 ` Linus Walleij
2014-07-22 7:17 ` [PATCH 4/5] gpio: remove gpiod_lock/unlock_as_irq() Alexandre Courbot
2014-07-23 15:45 ` Linus Walleij
2014-07-22 7:17 ` [PATCH 5/5] gpio: move gpio_ensure_requested() into legacy C file Alexandre Courbot
2014-07-22 8:30 ` Varka Bhadram
2014-07-23 15:48 ` Linus Walleij
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1406013463-19218-3-git-send-email-acourbot@nvidia.com \
--to=acourbot@nvidia.com \
--cc=gnurou@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).