shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 04:10:18 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ANDROID: KVM: arm64: Clear pvmfw pages on clean host shutdown"

Browse Source 
This reverts commit e3b73a4b5e.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I406a474c879d2fe44b850fd25262a70a561a5567
This commit is contained in:
Will Deacon
2022-07-07 15:49:13 +01:00
parent 03abbd72a3
commit 8fd570f1a8
3 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm64/kvm/hyp/include/nvhe/pkvm.h
View File

@@ -99,6 +99,5 @@ static inline bool ipa_in_pvmfw_region(struct kvm_shadow_vm *vm, u64 ipa)
int pkvm_load_pvmfw_pages(struct kvm_shadow_vm *vm, u64 ipa, phys_addr_t phys,
u64 size);
void pkvm_clear_pvmfw_pages(void);
#endif /* __ARM64_KVM_NVHE_PKVM_H__ */

8
arch/arm64/kvm/hyp/nvhe/pkvm.c
View File

@@ -712,14 +712,6 @@ int pkvm_load_pvmfw_pages(struct kvm_shadow_vm *vm, u64 ipa, phys_addr_t phys,
return 0;
}
void pkvm_clear_pvmfw_pages(void)
{
void *addr = hyp_phys_to_virt(pvmfw_base);
memset(addr, 0, pvmfw_size);
kvm_flush_dcache_to_poc(addr, pvmfw_size);
}
/*
* This function sets the registers on the vcpu to their architecturally defined
* reset values.

6
arch/arm64/kvm/hyp/nvhe/psci-relay.c
View File

@@ -12,7 +12,6 @@
#include <uapi/linux/psci.h>
#include <nvhe/memory.h>
#include <nvhe/pkvm.h>
#include <nvhe/trap_handler.h>
void kvm_hyp_cpu_entry(unsigned long r0);
@@ -250,7 +249,6 @@ 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();
return psci_forward(host_ctxt);
case PSCI_0_2_FN64_CPU_SUSPEND:
return psci_cpu_suspend(func_id, host_ctxt);
@@ -264,11 +262,9 @@ static unsigned long psci_0_2_handler(u64 func_id, struct kvm_cpu_context *host_
static unsigned long psci_1_0_handler(u64 func_id, struct kvm_cpu_context *host_ctxt)
{
switch (func_id) {
case PSCI_1_1_FN64_SYSTEM_RESET2:
pkvm_clear_pvmfw_pages();
fallthrough;
case PSCI_1_0_FN_PSCI_FEATURES:
case PSCI_1_0_FN_SET_SUSPEND_MODE:
case PSCI_1_1_FN64_SYSTEM_RESET2:
return psci_forward(host_ctxt);
case PSCI_1_0_FN64_SYSTEM_SUSPEND:
return psci_system_suspend(func_id, host_ctxt);