From: Alan Cox <alan@lxorguk.ukuu.org.uk>

EDAC requires a way to scrub memory if an ECC error is found and the chipset
does not do the work automatically.  That means rewriting memory locations
atomically with respect to all CPUs _and_ bus masters.  That means we can't
use atomic_add(foo, 0) as it gets optimised for non-SMP

This adds a function to include/asm-foo/atomic.h for the platforms currently
supported which implements a scrub of a mapped block.

It also adjusts a few other files include order where atomic.h is included
before types.h as this now causes an error as atomic_scrub uses u32.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/md/kcopyd.c         |    1 +
 drivers/w1/matrox_w1.c      |    2 +-
 fs/nfsctl.c                 |    1 +
 include/asm-i386/atomic.h   |   11 +++++++++++
 include/asm-x86_64/atomic.h |   12 ++++++++++++
 kernel/audit.c              |    2 +-
 kernel/auditsc.c            |    2 +-
 net/ipv4/raw.c              |    2 +-
 8 files changed, 29 insertions(+), 4 deletions(-)

diff -puN drivers/md/kcopyd.c~edac-atomic-scrub-operations drivers/md/kcopyd.c
--- devel/drivers/md/kcopyd.c~edac-atomic-scrub-operations	2005-10-15 13:35:21.000000000 -0700
+++ devel-akpm/drivers/md/kcopyd.c	2005-10-15 13:35:21.000000000 -0700
@@ -8,6 +8,7 @@
  * completion notification.
  */
 
+#include <asm/types.h>
 #include <asm/atomic.h>
 
 #include <linux/blkdev.h>
diff -puN drivers/w1/matrox_w1.c~edac-atomic-scrub-operations drivers/w1/matrox_w1.c
--- devel/drivers/w1/matrox_w1.c~edac-atomic-scrub-operations	2005-10-15 13:35:21.000000000 -0700
+++ devel-akpm/drivers/w1/matrox_w1.c	2005-10-15 13:35:21.000000000 -0700
@@ -19,8 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include <asm/atomic.h>
 #include <asm/types.h>
+#include <asm/atomic.h>
 #include <asm/io.h>
 
 #include <linux/delay.h>
diff -puN fs/nfsctl.c~edac-atomic-scrub-operations fs/nfsctl.c
--- devel/fs/nfsctl.c~edac-atomic-scrub-operations	2005-10-15 13:35:21.000000000 -0700
+++ devel-akpm/fs/nfsctl.c	2005-10-15 13:35:21.000000000 -0700
@@ -5,6 +5,7 @@
  *
  */
 #include <linux/config.h>
+#include <linux/types.h>
 #include <linux/file.h>
 #include <linux/fs.h>
 #include <linux/sunrpc/svc.h>
diff -puN include/asm-i386/atomic.h~edac-atomic-scrub-operations include/asm-i386/atomic.h
--- devel/include/asm-i386/atomic.h~edac-atomic-scrub-operations	2005-10-15 13:35:21.000000000 -0700
+++ devel-akpm/include/asm-i386/atomic.h	2005-10-15 13:35:21.000000000 -0700
@@ -233,4 +233,15 @@ __asm__ __volatile__(LOCK "orl %0,%1" \
 #define smp_mb__before_atomic_inc()	barrier()
 #define smp_mb__after_atomic_inc()	barrier()
 
+/* ECC atomic, DMA, SMP and interrupt safe scrub function */
+
+static __inline__ void atomic_scrub(unsigned long *virt_addr, u32 size)
+{
+	u32 i;
+	for (i = 0; i < size / 4; i++, virt_addr++)
+		/* Very carefully read and write to memory atomically
+		 * so we are interrupt, DMA and SMP safe.
+		 */
+		__asm__ __volatile__("lock; addl $0, %0"::"m"(*virt_addr));
+}
 #endif
diff -puN include/asm-x86_64/atomic.h~edac-atomic-scrub-operations include/asm-x86_64/atomic.h
--- devel/include/asm-x86_64/atomic.h~edac-atomic-scrub-operations	2005-10-15 13:35:21.000000000 -0700
+++ devel-akpm/include/asm-x86_64/atomic.h	2005-10-15 13:35:21.000000000 -0700
@@ -378,4 +378,16 @@ __asm__ __volatile__(LOCK "orl %0,%1" \
 #define smp_mb__before_atomic_inc()	barrier()
 #define smp_mb__after_atomic_inc()	barrier()
 
+/* ECC atomic, DMA, SMP and interrupt safe scrub function */
+
+static __inline__ void atomic_scrub(unsigned long *virt_addr, u32 size)
+{
+	u32 i;
+	for (i = 0; i < size / 4; i++, virt_addr++)
+		/* Very carefully read and write to memory atomically
+		 * so we are interrupt, DMA and SMP safe.
+		 */
+		__asm__ __volatile__("lock; addl $0, %0"::"m"(*virt_addr));
+}
+
 #endif
diff -puN kernel/audit.c~edac-atomic-scrub-operations kernel/audit.c
--- devel/kernel/audit.c~edac-atomic-scrub-operations	2005-10-15 13:35:21.000000000 -0700
+++ devel-akpm/kernel/audit.c	2005-10-15 13:35:21.000000000 -0700
@@ -42,8 +42,8 @@
  */
 
 #include <linux/init.h>
-#include <asm/atomic.h>
 #include <asm/types.h>
+#include <asm/atomic.h>
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/err.h>
diff -puN kernel/auditsc.c~edac-atomic-scrub-operations kernel/auditsc.c
--- devel/kernel/auditsc.c~edac-atomic-scrub-operations	2005-10-15 13:35:21.000000000 -0700
+++ devel-akpm/kernel/auditsc.c	2005-10-15 13:35:21.000000000 -0700
@@ -30,8 +30,8 @@
  */
 
 #include <linux/init.h>
-#include <asm/atomic.h>
 #include <asm/types.h>
+#include <asm/atomic.h>
 #include <linux/mm.h>
 #include <linux/module.h>
 #include <linux/mount.h>
diff -puN net/ipv4/raw.c~edac-atomic-scrub-operations net/ipv4/raw.c
--- devel/net/ipv4/raw.c~edac-atomic-scrub-operations	2005-10-15 13:35:21.000000000 -0700
+++ devel-akpm/net/ipv4/raw.c	2005-10-15 13:35:21.000000000 -0700
@@ -40,12 +40,12 @@
  */
  
 #include <linux/config.h> 
+#include <linux/types.h>
 #include <asm/atomic.h>
 #include <asm/byteorder.h>
 #include <asm/current.h>
 #include <asm/uaccess.h>
 #include <asm/ioctls.h>
-#include <linux/types.h>
 #include <linux/stddef.h>
 #include <linux/slab.h>
 #include <linux/errno.h>
_