| Message ID | 1433235718-30485-1-git-send-email-serge.fdrv@gmail.com |
|---|---|
| State | New |
| Headers | show |
On 2 June 2015 at 10:01, Sergey Fedorov <serge.fdrv@gmail.com> wrote: > 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. > > Signed-off-by: Sergey Fedorov <serge.fdrv@gmail.com> > --- > > v3: > * needless parenthesis removed > v2: > * commit message enhanced Applied to target-arm.next, thanks. -- PMM
diff --git a/target-arm/helper.c b/target-arm/helper.c index 1cc4993..b2b377a 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -5323,6 +5323,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. */
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. Signed-off-by: Sergey Fedorov <serge.fdrv@gmail.com> --- v3: * needless parenthesis removed v2: * commit message enhanced target-arm/helper.c | 2 ++ 1 file changed, 2 insertions(+)