mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/intc/armv7m_nvic: Don't hardcode M profile ID registers in NVIC

Browse Source 
Instead of hardcoding the values of M profile ID registers in the
NVIC, use the fields in the CPU struct. This will allow us to
give different M profile CPU types different ID register values.

This commit includes the addition of the missing ID_ISAR5,
which exists as RES0 in both v7M and v8M.

(The values of the ID registers might be wrong for the M4 --
this commit leaves the behaviour there unchanged.)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20180209165810.6668-2-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2018-02-15 18:29:37 +00:00
parent 4ff55bcb0e
commit 5a53e2c1dc
2 changed files with 44 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hw/intc/armv7m_nvic.c
View File

@ -990,31 +990,33 @@ static uint32_t nvic_readl(NVICState *s, uint32_t offset, MemTxAttrs attrs)
"Aux Fault status registers unimplemented\n");
return 0;
case 0xd40: /* PFR0. */
return 0x00000030;
case 0xd44: /* PRF1. */
return 0x00000200;
return cpu->id_pfr0;
case 0xd44: /* PFR1. */
return cpu->id_pfr1;
case 0xd48: /* DFR0. */
return 0x00100000;
return cpu->id_dfr0;
case 0xd4c: /* AFR0. */
return 0x00000000;
return cpu->id_afr0;
case 0xd50: /* MMFR0. */
return 0x00000030;
return cpu->id_mmfr0;
case 0xd54: /* MMFR1. */
return 0x00000000;
return cpu->id_mmfr1;
case 0xd58: /* MMFR2. */
return 0x00000000;
return cpu->id_mmfr2;
case 0xd5c: /* MMFR3. */
return 0x00000000;
return cpu->id_mmfr3;
case 0xd60: /* ISAR0. */
return 0x01141110;
return cpu->id_isar0;
case 0xd64: /* ISAR1. */
return 0x02111000;
return cpu->id_isar1;
case 0xd68: /* ISAR2. */
return 0x21112231;
return cpu->id_isar2;
case 0xd6c: /* ISAR3. */
return 0x01111110;
return cpu->id_isar3;
case 0xd70: /* ISAR4. */
return 0x01310102;
return cpu->id_isar4;
case 0xd74: /* ISAR5. */
return cpu->id_isar5;
/* TODO: Implement debug registers. */
case 0xd90: /* MPU_TYPE */
/* Unified MPU; if the MPU is not present this value is zero */

28
target/arm/cpu.c
View File

@ -1146,6 +1146,20 @@ static void cortex_m3_initfn(Object *obj)
set_feature(&cpu->env, ARM_FEATURE_M);
cpu->midr = 0x410fc231;
cpu->pmsav7_dregion = 8;
cpu->id_pfr0 = 0x00000030;
cpu->id_pfr1 = 0x00000200;
cpu->id_dfr0 = 0x00100000;
cpu->id_afr0 = 0x00000000;
cpu->id_mmfr0 = 0x00000030;
cpu->id_mmfr1 = 0x00000000;
cpu->id_mmfr2 = 0x00000000;
cpu->id_mmfr3 = 0x00000000;
cpu->id_isar0 = 0x01141110;
cpu->id_isar1 = 0x02111000;
cpu->id_isar2 = 0x21112231;
cpu->id_isar3 = 0x01111110;
cpu->id_isar4 = 0x01310102;
cpu->id_isar5 = 0x00000000;
}
static void cortex_m4_initfn(Object *obj)
@ -1157,6 +1171,20 @@ static void cortex_m4_initfn(Object *obj)
set_feature(&cpu->env, ARM_FEATURE_THUMB_DSP);
cpu->midr = 0x410fc240; /* r0p0 */
cpu->pmsav7_dregion = 8;
cpu->id_pfr0 = 0x00000030;
cpu->id_pfr1 = 0x00000200;
cpu->id_dfr0 = 0x00100000;
cpu->id_afr0 = 0x00000000;
cpu->id_mmfr0 = 0x00000030;
cpu->id_mmfr1 = 0x00000000;
cpu->id_mmfr2 = 0x00000000;
cpu->id_mmfr3 = 0x00000000;
cpu->id_isar0 = 0x01141110;
cpu->id_isar1 = 0x02111000;
cpu->id_isar2 = 0x21112231;
cpu->id_isar3 = 0x01111110;
cpu->id_isar4 = 0x01310102;
cpu->id_isar5 = 0x00000000;
}
static void arm_v7m_class_init(ObjectClass *oc, void *data)