From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:37398)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Joel.Schopp@amd.com>) id 1XDHjW-0003lU-0d
	for qemu-devel@nongnu.org; Fri, 01 Aug 2014 14:39:19 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Joel.Schopp@amd.com>) id 1XDHjQ-0002eP-2s
	for qemu-devel@nongnu.org; Fri, 01 Aug 2014 14:39:13 -0400
Received: from mail-bn1blp0182.outbound.protection.outlook.com
	([207.46.163.182]:5581
	helo=na01-bn1-obe.outbound.protection.outlook.com)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Joel.Schopp@amd.com>) id 1XDHjP-0002eI-Ta
	for qemu-devel@nongnu.org; Fri, 01 Aug 2014 14:39:07 -0400
Message-ID: <53DBDE43.2060306@amd.com>
Date: Fri, 1 Aug 2014 13:36:51 -0500
From: Joel Schopp <joel.schopp@amd.com>
MIME-Version: 1.0
References: <20140723200925.9787.75225.stgit@joelaarch64.amd.com>
	<CAFEAcA_t12TF3xeEtA4N7cwN5gsCx_Cpk9N5CJ13m_UN6n0y2A@mail.gmail.com>
	<53DB7CF4.1020702@redhat.com> <53DB9DE8.3020805@amd.com>
	<53DBA1D9.6070505@redhat.com>
In-Reply-To: <53DBA1D9.6070505@redhat.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] arm64: 64K pages and > 1024MB guest
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paolo Bonzini <pbonzini@redhat.com>, Peter Maydell <peter.maydell@linaro.org>
Cc: QEMU Developers <qemu-devel@nongnu.org>


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.