Commit 8b7fbd6c authored by Peter Maydell's avatar Peter Maydell
Browse files

hw/intc/arm_gicv3: Fix write of ICH_VMCR_EL2.{VBPR0, VBPR1} 



In ich_vmcr_write() we enforce "writes of BPR fields to less than
their minimum sets them to the minimum" by doing a "read vbpr and
write it back" operation.  A typo here meant that we weren't handling
writes to these fields correctly, because we were reading from VBPR0
but writing to VBPR1.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20190520162809.2677-4-peter.maydell@linaro.org
parent 12ec8bd5

hw/intc/arm_gicv3_cpuif.c

+1 −1
Original line number Diff line number Diff line
@@ -2366,7 +2366,7 @@ static void ich_vmcr_write(CPUARMState *env, const ARMCPRegInfo *ri, 
    /* Enforce "writing BPRs to less than minimum sets them to the minimum"

     * by reading and writing back the fields.

     */

    write_vbpr(cs, GICV3_G1, read_vbpr(cs, GICV3_G0));

    write_vbpr(cs, GICV3_G0, read_vbpr(cs, GICV3_G0));

    write_vbpr(cs, GICV3_G1, read_vbpr(cs, GICV3_G1));



    gicv3_cpuif_virt_update(cs);