Commit 4a4b344c authored by Bharata B Rao's avatar Bharata B Rao Committed by David Gibson
Browse files

xics,xics_kvm: Handle CPU unplug correctly 



XICS is setup for each CPU during initialization. Provide a routine
to undo the same when CPU is unplugged. While here, move ss->cs management
into xics from xics_kvm since there is nothing KVM specific in it.
Also ensure xics reset doesn't set irq for CPUs that are already unplugged.

This allows reboot of a VM that has undergone CPU hotplug and unplug
to work correctly.

Signed-off-by: default avatarBharata B Rao <bharata@linux.vnet.ibm.com>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
parent f1020c2c

hw/intc/xics.c

+14 −0
Original line number Diff line number Diff line
@@ -48,6 +48,18 @@ static int get_cpu_index_by_dt_id(int cpu_dt_id) 
    return -1;

}



void xics_cpu_destroy(XICSState *icp, PowerPCCPU *cpu)

{

    CPUState *cs = CPU(cpu);

    ICPState *ss = &icp->ss[cs->cpu_index];



    assert(cs->cpu_index < icp->nr_servers);

    assert(cs == ss->cs);



    ss->output = NULL;

    ss->cs = NULL;

}



void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu)

{

    CPUState *cs = CPU(cpu);
@@ -57,6 +69,8 @@ void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu) 


    assert(cs->cpu_index < icp->nr_servers);



    ss->cs = cs;



    if (info->cpu_setup) {

        info->cpu_setup(icp, cpu);

    }

hw/intc/xics_kvm.c

+4 −4
Original line number Diff line number Diff line
@@ -114,8 +114,10 @@ static void icp_kvm_reset(DeviceState *dev) 
    icp->pending_priority = 0xff;

    icp->mfrr = 0xff;



    /* Make all outputs are deasserted */

    /* Make all outputs as deasserted only if the CPU thread is in use */

    if (icp->output) {

        qemu_set_irq(icp->output, 0);

    }



    icp_set_kvm_state(icp, 1);

}
@@ -348,8 +350,6 @@ static void xics_kvm_cpu_setup(XICSState *icp, PowerPCCPU *cpu) 
    if (icpkvm->kernel_xics_fd != -1) {

        int ret;



        ss->cs = cs;



        ret = kvm_vcpu_enable_cap(cs, KVM_CAP_IRQ_XICS, 0,

                                  icpkvm->kernel_xics_fd, kvm_arch_vcpu_id(cs));

        if (ret < 0) {

include/hw/ppc/xics.h

+1 −0
Original line number Diff line number Diff line
@@ -167,5 +167,6 @@ int xics_alloc_block(XICSState *icp, int src, int num, bool lsi, bool align, 
void xics_free(XICSState *icp, int irq, int num);



void xics_cpu_setup(XICSState *icp, PowerPCCPU *cpu);

void xics_cpu_destroy(XICSState *icp, PowerPCCPU *cpu);



#endif /* __XICS_H__ */