ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Cédric Le Goater 2017-02-27 15:29:21 +01:00 committed by David Gibson
parent d114a66225
commit b2fc59aaf9
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/intc/xics.c
View File

@ -216,7 +216,7 @@ static void icp_check_ipi(ICPState *ss)
qemu_irq_raise(ss->output); qemu_irq_raise(ss->output);
} }
static void icp_resend(ICPState *ss) void icp_resend(ICPState *ss)
{ {
XICSFabric *xi = ss->xics; XICSFabric *xi = ss->xics;
XICSFabricClass *xic = XICS_FABRIC_GET_CLASS(xi); XICSFabricClass *xic = XICS_FABRIC_GET_CLASS(xi);

20
hw/ppc/spapr.c
View File

@ -2984,6 +2984,24 @@ static void spapr_ics_resend(XICSFabric *dev)
ics_resend(spapr->ics); 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) static void spapr_machine_class_init(ObjectClass *oc, void *data)
{ {
MachineClass *mc = MACHINE_CLASS(oc); 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; vhc->store_hpte = spapr_store_hpte;
xic->ics_get = spapr_ics_get; xic->ics_get = spapr_ics_get;
xic->ics_resend = spapr_ics_resend; xic->ics_resend = spapr_ics_resend;
xic->icp_get = spapr_icp_get;
xic->icp_resend = spapr_icp_resend;
} }
static const TypeInfo spapr_machine_info = { static const TypeInfo spapr_machine_info = {

3
include/hw/ppc/xics.h
View File

@ -193,6 +193,8 @@ typedef struct XICSFabricClass {
InterfaceClass parent; InterfaceClass parent;
ICSState *(*ics_get)(XICSFabric *xi, int irq); ICSState *(*ics_get)(XICSFabric *xi, int irq);
void (*ics_resend)(XICSFabric *xi); void (*ics_resend)(XICSFabric *xi);
ICPState *(*icp_get)(XICSFabric *xi, int server);
void (*icp_resend)(XICSFabric *xi);
} XICSFabricClass; } XICSFabricClass;
#define XICS_IRQS_SPAPR 1024 #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_set_irq_type(ICSState *ics, int srcno, bool lsi);
void ics_resend(ICSState *ics); void ics_resend(ICSState *ics);
void icp_resend(ICPState *ss);
#endif /* XICS_H */ #endif /* XICS_H */