From patchwork Sat Feb 2 16:45:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 217694 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2D2EE2C0079 for ; Sun, 3 Feb 2013 03:46:18 +1100 (EST) Received: from localhost ([::1]:51347 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1gEI-0002nn-Q5 for incoming@patchwork.ozlabs.org; Sat, 02 Feb 2013 11:46:14 -0500 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 Received: from relay1.suse.de (unknown [195.135.220.254]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 8858AA5077; Sat, 2 Feb 2013 17:46:04 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sat, 2 Feb 2013 17:45:57 +0100 Message-Id: <1359823557-5748-1-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: blauwirbel@gmail.com, dantesu@gmail.com, =?UTF-8?q?Andreas=20F=C3=A4rber?= , agraf@suse.de, rth@twiddle.net Subject: [Qemu-devel] [PATCH for-1.4] libi2c-omap: Fix endianness dependency X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Andreas Färber 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ärber --- tests/libi2c-omap.c | 51 ++++++++++++++++++++++++++++++++------------------- 1 Datei geändert, 32 Zeilen hinzugefügt(+), 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 #include "qemu/osdep.h" +#include "qemu/bswap.h" #include "libqtest.h" enum OMAPI2CRegisters { @@ -48,12 +49,24 @@ typedef struct OMAPI2C { } OMAPI2C; +static inline void omap_i2c_read16(uint64_t addr, uint16_t *data) +{ + memread(addr, data, 2); + *data = le16_to_cpu(*data); +} + +static inline void omap_i2c_write16(uint64_t addr, uint16_t data) +{ + data = cpu_to_le16(data); + memwrite(addr, &data, 2); +} + static void omap_i2c_set_slave_addr(OMAPI2C *s, uint8_t addr) { uint16_t data = addr; - 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, ==, addr); } @@ -66,22 +79,22 @@ static void omap_i2c_send(I2CAdapter *i2c, uint8_t addr, omap_i2c_set_slave_addr(s, addr); data = len; - memwrite(s->addr + OMAP_I2C_CNT, &data, 2); + omap_i2c_write16(s->addr + OMAP_I2C_CNT, data); data = 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) != 0); - memread(s->addr + OMAP_I2C_STAT, &data, 2); + omap_i2c_read16(s->addr + OMAP_I2C_STAT, &data); g_assert((data & OMAP_I2C_STAT_NACK) == 0); 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) != 0); memwrite(s->addr + OMAP_I2C_DATA, buf, 2); @@ -89,13 +102,13 @@ static void omap_i2c_send(I2CAdapter *i2c, uint8_t addr, len -= 2; } if (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) != 0); memwrite(s->addr + OMAP_I2C_DATA, buf, 1); } - memread(s->addr + OMAP_I2C_CON, &data, 2); + omap_i2c_read16(s->addr + OMAP_I2C_CON, &data); g_assert((data & OMAP_I2C_CON_STP) == 0); } @@ -108,32 +121,32 @@ static void omap_i2c_recv(I2CAdapter *i2c, uint8_t addr, omap_i2c_set_slave_addr(s, addr); data = len; - memwrite(s->addr + OMAP_I2C_CNT, &data, 2); + omap_i2c_write16(s->addr + OMAP_I2C_CNT, data); data = 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) == 0); - memread(s->addr + OMAP_I2C_STAT, &data, 2); + omap_i2c_read16(s->addr + OMAP_I2C_STAT, &data); g_assert((data & OMAP_I2C_STAT_NACK) == 0); - memread(s->addr + OMAP_I2C_CNT, &data, 2); + omap_i2c_read16(s->addr + OMAP_I2C_CNT, &data); g_assert_cmpuint(data, ==, len); 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) != 0); g_assert((data & OMAP_I2C_STAT_ROVR) == 0); memread(s->addr + OMAP_I2C_DATA, &data, 2); - memread(s->addr + OMAP_I2C_STAT, &stat, 2); + omap_i2c_read16(s->addr + OMAP_I2C_STAT, &stat); if (unlikely(len == 1)) { - *buf = data & 0xf; + *buf = le16_to_cpu(data) & 0xf; buf++; len--; } else { @@ -143,7 +156,7 @@ static void omap_i2c_recv(I2CAdapter *i2c, uint8_t addr, } } - memread(s->addr + OMAP_I2C_CON, &data, 2); + omap_i2c_read16(s->addr + OMAP_I2C_CON, &data); g_assert((data & OMAP_I2C_CON_STP) == 0); } @@ -159,7 +172,7 @@ I2CAdapter *omap_i2c_create(uint64_t addr) i2c->recv = omap_i2c_recv; /* 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, ==, 0x34); return i2c;