summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Burton <paul.burton@imgtec.com>2014-01-15 10:31:56 +0000
committerRalf Baechle <ralf@linux-mips.org>2014-03-26 23:09:07 +0100
commite56b6aa6da1a77175e003c85cdb554db7154b1c9 (patch)
tree2136b12c6b44f79c22e1f2f5f01429070e3cb51d
parent7dc2834fd57e12b355ee80ae5edf134af7476a3b (diff)
downloadop-kernel-dev-e56b6aa6da1a77175e003c85cdb554db7154b1c9.zip
op-kernel-dev-e56b6aa6da1a77175e003c85cdb554db7154b1c9.tar.gz
MIPS: Malta: Allow use of MIPS CPS SMP implementation
This patch simply attempts to register the MIPS Coherent Processing System SMP implementation when it is enabled. If registering that fails for some reason (like the Kconfig option being disabled or a lack of hardware support) then we fall back to the same SMP implementations as before. Signed-off-by: Paul Burton <paul.burton@imgtec.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/6365/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/Kconfig1
-rw-r--r--arch/mips/mti-malta/malta-init.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index d7543f2..38a77e4 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -329,6 +329,7 @@ config MIPS_MALTA
select SYS_SUPPORTS_BIG_ENDIAN
select SYS_SUPPORTS_LITTLE_ENDIAN
select SYS_SUPPORTS_MIPS_CMP
+ select SYS_SUPPORTS_MIPS_CPS
select SYS_SUPPORTS_MULTITHREADING
select SYS_SUPPORTS_SMARTMIPS
select SYS_SUPPORTS_ZBOOT
diff --git a/arch/mips/mti-malta/malta-init.c b/arch/mips/mti-malta/malta-init.c
index 1381365..eebb2d15 100644
--- a/arch/mips/mti-malta/malta-init.c
+++ b/arch/mips/mti-malta/malta-init.c
@@ -285,6 +285,8 @@ mips_pci_controller:
mips_cm_probe();
mips_cpc_probe();
+ if (!register_cps_smp_ops())
+ return;
if (!register_cmp_smp_ops())
return;
if (!register_vsmp_smp_ops())
OpenPOWER on IntegriCloud