linux-mips
[Top] [All Lists]

[PATCH 3/3] MIPS: OCTEON: disable SMP if the bootloader version is incor

To: linux-mips@linux-mips.org, Ralf Baechle <ralf@linux-mips.org>, David Daney <ddaney.cavm@gmail.com>
Subject: [PATCH 3/3] MIPS: OCTEON: disable SMP if the bootloader version is incorrect
From: Aaro Koskinen <aaro.koskinen@iki.fi>
Date: Mon, 16 Jun 2014 23:06:30 +0300
Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
In-reply-to: <1402949190-28182-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: <1402949190-28182-1-git-send-email-aaro.koskinen@iki.fi>
Sender: linux-mips-bounce@linux-mips.org
Disable SMP if the bootloader version is incorrect for HOTPLUG_CPU.

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

diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c
index ea96930..71f5505 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) {
+               setup_max_cpus = 0;
+               WARN(1, "Disabling SMP - the bootloader version on this board 
does not support HOTPLUG_CPU.");
+       }
 
        octeon_bootloader_entry_addr = labi->InitTLBStart_addr;
 #endif
-- 
2.0.0


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