On Mon, Mar 16, 2020 at 07:15:14PM +0100, Cédric Le Goater wrote: > On 3/16/20 3:26 PM, Nicholas Piggin wrote: > > Provide for an alternate delivery location, -1 defaults to the > > architected address. > > I don't know what is the best approach, to override the vector addr > computed by powerpc_excp() or use a machine class handler with > cpu->vhyp.
Again, in the interests of getting this in for the soft freeze, I've
applied this now. We can clean it up later.
>
> > Signed-off-by: Nicholas Piggin <npig...@gmail.com>
> > ---
> > hw/ppc/spapr.c | 2 +-
> > target/ppc/cpu.h | 2 +-
> > target/ppc/excp_helper.c | 5 ++++-
> > 3 files changed, 6 insertions(+), 3 deletions(-)
> >
> > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> > index 5f93c49706..25221d843c 100644
> > --- a/hw/ppc/spapr.c
> > +++ b/hw/ppc/spapr.c
> > @@ -3400,7 +3400,7 @@ static void spapr_machine_finalizefn(Object *obj)
> > void spapr_do_system_reset_on_cpu(CPUState *cs, run_on_cpu_data arg)
> > {
> > cpu_synchronize_state(cs);
> > - ppc_cpu_do_system_reset(cs);
> > + ppc_cpu_do_system_reset(cs, -1);
> > }
> >
> > static void spapr_nmi(NMIState *n, int cpu_index, Error **errp)
> > diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
> > index 3953680534..f8c7d6f19c 100644
> > --- a/target/ppc/cpu.h
> > +++ b/target/ppc/cpu.h
> > @@ -1220,7 +1220,7 @@ int ppc64_cpu_write_elf64_note(WriteCoreDumpFunction
> > f, CPUState *cs,
> > int ppc32_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs,
> > int cpuid, void *opaque);
> > #ifndef CONFIG_USER_ONLY
> > -void ppc_cpu_do_system_reset(CPUState *cs);
> > +void ppc_cpu_do_system_reset(CPUState *cs, target_ulong vector);
> > void ppc_cpu_do_fwnmi_machine_check(CPUState *cs, target_ulong vector);
> > extern const VMStateDescription vmstate_ppc_cpu;
> > #endif
> > diff --git a/target/ppc/excp_helper.c b/target/ppc/excp_helper.c
> > index 7f2b5899d3..08bc885ca6 100644
> > --- a/target/ppc/excp_helper.c
> > +++ b/target/ppc/excp_helper.c
> > @@ -961,12 +961,15 @@ static void ppc_hw_interrupt(CPUPPCState *env)
> > }
> > }
> >
> > -void ppc_cpu_do_system_reset(CPUState *cs)
> > +void ppc_cpu_do_system_reset(CPUState *cs, target_ulong vector)
> > {
> > PowerPCCPU *cpu = POWERPC_CPU(cs);
> > CPUPPCState *env = &cpu->env;
> >
> > powerpc_excp(cpu, env->excp_model, POWERPC_EXCP_RESET);
> > + if (vector != -1) {
> > + env->nip = vector;
> > + }
> > }
> >
> > void ppc_cpu_do_fwnmi_machine_check(CPUState *cs, target_ulong vector)
> >
>
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
