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

Revert "ANDROID: KVM: arm64: s2mpu: Remove host_stage2_adjust_mmio_range"

Browse Source 
This reverts commit bdcf9ecb5c.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I3ccba2141b959f42237160d7ea26d0aa8522952b
This commit is contained in:
Will Deacon
2022-07-07 15:49:02 +01:00
parent a2d0c06025
commit a9dd76faef
1 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
arch/arm64/kvm/hyp/nvhe/iommu/s2mpu.c
View File

@@ -351,6 +351,34 @@ static void s2mpu_host_stage2_set_owner(phys_addr_t addr, size_t size,
hyp_spin_unlock(&s2mpu_lock);
}
static int s2mpu_host_stage2_adjust_mmio_range(phys_addr_t addr, phys_addr_t *start,
phys_addr_t *end)
{
struct pkvm_iommu *dev;
phys_addr_t dev_start, dev_end, int_start, int_end;
/* Find the PA interval in the non-empty, sorted list of S2MPUs. */
int_start = 0;
for_each_s2mpu(dev) {
dev_start = dev->pa;
dev_end = dev_start + S2MPU_MMIO_SIZE;
int_end = dev_start;
if (dev_start <= addr && addr < dev_end)
return -EPERM;
if (int_start <= addr && addr < int_end)
break;
int_start = dev_end;
int_end = PA_MAX;
}
*start = max(*start, int_start);
*end = min(*end, int_end);
return 0;
}
static bool s2mpu_host_smc_handler(struct kvm_cpu_context *host_ctxt)
{
DECLARE_REG(u64, fn, host_ctxt, 0);
@@ -519,4 +547,5 @@ const struct kvm_iommu_ops kvm_s2mpu_ops = (struct kvm_iommu_ops){
.host_smc_handler = s2mpu_host_smc_handler,
.host_mmio_dabt_handler = s2mpu_host_mmio_dabt_handler,
.host_stage2_set_owner = s2mpu_host_stage2_set_owner,
.host_stage2_adjust_mmio_range = s2mpu_host_stage2_adjust_mmio_range,
};