[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-1.4 v2 2/5] libi2c-omap: Fix endianness dependen
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH for-1.4 v2 2/5] libi2c-omap: Fix endianness dependency |
Date: |
Wed, 6 Feb 2013 19:33:27 +0100 |
From: Andreas Färber <address@hidden>
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.
To prepare for a QTest-level endianness solution, poison mem{read,write}
and always use the helpers. Adopt the expected signatures.
To avoid an unused variable warning, assert the STAT Single Byte Data
bit but, due to it not getting cleared, only it being set when len == 1.
Signed-off-by: Andreas Färber <address@hidden>
---
tests/libi2c-omap.c | 76 +++++++++++++++++++++++++++++++++++----------------
1 Datei geändert, 53 Zeilen hinzugefügt(+), 23 Zeilen entfernt(-)
diff --git a/tests/libi2c-omap.c b/tests/libi2c-omap.c
index 9be57e9..b7b10b5 100644
--- a/tests/libi2c-omap.c
+++ b/tests/libi2c-omap.c
@@ -12,6 +12,7 @@
#include <string.h>
#include "qemu/osdep.h"
+#include "qemu/bswap.h"
#include "libqtest.h"
enum OMAPI2CRegisters {
@@ -48,12 +49,35 @@ typedef struct OMAPI2C {
} OMAPI2C;
+/* FIXME Use TBD readw qtest API */
+static inline uint16_t readw(uint64_t addr)
+{
+ uint16_t data;
+
+ memread(addr, &data, 2);
+ return le16_to_cpu(data);
+}
+
+/* FIXME Use TBD writew qtest API */
+static inline void writew(uint64_t addr, uint16_t data)
+{
+ data = cpu_to_le16(data);
+ memwrite(addr, &data, 2);
+}
+
+#ifdef __GNUC__
+#undef memread
+#undef memwrite
+#pragma GCC poison memread
+#pragma GCC poison memwrite
+#endif
+
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);
+ writew(s->addr + OMAP_I2C_SA, data);
+ data = readw(s->addr + OMAP_I2C_SA);
g_assert_cmphex(data, ==, addr);
}
@@ -66,36 +90,38 @@ 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);
+ writew(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);
+ writew(s->addr + OMAP_I2C_CON, data);
+ data = readw(s->addr + OMAP_I2C_CON);
g_assert((data & OMAP_I2C_CON_STP) != 0);
- memread(s->addr + OMAP_I2C_STAT, &data, 2);
+ data = readw(s->addr + OMAP_I2C_STAT);
g_assert((data & OMAP_I2C_STAT_NACK) == 0);
while (len > 1) {
- memread(s->addr + OMAP_I2C_STAT, &data, 2);
+ data = readw(s->addr + OMAP_I2C_STAT);
g_assert((data & OMAP_I2C_STAT_XRDY) != 0);
- memwrite(s->addr + OMAP_I2C_DATA, buf, 2);
+ data = buf[0] | ((uint16_t)buf[1] << 8);
+ writew(s->addr + OMAP_I2C_DATA, data);
buf = (uint8_t *)buf + 2;
len -= 2;
}
if (len == 1) {
- memread(s->addr + OMAP_I2C_STAT, &data, 2);
+ data = readw(s->addr + OMAP_I2C_STAT);
g_assert((data & OMAP_I2C_STAT_XRDY) != 0);
- memwrite(s->addr + OMAP_I2C_DATA, buf, 1);
+ data = buf[0];
+ writew(s->addr + OMAP_I2C_DATA, data);
}
- memread(s->addr + OMAP_I2C_CON, &data, 2);
+ data = readw(s->addr + OMAP_I2C_CON);
g_assert((data & OMAP_I2C_CON_STP) == 0);
}
@@ -108,42 +134,46 @@ 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);
+ writew(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);
+ writew(s->addr + OMAP_I2C_CON, data);
+ data = readw(s->addr + OMAP_I2C_CON);
g_assert((data & OMAP_I2C_CON_STP) == 0);
- memread(s->addr + OMAP_I2C_STAT, &data, 2);
+ data = readw(s->addr + OMAP_I2C_STAT);
g_assert((data & OMAP_I2C_STAT_NACK) == 0);
- memread(s->addr + OMAP_I2C_CNT, &data, 2);
+ data = readw(s->addr + OMAP_I2C_CNT);
g_assert_cmpuint(data, ==, len);
while (len > 0) {
- memread(s->addr + OMAP_I2C_STAT, &data, 2);
+ data = readw(s->addr + OMAP_I2C_STAT);
g_assert((data & OMAP_I2C_STAT_RRDY) != 0);
g_assert((data & OMAP_I2C_STAT_ROVR) == 0);
- memread(s->addr + OMAP_I2C_DATA, &data, 2);
+ data = readw(s->addr + OMAP_I2C_DATA);
+
+ stat = readw(s->addr + OMAP_I2C_STAT);
- memread(s->addr + OMAP_I2C_STAT, &stat, 2);
if (unlikely(len == 1)) {
- *buf = data & 0xf;
+ g_assert((stat & OMAP_I2C_STAT_SBD) != 0);
+
+ buf[0] = data & 0xff;
buf++;
len--;
} else {
- memcpy(buf, &data, 2);
+ buf[0] = data & 0xff;
+ buf[1] = data >> 8;
buf += 2;
len -= 2;
}
}
- memread(s->addr + OMAP_I2C_CON, &data, 2);
+ data = readw(s->addr + OMAP_I2C_CON);
g_assert((data & OMAP_I2C_CON_STP) == 0);
}
@@ -159,7 +189,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);
+ data = readw(addr + OMAP_I2C_REV);
g_assert_cmphex(data, ==, 0x34);
return i2c;
--
1.7.10.4
- [Qemu-devel] [PATCH RFC v2 0/5] qtest: tmp105-test BE fix for 1.4 and MMIO support, Andreas Färber, 2013/02/06
- [Qemu-devel] [PATCH for-1.4 v2 1/5] qtest: Use strtoull() for uint64_t, Andreas Färber, 2013/02/06
- [Qemu-devel] [PATCH for-1.4? v2 3/5] tmp105-test: Combine assertions of 16-bit responses, Andreas Färber, 2013/02/06
- [Qemu-devel] [RFC v2 5/5] qtest: Add MMIO support, Andreas Färber, 2013/02/06
- [Qemu-devel] [PATCH for-1.4 v2 2/5] libi2c-omap: Fix endianness dependency,
Andreas Färber <=
- [Qemu-devel] [PATCH v2 4/5] tmp105: Add debug output, Andreas Färber, 2013/02/06
- Re: [Qemu-devel] [PATCH RFC v2 0/5] qtest: tmp105-test BE fix for 1.4 and MMIO support, Anthony Liguori, 2013/02/12