From 2ab7a04c0c2db459c13c8cef6aa6327d6ac578c9 Mon Sep 17 00:00:00 2001 From: Will Deacon Date: Thu, 7 Jul 2022 15:48:50 +0100 Subject: [PATCH] Revert "ANDROID: KVM: arm64: s2mpu: Allow L1ENTRY_* r/o access" This reverts commit fdfed49bf713ca0e73b805223cbb633c9aa72062. Bug: 233587962 Signed-off-by: Will Deacon Change-Id: I8558f5d4c197f1f52104e44b8b78f316a61db137 --- arch/arm64/kvm/hyp/nvhe/iommu/s2mpu.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/iommu/s2mpu.c b/arch/arm64/kvm/hyp/nvhe/iommu/s2mpu.c index 89967f2fefcd..8ff0daeae176 100644 --- a/arch/arm64/kvm/hyp/nvhe/iommu/s2mpu.c +++ b/arch/arm64/kvm/hyp/nvhe/iommu/s2mpu.c @@ -402,11 +402,6 @@ static u32 host_mmio_reg_access_mask(size_t off, bool is_write) return read_only & ALL_VIDS_BITMAP; } - /* Allow reading L1ENTRY registers for debugging. */ - if (off >= REG_NS_L1ENTRY_L2TABLE_ADDR(0, 0) && - off < REG_NS_L1ENTRY_ATTR(NR_VIDS, 0)) - return read_only; - /* Allow EL1 IRQ handler to read fault information. */ masked_off = off & ~REG_NS_FAULT_VID_MASK; if ((masked_off == REG_NS_FAULT_PA_LOW(0)) ||