From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1L9MBf-00052Y-B8
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 11:08:51 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1L9MBe-000524-St
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 11:08:50 -0500
Received: from [199.232.76.173] (port=47329 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1L9MBe-00051y-Gr
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 11:08:50 -0500
Received: from savannah.gnu.org ([199.232.41.3]:55947 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1L9MBe-0007aI-6c
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 11:08:50 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1L9MBd-0000GU-SG
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 16:08:49 +0000
Received: from balrog by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <balrog@savannah.gnu.org>) id 1L9MBd-0000GQ-Lc
	for qemu-devel@nongnu.org; Sun, 07 Dec 2008 16:08:49 +0000
MIME-Version: 1.0
Errors-To: balrog
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Andrzej Zaborowski <balrogg@gmail.com>
Message-Id: <E1L9MBd-0000GQ-Lc@cvs.savannah.gnu.org>
Date: Sun, 07 Dec 2008 16:08:49 +0000
Subject: [Qemu-devel] [5917] PXA: Account for offset from page start in a
	subpage mapping.
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 5917
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5917
Author:   balrog
Date:     2008-12-07 16:08:49 +0000 (Sun, 07 Dec 2008)

Log Message:
-----------
PXA: Account for offset from page start in a subpage mapping.

Modified Paths:
--------------
    trunk/hw/pxa2xx.c

Modified: trunk/hw/pxa2xx.c
===================================================================
--- trunk/hw/pxa2xx.c	2008-12-07 16:04:13 UTC (rev 5916)
+++ trunk/hw/pxa2xx.c	2008-12-07 16:08:49 UTC (rev 5917)
@@ -1487,7 +1487,7 @@
     s->slave.recv = pxa2xx_i2c_rx;
     s->slave.send = pxa2xx_i2c_tx;
     s->bus = i2c_init_bus();
-    s->offset = base & region_size;
+    s->offset = base - (base & (~region_size) & TARGET_PAGE_MASK);
 
     iomemtype = cpu_register_io_memory(0, pxa2xx_i2c_readfn,
                     pxa2xx_i2c_writefn, s);