diff options
author | Mark Rutland <mark.rutland@arm.com> | 2018-07-05 15:16:53 +0100 |
---|---|---|
committer | Will Deacon <will.deacon@arm.com> | 2018-07-05 17:24:15 +0100 |
commit | 256c0960b7b6453dc90a4e879da52ab76b4037f9 (patch) | |
tree | d0da76f0c60112de94e055247f8e25fb96c548c2 /arch/arm64/kvm/reset.c | |
parent | d64567f67835736d65086e9bfc41a19b2863c32e (diff) | |
download | linux-256c0960b7b6453dc90a4e879da52ab76b4037f9.tar.gz linux-256c0960b7b6453dc90a4e879da52ab76b4037f9.tar.bz2 linux-256c0960b7b6453dc90a4e879da52ab76b4037f9.zip |
kvm/arm: use PSR_AA32 definitions
Some code cares about the SPSR_ELx format for exceptions taken from
AArch32 to inspect or manipulate the SPSR_ELx value, which is already in
the SPSR_ELx format, and not in the AArch32 PSR format.
To separate these from cases where we care about the AArch32 PSR format,
migrate these cases to use the PSR_AA32_* definitions rather than
COMPAT_PSR_*.
There should be no functional change as a result of this patch.
Note that arm64 KVM does not support a compat KVM API, and always uses
the SPSR_ELx format, even for AArch32 guests.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Christoffer Dall <christoffer.dall@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/kvm/reset.c')
-rw-r--r-- | arch/arm64/kvm/reset.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c index a74311beda35..4e4aedaf7ab7 100644 --- a/arch/arm64/kvm/reset.c +++ b/arch/arm64/kvm/reset.c @@ -42,8 +42,8 @@ static const struct kvm_regs default_regs_reset = { }; static const struct kvm_regs default_regs_reset32 = { - .regs.pstate = (COMPAT_PSR_MODE_SVC | COMPAT_PSR_A_BIT | - COMPAT_PSR_I_BIT | COMPAT_PSR_F_BIT), + .regs.pstate = (PSR_AA32_MODE_SVC | PSR_AA32_A_BIT | + PSR_AA32_I_BIT | PSR_AA32_F_BIT), }; static bool cpu_has_32bit_el1(void) |