svn commit: r226410 - head/sys/powerpc/powerpc

[Nathan Whitehorn]

Author: nwhitehorn
Date: Sat Oct 15 23:15:55 2011
New Revision: 226410
URL: http://svn.freebsd.org/changeset/base/226410

Log:
  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

Modified:
  head/sys/powerpc/powerpc/bus_machdep.c

Modified: head/sys/powerpc/powerpc/bus_machdep.c
==============================================================================
--- head/sys/powerpc/powerpc/bus_machdep.c      Sat Oct 15 23:13:24 2011        
(r226409)
+++ head/sys/powerpc/powerpc/bus_machdep.c      Sat Oct 15 23:15:55 2011        
(r226410)
@@ -293,6 +293,7 @@ bs_be_ws_1(bus_space_handle_t bsh, bus_s
 
        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_s
 
        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_s
 
        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_s
 
        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_s
 
        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_s
 
        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_s
 
        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);
 }
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"