From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45156) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1gEB-0002mr-Dn for qemu-devel@nongnu.org; Sat, 02 Feb 2013 11:46:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U1gEA-0006W8-0k for qemu-devel@nongnu.org; Sat, 02 Feb 2013 11:46:07 -0500 Received: from cantor2.suse.de ([195.135.220.15]:44900 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1gE9-0006W0-Nb for qemu-devel@nongnu.org; Sat, 02 Feb 2013 11:46:05 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 2 Feb 2013 17:45:57 +0100 Message-Id: <1359823557-5748-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH for-1.4] libi2c-omap: Fix endianness dependency List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, dantesu@gmail.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= , agraf@suse.de, rth@twiddle.net From: Andreas F=C3=A4rber The libqos driver for omap_i2c currently does not work on Big Endian. Introduce helpers for reading from and writing to 16-bit armel registers. This fixes tmp105-test failures on ppc. Signed-off-by: Andreas F=C3=A4rber --- tests/libi2c-omap.c | 51 ++++++++++++++++++++++++++++++++-------------= ------ 1 Datei ge=C3=A4ndert, 32 Zeilen hinzugef=C3=BCgt(+), 19 Zeilen entfernt= (-) diff --git a/tests/libi2c-omap.c b/tests/libi2c-omap.c index 9be57e9..7d50ef2 100644 --- a/tests/libi2c-omap.c +++ b/tests/libi2c-omap.c @@ -12,6 +12,7 @@ #include =20 #include "qemu/osdep.h" +#include "qemu/bswap.h" #include "libqtest.h" =20 enum OMAPI2CRegisters { @@ -48,12 +49,24 @@ typedef struct OMAPI2C { } OMAPI2C; =20 =20 +static inline void omap_i2c_read16(uint64_t addr, uint16_t *data) +{ + memread(addr, data, 2); + *data =3D le16_to_cpu(*data); +} + +static inline void omap_i2c_write16(uint64_t addr, uint16_t data) +{ + data =3D cpu_to_le16(data); + memwrite(addr, &data, 2); +} + static void omap_i2c_set_slave_addr(OMAPI2C *s, uint8_t addr) { uint16_t data =3D addr; =20 - memwrite(s->addr + OMAP_I2C_SA, &data, 2); - memread(s->addr + OMAP_I2C_SA, &data, 2); + omap_i2c_write16(s->addr + OMAP_I2C_SA, data); + omap_i2c_read16(s->addr + OMAP_I2C_SA, &data); g_assert_cmphex(data, =3D=3D, addr); } =20 @@ -66,22 +79,22 @@ static void omap_i2c_send(I2CAdapter *i2c, uint8_t ad= dr, omap_i2c_set_slave_addr(s, addr); =20 data =3D len; - memwrite(s->addr + OMAP_I2C_CNT, &data, 2); + omap_i2c_write16(s->addr + OMAP_I2C_CNT, data); =20 data =3D OMAP_I2C_CON_I2C_EN | OMAP_I2C_CON_TRX | OMAP_I2C_CON_MST | OMAP_I2C_CON_STT | OMAP_I2C_CON_STP; - memwrite(s->addr + OMAP_I2C_CON, &data, 2); - memread(s->addr + OMAP_I2C_CON, &data, 2); + omap_i2c_write16(s->addr + OMAP_I2C_CON, data); + omap_i2c_read16(s->addr + OMAP_I2C_CON, &data); g_assert((data & OMAP_I2C_CON_STP) !=3D 0); =20 - memread(s->addr + OMAP_I2C_STAT, &data, 2); + omap_i2c_read16(s->addr + OMAP_I2C_STAT, &data); g_assert((data & OMAP_I2C_STAT_NACK) =3D=3D 0); =20 while (len > 1) { - memread(s->addr + OMAP_I2C_STAT, &data, 2); + omap_i2c_read16(s->addr + OMAP_I2C_STAT, &data); g_assert((data & OMAP_I2C_STAT_XRDY) !=3D 0); =20 memwrite(s->addr + OMAP_I2C_DATA, buf, 2); @@ -89,13 +102,13 @@ static void omap_i2c_send(I2CAdapter *i2c, uint8_t a= ddr, len -=3D 2; } if (len =3D=3D 1) { - memread(s->addr + OMAP_I2C_STAT, &data, 2); + omap_i2c_read16(s->addr + OMAP_I2C_STAT, &data); g_assert((data & OMAP_I2C_STAT_XRDY) !=3D 0); =20 memwrite(s->addr + OMAP_I2C_DATA, buf, 1); } =20 - memread(s->addr + OMAP_I2C_CON, &data, 2); + omap_i2c_read16(s->addr + OMAP_I2C_CON, &data); g_assert((data & OMAP_I2C_CON_STP) =3D=3D 0); } =20 @@ -108,32 +121,32 @@ static void omap_i2c_recv(I2CAdapter *i2c, uint8_t = addr, omap_i2c_set_slave_addr(s, addr); =20 data =3D len; - memwrite(s->addr + OMAP_I2C_CNT, &data, 2); + omap_i2c_write16(s->addr + OMAP_I2C_CNT, data); =20 data =3D OMAP_I2C_CON_I2C_EN | OMAP_I2C_CON_MST | OMAP_I2C_CON_STT | OMAP_I2C_CON_STP; - memwrite(s->addr + OMAP_I2C_CON, &data, 2); - memread(s->addr + OMAP_I2C_CON, &data, 2); + omap_i2c_write16(s->addr + OMAP_I2C_CON, data); + omap_i2c_read16(s->addr + OMAP_I2C_CON, &data); g_assert((data & OMAP_I2C_CON_STP) =3D=3D 0); =20 - memread(s->addr + OMAP_I2C_STAT, &data, 2); + omap_i2c_read16(s->addr + OMAP_I2C_STAT, &data); g_assert((data & OMAP_I2C_STAT_NACK) =3D=3D 0); =20 - memread(s->addr + OMAP_I2C_CNT, &data, 2); + omap_i2c_read16(s->addr + OMAP_I2C_CNT, &data); g_assert_cmpuint(data, =3D=3D, len); =20 while (len > 0) { - memread(s->addr + OMAP_I2C_STAT, &data, 2); + omap_i2c_read16(s->addr + OMAP_I2C_STAT, &data); g_assert((data & OMAP_I2C_STAT_RRDY) !=3D 0); g_assert((data & OMAP_I2C_STAT_ROVR) =3D=3D 0); =20 memread(s->addr + OMAP_I2C_DATA, &data, 2); =20 - memread(s->addr + OMAP_I2C_STAT, &stat, 2); + omap_i2c_read16(s->addr + OMAP_I2C_STAT, &stat); if (unlikely(len =3D=3D 1)) { - *buf =3D data & 0xf; + *buf =3D le16_to_cpu(data) & 0xf; buf++; len--; } else { @@ -143,7 +156,7 @@ static void omap_i2c_recv(I2CAdapter *i2c, uint8_t ad= dr, } } =20 - memread(s->addr + OMAP_I2C_CON, &data, 2); + omap_i2c_read16(s->addr + OMAP_I2C_CON, &data); g_assert((data & OMAP_I2C_CON_STP) =3D=3D 0); } =20 @@ -159,7 +172,7 @@ I2CAdapter *omap_i2c_create(uint64_t addr) i2c->recv =3D omap_i2c_recv; =20 /* verify the mmio address by looking for a known signature */ - memread(addr + OMAP_I2C_REV, &data, 2); + omap_i2c_read16(addr + OMAP_I2C_REV, &data); g_assert_cmphex(data, =3D=3D, 0x34); =20 return i2c; --=20 1.7.10.4