diff options
| author |   Jean-Philippe Brucker <jean-philippe@linaro.org> | 2023-09-11 15:52:57 +0100 |
|---|---|---|
| committer |   Marc Zyngier <maz@kernel.org> | 2023-09-12 13:07:37 +0100 |
| commit | 373beef00f7d781a000b12c31fb17a5a9c25969c (patch) | |
| tree | d37c220ff624e4023d861d5d725ccb45aedd3e46 /arch/arm64/kvm/hyp/nvhe/psci-relay.c | |
| parent | KVM: arm64: Properly return allocated EL2 VA from hyp_alloc_private_va_range() (diff) | |
| download | wireguard-linux-373beef00f7d781a000b12c31fb17a5a9c25969c.tar.xz wireguard-linux-373beef00f7d781a000b12c31fb17a5a9c25969c.zip | |
KVM: arm64: nvhe: Ignore SVE hint in SMCCC function ID
When SVE is enabled, the host may set bit 16 in SMCCC function IDs, a
hint that indicates an unused SVE state. At the moment NVHE doesn't
account for this bit when inspecting the function ID, and rejects most
calls. Clear the hint bit before comparing function IDs.
About version compatibility: the host's PSCI driver initially probes the
firmware for a SMCCC version number. If the firmware implements a
protocol recent enough (1.3), subsequent SMCCC calls have the hint bit
set. Since the hint bit was reserved in earlier versions of the
protocol, clearing it is fine regardless of the version in use.
When a new hint is added to the protocol in the future, it will be added
to ARM_SMCCC_CALL_HINTS and NVHE will handle it straight away. This
patch only clears known hints and leaves reserved bits as is, because
future SMCCC versions could use reserved bits as modifiers for the
function ID, rather than hints.
Fixes: cfa7ff959a78 ("arm64: smccc: Support SMCCC v1.3 SVE register saving hint")
Reported-by: Ben Horgan <ben.horgan@arm.com>
Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20230911145254.934414-4-jean-philippe@linaro.org
Diffstat (limited to 'arch/arm64/kvm/hyp/nvhe/psci-relay.c')
| -rw-r--r-- | arch/arm64/kvm/hyp/nvhe/psci-relay.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/kvm/hyp/nvhe/psci-relay.c b/arch/arm64/kvm/hyp/nvhe/psci-relay.c index 24543d2a3490..d57bcb6ab94d 100644 --- a/arch/arm64/kvm/hyp/nvhe/psci-relay.c +++ b/arch/arm64/kvm/hyp/nvhe/psci-relay.c @@ -273,9 +273,8 @@ static unsigned long psci_1_0_handler(u64 func_id, struct kvm_cpu_context *host_ } } -bool kvm_host_psci_handler(struct kvm_cpu_context *host_ctxt) +bool kvm_host_psci_handler(struct kvm_cpu_context *host_ctxt, u32 func_id) { - DECLARE_REG(u64, func_id, host_ctxt, 0); unsigned long ret; switch (kvm_host_psci_config.version) { |