[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH v4 14/26] ppc/xics: extend the QOM interface to handle
From: |
Cédric Le Goater |
Subject: |
[Qemu-ppc] [PATCH v4 14/26] ppc/xics: extend the QOM interface to handle ICPs |
Date: |
Mon, 27 Feb 2017 15:29:21 +0100 |
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 <address@hidden>
---
hw/intc/xics.c | 2 +-
hw/ppc/spapr.c | 20 ++++++++++++++++++++
include/hw/ppc/xics.h | 3 +++
3 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/hw/intc/xics.c b/hw/intc/xics.c
index 76b50dc7722a..f828bcb07026 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 70b9618309fc..7273157ad50e 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2928,6 +2928,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);
@@ -2972,6 +2990,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 = {
diff --git a/include/hw/ppc/xics.h b/include/hw/ppc/xics.h
index 15c52f9d9eda..01ca5e2dab50 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 */
--
2.7.4
- [Qemu-ppc] [PATCH v4 03/26] ppc/xics: remove set_nr_irqs() handler from XICSStateClass, (continued)
- [Qemu-ppc] [PATCH v4 03/26] ppc/xics: remove set_nr_irqs() handler from XICSStateClass, Cédric Le Goater, 2017/02/27
- [Qemu-ppc] [PATCH v4 06/26] ppc/xics: add an InterruptStatsProvider interface to ICS and ICP objects, Cédric Le Goater, 2017/02/27
- [Qemu-ppc] [PATCH v4 05/26] ppc/xics: store the ICS object under the sPAPR machine, Cédric Le Goater, 2017/02/27
- [Qemu-ppc] [PATCH v4 07/26] ppc/xics: introduce a XICSFabric QOM interface to handle ICSs, Cédric Le Goater, 2017/02/27
- [Qemu-ppc] [PATCH v4 09/26] ppc/xics: use the QOM interface to get irqs, Cédric Le Goater, 2017/02/27
- [Qemu-ppc] [PATCH v4 10/26] ppc/xics: use the QOM interface to resend irqs, Cédric Le Goater, 2017/02/27
- [Qemu-ppc] [PATCH v4 08/26] ppc/xics: use the QOM interface under the sPAPR machine, Cédric Le Goater, 2017/02/27
- [Qemu-ppc] [PATCH v4 11/26] ppc/xics: remove xics_find_source(), Cédric Le Goater, 2017/02/27
- [Qemu-ppc] [PATCH v4 12/26] ppc/xics: register the reset handler of ICS objects, Cédric Le Goater, 2017/02/27
- [Qemu-ppc] [PATCH v4 13/26] ppc/xics: remove the XICS list of ICS, Cédric Le Goater, 2017/02/27
- [Qemu-ppc] [PATCH v4 14/26] ppc/xics: extend the QOM interface to handle ICPs,
Cédric Le Goater <=
- [Qemu-ppc] [PATCH v4 15/26] ppc/xics: move kernel_xics_fd out of KVMXICSState, Cédric Le Goater, 2017/02/27
- [Qemu-ppc] [PATCH v4 16/26] ppc/xics: simplify the cpu_setup() handler, Cédric Le Goater, 2017/02/27
- [Qemu-ppc] [PATCH v4 17/26] ppc/xics: move the cpu_setup() handler under the ICPState class, Cédric Le Goater, 2017/02/27
- [Qemu-ppc] [PATCH v4 18/26] ppc/xics: use the QOM interface to grab an ICP, Cédric Le Goater, 2017/02/27
- [Qemu-ppc] [PATCH v4 19/26] ppc/xics: simplify spapr_dt_xics() interface, Cédric Le Goater, 2017/02/27
- [Qemu-ppc] [PATCH v4 20/26] ppc/xics: register the reset handler of ICP objects, Cédric Le Goater, 2017/02/27
- [Qemu-ppc] [PATCH v4 21/26] ppc/xics: move the ICP array under the sPAPR machine, Cédric Le Goater, 2017/02/27
- [Qemu-ppc] [PATCH v4 22/26] ppc/xics: export the XICS init routines, Cédric Le Goater, 2017/02/27
- [Qemu-ppc] [PATCH v4 23/26] ppc/xics: remove the XICSState classes, Cédric Le Goater, 2017/02/27
- [Qemu-ppc] [PATCH v4 24/26] ppc/xics: move ics-simple post_load under the machine, Cédric Le Goater, 2017/02/27