From: Ferry Toth <fntoth@gmail.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Linux GPIO <linux-gpio@vger.kernel.org>
Cc: Linus Walleij <linus.walleij@linaro.org>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: Re: [PATCH 5/5] gpio: merrifield: Move hardware initialization to callback
Date: Fri, 11 Oct 2019 18:23:36 +0200 [thread overview]
Message-ID: <d8e63299-55f2-6704-cb04-b49e232b5db6@gmail.com> (raw)
In-Reply-To: <20191009165056.76580-6-andriy.shevchenko@linux.intel.com>
Op 09-10-19 om 18:50 schreef Andy Shevchenko:
> The driver wants to initialize related registers before IRQ chip will be added.
> That's why move it to a corresponding callback. It also fixes the NULL pointer
> dereference.
>
> Fixes: 8f86a5b4ad67 ("gpio: merrifield: Pass irqchip when adding gpiochip")
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Fixes boot when applied to 5.4-rc2
Tested-by: Ferry Toth <fntoth@gmail.com>
> ---
> drivers/gpio/gpio-merrifield.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpio/gpio-merrifield.c b/drivers/gpio/gpio-merrifield.c
> index 9596024c9161..2f1e9da81c1e 100644
> --- a/drivers/gpio/gpio-merrifield.c
> +++ b/drivers/gpio/gpio-merrifield.c
> @@ -362,8 +362,9 @@ static void mrfld_irq_handler(struct irq_desc *desc)
> chained_irq_exit(irqchip, desc);
> }
>
> -static void mrfld_irq_init_hw(struct mrfld_gpio *priv)
> +static int mrfld_irq_init_hw(struct gpio_chip *chip)
> {
> + struct mrfld_gpio *priv = gpiochip_get_data(chip);
> void __iomem *reg;
> unsigned int base;
>
> @@ -375,6 +376,8 @@ static void mrfld_irq_init_hw(struct mrfld_gpio *priv)
> reg = gpio_reg(&priv->chip, base, GFER);
> writel(0, reg);
> }
> +
> + return 0;
> }
>
> static const char *mrfld_gpio_get_pinctrl_dev_name(struct mrfld_gpio *priv)
> @@ -447,6 +450,7 @@ static int mrfld_gpio_probe(struct pci_dev *pdev, const struct pci_device_id *id
>
> girq = &priv->chip.irq;
> girq->chip = &mrfld_irqchip;
> + girq->init_hw = mrfld_irq_init_hw;
> girq->parent_handler = mrfld_irq_handler;
> girq->num_parents = 1;
> girq->parents = devm_kcalloc(&pdev->dev, girq->num_parents,
> @@ -459,8 +463,6 @@ static int mrfld_gpio_probe(struct pci_dev *pdev, const struct pci_device_id *id
> girq->default_type = IRQ_TYPE_NONE;
> girq->handler = handle_bad_irq;
>
> - mrfld_irq_init_hw(priv);
> -
> pci_set_drvdata(pdev, priv);
> retval = devm_gpiochip_add_data(&pdev->dev, &priv->chip, priv);
> if (retval) {
>
next prev parent reply other threads:[~2019-10-11 16:39 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-09 16:50 [GIT PULL] intel-gpio for 5.4-2 Andy Shevchenko
2019-10-09 16:50 ` [PATCH 1/5] gpio: merrifield: Restore use of irq_base Andy Shevchenko
2019-10-11 16:21 ` Ferry Toth
2019-10-09 16:50 ` [PATCH 2/5] gpiolib: Initialize the hardware with a callback Andy Shevchenko
2019-10-09 19:44 ` Hans de Goede
2019-10-10 7:23 ` Andy Shevchenko
2019-10-10 7:26 ` Andy Shevchenko
2019-10-10 7:41 ` Hans de Goede
2019-10-10 23:18 ` Linus Walleij
2019-10-09 16:50 ` [PATCH 3/5] gpio: intel-mid: Move hardware initialization to callback Andy Shevchenko
2019-10-09 16:50 ` [PATCH 4/5] gpio: lynxpoint: " Andy Shevchenko
2019-10-09 16:50 ` [PATCH 5/5] gpio: merrifield: " Andy Shevchenko
2019-10-11 16:23 ` Ferry Toth [this message]
2019-10-10 23:22 ` [GIT PULL] intel-gpio for 5.4-2 Linus Walleij
2019-10-11 8:35 ` Andy Shevchenko
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=d8e63299-55f2-6704-cb04-b49e232b5db6@gmail.com \
--to=fntoth@gmail.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=bgolaszewski@baylibre.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
/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).