platform/x86: intel: int0002_vgpio: Make the irqchip immutable

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:

gpio gpiochip4: (INT0002 Virtual GPIO): not an immutable chip, please consider fixing it!

Fix this by making the irqchip in the int0002_vgpio driver immutable.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andy@kernel.org>
Link: https://lore.kernel.org/r/20241204143807.32966-1-hdegoede@redhat.com
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

diff --git a/drivers/platform/x86/intel/int0002_vgpio.c b/drivers/platform/x86/intel/int0002_vgpio.c
index 0cc80603a8a9dc29d07777b22315617cb7119acd..3b48cd7a4075e8140c40e79202e5574eb2816c2b 100644 (file)
--- a/drivers/platform/x86/intel/int0002_vgpio.c
+++ b/drivers/platform/x86/intel/int0002_vgpio.c
@@ -83,8 +83,12 @@ static void int0002_irq_ack(struct irq_data *data)
 
 static void int0002_irq_unmask(struct irq_data *data)
 {
+       struct gpio_chip *gc = irq_data_get_irq_chip_data(data);
+       irq_hw_number_t hwirq = irqd_to_hwirq(data);
        u32 gpe_en_reg;
 
+       gpiochip_enable_irq(gc, hwirq);
+
        gpe_en_reg = inl(GPE0A_EN_PORT);
        gpe_en_reg |= GPE0A_PME_B0_EN_BIT;
        outl(gpe_en_reg, GPE0A_EN_PORT);
@@ -92,11 +96,15 @@ static void int0002_irq_unmask(struct irq_data *data)
 
 static void int0002_irq_mask(struct irq_data *data)
 {
+       struct gpio_chip *gc = irq_data_get_irq_chip_data(data);
+       irq_hw_number_t hwirq = irqd_to_hwirq(data);
        u32 gpe_en_reg;
 
        gpe_en_reg = inl(GPE0A_EN_PORT);
        gpe_en_reg &= ~GPE0A_PME_B0_EN_BIT;
        outl(gpe_en_reg, GPE0A_EN_PORT);
+
+       gpiochip_disable_irq(gc, hwirq);
 }
 
 static int int0002_irq_set_wake(struct irq_data *data, unsigned int on)
@@ -140,12 +148,14 @@ static bool int0002_check_wake(void *data)
        return (gpe_sts_reg & GPE0A_PME_B0_STS_BIT);
 }
 
-static struct irq_chip int0002_irqchip = {
+static const struct irq_chip int0002_irqchip = {
        .name                   = DRV_NAME,
        .irq_ack                = int0002_irq_ack,
        .irq_mask               = int0002_irq_mask,
        .irq_unmask             = int0002_irq_unmask,
        .irq_set_wake           = int0002_irq_set_wake,
+       .flags                  = IRQCHIP_IMMUTABLE,
+       GPIOCHIP_IRQ_RESOURCE_HELPERS,
 };
 
 static void int0002_init_irq_valid_mask(struct gpio_chip *chip,
@@ -203,7 +213,7 @@ static int int0002_probe(struct platform_device *pdev)
        }
 
        girq = &chip->irq;
-       girq->chip = &int0002_irqchip;
+       gpio_irq_chip_set_chip(girq, &int0002_irqchip);
        /* This let us handle the parent IRQ in the driver */
        girq->parent_handler = NULL;
        girq->num_parents = 0;