From: "Andrew Jeffery" <andrew@aj.id.au>
To: "Linus Walleij" <linus.walleij@linaro.org>, linux-gpio@vger.kernel.org
Cc: "Bartosz Golaszewski" <bgolaszewski@baylibre.com>,
"Joel Stanley" <joel@jms.id.au>,
"Benjamin Herrenschmidt" <benh@kernel.crashing.org>,
"Thierry Reding" <treding@nvidia.com>
Subject: Re: [PATCH] gpio: aspeed: Pass irqchip when adding gpiochip
Date: Tue, 13 Aug 2019 14:06:36 +0930 [thread overview]
Message-ID: <9939c72e-771f-4247-a691-caef8e5100e7@www.fastmail.com> (raw)
In-Reply-To: <20190809125515.19094-1-linus.walleij@linaro.org>
On Fri, 9 Aug 2019, at 22:25, Linus Walleij wrote:
> We need to convert all old gpio irqchips to pass the irqchip
> setup along when adding the gpio_chip. For more info see
> drivers/gpio/TODO.
>
> For chained irqchips this is a pretty straight-forward
> conversion.
>
> Cc: Joel Stanley <joel@jms.id.au>
> Cc: Andrew Jeffery <andrew@aj.id.au>
> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> Cc: Thierry Reding <treding@nvidia.com>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> Hi Aspeed folks, it'd be great if you could test/review this
> patch.
Used it to exercise our WIP GPIO model for qemu. After fixing the qemu bugs it
worked fine there. Booted it on a Witherspoon and things worked as expected
there too. From a brief inspection it looks fine to me.
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Tested-by: Andrew Jeffery <andrew@aj.id.au>
> ---
> drivers/gpio/gpio-aspeed.c | 60 ++++++++++++++++++--------------------
> 1 file changed, 29 insertions(+), 31 deletions(-)
>
> diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c
> index 13d80bfbc3b6..9defe25d4721 100644
> --- a/drivers/gpio/gpio-aspeed.c
> +++ b/drivers/gpio/gpio-aspeed.c
> @@ -711,32 +711,6 @@ static void set_irq_valid_mask(struct aspeed_gpio *gpio)
> }
> }
>
> -static int aspeed_gpio_setup_irqs(struct aspeed_gpio *gpio,
> - struct platform_device *pdev)
> -{
> - int rc;
> -
> - rc = platform_get_irq(pdev, 0);
> - if (rc < 0)
> - return rc;
> -
> - gpio->irq = rc;
> -
> - set_irq_valid_mask(gpio);
> -
> - rc = gpiochip_irqchip_add(&gpio->chip, &aspeed_gpio_irqchip,
> - 0, handle_bad_irq, IRQ_TYPE_NONE);
> - if (rc) {
> - dev_info(&pdev->dev, "Could not add irqchip\n");
> - return rc;
> - }
> -
> - gpiochip_set_chained_irqchip(&gpio->chip, &aspeed_gpio_irqchip,
> - gpio->irq, aspeed_gpio_irq_handler);
> -
> - return 0;
> -}
> -
> static int aspeed_gpio_reset_tolerance(struct gpio_chip *chip,
> unsigned int offset, bool enable)
> {
> @@ -1189,7 +1163,6 @@ static int __init aspeed_gpio_probe(struct
> platform_device *pdev)
> gpio->chip.set_config = aspeed_gpio_set_config;
> gpio->chip.label = dev_name(&pdev->dev);
> gpio->chip.base = -1;
> - gpio->chip.irq.need_valid_mask = true;
>
> /* Allocate a cache of the output registers */
> banks = gpio->config->nr_gpios >> 5;
> @@ -1212,16 +1185,41 @@ static int __init aspeed_gpio_probe(struct
> platform_device *pdev)
> aspeed_gpio_change_cmd_source(gpio, bank, 3, GPIO_CMDSRC_ARM);
> }
>
> - rc = devm_gpiochip_add_data(&pdev->dev, &gpio->chip, gpio);
> - if (rc < 0)
> - return rc;
> + /* Optionally set up an irqchip if there is an IRQ */
> + rc = platform_get_irq(pdev, 0);
> + if (rc > 0) {
> + struct gpio_irq_chip *girq;
> +
> + gpio->irq = rc;
> + girq = &gpio->chip.irq;
> + girq->chip = &aspeed_gpio_irqchip;
> + girq->parent_handler = aspeed_gpio_irq_handler;
> + girq->num_parents = 1;
> + girq->parents = devm_kcalloc(&pdev->dev, 1,
> + sizeof(*girq->parents),
> + GFP_KERNEL);
> + if (!girq->parents)
> + return -ENOMEM;
> + girq->parents[0] = gpio->irq;
> + girq->default_type = IRQ_TYPE_NONE;
> + girq->handler = handle_bad_irq;
> + girq->need_valid_mask = true;
> + }
>
> gpio->offset_timer =
> devm_kzalloc(&pdev->dev, gpio->chip.ngpio, GFP_KERNEL);
> if (!gpio->offset_timer)
> return -ENOMEM;
>
> - return aspeed_gpio_setup_irqs(gpio, pdev);
> + rc = devm_gpiochip_add_data(&pdev->dev, &gpio->chip, gpio);
> + if (rc < 0)
> + return rc;
> +
> + /* Now the valid mask is allocated */
> + if (gpio->irq)
> + set_irq_valid_mask(gpio);
> +
> + return 0;
> }
>
> static struct platform_driver aspeed_gpio_driver = {
> --
> 2.21.0
>
>
next prev parent reply other threads:[~2019-08-13 4:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-09 12:55 [PATCH] gpio: aspeed: Pass irqchip when adding gpiochip Linus Walleij
2019-08-13 4:36 ` Andrew Jeffery [this message]
2019-08-13 4:44 ` Joel Stanley
2019-08-15 8:01 ` 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=9939c72e-771f-4247-a691-caef8e5100e7@www.fastmail.com \
--to=andrew@aj.id.au \
--cc=benh@kernel.crashing.org \
--cc=bgolaszewski@baylibre.com \
--cc=joel@jms.id.au \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=treding@nvidia.com \
/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).