From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:37570)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1TsCTj-0005rK-VC
	for qemu-devel@nongnu.org; Mon, 07 Jan 2013 08:11:01 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1TsCTe-0000Y5-To
	for qemu-devel@nongnu.org; Mon, 07 Jan 2013 08:10:59 -0500
Received: from cantor2.suse.de ([195.135.220.15]:60331 helo=mx2.suse.de)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1TsCTe-0000Xy-KH
	for qemu-devel@nongnu.org; Mon, 07 Jan 2013 08:10:54 -0500
Message-ID: <50EAC956.40409@suse.de>
Date: Mon, 07 Jan 2013 14:10:46 +0100
From: =?ISO-8859-15?Q?Andreas_F=E4rber?= <afaerber@suse.de>
MIME-Version: 1.0
References: <50D55DB2.6080601@cn.fujitsu.com>
	<87lic5b3j0.fsf@blackfin.pond.sub.org>
In-Reply-To: <87lic5b3j0.fsf@blackfin.pond.sub.org>
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: quoted-printable
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: Luiz Capitulino <lcapitulino@redhat.com>, Markus Armbruster <armbru@redhat.com>, qemu-devel <qemu-devel@nongnu.org>

Am 07.01.2013 13:06, schrieb Markus Armbruster:
> Wen Congyang <wency@cn.fujitsu.com> writes:
>=20
>> ((pde & 0x1fe000) << 19) is the bits 39:32 of the final physical addre=
ss, and
>> we shouldn't use unit32_t to calculate it. Convert the type to hwaddr =
to fix
>> this problem.
>=20
> Spotted by Coverity.
>=20
>> Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
>>
>> ---
>>  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_memo=
ry_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,
>> =20
>>          line_addr =3D (((unsigned int)i & 0x3ff) << 22);
>>          if ((pde & PG_PSE_MASK) && pse) {
>> -            /* 4 MB page */
>> -            start_paddr =3D (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 =3D ((hwaddr)(pde & 0x1fe000) << 19);
>> +            start_paddr =3D (pde & ~0x3fffff) | high_paddr;
>>              if (cpu_physical_memory_is_io(start_paddr)) {
>>                  /* I/O region */
>>                  continue;
>=20
> Extra points for extending the comment.

...and a "target-i386: " prefix in the subject would be appreciated,
since it does not seem to fix a general issue.

Andreas

>=20
> Reviewed-by: Markus Armbruster <armbru@redhat.com>
>=20


--=20
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe=
rg