From: Varun Sethi <Varun.Sethi@freescale.com>
Date: Mon, 9 Jul 2012 13:04:01 +0000 (+0530)
Subject: powerpc/booke: Add CPU_FTR_EMB_HV check for e5500.
X-Git-Tag: v3.7-rc1~108^2~10^2~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=39be5b4a7f232870aad0b3c130791eacd0d34347;p=profile%2Fivi%2Fkernel-x86-ivi.git

powerpc/booke: Add CPU_FTR_EMB_HV check for e5500.

Added CPU_FTR_EMB_HV feature check for e5500.

Signed-off-by: Varun Sethi <Varun.Sethi@freescale.com>
Signed-off-by: Mihai Caraman <mihai.caraman@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---

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