david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spapr: Pass PowerPCCPU to hypercalls

Browse Source 
Needed for changing cpu_has_work() argument type to CPUState,
used in h_cede().

Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2012-05-03 06:23:01 +02:00
parent aa100fa4c9
commit b13ce26d3e
7 changed files with 42 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/spapr.h
View File

@ -286,7 +286,7 @@ extern sPAPREnvironment *spapr;
do { } while (0) do { } while (0)
#endif #endif
typedef target_ulong (*spapr_hcall_fn)(CPUPPCState *env, sPAPREnvironment *spapr, typedef target_ulong (*spapr_hcall_fn)(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong opcode,
target_ulong *args); target_ulong *args);

38
hw/spapr_hcall.c
View File

@ -75,9 +75,10 @@ static target_ulong compute_tlbie_rb(target_ulong v, target_ulong r,
return rb; return rb;
} }
static target_ulong h_enter(CPUPPCState *env, sPAPREnvironment *spapr, static target_ulong h_enter(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong *args) target_ulong opcode, target_ulong *args)
{ {
CPUPPCState *env = &cpu->env;
target_ulong flags = args[0]; target_ulong flags = args[0];
target_ulong pte_index = args[1]; target_ulong pte_index = args[1];
target_ulong pteh = args[2]; target_ulong pteh = args[2];
@ -192,9 +193,10 @@ static target_ulong remove_hpte(CPUPPCState *env, target_ulong ptex,
return REMOVE_SUCCESS; return REMOVE_SUCCESS;
} }
static target_ulong h_remove(CPUPPCState *env, sPAPREnvironment *spapr, static target_ulong h_remove(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong *args) target_ulong opcode, target_ulong *args)
{ {
CPUPPCState *env = &cpu->env;
target_ulong flags = args[0]; target_ulong flags = args[0];
target_ulong pte_index = args[1]; target_ulong pte_index = args[1];
target_ulong avpn = args[2]; target_ulong avpn = args[2];
@ -238,9 +240,10 @@ static target_ulong h_remove(CPUPPCState *env, sPAPREnvironment *spapr,
#define H_BULK_REMOVE_MAX_BATCH 4 #define H_BULK_REMOVE_MAX_BATCH 4
static target_ulong h_bulk_remove(CPUPPCState *env, sPAPREnvironment *spapr, static target_ulong h_bulk_remove(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong *args) target_ulong opcode, target_ulong *args)
{ {
CPUPPCState *env = &cpu->env;
int i; int i;
for (i = 0; i < H_BULK_REMOVE_MAX_BATCH; i++) { for (i = 0; i < H_BULK_REMOVE_MAX_BATCH; i++) {
@ -284,9 +287,10 @@ static target_ulong h_bulk_remove(CPUPPCState *env, sPAPREnvironment *spapr,
return H_SUCCESS; return H_SUCCESS;
} }
static target_ulong h_protect(CPUPPCState *env, sPAPREnvironment *spapr, static target_ulong h_protect(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong *args) target_ulong opcode, target_ulong *args)
{ {
CPUPPCState *env = &cpu->env;
target_ulong flags = args[0]; target_ulong flags = args[0];
target_ulong pte_index = args[1]; target_ulong pte_index = args[1];
target_ulong avpn = args[2]; target_ulong avpn = args[2];
@ -321,7 +325,7 @@ static target_ulong h_protect(CPUPPCState *env, sPAPREnvironment *spapr,
return H_SUCCESS; return H_SUCCESS;
} }
static target_ulong h_set_dabr(CPUPPCState *env, sPAPREnvironment *spapr, static target_ulong h_set_dabr(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong *args) target_ulong opcode, target_ulong *args)
{ {
/* FIXME: actually implement this */ /* FIXME: actually implement this */
@ -457,7 +461,7 @@ static target_ulong deregister_dtl(CPUPPCState *env, target_ulong addr)
return H_SUCCESS; return H_SUCCESS;
} }
static target_ulong h_register_vpa(CPUPPCState *env, sPAPREnvironment *spapr, static target_ulong h_register_vpa(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong *args) target_ulong opcode, target_ulong *args)
{ {
target_ulong flags = args[0]; target_ulong flags = args[0];
@ -505,9 +509,11 @@ static target_ulong h_register_vpa(CPUPPCState *env, sPAPREnvironment *spapr,
return ret; return ret;
} }
static target_ulong h_cede(CPUPPCState *env, sPAPREnvironment *spapr, static target_ulong h_cede(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong *args) target_ulong opcode, target_ulong *args)
{ {
CPUPPCState *env = &cpu->env;
env->msr |= (1ULL << MSR_EE); env->msr |= (1ULL << MSR_EE);
hreg_compute_hflags(env); hreg_compute_hflags(env);
if (!cpu_has_work(env)) { if (!cpu_has_work(env)) {
@ -518,7 +524,7 @@ static target_ulong h_cede(CPUPPCState *env, sPAPREnvironment *spapr,
return H_SUCCESS; return H_SUCCESS;
} }
static target_ulong h_rtas(CPUPPCState *env, sPAPREnvironment *spapr, static target_ulong h_rtas(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong *args) target_ulong opcode, target_ulong *args)
{ {
target_ulong rtas_r3 = args[0]; target_ulong rtas_r3 = args[0];
@ -530,7 +536,7 @@ static target_ulong h_rtas(CPUPPCState *env, sPAPREnvironment *spapr,
nret, rtas_r3 + 12 + 4*nargs); nret, rtas_r3 + 12 + 4*nargs);
} }
static target_ulong h_logical_load(CPUPPCState *env, sPAPREnvironment *spapr, static target_ulong h_logical_load(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong *args) target_ulong opcode, target_ulong *args)
{ {
target_ulong size = args[0]; target_ulong size = args[0];
@ -553,7 +559,7 @@ static target_ulong h_logical_load(CPUPPCState *env, sPAPREnvironment *spapr,
return H_PARAMETER; return H_PARAMETER;
} }
static target_ulong h_logical_store(CPUPPCState *env, sPAPREnvironment *spapr, static target_ulong h_logical_store(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong *args) target_ulong opcode, target_ulong *args)
{ {
target_ulong size = args[0]; target_ulong size = args[0];
@ -577,7 +583,7 @@ static target_ulong h_logical_store(CPUPPCState *env, sPAPREnvironment *spapr,
return H_PARAMETER; return H_PARAMETER;
} }
static target_ulong h_logical_memop(CPUPPCState *env, sPAPREnvironment *spapr, static target_ulong h_logical_memop(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong *args) target_ulong opcode, target_ulong *args)
{ {
target_ulong dst = args[0]; /* Destination address */ target_ulong dst = args[0]; /* Destination address */
@ -644,14 +650,14 @@ static target_ulong h_logical_memop(CPUPPCState *env, sPAPREnvironment *spapr,
return H_SUCCESS; return H_SUCCESS;
} }
static target_ulong h_logical_icbi(CPUPPCState *env, sPAPREnvironment *spapr, static target_ulong h_logical_icbi(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong *args) target_ulong opcode, target_ulong *args)
{ {
/* Nothing to do on emulation, KVM will trap this in the kernel */ /* Nothing to do on emulation, KVM will trap this in the kernel */
return H_SUCCESS; return H_SUCCESS;
} }
static target_ulong h_logical_dcbf(CPUPPCState *env, sPAPREnvironment *spapr, static target_ulong h_logical_dcbf(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong *args) target_ulong opcode, target_ulong *args)
{ {
/* Nothing to do on emulation, KVM will trap this in the kernel */ /* Nothing to do on emulation, KVM will trap this in the kernel */
@ -682,21 +688,19 @@ void spapr_register_hypercall(target_ulong opcode, spapr_hcall_fn fn)
target_ulong spapr_hypercall(PowerPCCPU *cpu, target_ulong opcode, target_ulong spapr_hypercall(PowerPCCPU *cpu, target_ulong opcode,
target_ulong *args) target_ulong *args)
{ {
CPUPPCState *env = &cpu->env;
if ((opcode <= MAX_HCALL_OPCODE) if ((opcode <= MAX_HCALL_OPCODE)
&& ((opcode & 0x3) == 0)) { && ((opcode & 0x3) == 0)) {
spapr_hcall_fn fn = papr_hypercall_table[opcode / 4]; spapr_hcall_fn fn = papr_hypercall_table[opcode / 4];
if (fn) { if (fn) {
return fn(env, spapr, opcode, args); return fn(cpu, spapr, opcode, args);
} }
} else if ((opcode >= KVMPPC_HCALL_BASE) && } else if ((opcode >= KVMPPC_HCALL_BASE) &&
(opcode <= KVMPPC_HCALL_MAX)) { (opcode <= KVMPPC_HCALL_MAX)) {
spapr_hcall_fn fn = kvmppc_hypercall_table[opcode - KVMPPC_HCALL_BASE]; spapr_hcall_fn fn = kvmppc_hypercall_table[opcode - KVMPPC_HCALL_BASE];
if (fn) { if (fn) {
return fn(env, spapr, opcode, args); return fn(cpu, spapr, opcode, args);
} }
} }

2
hw/spapr_iommu.c
View File

@ -204,7 +204,7 @@ static target_ulong put_tce_emu(sPAPRTCETable *tcet, target_ulong ioba,
return H_SUCCESS; return H_SUCCESS;
} }
static target_ulong h_put_tce(CPUPPCState *env, sPAPREnvironment *spapr, static target_ulong h_put_tce(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong *args) target_ulong opcode, target_ulong *args)
{ {
target_ulong liobn = args[0]; target_ulong liobn = args[0];

10
hw/spapr_llan.c
View File

@ -264,7 +264,7 @@ static int check_bd(VIOsPAPRVLANDevice *dev, vlan_bd_t bd,
return 0; return 0;
} }
static target_ulong h_register_logical_lan(CPUPPCState *env, static target_ulong h_register_logical_lan(PowerPCCPU *cpu,
sPAPREnvironment *spapr, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong opcode,
target_ulong *args) target_ulong *args)
@ -328,7 +328,7 @@ static target_ulong h_register_logical_lan(CPUPPCState *env,
} }
static target_ulong h_free_logical_lan(CPUPPCState *env, sPAPREnvironment *spapr, static target_ulong h_free_logical_lan(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong *args) target_ulong opcode, target_ulong *args)
{ {
target_ulong reg = args[0]; target_ulong reg = args[0];
@ -349,7 +349,7 @@ static target_ulong h_free_logical_lan(CPUPPCState *env, sPAPREnvironment *spapr
return H_SUCCESS; return H_SUCCESS;
} }
static target_ulong h_add_logical_lan_buffer(CPUPPCState *env, static target_ulong h_add_logical_lan_buffer(PowerPCCPU *cpu,
sPAPREnvironment *spapr, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong opcode,
target_ulong *args) target_ulong *args)
@ -398,7 +398,7 @@ static target_ulong h_add_logical_lan_buffer(CPUPPCState *env,
return H_SUCCESS; return H_SUCCESS;
} }
static target_ulong h_send_logical_lan(CPUPPCState *env, sPAPREnvironment *spapr, static target_ulong h_send_logical_lan(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong *args) target_ulong opcode, target_ulong *args)
{ {
target_ulong reg = args[0]; target_ulong reg = args[0];
@ -467,7 +467,7 @@ static target_ulong h_send_logical_lan(CPUPPCState *env, sPAPREnvironment *spapr
return H_SUCCESS; return H_SUCCESS;
} }
static target_ulong h_multicast_ctrl(CPUPPCState *env, sPAPREnvironment *spapr, static target_ulong h_multicast_ctrl(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong *args) target_ulong opcode, target_ulong *args)
{ {
target_ulong reg = args[0]; target_ulong reg = args[0];

10
hw/spapr_vio.c
View File

@ -161,7 +161,7 @@ static int vio_make_devnode(VIOsPAPRDevice *dev,
/* /*
* CRQ handling * CRQ handling
*/ */
static target_ulong h_reg_crq(CPUPPCState *env, sPAPREnvironment *spapr, static target_ulong h_reg_crq(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong *args) target_ulong opcode, target_ulong *args)
{ {
target_ulong reg = args[0]; target_ulong reg = args[0];
@ -219,7 +219,7 @@ static target_ulong free_crq(VIOsPAPRDevice *dev)
return H_SUCCESS; return H_SUCCESS;
} }
static target_ulong h_free_crq(CPUPPCState *env, sPAPREnvironment *spapr, static target_ulong h_free_crq(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong *args) target_ulong opcode, target_ulong *args)
{ {
target_ulong reg = args[0]; target_ulong reg = args[0];
@ -233,7 +233,7 @@ static target_ulong h_free_crq(CPUPPCState *env, sPAPREnvironment *spapr,
return free_crq(dev); return free_crq(dev);
} }
static target_ulong h_send_crq(CPUPPCState *env, sPAPREnvironment *spapr, static target_ulong h_send_crq(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong *args) target_ulong opcode, target_ulong *args)
{ {
target_ulong reg = args[0]; target_ulong reg = args[0];
@ -256,7 +256,7 @@ static target_ulong h_send_crq(CPUPPCState *env, sPAPREnvironment *spapr,
return H_HARDWARE; return H_HARDWARE;
} }
static target_ulong h_enable_crq(CPUPPCState *env, sPAPREnvironment *spapr, static target_ulong h_enable_crq(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong *args) target_ulong opcode, target_ulong *args)
{ {
target_ulong reg = args[0]; target_ulong reg = args[0];
@ -463,7 +463,7 @@ static int spapr_vio_busdev_init(DeviceState *qdev)
return pc->init(dev); return pc->init(dev);
} }
static target_ulong h_vio_signal(CPUPPCState *env, sPAPREnvironment *spapr, static target_ulong h_vio_signal(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong opcode,
target_ulong *args) target_ulong *args)
{ {

4
hw/spapr_vty.c
View File

@ -70,7 +70,7 @@ static int spapr_vty_init(VIOsPAPRDevice *sdev)
} }
/* Forward declaration */ /* Forward declaration */
static target_ulong h_put_term_char(CPUPPCState *env, sPAPREnvironment *spapr, static target_ulong h_put_term_char(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong *args) target_ulong opcode, target_ulong *args)
{ {
target_ulong reg = args[0]; target_ulong reg = args[0];
@ -97,7 +97,7 @@ static target_ulong h_put_term_char(CPUPPCState *env, sPAPREnvironment *spapr,
return H_SUCCESS; return H_SUCCESS;
} }
static target_ulong h_get_term_char(CPUPPCState *env, sPAPREnvironment *spapr, static target_ulong h_get_term_char(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong *args) target_ulong opcode, target_ulong *args)
{ {
target_ulong reg = args[0]; target_ulong reg = args[0];

11
hw/xics.c
View File

@ -342,16 +342,17 @@ void xics_set_irq_type(struct icp_state *icp, int irq, bool lsi)
icp->ics->irqs[irq - icp->ics->offset].lsi = lsi; icp->ics->irqs[irq - icp->ics->offset].lsi = lsi;
} }
static target_ulong h_cppr(CPUPPCState *env, sPAPREnvironment *spapr, static target_ulong h_cppr(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong *args) target_ulong opcode, target_ulong *args)
{ {
CPUPPCState *env = &cpu->env;
target_ulong cppr = args[0]; target_ulong cppr = args[0];
icp_set_cppr(spapr->icp, env->cpu_index, cppr); icp_set_cppr(spapr->icp, env->cpu_index, cppr);
return H_SUCCESS; return H_SUCCESS;
} }
static target_ulong h_ipi(CPUPPCState *env, sPAPREnvironment *spapr, static target_ulong h_ipi(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong *args) target_ulong opcode, target_ulong *args)
{ {
target_ulong server = args[0]; target_ulong server = args[0];
@ -366,18 +367,20 @@ static target_ulong h_ipi(CPUPPCState *env, sPAPREnvironment *spapr,
} }
static target_ulong h_xirr(CPUPPCState *env, sPAPREnvironment *spapr, static target_ulong h_xirr(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong *args) target_ulong opcode, target_ulong *args)
{ {
CPUPPCState *env = &cpu->env;
uint32_t xirr = icp_accept(spapr->icp->ss + env->cpu_index); uint32_t xirr = icp_accept(spapr->icp->ss + env->cpu_index);
args[0] = xirr; args[0] = xirr;
return H_SUCCESS; return H_SUCCESS;
} }
static target_ulong h_eoi(CPUPPCState *env, sPAPREnvironment *spapr, static target_ulong h_eoi(PowerPCCPU *cpu, sPAPREnvironment *spapr,
target_ulong opcode, target_ulong *args) target_ulong opcode, target_ulong *args)
{ {
CPUPPCState *env = &cpu->env;
target_ulong xirr = args[0]; target_ulong xirr = args[0];
icp_eoi(spapr->icp, env->cpu_index, xirr); icp_eoi(spapr->icp, env->cpu_index, xirr);