From 7f53358ec1db162589bef02b145afbf1fd43e32a Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Tue, 13 Feb 2018 14:18:38 -0500 Subject: [PATCH] target-arm: use extended address bits from supersection short descriptor Since ARMv7 with LPAE support, a supersection short translation table descriptor has had extended base address fields which hold bits 39:32 of translated address. These fields are IMPDEF in ARMv6 and ARMv7 without LPAE support. Backports commit 4e42a6ca37e39e56725518851f4388e46bd91129 from qemu --- qemu/target-arm/helper.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/qemu/target-arm/helper.c b/qemu/target-arm/helper.c index 645b87d4..830e0742 100644 --- a/qemu/target-arm/helper.c +++ b/qemu/target-arm/helper.c @@ -4858,6 +4858,8 @@ static int get_phys_addr_v6(CPUARMState *env, uint32_t address, int access_type, if (desc & (1 << 18)) { /* Supersection. */ phys_addr = (desc & 0xff000000) | (address & 0x00ffffff); + phys_addr |= (uint64_t)extract32(desc, 20, 4) << 32; + phys_addr |= (uint64_t)extract32(desc, 5, 4) << 36; *page_size = 0x1000000; } else { /* Section. */