Commit e3da9921 authored by Rabin Vincent's avatar Rabin Vincent Committed by Peter Maydell
Browse files

armv7m_nvic: fix CPUID Base Register 



cp15.c0_cpuid is never initialized for ARMv7-M; take the value directly
from cpu->midr instead.

Signed-off-by: default avatarRabin Vincent <rabin@rab.in>
Message-id: 1398036308-32166-1-git-send-email-rabin@rab.in
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 3b771579

hw/intc/armv7m_nvic.c

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ static uint32_t nvic_readl(nvic_state *s, uint32_t offset) 
        return 10000;

    case 0xd00: /* CPUID Base.  */

        cpu = ARM_CPU(current_cpu);

        return cpu->env.cp15.c0_cpuid;

        return cpu->midr;

    case 0xd04: /* Interrupt Control State.  */

        /* VECTACTIVE */

        val = s->gic.running_irq[0];