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

Unmapping S2MPU MMIO regions from MPTs is causing issues on oriole/raven
because it forces a 4K mapping in the first physical GB region instead
of 1G. During suspend AOC/APM can issue traffic through the S2MPUs and
the page lookup transaction fails because the MIF is powered off.

Revert the patch until the problem is fixed by AOC/APM device drivers.

This reverts commit 533c59945d.

Test: unplug device, wait until it suspends, observe no crash
Bug: 190463801
Bug: 209399107
Signed-off-by: David Brazdil <dbrazdil@google.com>
Change-Id: I9a84ccf4ace459dc35918fc31d86933bc5b923f7
This commit is contained in:
David Brazdil
2021-12-06 17:02:46 +00:00
parent f398bdcb07
commit 8a8500235e

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>
@@ -453,11 +452,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;
}