]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
irqchip/irq-bcm7038-l1: Guard uses of cpu_logical_map
authorFlorian Fainelli <f.fainelli@gmail.com>
Fri, 24 Jul 2020 18:41:56 +0000 (11:41 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 Aug 2020 06:26:13 +0000 (08:26 +0200)
[ 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

index fd7c537fb42ac9f6a18c7da4b93cdb5ede304996..4127eeab10af1e33b4b7ffd7fc76a2982285ac4e 100644 (file)
@@ -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++) {