Commit 2a5a9abd authored by Alistair Francis's avatar Alistair Francis Committed by Peter Maydell
Browse files

target-arm: Add the HSTR_EL2 register 



Add the Hypervisor System Trap Register for EL2.

This register is used early in the Linux boot and without it the kernel
aborts with a "Synchronous Abort" error.

Signed-off-by: default avatarAlistair Francis <alistair.francis@xilinx.com>
Message-id: ea5aae4b10283de4705b864fe9d4bd2eaddaacae.1463174342.git.alistair.francis@xilinx.com
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 280b2358

target-arm/cpu.h

+1 −0
Original line number Diff line number Diff line
@@ -278,6 +278,7 @@ typedef struct CPUARMState { 
            uint64_t far_el[4];

        };

        uint64_t hpfar_el2;

        uint64_t hstr_el2;

        union { /* Translation result. */

            struct {

                uint64_t _unused_par_0;

target-arm/helper.c

+7 −0
Original line number Diff line number Diff line
@@ -3471,6 +3471,9 @@ static const ARMCPRegInfo el3_no_el2_cp_reginfo[] = { 
      .opc0 = 3, .opc1 = 4, .crn = 6, .crm = 0, .opc2 = 4,

      .access = PL2_RW, .accessfn = access_el3_aa32ns_aa64any,

      .type = ARM_CP_CONST, .resetvalue = 0 },

    { .name = "HSTR_EL2", .state = ARM_CP_STATE_BOTH,

      .opc0 = 3, .opc1 = 4, .crn = 1, .crm = 1, .opc2 = 3,

      .access = PL2_RW, .type = ARM_CP_CONST, .resetvalue = 0 },

    REGINFO_SENTINEL

};
@@ -3706,6 +3709,10 @@ static const ARMCPRegInfo el2_cp_reginfo[] = { 
      .opc0 = 3, .opc1 = 4, .crn = 6, .crm = 0, .opc2 = 4,

      .access = PL2_RW,

      .fieldoffset = offsetof(CPUARMState, cp15.hpfar_el2) },

    { .name = "HSTR_EL2", .state = ARM_CP_STATE_BOTH,

      .cp = 15, .opc0 = 3, .opc1 = 4, .crn = 1, .crm = 1, .opc2 = 3,

      .access = PL2_RW,

      .fieldoffset = offsetof(CPUARMState, cp15.hstr_el2) },

    REGINFO_SENTINEL

};