Commit 2e886fb3 authored by Sam Bobroff's avatar Sam Bobroff Committed by David Gibson
Browse files

ppc: spapr: Make VCPU ID handling private to SPAPR 



The concept of a VCPU ID that differs from the CPU's index
(cpu->cpu_index) exists only within SPAPR machines so, move the
functions ppc_get_vcpu_id() and ppc_get_cpu_by_vcpu_id() into spapr.c
and rename them appropriately.

Signed-off-by: default avatarSam Bobroff <sam.bobroff@au1.ibm.com>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent 81210c20

hw/ppc/ppc.c

+0 −21
Original line number Diff line number Diff line
@@ -1358,27 +1358,6 @@ void PPC_debug_write (void *opaque, uint32_t addr, uint32_t val) 
    }

}



/* CPU device-tree ID helpers */

int ppc_get_vcpu_id(PowerPCCPU *cpu)

{

    return cpu->vcpu_id;

}



PowerPCCPU *ppc_get_cpu_by_vcpu_id(int vcpu_id)

{

    CPUState *cs;



    CPU_FOREACH(cs) {

        PowerPCCPU *cpu = POWERPC_CPU(cs);



        if (cpu->vcpu_id == vcpu_id) {

            return cpu;

        }

    }



    return NULL;

}



void ppc_cpu_parse_features(const char *cpu_model)

{

    CPUClass *cc;

hw/ppc/spapr.c

+33 −7
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ static int spapr_fixup_cpu_smt_dt(void *fdt, int offset, PowerPCCPU *cpu, 
    int i, ret = 0;

    uint32_t servers_prop[smt_threads];

    uint32_t gservers_prop[smt_threads * 2];

    int index = ppc_get_vcpu_id(cpu);

    int index = spapr_vcpu_id(cpu);



    if (cpu->compat_pvr) {

        ret = fdt_setprop_cell(fdt, offset, "cpu-version", cpu->compat_pvr);
@@ -237,7 +237,7 @@ static int spapr_fixup_cpu_smt_dt(void *fdt, int offset, PowerPCCPU *cpu, 


static int spapr_fixup_cpu_numa_dt(void *fdt, int offset, PowerPCCPU *cpu)

{

    int index = ppc_get_vcpu_id(cpu);

    int index = spapr_vcpu_id(cpu);

    uint32_t associativity[] = {cpu_to_be32(0x5),

                                cpu_to_be32(0x0),

                                cpu_to_be32(0x0),
@@ -341,7 +341,7 @@ static int spapr_fixup_cpu_dt(void *fdt, sPAPRMachineState *spapr) 
        PowerPCCPU *cpu = POWERPC_CPU(cs);

        CPUPPCState *env = &cpu->env;

        DeviceClass *dc = DEVICE_GET_CLASS(cs);

        int index = ppc_get_vcpu_id(cpu);

        int index = spapr_vcpu_id(cpu);

        int compat_smt = MIN(smp_threads, ppc_compat_max_threads(cpu));



        if ((index % smt) != 0) {
@@ -493,7 +493,7 @@ static void spapr_populate_cpu_dt(CPUState *cs, void *fdt, int offset, 
    PowerPCCPU *cpu = POWERPC_CPU(cs);

    CPUPPCState *env = &cpu->env;

    PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cs);

    int index = ppc_get_vcpu_id(cpu);

    int index = spapr_vcpu_id(cpu);

    uint32_t segs[] = {cpu_to_be32(28), cpu_to_be32(40),

                       0xffffffff, 0xffffffff};

    uint32_t tbfreq = kvm_enabled() ? kvmppc_get_tbfreq()
@@ -626,7 +626,7 @@ static void spapr_populate_cpus_dt_node(void *fdt, sPAPRMachineState *spapr) 
     */

    CPU_FOREACH_REVERSE(cs) {

        PowerPCCPU *cpu = POWERPC_CPU(cs);

        int index = ppc_get_vcpu_id(cpu);

        int index = spapr_vcpu_id(cpu);

        DeviceClass *dc = DEVICE_GET_CLASS(cs);

        int offset;
@@ -3025,7 +3025,7 @@ static void *spapr_populate_hotplug_cpu_dt(CPUState *cs, int *fdt_offset, 
{

    PowerPCCPU *cpu = POWERPC_CPU(cs);

    DeviceClass *dc = DEVICE_GET_CLASS(cs);

    int id = ppc_get_vcpu_id(cpu);

    int id = spapr_vcpu_id(cpu);

    void *fdt;

    int offset, fdt_size;

    char *nodename;
@@ -3435,7 +3435,7 @@ static void spapr_ics_resend(XICSFabric *dev) 


static ICPState *spapr_icp_get(XICSFabric *xi, int vcpu_id)

{

    PowerPCCPU *cpu = ppc_get_cpu_by_vcpu_id(vcpu_id);

    PowerPCCPU *cpu = spapr_find_cpu(vcpu_id);



    return cpu ? ICP(cpu->intc) : NULL;

}
@@ -3455,6 +3455,32 @@ static void spapr_pic_print_info(InterruptStatsProvider *obj, 
    ics_pic_print_info(spapr->ics, mon);

}



int spapr_vcpu_id(PowerPCCPU *cpu)

{

    CPUState *cs = CPU(cpu);



    if (kvm_enabled()) {

        return kvm_arch_vcpu_id(cs);

    } else {

        return cs->cpu_index;

    }

}



PowerPCCPU *spapr_find_cpu(int vcpu_id)

{

    CPUState *cs;



    CPU_FOREACH(cs) {

        PowerPCCPU *cpu = POWERPC_CPU(cs);



        if (spapr_vcpu_id(cpu) == vcpu_id) {

            return cpu;

        }

    }



    return NULL;

}



static void spapr_machine_class_init(ObjectClass *oc, void *data)

{

    MachineClass *mc = MACHINE_CLASS(oc);

hw/ppc/spapr_hcall.c

+2 −2
Original line number Diff line number Diff line
@@ -999,7 +999,7 @@ static target_ulong h_register_vpa(PowerPCCPU *cpu, sPAPRMachineState *spapr, 
    CPUPPCState *tenv;

    PowerPCCPU *tcpu;



    tcpu = ppc_get_cpu_by_vcpu_id(procno);

    tcpu = spapr_find_cpu(procno);

    if (!tcpu) {

        return H_PARAMETER;

    }
@@ -1431,7 +1431,7 @@ static target_ulong h_signal_sys_reset(PowerPCCPU *cpu, 


    } else {

        /* Unicast */

        cs = CPU(ppc_get_cpu_by_vcpu_id(target));

        cs = CPU(spapr_find_cpu(target));

        if (cs) {

            run_on_cpu(cs, spapr_do_system_reset_on_cpu, RUN_ON_CPU_NULL);

            return H_SUCCESS;

hw/ppc/spapr_rtas.c

+2 −2
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static void rtas_query_cpu_stopped_state(PowerPCCPU *cpu_, 
    }



    id = rtas_ld(args, 0);

    cpu = ppc_get_cpu_by_vcpu_id(id);

    cpu = spapr_find_cpu(id);

    if (cpu != NULL) {

        if (CPU(cpu)->halted) {

            rtas_st(rets, 1, 0);
@@ -158,7 +158,7 @@ static void rtas_start_cpu(PowerPCCPU *cpu_, sPAPRMachineState *spapr, 
    start = rtas_ld(args, 1);

    r3 = rtas_ld(args, 2);



    cpu = ppc_get_cpu_by_vcpu_id(id);

    cpu = spapr_find_cpu(id);

    if (cpu != NULL) {

        CPUState *cs = CPU(cpu);

        CPUPPCState *env = &cpu->env;

include/hw/ppc/spapr.h

+3 −0
Original line number Diff line number Diff line
@@ -705,4 +705,7 @@ void spapr_do_system_reset_on_cpu(CPUState *cs, run_on_cpu_data arg); 


#define HTAB_SIZE(spapr)        (1ULL << ((spapr)->htab_shift))



int spapr_vcpu_id(PowerPCCPU *cpu);

PowerPCCPU *spapr_find_cpu(int vcpu_id);



#endif /* HW_SPAPR_H */