On 15/11/22 17:17, Alex Bennée wrote:
a66a24585f (hw/intc/arm_gic: Implement read of GICC_IIDR) implemented
this for the CPU interface register. The fact we don't implement it
shows up when running Xen with -d guest_error which is definitely
wrong because the guest is perfectly entitled to read it.
Signed-off-by: Alex Bennée <alex.ben...@linaro.org>
---
v2
- checkpatch fixes.
v3
- re-base on re-flow with if
v4
- fix the commit message
---
hw/intc/arm_gic.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c
index 1a04144c38..7a34bc0998 100644
--- a/hw/intc/arm_gic.c
+++ b/hw/intc/arm_gic.c
@@ -973,8 +973,18 @@ static uint8_t gic_dist_readb(void *opaque, hwaddr offset,
MemTxAttrs attrs)
/* GICD_TYPER byte 1 */
return (s->security_extn << 2);
}
- if (offset < 0x08)
+ if (offset == 8) {
+ /* GICD_IIDR byte 0 */
+ return 0x3b; /* Arm JEP106 identity */
+ }
+ if (offset == 9) {
+ /* GICD_IIDR byte 1 */
+ return 0x04; /* Arm JEP106 identity */
Possible future cleanup, define JEP106_ID_ARM:
$ git grep 0x43b
hw/intc/arm_gic.c:1671: *data = (s->revision << 16) | 0x43b;
hw/intc/gicv3_internal.h:743: return 0x43b;
hw/misc/armv7m_ras.c:26: *data = 0x43b;
+ }
+ if (offset < 0x0c) {
+ /* All other bytes in this range are RAZ */
return 0;
+ }
Reviewed-by: Philippe Mathieu-Daudé <phi...@linaro.org>