[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/15] openpic: IRQ_check: search the queue a word a
From: |
Scott Wood |
Subject: |
[Qemu-devel] [PATCH 12/15] openpic: IRQ_check: search the queue a word at a time |
Date: |
Fri, 21 Dec 2012 20:15:49 -0600 |
Search the queue more efficiently by first looking for a non-zero word,
and then using the common bit-searching function to find the bit within
the word. It would be even nicer if bitops_ffsl() could be hooked up
to the compiler intrinsic so that bit-searching instructions could be
used, but that's another matter.
Signed-off-by: Scott Wood <address@hidden>
---
hw/openpic.c | 28 +++++++++++++++++++++-------
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/hw/openpic.c b/hw/openpic.c
index f2ac286..5accff5 100644
--- a/hw/openpic.c
+++ b/hw/openpic.c
@@ -270,21 +270,35 @@ static inline int IRQ_testbit(IRQ_queue_t *q, int n_IRQ)
static void IRQ_check(OpenPICState *opp, IRQ_queue_t *q)
{
- int next, i;
+ int next, word, irq, base;
int priority;
next = -1;
priority = -1;
- for (i = 0; i < opp->max_irq; i++) {
- if (IRQ_testbit(q, i)) {
+
+ for (word = 0, base = 0; word < ARRAY_SIZE(q->queue);
+ word++, base += BITS_PER_LONG) {
+ unsigned long map = q->queue[word];
+
+ if (!map) {
+ continue;
+ }
+
+ while (map) {
+ int offset = bitops_ffsl(map);
+ irq = base + offset;
+ map &= ~(1UL << offset);
+
DPRINTF("IRQ_check: irq %d set ivpr_pr=%d pr=%d\n",
- i, IVPR_PRIORITY(opp->src[i].ivpr), priority);
- if (IVPR_PRIORITY(opp->src[i].ivpr) > priority) {
- next = i;
- priority = IVPR_PRIORITY(opp->src[i].ivpr);
+ irq, IVPR_PRIORITY(opp->src[irq].ivpr), priority);
+
+ if (IVPR_PRIORITY(opp->src[irq].ivpr) > priority) {
+ next = irq;
+ priority = IVPR_PRIORITY(opp->src[irq].ivpr);
}
}
}
+
q->next = next;
q->priority = priority;
}
--
1.7.9.5
- [Qemu-devel] [PATCH 00/15] openpic: cleanups and fixes, Scott Wood, 2012/12/21
- [Qemu-devel] [PATCH 02/15] openpic: lower interrupt when reading the MSI register, Scott Wood, 2012/12/21
- [Qemu-devel] [PATCH 04/15] ppc/booke: fix crit/mcheck/debug exceptions, Scott Wood, 2012/12/21
- [Qemu-devel] [PATCH 01/15] openpic: fix debug prints, Scott Wood, 2012/12/21
- [Qemu-devel] [PATCH 03/15] openpic: fix sense and priority bits, Scott Wood, 2012/12/21
- [Qemu-devel] [PATCH 07/15] openpic: make ctpr signed, Scott Wood, 2012/12/21
- [Qemu-devel] [PATCH 06/15] openpic: rework critical interrupt support, Scott Wood, 2012/12/21
- [Qemu-devel] [PATCH 08/15] openpic/fsl: critical interrupts ignore mask before v4.1, Scott Wood, 2012/12/21
- [Qemu-devel] [PATCH 10/15] Revert "openpic: Accelerate pending irq search", Scott Wood, 2012/12/21
- [Qemu-devel] [PATCH 12/15] openpic: IRQ_check: search the queue a word at a time,
Scott Wood <=
- [Qemu-devel] [PATCH 09/15] openpic: always call IRQ_check from IRQ_get_next, Scott Wood, 2012/12/21
- [Qemu-devel] [PATCH 11/15] openpic: use standard bitmap operations, Scott Wood, 2012/12/21
- [Qemu-devel] [PATCH 05/15] openpic: make register names correspond better with hw docs, Scott Wood, 2012/12/21
- [Qemu-devel] [PATCH 15/15] openpic: fix CTPR and de-assertion of interrupts, Scott Wood, 2012/12/21
- [Qemu-devel] [PATCH 13/15] openpic: add some bounds checking for IRQ numbers, Scott Wood, 2012/12/21
- [Qemu-devel] [PATCH 14/15] openpic: move IACK to its own function, Scott Wood, 2012/12/21