On Fri, 4 Sep 2020 10:56:29 -0300
Daniel Henrique Barboza <danielhb...@gmail.com> wrote:
> The implementation of this hypercall will be modified to use
> spapr->numa_assoc_arrays input. Moving it to spapr_numa.c makes
> make more sense.
>
> Signed-off-by: Daniel Henrique Barboza <danielhb...@gmail.com>
> ---
Not sure if David already applied it to ppc-for-5.2. Anyway:
Reviewed-by: Greg Kurz <gr...@kaod.org>
> hw/ppc/spapr_hcall.c | 40 ---------------------------------------
> hw/ppc/spapr_numa.c | 45 ++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 45 insertions(+), 40 deletions(-)
>
> diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
> index c1d01228c6..c2776b6a7d 100644
> --- a/hw/ppc/spapr_hcall.c
> +++ b/hw/ppc/spapr_hcall.c
> @@ -1873,42 +1873,6 @@ static target_ulong
> h_client_architecture_support(PowerPCCPU *cpu,
> return ret;
> }
>
> -static target_ulong h_home_node_associativity(PowerPCCPU *cpu,
> - SpaprMachineState *spapr,
> - target_ulong opcode,
> - target_ulong *args)
> -{
> - target_ulong flags = args[0];
> - target_ulong procno = args[1];
> - PowerPCCPU *tcpu;
> - int idx;
> -
> - /* only support procno from H_REGISTER_VPA */
> - if (flags != 0x1) {
> - return H_FUNCTION;
> - }
> -
> - tcpu = spapr_find_cpu(procno);
> - if (tcpu == NULL) {
> - return H_P2;
> - }
> -
> - /* sequence is the same as in the "ibm,associativity" property */
> -
> - idx = 0;
> -#define ASSOCIATIVITY(a, b) (((uint64_t)(a) << 32) | \
> - ((uint64_t)(b) & 0xffffffff))
> - args[idx++] = ASSOCIATIVITY(0, 0);
> - args[idx++] = ASSOCIATIVITY(0, tcpu->node_id);
> - args[idx++] = ASSOCIATIVITY(procno, -1);
> - for ( ; idx < 6; idx++) {
> - args[idx] = -1;
> - }
> -#undef ASSOCIATIVITY
> -
> - return H_SUCCESS;
> -}
> -
> static target_ulong h_get_cpu_characteristics(PowerPCCPU *cpu,
> SpaprMachineState *spapr,
> target_ulong opcode,
> @@ -2139,10 +2103,6 @@ static void hypercall_register_types(void)
> spapr_register_hypercall(KVMPPC_H_CAS, h_client_architecture_support);
>
> spapr_register_hypercall(KVMPPC_H_UPDATE_DT, h_update_dt);
> -
> - /* Virtual Processor Home Node */
> - spapr_register_hypercall(H_HOME_NODE_ASSOCIATIVITY,
> - h_home_node_associativity);
> }
>
> type_init(hypercall_register_types)
> diff --git a/hw/ppc/spapr_numa.c b/hw/ppc/spapr_numa.c
> index 93a000b729..368c1a494d 100644
> --- a/hw/ppc/spapr_numa.c
> +++ b/hw/ppc/spapr_numa.c
> @@ -165,3 +165,48 @@ void spapr_numa_write_rtas_dt(SpaprMachineState *spapr,
> void *fdt, int rtas)
> _FDT(fdt_setprop(fdt, rtas, "ibm,max-associativity-domains",
> maxdomains, sizeof(maxdomains)));
> }
> +
> +static target_ulong h_home_node_associativity(PowerPCCPU *cpu,
> + SpaprMachineState *spapr,
> + target_ulong opcode,
> + target_ulong *args)
> +{
> + target_ulong flags = args[0];
> + target_ulong procno = args[1];
> + PowerPCCPU *tcpu;
> + int idx;
> +
> + /* only support procno from H_REGISTER_VPA */
> + if (flags != 0x1) {
> + return H_FUNCTION;
> + }
> +
> + tcpu = spapr_find_cpu(procno);
> + if (tcpu == NULL) {
> + return H_P2;
> + }
> +
> + /* sequence is the same as in the "ibm,associativity" property */
> +
> + idx = 0;
> +#define ASSOCIATIVITY(a, b) (((uint64_t)(a) << 32) | \
> + ((uint64_t)(b) & 0xffffffff))
> + args[idx++] = ASSOCIATIVITY(0, 0);
> + args[idx++] = ASSOCIATIVITY(0, tcpu->node_id);
> + args[idx++] = ASSOCIATIVITY(procno, -1);
> + for ( ; idx < 6; idx++) {
> + args[idx] = -1;
> + }
> +#undef ASSOCIATIVITY
> +
> + return H_SUCCESS;
> +}
> +
> +static void spapr_numa_register_types(void)
> +{
> + /* Virtual Processor Home Node */
> + spapr_register_hypercall(H_HOME_NODE_ASSOCIATIVITY,
> + h_home_node_associativity);
> +}
> +
> +type_init(spapr_numa_register_types)
