mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 01:33:56 -06:00
ppc: Reset the interrupt presenter from the CPU reset handler
On the sPAPR machine and PowerNV machine, the interrupt presenters are created by a machine handler at the core level and are reset independently. This is not consistent and it raises issues when it comes to handle hot-plugged CPUs. In that case, the presenters are not reset. This is less of an issue in XICS, although a zero MFFR could be a concern, but in XIVE, the OS CAM line is not set and this breaks the presenting algorithm. The current code has workarounds which need a global cleanup. Extend the sPAPR IRQ backend and the PowerNV Chip class with a new cpu_intc_reset() handler called by the CPU reset handler and remove the XiveTCTX reset handler which is now redundant. Signed-off-by: Cédric Le Goater <clg@kaod.org> Message-Id: <20191022163812.330-6-clg@kaod.org> Reviewed-by: Greg Kurz <groug@kaod.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
aa5ac64b23
commit
d49e8a9b46
12 changed files with 65 additions and 20 deletions
|
@ -274,10 +274,8 @@ static const VMStateDescription vmstate_icp_server = {
|
|||
},
|
||||
};
|
||||
|
||||
static void icp_reset_handler(void *dev)
|
||||
void icp_reset(ICPState *icp)
|
||||
{
|
||||
ICPState *icp = ICP(dev);
|
||||
|
||||
icp->xirr = 0;
|
||||
icp->pending_priority = 0xff;
|
||||
icp->mfrr = 0xff;
|
||||
|
@ -288,7 +286,7 @@ static void icp_reset_handler(void *dev)
|
|||
if (kvm_irqchip_in_kernel()) {
|
||||
Error *local_err = NULL;
|
||||
|
||||
icp_set_kvm_state(ICP(dev), &local_err);
|
||||
icp_set_kvm_state(icp, &local_err);
|
||||
if (local_err) {
|
||||
error_report_err(local_err);
|
||||
}
|
||||
|
@ -351,7 +349,6 @@ static void icp_realize(DeviceState *dev, Error **errp)
|
|||
}
|
||||
}
|
||||
|
||||
qemu_register_reset(icp_reset_handler, dev);
|
||||
vmstate_register(NULL, icp->cs->cpu_index, &vmstate_icp_server, icp);
|
||||
}
|
||||
|
||||
|
@ -360,7 +357,6 @@ static void icp_unrealize(DeviceState *dev, Error **errp)
|
|||
ICPState *icp = ICP(dev);
|
||||
|
||||
vmstate_unregister(NULL, &vmstate_icp_server, icp);
|
||||
qemu_unregister_reset(icp_reset_handler, dev);
|
||||
}
|
||||
|
||||
static void icp_class_init(ObjectClass *klass, void *data)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue