This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / asm-ppc64 / eeh.h

diff --git a/include/asm-ppc64/eeh.h b/include/asm-ppc64/eeh.h
index a877ce9..d5e44bf 100644 (file)
--- a/include/asm-ppc64/eeh.h
+++ b/include/asm-ppc64/eeh.h
@@ -180,96 +180,27 @@ static inline void eeh_raw_writeq(u64 val, void *addr) {
        out_be64(vaddr, val);
 }
 
-#define EEH_CHECK_ALIGN(v,a) \
-       ((((unsigned long)(v)) & ((a) - 1)) == 0)
-
 static inline void eeh_memset_io(void *addr, int c, unsigned long n) {
        void *vaddr = (void *)IO_TOKEN_TO_ADDR(addr);
-       u32 lc = c;
-       lc |= lc << 8;
-       lc |= lc << 16;
-
-       while(n && !EEH_CHECK_ALIGN(vaddr, 4)) {
-               *((volatile u8 *)vaddr) = c;
-               vaddr = (void *)((unsigned long)vaddr + 1);
-               n--;
-       }
-       while(n >= 4) {
-               *((volatile u32 *)vaddr) = lc;
-               vaddr = (void *)((unsigned long)vaddr + 4);
-               n -= 4;
-       }
-       while(n) {
-               *((volatile u8 *)vaddr) = c;
-               vaddr = (void *)((unsigned long)vaddr + 1);
-               n--;
-       }
-       __asm__ __volatile__ ("sync" : : : "memory");
+       memset(vaddr, c, n);
 }
 static inline void eeh_memcpy_fromio(void *dest, void *src, unsigned long n) {
        void *vsrc = (void *)IO_TOKEN_TO_ADDR(src);
-       void *vsrcsave = vsrc, *destsave = dest, *srcsave = src;
-       unsigned long nsave = n;
-
-       while(n && (!EEH_CHECK_ALIGN(vsrc, 4) || !EEH_CHECK_ALIGN(dest, 4))) {
-               *((u8 *)dest) = *((volatile u8 *)vsrc);
-               __asm__ __volatile__ ("eieio" : : : "memory");
-               vsrc = (void *)((unsigned long)vsrc + 1);
-               dest = (void *)((unsigned long)dest + 1);                       
-               n--;
-       }
-       while(n > 4) {
-               *((u32 *)dest) = *((volatile u32 *)vsrc);
-               __asm__ __volatile__ ("eieio" : : : "memory");
-               vsrc = (void *)((unsigned long)vsrc + 4);
-               dest = (void *)((unsigned long)dest + 4);                       
-               n -= 4;
-       }
-       while(n) {
-               *((u8 *)dest) = *((volatile u8 *)vsrc);
-               __asm__ __volatile__ ("eieio" : : : "memory");
-               vsrc = (void *)((unsigned long)vsrc + 1);
-               dest = (void *)((unsigned long)dest + 1);                       
-               n--;
-       }
-       __asm__ __volatile__ ("sync" : : : "memory");
-
+       memcpy(dest, vsrc, n);
        /* Look for ffff's here at dest[n].  Assume that at least 4 bytes
         * were copied. Check all four bytes.
         */
-       if ((nsave >= 4) &&
-               (EEH_POSSIBLE_ERROR(srcsave, vsrcsave, (*((u32 *) destsave+nsave-4)),
-                                   u32))) {
-               eeh_check_failure(srcsave, (*((u32 *) destsave+nsave-4)));
+       if ((n >= 4) &&
+               (EEH_POSSIBLE_ERROR(src, vsrc, (*((u32 *) dest+n-4)), u32))) {
+               eeh_check_failure(src, (*((u32 *) dest+n-4)));
        }
 }
 
 static inline void eeh_memcpy_toio(void *dest, void *src, unsigned long n) {
        void *vdest = (void *)IO_TOKEN_TO_ADDR(dest);
-
-       while(n && (!EEH_CHECK_ALIGN(vdest, 4) || !EEH_CHECK_ALIGN(src, 4))) {
-               *((volatile u8 *)vdest) = *((u8 *)src);
-               src = (void *)((unsigned long)src + 1);
-               vdest = (void *)((unsigned long)vdest + 1);                     
-               n--;
-       }
-       while(n > 4) {
-               *((volatile u32 *)vdest) = *((volatile u32 *)src);
-               src = (void *)((unsigned long)src + 4);
-               vdest = (void *)((unsigned long)vdest + 4);                     
-               n-=4;
-       }
-       while(n) {
-               *((volatile u8 *)vdest) = *((u8 *)src);
-               src = (void *)((unsigned long)src + 1);
-               vdest = (void *)((unsigned long)vdest + 1);                     
-               n--;
-       }
-       __asm__ __volatile__ ("sync" : : : "memory");
+       memcpy(vdest, src, n);
 }
 
-#undef EEH_CHECK_ALIGN
-
 #define MAX_ISA_PORT 0x10000
 extern unsigned long io_page_mask;
 #define _IO_IS_VALID(port) ((port) >= MAX_ISA_PORT || (1 << (port>>PAGE_SHIFT)) & io_page_mask)