| Message ID | 1380009480-4975-1-git-send-email-javier.martinez@collabora.co.uk (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Javier Martinez Canillas <javier.martinez@collabora.co.uk> [130924 01:06]: > The OMAP GPIO controller HW requires a pin to be configured in GPIO > input mode in order to operate as an interrupt input. Since drivers > should not be aware of whether an interrupt pin is also a GPIO or not, > the HW should be fully configured/enabled as an IRQ if a driver solely > uses IRQ APIs such as request_irq(), and never calls any GPIO-related > APIs. As such, add the missing HW setup to the OMAP GPIO controller's > irq_chip driver. > > Since this bypasses the GPIO subsystem we have to ensure that another > caller won't be able to request the same GPIO pin that is used as an > IRQ and set its direction as output. Requesting the GPIO and setting > its direction as input is allowed though. Also please mention the regression that this fixes. So far we know that smsc911x for tobi and igep boards in mainline, and also the MMC card detect for omap4 boards. > --- a/drivers/gpio/gpio-omap.c > +++ b/drivers/gpio/gpio-omap.c > @@ -63,6 +63,7 @@ struct gpio_bank { > struct gpio_chip chip; > struct clk *dbck; > u32 mod_usage; > + u32 irq_usage; > u32 dbck_enable_mask; > bool dbck_enabled; > struct device *dev; > @@ -86,6 +87,9 @@ struct gpio_bank { > #define GPIO_BIT(bank, gpio) (1 << GPIO_INDEX(bank, gpio)) > #define GPIO_MOD_CTRL_BIT BIT(0) > > +#define BANK_USED(bank) (bank->mod_usage || bank->irq_usage) > +#define LINE_USED(line, offset) (line & (1 << offset)) Hmm this patch is hard to read, maybe break it into two patches? First you could do a patch to prepare thing by introducing BANK_USED and LINE_USED. > +static int gpio_is_input(struct gpio_bank *bank, int mask) > +{ > + void __iomem *reg = bank->base + bank->regs->direction; > + > + return __raw_readl(reg) & mask; > +} And also move gpio_is_input() around in the first patch. Then the second patch for the fix would probably be much easier to read. Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 09/24/2013 05:40 PM, Tony Lindgren wrote: > * Javier Martinez Canillas <javier.martinez@collabora.co.uk> [130924 01:06]: >> The OMAP GPIO controller HW requires a pin to be configured in GPIO >> input mode in order to operate as an interrupt input. Since drivers >> should not be aware of whether an interrupt pin is also a GPIO or not, >> the HW should be fully configured/enabled as an IRQ if a driver solely >> uses IRQ APIs such as request_irq(), and never calls any GPIO-related >> APIs. As such, add the missing HW setup to the OMAP GPIO controller's >> irq_chip driver. >> >> Since this bypasses the GPIO subsystem we have to ensure that another >> caller won't be able to request the same GPIO pin that is used as an >> IRQ and set its direction as output. Requesting the GPIO and setting >> its direction as input is allowed though. > > Also please mention the regression that this fixes. So far we know > that smsc911x for tobi and igep boards in mainline, and also the > MMC card detect for omap4 boards. > Ok, I'll mention that on the next post. >> --- a/drivers/gpio/gpio-omap.c >> +++ b/drivers/gpio/gpio-omap.c >> @@ -63,6 +63,7 @@ struct gpio_bank { >> struct gpio_chip chip; >> struct clk *dbck; >> u32 mod_usage; >> + u32 irq_usage; >> u32 dbck_enable_mask; >> bool dbck_enabled; >> struct device *dev; >> @@ -86,6 +87,9 @@ struct gpio_bank { >> #define GPIO_BIT(bank, gpio) (1 << GPIO_INDEX(bank, gpio)) >> #define GPIO_MOD_CTRL_BIT BIT(0) >> >> +#define BANK_USED(bank) (bank->mod_usage || bank->irq_usage) >> +#define LINE_USED(line, offset) (line & (1 << offset)) > > Hmm this patch is hard to read, maybe break it into two patches? > > First you could do a patch to prepare thing by introducing > BANK_USED and LINE_USED. > >> +static int gpio_is_input(struct gpio_bank *bank, int mask) >> +{ >> + void __iomem *reg = bank->base + bank->regs->direction; >> + >> + return __raw_readl(reg) & mask; >> +} > > And also move gpio_is_input() around in the first patch. > > Then the second patch for the fix would probably be much > easier to read. > Sure will split in more patches, I just wanted to keep in one patch since it was a RFC but it seems that the change makes sense so I'll post it as a proper patch-set. > Regards, > > Tony > Thanks a lot for your feedback and best regards, Javier -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tuesday 24 September 2013 09:10 PM, Tony Lindgren wrote: > * Javier Martinez Canillas <javier.martinez@collabora.co.uk> [130924 01:06]: >> The OMAP GPIO controller HW requires a pin to be configured in GPIO >> input mode in order to operate as an interrupt input. Since drivers >> should not be aware of whether an interrupt pin is also a GPIO or not, >> the HW should be fully configured/enabled as an IRQ if a driver solely >> uses IRQ APIs such as request_irq(), and never calls any GPIO-related >> APIs. As such, add the missing HW setup to the OMAP GPIO controller's >> irq_chip driver. >> >> Since this bypasses the GPIO subsystem we have to ensure that another >> caller won't be able to request the same GPIO pin that is used as an >> IRQ and set its direction as output. Requesting the GPIO and setting >> its direction as input is allowed though. > > Also please mention the regression that this fixes. So far we know > that smsc911x for tobi and igep boards in mainline, and also the > MMC card detect for omap4 boards. Hi Tony, Card detect on omap4 board (sdp and panda) is not based on omap gpio, so I think this fix is not applicable for omap4. Card detect line for SD card goes to power IC on OMAP4 panda and SDP. -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tuesday 24 September 2013 11:45 AM, Balaji T K wrote: > On Tuesday 24 September 2013 09:10 PM, Tony Lindgren wrote: >> * Javier Martinez Canillas <javier.martinez@collabora.co.uk> [130924 01:06]: >>> The OMAP GPIO controller HW requires a pin to be configured in GPIO >>> input mode in order to operate as an interrupt input. Since drivers >>> should not be aware of whether an interrupt pin is also a GPIO or not, >>> the HW should be fully configured/enabled as an IRQ if a driver solely >>> uses IRQ APIs such as request_irq(), and never calls any GPIO-related >>> APIs. As such, add the missing HW setup to the OMAP GPIO controller's >>> irq_chip driver. >>> >>> Since this bypasses the GPIO subsystem we have to ensure that another >>> caller won't be able to request the same GPIO pin that is used as an >>> IRQ and set its direction as output. Requesting the GPIO and setting >>> its direction as input is allowed though. >> >> Also please mention the regression that this fixes. So far we know >> that smsc911x for tobi and igep boards in mainline, and also the > >> MMC card detect for omap4 boards. > Hi Tony, > > Card detect on omap4 board (sdp and panda) is not based on omap gpio, > so I think this fix is not applicable for omap4. > > Card detect line for SD card goes to power IC on OMAP4 panda and SDP. > I confused Tony mostly. It was OMAP4 SPI based ethernet which uses the GPIO as an interrupt line. So for Panda, its Ethernet driver and not MMC. Regards, Santosh -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
* Balaji T K <balajitk@ti.com> [130924 08:54]: > On Tuesday 24 September 2013 09:10 PM, Tony Lindgren wrote: > > > >Also please mention the regression that this fixes. So far we know > >that smsc911x for tobi and igep boards in mainline, and also the > > >MMC card detect for omap4 boards. > Hi Tony, > > Card detect on omap4 board (sdp and panda) is not based on omap gpio, > so I think this fix is not applicable for omap4. > > Card detect line for SD card goes to power IC on OMAP4 panda and SDP. Hmm OK is that the twl6030_mmc_card_detect_config() on PMIC? Santosh, care to clarify what you mentioned to me earlier regarding the MMC card detect regression? Regards, Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
* Santosh Shilimkar <santosh.shilimkar@ti.com> [130924 08:56]: > On Tuesday 24 September 2013 11:45 AM, Balaji T K wrote: > > On Tuesday 24 September 2013 09:10 PM, Tony Lindgren wrote: > >> * Javier Martinez Canillas <javier.martinez@collabora.co.uk> [130924 01:06]: > >>> The OMAP GPIO controller HW requires a pin to be configured in GPIO > >>> input mode in order to operate as an interrupt input. Since drivers > >>> should not be aware of whether an interrupt pin is also a GPIO or not, > >>> the HW should be fully configured/enabled as an IRQ if a driver solely > >>> uses IRQ APIs such as request_irq(), and never calls any GPIO-related > >>> APIs. As such, add the missing HW setup to the OMAP GPIO controller's > >>> irq_chip driver. > >>> > >>> Since this bypasses the GPIO subsystem we have to ensure that another > >>> caller won't be able to request the same GPIO pin that is used as an > >>> IRQ and set its direction as output. Requesting the GPIO and setting > >>> its direction as input is allowed though. > >> > >> Also please mention the regression that this fixes. So far we know > >> that smsc911x for tobi and igep boards in mainline, and also the > > > >> MMC card detect for omap4 boards. > > Hi Tony, > > > > Card detect on omap4 board (sdp and panda) is not based on omap gpio, > > so I think this fix is not applicable for omap4. > > > > Card detect line for SD card goes to power IC on OMAP4 panda and SDP. > > > I confused Tony mostly. It was OMAP4 SPI based ethernet which uses the > GPIO as an interrupt line. > > So for Panda, its Ethernet driver and not MMC. OK :) Thanks for clarifying. Tony -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 09/24/2013 01:58 AM, Javier Martinez Canillas wrote: > The OMAP GPIO controller HW requires a pin to be configured in GPIO > input mode in order to operate as an interrupt input. Since drivers > should not be aware of whether an interrupt pin is also a GPIO or not, > the HW should be fully configured/enabled as an IRQ if a driver solely > uses IRQ APIs such as request_irq(), and never calls any GPIO-related > APIs. As such, add the missing HW setup to the OMAP GPIO controller's > irq_chip driver. > > Since this bypasses the GPIO subsystem we have to ensure that another > caller won't be able to request the same GPIO pin that is used as an > IRQ and set its direction as output. Requesting the GPIO and setting > its direction as input is allowed though. FWIW, the concept of this patch, Acked-by: Stephen Warren <swarren@nvidia.com> I didn't review the code; just skimmed it to see where the new functionality was implemented. -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 09/27/2013 01:18 AM, Stephen Warren wrote: > On 09/24/2013 01:58 AM, Javier Martinez Canillas wrote: >> The OMAP GPIO controller HW requires a pin to be configured in GPIO >> input mode in order to operate as an interrupt input. Since drivers >> should not be aware of whether an interrupt pin is also a GPIO or not, >> the HW should be fully configured/enabled as an IRQ if a driver solely >> uses IRQ APIs such as request_irq(), and never calls any GPIO-related >> APIs. As such, add the missing HW setup to the OMAP GPIO controller's >> irq_chip driver. >> >> Since this bypasses the GPIO subsystem we have to ensure that another >> caller won't be able to request the same GPIO pin that is used as an >> IRQ and set its direction as output. Requesting the GPIO and setting >> its direction as input is allowed though. > > FWIW, the concept of this patch, > Acked-by: Stephen Warren <swarren@nvidia.com> > > I didn't review the code; just skimmed it to see where the new > functionality was implemented. > Thanks Stephen, I split the changes as suggested by Tony and posted as a patch-set and not an RFC anymore: [PATCH 1/2] gpio/omap: maintain GPIO and IRQ usage separately [1] [PATCH 2/2] gpio/omap: auto-setup a GPIO when used as an IRQ [2] Linus, Could you please add Stephen Acked-by when taking the patches and also George Cherian Tested-by that sent for this RFC. George it would be great if you can also comment on which OMAP platform you had tested. I cc'ed Aaro Koskinen and Paul Walmsley now which seems to have OMAP1 platforms to test. Could you please test [1] and [2] on a OMAP1 board? These patches solves a long standing issue we have on OMAP2+ when booting with DT and it would be great if you can check that it does not cause regressions on OMAP1 based boards. Thanks a lot and best regards, Javier [1]: https://patchwork.kernel.org/patch/2937351/ [2]: https://patchwork.kernel.org/patch/2937371/ -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 9/27/2013 1:05 PM, Javier Martinez Canillas wrote: > On 09/27/2013 01:18 AM, Stephen Warren wrote: >> On 09/24/2013 01:58 AM, Javier Martinez Canillas wrote: >>> The OMAP GPIO controller HW requires a pin to be configured in GPIO >>> input mode in order to operate as an interrupt input. Since drivers >>> should not be aware of whether an interrupt pin is also a GPIO or not, >>> the HW should be fully configured/enabled as an IRQ if a driver solely >>> uses IRQ APIs such as request_irq(), and never calls any GPIO-related >>> APIs. As such, add the missing HW setup to the OMAP GPIO controller's >>> irq_chip driver. >>> >>> Since this bypasses the GPIO subsystem we have to ensure that another >>> caller won't be able to request the same GPIO pin that is used as an >>> IRQ and set its direction as output. Requesting the GPIO and setting >>> its direction as input is allowed though. >> FWIW, the concept of this patch, >> Acked-by: Stephen Warren <swarren@nvidia.com> >> >> I didn't review the code; just skimmed it to see where the new >> functionality was implemented. >> > Thanks Stephen, > > I split the changes as suggested by Tony and posted as a patch-set and not an > RFC anymore: > > [PATCH 1/2] gpio/omap: maintain GPIO and IRQ usage separately [1] > [PATCH 2/2] gpio/omap: auto-setup a GPIO when used as an IRQ [2] > > Linus, > > Could you please add Stephen Acked-by when taking the patches and also George > Cherian Tested-by that sent for this RFC. George it would be great if you can > also comment on which OMAP platform you had tested. Tested on dra7xx/evm with GPIO interrupt for pcf gpio expander. Tested-by: George Cherian <george.cherian@ti.com> > > I cc'ed Aaro Koskinen and Paul Walmsley now which seems to have OMAP1 platforms > to test. Could you please test [1] and [2] on a OMAP1 board? These patches > solves a long standing issue we have on OMAP2+ when booting with DT and it would > be great if you can check that it does not cause regressions on OMAP1 based boards. > > Thanks a lot and best regards, > Javier > > [1]: https://patchwork.kernel.org/patch/2937351/ > [2]: https://patchwork.kernel.org/patch/2937371/ > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On Fri, Sep 27, 2013 at 09:35:33AM +0200, Javier Martinez Canillas wrote: > I cc'ed Aaro Koskinen and Paul Walmsley now which seems to have OMAP1 > platforms to test. Could you please test [1] and [2] on a OMAP1 board? [...] > [1]: https://patchwork.kernel.org/patch/2937351/ > [2]: https://patchwork.kernel.org/patch/2937371/ Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi> I applied these patches on top of 3.12-rc2 and tested them on Nokia 770 (OMAP1, Touchscreen & Retu powerbutton GPIO IRQs) and N800 (OMAP2, Retu powerbutton). Seems to work fine on both boards. A. -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 27 Sep 2013, Javier Martinez Canillas wrote: > I cc'ed Aaro Koskinen and Paul Walmsley now which seems to have OMAP1 platforms > to test. Could you please test [1] and [2] on a OMAP1 board? These patches > solves a long standing issue we have on OMAP2+ when booting with DT and it would > be great if you can check that it does not cause regressions on OMAP1 based boards. Unfortunately my OMAP1 test platform is down at the moment, so am not able to test. But saw that it passed Aaro's tests, so I'd say that's a pretty good endorsement. - Paul -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index 0ff4355..89675f8 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c @@ -63,6 +63,7 @@ struct gpio_bank { struct gpio_chip chip; struct clk *dbck; u32 mod_usage; + u32 irq_usage; u32 dbck_enable_mask; bool dbck_enabled; struct device *dev; @@ -86,6 +87,9 @@ struct gpio_bank { #define GPIO_BIT(bank, gpio) (1 << GPIO_INDEX(bank, gpio)) #define GPIO_MOD_CTRL_BIT BIT(0) +#define BANK_USED(bank) (bank->mod_usage || bank->irq_usage) +#define LINE_USED(line, offset) (line & (1 << offset)) + static int irq_to_gpio(struct gpio_bank *bank, unsigned int gpio_irq) { return bank->chip.base + gpio_irq; @@ -420,15 +424,69 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, return 0; } +static void _enable_gpio_module(struct gpio_bank *bank, unsigned offset) +{ + if (bank->regs->pinctrl) { + void __iomem *reg = bank->base + bank->regs->pinctrl; + + /* Claim the pin for MPU */ + __raw_writel(__raw_readl(reg) | (1 << offset), reg); + } + + if (bank->regs->ctrl && !BANK_USED(bank)) { + void __iomem *reg = bank->base + bank->regs->ctrl; + u32 ctrl; + + ctrl = __raw_readl(reg); + /* Module is enabled, clocks are not gated */ + ctrl &= ~GPIO_MOD_CTRL_BIT; + __raw_writel(ctrl, reg); + bank->context.ctrl = ctrl; + } +} + +static void _disable_gpio_module(struct gpio_bank *bank, unsigned offset) +{ + void __iomem *base = bank->base; + + if (bank->regs->wkup_en && + !LINE_USED(bank->mod_usage, offset) && + !LINE_USED(bank->irq_usage, offset)) { + /* Disable wake-up during idle for dynamic tick */ + _gpio_rmw(base, bank->regs->wkup_en, 1 << offset, 0); + bank->context.wake_en = + __raw_readl(bank->base + bank->regs->wkup_en); + } + + if (bank->regs->ctrl && !BANK_USED(bank)) { + void __iomem *reg = bank->base + bank->regs->ctrl; + u32 ctrl; + + ctrl = __raw_readl(reg); + /* Module is disabled, clocks are gated */ + ctrl |= GPIO_MOD_CTRL_BIT; + __raw_writel(ctrl, reg); + bank->context.ctrl = ctrl; + } +} + +static int gpio_is_input(struct gpio_bank *bank, int mask) +{ + void __iomem *reg = bank->base + bank->regs->direction; + + return __raw_readl(reg) & mask; +} + static int gpio_irq_type(struct irq_data *d, unsigned type) { struct gpio_bank *bank = irq_data_get_irq_chip_data(d); unsigned gpio = 0; int retval; unsigned long flags; + unsigned offset; - if (WARN_ON(!bank->mod_usage)) - return -EINVAL; + if (!BANK_USED(bank)) + pm_runtime_get_sync(bank->dev); #ifdef CONFIG_ARCH_OMAP1 if (d->irq > IH_MPUIO_BASE) @@ -446,7 +504,17 @@ static int gpio_irq_type(struct irq_data *d, unsigned type) return -EINVAL; spin_lock_irqsave(&bank->lock, flags); - retval = _set_gpio_triggering(bank, GPIO_INDEX(bank, gpio), type); + offset = GPIO_INDEX(bank, gpio); + retval = _set_gpio_triggering(bank, offset, type); + if (!LINE_USED(bank->mod_usage, offset)) { + _enable_gpio_module(bank, offset); + _set_gpio_direction(bank, offset, 1); + } else if (!gpio_is_input(bank, 1 << offset)) { + spin_unlock_irqrestore(&bank->lock, flags); + return -EINVAL; + } + + bank->irq_usage |= 1 << GPIO_INDEX(bank, gpio); spin_unlock_irqrestore(&bank->lock, flags); if (type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH)) @@ -603,35 +671,19 @@ static int omap_gpio_request(struct gpio_chip *chip, unsigned offset) * If this is the first gpio_request for the bank, * enable the bank module. */ - if (!bank->mod_usage) + if (!BANK_USED(bank)) pm_runtime_get_sync(bank->dev); spin_lock_irqsave(&bank->lock, flags); /* Set trigger to none. You need to enable the desired trigger with - * request_irq() or set_irq_type(). + * request_irq() or set_irq_type(). Only do this if the IRQ line has + * not already been requested. */ - _set_gpio_triggering(bank, offset, IRQ_TYPE_NONE); - - if (bank->regs->pinctrl) { - void __iomem *reg = bank->base + bank->regs->pinctrl; - - /* Claim the pin for MPU */ - __raw_writel(__raw_readl(reg) | (1 << offset), reg); - } - - if (bank->regs->ctrl && !bank->mod_usage) { - void __iomem *reg = bank->base + bank->regs->ctrl; - u32 ctrl; - - ctrl = __raw_readl(reg); - /* Module is enabled, clocks are not gated */ - ctrl &= ~GPIO_MOD_CTRL_BIT; - __raw_writel(ctrl, reg); - bank->context.ctrl = ctrl; + if (!LINE_USED(bank->irq_usage, offset)) { + _set_gpio_triggering(bank, offset, IRQ_TYPE_NONE); + _enable_gpio_module(bank, offset); } - bank->mod_usage |= 1 << offset; - spin_unlock_irqrestore(&bank->lock, flags); return 0; @@ -640,31 +692,11 @@ static int omap_gpio_request(struct gpio_chip *chip, unsigned offset) static void omap_gpio_free(struct gpio_chip *chip, unsigned offset) { struct gpio_bank *bank = container_of(chip, struct gpio_bank, chip); - void __iomem *base = bank->base; unsigned long flags; spin_lock_irqsave(&bank->lock, flags); - - if (bank->regs->wkup_en) { - /* Disable wake-up during idle for dynamic tick */ - _gpio_rmw(base, bank->regs->wkup_en, 1 << offset, 0); - bank->context.wake_en = - __raw_readl(bank->base + bank->regs->wkup_en); - } - bank->mod_usage &= ~(1 << offset); - - if (bank->regs->ctrl && !bank->mod_usage) { - void __iomem *reg = bank->base + bank->regs->ctrl; - u32 ctrl; - - ctrl = __raw_readl(reg); - /* Module is disabled, clocks are gated */ - ctrl |= GPIO_MOD_CTRL_BIT; - __raw_writel(ctrl, reg); - bank->context.ctrl = ctrl; - } - + _disable_gpio_module(bank, offset); _reset_gpio(bank, bank->chip.base + offset); spin_unlock_irqrestore(&bank->lock, flags); @@ -672,7 +704,7 @@ static void omap_gpio_free(struct gpio_chip *chip, unsigned offset) * If this is the last gpio to be freed in the bank, * disable the bank module. */ - if (!bank->mod_usage) + if (!BANK_USED(bank)) pm_runtime_put(bank->dev); } @@ -762,10 +794,20 @@ static void gpio_irq_shutdown(struct irq_data *d) struct gpio_bank *bank = irq_data_get_irq_chip_data(d); unsigned int gpio = irq_to_gpio(bank, d->hwirq); unsigned long flags; + unsigned offset = GPIO_INDEX(bank, gpio); spin_lock_irqsave(&bank->lock, flags); + bank->irq_usage &= ~(1 << offset); + _disable_gpio_module(bank, offset); _reset_gpio(bank, gpio); spin_unlock_irqrestore(&bank->lock, flags); + + /* + * If this is the last IRQ to be freed in the bank, + * disable the bank module. + */ + if (!BANK_USED(bank)) + pm_runtime_put(bank->dev); } static void gpio_ack_irq(struct irq_data *d) @@ -897,13 +939,6 @@ static int gpio_input(struct gpio_chip *chip, unsigned offset) return 0; } -static int gpio_is_input(struct gpio_bank *bank, int mask) -{ - void __iomem *reg = bank->base + bank->regs->direction; - - return __raw_readl(reg) & mask; -} - static int gpio_get(struct gpio_chip *chip, unsigned offset) { struct gpio_bank *bank; @@ -922,13 +957,22 @@ static int gpio_output(struct gpio_chip *chip, unsigned offset, int value) { struct gpio_bank *bank; unsigned long flags; + int retval = 0; bank = container_of(chip, struct gpio_bank, chip); spin_lock_irqsave(&bank->lock, flags); + + if (LINE_USED(bank->irq_usage, offset)) { + retval = -EINVAL; + goto exit; + } + bank->set_dataout(bank, offset, value); _set_gpio_direction(bank, offset, 0); + +exit: spin_unlock_irqrestore(&bank->lock, flags); - return 0; + return retval; } static int gpio_debounce(struct gpio_chip *chip, unsigned offset, @@ -1400,7 +1444,7 @@ void omap2_gpio_prepare_for_idle(int pwr_mode) struct gpio_bank *bank; list_for_each_entry(bank, &omap_gpio_list, node) { - if (!bank->mod_usage || !bank->loses_context) + if (!BANK_USED(bank) || !bank->loses_context) continue; bank->power_mode = pwr_mode; @@ -1414,7 +1458,7 @@ void omap2_gpio_resume_after_idle(void) struct gpio_bank *bank; list_for_each_entry(bank, &omap_gpio_list, node) { - if (!bank->mod_usage || !bank->loses_context) + if (!BANK_USED(bank) || !bank->loses_context) continue; pm_runtime_get_sync(bank->dev);
The OMAP GPIO controller HW requires a pin to be configured in GPIO input mode in order to operate as an interrupt input. Since drivers should not be aware of whether an interrupt pin is also a GPIO or not, the HW should be fully configured/enabled as an IRQ if a driver solely uses IRQ APIs such as request_irq(), and never calls any GPIO-related APIs. As such, add the missing HW setup to the OMAP GPIO controller's irq_chip driver. Since this bypasses the GPIO subsystem we have to ensure that another caller won't be able to request the same GPIO pin that is used as an IRQ and set its direction as output. Requesting the GPIO and setting its direction as input is allowed though. Signed-off-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> --- Tested on a OMAP3 DM3730 board with both legacy and DT based booting. Changes since v1: - Simplify patch description as suggested by Stephen Warren. - Track IRQ and GPIO module usage separately. - Add clearing path for PM when free_irq() is called to not leave the bank unnecessary enabled as suggested by Tony Lindgren. - Check if the line is used as IRQ to not allow a second caller to set the GPIO direction as output as suggested by Linus Walleij. drivers/gpio/gpio-omap.c | 158 ++++++++++++++++++++++++++++++----------------- 1 file changed, 101 insertions(+), 57 deletions(-)