linux-mips
[Top] [All Lists]

[PATCH v2 4/4] MIPS: OCTEON: disable HOTPLUG_CPU if the bootloader versi

To: linux-mips@linux-mips.org, Ralf Baechle <ralf@linux-mips.org>, David Daney <ddaney.cavm@gmail.com>
Subject: [PATCH v2 4/4] MIPS: OCTEON: disable HOTPLUG_CPU if the bootloader version is incorrect
From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Sat, 28 Jun 2014 00:59:52 +0300
Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
In-reply-to: <1403906392-10650-1-git-send-email-aaro.koskinen@iki.fi>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <1403906392-10650-1-git-send-email-aaro.koskinen@iki.fi>
Sender: linux-mips-bounce@linux-mips.org
Disable HOTPLUG_CPU functionality if the bootloader version is incorrect.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
---
 arch/mips/cavium-octeon/smp.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c
index ea96930..ecd903d 100644
--- a/arch/mips/cavium-octeon/smp.c
+++ b/arch/mips/cavium-octeon/smp.c
@@ -88,8 +88,10 @@ static void octeon_smp_hotplug_setup(void)
                return;
 
        labi = (struct linux_app_boot_info 
*)PHYS_TO_XKSEG_CACHED(LABI_ADDR_IN_BOOTLOADER);
-       if (labi->labi_signature != LABI_SIGNATURE)
-               panic("The bootloader version on this board is incorrect.");
+       if (labi->labi_signature != LABI_SIGNATURE) {
+               pr_info("The bootloader on this board does not support 
HOTPLUG_CPU.");
+               return;
+       }
 
        octeon_bootloader_entry_addr = labi->InitTLBStart_addr;
 #endif
@@ -132,7 +134,8 @@ static void octeon_smp_setup(void)
         * will assign CPU numbers for possible cores as well.  Cores
         * are always consecutively numberd from 0.
         */
-       for (id = 0; setup_max_cpus && id < num_cores && id < NR_CPUS; id++) {
+       for (id = 0; setup_max_cpus && octeon_bootloader_entry_addr &&
+                    id < num_cores && id < NR_CPUS; id++) {
                if (!(core_mask & (1 << id))) {
                        set_cpu_possible(cpus, true);
                        __cpu_number_map[id] = cpus;
@@ -232,6 +235,9 @@ static int octeon_cpu_disable(void)
        if (cpu == 0)
                return -EBUSY;
 
+       if (!octeon_bootloader_entry_addr)
+               return -ENOTSUPP;
+
        set_cpu_online(cpu, false);
        cpu_clear(cpu, cpu_callin_map);
        local_irq_disable();
-- 
2.0.0


<Prev in Thread] Current Thread [Next in Thread>