| Message ID | 1394167061-19317-2-git-send-email-aik@ozlabs.ru |
|---|---|
| State | New |
| Headers | show |
On Fri, 7 Mar 2014 15:37:39 +1100 Alexey Kardashevskiy <aik@ozlabs.ru> wrote: > This flag will be used to decide whether to emulate some bits of > H_SET_MODE hypercall because some are POWER8-only. > > While we are here, add 2.05 flag to POWER8 family too. POWER7/7+ already > have it. > > Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> > --- Reviewed-by: Greg Kurz <gkurz@linux.vnet.ibm.com> > target-ppc/cpu.h | 2 ++ > target-ppc/translate_init.c | 3 ++- > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h > index afab267..27a2cd9 100644 > --- a/target-ppc/cpu.h > +++ b/target-ppc/cpu.h > @@ -1900,6 +1900,8 @@ enum { > PPC2_LSQ_ISA207 = 0x0000000000002000ULL, > /* ISA 2.07 Altivec */ > PPC2_ALTIVEC_207 = 0x0000000000004000ULL, > + /* PowerISA 2.07 Book3s specification */ > + PPC2_ISA207S = 0x0000000000008000ULL, > > #define PPC_TCG_INSNS2 (PPC2_BOOKE206 | PPC2_VSX | PPC2_PRCNTL | PPC2_DBRX | \ > PPC2_ISA205 | PPC2_VSX207 | PPC2_PERM_ISA206 | \ > diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c > index 3eafbb0..9f896eb 100644 > --- a/target-ppc/translate_init.c > +++ b/target-ppc/translate_init.c > @@ -7172,7 +7172,8 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) > PPC2_PERM_ISA206 | PPC2_DIVE_ISA206 | > PPC2_ATOMIC_ISA206 | PPC2_FP_CVT_ISA206 | > PPC2_FP_TST_ISA206 | PPC2_BCTAR_ISA207 | > - PPC2_LSQ_ISA207 | PPC2_ALTIVEC_207; > + PPC2_LSQ_ISA207 | PPC2_ALTIVEC_207 | > + PPC2_ISA205 | PPC2_ISA207S; > pcc->msr_mask = 0x800000000284FF36ULL; > pcc->mmu_model = POWERPC_MMU_2_06; > #if defined(CONFIG_SOFTMMU)
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index afab267..27a2cd9 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -1900,6 +1900,8 @@ enum { PPC2_LSQ_ISA207 = 0x0000000000002000ULL, /* ISA 2.07 Altivec */ PPC2_ALTIVEC_207 = 0x0000000000004000ULL, + /* PowerISA 2.07 Book3s specification */ + PPC2_ISA207S = 0x0000000000008000ULL, #define PPC_TCG_INSNS2 (PPC2_BOOKE206 | PPC2_VSX | PPC2_PRCNTL | PPC2_DBRX | \ PPC2_ISA205 | PPC2_VSX207 | PPC2_PERM_ISA206 | \ diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 3eafbb0..9f896eb 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7172,7 +7172,8 @@ POWERPC_FAMILY(POWER8)(ObjectClass *oc, void *data) PPC2_PERM_ISA206 | PPC2_DIVE_ISA206 | PPC2_ATOMIC_ISA206 | PPC2_FP_CVT_ISA206 | PPC2_FP_TST_ISA206 | PPC2_BCTAR_ISA207 | - PPC2_LSQ_ISA207 | PPC2_ALTIVEC_207; + PPC2_LSQ_ISA207 | PPC2_ALTIVEC_207 | + PPC2_ISA205 | PPC2_ISA207S; pcc->msr_mask = 0x800000000284FF36ULL; pcc->mmu_model = POWERPC_MMU_2_06; #if defined(CONFIG_SOFTMMU)
This flag will be used to decide whether to emulate some bits of H_SET_MODE hypercall because some are POWER8-only. While we are here, add 2.05 flag to POWER8 family too. POWER7/7+ already have it. Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> --- target-ppc/cpu.h | 2 ++ target-ppc/translate_init.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-)