| Message ID | 1484288903-18807-4-git-send-email-sjitindarsingh@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jan 13, 2017 at 05:28:09PM +1100, Suraj Jitindar Singh wrote: > pcr_supported is used to define the supported PCR values for a given > processor. A POWER9 processor can support 3.00, 2.07, 2.06 and 2.05 > compatibility modes, thus we set this accordingly. > > Signed-off-by: Suraj Jitindar Singh <sjitindarsingh@gmail.com> This looks fine to go ahead now, so I've merged it to ppc-for-2.9. > --- > target/ppc/cpu.h | 1 + > target/ppc/translate_init.c | 2 ++ > 2 files changed, 3 insertions(+) > > diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h > index 2a50c43..afb7ddb 100644 > --- a/target/ppc/cpu.h > +++ b/target/ppc/cpu.h > @@ -2250,6 +2250,7 @@ enum { > PCR_COMPAT_2_05 = 1ull << (63-62), > PCR_COMPAT_2_06 = 1ull << (63-61), > PCR_COMPAT_2_07 = 1ull << (63-60), > + PCR_COMPAT_3_00 = 1ull << (63-59), > PCR_VEC_DIS = 1ull << (63-0), /* Vec. disable (bit NA since POWER8) */ > PCR_VSX_DIS = 1ull << (63-1), /* VSX disable (bit NA since POWER8) */ > PCR_TM_DIS = 1ull << (63-2), /* Trans. memory disable (POWER8) */ > diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c > index 626e031..bfc1f24 100644 > --- a/target/ppc/translate_init.c > +++ b/target/ppc/translate_init.c > @@ -8797,6 +8797,8 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data) > dc->props = powerpc_servercpu_properties; > pcc->pvr_match = ppc_pvr_match_power9; > pcc->pcr_mask = PCR_COMPAT_2_05 | PCR_COMPAT_2_06 | PCR_COMPAT_2_07; > + pcc->pcr_supported = PCR_COMPAT_3_00 | PCR_COMPAT_2_07 | PCR_COMPAT_2_06 | > + PCR_COMPAT_2_05; > pcc->init_proc = init_proc_POWER9; > pcc->check_pow = check_pow_nocheck; > pcc->insns_flags = PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB |
diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index 2a50c43..afb7ddb 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -2250,6 +2250,7 @@ enum { PCR_COMPAT_2_05 = 1ull << (63-62), PCR_COMPAT_2_06 = 1ull << (63-61), PCR_COMPAT_2_07 = 1ull << (63-60), + PCR_COMPAT_3_00 = 1ull << (63-59), PCR_VEC_DIS = 1ull << (63-0), /* Vec. disable (bit NA since POWER8) */ PCR_VSX_DIS = 1ull << (63-1), /* VSX disable (bit NA since POWER8) */ PCR_TM_DIS = 1ull << (63-2), /* Trans. memory disable (POWER8) */ diff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c index 626e031..bfc1f24 100644 --- a/target/ppc/translate_init.c +++ b/target/ppc/translate_init.c @@ -8797,6 +8797,8 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data) dc->props = powerpc_servercpu_properties; pcc->pvr_match = ppc_pvr_match_power9; pcc->pcr_mask = PCR_COMPAT_2_05 | PCR_COMPAT_2_06 | PCR_COMPAT_2_07; + pcc->pcr_supported = PCR_COMPAT_3_00 | PCR_COMPAT_2_07 | PCR_COMPAT_2_06 | + PCR_COMPAT_2_05; pcc->init_proc = init_proc_POWER9; pcc->check_pow = check_pow_nocheck; pcc->insns_flags = PPC_INSNS_BASE | PPC_ISEL | PPC_STRING | PPC_MFTB |
pcr_supported is used to define the supported PCR values for a given processor. A POWER9 processor can support 3.00, 2.07, 2.06 and 2.05 compatibility modes, thus we set this accordingly. Signed-off-by: Suraj Jitindar Singh <sjitindarsingh@gmail.com> --- target/ppc/cpu.h | 1 + target/ppc/translate_init.c | 2 ++ 2 files changed, 3 insertions(+)