[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 19/31] Revert "openpic: Accelerate pending irq search"
From: |
Alexander Graf |
Subject: |
[Qemu-ppc] [PATCH 19/31] Revert "openpic: Accelerate pending irq search" |
Date: |
Mon, 7 Jan 2013 16:38:48 +0100 |
From: Scott Wood <address@hidden>
This reverts commit a9bd83f4c65de0058659ede009fa1a241f379edd.
This counting approach is not robust against setting a bit that
was already set, or clearing a bit that was already clear. Perhaps
that is considered a bug, but besides the lack of any documentation
for that restriction, it's a pretty unpleasant way for the problem
to manifest itself.
It could be made more robust by testing the current value of the
bit before changing the count, but a later patch speeds up IRQ_check
in all cases, not just when there's nothing pending. Hopefully that
should be adequate to address performance concerns.
Signed-off-by: Scott Wood <address@hidden>
Signed-off-by: Alexander Graf <address@hidden>
---
hw/openpic.c | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/hw/openpic.c b/hw/openpic.c
index 19e6280..2c238fb 100644
--- a/hw/openpic.c
+++ b/hw/openpic.c
@@ -183,7 +183,6 @@ typedef struct IRQQueue {
uint32_t queue[BF_WIDTH(MAX_IRQ)];
int next;
int priority;
- int pending; /* nr of pending bits in queue */
} IRQQueue;
typedef struct IRQSource {
@@ -269,13 +268,11 @@ typedef struct OpenPICState {
static inline void IRQ_setbit(IRQQueue *q, int n_IRQ)
{
- q->pending++;
set_bit(q->queue, n_IRQ);
}
static inline void IRQ_resetbit(IRQQueue *q, int n_IRQ)
{
- q->pending--;
reset_bit(q->queue, n_IRQ);
}
@@ -291,12 +288,6 @@ static void IRQ_check(OpenPICState *opp, IRQQueue *q)
next = -1;
priority = -1;
-
- if (!q->pending) {
- /* IRQ bitmap is empty */
- goto out;
- }
-
for (i = 0; i < opp->max_irq; i++) {
if (IRQ_testbit(q, i)) {
DPRINTF("IRQ_check: irq %d set ivpr_pr=%d pr=%d\n",
@@ -307,8 +298,6 @@ static void IRQ_check(OpenPICState *opp, IRQQueue *q)
}
}
}
-
-out:
q->next = next;
q->priority = priority;
}
--
1.6.0.2
- [Qemu-ppc] [PULL 00/31] ppc patch queue 2013-01-07, Alexander Graf, 2013/01/07
- [Qemu-ppc] [PATCH 05/31] openpic: s/opp->nb_irqs -1/opp->nb_cpus - 1/, Alexander Graf, 2013/01/07
- [Qemu-ppc] [PATCH 02/31] openpic: remove pcsr (CPU sensitivity register), Alexander Graf, 2013/01/07
- [Qemu-ppc] [PATCH 06/31] openpic: don't crash on a register access without a CPU context, Alexander Graf, 2013/01/07
- [Qemu-ppc] [PATCH 04/31] openpic: BRR1 is not a CPU-specific register., Alexander Graf, 2013/01/07
- [Qemu-ppc] [PATCH 10/31] PPC: fix segfault in signal handling code, Alexander Graf, 2013/01/07
- [Qemu-ppc] [PATCH 07/31] powerpc: linux header sync script includes epapr_hcalls.h, Alexander Graf, 2013/01/07
- [Qemu-ppc] [PATCH 03/31] openpic: support large vectors on FSL mpic, Alexander Graf, 2013/01/07
- [Qemu-ppc] [PATCH 08/31] openpic: fix coding style issues, Alexander Graf, 2013/01/07
- [Qemu-ppc] [PATCH 18/31] openpic: always call IRQ_check from IRQ_get_next, Alexander Graf, 2013/01/07
- [Qemu-ppc] [PATCH 19/31] Revert "openpic: Accelerate pending irq search",
Alexander Graf <=
- [Qemu-ppc] [PATCH 23/31] openpic: IRQ_check: search the queue a word at a time, Alexander Graf, 2013/01/07
- [Qemu-ppc] [PATCH 21/31] openpic: add some bounds checking for IRQ numbers, Alexander Graf, 2013/01/07
- [Qemu-ppc] [PATCH 29/31] target-ppc: Slim conversion of model definitions to QOM subclasses, Alexander Graf, 2013/01/07
- [Qemu-ppc] [PATCH 31/31] PPC: linux-user: Calculate context pointer explicitly, Alexander Graf, 2013/01/07
- [Qemu-ppc] [PATCH 26/31] kvm: Update kernel headers, Alexander Graf, 2013/01/07
- [Qemu-ppc] [PATCH 09/31] PPC: Reset qemu timers when guest reset, Alexander Graf, 2013/01/07
- [Qemu-ppc] [PATCH 01/31] openpic: symbolicize some magic numbers, Alexander Graf, 2013/01/07
- Re: [Qemu-ppc] [Qemu-devel] [PULL 00/31] ppc patch queue 2013-01-07, Andreas Färber, 2013/01/07