Revert "ANDROID: KVM: arm64: Unmap S2MPU MMIO regions in MPT"

This reverts commit b03ce007f9.

Bug: 233587962
Signed-off-by: Will Deacon <willdeacon@google.com>
Change-Id: I890260dd0da31b642b0dc6bd0aa47b02e3eb2b43
This commit is contained in:
Will Deacon
2022-07-07 15:51:46 +01:00
parent 4544cc012a
commit d192e9dd59

View File

@@ -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;
}