diff options
| author | Cédric Le Goater <clg@kaod.org> | 2017-02-27 15:29:21 +0100 |
|---|---|---|
| committer | David Gibson <david@gibson.dropbear.id.au> | 2017-03-01 11:23:39 +1100 |
| commit | b2fc59aaf90f3a0b6e1976d27ce533b035a40b49 (patch) | |
| tree | eedad84b98fd06c28e5df7f154c013017b20ed9b | |
| parent | d114a662253b4b9254f38449d9a7ef3b4b26480e (diff) | |
ppc/xics: extend the QOM interface to handle ICPs
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.
The icp_resend() handler is a temporary workaround needed by the
ics-simple post_load() handler. It will be removed when the post_load
portion can be done at the machine level.
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
| -rw-r--r-- | hw/intc/xics.c | 2 | ||||
| -rw-r--r-- | hw/ppc/spapr.c | 20 | ||||
| -rw-r--r-- | include/hw/ppc/xics.h | 3 |
3 files changed, 24 insertions, 1 deletions
diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 76b50dc772..f828bcb070 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -216,7 +216,7 @@ static void icp_check_ipi(ICPState *ss) qemu_irq_raise(ss->output); } -static void icp_resend(ICPState *ss) +void icp_resend(ICPState *ss) { XICSFabric *xi = ss->xics; XICSFabricClass *xic = XICS_FABRIC_GET_CLASS(xi); diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index bce975ada5..5400519df9 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2984,6 +2984,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(&spapr->xics->ss[i]); + } +} + static void spapr_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -3032,6 +3050,8 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) vhc->store_hpte = spapr_store_hpte; 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 = { diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h index 15c52f9d9e..01ca5e2dab 100644 --- a/include/hw/ppc/xics.h +++ b/include/hw/ppc/xics.h @@ -193,6 +193,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 @@ -223,5 +225,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(ICPState *ss); #endif /* XICS_H */ |