[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/6] xics: add find_server
From: |
Alexey Kardashevskiy |
Subject: |
[Qemu-devel] [PATCH 2/6] xics: add find_server |
Date: |
Wed, 7 May 2014 16:01:54 +1000 |
PAPR allows having multiple interrupr servers.
This adds a server lookup function and makes use of it.
Since at the moment QEMU only supports a single server,
no change in behaviour is expected.
Signed-off-by: Alexey Kardashevskiy <address@hidden>
---
hw/intc/xics.c | 28 +++++++++++++++++++++++-----
1 file changed, 23 insertions(+), 5 deletions(-)
diff --git a/hw/intc/xics.c b/hw/intc/xics.c
index 1f89a00..9314654 100644
--- a/hw/intc/xics.c
+++ b/hw/intc/xics.c
@@ -635,14 +635,30 @@ static const TypeInfo ics_info = {
/*
* Exported functions
*/
+static int xics_find_server(XICSState *icp, int irq)
+{
+ int server;
+
+ for (server = 0; server < icp->nr_servers; ++server) {
+ ICSState *ics = &icp->ics[server];
+ if (ics_valid_irq(ics, irq)) {
+ return server;
+ }
+ }
+
+ return -1;
+}
qemu_irq xics_get_qirq(XICSState *icp, int irq)
{
- if (!ics_valid_irq(icp->ics, irq)) {
- return NULL;
+ int server = xics_find_server(icp, irq);
+
+ if (server >= 0) {
+ ICSState *ics = &icp->ics[server];
+ 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)
@@ -653,10 +669,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 server = xics_find_server(icp, irq);
+ ICSState *ics;
- assert(ics_valid_irq(ics, irq));
+ assert(server >= 0);
+ ics = &icp->ics[server];
ics_set_irq_type(ics, irq - ics->offset, lsi);
}
--
1.8.4.rc4
- [Qemu-devel] [PATCH 0/6] move interrupts from spapr to xics, Alexey Kardashevskiy, 2014/05/07
- [Qemu-devel] [PATCH 5/6] spapr: remove @next_irq, Alexey Kardashevskiy, 2014/05/07
- [Qemu-devel] [PATCH 3/6] xics: disable flags reset on xics reset, Alexey Kardashevskiy, 2014/05/07
- [Qemu-devel] [PATCH 2/6] xics: add find_server,
Alexey Kardashevskiy <=
- [Qemu-devel] [PATCH 6/6] xics: implement xics_ics_free(), Alexey Kardashevskiy, 2014/05/07
- [Qemu-devel] [PATCH 4/6] spapr: move interrupt allocator to xics, Alexey Kardashevskiy, 2014/05/07
- [Qemu-devel] [PATCH 1/6] xics: add flags for interrupts, Alexey Kardashevskiy, 2014/05/07
- Re: [Qemu-devel] [PATCH 1/6] xics: add flags for interrupts, Alexander Graf, 2014/05/08