[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 11/15] openpic: use standard bitmap operations
From: |
Scott Wood |
Subject: |
[Qemu-devel] [PATCH 11/15] openpic: use standard bitmap operations |
Date: |
Fri, 21 Dec 2012 20:15:48 -0600 |
Besides the private implementation being redundant, namespace collisions
prevented the use of other things in bitops.h.
Serialization does get a bit more awkward, unfortunately, since the
standard bitmap operations are "unsigned long" rather than "uint32_t",
though in exchange we will get faster queue lookups on 64-bit hosts once
we search a word at a time.
Signed-off-by: Scott Wood <address@hidden>
---
hw/openpic.c | 55 +++++++++++++++++++++++++++++--------------------------
1 file changed, 29 insertions(+), 26 deletions(-)
diff --git a/hw/openpic.c b/hw/openpic.c
index cc3e514..f2ac286 100644
--- a/hw/openpic.c
+++ b/hw/openpic.c
@@ -39,6 +39,7 @@
#include "openpic.h"
#include "sysbus.h"
#include "pci/msi.h"
+#include "qemu/bitops.h"
//#define DEBUG_OPENPIC
@@ -145,24 +146,6 @@
#define MSIIR_IBS_SHIFT 24
#define MSIIR_IBS_MASK (0x1f << MSIIR_IBS_SHIFT)
-#define BF_WIDTH(_bits_) \
-(((_bits_) + (sizeof(uint32_t) * 8) - 1) / (sizeof(uint32_t) * 8))
-
-static inline void set_bit(uint32_t *field, int bit)
-{
- field[bit >> 5] |= 1 << (bit & 0x1F);
-}
-
-static inline void reset_bit(uint32_t *field, int bit)
-{
- field[bit >> 5] &= ~(1 << (bit & 0x1F));
-}
-
-static inline int test_bit(uint32_t *field, int bit)
-{
- return (field[bit >> 5] & 1 << (bit & 0x1F)) != 0;
-}
-
static int get_current_cpu(void)
{
if (!cpu_single_env) {
@@ -178,7 +161,10 @@ static void openpic_cpu_write_internal(void *opaque,
hwaddr addr,
uint32_t val, int idx);
typedef struct IRQ_queue_t {
- uint32_t queue[BF_WIDTH(MAX_IRQ)];
+ /* Round up to the nearest 64 IRQs so that the queue length
+ * won't change when moving between 32 and 64 bit hosts.
+ */
+ unsigned long queue[BITS_TO_LONGS((MAX_IRQ + 63) & ~63)];
int next;
int priority;
} IRQ_queue_t;
@@ -269,17 +255,17 @@ typedef struct OpenPICState {
static inline void IRQ_setbit(IRQ_queue_t *q, int n_IRQ)
{
- set_bit(q->queue, n_IRQ);
+ set_bit(n_IRQ, q->queue);
}
static inline void IRQ_resetbit(IRQ_queue_t *q, int n_IRQ)
{
- reset_bit(q->queue, n_IRQ);
+ clear_bit(n_IRQ, q->queue);
}
static inline int IRQ_testbit(IRQ_queue_t *q, int n_IRQ)
{
- return test_bit(q->queue, n_IRQ);
+ return test_bit(n_IRQ, q->queue);
}
static void IRQ_check(OpenPICState *opp, IRQ_queue_t *q)
@@ -1137,8 +1123,16 @@ static void openpic_save_IRQ_queue(QEMUFile* f,
IRQ_queue_t *q)
{
unsigned int i;
- for (i = 0; i < BF_WIDTH(MAX_IRQ); i++)
- qemu_put_be32s(f, &q->queue[i]);
+ for (i = 0; i < ARRAY_SIZE(q->queue); i++) {
+ /* Always put the lower half of a 64-bit long first, in case we
+ * restore on a 32-bit host. The least significant bits correspond
+ * to lower IRQ numbers in the bitmap.
+ */
+ qemu_put_be32(f, (uint32_t)q->queue[i]);
+#if LONG_MAX > 0x7FFFFFFF
+ qemu_put_be32(f, (uint32_t)(q->queue[i] >> 32));
+#endif
+ }
qemu_put_sbe32s(f, &q->next);
qemu_put_sbe32s(f, &q->priority);
@@ -1180,8 +1174,17 @@ static void openpic_load_IRQ_queue(QEMUFile* f,
IRQ_queue_t *q)
{
unsigned int i;
- for (i = 0; i < BF_WIDTH(MAX_IRQ); i++)
- qemu_get_be32s(f, &q->queue[i]);
+ for (i = 0; i < ARRAY_SIZE(q->queue); i++) {
+ unsigned long val;
+
+ val = qemu_get_be32(f);
+#if LONG_MAX > 0x7FFFFFFF
+ val <<= 32;
+ val |= qemu_get_be32(f);
+#endif
+
+ q->queue[i] = val;
+ }
qemu_get_sbe32s(f, &q->next);
qemu_get_sbe32s(f, &q->priority);
--
1.7.9.5
- [Qemu-devel] [PATCH 02/15] openpic: lower interrupt when reading the MSI register, (continued)
- [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, 2012/12/21
- [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 <=
- [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