From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:50169)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1Tsut6-0002wn-VF
	for qemu-devel@nongnu.org; Wed, 09 Jan 2013 07:36:09 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1Tsut5-0004xT-T2
	for qemu-devel@nongnu.org; Wed, 09 Jan 2013 07:36:08 -0500
Received: from mx1.redhat.com ([209.132.183.28]:15257)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lcapitulino@redhat.com>) id 1Tsut5-0004xJ-K8
	for qemu-devel@nongnu.org; Wed, 09 Jan 2013 07:36:07 -0500
Date: Wed, 9 Jan 2013 09:47:41 -0200
From: Luiz Capitulino <lcapitulino@redhat.com>
Message-ID: <20130109094741.6ef09c64@doriath.home>
In-Reply-To: <50D55DB2.6080601@cn.fujitsu.com>
References: <50D55DB2.6080601@cn.fujitsu.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] fix bits 39:32 of the final physical
 address when using 4M page
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: Wen Congyang <wency@cn.fujitsu.com>
Cc: qemu-devel <qemu-devel@nongnu.org>, Markus Armbruster <armbru@redhat.com>

On Sat, 22 Dec 2012 15:13:54 +0800
Wen Congyang <wency@cn.fujitsu.com> wrote:

> ((pde & 0x1fe000) << 19) is the bits 39:32 of the final physical address, and
> we shouldn't use unit32_t to calculate it. Convert the type to hwaddr to fix
> this problem.
> 
> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>

Applied to the qmp branch, thanks.

> 
> ---
>  target-i386/arch_memory_mapping.c | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/target-i386/arch_memory_mapping.c b/target-i386/arch_memory_mapping.c
> index c6c7874..844893f 100644
> --- a/target-i386/arch_memory_mapping.c
> +++ b/target-i386/arch_memory_mapping.c
> @@ -115,7 +115,7 @@ static void walk_pde2(MemoryMappingList *list,
>                        hwaddr pde_start_addr, int32_t a20_mask,
>                        bool pse)
>  {
> -    hwaddr pde_addr, pte_start_addr, start_paddr;
> +    hwaddr pde_addr, pte_start_addr, start_paddr, high_paddr;
>      uint32_t pde;
>      target_ulong line_addr, start_vaddr;
>      int i;
> @@ -130,8 +130,13 @@ static void walk_pde2(MemoryMappingList *list,
>  
>          line_addr = (((unsigned int)i & 0x3ff) << 22);
>          if ((pde & PG_PSE_MASK) && pse) {
> -            /* 4 MB page */
> -            start_paddr = (pde & ~0x3fffff) | ((pde & 0x1fe000) << 19);
> +            /*
> +             * 4 MB page:
> +             * bits 39:32 are bits 20:13 of the PDE
> +             * bit3 31:22 are bits 31:22 of the PDE
> +             */
> +            high_paddr = ((hwaddr)(pde & 0x1fe000) << 19);
> +            start_paddr = (pde & ~0x3fffff) | high_paddr;
>              if (cpu_physical_memory_is_io(start_paddr)) {
>                  /* I/O region */
>                  continue;