irqchip/gic-v3: Add support for ACPI's disabled but 'online capable' CPUs

To support virtual CPU hotplug, ACPI has added an 'online capable' bit
to the MADT GICC entries. This indicates a disabled CPU entry may not
be possible to online via PSCI until firmware has set enabled bit in
_STA.

This means that a "usable" GIC redistributor is one that is marked as
either enabled, or online capable. The meaning of the
acpi_gicc_is_usable() would become less clear than just checking the
pair of flags at call sites. As such, drop that helper function.
The test in gic_acpi_match_gicc() remains as testing just the
enabled bit so the count of enabled distributors is correct.

What about the redistributor in the GICC entry? ACPI doesn't want to say.
Assume the worst: When a redistributor is described in the GICC entry,
but the entry is marked as disabled at boot, assume the redistributor
is inaccessible.

The GICv3 driver doesn't support late online of redistributors, so this
means the corresponding CPU can't be brought online either.
Rather than modifying cpu masks that may already have been used,
register a new cpuhp callback to fail this case. This must run earlier
than the main gic_starting_cpu() so that this case can be rejected
before the section of cpuhp that runs on the CPU that is coming up as
that is not allowed to fail. This solution keeps the handling of this
broken firmware corner case local to the GIC driver. As precise ordering
of this callback doesn't need to be controlled as long as it is
in that initial prepare phase, use CPUHP_BP_PREPARE_DYN.

Systems that want CPU hotplug in a VM can ensure their redistributors
are always-on, and describe them that way with a GICR entry in the MADT.

Suggested-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: James Morse <james.morse@arm.com>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Tested-by: Miguel Luis <miguel.luis@oracle.com>
Co-developed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Acked-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20240529133446.28446-15-Jonathan.Cameron@huawei.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index 31c8b3094dd7bfd205470bffb079ac7d36ba6dae..6b0572daa9dab85f09356e6ae52a92350c1876de 100644 (file)
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -530,7 +530,8 @@ acpi_map_gic_cpu_interface(struct acpi_madt_generic_interrupt *processor)
 {
        u64 hwid = processor->arm_mpidr;
 
-       if (!acpi_gicc_is_usable(processor)) {
+       if (!(processor->flags &
+             (ACPI_MADT_ENABLED | ACPI_MADT_GICC_ONLINE_CAPABLE))) {
                pr_debug("skipping disabled CPU entry with 0x%llx MPIDR\n", hwid);
                return;
        }

diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c
index b203cfe2855023eb1a664874d55fabcd932a1a06..b04b684f31904ee388b257a8c724b2232962698d 100644 (file)
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
@@ -90,7 +90,8 @@ static int map_gicc_mpidr(struct acpi_subtable_header *entry,
        struct acpi_madt_generic_interrupt *gicc =
            container_of(entry, struct acpi_madt_generic_interrupt, header);
 
-       if (!acpi_gicc_is_usable(gicc))
+       if (!(gicc->flags &
+             (ACPI_MADT_ENABLED | ACPI_MADT_GICC_ONLINE_CAPABLE)))
                return -ENODEV;
 
        /* device_declaration means Device object in DSDT, in the

diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index 10af15f93d4d410e4e195f740bef48cf913bd57a..cc81515c1413b957a32ccfbd9e1f16eacc26c767 100644 (file)
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -44,6 +44,8 @@
 
 #define GIC_IRQ_TYPE_PARTITION (GIC_IRQ_TYPE_LPI + 1)
 
+static struct cpumask broken_rdists __read_mostly;
+
 struct redist_region {
        void __iomem            *redist_base;
        phys_addr_t             phys_base;
@@ -1293,6 +1295,18 @@ static void gic_cpu_init(void)
 #define MPIDR_TO_SGI_RS(mpidr) (MPIDR_RS(mpidr) << ICC_SGI1R_RS_SHIFT)
 #define MPIDR_TO_SGI_CLUSTER_ID(mpidr) ((mpidr) & ~0xFUL)
 
+/*
+ * gic_starting_cpu() is called after the last point where cpuhp is allowed
+ * to fail. So pre check for problems earlier.
+ */
+static int gic_check_rdist(unsigned int cpu)
+{
+       if (cpumask_test_cpu(cpu, &broken_rdists))
+               return -EINVAL;
+
+       return 0;
+}
+
 static int gic_starting_cpu(unsigned int cpu)
 {
        gic_cpu_init();
@@ -1384,6 +1398,10 @@ static void __init gic_smp_init(void)
        };
        int base_sgi;
 
+       cpuhp_setup_state_nocalls(CPUHP_BP_PREPARE_DYN,
+                                 "irqchip/arm/gicv3:checkrdist",
+                                 gic_check_rdist, NULL);
+
        cpuhp_setup_state_nocalls(CPUHP_AP_IRQ_GIC_STARTING,
                                  "irqchip/arm/gicv3:starting",
                                  gic_starting_cpu, NULL);
@@ -2365,8 +2383,24 @@ gic_acpi_parse_madt_gicc(union acpi_subtable_headers *header,
        u32 size = reg == GIC_PIDR2_ARCH_GICv4 ? SZ_64K * 4 : SZ_64K * 2;
        void __iomem *redist_base;
 
-       if (!acpi_gicc_is_usable(gicc))
+       /* Neither enabled or online capable means it doesn't exist, skip it */
+       if (!(gicc->flags & (ACPI_MADT_ENABLED | ACPI_MADT_GICC_ONLINE_CAPABLE)))
+               return 0;
+
+       /*
+        * Capable but disabled CPUs can be brought online later. What about
+        * the redistributor? ACPI doesn't want to say!
+        * Virtual hotplug systems can use the MADT's "always-on" GICR entries.
+        * Otherwise, prevent such CPUs from being brought online.
+        */
+       if (!(gicc->flags & ACPI_MADT_ENABLED)) {
+               int cpu = get_cpu_for_acpi_id(gicc->uid);
+
+               pr_warn("CPU %u's redistributor is inaccessible: this CPU can't be brought online\n", cpu);
+               if (cpu >= 0)
+                       cpumask_set_cpu(cpu, &broken_rdists);
                return 0;
+       }
 
        redist_base = ioremap(gicc->gicr_base_address, size);
        if (!redist_base)
@@ -2413,9 +2447,12 @@ static int __init gic_acpi_match_gicc(union acpi_subtable_headers *header,
 
        /*
         * If GICC is enabled and has valid gicr base address, then it means
-        * GICR base is presented via GICC
+        * GICR base is presented via GICC. The redistributor is only known to
+        * be accessible if the GICC is marked as enabled. If this bit is not
+        * set, we'd need to add the redistributor at runtime, which isn't
+        * supported.
         */
-       if (acpi_gicc_is_usable(gicc) && gicc->gicr_base_address)
+       if (gicc->flags & ACPI_MADT_ENABLED && gicc->gicr_base_address)
                acpi_data.enabled_rdists++;
 
        return 0;
@@ -2474,7 +2511,8 @@ static int __init gic_acpi_parse_virt_madt_gicc(union acpi_subtable_headers *hea
        int maint_irq_mode;
        static int first_madt = true;
 
-       if (!acpi_gicc_is_usable(gicc))
+       if (!(gicc->flags &
+             (ACPI_MADT_ENABLED | ACPI_MADT_GICC_ONLINE_CAPABLE)))
                return 0;
 
        maint_irq_mode = (gicc->flags & ACPI_MADT_VGIC_IRQ_MODE) ?

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index fd45bfab66b8fd34154939c86a020822f5bfcc6f..9f8c9d29b035f1c7ac0a44e22ab14407740e5461 100644 (file)
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -237,11 +237,6 @@ acpi_table_parse_cedt(enum acpi_cedt_type id,
 int acpi_parse_mcfg (struct acpi_table_header *header);
 void acpi_table_print_madt_entry (struct acpi_subtable_header *madt);
 
-static inline bool acpi_gicc_is_usable(struct acpi_madt_generic_interrupt *gicc)
-{
-       return gicc->flags & ACPI_MADT_ENABLED;
-}
-
 #if defined(CONFIG_X86) || defined(CONFIG_LOONGARCH)
 void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa);
 #else