* [PATCH] KVM: arm64: Kill CPACR_EL1_TTA definition
@ 2023-01-12 15:48 Marc Zyngier
2023-01-23 20:28 ` Oliver Upton
0 siblings, 1 reply; 2+ messages in thread
From: Marc Zyngier @ 2023-01-12 15:48 UTC (permalink / raw)
To: linux-arm-kernel, kvm, kvmarm
Cc: James Morse, Suzuki K Poulose, Oliver Upton, Zenghui Yu
Since the One True Way is to use the new generated definition,
kill the KVM-specific definition of CPACR_EL1_TTA, and move
over to CPACR_ELx_TTA, hopefully for the same result.
Signed-off-by: Marc Zyngier <maz@kernel.org>
---
arch/arm64/include/asm/kvm_arm.h | 1 -
arch/arm64/kvm/hyp/vhe/switch.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h
index 26b0c97df986..8a6b5ca2cfc6 100644
--- a/arch/arm64/include/asm/kvm_arm.h
+++ b/arch/arm64/include/asm/kvm_arm.h
@@ -346,7 +346,6 @@
ECN(SOFTSTP_CUR), ECN(WATCHPT_LOW), ECN(WATCHPT_CUR), \
ECN(BKPT32), ECN(VECTOR32), ECN(BRK64)
-#define CPACR_EL1_TTA (1 << 28)
#define CPACR_EL1_DEFAULT (CPACR_EL1_FPEN_EL0EN | CPACR_EL1_FPEN_EL1EN |\
CPACR_EL1_ZEN_EL1EN)
diff --git a/arch/arm64/kvm/hyp/vhe/switch.c b/arch/arm64/kvm/hyp/vhe/switch.c
index 1a97391fedd2..81bf236d9c27 100644
--- a/arch/arm64/kvm/hyp/vhe/switch.c
+++ b/arch/arm64/kvm/hyp/vhe/switch.c
@@ -40,7 +40,7 @@ static void __activate_traps(struct kvm_vcpu *vcpu)
___activate_traps(vcpu);
val = read_sysreg(cpacr_el1);
- val |= CPACR_EL1_TTA;
+ val |= CPACR_ELx_TTA;
val &= ~(CPACR_EL1_ZEN_EL0EN | CPACR_EL1_ZEN_EL1EN |
CPACR_EL1_SMEN_EL0EN | CPACR_EL1_SMEN_EL1EN);
--
2.34.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] KVM: arm64: Kill CPACR_EL1_TTA definition
2023-01-12 15:48 [PATCH] KVM: arm64: Kill CPACR_EL1_TTA definition Marc Zyngier
@ 2023-01-23 20:28 ` Oliver Upton
0 siblings, 0 replies; 2+ messages in thread
From: Oliver Upton @ 2023-01-23 20:28 UTC (permalink / raw)
To: kvmarm, Marc Zyngier, kvm, linux-arm-kernel
Cc: Oliver Upton, James Morse, Suzuki K Poulose, Zenghui Yu
On Thu, 12 Jan 2023 15:48:03 +0000, Marc Zyngier wrote:
> Since the One True Way is to use the new generated definition,
> kill the KVM-specific definition of CPACR_EL1_TTA, and move
> over to CPACR_ELx_TTA, hopefully for the same result.
>
>
Applied to kvmarm/next, thanks!
[1/1] KVM: arm64: Kill CPACR_EL1_TTA definition
https://git.kernel.org/kvmarm/kvmarm/c/7a5e9c8f0b2d
--
Best,
Oliver
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-01-23 20:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-12 15:48 [PATCH] KVM: arm64: Kill CPACR_EL1_TTA definition Marc Zyngier
2023-01-23 20:28 ` Oliver Upton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).