Skip to contentSkip to conversation

irqchip: gic-v3-its: fix build for !SMP

PATCH Applied Ard Biesheuvel 3 participants 3 messages Jan 22, 2022 – Jan 24, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 irqchip: gic-v3-its: fix build for !SMP

Commit 835f442fdbce ("irqchip/gic-v3-its: Limit memreserve cpuhp state lifetime") added a reference to cpus_booted_once_mask, which does not exist on !SMP builds, breaking the build for such configurations.

Given the intent of the check, short circuit it to always pass.

Cc Valentin Schneider <[email protected]>
Fixes 835f442fdbce ("irqchip/gic-v3-its: Limit memreserve cpuhp state lifetime")
---
 drivers/irqchip/irq-gic-v3-its.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/irqchip/irq-gic-v3-its.c +2 -1
index d25b7a864bbb..d2d61d89c3b8 100644
@@ -5241,7 +5241,8 @@ static int its_cpu_memreserve_lpi(unsigned int cpu)
 
 out:
 	/* Last CPU being brought up gets to issue the cleanup */
-	if (cpumask_equal(&cpus_booted_once_mask, cpu_possible_mask))
+	if (!IS_ENABLED(CONFIG_SMP) ||
+	    cpumask_equal(&cpus_booted_once_mask, cpu_possible_mask))
 		schedule_work(&rdist_memreserve_cpuhp_cleanup_work);
 
 	gic_data_rdist()->flags |= RD_LOCAL_MEMRESERVE_DONE;
Signature · 1 line
2.30.2
#1 lore raw

[irqchip: irq/irqchip-fixes] irqchip/gic-v3-its: Fix build for !SMP

The following commit has been merged into the irq/irqchip-fixes branch of irqchip:

The following commit has been merged into the irq/irqchip-fixes branch of irqchip:

Commit-ID:     16436f70abeebb29cd99444e27b310755806c1fa
Gitweb:        https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/16436f70abeebb29cd99444e27b310755806c1fa
Author:        Ard Biesheuvel <[email protected]>
AuthorDate:    Sat, 22 Jan 2022 16:16:14 +01:00
Committer:     Marc Zyngier <[email protected]>
CommitterDate: Sat, 22 Jan 2022 15:42:49 

irqchip/gic-v3-its: Fix build for !SMP

Commit 835f442fdbce ("irqchip/gic-v3-its: Limit memreserve cpuhp state lifetime") added a reference to cpus_booted_once_mask, which does not exist on !SMP builds, breaking the build for such configurations.

Given the intent of the check, short circuit it to always pass.

Cc Valentin Schneider <[email protected]>
Fixes 835f442fdbce ("irqchip/gic-v3-its: Limit memreserve cpuhp state lifetime")
---
 drivers/irqchip/irq-gic-v3-its.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/irqchip/irq-gic-v3-its.c +2 -1
index ee83eb3..7b8f1ec 100644
@@ -5241,7 +5241,8 @@ static int its_cpu_memreserve_lpi(unsigned int cpu)
 
 out:
 	/* Last CPU being brought up gets to issue the cleanup */
-	if (cpumask_equal(&cpus_booted_once_mask, cpu_possible_mask))
+	if (!IS_ENABLED(CONFIG_SMP) ||
+	    cpumask_equal(&cpus_booted_once_mask, cpu_possible_mask))
 		schedule_work(&rdist_memreserve_cpuhp_cleanup_work);
 
 	gic_data_rdist()->flags |= RD_LOCAL_MEMRESERVE_DONE;
#2 lore raw
In reply to Ard Biesheuvel
Quoted 9 lines · Ard Biesheuvel

Commit 835f442fdbce ("irqchip/gic-v3-its: Limit memreserve cpuhp state lifetime") added a reference to cpus_booted_once_mask, which does not exist on !SMP builds, breaking the build for such configurations.

Given the intent of the check, short circuit it to always pass.

Cc Valentin Schneider <[email protected]>
Fixes 835f442fdbce ("irqchip/gic-v3-its: Limit memreserve cpuhp state lifetime")

Sorry about that, and thanks for the fix.

This looks fine to me, though one alternative to prevent future IS_ENABLED() proliferations would be to make cpus_booted_once_mask exist for !SMP - the online, active, present and possible masks exist for !SMP already after all.

---

kernel/cpu.c +0 -4
index 407a2568f35e..7487b7061f2c 100644
@@ -84,9 +84,7 @@ static DEFINE_PER_CPU(struct cpuhp_cpu_state, cpuhp_state) = {
 	.fail = CPUHP_INVALID,
 };
 
-#ifdef CONFIG_SMP
 cpumask_t cpus_booted_once_mask;
-#endif
 
 #if defined(CONFIG_LOCKDEP) && defined(CONFIG_SMP)
 static struct lockdep_map cpuhp_state_up_map =
@@ -2662,9 +2660,7 @@ void __init boot_cpu_init(void)
  */
 void __init boot_cpu_hotplug_init(void)
 {
-#ifdef CONFIG_SMP
 	cpumask_set_cpu(smp_processor_id(), &cpus_booted_once_mask);
-#endif
 	this_cpu_write(cpuhp_state.state, CPUHP_ONLINE);
 }