linux-gpio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2 0/2] pinctrl: ingenic: Convert to immutable irq chip
@ 2022-06-17 12:28 Aidan MacDonald
  2022-06-17 12:28 ` [PATCH v2 1/2] pinctrl: ingenic: Use irqd_to_hwirq() Aidan MacDonald
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Aidan MacDonald @ 2022-06-17 12:28 UTC (permalink / raw)
  To: linus.walleij, paul
  Cc: maz, andy.shevchenko, linux-mips, linux-gpio, linux-kernel

Two cleanup patches for pinctrl-ingenic.

v2:
* Add print_chip callback to avoid changing /proc/interrupts output
* Add patch to use irqd_to_hwirq()

Aidan MacDonald (2):
  pinctrl: ingenic: Use irqd_to_hwirq()
  pinctrl: ingenic: Convert to immutable irq chip

 drivers/pinctrl/pinctrl-ingenic.c | 64 +++++++++++++++++++------------
 1 file changed, 40 insertions(+), 24 deletions(-)

-- 
2.35.1


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH v2 1/2] pinctrl: ingenic: Use irqd_to_hwirq()
  2022-06-17 12:28 [PATCH v2 0/2] pinctrl: ingenic: Convert to immutable irq chip Aidan MacDonald
@ 2022-06-17 12:28 ` Aidan MacDonald
  2022-06-17 16:09   ` Andy Shevchenko
  2022-06-17 12:28 ` [PATCH v2 2/2] pinctrl: ingenic: Convert to immutable irq chip Aidan MacDonald
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 7+ messages in thread
From: Aidan MacDonald @ 2022-06-17 12:28 UTC (permalink / raw)
  To: linus.walleij, paul
  Cc: maz, andy.shevchenko, linux-mips, linux-gpio, linux-kernel

Instead of accessing ->hwirq directly, use irqd_to_hwirq().

Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
---
 drivers/pinctrl/pinctrl-ingenic.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c
index 1ca11616db74..69e0d88665d3 100644
--- a/drivers/pinctrl/pinctrl-ingenic.c
+++ b/drivers/pinctrl/pinctrl-ingenic.c
@@ -3393,7 +3393,7 @@ static void ingenic_gpio_irq_mask(struct irq_data *irqd)
 {
 	struct gpio_chip *gc = irq_data_get_irq_chip_data(irqd);
 	struct ingenic_gpio_chip *jzgc = gpiochip_get_data(gc);
-	int irq = irqd->hwirq;
+	irq_hw_number_t irq = irqd_to_hwirq(irqd);
 
 	if (is_soc_or_above(jzgc->jzpc, ID_JZ4740))
 		ingenic_gpio_set_bit(jzgc, GPIO_MSK, irq, true);
@@ -3405,7 +3405,7 @@ static void ingenic_gpio_irq_unmask(struct irq_data *irqd)
 {
 	struct gpio_chip *gc = irq_data_get_irq_chip_data(irqd);
 	struct ingenic_gpio_chip *jzgc = gpiochip_get_data(gc);
-	int irq = irqd->hwirq;
+	irq_hw_number_t irq = irqd_to_hwirq(irqd);
 
 	if (is_soc_or_above(jzgc->jzpc, ID_JZ4740))
 		ingenic_gpio_set_bit(jzgc, GPIO_MSK, irq, false);
@@ -3417,7 +3417,7 @@ static void ingenic_gpio_irq_enable(struct irq_data *irqd)
 {
 	struct gpio_chip *gc = irq_data_get_irq_chip_data(irqd);
 	struct ingenic_gpio_chip *jzgc = gpiochip_get_data(gc);
-	int irq = irqd->hwirq;
+	irq_hw_number_t irq = irqd_to_hwirq(irqd);
 
 	if (is_soc_or_above(jzgc->jzpc, ID_JZ4770))
 		ingenic_gpio_set_bit(jzgc, JZ4770_GPIO_INT, irq, true);
@@ -3433,7 +3433,7 @@ static void ingenic_gpio_irq_disable(struct irq_data *irqd)
 {
 	struct gpio_chip *gc = irq_data_get_irq_chip_data(irqd);
 	struct ingenic_gpio_chip *jzgc = gpiochip_get_data(gc);
-	int irq = irqd->hwirq;
+	irq_hw_number_t irq = irqd_to_hwirq(irqd);
 
 	ingenic_gpio_irq_mask(irqd);
 
@@ -3449,7 +3449,7 @@ static void ingenic_gpio_irq_ack(struct irq_data *irqd)
 {
 	struct gpio_chip *gc = irq_data_get_irq_chip_data(irqd);
 	struct ingenic_gpio_chip *jzgc = gpiochip_get_data(gc);
-	int irq = irqd->hwirq;
+	irq_hw_number_t irq = irqd_to_hwirq(irqd);
 	bool high;
 
 	if ((irqd_get_trigger_type(irqd) == IRQ_TYPE_EDGE_BOTH) &&
@@ -3477,6 +3477,7 @@ static int ingenic_gpio_irq_set_type(struct irq_data *irqd, unsigned int type)
 {
 	struct gpio_chip *gc = irq_data_get_irq_chip_data(irqd);
 	struct ingenic_gpio_chip *jzgc = gpiochip_get_data(gc);
+	irq_hw_number_t irq = irqd_to_hwirq(irqd);
 
 	switch (type) {
 	case IRQ_TYPE_EDGE_BOTH:
@@ -3498,12 +3499,12 @@ static int ingenic_gpio_irq_set_type(struct irq_data *irqd, unsigned int type)
 		 * best we can do is to set up a single-edge interrupt and then
 		 * switch to the opposing edge when ACKing the interrupt.
 		 */
-		bool high = ingenic_gpio_get_value(jzgc, irqd->hwirq);
+		bool high = ingenic_gpio_get_value(jzgc, irq);
 
 		type = high ? IRQ_TYPE_LEVEL_LOW : IRQ_TYPE_LEVEL_HIGH;
 	}
 
-	irq_set_type(jzgc, irqd->hwirq, type);
+	irq_set_type(jzgc, irq, type);
 	return 0;
 }
 
@@ -3668,20 +3669,22 @@ static const struct pinctrl_ops ingenic_pctlops = {
 static int ingenic_gpio_irq_request(struct irq_data *data)
 {
 	struct gpio_chip *gpio_chip = irq_data_get_irq_chip_data(data);
+	irq_hw_number_t irq = irqd_to_hwirq(data);
 	int ret;
 
-	ret = ingenic_gpio_direction_input(gpio_chip, data->hwirq);
+	ret = ingenic_gpio_direction_input(gpio_chip, irq);
 	if (ret)
 		return ret;
 
-	return gpiochip_reqres_irq(gpio_chip, data->hwirq);
+	return gpiochip_reqres_irq(gpio_chip, irq);
 }
 
 static void ingenic_gpio_irq_release(struct irq_data *data)
 {
 	struct gpio_chip *gpio_chip = irq_data_get_irq_chip_data(data);
+	irq_hw_number_t irq = irqd_to_hwirq(data);
 
-	return gpiochip_relres_irq(gpio_chip, data->hwirq);
+	return gpiochip_relres_irq(gpio_chip, irq);
 }
 
 static int ingenic_pinmux_set_pin_fn(struct ingenic_pinctrl *jzpc,
-- 
2.35.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH v2 2/2] pinctrl: ingenic: Convert to immutable irq chip
  2022-06-17 12:28 [PATCH v2 0/2] pinctrl: ingenic: Convert to immutable irq chip Aidan MacDonald
  2022-06-17 12:28 ` [PATCH v2 1/2] pinctrl: ingenic: Use irqd_to_hwirq() Aidan MacDonald
@ 2022-06-17 12:28 ` Aidan MacDonald
  2022-06-17 16:11   ` Andy Shevchenko
  2022-06-17 12:57 ` [PATCH v2 0/2] " Marc Zyngier
  2022-06-17 13:58 ` Paul Cercueil
  3 siblings, 1 reply; 7+ messages in thread
From: Aidan MacDonald @ 2022-06-17 12:28 UTC (permalink / raw)
  To: linus.walleij, paul
  Cc: maz, andy.shevchenko, linux-mips, linux-gpio, linux-kernel

Update the driver to use an immutable IRQ chip to fix this warning:

    "not an immutable chip, please consider fixing it!"

Preserve per-chip labels by adding an irq_print_chip callback.

Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
---
 drivers/pinctrl/pinctrl-ingenic.c | 41 ++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c
index 69e0d88665d3..787a8daa400e 100644
--- a/drivers/pinctrl/pinctrl-ingenic.c
+++ b/drivers/pinctrl/pinctrl-ingenic.c
@@ -22,6 +22,7 @@
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
 #include <linux/slab.h>
+#include <linux/seq_file.h>
 
 #include "core.h"
 #include "pinconf.h"
@@ -135,7 +136,6 @@ struct ingenic_pinctrl {
 struct ingenic_gpio_chip {
 	struct ingenic_pinctrl *jzpc;
 	struct gpio_chip gc;
-	struct irq_chip irq_chip;
 	unsigned int irq, reg_base;
 };
 
@@ -3419,6 +3419,8 @@ static void ingenic_gpio_irq_enable(struct irq_data *irqd)
 	struct ingenic_gpio_chip *jzgc = gpiochip_get_data(gc);
 	irq_hw_number_t irq = irqd_to_hwirq(irqd);
 
+	gpiochip_enable_irq(gc, irq);
+
 	if (is_soc_or_above(jzgc->jzpc, ID_JZ4770))
 		ingenic_gpio_set_bit(jzgc, JZ4770_GPIO_INT, irq, true);
 	else if (is_soc_or_above(jzgc->jzpc, ID_JZ4740))
@@ -3443,6 +3445,8 @@ static void ingenic_gpio_irq_disable(struct irq_data *irqd)
 		ingenic_gpio_set_bit(jzgc, JZ4740_GPIO_SELECT, irq, false);
 	else
 		ingenic_gpio_set_bit(jzgc, JZ4730_GPIO_GPIER, irq, false);
+
+	gpiochip_disable_irq(gc, irq);
 }
 
 static void ingenic_gpio_irq_ack(struct irq_data *irqd)
@@ -3687,6 +3691,27 @@ static void ingenic_gpio_irq_release(struct irq_data *data)
 	return gpiochip_relres_irq(gpio_chip, irq);
 }
 
+static void ingenic_gpio_irq_print_chip(struct irq_data *data, struct seq_file *p)
+{
+	struct gpio_chip *gpio_chip = irq_data_get_irq_chip_data(data);
+
+	seq_printf(p, "%s", gpio_chip->label);
+}
+
+static const struct irq_chip ingenic_gpio_irqchip = {
+	.irq_enable		= ingenic_gpio_irq_enable,
+	.irq_disable		= ingenic_gpio_irq_disable,
+	.irq_unmask		= ingenic_gpio_irq_unmask,
+	.irq_mask		= ingenic_gpio_irq_mask,
+	.irq_ack		= ingenic_gpio_irq_ack,
+	.irq_set_type		= ingenic_gpio_irq_set_type,
+	.irq_set_wake		= ingenic_gpio_irq_set_wake,
+	.irq_request_resources	= ingenic_gpio_irq_request,
+	.irq_release_resources	= ingenic_gpio_irq_release,
+	.irq_print_chip		= ingenic_gpio_irq_print_chip,
+	.flags			= IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_IMMUTABLE,
+};
+
 static int ingenic_pinmux_set_pin_fn(struct ingenic_pinctrl *jzpc,
 		int pin, int func)
 {
@@ -4175,20 +4200,8 @@ static int __init ingenic_gpio_probe(struct ingenic_pinctrl *jzpc,
 	if (!jzgc->irq)
 		return -EINVAL;
 
-	jzgc->irq_chip.name = jzgc->gc.label;
-	jzgc->irq_chip.irq_enable = ingenic_gpio_irq_enable;
-	jzgc->irq_chip.irq_disable = ingenic_gpio_irq_disable;
-	jzgc->irq_chip.irq_unmask = ingenic_gpio_irq_unmask;
-	jzgc->irq_chip.irq_mask = ingenic_gpio_irq_mask;
-	jzgc->irq_chip.irq_ack = ingenic_gpio_irq_ack;
-	jzgc->irq_chip.irq_set_type = ingenic_gpio_irq_set_type;
-	jzgc->irq_chip.irq_set_wake = ingenic_gpio_irq_set_wake;
-	jzgc->irq_chip.irq_request_resources = ingenic_gpio_irq_request;
-	jzgc->irq_chip.irq_release_resources = ingenic_gpio_irq_release;
-	jzgc->irq_chip.flags = IRQCHIP_MASK_ON_SUSPEND;
-
 	girq = &jzgc->gc.irq;
-	girq->chip = &jzgc->irq_chip;
+	gpio_irq_chip_set_chip(girq, &ingenic_gpio_irqchip);
 	girq->parent_handler = ingenic_gpio_irq_handler;
 	girq->num_parents = 1;
 	girq->parents = devm_kcalloc(dev, 1, sizeof(*girq->parents),
-- 
2.35.1


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH v2 0/2] pinctrl: ingenic: Convert to immutable irq chip
  2022-06-17 12:28 [PATCH v2 0/2] pinctrl: ingenic: Convert to immutable irq chip Aidan MacDonald
  2022-06-17 12:28 ` [PATCH v2 1/2] pinctrl: ingenic: Use irqd_to_hwirq() Aidan MacDonald
  2022-06-17 12:28 ` [PATCH v2 2/2] pinctrl: ingenic: Convert to immutable irq chip Aidan MacDonald
@ 2022-06-17 12:57 ` Marc Zyngier
  2022-06-17 13:58 ` Paul Cercueil
  3 siblings, 0 replies; 7+ messages in thread
From: Marc Zyngier @ 2022-06-17 12:57 UTC (permalink / raw)
  To: Aidan MacDonald
  Cc: linus.walleij, paul, andy.shevchenko, linux-mips, linux-gpio,
	linux-kernel

On 2022-06-17 13:28, Aidan MacDonald wrote:
> Two cleanup patches for pinctrl-ingenic.
> 
> v2:
> * Add print_chip callback to avoid changing /proc/interrupts output
> * Add patch to use irqd_to_hwirq()
> 
> Aidan MacDonald (2):
>   pinctrl: ingenic: Use irqd_to_hwirq()
>   pinctrl: ingenic: Convert to immutable irq chip
> 
>  drivers/pinctrl/pinctrl-ingenic.c | 64 +++++++++++++++++++------------
>  1 file changed, 40 insertions(+), 24 deletions(-)

For the series:

Acked-by: Marc Zyngier <maz@kernel.org>

         M.
-- 
Jazz is not dead. It just smells funny...

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH v2 0/2] pinctrl: ingenic: Convert to immutable irq chip
  2022-06-17 12:28 [PATCH v2 0/2] pinctrl: ingenic: Convert to immutable irq chip Aidan MacDonald
                   ` (2 preceding siblings ...)
  2022-06-17 12:57 ` [PATCH v2 0/2] " Marc Zyngier
@ 2022-06-17 13:58 ` Paul Cercueil
  3 siblings, 0 replies; 7+ messages in thread
From: Paul Cercueil @ 2022-06-17 13:58 UTC (permalink / raw)
  To: Aidan MacDonald
  Cc: linus.walleij, maz, andy.shevchenko, linux-mips, linux-gpio,
	linux-kernel

Hi Aidan,

Le ven., juin 17 2022 at 13:28:53 +0100, Aidan MacDonald 
<aidanmacdonald.0x0@gmail.com> a écrit :
> Two cleanup patches for pinctrl-ingenic.
> 
> v2:
> * Add print_chip callback to avoid changing /proc/interrupts output
> * Add patch to use irqd_to_hwirq()
> 
> Aidan MacDonald (2):
>   pinctrl: ingenic: Use irqd_to_hwirq()
>   pinctrl: ingenic: Convert to immutable irq chip
> 
>  drivers/pinctrl/pinctrl-ingenic.c | 64 
> +++++++++++++++++++------------
>  1 file changed, 40 insertions(+), 24 deletions(-)

Reviewed-by: Paul Cercueil <paul@crapouillou.net>

For the two patches.

Cheers,
-Paul



^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH v2 1/2] pinctrl: ingenic: Use irqd_to_hwirq()
  2022-06-17 12:28 ` [PATCH v2 1/2] pinctrl: ingenic: Use irqd_to_hwirq() Aidan MacDonald
@ 2022-06-17 16:09   ` Andy Shevchenko
  0 siblings, 0 replies; 7+ messages in thread
From: Andy Shevchenko @ 2022-06-17 16:09 UTC (permalink / raw)
  To: Aidan MacDonald
  Cc: Linus Walleij, Paul Cercueil, Marc Zyngier,
	open list:BROADCOM NVRAM DRIVER, open list:GPIO SUBSYSTEM,
	Linux Kernel Mailing List

On Fri, Jun 17, 2022 at 2:27 PM Aidan MacDonald
<aidanmacdonald.0x0@gmail.com> wrote:
>
> Instead of accessing ->hwirq directly, use irqd_to_hwirq().

LGTM,
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>

> Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
> ---
>  drivers/pinctrl/pinctrl-ingenic.c | 23 +++++++++++++----------
>  1 file changed, 13 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c
> index 1ca11616db74..69e0d88665d3 100644
> --- a/drivers/pinctrl/pinctrl-ingenic.c
> +++ b/drivers/pinctrl/pinctrl-ingenic.c
> @@ -3393,7 +3393,7 @@ static void ingenic_gpio_irq_mask(struct irq_data *irqd)
>  {
>         struct gpio_chip *gc = irq_data_get_irq_chip_data(irqd);
>         struct ingenic_gpio_chip *jzgc = gpiochip_get_data(gc);
> -       int irq = irqd->hwirq;
> +       irq_hw_number_t irq = irqd_to_hwirq(irqd);
>
>         if (is_soc_or_above(jzgc->jzpc, ID_JZ4740))
>                 ingenic_gpio_set_bit(jzgc, GPIO_MSK, irq, true);
> @@ -3405,7 +3405,7 @@ static void ingenic_gpio_irq_unmask(struct irq_data *irqd)
>  {
>         struct gpio_chip *gc = irq_data_get_irq_chip_data(irqd);
>         struct ingenic_gpio_chip *jzgc = gpiochip_get_data(gc);
> -       int irq = irqd->hwirq;
> +       irq_hw_number_t irq = irqd_to_hwirq(irqd);
>
>         if (is_soc_or_above(jzgc->jzpc, ID_JZ4740))
>                 ingenic_gpio_set_bit(jzgc, GPIO_MSK, irq, false);
> @@ -3417,7 +3417,7 @@ static void ingenic_gpio_irq_enable(struct irq_data *irqd)
>  {
>         struct gpio_chip *gc = irq_data_get_irq_chip_data(irqd);
>         struct ingenic_gpio_chip *jzgc = gpiochip_get_data(gc);
> -       int irq = irqd->hwirq;
> +       irq_hw_number_t irq = irqd_to_hwirq(irqd);
>
>         if (is_soc_or_above(jzgc->jzpc, ID_JZ4770))
>                 ingenic_gpio_set_bit(jzgc, JZ4770_GPIO_INT, irq, true);
> @@ -3433,7 +3433,7 @@ static void ingenic_gpio_irq_disable(struct irq_data *irqd)
>  {
>         struct gpio_chip *gc = irq_data_get_irq_chip_data(irqd);
>         struct ingenic_gpio_chip *jzgc = gpiochip_get_data(gc);
> -       int irq = irqd->hwirq;
> +       irq_hw_number_t irq = irqd_to_hwirq(irqd);
>
>         ingenic_gpio_irq_mask(irqd);
>
> @@ -3449,7 +3449,7 @@ static void ingenic_gpio_irq_ack(struct irq_data *irqd)
>  {
>         struct gpio_chip *gc = irq_data_get_irq_chip_data(irqd);
>         struct ingenic_gpio_chip *jzgc = gpiochip_get_data(gc);
> -       int irq = irqd->hwirq;
> +       irq_hw_number_t irq = irqd_to_hwirq(irqd);
>         bool high;
>
>         if ((irqd_get_trigger_type(irqd) == IRQ_TYPE_EDGE_BOTH) &&
> @@ -3477,6 +3477,7 @@ static int ingenic_gpio_irq_set_type(struct irq_data *irqd, unsigned int type)
>  {
>         struct gpio_chip *gc = irq_data_get_irq_chip_data(irqd);
>         struct ingenic_gpio_chip *jzgc = gpiochip_get_data(gc);
> +       irq_hw_number_t irq = irqd_to_hwirq(irqd);
>
>         switch (type) {
>         case IRQ_TYPE_EDGE_BOTH:
> @@ -3498,12 +3499,12 @@ static int ingenic_gpio_irq_set_type(struct irq_data *irqd, unsigned int type)
>                  * best we can do is to set up a single-edge interrupt and then
>                  * switch to the opposing edge when ACKing the interrupt.
>                  */
> -               bool high = ingenic_gpio_get_value(jzgc, irqd->hwirq);
> +               bool high = ingenic_gpio_get_value(jzgc, irq);
>
>                 type = high ? IRQ_TYPE_LEVEL_LOW : IRQ_TYPE_LEVEL_HIGH;
>         }
>
> -       irq_set_type(jzgc, irqd->hwirq, type);
> +       irq_set_type(jzgc, irq, type);
>         return 0;
>  }
>
> @@ -3668,20 +3669,22 @@ static const struct pinctrl_ops ingenic_pctlops = {
>  static int ingenic_gpio_irq_request(struct irq_data *data)
>  {
>         struct gpio_chip *gpio_chip = irq_data_get_irq_chip_data(data);
> +       irq_hw_number_t irq = irqd_to_hwirq(data);
>         int ret;
>
> -       ret = ingenic_gpio_direction_input(gpio_chip, data->hwirq);
> +       ret = ingenic_gpio_direction_input(gpio_chip, irq);
>         if (ret)
>                 return ret;
>
> -       return gpiochip_reqres_irq(gpio_chip, data->hwirq);
> +       return gpiochip_reqres_irq(gpio_chip, irq);
>  }
>
>  static void ingenic_gpio_irq_release(struct irq_data *data)
>  {
>         struct gpio_chip *gpio_chip = irq_data_get_irq_chip_data(data);
> +       irq_hw_number_t irq = irqd_to_hwirq(data);
>
> -       return gpiochip_relres_irq(gpio_chip, data->hwirq);
> +       return gpiochip_relres_irq(gpio_chip, irq);
>  }
>
>  static int ingenic_pinmux_set_pin_fn(struct ingenic_pinctrl *jzpc,
> --
> 2.35.1
>


-- 
With Best Regards,
Andy Shevchenko

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH v2 2/2] pinctrl: ingenic: Convert to immutable irq chip
  2022-06-17 12:28 ` [PATCH v2 2/2] pinctrl: ingenic: Convert to immutable irq chip Aidan MacDonald
@ 2022-06-17 16:11   ` Andy Shevchenko
  0 siblings, 0 replies; 7+ messages in thread
From: Andy Shevchenko @ 2022-06-17 16:11 UTC (permalink / raw)
  To: Aidan MacDonald
  Cc: Linus Walleij, Paul Cercueil, Marc Zyngier,
	open list:BROADCOM NVRAM DRIVER, open list:GPIO SUBSYSTEM,
	Linux Kernel Mailing List

On Fri, Jun 17, 2022 at 2:28 PM Aidan MacDonald
<aidanmacdonald.0x0@gmail.com> wrote:
>
> Update the driver to use an immutable IRQ chip to fix this warning:
>
>     "not an immutable chip, please consider fixing it!"
>
> Preserve per-chip labels by adding an irq_print_chip callback.

Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
One nit-pick below, though.

> Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
> ---
>  drivers/pinctrl/pinctrl-ingenic.c | 41 ++++++++++++++++++++-----------
>  1 file changed, 27 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/pinctrl/pinctrl-ingenic.c b/drivers/pinctrl/pinctrl-ingenic.c
> index 69e0d88665d3..787a8daa400e 100644
> --- a/drivers/pinctrl/pinctrl-ingenic.c
> +++ b/drivers/pinctrl/pinctrl-ingenic.c
> @@ -22,6 +22,7 @@
>  #include <linux/platform_device.h>
>  #include <linux/regmap.h>
>  #include <linux/slab.h>
> +#include <linux/seq_file.h>

Ordered?

>  #include "core.h"
>  #include "pinconf.h"
> @@ -135,7 +136,6 @@ struct ingenic_pinctrl {
>  struct ingenic_gpio_chip {
>         struct ingenic_pinctrl *jzpc;
>         struct gpio_chip gc;
> -       struct irq_chip irq_chip;
>         unsigned int irq, reg_base;
>  };
>
> @@ -3419,6 +3419,8 @@ static void ingenic_gpio_irq_enable(struct irq_data *irqd)
>         struct ingenic_gpio_chip *jzgc = gpiochip_get_data(gc);
>         irq_hw_number_t irq = irqd_to_hwirq(irqd);
>
> +       gpiochip_enable_irq(gc, irq);
> +
>         if (is_soc_or_above(jzgc->jzpc, ID_JZ4770))
>                 ingenic_gpio_set_bit(jzgc, JZ4770_GPIO_INT, irq, true);
>         else if (is_soc_or_above(jzgc->jzpc, ID_JZ4740))
> @@ -3443,6 +3445,8 @@ static void ingenic_gpio_irq_disable(struct irq_data *irqd)
>                 ingenic_gpio_set_bit(jzgc, JZ4740_GPIO_SELECT, irq, false);
>         else
>                 ingenic_gpio_set_bit(jzgc, JZ4730_GPIO_GPIER, irq, false);
> +
> +       gpiochip_disable_irq(gc, irq);
>  }
>
>  static void ingenic_gpio_irq_ack(struct irq_data *irqd)
> @@ -3687,6 +3691,27 @@ static void ingenic_gpio_irq_release(struct irq_data *data)
>         return gpiochip_relres_irq(gpio_chip, irq);
>  }
>
> +static void ingenic_gpio_irq_print_chip(struct irq_data *data, struct seq_file *p)
> +{
> +       struct gpio_chip *gpio_chip = irq_data_get_irq_chip_data(data);
> +
> +       seq_printf(p, "%s", gpio_chip->label);
> +}
> +
> +static const struct irq_chip ingenic_gpio_irqchip = {
> +       .irq_enable             = ingenic_gpio_irq_enable,
> +       .irq_disable            = ingenic_gpio_irq_disable,
> +       .irq_unmask             = ingenic_gpio_irq_unmask,
> +       .irq_mask               = ingenic_gpio_irq_mask,
> +       .irq_ack                = ingenic_gpio_irq_ack,
> +       .irq_set_type           = ingenic_gpio_irq_set_type,
> +       .irq_set_wake           = ingenic_gpio_irq_set_wake,
> +       .irq_request_resources  = ingenic_gpio_irq_request,
> +       .irq_release_resources  = ingenic_gpio_irq_release,
> +       .irq_print_chip         = ingenic_gpio_irq_print_chip,
> +       .flags                  = IRQCHIP_MASK_ON_SUSPEND | IRQCHIP_IMMUTABLE,
> +};
> +
>  static int ingenic_pinmux_set_pin_fn(struct ingenic_pinctrl *jzpc,
>                 int pin, int func)
>  {
> @@ -4175,20 +4200,8 @@ static int __init ingenic_gpio_probe(struct ingenic_pinctrl *jzpc,
>         if (!jzgc->irq)
>                 return -EINVAL;
>
> -       jzgc->irq_chip.name = jzgc->gc.label;
> -       jzgc->irq_chip.irq_enable = ingenic_gpio_irq_enable;
> -       jzgc->irq_chip.irq_disable = ingenic_gpio_irq_disable;
> -       jzgc->irq_chip.irq_unmask = ingenic_gpio_irq_unmask;
> -       jzgc->irq_chip.irq_mask = ingenic_gpio_irq_mask;
> -       jzgc->irq_chip.irq_ack = ingenic_gpio_irq_ack;
> -       jzgc->irq_chip.irq_set_type = ingenic_gpio_irq_set_type;
> -       jzgc->irq_chip.irq_set_wake = ingenic_gpio_irq_set_wake;
> -       jzgc->irq_chip.irq_request_resources = ingenic_gpio_irq_request;
> -       jzgc->irq_chip.irq_release_resources = ingenic_gpio_irq_release;
> -       jzgc->irq_chip.flags = IRQCHIP_MASK_ON_SUSPEND;
> -
>         girq = &jzgc->gc.irq;
> -       girq->chip = &jzgc->irq_chip;
> +       gpio_irq_chip_set_chip(girq, &ingenic_gpio_irqchip);
>         girq->parent_handler = ingenic_gpio_irq_handler;
>         girq->num_parents = 1;
>         girq->parents = devm_kcalloc(dev, 1, sizeof(*girq->parents),
> --
> 2.35.1
>


-- 
With Best Regards,
Andy Shevchenko

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2022-06-17 16:12 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-17 12:28 [PATCH v2 0/2] pinctrl: ingenic: Convert to immutable irq chip Aidan MacDonald
2022-06-17 12:28 ` [PATCH v2 1/2] pinctrl: ingenic: Use irqd_to_hwirq() Aidan MacDonald
2022-06-17 16:09   ` Andy Shevchenko
2022-06-17 12:28 ` [PATCH v2 2/2] pinctrl: ingenic: Convert to immutable irq chip Aidan MacDonald
2022-06-17 16:11   ` Andy Shevchenko
2022-06-17 12:57 ` [PATCH v2 0/2] " Marc Zyngier
2022-06-17 13:58 ` Paul Cercueil

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).