From 8b48bb1593aca558eff5bd0c2e424762e7242042 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 17 Nov 2022 11:40:01 +0000 Subject: [PATCH] ANDROID: KVM: arm64: Rename pkvm_clear_pvmfw_pages() pkvm_clear_pvmfw_pages() is used to poison the pvmfw pages during reset, so rename it to pkvm_poison_pvmfw_pages() instead. Signed-off-by: Will Deacon Bug: 254819795 Change-Id: Ie5b9c90f0707fa81d9099425cff35383bfb0d009 Signed-off-by: Will Deacon --- arch/arm64/kvm/hyp/include/nvhe/pkvm.h | 2 +- arch/arm64/kvm/hyp/nvhe/pkvm.c | 2 +- arch/arm64/kvm/hyp/nvhe/psci-relay.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kvm/hyp/include/nvhe/pkvm.h b/arch/arm64/kvm/hyp/include/nvhe/pkvm.h index c880d6605453..65861da8b460 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/pkvm.h +++ b/arch/arm64/kvm/hyp/include/nvhe/pkvm.h @@ -133,6 +133,6 @@ static inline bool pkvm_ipa_in_pvmfw_region(struct pkvm_hyp_vm *vm, u64 ipa) int pkvm_load_pvmfw_pages(struct pkvm_hyp_vm *vm, u64 ipa, phys_addr_t phys, u64 size); -void pkvm_clear_pvmfw_pages(void); +void pkvm_poison_pvmfw_pages(void); #endif /* __ARM64_KVM_NVHE_PKVM_H__ */ diff --git a/arch/arm64/kvm/hyp/nvhe/pkvm.c b/arch/arm64/kvm/hyp/nvhe/pkvm.c index 3ccfdf23e0dd..3236ed39e70f 100644 --- a/arch/arm64/kvm/hyp/nvhe/pkvm.c +++ b/arch/arm64/kvm/hyp/nvhe/pkvm.c @@ -887,7 +887,7 @@ int pkvm_load_pvmfw_pages(struct pkvm_hyp_vm *vm, u64 ipa, phys_addr_t phys, return 0; } -void pkvm_clear_pvmfw_pages(void) +void pkvm_poison_pvmfw_pages(void) { void *addr = hyp_phys_to_virt(pvmfw_base); diff --git a/arch/arm64/kvm/hyp/nvhe/psci-relay.c b/arch/arm64/kvm/hyp/nvhe/psci-relay.c index cee6d4a2821f..0bb1b66977b0 100644 --- a/arch/arm64/kvm/hyp/nvhe/psci-relay.c +++ b/arch/arm64/kvm/hyp/nvhe/psci-relay.c @@ -250,7 +250,7 @@ static unsigned long psci_0_2_handler(u64 func_id, struct kvm_cpu_context *host_ */ case PSCI_0_2_FN_SYSTEM_OFF: case PSCI_0_2_FN_SYSTEM_RESET: - pkvm_clear_pvmfw_pages(); + pkvm_poison_pvmfw_pages(); return psci_forward(host_ctxt); case PSCI_0_2_FN64_CPU_SUSPEND: return psci_cpu_suspend(func_id, host_ctxt); @@ -265,7 +265,7 @@ static unsigned long psci_1_0_handler(u64 func_id, struct kvm_cpu_context *host_ { switch (func_id) { case PSCI_1_1_FN64_SYSTEM_RESET2: - pkvm_clear_pvmfw_pages(); + pkvm_poison_pvmfw_pages(); fallthrough; case PSCI_1_0_FN_PSCI_FEATURES: case PSCI_1_0_FN_SET_SUSPEND_MODE: