ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/intc/arm_gic: Remove the definition of NUM_CPU 

arm_gic.c retrieves CPU number using either NUM_CPU(s) or s->num_cpu.
Such mixed-uses make source code inconsistent. This patch removes
NUM_CPU(s), which was defined for MPCore tweak long ago, and instead
favors s->num_cpu. The source is more consistent after this small tweak.

Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Wei Huang <wei@redhat.com>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Message-id: 1446744293-32365-1-git-send-email-wei@redhat.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Wei Huang 2015-11-10 13:37:33 +00:00 committed by Peter Maydell
parent 5c629f4ff4
commit b95690c9be
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/intc/arm_gic.c
View File

@ -35,8 +35,6 @@ static const uint8_t gic_id[] = {
0x90, 0x13, 0x04, 0x00, 0x0d, 0xf0, 0x05, 0xb1 0x90, 0x13, 0x04, 0x00, 0x0d, 0xf0, 0x05, 0xb1
}; };
#define NUM_CPU(s) ((s)->num_cpu)
static inline int gic_get_current_cpu(GICState *s) static inline int gic_get_current_cpu(GICState *s)
{ {
if (s->num_cpu > 1) { if (s->num_cpu > 1) {
@ -64,7 +62,7 @@ void gic_update(GICState *s)
int cpu; int cpu;
int cm; int cm;
for (cpu = 0; cpu < NUM_CPU(s); cpu++) { for (cpu = 0; cpu < s->num_cpu; cpu++) {
cm = 1 << cpu; cm = 1 << cpu;
s->current_pending[cpu] = 1023; s->current_pending[cpu] = 1023;
if (!(s->ctlr & (GICD_CTLR_EN_GRP0 | GICD_CTLR_EN_GRP1)) if (!(s->ctlr & (GICD_CTLR_EN_GRP0 | GICD_CTLR_EN_GRP1))
@ -567,7 +565,7 @@ static uint32_t gic_dist_readb(void *opaque, hwaddr offset, MemTxAttrs attrs)
if (offset == 4) if (offset == 4)
/* Interrupt Controller Type Register */ /* Interrupt Controller Type Register */
return ((s->num_irq / 32) - 1) return ((s->num_irq / 32) - 1)
| ((NUM_CPU(s) - 1) << 5) | ((s->num_cpu - 1) << 5)
| (s->security_extn << 10); | (s->security_extn << 10);
if (offset < 0x08) if (offset < 0x08)
return 0; return 0;
@ -1284,7 +1282,7 @@ static void arm_gic_realize(DeviceState *dev, Error **errp)
* GIC v2 defines a larger memory region (0x1000) so this will need * GIC v2 defines a larger memory region (0x1000) so this will need
* to be extended when we implement A15. * to be extended when we implement A15.
*/ */
for (i = 0; i < NUM_CPU(s); i++) { for (i = 0; i < s->num_cpu; i++) {
s->backref[i] = s; s->backref[i] = s;
memory_region_init_io(&s->cpuiomem[i+1], OBJECT(s), &gic_cpu_ops, memory_region_init_io(&s->cpuiomem[i+1], OBJECT(s), &gic_cpu_ops,
&s->backref[i], "gic_cpu", 0x100); &s->backref[i], "gic_cpu", 0x100);