From: Alexander Sverdlin <alexander.sverdlin@gmail.com>
To: Nikita Shubin <nikita.shubin@maquefel.me>
Cc: Andy Shevchenko <andy.shevchenko@gmail.com>,
Linus Walleij <linus.walleij@linaro.org>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v6 2/7] gpio: ep93xx: Fix single irqchip with multi gpiochips
Date: Tue, 09 Feb 2021 23:03:59 +0100 [thread overview]
Message-ID: <223de0d7e692a5871b3fe3dfd899987c793c20da.camel@gmail.com> (raw)
In-Reply-To: <20210209133110.7383-3-nikita.shubin@maquefel.me>
Hello Nikita!
On Tue, 2021-02-09 at 16:31 +0300, Nikita Shubin wrote:
> Fixes the following warnings which results in interrupts disabled on
> port B/F:
>
> gpio gpiochip1: (B): detected irqchip that is shared with multiple gpiochips: please fix the driver.
> gpio gpiochip5: (F): detected irqchip that is shared with multiple gpiochips: please fix the driver.
>
> - added separate irqchip for each interrupt capable gpiochip
> - provided unique names for each irqchip
>
> Fixes: d2b091961510 ("gpio: ep93xx: Pass irqchip when adding gpiochip")
> Signed-off-by: Nikita Shubin <nikita.shubin@maquefel.me>
Tested-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
> ---
> v5->v6:
> - add devm_kasprintf() return value check and move it out from
> ep93xx_init_irq_chip()
> - removed ep93xx_gpio_irq_chip
> - pass girq->chip instead of removed ep93xx_gpio_irq_chip to
> irq_set_chip_and_handler for port F
> ---
> drivers/gpio/gpio-ep93xx.c | 30 +++++++++++++++++++-----------
> 1 file changed, 19 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpio/gpio-ep93xx.c b/drivers/gpio/gpio-ep93xx.c
> index 64d6c2b4282e..94d9fa0d6aa7 100644
> --- a/drivers/gpio/gpio-ep93xx.c
> +++ b/drivers/gpio/gpio-ep93xx.c
> @@ -38,6 +38,7 @@
> #define EP93XX_GPIO_F_IRQ_BASE 80
>
> struct ep93xx_gpio_irq_chip {
> + struct irq_chip ic;
> u8 irq_offset;
> u8 int_unmasked;
> u8 int_enabled;
> @@ -263,15 +264,6 @@ static int ep93xx_gpio_irq_type(struct irq_data *d, unsigned int type)
> return 0;
> }
>
> -static struct irq_chip ep93xx_gpio_irq_chip = {
> - .name = "GPIO",
> - .irq_ack = ep93xx_gpio_irq_ack,
> - .irq_mask_ack = ep93xx_gpio_irq_mask_ack,
> - .irq_mask = ep93xx_gpio_irq_mask,
> - .irq_unmask = ep93xx_gpio_irq_unmask,
> - .irq_set_type = ep93xx_gpio_irq_type,
> -};
> -
> /*************************************************************************
> * gpiolib interface for EP93xx on-chip GPIOs
> *************************************************************************/
> @@ -331,6 +323,15 @@ static int ep93xx_gpio_f_to_irq(struct gpio_chip *gc, unsigned offset)
> return EP93XX_GPIO_F_IRQ_BASE + offset;
> }
>
> +static void ep93xx_init_irq_chip(struct device *dev, struct irq_chip *ic)
> +{
> + ic->irq_ack = ep93xx_gpio_irq_ack;
> + ic->irq_mask_ack = ep93xx_gpio_irq_mask_ack;
> + ic->irq_mask = ep93xx_gpio_irq_mask;
> + ic->irq_unmask = ep93xx_gpio_irq_unmask;
> + ic->irq_set_type = ep93xx_gpio_irq_type;
> +}
> +
> static int ep93xx_gpio_add_bank(struct ep93xx_gpio_chip *egc,
> struct platform_device *pdev,
> struct ep93xx_gpio *epg,
> @@ -352,6 +353,8 @@ static int ep93xx_gpio_add_bank(struct ep93xx_gpio_chip *egc,
>
> girq = &gc->irq;
> if (bank->has_irq || bank->has_hierarchical_irq) {
> + struct irq_chip *ic;
> +
> gc->set_config = ep93xx_gpio_set_config;
> egc->eic = devm_kcalloc(dev, 1,
> sizeof(*egc->eic),
> @@ -359,7 +362,12 @@ static int ep93xx_gpio_add_bank(struct ep93xx_gpio_chip *egc,
> if (!egc->eic)
> return -ENOMEM;
> egc->eic->irq_offset = bank->irq;
> - girq->chip = &ep93xx_gpio_irq_chip;
> + ic = &egc->eic->ic;
> + ic->name = devm_kasprintf(dev, GFP_KERNEL, "gpio-irq-%s", bank->label);
> + if (!ic->name)
> + return -ENOMEM;
> + ep93xx_init_irq_chip(dev, ic);
> + girq->chip = ic;
> }
>
> if (bank->has_irq) {
> @@ -401,7 +409,7 @@ static int ep93xx_gpio_add_bank(struct ep93xx_gpio_chip *egc,
> gpio_irq = EP93XX_GPIO_F_IRQ_BASE + i;
> irq_set_chip_data(gpio_irq, &epg->gc[5]);
> irq_set_chip_and_handler(gpio_irq,
> - &ep93xx_gpio_irq_chip,
> + girq->chip,
> handle_level_irq);
> irq_clear_status_flags(gpio_irq, IRQ_NOREQUEST);
> }
--
Alexander Sverdlin.
next prev parent reply other threads:[~2021-02-10 0:50 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-09 13:31 [PATCH v6 0/7] gpio: ep93xx: fixes series patch Nikita Shubin
2021-02-09 13:31 ` [PATCH v6 1/7] gpio: ep93xx: fix BUG_ON port F usage Nikita Shubin
2021-02-09 14:00 ` Andy Shevchenko
2021-02-09 13:31 ` [PATCH v6 2/7] gpio: ep93xx: Fix single irqchip with multi gpiochips Nikita Shubin
2021-02-09 22:03 ` Alexander Sverdlin [this message]
2021-02-09 13:31 ` [PATCH v6 3/7] gpio: ep93xx: Fix wrong irq numbers in port F Nikita Shubin
2021-02-09 13:31 ` [PATCH v6 4/7] gpio: ep93xx: drop to_irq binding Nikita Shubin
2021-02-09 13:31 ` [PATCH v6 5/7] gpio: ep93xx: Fix typo s/hierarchial/hierarchical Nikita Shubin
2021-02-09 13:31 ` [PATCH v6 6/7] gpio: ep93xx: refactor ep93xx_gpio_add_bank Nikita Shubin
2021-02-09 13:31 ` [PATCH v6 7/7] gpio: ep93xx: refactor base IRQ number Nikita Shubin
2021-02-09 14:02 ` [PATCH v6 0/7] gpio: ep93xx: fixes series patch Andy Shevchenko
2021-02-10 13:50 ` Bartosz Golaszewski
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=223de0d7e692a5871b3fe3dfd899987c793c20da.camel@gmail.com \
--to=alexander.sverdlin@gmail.com \
--cc=andy.shevchenko@gmail.com \
--cc=bgolaszewski@baylibre.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nikita.shubin@maquefel.me \
/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).