diff options
| -rw-r--r-- | hw/a15mpcore.c | 8 | ||||
| -rw-r--r-- | hw/a9mpcore.c | 9 | ||||
| -rw-r--r-- | hw/arm11mpcore.c | 6 | ||||
| -rw-r--r-- | hw/arm_gic.c | 20 | ||||
| -rw-r--r-- | hw/armv7m_nvic.c | 7 | ||||
| -rw-r--r-- | hw/exynos4210_gic.c | 6 | ||||
| -rw-r--r-- | hw/realview_gic.c | 7 |
7 files changed, 15 insertions, 48 deletions
diff --git a/hw/a15mpcore.c b/hw/a15mpcore.c index 67206ec870..2e2ed423da 100644 --- a/hw/a15mpcore.c +++ b/hw/a15mpcore.c @@ -20,14 +20,6 @@ #include "sysbus.h" -/* Configuration for arm_gic.c: - * how to ID current CPU - */ -static inline int gic_get_current_cpu(void) -{ - return cpu_single_env->cpu_index; -} - #include "arm_gic.c" /* A15MP private memory region. */ diff --git a/hw/a9mpcore.c b/hw/a9mpcore.c index 5bbe3c76c5..1d83c37ad5 100644 --- a/hw/a9mpcore.c +++ b/hw/a9mpcore.c @@ -10,15 +10,6 @@ #include "sysbus.h" -/* Configuration for arm_gic.c: - * how to ID current CPU - */ -static inline int -gic_get_current_cpu(void) -{ - return cpu_single_env->cpu_index; -} - #include "arm_gic.c" /* A9MP private memory region. */ diff --git a/hw/arm11mpcore.c b/hw/arm11mpcore.c index 99c18269c1..c4829d8845 100644 --- a/hw/arm11mpcore.c +++ b/hw/arm11mpcore.c @@ -10,12 +10,6 @@ #include "sysbus.h" #include "qemu-timer.h" -static inline int -gic_get_current_cpu(void) -{ - return cpu_single_env->cpu_index; -} - #include "arm_gic.c" /* MPCore private memory region. */ diff --git a/hw/arm_gic.c b/hw/arm_gic.c index f64a0015f4..df1a34b8df 100644 --- a/hw/arm_gic.c +++ b/hw/arm_gic.c @@ -126,6 +126,16 @@ typedef struct gic_state uint32_t num_irq; } gic_state; +static inline int gic_get_current_cpu(gic_state *s) +{ +#if NCPU > 1 + if (s->num_cpu > 1) { + return cpu_single_env->cpu_index; + } +#endif + return 0; +} + /* TODO: Many places that call this routine could be optimized. */ /* Update interrupt status after enabled or pending bits have been changed. */ static void gic_update(gic_state *s) @@ -285,7 +295,7 @@ static uint32_t gic_dist_readb(void *opaque, target_phys_addr_t offset) int cm; int mask; - cpu = gic_get_current_cpu(); + cpu = gic_get_current_cpu(s); cm = 1 << cpu; if (offset < 0x100) { #ifndef NVIC @@ -420,7 +430,7 @@ static void gic_dist_writeb(void *opaque, target_phys_addr_t offset, int i; int cpu; - cpu = gic_get_current_cpu(); + cpu = gic_get_current_cpu(s); if (offset < 0x100) { #ifdef NVIC goto bad_reg; @@ -582,7 +592,7 @@ static void gic_dist_writel(void *opaque, target_phys_addr_t offset, int irq; int mask; - cpu = gic_get_current_cpu(); + cpu = gic_get_current_cpu(s); irq = value & 0x3ff; switch ((value >> 24) & 3) { case 0: @@ -665,14 +675,14 @@ static uint64_t gic_thiscpu_read(void *opaque, target_phys_addr_t addr, unsigned size) { gic_state *s = (gic_state *)opaque; - return gic_cpu_read(s, gic_get_current_cpu(), addr); + return gic_cpu_read(s, gic_get_current_cpu(s), addr); } static void gic_thiscpu_write(void *opaque, target_phys_addr_t addr, uint64_t value, unsigned size) { gic_state *s = (gic_state *)opaque; - gic_cpu_write(s, gic_get_current_cpu(), addr, value); + gic_cpu_write(s, gic_get_current_cpu(s), addr, value); } /* Wrappers to read/write the GIC CPU interface for a specific CPU. diff --git a/hw/armv7m_nvic.c b/hw/armv7m_nvic.c index bdab709798..99ed85b163 100644 --- a/hw/armv7m_nvic.c +++ b/hw/armv7m_nvic.c @@ -17,13 +17,6 @@ #define NVIC 1 -/* Only a single "CPU" interface is present. */ -static inline int -gic_get_current_cpu(void) -{ - return 0; -} - static uint32_t nvic_readl(void *opaque, uint32_t offset); static void nvic_writel(void *opaque, uint32_t offset, uint32_t value); diff --git a/hw/exynos4210_gic.c b/hw/exynos4210_gic.c index 426f540174..ff7ab848e5 100644 --- a/hw/exynos4210_gic.c +++ b/hw/exynos4210_gic.c @@ -262,12 +262,6 @@ uint32_t exynos4210_get_irq(uint32_t grp, uint32_t bit) /********* GIC part *********/ -static inline int -gic_get_current_cpu(void) -{ - return cpu_single_env->cpu_index; -} - #include "arm_gic.c" typedef struct { diff --git a/hw/realview_gic.c b/hw/realview_gic.c index d114242f27..aa780fe47f 100644 --- a/hw/realview_gic.c +++ b/hw/realview_gic.c @@ -9,13 +9,6 @@ #include "sysbus.h" -/* Only a single "CPU" interface is present. */ -static inline int -gic_get_current_cpu(void) -{ - return 0; -} - #include "arm_gic.c" typedef struct { |