diff options
| author | nwhitehorn <nwhitehorn@FreeBSD.org> | 2011-10-15 23:15:55 +0000 |
|---|---|---|
| committer | nwhitehorn <nwhitehorn@FreeBSD.org> | 2011-10-15 23:15:55 +0000 |
| commit | 0b7d8050e61b989ccbc399e0d0fa6a001fe26899 (patch) | |
| tree | f6cec8c001f848e22eaf81afe27195a9e3b9eba5 /sys/powerpc | |
| parent | e3aa90f17e391d8f8e9c117bafef655423269cef (diff) | |
| download | FreeBSD-src-0b7d8050e61b989ccbc399e0d0fa6a001fe26899.zip FreeBSD-src-0b7d8050e61b989ccbc399e0d0fa6a001fe26899.tar.gz | |
Enforce a memory barrier in stream operations, as is done on other
bus_space calls. This makes ath(4) work correctly on PowerPC.
Submitted by: adrian
Tested by: andreast
MFC after: 3 days
Diffstat (limited to 'sys/powerpc')
| -rw-r--r-- | sys/powerpc/powerpc/bus_machdep.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sys/powerpc/powerpc/bus_machdep.c b/sys/powerpc/powerpc/bus_machdep.c index 2d2f6ee..6372d51 100644 --- a/sys/powerpc/powerpc/bus_machdep.c +++ b/sys/powerpc/powerpc/bus_machdep.c @@ -293,6 +293,7 @@ bs_be_ws_1(bus_space_handle_t bsh, bus_size_t ofs, uint8_t val) addr = __ppc_ba(bsh, ofs); *addr = val; + __asm __volatile("eieio; sync"); CTR4(KTR_BE_IO, "%s(bsh=%#x, ofs=%#x, val=%#x)", __func__, bsh, ofs, val); } @@ -303,6 +304,7 @@ bs_be_ws_2(bus_space_handle_t bsh, bus_size_t ofs, uint16_t val) addr = __ppc_ba(bsh, ofs); *addr = val; + __asm __volatile("eieio; sync"); CTR4(KTR_BE_IO, "%s(bsh=%#x, ofs=%#x, val=%#x)", __func__, bsh, ofs, val); } @@ -313,6 +315,7 @@ bs_be_ws_4(bus_space_handle_t bsh, bus_size_t ofs, uint32_t val) addr = __ppc_ba(bsh, ofs); *addr = val; + __asm __volatile("eieio; sync"); CTR4(KTR_BE_IO, "%s(bsh=%#x, ofs=%#x, val=%#x)", __func__, bsh, ofs, val); } @@ -323,6 +326,7 @@ bs_be_ws_8(bus_space_handle_t bsh, bus_size_t ofs, uint64_t val) addr = __ppc_ba(bsh, ofs); *addr = val; + __asm __volatile("eieio; sync"); } static void @@ -488,6 +492,7 @@ bs_le_rs_1(bus_space_handle_t bsh, bus_size_t ofs) addr = __ppc_ba(bsh, ofs); res = *addr; + __asm __volatile("eieio; sync"); CTR4(KTR_LE_IO, "%s(bsh=%#x, ofs=%#x) = %#x", __func__, bsh, ofs, res); return (res); } @@ -500,6 +505,7 @@ bs_le_rs_2(bus_space_handle_t bsh, bus_size_t ofs) addr = __ppc_ba(bsh, ofs); __asm __volatile("lhbrx %0, 0, %1" : "=r"(res) : "r"(addr)); + __asm __volatile("eieio; sync"); CTR4(KTR_LE_IO, "%s(bsh=%#x, ofs=%#x) = %#x", __func__, bsh, ofs, res); return (res); } @@ -512,6 +518,7 @@ bs_le_rs_4(bus_space_handle_t bsh, bus_size_t ofs) addr = __ppc_ba(bsh, ofs); __asm __volatile("lwbrx %0, 0, %1" : "=r"(res) : "r"(addr)); + __asm __volatile("eieio; sync"); CTR4(KTR_LE_IO, "%s(bsh=%#x, ofs=%#x) = %#x", __func__, bsh, ofs, res); return (res); } |
