Commit 7dc176bc authored by Peter Maydell's avatar Peter Maydell

hw/pci-host/prep: Don't reverse IO accesses on bigendian hosts

The raven_io_read() and raven_io_write() functions pass and
return values in little-endian format (since the IO op struct
is marked DEVICE_LITTLE_ENDIAN); however they were storing the
values in the buffer to pass to address_space_read/write()
in host-endian order, which meant that on big-endian hosts
the values were inadvertently reversed. Use the *_le_p()
accessors instead so that we are consistent regardless of
host endianness.

Strictly speaking the byte order of the buffer for
address_space_rw() is target byte order (which for PPC
will be BE) but it doesn't actually matter as long as we
are consistent about the marking on the IO op struct and
which stl_*_p().

This bug was probably introduced due to confusion caused by
the two different versions of ldl_p() and friends:
 bswap.h defines versions meaning "host endianness access"
 cpu-all.h defines versions meaning "target endianness access"
As a target-independent source file prep.c gets the bswap.h
versions; the very similar looking code in ioport.c is
compiled per-target and gets the cpu-all.h versions.
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Message-id: 1396972271-22660-1-git-send-email-peter.maydell@linaro.org
Reviewed-by: default avatarRichard Henderson <rth@twiddle.net>
parent 9bc1a1d8
...@@ -145,9 +145,9 @@ static uint64_t raven_io_read(void *opaque, hwaddr addr, ...@@ -145,9 +145,9 @@ static uint64_t raven_io_read(void *opaque, hwaddr addr,
if (size == 1) { if (size == 1) {
return buf[0]; return buf[0];
} else if (size == 2) { } else if (size == 2) {
return lduw_p(buf); return lduw_le_p(buf);
} else if (size == 4) { } else if (size == 4) {
return ldl_p(buf); return ldl_le_p(buf);
} else { } else {
g_assert_not_reached(); g_assert_not_reached();
} }
...@@ -164,9 +164,9 @@ static void raven_io_write(void *opaque, hwaddr addr, ...@@ -164,9 +164,9 @@ static void raven_io_write(void *opaque, hwaddr addr,
if (size == 1) { if (size == 1) {
buf[0] = val; buf[0] = val;
} else if (size == 2) { } else if (size == 2) {
stw_p(buf, val); stw_le_p(buf, val);
} else if (size == 4) { } else if (size == 4) {
stl_p(buf, val); stl_le_p(buf, val);
} else { } else {
g_assert_not_reached(); g_assert_not_reached();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment