From d192e9dd59e63f841dca2b0351e23b5abc483697 Mon Sep 17 00:00:00 2001
From: Will Deacon <willdeacon@google.com>
Date: Thu, 7 Jul 2022 15:51:46 +0100
Subject: [PATCH] Revert "ANDROID: KVM: arm64: Unmap S2MPU MMIO regions in MPT"

This reverts commit b03ce007f96c02e531adcc930562cab0b057cbdc.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I890260dd0da31b642b0dc6bd0aa47b02e3eb2b43
---
 arch/arm64/kvm/hyp/nvhe/iommu/s2mpu.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/arch/arm64/kvm/hyp/nvhe/iommu/s2mpu.c b/arch/arm64/kvm/hyp/nvhe/iommu/s2mpu.c
index bbe4490b7173..7a735cdca80b 100644
--- a/arch/arm64/kvm/hyp/nvhe/iommu/s2mpu.c
+++ b/arch/arm64/kvm/hyp/nvhe/iommu/s2mpu.c
@@ -14,7 +14,6 @@
 #include <linux/arm-smccc.h>
 
 #include <nvhe/memory.h>
-#include <nvhe/mem_protect.h>
 #include <nvhe/mm.h>
 #include <nvhe/spinlock.h>
 #include <nvhe/trap_handler.h>
@@ -360,11 +359,6 @@ static int s2mpu_init(void)
 	 */
 	for_each_powered_s2mpu(dev)
 		initialize_with_mpt(dev, &kvm_hyp_host_mpt);
-
-	/* Prevent DMA to the S2MPU MMIO regions. */
-	for_each_s2mpu(dev)
-		s2mpu_host_stage2_set_owner(dev->pa, S2MPU_MMIO_SIZE, pkvm_hyp_id);
-
 	return 0;
 }