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 1345e1bc748a643898eb6ced7115a47b6b34d7da..dcd881937f7a9217c2c6b7843d218a1d6b777970 100644 (file)
--- 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