Message ID | ea5aae4b10283de4705b864fe9d4bd2eaddaacae.1463174342.git.alistair.francis@xilinx.com |
---|---|
State | New |
Headers | show |
On 13 May 2016 at 22:28, Alistair Francis <alistair.francis@xilinx.com> wrote: > 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: Alistair Francis <alistair.francis@xilinx.com> > --- Applied to target-arm.next, thanks. -- PMM
On Mon, May 16, 2016 at 10:43 AM, Peter Maydell <peter.maydell@linaro.org> wrote: > On 13 May 2016 at 22:28, Alistair Francis <alistair.francis@xilinx.com> wrote: >> 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: Alistair Francis <alistair.francis@xilinx.com> >> --- > > > > Applied to target-arm.next, thanks. Thanks Peter Alistair > > -- PMM >
diff --git a/target-arm/cpu.h b/target-arm/cpu.h index 9deef86..0eb93c6 100644 --- a/target-arm/cpu.h +++ b/target-arm/cpu.h @@ -279,6 +279,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; diff --git a/target-arm/helper.c b/target-arm/helper.c index a2ab701..d652c01 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -3470,6 +3470,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 }; @@ -3705,6 +3708,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 };
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: Alistair Francis <alistair.francis@xilinx.com> --- V2: - Add 32-bit access - Connect to a variable target-arm/cpu.h | 1 + target-arm/helper.c | 7 +++++++ 2 files changed, 8 insertions(+)