| Message ID | 20190503055316.6441-9-sjitindarsingh@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | target/ppc: Implement KVM support under TCG | expand |
On Fri, May 03, 2019 at 03:53:11PM +1000, Suraj Jitindar Singh wrote: > The hcall H_SET_PARTITION_TABLE is used by a guest acting as a nested > hypervisor to register the partition table entry for one of its guests > with the real hypervisor. > > Implement this hcall for a spapr guest. > > Signed-off-by: Suraj Jitindar Singh <sjitindarsingh@gmail.com> > --- > hw/ppc/spapr_hcall.c | 22 ++++++++++++++++++++++ > include/hw/ppc/spapr.h | 4 +++- > 2 files changed, 25 insertions(+), 1 deletion(-) > > diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c > index 4d7fe337a1..704ceff8e1 100644 > --- a/hw/ppc/spapr_hcall.c > +++ b/hw/ppc/spapr_hcall.c > @@ -1828,6 +1828,25 @@ static target_ulong h_update_dt(PowerPCCPU *cpu, SpaprMachineState *spapr, > return H_SUCCESS; > } > > +static target_ulong h_set_partition_table(PowerPCCPU *cpu, > + SpaprMachineState *spapr, > + target_ulong opcode, > + target_ulong *args) > +{ > + CPUPPCState *env = &cpu->env; > + target_ulong ptcr = args[0]; > + > + if (spapr_get_cap(spapr, SPAPR_CAP_NESTED_KVM_HV) == 0) { > + return H_FUNCTION; > + } > + > + if ((ptcr & PTCR_PATS) > 24) > + return H_PARAMETER; > + > + env->spr[SPR_PTCR] = ptcr; > + return H_SUCCESS; > +} > + > static spapr_hcall_fn papr_hypercall_table[(MAX_HCALL_OPCODE / 4) + 1]; > static spapr_hcall_fn kvmppc_hypercall_table[KVMPPC_HCALL_MAX - KVMPPC_HCALL_BASE + 1]; > > @@ -1934,6 +1953,9 @@ static void hypercall_register_types(void) > > spapr_register_hypercall(KVMPPC_H_UPDATE_DT, h_update_dt); > > + /* Platform-specific hcalls used for nested HV KVM */ > + spapr_register_hypercall(H_SET_PARTITION_TABLE, h_set_partition_table); > + > /* Virtual Processor Home Node */ > spapr_register_hypercall(H_HOME_NODE_ASSOCIATIVITY, > h_home_node_associativity); > diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h > index 4251215908..e591ee0ba0 100644 > --- a/include/hw/ppc/spapr.h > +++ b/include/hw/ppc/spapr.h > @@ -501,7 +501,9 @@ struct SpaprMachineState { > /* Client Architecture support */ > #define KVMPPC_H_CAS (KVMPPC_HCALL_BASE + 0x2) > #define KVMPPC_H_UPDATE_DT (KVMPPC_HCALL_BASE + 0x3) > -#define KVMPPC_HCALL_MAX KVMPPC_H_UPDATE_DT > +/* Platform-specific hcalls used for nested HV KVM */ > +#define H_SET_PARTITION_TABLE 0xF800 Urgh, vastly expanding the size of the kvmppc specific hcall table here. I guess that can't really be helped. > +#define KVMPPC_HCALL_MAX H_SET_PARTITION_TABLE > > typedef struct SpaprDeviceTreeUpdateHeader { > uint32_t version_id;
diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c index 4d7fe337a1..704ceff8e1 100644 --- a/hw/ppc/spapr_hcall.c +++ b/hw/ppc/spapr_hcall.c @@ -1828,6 +1828,25 @@ static target_ulong h_update_dt(PowerPCCPU *cpu, SpaprMachineState *spapr, return H_SUCCESS; } +static target_ulong h_set_partition_table(PowerPCCPU *cpu, + SpaprMachineState *spapr, + target_ulong opcode, + target_ulong *args) +{ + CPUPPCState *env = &cpu->env; + target_ulong ptcr = args[0]; + + if (spapr_get_cap(spapr, SPAPR_CAP_NESTED_KVM_HV) == 0) { + return H_FUNCTION; + } + + if ((ptcr & PTCR_PATS) > 24) + return H_PARAMETER; + + env->spr[SPR_PTCR] = ptcr; + return H_SUCCESS; +} + static spapr_hcall_fn papr_hypercall_table[(MAX_HCALL_OPCODE / 4) + 1]; static spapr_hcall_fn kvmppc_hypercall_table[KVMPPC_HCALL_MAX - KVMPPC_HCALL_BASE + 1]; @@ -1934,6 +1953,9 @@ static void hypercall_register_types(void) spapr_register_hypercall(KVMPPC_H_UPDATE_DT, h_update_dt); + /* Platform-specific hcalls used for nested HV KVM */ + spapr_register_hypercall(H_SET_PARTITION_TABLE, h_set_partition_table); + /* Virtual Processor Home Node */ spapr_register_hypercall(H_HOME_NODE_ASSOCIATIVITY, h_home_node_associativity); diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index 4251215908..e591ee0ba0 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -501,7 +501,9 @@ struct SpaprMachineState { /* Client Architecture support */ #define KVMPPC_H_CAS (KVMPPC_HCALL_BASE + 0x2) #define KVMPPC_H_UPDATE_DT (KVMPPC_HCALL_BASE + 0x3) -#define KVMPPC_HCALL_MAX KVMPPC_H_UPDATE_DT +/* Platform-specific hcalls used for nested HV KVM */ +#define H_SET_PARTITION_TABLE 0xF800 +#define KVMPPC_HCALL_MAX H_SET_PARTITION_TABLE typedef struct SpaprDeviceTreeUpdateHeader { uint32_t version_id;
The hcall H_SET_PARTITION_TABLE is used by a guest acting as a nested hypervisor to register the partition table entry for one of its guests with the real hypervisor. Implement this hcall for a spapr guest. Signed-off-by: Suraj Jitindar Singh <sjitindarsingh@gmail.com> --- hw/ppc/spapr_hcall.c | 22 ++++++++++++++++++++++ include/hw/ppc/spapr.h | 4 +++- 2 files changed, 25 insertions(+), 1 deletion(-)