diff options
| author | Marc Zyngier <maz@kernel.org> | 2020-11-27 11:33:16 +0000 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-11-27 11:33:16 +0000 |
| commit | 149f120edbf89d894bd4e2c83ad7aa55c780d569 (patch) | |
| tree | c18720e7325e8a78871840190935240f6e18f872 /arch/arm64/kvm/sys_regs.h | |
| parent | 37da329ed6a7fd7d5c874ff99b9fc3a18e9c7c64 (diff) | |
| parent | 6ac4a5ac50d1d25a61aa00e660eebb21a2ff9b96 (diff) | |
| download | linux-149f120edbf89d894bd4e2c83ad7aa55c780d569.tar.bz2 | |
Merge branch 'kvm-arm64/copro-no-more' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/kvm/sys_regs.h')
| -rw-r--r-- | arch/arm64/kvm/sys_regs.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm64/kvm/sys_regs.h b/arch/arm64/kvm/sys_regs.h index 0f95964339b1..9d0621417c2a 100644 --- a/arch/arm64/kvm/sys_regs.h +++ b/arch/arm64/kvm/sys_regs.h @@ -19,14 +19,18 @@ struct sys_reg_params { u8 Op2; u64 regval; bool is_write; - bool is_aarch32; - bool is_32bit; /* Only valid if is_aarch32 is true */ }; struct sys_reg_desc { /* Sysreg string for debug */ const char *name; + enum { + AA32_ZEROHIGH, + AA32_LO, + AA32_HI, + } aarch32_map; + /* MRS/MSR instruction which accesses it. */ u8 Op0; u8 Op1; @@ -153,6 +157,7 @@ const struct sys_reg_desc *find_reg_by_id(u64 id, const struct sys_reg_desc table[], unsigned int num); +#define AA32(_x) .aarch32_map = AA32_##_x #define Op0(_x) .Op0 = _x #define Op1(_x) .Op1 = _x #define CRn(_x) .CRn = _x |