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

Revert "ANDROID: KVM: arm64: Add 'host_stage2_set_owner' to kvm_iommu_ops"

Browse Source 
This reverts commit f51f6b5d26.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I985a3f0c01a5c05472b7381441c9144a78b0e3a8
This commit is contained in:
Will Deacon
2022-07-07 15:51:50 +01:00
parent 2c2b64e5b3
commit 35da9fb07b
2 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm64/include/asm/kvm_hyp.h
View File

@@ -126,7 +126,6 @@ extern u64 kvm_nvhe_sym(id_aa64mmfr2_el1_sys_val);
struct kvm_iommu_ops {
int (*init)(void);
bool (*host_smc_handler)(struct kvm_cpu_context *host_ctxt);
void (*host_stage2_set_owner)(phys_addr_t addr, size_t size, u8 owner_id);
};
extern struct kvm_iommu_ops kvm_iommu_ops;

11
arch/arm64/kvm/hyp/nvhe/mem_protect.c
View File

@@ -322,17 +322,10 @@ int host_stage2_idmap_locked(phys_addr_t addr, u64 size,
int host_stage2_set_owner_locked(phys_addr_t addr, u64 size, u8 owner_id)
{
int ret;
hyp_assert_lock_held(&host_kvm.lock);
ret = host_stage2_try(kvm_pgtable_stage2_set_owner, &host_kvm.pgt,
addr, size, &host_s2_pool, owner_id);
if (!ret && kvm_iommu_ops.host_stage2_set_owner)
kvm_iommu_ops.host_stage2_set_owner(addr, size, owner_id);
return ret;
return host_stage2_try(kvm_pgtable_stage2_set_owner, &host_kvm.pgt,
addr, size, &host_s2_pool, owner_id);
}
static bool host_stage2_force_pte_cb(u64 addr, u64 end, enum kvm_pgtable_prot prot)