irqchip/aspeed-scu-ic: Add support for AST2700 SCU interrupt controllers

AST2700 continues the multi-instance SCU interrupt controller model
introduced in the AST2600, with four independent interrupt domains (scu-ic0
to 3).

Unlike earlier generations which combine interrupt enable and status bits
into a single register, AST2700 separates these into distinct IER and ISR
registers. Support for this layout is implemented by using register offsets
and separate chained IRQ handlers.

The variant table is extended to cover AST2700 IC instances, enabling
shared initialization logic while preserving support for previous SoCs.

[ tglx: Simplified the logic and cleaned up coding style ]

Signed-off-by: Ryan Chen <ryan_chen@aspeedtech.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250908011812.1033858-5-ryan_chen@aspeedtech.com

diff --git a/drivers/irqchip/irq-aspeed-scu-ic.c b/drivers/irqchip/irq-aspeed-scu-ic.c
index 9c1fbdd..5584e0f 100644 (file)
--- a/drivers/irqchip/irq-aspeed-scu-ic.c
+++ b/drivers/irqchip/irq-aspeed-scu-ic.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 /*
- * Aspeed AST24XX, AST25XX, and AST26XX SCU Interrupt Controller
+ * Aspeed AST24XX, AST25XX, AST26XX, and AST27XX SCU Interrupt Controller
  * Copyright 2019 IBM Corporation
  *
  * Eddie James <eajames@linux.ibm.com>
@@ -17,26 +17,35 @@
 
 #define ASPEED_SCU_IC_STATUS           GENMASK(28, 16)
 #define ASPEED_SCU_IC_STATUS_SHIFT     16
+#define AST2700_SCU_IC_STATUS          GENMASK(15, 0)
 
 struct aspeed_scu_ic_variant {
        const char      *compatible;
        unsigned long   irq_enable;
        unsigned long   irq_shift;
        unsigned int    num_irqs;
+       unsigned long   ier;
+       unsigned long   isr;
 };
 
-#define SCU_VARIANT(_compat, _shift, _enable, _num) {  \
+#define SCU_VARIANT(_compat, _shift, _enable, _num, _ier, _isr) {      \
        .compatible             =       _compat,        \
        .irq_shift              =       _shift,         \
        .irq_enable             =       _enable,        \
        .num_irqs               =       _num,           \
+       .ier                    =       _ier,           \
+       .isr                    =       _isr,           \
 }
 
 static const struct aspeed_scu_ic_variant scu_ic_variants[]    __initconst = {
-       SCU_VARIANT("aspeed,ast2400-scu-ic",    0, GENMASK(15, 0),      7),
-       SCU_VARIANT("aspeed,ast2500-scu-ic",    0, GENMASK(15, 0),      7),
-       SCU_VARIANT("aspeed,ast2600-scu-ic0",   0, GENMASK(5, 0),       6),
-       SCU_VARIANT("aspeed,ast2600-scu-ic1",   4, GENMASK(5, 4),       2),
+       SCU_VARIANT("aspeed,ast2400-scu-ic",    0, GENMASK(15, 0),      7, 0x00, 0x00),
+       SCU_VARIANT("aspeed,ast2500-scu-ic",    0, GENMASK(15, 0),      7, 0x00, 0x00),
+       SCU_VARIANT("aspeed,ast2600-scu-ic0",   0, GENMASK(5, 0),       6, 0x00, 0x00),
+       SCU_VARIANT("aspeed,ast2600-scu-ic1",   4, GENMASK(5, 4),       2, 0x00, 0x00),
+       SCU_VARIANT("aspeed,ast2700-scu-ic0",   0, GENMASK(3, 0),       4, 0x00, 0x04),
+       SCU_VARIANT("aspeed,ast2700-scu-ic1",   0, GENMASK(3, 0),       4, 0x00, 0x04),
+       SCU_VARIANT("aspeed,ast2700-scu-ic2",   0, GENMASK(3, 0),       4, 0x04, 0x00),
+       SCU_VARIANT("aspeed,ast2700-scu-ic3",   0, GENMASK(1, 0),       2, 0x04, 0x00),
 };
 
 struct aspeed_scu_ic {
@@ -45,9 +54,16 @@ struct aspeed_scu_ic {
        unsigned int            num_irqs;
        void __iomem            *base;
        struct irq_domain       *irq_domain;
+       unsigned long           ier;
+       unsigned long           isr;
 };
 
-static void aspeed_scu_ic_irq_handler(struct irq_desc *desc)
+static inline bool scu_has_split_isr(struct aspeed_scu_ic *scu)
+{
+       return scu->ier != scu->isr;
+}
+
+static void aspeed_scu_ic_irq_handler_combined(struct irq_desc *desc)
 {
        struct aspeed_scu_ic *scu_ic = irq_desc_get_handler_data(desc);
        struct irq_chip *chip = irq_desc_get_chip(desc);
@@ -83,7 +99,34 @@ static void aspeed_scu_ic_irq_handler(struct irq_desc *desc)
        chained_irq_exit(chip, desc);
 }
 
-static void aspeed_scu_ic_irq_mask(struct irq_data *data)
+static void aspeed_scu_ic_irq_handler_split(struct irq_desc *desc)
+{
+       struct aspeed_scu_ic *scu_ic = irq_desc_get_handler_data(desc);
+       struct irq_chip *chip = irq_desc_get_chip(desc);
+       unsigned long bit, enabled, max, status;
+       unsigned int sts, mask;
+
+       chained_irq_enter(chip, desc);
+
+       mask = scu_ic->irq_enable;
+       sts = readl(scu_ic->base + scu_ic->isr);
+       enabled = sts & scu_ic->irq_enable;
+       sts = readl(scu_ic->base + scu_ic->isr);
+       status = sts & enabled;
+
+       bit = scu_ic->irq_shift;
+       max = scu_ic->num_irqs + bit;
+
+       for_each_set_bit_from(bit, &status, max) {
+               generic_handle_domain_irq(scu_ic->irq_domain, bit - scu_ic->irq_shift);
+               /* Clear interrupt */
+               writel(BIT(bit), scu_ic->base + scu_ic->isr);
+       }
+
+       chained_irq_exit(chip, desc);
+}
+
+static void aspeed_scu_ic_irq_mask_combined(struct irq_data *data)
 {
        struct aspeed_scu_ic *scu_ic = irq_data_get_irq_chip_data(data);
        unsigned int bit = BIT(data->hwirq + scu_ic->irq_shift);
@@ -97,7 +140,7 @@ static void aspeed_scu_ic_irq_mask(struct irq_data *data)
        writel(readl(scu_ic->base) & ~mask, scu_ic->base);
 }
 
-static void aspeed_scu_ic_irq_unmask(struct irq_data *data)
+static void aspeed_scu_ic_irq_unmask_combined(struct irq_data *data)
 {
        struct aspeed_scu_ic *scu_ic = irq_data_get_irq_chip_data(data);
        unsigned int bit = BIT(data->hwirq + scu_ic->irq_shift);
@@ -111,6 +154,22 @@ static void aspeed_scu_ic_irq_unmask(struct irq_data *data)
        writel((readl(scu_ic->base) & ~mask) | bit, scu_ic->base);
 }
 
+static void aspeed_scu_ic_irq_mask_split(struct irq_data *data)
+{
+       struct aspeed_scu_ic *scu_ic = irq_data_get_irq_chip_data(data);
+       unsigned int mask = BIT(data->hwirq + scu_ic->irq_shift);
+
+       writel(readl(scu_ic->base) & ~mask, scu_ic->base + scu_ic->ier);
+}
+
+static void aspeed_scu_ic_irq_unmask_split(struct irq_data *data)
+{
+       struct aspeed_scu_ic *scu_ic = irq_data_get_irq_chip_data(data);
+       unsigned int bit = BIT(data->hwirq + scu_ic->irq_shift);
+
+       writel(readl(scu_ic->base) | bit, scu_ic->base + scu_ic->ier);
+}
+
 static int aspeed_scu_ic_irq_set_affinity(struct irq_data *data,
                                          const struct cpumask *dest,
                                          bool force)
@@ -118,17 +177,29 @@ static int aspeed_scu_ic_irq_set_affinity(struct irq_data *data,
        return -EINVAL;
 }
 
-static struct irq_chip aspeed_scu_ic_chip = {
+static struct irq_chip aspeed_scu_ic_chip_combined = {
        .name                   = "aspeed-scu-ic",
-       .irq_mask               = aspeed_scu_ic_irq_mask,
-       .irq_unmask             = aspeed_scu_ic_irq_unmask,
-       .irq_set_affinity       = aspeed_scu_ic_irq_set_affinity,
+       .irq_mask               = aspeed_scu_ic_irq_mask_combined,
+       .irq_unmask             = aspeed_scu_ic_irq_unmask_combined,
+       .irq_set_affinity       = aspeed_scu_ic_irq_set_affinity,
+};
+
+static struct irq_chip aspeed_scu_ic_chip_split = {
+       .name                   = "ast2700-scu-ic",
+       .irq_mask               = aspeed_scu_ic_irq_mask_split,
+       .irq_unmask             = aspeed_scu_ic_irq_unmask_split,
+       .irq_set_affinity       = aspeed_scu_ic_irq_set_affinity,
 };
 
 static int aspeed_scu_ic_map(struct irq_domain *domain, unsigned int irq,
                             irq_hw_number_t hwirq)
 {
-       irq_set_chip_and_handler(irq, &aspeed_scu_ic_chip, handle_level_irq);
+       struct aspeed_scu_ic *scu_ic = domain->host_data;
+
+       if (scu_has_split_isr(scu_ic))
+               irq_set_chip_and_handler(irq, &aspeed_scu_ic_chip_split, handle_level_irq);
+       else
+               irq_set_chip_and_handler(irq, &aspeed_scu_ic_chip_combined, handle_level_irq);
        irq_set_chip_data(irq, domain->host_data);
 
        return 0;
@@ -148,8 +219,14 @@ static int aspeed_scu_ic_of_init_common(struct aspeed_scu_ic *scu_ic,
                rc = PTR_ERR(scu_ic->base);
                goto err;
        }
-       writel(ASPEED_SCU_IC_STATUS, scu_ic->base);
-       writel(0, scu_ic->base);
+
+       if (scu_has_split_isr(scu_ic)) {
+               writel(AST2700_SCU_IC_STATUS, scu_ic->base + scu_ic->isr);
+               writel(0, scu_ic->base + scu_ic->ier);
+       } else {
+               writel(ASPEED_SCU_IC_STATUS, scu_ic->base);
+               writel(0, scu_ic->base);
+       }
 
        irq = irq_of_parse_and_map(node, 0);
        if (!irq) {
@@ -164,7 +241,9 @@ static int aspeed_scu_ic_of_init_common(struct aspeed_scu_ic *scu_ic,
                goto err;
        }
 
-       irq_set_chained_handler_and_data(irq, aspeed_scu_ic_irq_handler,
+       irq_set_chained_handler_and_data(irq, scu_has_split_isr(scu_ic) ?
+                                        aspeed_scu_ic_irq_handler_split :
+                                        aspeed_scu_ic_irq_handler_combined,
                                         scu_ic);
 
        return 0;
@@ -199,6 +278,8 @@ static int __init aspeed_scu_ic_of_init(struct device_node *node, struct device_
        scu_ic->irq_enable      = variant->irq_enable;
        scu_ic->irq_shift       = variant->irq_shift;
        scu_ic->num_irqs        = variant->num_irqs;
+       scu_ic->ier             = variant->ier;
+       scu_ic->isr             = variant->isr;
 
        return aspeed_scu_ic_of_init_common(scu_ic, node);
 }
@@ -207,3 +288,7 @@ IRQCHIP_DECLARE(ast2400_scu_ic, "aspeed,ast2400-scu-ic", aspeed_scu_ic_of_init);
 IRQCHIP_DECLARE(ast2500_scu_ic, "aspeed,ast2500-scu-ic", aspeed_scu_ic_of_init);
 IRQCHIP_DECLARE(ast2600_scu_ic0, "aspeed,ast2600-scu-ic0", aspeed_scu_ic_of_init);
 IRQCHIP_DECLARE(ast2600_scu_ic1, "aspeed,ast2600-scu-ic1", aspeed_scu_ic_of_init);
+IRQCHIP_DECLARE(ast2700_scu_ic0, "aspeed,ast2700-scu-ic0", aspeed_scu_ic_of_init);
+IRQCHIP_DECLARE(ast2700_scu_ic1, "aspeed,ast2700-scu-ic1", aspeed_scu_ic_of_init);
+IRQCHIP_DECLARE(ast2700_scu_ic2, "aspeed,ast2700-scu-ic2", aspeed_scu_ic_of_init);
+IRQCHIP_DECLARE(ast2700_scu_ic3, "aspeed,ast2700-scu-ic3", aspeed_scu_ic_of_init);