On Mon, Apr 28 2025, Eric Auger <eric.au...@redhat.com> wrote: > On 4/9/25 4:42 PM, Cornelia Huck wrote: >> From: Eric Auger <eric.au...@redhat.com> >> >> Reviewed-by: Richard Henderson <richard.hender...@linaro.org> >> Reviewed-by: Sebastian Ott <seb...@redhat.com> >> Signed-off-by: Eric Auger <eric.au...@redhat.com> >> Signed-off-by: Cornelia Huck <coh...@redhat.com> >> --- >> hw/intc/armv7m_nvic.c | 12 ++-- >> target/arm/cpu-features.h | 36 +++++----- >> target/arm/cpu.c | 24 +++---- >> target/arm/cpu.h | 7 -- >> target/arm/cpu64.c | 28 ++++---- >> target/arm/helper.c | 14 ++-- >> target/arm/kvm.c | 21 ++---- >> target/arm/tcg/cpu-v7m.c | 90 +++++++++++++----------- >> target/arm/tcg/cpu32.c | 144 +++++++++++++++++++++----------------- >> target/arm/tcg/cpu64.c | 108 ++++++++++++++-------------- >> 10 files changed, 243 insertions(+), 241 deletions(-)
>> @@ -599,13 +609,13 @@ static void cortex_r5_initfn(Object *obj) >> cpu->isar.id_mmfr1 = 0x00000000; >> cpu->isar.id_mmfr2 = 0x01200000; >> cpu->isar.id_mmfr3 = 0x0211; >> - cpu->isar.id_isar0 = 0x02101111; >> - cpu->isar.id_isar1 = 0x13112111; >> - cpu->isar.id_isar2 = 0x21232141; >> - cpu->isar.id_isar3 = 0x01112131; >> - cpu->isar.id_isar4 = 0x0010142; >> - cpu->isar.id_isar5 = 0x0; >> - cpu->isar.id_isar6 = 0x0; >> + SET_IDREG(isar, ID_ISAR0, 0x02101111); >> + SET_IDREG(isar, ID_ISAR1, 0x13112111); >> + SET_IDREG(isar, ID_ISAR2, 0x21232141); >> + SET_IDREG(isar, ID_ISAR3, 0x01112131); >> + SET_IDREG(isar, ID_ISAR4, 0x0010142); >> + SET_IDREG(isar, ID_ISAR5, 0x21232141); > glurp this one is bad > it should be SET_IDREG(isar, ID_ISAR5, 0x0); Huh, no idea where that came from. Fixing.
