target/ppc: Merge cpu_ppc_set_vhyp() with cpu_ppc_set_papr()
cpu_ppc_set_papr() sets up various aspects of CPU state for use with PAPR paravirtualized guests. However, it doesn't set the virtual hypervisor, so callers must also call cpu_ppc_set_vhyp() so that PAPR hypercalls are handled properly. This is a bit silly, so fold setting the virtual hypervisor into cpu_ppc_set_papr(). Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Reviewed-by: Suraj Jitindar Singh <sjitindarsingh@gmail.com>
This commit is contained in:
parent
c6404adebf
commit
b7b0b1f13a
|
@ -57,8 +57,7 @@ static void spapr_cpu_init(sPAPRMachineState *spapr, PowerPCCPU *cpu,
|
||||||
cpu_ppc_tb_init(env, SPAPR_TIMEBASE_FREQ);
|
cpu_ppc_tb_init(env, SPAPR_TIMEBASE_FREQ);
|
||||||
|
|
||||||
/* Enable PAPR mode in TCG or KVM */
|
/* Enable PAPR mode in TCG or KVM */
|
||||||
cpu_ppc_set_vhyp(cpu, PPC_VIRTUAL_HYPERVISOR(spapr));
|
cpu_ppc_set_papr(cpu, PPC_VIRTUAL_HYPERVISOR(spapr));
|
||||||
cpu_ppc_set_papr(cpu);
|
|
||||||
|
|
||||||
if (cpu->max_compat) {
|
if (cpu->max_compat) {
|
||||||
Error *local_err = NULL;
|
Error *local_err = NULL;
|
||||||
|
|
|
@ -1301,8 +1301,7 @@ void store_booke_tcr (CPUPPCState *env, target_ulong val);
|
||||||
void store_booke_tsr (CPUPPCState *env, target_ulong val);
|
void store_booke_tsr (CPUPPCState *env, target_ulong val);
|
||||||
void ppc_tlb_invalidate_all (CPUPPCState *env);
|
void ppc_tlb_invalidate_all (CPUPPCState *env);
|
||||||
void ppc_tlb_invalidate_one (CPUPPCState *env, target_ulong addr);
|
void ppc_tlb_invalidate_one (CPUPPCState *env, target_ulong addr);
|
||||||
void cpu_ppc_set_vhyp(PowerPCCPU *cpu, PPCVirtualHypervisor *vhyp);
|
void cpu_ppc_set_papr(PowerPCCPU *cpu, PPCVirtualHypervisor *vhyp);
|
||||||
void cpu_ppc_set_papr(PowerPCCPU *cpu);
|
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -8835,18 +8835,14 @@ POWERPC_FAMILY(POWER9)(ObjectClass *oc, void *data)
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !defined(CONFIG_USER_ONLY)
|
#if !defined(CONFIG_USER_ONLY)
|
||||||
|
void cpu_ppc_set_papr(PowerPCCPU *cpu, PPCVirtualHypervisor *vhyp)
|
||||||
void cpu_ppc_set_vhyp(PowerPCCPU *cpu, PPCVirtualHypervisor *vhyp)
|
|
||||||
{
|
|
||||||
cpu->vhyp = vhyp;
|
|
||||||
}
|
|
||||||
|
|
||||||
void cpu_ppc_set_papr(PowerPCCPU *cpu)
|
|
||||||
{
|
{
|
||||||
CPUPPCState *env = &cpu->env;
|
CPUPPCState *env = &cpu->env;
|
||||||
ppc_spr_t *lpcr = &env->spr_cb[SPR_LPCR];
|
ppc_spr_t *lpcr = &env->spr_cb[SPR_LPCR];
|
||||||
ppc_spr_t *amor = &env->spr_cb[SPR_AMOR];
|
ppc_spr_t *amor = &env->spr_cb[SPR_AMOR];
|
||||||
|
|
||||||
|
cpu->vhyp = vhyp;
|
||||||
|
|
||||||
/* PAPR always has exception vectors in RAM not ROM. To ensure this,
|
/* PAPR always has exception vectors in RAM not ROM. To ensure this,
|
||||||
* MSR[IP] should never be set.
|
* MSR[IP] should never be set.
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in a new issue