From 8f26d8e5561277de970f760d071d3d24437c4e5b Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Wed, 11 Apr 2018 19:32:06 -0400 Subject: [PATCH] target/arm: Report unsupported MPU region sizes more clearly Currently our PMSAv7 and ARMv7M MPU implementation cannot handle MPU region sizes smaller than our TARGET_PAGE_SIZE. However we report that in a slightly confusing way: DRSR[3]: No support for MPU (sub)region alignment of 9 bits. Minimum is 10 The problem is not the alignment of the region, but its size; tweak the error message to say so: DRSR[3]: No support for MPU (sub)region size of 512 bytes. Minimum is 1024. Backports commit 8aec759b45fa6986c0b159cb27353d6abb0d5d73 from qemu --- qemu/target/arm/helper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qemu/target/arm/helper.c b/qemu/target/arm/helper.c index 0de3f701..559ea7f9 100644 --- a/qemu/target/arm/helper.c +++ b/qemu/target/arm/helper.c @@ -8874,9 +8874,9 @@ static bool get_phys_addr_pmsav7(CPUARMState *env, uint32_t address, } if (rsize < TARGET_PAGE_BITS) { qemu_log_mask(LOG_UNIMP, - "DRSR[%d]: No support for MPU (sub)region " - "alignment of %" PRIu32 " bits. Minimum is %d\n", - n, rsize, TARGET_PAGE_BITS); + "DRSR[%d]: No support for MPU (sub)region size of" + " %" PRIu32 " bytes. Minimum is %d.\n", + n, (1 << rsize), TARGET_PAGE_SIZE); continue; } if (srdis) {