[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <AE6E30D8-7E58-4D18-A8F3-B903F5D85498@jcrosoft.com>
Date: Thu, 26 Feb 2015 21:59:08 +0800
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@...osoft.com>
To: Nicolas FERRE <nicolas.ferre@...el.com>
Cc: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@...osoft.com>,
Boris Brezillon <boris.brezillon@...e-electrons.com>,
Linus Walleij <linus.walleij@...aro.org>,
Alexandre Belloni <alexandre.belloni@...e-electrons.com>,
linux-gpio@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-kernel@...r.kernel.org,
Jean-Jacques Hiblot <jjhiblot@...phandler.com>
Subject: Re: [PATCH] pinctrl: at91: move lock/unlock_as_irq calls into request/release resources methods
> On Feb 26, 2015, at 9:32 PM, Nicolas Ferre <nicolas.ferre@...el.com> wrote:
>
> Le 08/02/2015 19:23, Boris Brezillon a écrit :
>> The gpiochip_lock_as_irq call can fail and return an error, while the
>> irq_startup is not expected to fail (returns an unsigned int which is not
>> checked by irq core code).
>>
>> irq_request/release_resources functions have been created to address this
>> problem.
>>
>> Move gpiochip_lock/unlock_as_irq calls into
>> irq_request/release_resources functions to prevent using a gpio as an irq
>> if the gpiochip_lock_as_irq call failed.
>>
>> Signed-off-by: Boris Brezillon <boris.brezillon@...e-electrons.com>
>
> If it can speed up things:
> Acked-by: Nicolas Ferre <nicolas.ferre@...el.com>
>
> Linus,
> can we schedule this fix during the 4.0-rc phase?
As I said I’ll test after CNY which finish this week for us
as we only re-open the office Monday
Best Regards,
J.
>
> Bye,
>
>> ---
>> drivers/pinctrl/pinctrl-at91.c | 17 +++++++----------
>> 1 file changed, 7 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c
>> index f4cd0b9..a481406 100644
>> --- a/drivers/pinctrl/pinctrl-at91.c
>> +++ b/drivers/pinctrl/pinctrl-at91.c
>> @@ -1477,28 +1477,25 @@ static void gpio_irq_ack(struct irq_data *d)
>> /* the interrupt is already cleared before by reading ISR */
>> }
>>
>> -static unsigned int gpio_irq_startup(struct irq_data *d)
>> +static int gpio_irq_request_res(struct irq_data *d)
>> {
>> struct at91_gpio_chip *at91_gpio = irq_data_get_irq_chip_data(d);
>> unsigned pin = d->hwirq;
>> int ret;
>>
>> ret = gpiochip_lock_as_irq(&at91_gpio->chip, pin);
>> - if (ret) {
>> + if (ret)
>> dev_err(at91_gpio->chip.dev, "unable to lock pind %lu IRQ\n",
>> d->hwirq);
>> - return ret;
>> - }
>> - gpio_irq_unmask(d);
>> - return 0;
>> +
>> + return ret;
>> }
>>
>> -static void gpio_irq_shutdown(struct irq_data *d)
>> +static void gpio_irq_release_res(struct irq_data *d)
>> {
>> struct at91_gpio_chip *at91_gpio = irq_data_get_irq_chip_data(d);
>> unsigned pin = d->hwirq;
>>
>> - gpio_irq_mask(d);
>> gpiochip_unlock_as_irq(&at91_gpio->chip, pin);
>> }
>>
>> @@ -1577,8 +1574,8 @@ void at91_pinctrl_gpio_resume(void)
>> static struct irq_chip gpio_irqchip = {
>> .name = "GPIO",
>> .irq_ack = gpio_irq_ack,
>> - .irq_startup = gpio_irq_startup,
>> - .irq_shutdown = gpio_irq_shutdown,
>> + .irq_request_resources = gpio_irq_request_res,
>> + .irq_release_resources = gpio_irq_release_res,
>> .irq_disable = gpio_irq_mask,
>> .irq_mask = gpio_irq_mask,
>> .irq_unmask = gpio_irq_unmask,
>>
>
>
> --
> Nicolas Ferre
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists