[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 2/9] xics: Add xics_find_source()
From: |
Alexey Kardashevskiy |
Subject: |
[Qemu-devel] [PATCH v3 2/9] xics: Add xics_find_source() |
Date: |
Fri, 30 May 2014 19:34:13 +1000 |
PAPR allows having multiple interrupt sources such as PHB.
This adds a source lookup function and makes use of it.
Since at the moment QEMU only supports a single source,
no change in behaviour is expected.
Signed-off-by: Alexey Kardashevskiy <address@hidden>
---
hw/intc/xics.c | 30 +++++++++++++++++++++++++-----
1 file changed, 25 insertions(+), 5 deletions(-)
diff --git a/hw/intc/xics.c b/hw/intc/xics.c
index d0aa4cd..84eb4fe 100644
--- a/hw/intc/xics.c
+++ b/hw/intc/xics.c
@@ -636,14 +636,32 @@ static const TypeInfo ics_info = {
/*
* Exported functions
*/
+static int xics_find_source(XICSState *icp, int irq)
+{
+ int sources = 1;
+ int src;
+
+ /* FIXME: implement multiple sources */
+ for (src = 0; src < sources; ++src) {
+ ICSState *ics = &icp->ics[src];
+ if (ics_valid_irq(ics, irq)) {
+ return src;
+ }
+ }
+
+ return -1;
+}
qemu_irq xics_get_qirq(XICSState *icp, int irq)
{
- if (!ics_valid_irq(icp->ics, irq)) {
- return NULL;
+ int src = xics_find_source(icp, irq);
+
+ if (src >= 0) {
+ ICSState *ics = &icp->ics[src];
+ return ics->qirqs[irq - ics->offset];
}
- return icp->ics->qirqs[irq - icp->ics->offset];
+ return NULL;
}
static void ics_set_irq_type(ICSState *ics, int srcno, bool lsi)
@@ -656,10 +674,12 @@ static void ics_set_irq_type(ICSState *ics, int srcno,
bool lsi)
void xics_set_irq_type(XICSState *icp, int irq, bool lsi)
{
- ICSState *ics = icp->ics;
+ int src = xics_find_source(icp, irq);
+ ICSState *ics;
- assert(ics_valid_irq(ics, irq));
+ assert(src >= 0);
+ ics = &icp->ics[src];
ics_set_irq_type(ics, irq - ics->offset, lsi);
}
--
2.0.0
- [Qemu-devel] [PATCH v3 0/9] Move interrupts from spapr to xics, Alexey Kardashevskiy, 2014/05/30
- [Qemu-devel] [PATCH v3 2/9] xics: Add xics_find_source(),
Alexey Kardashevskiy <=
- [Qemu-devel] [PATCH v3 6/9] spapr: Remove @next_irq, Alexey Kardashevskiy, 2014/05/30
- [Qemu-devel] [PATCH v3 8/9] vmstate: Add preallocation for migrating arrays (VMS_ALLOC flag), Alexey Kardashevskiy, 2014/05/30
- [Qemu-devel] [PATCH v3 7/9] xics: Implement xics_ics_free(), Alexey Kardashevskiy, 2014/05/30
- [Qemu-devel] [PATCH v3 5/9] xics: Remove obsolete xics_set_irq_type(), Alexey Kardashevskiy, 2014/05/30
- [Qemu-devel] [PATCH v3 4/9] spapr: Move interrupt allocator to xics, Alexey Kardashevskiy, 2014/05/30
- [Qemu-devel] [PATCH v3 1/9] xics: Add flags for interrupts, Alexey Kardashevskiy, 2014/05/30
- [Qemu-devel] [PATCH v3 9/9] spapr_pci: Use XICS interrupt allocator and do not cache interrupts in PHB, Alexey Kardashevskiy, 2014/05/30