[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 7/7] pseries: Fix XICS reset
From: |
David Gibson |
Subject: |
[Qemu-ppc] [PATCH 7/7] pseries: Fix XICS reset |
Date: |
Mon, 10 Sep 2012 16:38:51 +1000 |
The XICS interrupt controller used on the pseries machine currently has no
reset handler. We can get away with this under some circumstances, but
it's not correct, and can cause failures if the XICS happens to be in the
wrong state at the time of reset.
This patch adds a hook to properly reset the XICS state.
Signed-off-by: David Gibson <address@hidden>
---
hw/xics.c | 34 ++++++++++++++++++++++++----------
1 file changed, 24 insertions(+), 10 deletions(-)
diff --git a/hw/xics.c b/hw/xics.c
index b674771..8b1ee2d 100644
--- a/hw/xics.c
+++ b/hw/xics.c
@@ -489,11 +489,32 @@ static void rtas_int_on(sPAPREnvironment *spapr, uint32_t
token,
rtas_st(rets, 0, 0); /* Success */
}
+static void xics_reset(void *opaque)
+{
+ struct icp_state *icp = (struct icp_state *)opaque;
+ struct ics_state *ics = icp->ics;
+ int i;
+
+ for (i = 0; i < icp->nr_servers; i++) {
+ icp->ss[i].xirr = 0;
+ icp->ss[i].pending_priority = 0;
+ icp->ss[i].mfrr = 0xff;
+ /* Make all outputs are deasserted */
+ qemu_set_irq(icp->ss[i].output, 0);
+ }
+
+ for (i = 0; i < ics->nr_irqs; i++) {
+ memset(&ics->irqs[i], 0, sizeof(ics->irqs[i]));
+
+ ics->irqs[i].priority = 0xff;
+ ics->irqs[i].saved_priority = 0xff;
+ }
+}
+
struct icp_state *xics_system_init(int nr_irqs)
{
CPUPPCState *env;
int max_server_num;
- int i;
struct icp_state *icp;
struct ics_state *ics;
@@ -508,10 +529,6 @@ struct icp_state *xics_system_init(int nr_irqs)
icp->nr_servers = max_server_num + 1;
icp->ss = g_malloc0(icp->nr_servers*sizeof(struct icp_server_state));
- for (i = 0; i < icp->nr_servers; i++) {
- icp->ss[i].mfrr = 0xff;
- }
-
for (env = first_cpu; env != NULL; env = env->next_cpu) {
struct icp_server_state *ss = &icp->ss[env->cpu_index];
@@ -539,11 +556,6 @@ struct icp_state *xics_system_init(int nr_irqs)
icp->ics = ics;
ics->icp = icp;
- for (i = 0; i < nr_irqs; i++) {
- ics->irqs[i].priority = 0xff;
- ics->irqs[i].saved_priority = 0xff;
- }
-
ics->qirqs = qemu_allocate_irqs(ics_set_irq, ics, nr_irqs);
spapr_register_hypercall(H_CPPR, h_cppr);
@@ -556,5 +568,7 @@ struct icp_state *xics_system_init(int nr_irqs)
spapr_rtas_register("ibm,int-off", rtas_int_off);
spapr_rtas_register("ibm,int-on", rtas_int_on);
+ qemu_register_reset(xics_reset, icp);
+
return icp;
}
--
1.7.10.4
- [Qemu-ppc] [0/7] System reset fixes for pseries, David Gibson, 2012/09/10
- [Qemu-ppc] [PATCH 7/7] pseries: Fix XICS reset,
David Gibson <=
- [Qemu-ppc] [PATCH 5/7] pseries: Clear TCE and signal state when resetting PAPR VIO devices, David Gibson, 2012/09/10
- [Qemu-ppc] [PATCH 3/7] pseries: Use new method to correct reset sequence, David Gibson, 2012/09/10
- [Qemu-ppc] [PATCH 1/7] ppc: Make kvm_arch_put_registers() put *all* the registers, David Gibson, 2012/09/10
- [Qemu-ppc] [PATCH 6/7] pseries: Reset emulated PCI TCE tables on system reset, David Gibson, 2012/09/10
- [Qemu-ppc] [PATCH 4/7] pseries: Add support for new KVM hash table control call, David Gibson, 2012/09/10
- [Qemu-ppc] [PATCH 2/7] pseries: Fix and cleanup CPU initialization and reset, David Gibson, 2012/09/10