[PATCH 4/4] powerpc/booke: Add CPU_FTR_EMB_HV check for e5500.

Varun Sethi Varun.Sethi at freescale.com
Mon Jul 9 23:04:01 EST 2012


Added CPU_FTR_EMB_HV feature check for e550.

Signed-off-by: Varun Sethi <Varun.Sethi at freescale.com>
Signed-off-by: Mihai Caraman <mihai.caraman at freescale.com>
---
 arch/powerpc/kernel/cpu_setup_fsl_booke.S |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/arch/powerpc/kernel/cpu_setup_fsl_booke.S b/arch/powerpc/kernel/cpu_setup_fsl_booke.S
index 1345e1b..dcd8819 100644
--- a/arch/powerpc/kernel/cpu_setup_fsl_booke.S
+++ b/arch/powerpc/kernel/cpu_setup_fsl_booke.S
@@ -143,7 +143,13 @@ _GLOBAL(__setup_cpu_e5500)
 	rlwinm.	r10,r10,0,MMUCFG_LPIDSIZE
 	beq	1f
 	bl	.setup_ehv_ivors
+	b	2f
 1:
+	ld	r10,CPU_SPEC_FEATURES(r4)
+	LOAD_REG_IMMEDIATE(r9,CPU_FTR_EMB_HV)
+	andc	r10,r10,r9
+	std	r10,CPU_SPEC_FEATURES(r4)
+2:
 	mtlr	r5
 	blr
 #endif
-- 
1.7.4.1




More information about the Linuxppc-dev mailing list