| From 798f1c19171b8a9d6bf1644a82fe5d11e172d329 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 24 Jul 2020 11:41:56 -0700 |
| Subject: irqchip/irq-bcm7038-l1: Guard uses of cpu_logical_map |
| |
| From: Florian Fainelli <f.fainelli@gmail.com> |
| |
| [ Upstream commit 9808357ff2e5bfe1e0dcafef5e78cc5b617a7078 ] |
| |
| cpu_logical_map is only defined for CONFIG_SMP builds, when we are in an |
| UP configuration, the boot CPU is 0. |
| |
| Fixes: 6468fc18b006 ("irqchip/irq-bcm7038-l1: Add PM support") |
| Reported-by: kernel test robot <lkp@intel.com> |
| Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> |
| Signed-off-by: Marc Zyngier <maz@kernel.org> |
| Link: https://lore.kernel.org/r/20200724184157.29150-1-f.fainelli@gmail.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/irqchip/irq-bcm7038-l1.c | 8 ++++++++ |
| 1 file changed, 8 insertions(+) |
| |
| diff --git a/drivers/irqchip/irq-bcm7038-l1.c b/drivers/irqchip/irq-bcm7038-l1.c |
| index fd7c537fb42ac..4127eeab10af1 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++) { |
| -- |
| 2.25.1 |
| |
