From cbb6caba0b66fa33ac119c2b992dc32d98b0065d Mon Sep 17 00:00:00 2001 From: Jayachandran C Date: Mon, 14 Jan 2013 15:11:56 +0000 Subject: [PATCH] --- yaml --- r: 360045 b: refs/heads/master c: a69ba6293d11b7dfd395a742f3449d6ddda8ecad h: refs/heads/master i: 360043: 1e456814d06297ec03ef6480c514868171055501 v: v3 --- [refs] | 2 +- trunk/arch/mips/include/asm/netlogic/xlp-hal/cpucontrol.h | 2 ++ trunk/arch/mips/netlogic/common/smpboot.S | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ae6e9aa9f7e7..94f1c81a47dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a264b5e8dc3cae1b07cea010d6283be6e67b0209 +refs/heads/master: a69ba6293d11b7dfd395a742f3449d6ddda8ecad diff --git a/trunk/arch/mips/include/asm/netlogic/xlp-hal/cpucontrol.h b/trunk/arch/mips/include/asm/netlogic/xlp-hal/cpucontrol.h index 7b63a6b722a0..6d2e58a9a542 100644 --- a/trunk/arch/mips/include/asm/netlogic/xlp-hal/cpucontrol.h +++ b/trunk/arch/mips/include/asm/netlogic/xlp-hal/cpucontrol.h @@ -46,6 +46,8 @@ #define CPU_BLOCKID_FPU 9 #define CPU_BLOCKID_MAP 10 +#define ICU_DEFEATURE 0x100 + #define LSU_DEFEATURE 0x304 #define LSU_DEBUG_ADDR 0x305 #define LSU_DEBUG_DATA0 0x306 diff --git a/trunk/arch/mips/netlogic/common/smpboot.S b/trunk/arch/mips/netlogic/common/smpboot.S index a0b74874bebe..d772a87fe846 100644 --- a/trunk/arch/mips/netlogic/common/smpboot.S +++ b/trunk/arch/mips/netlogic/common/smpboot.S @@ -69,6 +69,12 @@ #endif mtcr t1, t0 + li t0, ICU_DEFEATURE + mfcr t1, t0 + ori t1, 0x1000 /* Enable Icache partitioning */ + mtcr t1, t0 + + #ifdef XLP_AX_WORKAROUND li t0, SCHED_DEFEATURE lui t1, 0x0100 /* Disable BRU accepting ALU ops */