On Tue, 2016-04-05 at 12:17 +1000, David Gibson wrote:
> From: Cédric Le Goater
>
> From: Benjamin Herrenschmidt
>
> This patch fixes the current AIL implementation for POWER8. The
> interrupt vector address can be calculated directly from LPCR when
> the
> exception is handled. The excp_prefix update becomes useless and we
> can cleanup the H_SET_MODE hcall.
Beware, iirc, this depends on the new cpu_set_papr() stuff I did so we
get the right LPCR values in PAPR mode.
Cheers,
Ben.
> Signed-off-by: Benjamin Herrenschmidt
> [clg: Removed LPES0/1 handling for HV vs. !HV
> Fixed LPCR_ILE case for POWERPC_EXCP_POWER8 ]
> Signed-off-by: Cédric Le Goater
> [dwg: This was written as a cleanup, but it also fixes a real bug
> where setting an alternative interrupt location would not be
> correctly migrated]
> Signed-off-by: David Gibson
> ---
> hw/ppc/spapr_hcall.c| 16 +--
> include/hw/ppc/spapr.h | 5 -
> target-ppc/cpu.h| 10 +
> target-ppc/excp_helper.c| 49
> +++--
> target-ppc/translate_init.c | 2 +-
> 5 files changed, 59 insertions(+), 23 deletions(-)
>
> diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
> index 2dcb676..8f40602 100644
> --- a/hw/ppc/spapr_hcall.c
> +++ b/hw/ppc/spapr_hcall.c
> @@ -824,7 +824,6 @@ static target_ulong
> h_set_mode_resource_addr_trans_mode(PowerPCCPU *cpu,
> {
> CPUState *cs;
> PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu);
> -target_ulong prefix;
>
> if (!(pcc->insns_flags2 & PPC2_ISA207S)) {
> return H_P2;
> @@ -836,25 +835,12 @@ static target_ulong
> h_set_mode_resource_addr_trans_mode(PowerPCCPU *cpu,
> return H_P4;
> }
>
> -switch (mflags) {
> -case H_SET_MODE_ADDR_TRANS_NONE:
> -prefix = 0;
> -break;
> -case H_SET_MODE_ADDR_TRANS_0001_8000:
> -prefix = 0x18000;
> -break;
> -case H_SET_MODE_ADDR_TRANS_C000___4000:
> -prefix = 0xC0004000ULL;
> -break;
> -default:
> +if (mflags == AIL_RESERVED) {
> return H_UNSUPPORTED_FLAG;
> }
>
> CPU_FOREACH(cs) {
> -CPUPPCState *env = &POWERPC_CPU(cpu)->env;
> -
> set_spr(cs, SPR_LPCR, mflags << LPCR_AIL_SHIFT, LPCR_AIL);
> -env->excp_prefix = prefix;
> }
>
> return H_SUCCESS;
> diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
> index 098d85d..815d5ee 100644
> --- a/include/hw/ppc/spapr.h
> +++ b/include/hw/ppc/spapr.h
> @@ -204,11 +204,6 @@ struct sPAPRMachineState {
> #define H_SET_MODE_ENDIAN_BIG0
> #define H_SET_MODE_ENDIAN_LITTLE 1
>
> -/* Flags for H_SET_MODE_RESOURCE_ADDR_TRANS_MODE */
> -#define H_SET_MODE_ADDR_TRANS_NONE 0
> -#define H_SET_MODE_ADDR_TRANS_0001_8000 2
> -#define H_SET_MODE_ADDR_TRANS_C000___4000 3
> -
> /* VASI States */
> #define H_VASI_INVALID0
> #define H_VASI_ENABLED1
> diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h
> index 676081e..9d4e43c 100644
> --- a/target-ppc/cpu.h
> +++ b/target-ppc/cpu.h
> @@ -167,6 +167,8 @@ enum powerpc_excp_t {
> POWERPC_EXCP_970,
> /* POWER7 exception model */
> POWERPC_EXCP_POWER7,
> +/* POWER8 exception model */
> +POWERPC_EXCP_POWER8,
> #endif /* defined(TARGET_PPC64) */
> };
>
> @@ -2277,6 +2279,14 @@ enum {
> HMER_XSCOM_STATUS_LSH = (63 - 23),
> };
>
> +/* Alternate Interrupt Location (AIL) */
> +enum {
> +AIL_NONE= 0,
> +AIL_RESERVED= 1,
> +AIL_0001_8000 = 2,
> +AIL_C000___4000 = 3,
> +};
> +
> /***
> **/
>
> static inline target_ulong cpu_read_xer(CPUPPCState *env)
> diff --git a/target-ppc/excp_helper.c b/target-ppc/excp_helper.c
> index c890853..ca4ffe8 100644
> --- a/target-ppc/excp_helper.c
> +++ b/target-ppc/excp_helper.c
> @@ -77,7 +77,7 @@ static inline void powerpc_excp(PowerPCCPU *cpu,
> int excp_model, int excp)
> CPUPPCState *env = &cpu->env;
> target_ulong msr, new_msr, vector;
> int srr0, srr1, asrr0, asrr1;
> -int lpes0, lpes1, lev;
> +int lpes0, lpes1, lev, ail;
>
> if (0) {
> /* XXX: find a suitable condition to enable the hypervisor
> mode */
> @@ -108,6 +108,25 @@ static inline void powerpc_excp(PowerPCCPU *cpu,
> int excp_model, int excp)
> asrr0 = -1;
> asrr1 = -1;
>
> +/* Exception targetting modifiers
> + *
> + * AIL is initialized here but can be cleared by
> + * selected exceptions
> + */
> +#if defined(TARGET_PPC64)
> +if (excp_model == POWERPC_EXCP_POWER7 ||
> +excp_model == POWERPC_EXCP_POWER8) {
> +if (excp_model == POWERPC_EXCP_POWER8) {
> +ail = (env->spr[SPR_LPCR] & LPCR_AIL) >> LPCR_AIL_SHIFT;
> +} else {
> +ail = 0;
> +}
>
