Commit 9aa25280 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by David Gibson
Browse files

target/ppc: allow ppc_cpu_do_system_reset to take an alternate vector 



Provide for an alternate delivery location, -1 defaults to the
architected address.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Message-Id: <20200316142613.121089-7-npiggin@gmail.com>
Reviewed-by: default avatarGreg Kurz <groug@kaod.org>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 89ba4565

hw/ppc/spapr.c

+1 −1
Original line number Diff line number Diff line
@@ -3385,7 +3385,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)

target/ppc/cpu.h

+1 −1
Original line number Diff line number Diff line
@@ -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

target/ppc/excp_helper.c

+4 −1
Original line number Diff line number Diff line
@@ -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)