Skip to contentSkip to conversation

gpio: sprd: Make irq_chip immutable

PATCH In review Cixi Geng 2 participants 3 messages Dec 16, 2022 – Dec 18, 2022

Subsystems (2)
lore
Share & tools
lore

Cixi Geng

author
#0 lore raw

PATCH 1/1 gpio: sprd: Make irq_chip immutable

From: Cixi Geng <[email protected]>

Kernel warns about mutable irq_chips:

"not an immutable chip, please consider fixing!"

Make the struct irq_chip const, flag it as IRQCHIP_IMMUTABLE, add the new helper functions, and call the appropriate gpiolib functions.

---
 drivers/gpio/gpio-eic-sprd.c      |  4 ++--
 drivers/gpio/gpio-pmic-eic-sprd.c |  4 ++--
 drivers/gpio/gpio-sprd.c          | 11 +++++++++--
 3 files changed, 13 insertions(+), 6 deletions(-)
drivers/gpio/gpio-eic-sprd.c +2 -2
index 8d722e026e9c..07b9099f2a6d 100644
@@ -631,10 +631,10 @@ static int sprd_eic_probe(struct platform_device *pdev)
 	sprd_eic->intc.irq_mask = sprd_eic_irq_mask;
 	sprd_eic->intc.irq_unmask = sprd_eic_irq_unmask;
 	sprd_eic->intc.irq_set_type = sprd_eic_irq_set_type;
-	sprd_eic->intc.flags = IRQCHIP_SKIP_SET_WAKE;
+	sprd_eic->intc.flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_IMMUTABLE;
 
 	irq = &sprd_eic->chip.irq;
-	irq->chip = &sprd_eic->intc;
+	gpio_irq_chip_set_chip(irq, &sprd_eic->intc);
 	irq->handler = handle_bad_irq;
 	irq->default_type = IRQ_TYPE_NONE;
 	irq->parent_handler = sprd_eic_irq_handler;
drivers/gpio/gpio-pmic-eic-sprd.c +2 -2
index e518490c4b68..d96604ea10e7 100644
@@ -344,10 +344,10 @@ static int sprd_pmic_eic_probe(struct platform_device *pdev)
 	pmic_eic->intc.irq_set_type = sprd_pmic_eic_irq_set_type;
 	pmic_eic->intc.irq_bus_lock = sprd_pmic_eic_bus_lock;
 	pmic_eic->intc.irq_bus_sync_unlock = sprd_pmic_eic_bus_sync_unlock;
-	pmic_eic->intc.flags = IRQCHIP_SKIP_SET_WAKE;
+	pmic_eic->intc.flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_IMMUTABLE;
 
 	irq = &pmic_eic->chip.irq;
-	irq->chip = &pmic_eic->intc;
+	gpio_irq_chip_set_chip(irq, &pmic_eic->intc);
 	irq->threaded = true;
 
 	ret = devm_gpiochip_add_data(&pdev->dev, &pmic_eic->chip, pmic_eic);
drivers/gpio/gpio-sprd.c +9 -2
index 9bff63990eee..8398f9707ec0 100644
@@ -64,6 +64,11 @@ static void sprd_gpio_update(struct gpio_chip *chip, unsigned int offset,
 
 	writel_relaxed(tmp, base + reg);
 	spin_unlock_irqrestore(&sprd_gpio->lock, flags);
+
+	if (reg == SPRD_GPIO_IE && val == 1)
+		gpiochip_enable_irq(chip, offset);
+	else if (reg == SPRD_GPIO_IE && val == 0)
+		gpiochip_disable_irq(chip, offset);
 }
 
 static int sprd_gpio_read(struct gpio_chip *chip, unsigned int offset, u16 reg)
@@ -205,13 +210,15 @@ static void sprd_gpio_irq_handler(struct irq_desc *desc)
 	chained_irq_exit(ic, desc);
 }
 
-static struct irq_chip sprd_gpio_irqchip = {
+static const struct irq_chip sprd_gpio_irqchip = {
 	.name = "sprd-gpio",
 	.irq_ack = sprd_gpio_irq_ack,
 	.irq_mask = sprd_gpio_irq_mask,
 	.irq_unmask = sprd_gpio_irq_unmask,
 	.irq_set_type = sprd_gpio_irq_set_type,
 	.flags = IRQCHIP_SKIP_SET_WAKE,
+	.flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_IMMUTABLE,
+	GPIOCHIP_IRQ_RESOURCE_HELPERS,
 };
 
 static int sprd_gpio_probe(struct platform_device *pdev)
@@ -245,7 +252,7 @@ static int sprd_gpio_probe(struct platform_device *pdev)
 	sprd_gpio->chip.direction_output = sprd_gpio_direction_output;
 
 	irq = &sprd_gpio->chip.irq;
-	irq->chip = &sprd_gpio_irqchip;
+	gpio_irq_chip_set_chip(irq, &sprd_gpio_irqchip);
 	irq->handler = handle_bad_irq;
 	irq->default_type = IRQ_TYPE_NONE;
 	irq->parent_handler = sprd_gpio_irq_handler;
Signature · 1 line
2.34.1
#1 lore raw
Quoted 8 lines · Cixi Geng

From: Cixi Geng <[email protected]>

Kernel warns about mutable irq_chips:

"not an immutable chip, please consider fixing!"

Make the struct irq_chip const, flag it as IRQCHIP_IMMUTABLE, add the new helper functions, and call the appropriate gpiolib functions.

Please split them into 3 patches and each patch converts one driver, which is easy to review.

Quoted 30 lines
---
  drivers/gpio/gpio-eic-sprd.c      |  4 ++--
  drivers/gpio/gpio-pmic-eic-sprd.c |  4 ++--
  drivers/gpio/gpio-sprd.c          | 11 +++++++++--
  3 files changed, 13 insertions(+), 6 deletions(-)
drivers/gpio/gpio-eic-sprd.c +2 -2
index 8d722e026e9c..07b9099f2a6d 100644
@@ -631,10 +631,10 @@ static int sprd_eic_probe(struct platform_device *pdev)
  	sprd_eic->intc.irq_mask = sprd_eic_irq_mask;
  	sprd_eic->intc.irq_unmask = sprd_eic_irq_unmask;
  	sprd_eic->intc.irq_set_type = sprd_eic_irq_set_type;
-	sprd_eic->intc.flags = IRQCHIP_SKIP_SET_WAKE;
+	sprd_eic->intc.flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_IMMUTABLE;
 
  	irq = &sprd_eic->chip.irq;
-	irq->chip = &sprd_eic->intc;
+	gpio_irq_chip_set_chip(irq, &sprd_eic->intc);
  	irq->handler = handle_bad_irq;
  	irq->default_type = IRQ_TYPE_NONE;
  	irq->parent_handler = sprd_eic_irq_handler;
drivers/gpio/gpio-pmic-eic-sprd.c +0 -0
index e518490c4b68..d96604ea10e7 100644

drivers/gpio/gpio-pmic-eic-sprd.c static int sprd_pmic_eic_probe(struct platform_device *pdev) · line 347

Quoted 5 lines
drivers/gpio/gpio-pmic-eic-sprd.c +1 -1
@@ -344,10 +344,10 @@ static int sprd_pmic_eic_probe(struct platform_device *pdev)
  	pmic_eic->intc.irq_set_type = sprd_pmic_eic_irq_set_type;
  	pmic_eic->intc.irq_bus_lock = sprd_pmic_eic_bus_lock;
  	pmic_eic->intc.irq_bus_sync_unlock = sprd_pmic_eic_bus_sync_unlock;
-	pmic_eic->intc.flags = IRQCHIP_SKIP_SET_WAKE;
+	pmic_eic->intc.flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_IMMUTABLE;

Why not add GPIOCHIP_IRQ_RESOURCE_HELPERS for above 2 drivers? Seems we can remove the irq_chip from pmic_eic structure, instead we can define it statically with adding GPIOCHIP_IRQ_RESOURCE_HELPERS like other patch [1] did?

[1] https://lore.kernel.org/all/[email protected]/

Quoted 12 lines
drivers/gpio/gpio-pmic-eic-sprd.c +1 -1
  	irq = &pmic_eic->chip.irq;
-	irq->chip = &pmic_eic->intc;
+	gpio_irq_chip_set_chip(irq, &pmic_eic->intc);
  	irq->threaded = true;
 
  	ret = devm_gpiochip_add_data(&pdev->dev, &pmic_eic->chip, pmic_eic);
drivers/gpio/gpio-sprd.c +0 -0
index 9bff63990eee..8398f9707ec0 100644

drivers/gpio/gpio-sprd.c static void sprd_gpio_update(struct gpio_chip *chip, unsigned int offset, · line 71

Quoted 8 lines
drivers/gpio/gpio-sprd.c +5 -0
@@ -64,6 +64,11 @@ static void sprd_gpio_update(struct gpio_chip *chip, unsigned int offset,
 
  	writel_relaxed(tmp, base + reg);
  	spin_unlock_irqrestore(&sprd_gpio->lock, flags);
+
+	if (reg == SPRD_GPIO_IE && val == 1)
+		gpiochip_enable_irq(chip, offset);
+	else if (reg == SPRD_GPIO_IE && val == 0)
+		gpiochip_disable_irq(chip, offset);

Looks incorrect to me, IIUC you should move gpiochip_enable_irq/gpiochip_disable_irq() into sprd_gpio_irq_mask() and sprd_gpio_irq_unmask().

Quoted 29 lines
drivers/gpio/gpio-sprd.c +4 -2
  }
 
  static int sprd_gpio_read(struct gpio_chip *chip, unsigned int offset, u16 reg)
@@ -205,13 +210,15 @@ static void sprd_gpio_irq_handler(struct irq_desc *desc)
  	chained_irq_exit(ic, desc);
  }
 
-static struct irq_chip sprd_gpio_irqchip = {
+static const struct irq_chip sprd_gpio_irqchip = {
  	.name = "sprd-gpio",
  	.irq_ack = sprd_gpio_irq_ack,
  	.irq_mask = sprd_gpio_irq_mask,
  	.irq_unmask = sprd_gpio_irq_unmask,
  	.irq_set_type = sprd_gpio_irq_set_type,
  	.flags = IRQCHIP_SKIP_SET_WAKE,
+	.flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_IMMUTABLE,
+	GPIOCHIP_IRQ_RESOURCE_HELPERS,
  };
 
  static int sprd_gpio_probe(struct platform_device *pdev)
@@ -245,7 +252,7 @@ static int sprd_gpio_probe(struct platform_device *pdev)
  	sprd_gpio->chip.direction_output = sprd_gpio_direction_output;
 
  	irq = &sprd_gpio->chip.irq;
-	irq->chip = &sprd_gpio_irqchip;
+	gpio_irq_chip_set_chip(irq, &sprd_gpio_irqchip);
  	irq->handler = handle_bad_irq;
  	irq->default_type = IRQ_TYPE_NONE;
  	irq->parent_handler = sprd_gpio_irq_handler;
author
#2 lore raw
Quoted 9 lines · Baolin Wang
Quoted 9 lines · Cixi Geng
Quoted 6 lines
Quoted 6 lines

From: Cixi Geng <[email protected]>

Kernel warns about mutable irq_chips:

     "not an immutable chip, please consider fixing!"

Quoted 8 lines
Quoted 8 lines
Quoted 4 lines
Quoted 4 lines

Make the struct irq_chip const, flag it as IRQCHIP_IMMUTABLE, add > > the
new helper functions, and call the appropriate gpiolib functions.

Please split them into 3 patches and each patch converts one driver,
which is easy to review.

Thanks for reviewing, I will modify the comments in the next version

Quoted 118 lines
Quoted 118 lines
Quoted 36 lines
Quoted 36 lines

---
  drivers/gpio/gpio-eic-sprd.c      |  4 ++-- drivers/gpio/gpio-pmic-eic-sprd.c |  4 ++-- drivers/gpio/gpio-sprd.c          | 11 +++++++++--

  3 files changed, 13 insertions(+), 6 deletions(-)
> > renamed from drivers/gpio/gpio-eic-sprd.c +0 -0

b/drivers/gpio/gpio-eic-sprd.c
index 8d722e026e9c..07b9099f2a6d 100644

drivers/gpio/gpio-eic-sprd.c +1 -1
@@ -631,10 +631,10 @@ static int sprd_eic_probe(struct > >
 platform_device *pdev)
         sprd_eic->intc.irq_mask = sprd_eic_irq_mask;
         sprd_eic->intc.irq_unmask = sprd_eic_irq_unmask;
         sprd_eic->intc.irq_set_type = sprd_eic_irq_set_type;
-       sprd_eic->intc.flags = IRQCHIP_SKIP_SET_WAKE;
+       sprd_eic->intc.flags = IRQCHIP_SKIP_SET_WAKE | > >
 IRQCHIP_IMMUTABLE;


        irq = &sprd_eic->chip.irq;
-       irq->chip = &sprd_eic->intc;
+       gpio_irq_chip_set_chip(irq, &sprd_eic->intc); irq->handler = handle_bad_irq; irq->default_type = IRQ_TYPE_NONE; irq->parent_handler = sprd_eic_irq_handler;

> > renamed from drivers/gpio/gpio-pmic-eic-sprd.c +0 -0

b/drivers/gpio/gpio-pmic-eic-sprd.c
index e518490c4b68..d96604ea10e7 100644

drivers/gpio/gpio-pmic-eic-sprd.c +0 -0
@@ -344,10 +344,10 @@ static int sprd_pmic_eic_probe(struct > >
 platform_device *pdev)
Quoted 8 lines
Quoted 8 lines

        pmic_eic->intc.irq_set_type = sprd_pmic_eic_irq_set_type; pmic_eic->intc.irq_bus_lock = sprd_pmic_eic_bus_lock; pmic_eic->intc.irq_bus_sync_unlock = > > sprd_pmic_eic_bus_sync_unlock;
-       pmic_eic->intc.flags = IRQCHIP_SKIP_SET_WAKE; +       pmic_eic->intc.flags = IRQCHIP_SKIP_SET_WAKE | > > IRQCHIP_IMMUTABLE;

Why not add GPIOCHIP_IRQ_RESOURCE_HELPERS for above 2 drivers? Seems > we
can remove the irq_chip from pmic_eic structure, instead we can > define
it statically with adding GPIOCHIP_IRQ_RESOURCE_HELPERS like other

Quoted 1 line

patch

[1] did?

[1] >
https://lore.kernel.org/all/[email protected]/

Quoted 8 lines
Quoted 8 lines


        irq = &pmic_eic->chip.irq;
-       irq->chip = &pmic_eic->intc;
+       gpio_irq_chip_set_chip(irq, &pmic_eic->intc); irq->threaded = true;

        ret = devm_gpiochip_add_data(&pdev->dev, &pmic_eic-

Quoted 1 line

chip, > > pmic_eic);

Quoted 15 lines
Quoted 7 lines
drivers/gpio/gpio- renamed from drivers/gpio/gpio-sprd.c +0 -0

sprd.c
index 9bff63990eee..8398f9707ec0 100644

drivers/gpio/gpio-sprd.c +0 -0
@@ -64,6 +64,11 @@ static void sprd_gpio_update(struct
 gpio_chip > > *chip, unsigned int offset,
Quoted 8 lines


        writel_relaxed(tmp, base + reg); spin_unlock_irqrestore(&sprd_gpio->lock, flags); +
+       if (reg == SPRD_GPIO_IE && val == 1)
+               gpiochip_enable_irq(chip, offset); +       else if (reg == SPRD_GPIO_IE && val == 0) +               gpiochip_disable_irq(chip, offset);

Looks incorrect to me, IIUC you should move
gpiochip_enable_irq/gpiochip_disable_irq() into
sprd_gpio_irq_mask() > and
sprd_gpio_irq_unmask().

Quoted 33 lines
Quoted 33 lines

  }

  static int sprd_gpio_read(struct gpio_chip *chip, unsigned int > > offset, u16 reg)

drivers/gpio/gpio-sprd.c +0 -0
@@ -205,13 +210,15 @@ static void sprd_gpio_irq_handler(struct
 > > irq_desc *desc)
         chained_irq_exit(ic, desc);
   }

drivers/gpio/gpio-sprd.c +1 -1
-static struct irq_chip sprd_gpio_irqchip = {
+static const struct irq_chip sprd_gpio_irqchip = {

        .name = "sprd-gpio",
        .irq_ack = sprd_gpio_irq_ack,
        .irq_mask = sprd_gpio_irq_mask, .irq_unmask = sprd_gpio_irq_unmask, .irq_set_type = sprd_gpio_irq_set_type, .flags = IRQCHIP_SKIP_SET_WAKE,
+       .flags = IRQCHIP_SKIP_SET_WAKE | IRQCHIP_IMMUTABLE, +       GPIOCHIP_IRQ_RESOURCE_HELPERS,
  };

  static int sprd_gpio_probe(struct platform_device *pdev)

drivers/gpio/gpio-sprd.c +0 -0
@@ -245,7 +252,7 @@ static int sprd_gpio_probe(struct > >
 platform_device *pdev)

        sprd_gpio->chip.direction_output = > > sprd_gpio_direction_output;

        irq = &sprd_gpio->chip.irq;
-       irq->chip = &sprd_gpio_irqchip;
+       gpio_irq_chip_set_chip(irq, &sprd_gpio_irqchip); irq->handler = handle_bad_irq; irq->default_type = IRQ_TYPE_NONE; irq->parent_handler = sprd_gpio_irq_handler;