OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/intc/arm_gicv3: Fix decoding of ID register range 

The GIC ID registers cover an area 0x30 bytes in size
(12 registers, 4 bytes each). We were incorrectly decoding
only the first 0x20 bytes.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20190524124248.28394-2-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2019-05-24 13:42:47 +01:00
parent a90a862b9e
commit e40f60730a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/intc/arm_gicv3_dist.c
View File

@ -533,7 +533,7 @@ static MemTxResult gicd_readl(GICv3State *s, hwaddr offset,
} }
return MEMTX_OK; return MEMTX_OK;
} }
case GICD_IDREGS ... GICD_IDREGS + 0x1f: case GICD_IDREGS ... GICD_IDREGS + 0x2f:
/* ID registers */ /* ID registers */
*data = gicv3_idreg(offset - GICD_IDREGS); *data = gicv3_idreg(offset - GICD_IDREGS);
return MEMTX_OK; return MEMTX_OK;
@ -744,7 +744,7 @@ static MemTxResult gicd_writel(GICv3State *s, hwaddr offset,
gicd_write_irouter(s, attrs, irq, r); gicd_write_irouter(s, attrs, irq, r);
return MEMTX_OK; return MEMTX_OK;
} }
case GICD_IDREGS ... GICD_IDREGS + 0x1f: case GICD_IDREGS ... GICD_IDREGS + 0x2f:
case GICD_TYPER: case GICD_TYPER:
case GICD_IIDR: case GICD_IIDR:
/* RO registers, ignore the write */ /* RO registers, ignore the write */

4
hw/intc/arm_gicv3_redist.c
View File

@ -233,7 +233,7 @@ static MemTxResult gicr_readl(GICv3CPUState *cs, hwaddr offset,
} }
*data = cs->gicr_nsacr; *data = cs->gicr_nsacr;
return MEMTX_OK; return MEMTX_OK;
case GICR_IDREGS ... GICR_IDREGS + 0x1f: case GICR_IDREGS ... GICR_IDREGS + 0x2f:
*data = gicv3_idreg(offset - GICR_IDREGS); *data = gicv3_idreg(offset - GICR_IDREGS);
return MEMTX_OK; return MEMTX_OK;
default: default:
@ -363,7 +363,7 @@ static MemTxResult gicr_writel(GICv3CPUState *cs, hwaddr offset,
return MEMTX_OK; return MEMTX_OK;
case GICR_IIDR: case GICR_IIDR:
case GICR_TYPER: case GICR_TYPER:
case GICR_IDREGS ... GICR_IDREGS + 0x1f: case GICR_IDREGS ... GICR_IDREGS + 0x2f:
/* RO registers, ignore the write */ /* RO registers, ignore the write */
qemu_log_mask(LOG_GUEST_ERROR, qemu_log_mask(LOG_GUEST_ERROR,
"%s: invalid guest write to RO register at offset " "%s: invalid guest write to RO register at offset "