diff mbox series

irqchip/irq-bcm7038-l1: Guard uses of cpu_logical_map

Message ID 20200724184157.29150-1-f.fainelli@gmail.com (mailing list archive)
State Mainlined
Commit 9808357ff2e5bfe1e0dcafef5e78cc5b617a7078
Headers show
Series irqchip/irq-bcm7038-l1: Guard uses of cpu_logical_map | expand

Commit Message

Florian Fainelli July 24, 2020, 6:41 p.m. UTC
cpu_logical_map is only defined for CONFIG_SMP builds, when we are in an
UP configuration, the boot CPU is 0.

Reported-by: kernel test robot <lkp@intel.com>
Fixes: 6468fc18b006 ("irqchip/irq-bcm7038-l1: Add PM support")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 drivers/irqchip/irq-bcm7038-l1.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Marc Zyngier July 25, 2020, 2:23 p.m. UTC | #1
On Fri, 24 Jul 2020 11:41:56 -0700, Florian Fainelli wrote:
> cpu_logical_map is only defined for CONFIG_SMP builds, when we are in an
> UP configuration, the boot CPU is 0.

Applied to irq/irqchip-5.9, thanks!

[1/1] irqchip/irq-bcm7038-l1: Guard uses of cpu_logical_map
      commit: 29a190b6a2bd9ef4282e2f73e7abd76203740150

Cheers,

	M.
diff mbox series

Patch

diff --git a/drivers/irqchip/irq-bcm7038-l1.c b/drivers/irqchip/irq-bcm7038-l1.c
index fd7c537fb42a..4127eeab10af 100644
--- a/drivers/irqchip/irq-bcm7038-l1.c
+++ b/drivers/irqchip/irq-bcm7038-l1.c
@@ -327,7 +327,11 @@  static int bcm7038_l1_suspend(void)
 	u32 val;
 
 	/* Wakeup interrupt should only come from the boot cpu */
+#ifdef CONFIG_SMP
 	boot_cpu = cpu_logical_map(0);
+#else
+	boot_cpu = 0;
+#endif
 
 	list_for_each_entry(intc, &bcm7038_l1_intcs_list, list) {
 		for (word = 0; word < intc->n_words; word++) {
@@ -347,7 +351,11 @@  static void bcm7038_l1_resume(void)
 	struct bcm7038_l1_chip *intc;
 	int boot_cpu, word;
 
+#ifdef CONFIG_SMP
 	boot_cpu = cpu_logical_map(0);
+#else
+	boot_cpu = 0;
+#endif
 
 	list_for_each_entry(intc, &bcm7038_l1_intcs_list, list) {
 		for (word = 0; word < intc->n_words; word++) {