Re: [Qemu-devel] [PATCH] arm64: 64K pages and > 1024MB guest

[Joel Schopp <joel.schopp@amd.com>]

On 08/01/2014 09:19 AM, Paolo Bonzini wrote:
> Il 01/08/2014 16:02, Joel Schopp ha scritto:
>>>> I think the patch is right but, besides these considerations, does this
>>>> bug still manifest itself after Andrew fixed the start address of the
>>>> device at 0x90010000 (IIRC it was the pl031)?
>> The device I see with that address is:
>> hw/arm/virt.c:    [VIRT_RTC] = { 0x90010000, 0x1000 },
>>
>> The bug still manifests itself with that in the tree (without my patch
>> applied).
> In 2.1-rc5 it is
>
>     [VIRT_RTC] = { 0x9010000, 0x1000 },
>
> with one zero less:
>
> commit 1373e140f0b0554a8b3aba9761cd96df49520f97
> Author: Andrew Jones <drjones@redhat.com>
> Date:   Tue Jul 29 18:32:01 2014 +0200
>
>     hw/arm/virt: fix pl031 addr typo
>     
>     pl031's base address should be 0x9010000, not 0x90010000, otherwise
>     it sits in ram when configuring a guest with greater than 1G.
>     
>     Signed-off-by: Andrew Jones <drjones@redhat.com>
>     Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
>
> diff --git a/hw/arm/virt.c b/hw/arm/virt.c
> index 405c61d..89532bd 100644
> --- a/hw/arm/virt.c
> +++ b/hw/arm/virt.c
> @@ -104,7 +104,7 @@ static const MemMapEntry a15memmap[] = {
>      [VIRT_GIC_DIST] = { 0x8000000, 0x10000 },
>      [VIRT_GIC_CPU] = { 0x8010000, 0x10000 },
>      [VIRT_UART] = { 0x9000000, 0x1000 },
> -    [VIRT_RTC] = { 0x90010000, 0x1000 },
> +    [VIRT_RTC] = { 0x9010000, 0x1000 },
>      [VIRT_MMIO] = { 0xa000000, 0x200 },
>      /* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */
>      /* 0x10000000 .. 0x40000000 reserved for PCI */
>
> Paolo

Retested  with the latest master and this commit from Andrew did indeed
resolve my issue.