From: Thierry Reding <thierry.reding@gmail.com>
To: Linus Walleij <linus.walleij@linaro.org>,
Grygorii Strashko <grygorii.strashko@ti.com>
Cc: Jonathan Hunter <jonathanh@nvidia.com>,
linux-gpio@vger.kernel.org, linux-tegra@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v7 06/15] gpio: Move irq_chained_parent to struct gpio_irq_chip
Date: Tue, 7 Nov 2017 19:15:50 +0100 [thread overview]
Message-ID: <20171107181559.6318-7-thierry.reding@gmail.com> (raw)
In-Reply-To: <20171107181559.6318-1-thierry.reding@gmail.com>
From: Thierry Reding <treding@nvidia.com>
In order to consolidate the multiple ways to associate an IRQ chip with
a GPIO chip, move more fields into the new struct gpio_irq_chip.
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
drivers/gpio/gpiolib.c | 17 ++++++++++++-----
include/linux/gpio/driver.h | 19 +++++++++++++++----
2 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 6b0eef375b58..3edb02b54bb2 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -1570,7 +1570,8 @@ static void gpiochip_set_cascaded_irqchip(struct gpio_chip *gpiochip,
irq_set_chained_handler_and_data(parent_irq, parent_handler,
gpiochip);
- gpiochip->irq_chained_parent = parent_irq;
+ gpiochip->irq.parents = &parent_irq;
+ gpiochip->irq.num_parents = 1;
}
/* Set the parent IRQ for all affected IRQs */
@@ -1719,17 +1720,23 @@ static int gpiochip_to_irq(struct gpio_chip *chip, unsigned offset)
*/
static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip)
{
- unsigned int offset, irq;
+ unsigned int offset;
acpi_gpiochip_free_interrupts(gpiochip);
- if (gpiochip->irq_chained_parent) {
- irq_set_chained_handler_and_data(
- gpiochip->irq_chained_parent, NULL, NULL);
+ if (gpiochip->irq.num_parents > 0) {
+ struct gpio_irq_chip *irq = &gpiochip->irq;
+ unsigned int i;
+
+ for (i = 0; i < irq->num_parents; i++)
+ irq_set_chained_handler_and_data(irq->parents[i],
+ NULL, NULL);
}
/* Remove all IRQ mappings and delete the domain */
if (gpiochip->irq.domain) {
+ unsigned int irq;
+
for (offset = 0; offset < gpiochip->ngpio; offset++) {
if (!gpiochip_irqchip_irq_valid(gpiochip, offset))
continue;
diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h
index 7bafae934112..4210aa4c11d1 100644
--- a/include/linux/gpio/driver.h
+++ b/include/linux/gpio/driver.h
@@ -78,6 +78,21 @@ struct gpio_irq_chip {
* interrupt.
*/
void *parent_handler_data;
+
+ /**
+ * @num_parents:
+ *
+ * The number of interrupt parents of a GPIO chip.
+ */
+ unsigned int num_parents;
+
+ /**
+ * @parents:
+ *
+ * A list of interrupt parents of a GPIO chip. This is owned by the
+ * driver, so the core will only reference this list, not modify it.
+ */
+ unsigned int *parents;
};
static inline struct gpio_irq_chip *to_gpio_irq_chip(struct irq_chip *chip)
@@ -149,9 +164,6 @@ static inline struct gpio_irq_chip *to_gpio_irq_chip(struct irq_chip *chip)
* safely.
* @bgpio_dir: shadowed direction register for generic GPIO to clear/set
* direction safely.
- * @irq_chained_parent: GPIO IRQ chip parent/bank linux irq number,
- * provided by GPIO driver for chained interrupt (not for nested
- * interrupts).
* @irq_nested: True if set the interrupt handling is nested.
* @irq_need_valid_mask: If set core allocates @irq_valid_mask with all
* bits set to one
@@ -227,7 +239,6 @@ struct gpio_chip {
* With CONFIG_GPIOLIB_IRQCHIP we get an irqchip inside the gpiolib
* to handle IRQs for most practical cases.
*/
- unsigned int irq_chained_parent;
bool irq_nested;
bool irq_need_valid_mask;
unsigned long *irq_valid_mask;
--
2.14.1
next prev parent reply other threads:[~2017-11-07 18:19 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-07 18:15 [PATCH v7 00/15] gpio: Tight IRQ chip integration Thierry Reding
2017-11-07 18:15 ` [PATCH v7 01/15] gpio: Introduce struct gpio_irq_chip Thierry Reding
2017-11-07 18:15 ` [PATCH v7 02/15] gpio: Move irqchip into " Thierry Reding
2017-11-07 18:15 ` [PATCH v7 03/15] gpio: Move irqdomain " Thierry Reding
2017-11-07 18:15 ` [PATCH v7 04/15] gpio: Move irq_handler to " Thierry Reding
2017-11-07 18:15 ` [PATCH v7 05/15] gpio: Move irq_default_type " Thierry Reding
2017-11-07 18:15 ` Thierry Reding [this message]
2017-11-07 18:15 ` [PATCH v7 07/15] gpio: Move irq_nested into " Thierry Reding
2017-11-07 18:15 ` [PATCH v7 08/15] gpio: Move irq_valid_mask " Thierry Reding
2017-11-15 15:57 ` Grygorii Strashko
2017-11-07 18:15 ` [PATCH v7 09/15] gpio: Move lock_key " Thierry Reding
2017-11-07 18:15 ` [PATCH v7 10/15] gpio: Implement tighter IRQ chip integration Thierry Reding
2017-11-07 18:15 ` [PATCH v7 11/15] gpio: Export gpiochip_irq_{map,unmap}() Thierry Reding
2017-11-07 18:15 ` [PATCH v7 12/15] gpio: Add Tegra186 support Thierry Reding
2017-11-07 18:15 ` [PATCH v7 13/15] gpio: Disambiguate struct gpio_irq_chip.nested Thierry Reding
2017-11-07 18:15 ` [PATCH v7 14/15] gpio: Introduce struct gpio_irq_chip.first Thierry Reding
2017-11-07 18:15 ` [PATCH v7 15/15] gpio: Automatically add lockdep keys Thierry Reding
2017-11-08 13:21 ` Linus Walleij
2017-11-07 20:02 ` [PATCH v7 00/15] gpio: Tight IRQ chip integration Grygorii Strashko
2017-11-08 13:30 ` 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=20171107181559.6318-7-thierry.reding@gmail.com \
--to=thierry.reding@gmail.com \
--cc=grygorii.strashko@ti.com \
--cc=jonathanh@nvidia.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@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).