| Message ID | 20220504144406.36744-1-jonathanh@nvidia.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [V2] gpio: max77620: Make the irqchip immutable | expand |
On Wed, 04 May 2022 15:44:06 +0100, Jon Hunter <jonathanh@nvidia.com> wrote: > > Commit 6c846d026d49 ("gpio: Don't fiddle with irqchips marked as > immutable") added a warning to indicate if the gpiolib is altering the > internals of irqchips. Following this change the following warning is > now observed for the max77620 gpio driver ... > > WARNING KERN gpio gpiochip0: (max77620-gpio): not an immutable chip, > please consider fixing it! > > Fix the above warning by making the max77620 gpio driver immutable. > > Signed-off-by: Jon Hunter <jonathanh@nvidia.com> Reviewed-by: Marc Zyngier <maz@kernel.org> M.
On Wed, May 4, 2022 at 4:44 PM Jon Hunter <jonathanh@nvidia.com> wrote: > > Commit 6c846d026d49 ("gpio: Don't fiddle with irqchips marked as > immutable") added a warning to indicate if the gpiolib is altering the > internals of irqchips. Following this change the following warning is > now observed for the max77620 gpio driver ... > > WARNING KERN gpio gpiochip0: (max77620-gpio): not an immutable chip, > please consider fixing it! > > Fix the above warning by making the max77620 gpio driver immutable. > > Signed-off-by: Jon Hunter <jonathanh@nvidia.com> > --- Queued for fixes, thanks! Bart
On 2022-05-05 13:42, Bartosz Golaszewski wrote: > On Wed, May 4, 2022 at 4:44 PM Jon Hunter <jonathanh@nvidia.com> wrote: >> >> Commit 6c846d026d49 ("gpio: Don't fiddle with irqchips marked as >> immutable") added a warning to indicate if the gpiolib is altering the >> internals of irqchips. Following this change the following warning is >> now observed for the max77620 gpio driver ... >> >> WARNING KERN gpio gpiochip0: (max77620-gpio): not an immutable chip, >> please consider fixing it! >> >> Fix the above warning by making the max77620 gpio driver immutable. >> >> Signed-off-by: Jon Hunter <jonathanh@nvidia.com> >> --- > > Queued for fixes, thanks! You mean fixes for *5.19*, right? Thanks, M.
On Thu, May 5, 2022 at 2:54 PM Marc Zyngier <maz@kernel.org> wrote: > > On 2022-05-05 13:42, Bartosz Golaszewski wrote: > > On Wed, May 4, 2022 at 4:44 PM Jon Hunter <jonathanh@nvidia.com> wrote: > >> > >> Commit 6c846d026d49 ("gpio: Don't fiddle with irqchips marked as > >> immutable") added a warning to indicate if the gpiolib is altering the > >> internals of irqchips. Following this change the following warning is > >> now observed for the max77620 gpio driver ... > >> > >> WARNING KERN gpio gpiochip0: (max77620-gpio): not an immutable chip, > >> please consider fixing it! > >> > >> Fix the above warning by making the max77620 gpio driver immutable. > >> > >> Signed-off-by: Jon Hunter <jonathanh@nvidia.com> > >> --- > > > > Queued for fixes, thanks! > > You mean fixes for *5.19*, right? > Of course I did. 100%. And I'll stick to this version. :) (Thanks for the heads-up!) Bart
diff --git a/drivers/gpio/gpio-max77620.c b/drivers/gpio/gpio-max77620.c index ebf9dea6546b..c18b60e39a94 100644 --- a/drivers/gpio/gpio-max77620.c +++ b/drivers/gpio/gpio-max77620.c @@ -54,6 +54,7 @@ static void max77620_gpio_irq_mask(struct irq_data *data) struct max77620_gpio *gpio = gpiochip_get_data(chip); gpio->irq_enabled[data->hwirq] = false; + gpiochip_disable_irq(chip, data->hwirq); } static void max77620_gpio_irq_unmask(struct irq_data *data) @@ -61,6 +62,7 @@ static void max77620_gpio_irq_unmask(struct irq_data *data) struct gpio_chip *chip = irq_data_get_irq_chip_data(data); struct max77620_gpio *gpio = gpiochip_get_data(chip); + gpiochip_enable_irq(chip, data->hwirq); gpio->irq_enabled[data->hwirq] = true; } @@ -119,14 +121,15 @@ static void max77620_gpio_bus_sync_unlock(struct irq_data *data) mutex_unlock(&gpio->buslock); } -static struct irq_chip max77620_gpio_irqchip = { +static const struct irq_chip max77620_gpio_irqchip = { .name = "max77620-gpio", .irq_mask = max77620_gpio_irq_mask, .irq_unmask = max77620_gpio_irq_unmask, .irq_set_type = max77620_gpio_set_irq_type, .irq_bus_lock = max77620_gpio_bus_lock, .irq_bus_sync_unlock = max77620_gpio_bus_sync_unlock, - .flags = IRQCHIP_MASK_ON_SUSPEND, + .flags = IRQCHIP_IMMUTABLE | IRQCHIP_MASK_ON_SUSPEND, + GPIOCHIP_IRQ_RESOURCE_HELPERS, }; static int max77620_gpio_dir_input(struct gpio_chip *gc, unsigned int offset) @@ -318,7 +321,7 @@ static int max77620_gpio_probe(struct platform_device *pdev) mgpio->gpio_chip.base = -1; girq = &mgpio->gpio_chip.irq; - girq->chip = &max77620_gpio_irqchip; + gpio_irq_chip_set_chip(girq, &max77620_gpio_irqchip); /* This will let us handle the parent IRQ in the driver */ girq->parent_handler = NULL; girq->num_parents = 0;
Commit 6c846d026d49 ("gpio: Don't fiddle with irqchips marked as immutable") added a warning to indicate if the gpiolib is altering the internals of irqchips. Following this change the following warning is now observed for the max77620 gpio driver ... WARNING KERN gpio gpiochip0: (max77620-gpio): not an immutable chip, please consider fixing it! Fix the above warning by making the max77620 gpio driver immutable. Signed-off-by: Jon Hunter <jonathanh@nvidia.com> --- Changes since V1: - Dropped irq_print_chip callback - Fixed up the irq_mask/unmask callbacks drivers/gpio/gpio-max77620.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)