@@ -216,7 +216,7 @@ static void icp_check_ipi(ICPState *ss)
qemu_irq_raise(ss->output);
}
-static void icp_resend(XICSFabric *xi, ICPState *ss)
+void icp_resend(XICSFabric *xi, ICPState *ss)
{
XICSFabricClass *xic = XICS_FABRIC_GET_CLASS(xi);
@@ -2923,6 +2923,24 @@ static void spapr_ics_resend(XICSFabric *dev)
ics_resend(spapr->ics);
}
+static ICPState *spapr_icp_get(XICSFabric *xi, int server)
+{
+ sPAPRMachineState *spapr = SPAPR_MACHINE(xi);
+
+ return (server < spapr->xics->nr_servers) ? &spapr->xics->ss[server] :
+ NULL;
+}
+
+static void spapr_icp_resend(XICSFabric *xi)
+{
+ sPAPRMachineState *spapr = SPAPR_MACHINE(xi);
+ int i;
+
+ for (i = 0; i < spapr->xics->nr_servers; i++) {
+ icp_resend(xi, &spapr->xics->ss[i]);
+ }
+}
+
static void spapr_machine_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
@@ -2967,6 +2985,8 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
vhc->hypercall = emulate_spapr_hypercall;
xic->ics_get = spapr_ics_get;
xic->ics_resend = spapr_ics_resend;
+ xic->icp_get = spapr_icp_get;
+ xic->icp_resend = spapr_icp_resend;
}
static const TypeInfo spapr_machine_info = {
@@ -191,6 +191,8 @@ typedef struct XICSFabricClass {
InterfaceClass parent;
ICSState *(*ics_get)(XICSFabric *xi, int irq);
void (*ics_resend)(XICSFabric *xi);
+ ICPState *(*icp_get)(XICSFabric *xi, int server);
+ void (*icp_resend)(XICSFabric *xi);
} XICSFabricClass;
#define XICS_IRQS_SPAPR 1024
@@ -221,5 +223,6 @@ void ics_simple_write_xive(ICSState *ics, int nr, int server,
void ics_set_irq_type(ICSState *ics, int srcno, bool lsi);
void ics_resend(ICSState *ics);
+void icp_resend(XICSFabric *xi, ICPState *ss);
#endif /* XICS_H */
Let's add two new handlers for ICPs. One is to get an ICP object from a server number and a second is to resend the irqs when needed. Signed-off-by: Cédric Le Goater <clg@kaod.org> --- hw/intc/xics.c | 2 +- hw/ppc/spapr.c | 20 ++++++++++++++++++++ include/hw/ppc/xics.h | 3 +++ 3 files changed, 24 insertions(+), 1 deletion(-)