target-arm: Add HPFAR_EL2

Backports commit 59e055307392fdf99b86c8cbcd33a7e261dcbdb1 from qemu
This commit is contained in:
Edgar E. Iglesias 2018-02-17 13:10:04 -05:00 committed by Lioncash
parent 9432e3a285
commit 7409da7a4e
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
2 changed files with 9 additions and 0 deletions

View file

@ -282,6 +282,7 @@ typedef struct CPUARMState {
};
uint64_t far_el[4];
};
uint64_t hpfar_el2;
union { /* Translation result. */
struct {
uint64_t _unused_par_0;

View file

@ -2853,6 +2853,9 @@ static const ARMCPRegInfo el3_no_el2_cp_reginfo[] = {
PL2_RW, 0, NULL, 0 },
{ "MDCR_EL2", 0,1,1, 3,4,1, ARM_CP_STATE_BOTH, ARM_CP_CONST,
PL2_RW, 0, NULL, 0 },
{ "HPFAR_EL2", 0,6,0, 3,4,4, ARM_CP_STATE_BOTH, ARM_CP_CONST,
PL2_RW, 0, NULL, 0, 0, {0, 0},
access_el3_aa32ns_aa64any },
REGINFO_SENTINEL
};
@ -3022,6 +3025,11 @@ static const ARMCPRegInfo el2_cp_reginfo[] = {
*/
{ "MDCR_EL2", 0,1,1, 3,4,1, ARM_CP_STATE_BOTH, 0,
PL2_RW, 0, NULL, 0, offsetof(CPUARMState, cp15.mdcr_el2), },
{ "HPFAR", 15,6,0, 0,4,4, ARM_CP_STATE_AA32, 0,
PL2_RW, 0, NULL, 0, offsetof(CPUARMState, cp15.hpfar_el2), {0, 0},
access_el3_aa32ns },
{ "HPFAR_EL2", 0,6,0, 3,4,4, ARM_CP_STATE_AA64, 0,
PL2_RW, 0, NULL, 0, offsetof(CPUARMState, cp15.hpfar_el2) },
REGINFO_SENTINEL
};