[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/15] pseries: Use #define for XICS base irq number
From: |
David Gibson |
Subject: |
[Qemu-devel] [PATCH 06/15] pseries: Use #define for XICS base irq number |
Date: |
Thu, 18 Oct 2012 16:50:28 +1100 |
From: Ben Herrenschmidt <address@hidden>
Currently the lowest "real" irq number for the XICS irq controller (as
opposed to numbers reserved for IPIs and other special purposes) is
hard coded as 16 in two places - in xics_system_init() and in spapr.c.
As well as being generally bad practice, we're going to need to change this
number soon to fit in with the in-kernel XICS implementation. This patch
adds a #define for this number to avoid future breakage.
Signed-off-by: Michael Ellerman <address@hidden>
Signed-off-by: Ben Herrenschmidt <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
hw/spapr.c | 2 +-
hw/xics.c | 2 +-
hw/xics.h | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/spapr.c b/hw/spapr.c
index 64c35a8..789c941 100644
--- a/hw/spapr.c
+++ b/hw/spapr.c
@@ -798,7 +798,7 @@ static void ppc_spapr_init(ram_addr_t ram_size,
/* Set up Interrupt Controller */
spapr->icp = xics_system_init(XICS_IRQS);
- spapr->next_irq = 16;
+ spapr->next_irq = XICS_IRQ_BASE;
/* Set up EPOW events infrastructure */
spapr_events_init(spapr);
diff --git a/hw/xics.c b/hw/xics.c
index 7a899dd..db01fe3 100644
--- a/hw/xics.c
+++ b/hw/xics.c
@@ -548,7 +548,7 @@ struct icp_state *xics_system_init(int nr_irqs)
ics = g_malloc0(sizeof(*ics));
ics->nr_irqs = nr_irqs;
- ics->offset = 16;
+ ics->offset = XICS_IRQ_BASE;
ics->irqs = g_malloc0(nr_irqs * sizeof(struct ics_irq_state));
icp->ics = ics;
diff --git a/hw/xics.h b/hw/xics.h
index 6817268..c3bf008 100644
--- a/hw/xics.h
+++ b/hw/xics.h
@@ -28,6 +28,7 @@
#define __XICS_H__
#define XICS_IPI 0x2
+#define XICS_IRQ_BASE 0x10
struct icp_state;
--
1.7.10.4
- [Qemu-devel] [0/15] pseries patch queue, David Gibson, 2012/10/18
- [Qemu-devel] [PATCH 05/15] pseries: Clean up inconsistent variable name in xics.c, David Gibson, 2012/10/18
- [Qemu-devel] [PATCH 01/15] pseries: Don't allow duplicate registration of hcalls or RTAS calls, David Gibson, 2012/10/18
- [Qemu-devel] [PATCH 09/15] pseries: Return the token when we register an RTAS call, David Gibson, 2012/10/18
- [Qemu-devel] [PATCH 10/15] pseries: Allow RTAS tokens without a qemu handler, David Gibson, 2012/10/18
- [Qemu-devel] [PATCH 06/15] pseries: Use #define for XICS base irq number,
David Gibson <=
- [Qemu-devel] [PATCH 02/15] target-ppc: Rework storage of VPA registration state, David Gibson, 2012/10/18
- [Qemu-devel] [PATCH 07/15] pseries: Cleanup duplications of ics_valid_irq() code, David Gibson, 2012/10/18
- [Qemu-devel] [PATCH 12/15] pseries: Split xics irq configuration from state information, David Gibson, 2012/10/18
- [Qemu-devel] [PATCH 11/15] pseries: Add tracepoints to the XICS interrupt controller, David Gibson, 2012/10/18
- [Qemu-devel] [PATCH 04/15] target-ppc: Extend FPU state for newer POWER CPUs, David Gibson, 2012/10/18
- [Qemu-devel] [PATCH 08/15] pseries: Move XICS initialization before cpu initialization, David Gibson, 2012/10/18
- [Qemu-devel] [PATCH 13/15] target-pcc: Convert ppcemb_tlb_t to use fixed 64-bit RPN, David Gibson, 2012/10/18
- [Qemu-devel] [PATCH 03/15] pseries: Implement qemu initiated shutdowns using EPOW events, David Gibson, 2012/10/18