diff --git a/arch/arm64/include/asm/kvm_pkvm.h b/arch/arm64/include/asm/kvm_pkvm.h index a5a0dca0c633..f96f8fa7059e 100644 --- a/arch/arm64/include/asm/kvm_pkvm.h +++ b/arch/arm64/include/asm/kvm_pkvm.h @@ -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) { diff --git a/arch/arm64/kvm/hyp/nvhe/setup.c b/arch/arm64/kvm/hyp/nvhe/setup.c index 3ac328332848..3e5099074dae 100644 --- a/arch/arm64/kvm/hyp/nvhe/setup.c +++ b/arch/arm64/kvm/hyp/nvhe/setup.c @@ -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; } diff --git a/arch/arm64/kvm/pkvm.c b/arch/arm64/kvm/pkvm.c index 67230b10fca7..ca8b8e08a260 100644 --- a/arch/arm64/kvm/pkvm.c +++ b/arch/arm64/kvm/pkvm.c @@ -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; }