In message: [linux-yocto][v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc][PATCH] gpio: zynq: fix zynqmp_gpio not an immutable chip warning on 17/08/2023 [email protected] wrote:
> From: Manikanta Guntupalli <[email protected]> > > commit f5691439353783ef114876849c70d2a641e09498 upstream. > > Make the struct irq_chip const and flag it as IRQCHIP_IMMUTABLE, > call gpiochip_disable_irq() in the .irq_mask() callback and > gpiochip_enable_irq() in the .irq_unmask() callback to fix > "gpio gpiochip1: (zynqmp_gpio): not an immutable chip" warning. > > Signed-off-by: Manikanta Guntupalli <[email protected]> > Reviewed-by: Linus Walleij <[email protected]> > Signed-off-by: Bartosz Golaszewski <[email protected]> > --- > Hi Bruce, > Would you please help merge this patch to the branches: > v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc > v6.1/standard/sdkv6.1/xlnx-soc merged. Bruce > Thanks, > Quanyang > --- > drivers/gpio/gpio-zynq.c | 22 +++++++++++++++------- > 1 file changed, 15 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpio/gpio-zynq.c b/drivers/gpio/gpio-zynq.c > index 06c6401f02b89..c334e46033bae 100644 > --- a/drivers/gpio/gpio-zynq.c > +++ b/drivers/gpio/gpio-zynq.c > @@ -151,8 +151,8 @@ struct zynq_platform_data { > int bank_max[ZYNQMP_GPIO_MAX_BANK]; > }; > > -static struct irq_chip zynq_gpio_level_irqchip; > -static struct irq_chip zynq_gpio_edge_irqchip; > +static const struct irq_chip zynq_gpio_level_irqchip; > +static const struct irq_chip zynq_gpio_edge_irqchip; > > /** > * zynq_gpio_is_zynq - test if HW is zynq or zynqmp > @@ -404,9 +404,12 @@ static int zynq_gpio_get_direction(struct gpio_chip > *chip, unsigned int pin) > static void zynq_gpio_irq_mask(struct irq_data *irq_data) > { > unsigned int device_pin_num, bank_num, bank_pin_num; > + const unsigned long offset = irqd_to_hwirq(irq_data); > + struct gpio_chip *chip = irq_data_get_irq_chip_data(irq_data); > struct zynq_gpio *gpio = > gpiochip_get_data(irq_data_get_irq_chip_data(irq_data)); > > + gpiochip_disable_irq(chip, offset); > device_pin_num = irq_data->hwirq; > zynq_gpio_get_bank_pin(device_pin_num, &bank_num, &bank_pin_num, gpio); > writel_relaxed(BIT(bank_pin_num), > @@ -425,9 +428,12 @@ static void zynq_gpio_irq_mask(struct irq_data *irq_data) > static void zynq_gpio_irq_unmask(struct irq_data *irq_data) > { > unsigned int device_pin_num, bank_num, bank_pin_num; > + const unsigned long offset = irqd_to_hwirq(irq_data); > + struct gpio_chip *chip = irq_data_get_irq_chip_data(irq_data); > struct zynq_gpio *gpio = > gpiochip_get_data(irq_data_get_irq_chip_data(irq_data)); > > + gpiochip_enable_irq(chip, offset); > device_pin_num = irq_data->hwirq; > zynq_gpio_get_bank_pin(device_pin_num, &bank_num, &bank_pin_num, gpio); > writel_relaxed(BIT(bank_pin_num), > @@ -590,7 +596,7 @@ static void zynq_gpio_irq_relres(struct irq_data *d) > } > > /* irq chip descriptor */ > -static struct irq_chip zynq_gpio_level_irqchip = { > +static const struct irq_chip zynq_gpio_level_irqchip = { > .name = DRIVER_NAME, > .irq_enable = zynq_gpio_irq_enable, > .irq_eoi = zynq_gpio_irq_ack, > @@ -601,10 +607,11 @@ static struct irq_chip zynq_gpio_level_irqchip = { > .irq_request_resources = zynq_gpio_irq_reqres, > .irq_release_resources = zynq_gpio_irq_relres, > .flags = IRQCHIP_EOI_THREADED | IRQCHIP_EOI_IF_HANDLED | > - IRQCHIP_MASK_ON_SUSPEND, > + IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_IMMUTABLE, > + GPIOCHIP_IRQ_RESOURCE_HELPERS, > }; > > -static struct irq_chip zynq_gpio_edge_irqchip = { > +static const struct irq_chip zynq_gpio_edge_irqchip = { > .name = DRIVER_NAME, > .irq_enable = zynq_gpio_irq_enable, > .irq_ack = zynq_gpio_irq_ack, > @@ -614,7 +621,8 @@ static struct irq_chip zynq_gpio_edge_irqchip = { > .irq_set_wake = zynq_gpio_set_wake, > .irq_request_resources = zynq_gpio_irq_reqres, > .irq_release_resources = zynq_gpio_irq_relres, > - .flags = IRQCHIP_MASK_ON_SUSPEND, > + .flags = IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_IMMUTABLE, > + GPIOCHIP_IRQ_RESOURCE_HELPERS, > }; > > static void zynq_gpio_handle_bank_irq(struct zynq_gpio *gpio, > @@ -962,7 +970,7 @@ static int zynq_gpio_probe(struct platform_device *pdev) > > /* Set up the GPIO irqchip */ > girq = &chip->irq; > - girq->chip = &zynq_gpio_edge_irqchip; > + gpio_irq_chip_set_chip(girq, &zynq_gpio_edge_irqchip); > girq->parent_handler = zynq_gpio_irqhandler; > girq->num_parents = 1; > girq->parents = devm_kcalloc(&pdev->dev, 1, > -- > 2.36.1 >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#12988): https://lists.yoctoproject.org/g/linux-yocto/message/12988 Mute This Topic: https://lists.yoctoproject.org/mt/100792612/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/leave/6687884/21656/624485779/xyzzy [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
