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

Revert "ANDROID: KVM: arm64: Unmap PVM firmware from host stage-2 during de-privilege"

Browse Source 
This reverts commit ab5c0b846b.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: Ie841e089ff0a8a1de8fd3137b6271a846de14f24
This commit is contained in:
Will Deacon
2022-07-07 15:51:23 +01:00
parent 77fa9a4630
commit 1f5daaad2a
3 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm64/include/asm/kvm_pkvm.h
View File

@@ -231,9 +231,6 @@ static inline int pkvm_get_max_wrps(void)
extern struct memblock_region kvm_nvhe_sym(hyp_memory)[];
extern unsigned int kvm_nvhe_sym(hyp_memblock_nr);
extern phys_addr_t kvm_nvhe_sym(pvmfw_base);
extern phys_addr_t kvm_nvhe_sym(pvmfw_size);
static inline unsigned long
hyp_vmemmap_memblock_size(struct memblock_region *reg, size_t vmemmap_entry_size)
{

10
arch/arm64/kvm/hyp/nvhe/setup.c
View File

@@ -21,9 +21,6 @@
unsigned long hyp_nr_cpus;
phys_addr_t pvmfw_base;
phys_addr_t pvmfw_size;
#define hyp_percpu_size ((unsigned long)__per_cpu_end - \
(unsigned long)__per_cpu_start)
@@ -138,13 +135,6 @@ static int recreate_hyp_mappings(phys_addr_t phys, unsigned long size,
if (ret)
return ret;
start = hyp_phys_to_virt(pvmfw_base);
end = start + pvmfw_size;
prot = pkvm_mkstate(PAGE_HYP, PKVM_PAGE_OWNED);
ret = pkvm_create_mappings(start, end, prot);
if (ret)
return ret;
return 0;
}

4
arch/arm64/kvm/pkvm.c
View File

@@ -18,8 +18,6 @@
#include "hyp_constants.h"
static struct reserved_mem *pkvm_firmware_mem;
static phys_addr_t *pvmfw_base = &kvm_nvhe_sym(pvmfw_base);
static phys_addr_t *pvmfw_size = &kvm_nvhe_sym(pvmfw_size);
static struct memblock_region *hyp_memory = kvm_nvhe_sym(hyp_memory);
static unsigned int *hyp_memblock_nr_ptr = &kvm_nvhe_sym(hyp_memblock_nr);
@@ -216,8 +214,6 @@ static int __init pkvm_firmware_rmem_init(struct reserved_mem *rmem)
if (!PAGE_ALIGNED(rmem->size))
return pkvm_firmware_rmem_err(rmem, "size is not page-aligned");
*pvmfw_size = rmem->size;
*pvmfw_base = rmem->base;
pkvm_firmware_mem = rmem;
return 0;
}