summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/cpu_setup_fsl_booke.S
diff options
context:
space:
mode:
authorVarun Sethi <Varun.Sethi@freescale.com>2012-07-09 18:34:01 +0530
committerKumar Gala <galak@kernel.crashing.org>2012-09-12 14:57:09 -0500
commit39be5b4a7f232870aad0b3c130791eacd0d34347 (patch)
tree7731588df2a43e42dae67d47f2b0de2ced2401be /arch/powerpc/kernel/cpu_setup_fsl_booke.S
parent0778407f836d632cce90e5d9df490a7c5e6e398a (diff)
downloadlinux-39be5b4a7f232870aad0b3c130791eacd0d34347.tar.bz2
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>
Diffstat (limited to 'arch/powerpc/kernel/cpu_setup_fsl_booke.S')
-rw-r--r--arch/powerpc/kernel/cpu_setup_fsl_booke.S6
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 1345e1bc748a..dcd881937f7a 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