svn commit: r244588 - in user/attilio/membarclean/dev: bce cxgb e1000 ixgbe vxge

[Attilio Rao]

Author: attilio
Date: Sat Dec 22 14:26:58 2012
New Revision: 244588
URL: http://svnweb.freebsd.org/changeset/base/244588

Log:
  Remove unused barriers.

Modified:
  user/attilio/membarclean/dev/bce/if_bcereg.h
  user/attilio/membarclean/dev/cxgb/cxgb_osdep.h
  user/attilio/membarclean/dev/e1000/e1000_osdep.h
  user/attilio/membarclean/dev/ixgbe/ixgbe_osdep.h
  user/attilio/membarclean/dev/vxge/vxge-osdep.h

Modified: user/attilio/membarclean/dev/bce/if_bcereg.h
==============================================================================
--- user/attilio/membarclean/dev/bce/if_bcereg.h	Sat Dec 22 14:18:24 2012	(r244587)
+++ user/attilio/membarclean/dev/bce/if_bcereg.h	Sat Dec 22 14:26:58 2012	(r244588)
@@ -544,12 +544,10 @@ default: DBPRINT(sc, BCE_INSANE_PHY,				
 #if __FreeBSD_version < 800054
 #if defined(__i386__) || defined(__amd64__)
 #define mb()    __asm volatile("mfence" ::: "memory")
-#define wmb()   __asm volatile("sfence" ::: "memory")
 #define rmb()   __asm volatile("lfence" ::: "memory")
 #else
 #define mb()
 #define rmb()
-#define wmb()
 #endif
 #endif
 

Modified: user/attilio/membarclean/dev/cxgb/cxgb_osdep.h
==============================================================================
--- user/attilio/membarclean/dev/cxgb/cxgb_osdep.h	Sat Dec 22 14:18:24 2012	(r244587)
+++ user/attilio/membarclean/dev/cxgb/cxgb_osdep.h	Sat Dec 22 14:26:58 2012	(r244588)
@@ -72,18 +72,14 @@ struct t3_mbuf_hdr {
   #if #cpu(i386) || defined __i386 || defined i386 || defined __i386__ || #cpu(x86_64) || defined __x86_64__
     #define mb()  __asm__ __volatile__ ("mfence;": : :"memory")
     #define wmb()  __asm__ __volatile__ ("sfence;": : :"memory")
-    #define rmb()  __asm__ __volatile__ ("lfence;": : :"memory")
   #elif #cpu(sparc64) || defined sparc64 || defined __sparcv9 
     #define mb()  __asm__ __volatile__ ("membar #MemIssue": : :"memory")
     #define wmb() mb()
-    #define rmb() mb()
   #elif #cpu(sparc) || defined sparc || defined __sparc__
     #define mb()  __asm__ __volatile__ ("stbar;": : :"memory")
     #define wmb() mb()
-    #define rmb() mb()
 #else
     #define wmb() mb()
-    #define rmb() mb()
     #define mb() 	/* XXX just to make this compile */
   #endif
 #else

Modified: user/attilio/membarclean/dev/e1000/e1000_osdep.h
==============================================================================
--- user/attilio/membarclean/dev/e1000/e1000_osdep.h	Sat Dec 22 14:18:24 2012	(r244587)
+++ user/attilio/membarclean/dev/e1000/e1000_osdep.h	Sat Dec 22 14:26:58 2012	(r244588)
@@ -107,18 +107,6 @@ typedef boolean_t	bool;
 #define __le32		u32
 #define __le64		u64
 
-#if __FreeBSD_version < 800000 /* Now in HEAD */
-#if defined(__i386__) || defined(__amd64__)
-#define mb()	__asm volatile("mfence" ::: "memory")
-#define wmb()	__asm volatile("sfence" ::: "memory")
-#define rmb()	__asm volatile("lfence" ::: "memory")
-#else
-#define mb()
-#define rmb()
-#define wmb()
-#endif
-#endif /*__FreeBSD_version < 800000 */
-
 #if defined(__i386__) || defined(__amd64__)
 static __inline
 void prefetch(void *x)

Modified: user/attilio/membarclean/dev/ixgbe/ixgbe_osdep.h
==============================================================================
--- user/attilio/membarclean/dev/ixgbe/ixgbe_osdep.h	Sat Dec 22 14:18:24 2012	(r244587)
+++ user/attilio/membarclean/dev/ixgbe/ixgbe_osdep.h	Sat Dec 22 14:26:58 2012	(r244588)
@@ -130,10 +130,8 @@ typedef boolean_t	bool;
 #if defined(__i386__) || defined(__amd64__)
 #define mb()	__asm volatile("mfence" ::: "memory")
 #define wmb()	__asm volatile("sfence" ::: "memory")
-#define rmb()	__asm volatile("lfence" ::: "memory")
 #else
 #define mb()
-#define rmb()
 #define wmb()
 #endif
 #endif

Modified: user/attilio/membarclean/dev/vxge/vxge-osdep.h
==============================================================================
--- user/attilio/membarclean/dev/vxge/vxge-osdep.h	Sat Dec 22 14:18:24 2012	(r244587)
+++ user/attilio/membarclean/dev/vxge/vxge-osdep.h	Sat Dec 22 14:26:58 2012	(r244588)
@@ -262,12 +262,8 @@ typedef vxge_dma_alloc_t	pci_dma_acc_h;
 /* Write memory	barrier	*/
 #if __FreeBSD_version <	800000
 #if defined(__i386__) || defined(__amd64__)
-#define	mb()  __asm volatile("mfence" ::: "memory")
 #define	wmb() __asm volatile("sfence" ::: "memory")
-#define	rmb() __asm volatile("lfence" ::: "memory")
 #else
-#define	mb()
-#define	rmb()
 #define	wmb()
 #endif
 #endif