Message ID | 1341839041-17223-1-git-send-email-Varun.Sethi@freescale.com |
---|---|
State | New, archived |
Headers | show |
On Jul 9, 2012, at 8:04 AM, Varun Sethi wrote: > Added CPU_FTR_EMB_HV feature check for e550. > > Signed-off-by: Varun Sethi <Varun.Sethi@freescale.com> > Signed-off-by: Mihai Caraman <mihai.caraman@freescale.com> > --- > arch/powerpc/kernel/cpu_setup_fsl_booke.S | 6 ++++++ > 1 files changed, 6 insertions(+), 0 deletions(-) [ fixed typo e550 -> e5500 ] applied to next - k -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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