Base header patch

[mcf548x/linux.git] / arch / m68k / include / asm / delay_mm.h

diff --git a/arch/m68k/include/asm/delay_mm.h b/arch/m68k/include/asm/delay_mm.h
index 5ed92851bc6fed72096aab039343c38d477aad45..07514c9695f2f747754d9f03d89702584b162ec3 100644 (file)
--- a/arch/m68k/include/asm/delay_mm.h
+++ b/arch/m68k/include/asm/delay_mm.h
@@ -11,8 +11,25 @@
 
 static inline void __delay(unsigned long loops)
 {
-       __asm__ __volatile__ ("1: subql #1,%0; jcc 1b"
-               : "=d" (loops) : "0" (loops));
+#if defined(CONFIG_COLDFIRE)
+       /* The coldfire runs this loop at significantly different speeds
+        * depending upon long word alignment or not.  We'll pad it to
+        * long word alignment which is the faster version.
+        * The 0x4a8e is of course a 'tstl %fp' instruction.  This is better
+        * than using a NOP (0x4e71) instruction because it executes in one
+        * cycle not three and doesn't allow for an arbitary delay waiting
+        * for bus cycles to finish.  Also fp/a6 isn't likely to cause a
+        * stall waiting for the register to become valid if such is added
+        * to the coldfire at some stage.
+        */
+       __asm__ __volatile__ (".balignw 4, 0x4a8e\n\t"
+                             "1: subql #1, %0\n\t"
+                             "jcc 1b"
+                             : "=d" (loops) : "0" (loops));
+#else
+       __asm__ __volatile__ ("1: subql #1,%0; jcc 1b"
+               : "=d" (loops) : "0" (loops));
+#endif
 }
 
 extern void __bad_udelay(void);
@@ -26,12 +43,16 @@ extern void __bad_udelay(void);
  */
 static inline void __const_udelay(unsigned long xloops)
 {
+#if defined(CONFIG_COLDFIRE)
+       __delay(((((unsigned long long) xloops * loops_per_jiffy))>>32)*HZ);
+#else
        unsigned long tmp;
 
        __asm__ ("mulul %2,%0:%1"
                : "=d" (xloops), "=d" (tmp)
                : "d" (xloops), "1" (loops_per_jiffy));
        __delay(xloops * HZ);
+#endif
 }
 
 static inline void __udelay(unsigned long usecs)
@@ -46,12 +67,16 @@ static inline void __udelay(unsigned long usecs)
 static inline unsigned long muldiv(unsigned long a, unsigned long b,
                                   unsigned long c)
 {
+#if defined(CONFIG_COLDFIRE)
+       return (long)(((unsigned long long)a * b)/c);
+#else
        unsigned long tmp;
 
        __asm__ ("mulul %2,%0:%1; divul %3,%0:%1"
                : "=d" (tmp), "=d" (a)
                : "d" (b), "d" (c), "1" (a));
        return a;
+#endif
 }
 
 #endif /* defined(_M68K_DELAY_H) */