Message ID | 20220830092232.168561-1-manivannan.sadhasivam@linaro.org |
---|---|
State | New |
Headers | show |
Series | [v3] pinctrl: qcom: spmi-gpio: Make irqchip immutable | expand |
On Tue, Aug 30, 2022 at 02:52:32PM +0530, Manivannan Sadhasivam wrote: > The irqchip implementation used inside the gpiochips are not supposed to > be changed during runtime. So let's make the one inside the spmi-gpio > gpiochip immutable. > > This fixes the below warning during boot: > gpio gpiochip0: (c440000.spmi:pmic@0:gpio@c000): not an immutable chip, please consider fixing it! > > Acked-by: Marc Zyngier <maz@kernel.org> > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > --- > > Changes in v3: > > * Added Ack from Marc > * Removed the text that was mimicking the documentation > > Changes in v2: > > * Added new callbacks for irq_{mask/unmask} for masking/unmasking the parent > IRQ that was missing in v1. (Thanks to Marc) > * Modified the commit message accordingly. > > drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 38 +++++++++++++++++------- > 1 file changed, 28 insertions(+), 10 deletions(-) > > diff --git a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c > index ccaf40a9c0e6..d40e3b2d38cc 100644 > --- a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c > +++ b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c > @@ -985,6 +984,33 @@ static int pmic_gpio_populate_parent_fwspec(struct gpio_chip *chip, > return 0; > } > > +static void pmic_gpio_irq_mask(struct irq_data *data) > +{ > + struct gpio_chip *gc = irq_data_get_irq_chip_data(data); > + > + irq_chip_mask_parent(data); > + gpiochip_disable_irq(gc, data->hwirq); > +} > + > +static void pmic_gpio_irq_unmask(struct irq_data *data) > +{ > + struct gpio_chip *gc = irq_data_get_irq_chip_data(data); > + > + irq_chip_unmask_parent(data); > + gpiochip_enable_irq(gc, data->hwirq); Could you set the IRQ-enabled flag before unmasking the parent here for symmetry (and as most other implementations do)? > +} Other than that, looks good: Reviewed-by: Johan Hovold <johan+linaro@kernel.org> Johan
On Tue, Aug 30, 2022 at 2:08 PM Johan Hovold <johan@kernel.org> wrote: > > + irq_chip_unmask_parent(data); > > + gpiochip_enable_irq(gc, data->hwirq); > > Could you set the IRQ-enabled flag before unmasking the parent here for > symmetry (and as most other implementations do)? I fixed this up while applying so no need to resend. Patch applied! Yours, Linus Walleij
diff --git a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c index ccaf40a9c0e6..d40e3b2d38cc 100644 --- a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c +++ b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c @@ -171,7 +171,6 @@ struct pmic_gpio_state { struct regmap *map; struct pinctrl_dev *ctrl; struct gpio_chip chip; - struct irq_chip irq; u8 usid; u8 pid_base; }; @@ -985,6 +984,33 @@ static int pmic_gpio_populate_parent_fwspec(struct gpio_chip *chip, return 0; } +static void pmic_gpio_irq_mask(struct irq_data *data) +{ + struct gpio_chip *gc = irq_data_get_irq_chip_data(data); + + irq_chip_mask_parent(data); + gpiochip_disable_irq(gc, data->hwirq); +} + +static void pmic_gpio_irq_unmask(struct irq_data *data) +{ + struct gpio_chip *gc = irq_data_get_irq_chip_data(data); + + irq_chip_unmask_parent(data); + gpiochip_enable_irq(gc, data->hwirq); +} + +static const struct irq_chip spmi_gpio_irq_chip = { + .name = "spmi-gpio", + .irq_ack = irq_chip_ack_parent, + .irq_mask = pmic_gpio_irq_mask, + .irq_unmask = pmic_gpio_irq_unmask, + .irq_set_type = irq_chip_set_type_parent, + .irq_set_wake = irq_chip_set_wake_parent, + .flags = IRQCHIP_IMMUTABLE | IRQCHIP_MASK_ON_SUSPEND, + GPIOCHIP_IRQ_RESOURCE_HELPERS, +}; + static int pmic_gpio_probe(struct platform_device *pdev) { struct irq_domain *parent_domain; @@ -1078,16 +1104,8 @@ static int pmic_gpio_probe(struct platform_device *pdev) if (!parent_domain) return -ENXIO; - state->irq.name = "spmi-gpio", - state->irq.irq_ack = irq_chip_ack_parent, - state->irq.irq_mask = irq_chip_mask_parent, - state->irq.irq_unmask = irq_chip_unmask_parent, - state->irq.irq_set_type = irq_chip_set_type_parent, - state->irq.irq_set_wake = irq_chip_set_wake_parent, - state->irq.flags = IRQCHIP_MASK_ON_SUSPEND, - girq = &state->chip.irq; - girq->chip = &state->irq; + gpio_irq_chip_set_chip(girq, &spmi_gpio_irq_chip); girq->default_type = IRQ_TYPE_NONE; girq->handler = handle_level_irq; girq->fwnode = of_node_to_fwnode(state->dev->of_node);