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 v2 7/9] gpio: ep93xx: separate IRQ's setup
Date: Wed, 27 Jan 2021 21:48:31 +0100 [thread overview]
Message-ID: <ab96a1a58e1f7037e6d43491f1e0f698d0390296.camel@gmail.com> (raw)
In-Reply-To: <20210127104617.1173-8-nikita.shubin@maquefel.me>
Hello Nikita,
On Wed, 2021-01-27 at 13:46 +0300, Nikita Shubin wrote:
> Separate IRQ's setup for port A,B,F.
Somehow I don't feel that moving "FIXME" code around makes much
sense. Maybe the anticipated conversion to hierarhical IRQ chip
will result in a cleanup automatically?
> Signed-off-by: Nikita Shubin <nikita.shubin@maquefel.me>
> ---
> drivers/gpio/gpio-ep93xx.c | 104 +++++++++++++++++++++++------------
> --
> 1 file changed, 64 insertions(+), 40 deletions(-)
>
> diff --git a/drivers/gpio/gpio-ep93xx.c b/drivers/gpio/gpio-ep93xx.c
> index e4270b4e5f26..b212c007240e 100644
> --- a/drivers/gpio/gpio-ep93xx.c
> +++ b/drivers/gpio/gpio-ep93xx.c
> @@ -353,6 +353,64 @@ static void ep93xx_init_irq_chips(struct
> ep93xx_gpio *epg)
> }
> }
>
> +static int ep93xx_gpio_add_ab_irq_chip(struct platform_device *pdev,
> + struct gpio_irq_chip *girq,
> + unsigned int irq_base)
> +{
> + struct device *dev = &pdev->dev;
> + int ab_parent_irq = platform_get_irq(pdev, 0);
> +
> + girq->parent_handler = ep93xx_gpio_ab_irq_handler;
> + girq->num_parents = 1;
> + girq->parents = devm_kcalloc(dev, girq->num_parents,
> + sizeof(*girq->parents),
> + GFP_KERNEL);
> + if (!girq->parents)
> + return -ENOMEM;
> + girq->default_type = IRQ_TYPE_NONE;
> + girq->handler = handle_level_irq;
> + girq->parents[0] = ab_parent_irq;
> + girq->first = irq_base;
> +
> + return 0;
> +}
> +
> +static int ep93xx_gpio_add_f_irq_chip(struct platform_device *pdev,
> + struct gpio_irq_chip *girq,
> + unsigned int irq_base)
> +{
> + int gpio_irq;
> + int i;
> + struct device *dev = &pdev->dev;
> +
> + /*
> + * FIXME: convert this to use hierarchical IRQ support!
> + * this requires fixing the root irqchip to be hierarchical.
> + */
> + girq->parent_handler = ep93xx_gpio_f_irq_handler;
> + girq->num_parents = 8;
> + girq->parents = devm_kcalloc(dev, girq->num_parents,
> + sizeof(*girq->parents),
> + GFP_KERNEL);
> + if (!girq->parents)
> + return -ENOMEM;
> + /* Pick resources 1..8 for these IRQs */
> + for (i = 0; i < ARRAY_SIZE(girq->parents); i++) {
> + girq->parents[i] = platform_get_irq(pdev, i + 1);
> + gpio_irq = irq_base + i;
> + irq_set_chip_data(gpio_irq, &epg->gc[5]);
> + irq_set_chip_and_handler(gpio_irq,
> + &ep93xx_gpio_irq_chip,
> + handle_level_irq);
> + irq_clear_status_flags(gpio_irq, IRQ_NOREQUEST);
> + }
> + girq->default_type = IRQ_TYPE_NONE;
> + girq->handler = handle_level_irq;
> + girq->first = irq_base;
> +
> + return 0;
> +}
> +
> static int ep93xx_gpio_add_bank(struct gpio_chip *gc,
> struct platform_device *pdev,
> struct ep93xx_gpio *epg,
> @@ -380,50 +438,16 @@ static int ep93xx_gpio_add_bank(struct
> gpio_chip *gc,
> }
>
> if (bank->has_irq) {
> - int ab_parent_irq = platform_get_irq(pdev, 0);
> -
> - girq->parent_handler = ep93xx_gpio_ab_irq_handler;
> - girq->num_parents = 1;
> - girq->parents = devm_kcalloc(dev, girq->num_parents,
> - sizeof(*girq->parents),
> - GFP_KERNEL);
> - if (!girq->parents)
> - return -ENOMEM;
> - girq->default_type = IRQ_TYPE_NONE;
> - girq->handler = handle_level_irq;
> - girq->parents[0] = ab_parent_irq;
> - girq->first = bank->irq_base;
> + err = ep93xx_gpio_add_ab_irq_chip(pdev, girq, bank-
> >irq_base);
> + if (err)
> + return err;
> }
>
> /* Only bank F has especially funky IRQ handling */
> if (bank->has_hierarchical_irq) {
> - int gpio_irq;
> - int i;
> -
> - /*
> - * FIXME: convert this to use hierarchical IRQ
> support!
> - * this requires fixing the root irqchip to be
> hierarchical.
> - */
> - girq->parent_handler = ep93xx_gpio_f_irq_handler;
> - girq->num_parents = 8;
> - girq->parents = devm_kcalloc(dev, girq->num_parents,
> - sizeof(*girq->parents),
> - GFP_KERNEL);
> - if (!girq->parents)
> - return -ENOMEM;
> - /* Pick resources 1..8 for these IRQs */
> - for (i = 0; i < ARRAY_SIZE(girq->parents); i++) {
> - girq->parents[i] = platform_get_irq(pdev, i +
> 1);
> - 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,
> - handle_level_irq);
> - irq_clear_status_flags(gpio_irq,
> IRQ_NOREQUEST);
> - }
> - girq->default_type = IRQ_TYPE_NONE;
> - girq->handler = handle_level_irq;
> - girq->first = EP93XX_GPIO_F_IRQ_BASE;
> + err = ep93xx_gpio_add_f_irq_chip(pdev, girq,
> EP93XX_GPIO_F_IRQ_BASE);
> + if (err)
> + return err;
> }
>
> return devm_gpiochip_add_data(dev, gc, epg);
--
Alexander Sverdlin.
next prev parent reply other threads:[~2021-01-27 20:49 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-28 15:00 [PATCH] gpiolib: warning on gpiochip->to_irq defined Nikita Shubin
2021-01-04 14:15 ` Bartosz Golaszewski
2021-01-18 9:05 ` [PATCH v2] " Nikita Shubin
2021-01-19 10:51 ` Bartosz Golaszewski
2021-01-27 10:46 ` [PATCH v2 0/9] gpio: ep93xx: fixes series patch Nikita Shubin
2021-01-27 10:46 ` [PATCH v2 1/9] gpio: ep93xx: fix BUG_ON port F usage Nikita Shubin
2021-01-27 10:46 ` [PATCH v2 2/9] gpio: ep93xx: Fix single irqchip with multi gpiochips Nikita Shubin
2021-01-27 21:39 ` Alexander Sverdlin
2021-01-28 10:17 ` Alexander Sverdlin
2021-01-27 10:46 ` [PATCH v2 3/9] gpio: ep93xx: Fix wrong irq numbers in port F Nikita Shubin
2021-01-27 21:50 ` Linus Walleij
2021-01-28 10:15 ` Alexander Sverdlin
2021-01-27 10:46 ` [PATCH v2 4/9] gpio: ep93xx: drop to_irq binding Nikita Shubin
2021-01-27 12:21 ` Alexander Sverdlin
2021-01-27 10:46 ` [PATCH v2 5/9] gpio: ep93xx: Fix typo s/hierarchial/hierarchical Nikita Shubin
2021-01-27 13:20 ` Alexander Sverdlin
2021-01-27 10:46 ` [PATCH v2 6/9] gpio: ep93xx: refactor ep93xx_gpio_add_bank Nikita Shubin
2021-01-27 13:24 ` Alexander Sverdlin
2021-01-27 10:46 ` [PATCH v2 7/9] gpio: ep93xx: separate IRQ's setup Nikita Shubin
2021-01-27 20:48 ` Alexander Sverdlin [this message]
2021-01-27 10:46 ` [PATCH v2 8/9] gpio: ep93xx: refactor base IRQ number Nikita Shubin
2021-01-27 11:36 ` Alexander Sverdlin
2021-01-27 10:46 ` [PATCH v2 9/9] gpio: ep93xx: replace bools with idx for IRQ ports Nikita Shubin
2021-01-27 11:34 ` Alexander Sverdlin
2021-01-27 21:54 ` [PATCH v2 0/9] gpio: ep93xx: fixes series patch Linus Walleij
2021-01-28 10:19 ` Alexander Sverdlin
2021-01-28 11:57 ` 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=ab96a1a58e1f7037e6d43491f1e0f698d0390296.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).