| Message ID | 20220627141104.669152-6-matheus.ferst@eldorado.org.br |
|---|---|
| State | New |
| Headers | show |
| Series | Fix gen_*_exception error codes | expand |
On 6/27/22 11:11, Matheus Ferst wrote: > A call to "gen_(hv)priv_exception" should use POWERPC_EXCP_PRIV_* as the > 'error' argument instead of POWERPC_EXCP_INVAL_*, and POWERPC_EXCP_FU is > an exception type, not an exception error code. To correctly set > FSCR[IC], we should raise Facility Unavailable with this exception type > and IC value as the error code. > > Fixes: 565cb1096733 ("target/ppc: add user read/write functions for MMCR0") > Signed-off-by: Matheus Ferst <matheus.ferst@eldorado.org.br> > --- Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com> > target/ppc/power8-pmu-regs.c.inc | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/target/ppc/power8-pmu-regs.c.inc b/target/ppc/power8-pmu-regs.c.inc > index 2bab6cece7..c3cc919ee4 100644 > --- a/target/ppc/power8-pmu-regs.c.inc > +++ b/target/ppc/power8-pmu-regs.c.inc > @@ -22,7 +22,7 @@ > static bool spr_groupA_read_allowed(DisasContext *ctx) > { > if (!ctx->mmcr0_pmcc0 && ctx->mmcr0_pmcc1) { > - gen_hvpriv_exception(ctx, POWERPC_EXCP_FU); > + gen_exception_err(ctx, POWERPC_EXCP_FU, FSCR_IC_PMU); > return false; > } > > @@ -46,10 +46,10 @@ static bool spr_groupA_write_allowed(DisasContext *ctx) > > if (ctx->mmcr0_pmcc1) { > /* PMCC = 0b01 */ > - gen_hvpriv_exception(ctx, POWERPC_EXCP_FU); > + gen_exception_err(ctx, POWERPC_EXCP_FU, FSCR_IC_PMU); > } else { > /* PMCC = 0b00 */ > - gen_hvpriv_exception(ctx, POWERPC_EXCP_INVAL_SPR); > + gen_hvpriv_exception(ctx, POWERPC_EXCP_PRIV_REG); > } > > return false; > @@ -214,7 +214,7 @@ void spr_read_PMC56_ureg(DisasContext *ctx, int gprn, int sprn) > * Interrupt. > */ > if (ctx->mmcr0_pmcc0 && ctx->mmcr0_pmcc1) { > - gen_hvpriv_exception(ctx, POWERPC_EXCP_FU); > + gen_exception_err(ctx, POWERPC_EXCP_FU, FSCR_IC_PMU); > return; > } > > @@ -249,7 +249,7 @@ void spr_write_PMC56_ureg(DisasContext *ctx, int sprn, int gprn) > * Interrupt. > */ > if (ctx->mmcr0_pmcc0 && ctx->mmcr0_pmcc1) { > - gen_hvpriv_exception(ctx, POWERPC_EXCP_FU); > + gen_exception_err(ctx, POWERPC_EXCP_FU, FSCR_IC_PMU); > return; > } >
diff --git a/target/ppc/power8-pmu-regs.c.inc b/target/ppc/power8-pmu-regs.c.inc index 2bab6cece7..c3cc919ee4 100644 --- a/target/ppc/power8-pmu-regs.c.inc +++ b/target/ppc/power8-pmu-regs.c.inc @@ -22,7 +22,7 @@ static bool spr_groupA_read_allowed(DisasContext *ctx) { if (!ctx->mmcr0_pmcc0 && ctx->mmcr0_pmcc1) { - gen_hvpriv_exception(ctx, POWERPC_EXCP_FU); + gen_exception_err(ctx, POWERPC_EXCP_FU, FSCR_IC_PMU); return false; } @@ -46,10 +46,10 @@ static bool spr_groupA_write_allowed(DisasContext *ctx) if (ctx->mmcr0_pmcc1) { /* PMCC = 0b01 */ - gen_hvpriv_exception(ctx, POWERPC_EXCP_FU); + gen_exception_err(ctx, POWERPC_EXCP_FU, FSCR_IC_PMU); } else { /* PMCC = 0b00 */ - gen_hvpriv_exception(ctx, POWERPC_EXCP_INVAL_SPR); + gen_hvpriv_exception(ctx, POWERPC_EXCP_PRIV_REG); } return false; @@ -214,7 +214,7 @@ void spr_read_PMC56_ureg(DisasContext *ctx, int gprn, int sprn) * Interrupt. */ if (ctx->mmcr0_pmcc0 && ctx->mmcr0_pmcc1) { - gen_hvpriv_exception(ctx, POWERPC_EXCP_FU); + gen_exception_err(ctx, POWERPC_EXCP_FU, FSCR_IC_PMU); return; } @@ -249,7 +249,7 @@ void spr_write_PMC56_ureg(DisasContext *ctx, int sprn, int gprn) * Interrupt. */ if (ctx->mmcr0_pmcc0 && ctx->mmcr0_pmcc1) { - gen_hvpriv_exception(ctx, POWERPC_EXCP_FU); + gen_exception_err(ctx, POWERPC_EXCP_FU, FSCR_IC_PMU); return; }
A call to "gen_(hv)priv_exception" should use POWERPC_EXCP_PRIV_* as the 'error' argument instead of POWERPC_EXCP_INVAL_*, and POWERPC_EXCP_FU is an exception type, not an exception error code. To correctly set FSCR[IC], we should raise Facility Unavailable with this exception type and IC value as the error code. Fixes: 565cb1096733 ("target/ppc: add user read/write functions for MMCR0") Signed-off-by: Matheus Ferst <matheus.ferst@eldorado.org.br> --- target/ppc/power8-pmu-regs.c.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)