Title: [8664] trunk/arch/blackfin/include/asm/blackfin.h: Change anomaly workarounds, to be what the anomaly sheet writer ment,
- Revision
- 8664
- Author
- rgetz
- Date
- 2010-04-23 14:16:17 -0400 (Fri, 23 Apr 2010)
Log Message
Change anomaly workarounds, to be what the anomaly sheet writer ment,
not what is actually said in the workarounds...
[!no_src_qa!] - due to assembly syntax in h file:
ERROR: Macros with multiple statements should be enclosed in a do -
while loop
#63: FILE: arch/blackfin/include/asm/blackfin.h:65:
+#define SSYNC(scratch) cli scratch; nop; nop; nop; SSYNC; sti scratch;
Modified Paths
Diff
Modified: trunk/arch/blackfin/include/asm/blackfin.h (8663 => 8664)
--- trunk/arch/blackfin/include/asm/blackfin.h 2010-04-23 10:06:03 UTC (rev 8663)
+++ trunk/arch/blackfin/include/asm/blackfin.h 2010-04-23 18:16:17 UTC (rev 8664)
@@ -17,22 +17,16 @@
static inline void SSYNC(void)
{
int _tmp;
- if (ANOMALY_05000312)
+ if (ANOMALY_05000312 || ANOMALY_05000244)
__asm__ __volatile__(
"cli %0;"
"nop;"
"nop;"
+ "nop;"
"ssync;"
"sti %0;"
: "=d" (_tmp)
);
- else if (ANOMALY_05000244)
- __asm__ __volatile__(
- "nop;"
- "nop;"
- "nop;"
- "ssync;"
- );
else
__asm__ __volatile__("ssync;");
}
@@ -41,22 +35,16 @@
static inline void CSYNC(void)
{
int _tmp;
- if (ANOMALY_05000312)
+ if (ANOMALY_05000312 || ANOMALY_05000244)
__asm__ __volatile__(
"cli %0;"
"nop;"
"nop;"
+ "nop;"
"csync;"
"sti %0;"
: "=d" (_tmp)
);
- else if (ANOMALY_05000244)
- __asm__ __volatile__(
- "nop;"
- "nop;"
- "nop;"
- "csync;"
- );
else
__asm__ __volatile__("csync;");
}
@@ -73,14 +61,10 @@
#define ssync(x) SSYNC(x)
#define csync(x) CSYNC(x)
-#if ANOMALY_05000312
-#define SSYNC(scratch) cli scratch; nop; nop; SSYNC; sti scratch;
-#define CSYNC(scratch) cli scratch; nop; nop; CSYNC; sti scratch;
+#if ANOMALY_05000312 || ANOMALY_05000244
+#define SSYNC(scratch) cli scratch; nop; nop; nop; SSYNC; sti scratch;
+#define CSYNC(scratch) cli scratch; nop; nop; nop; CSYNC; sti scratch;
-#elif ANOMALY_05000244
-#define SSYNC(scratch) nop; nop; nop; SSYNC;
-#define CSYNC(scratch) nop; nop; nop; CSYNC;
-
#else
#define SSYNC(scratch) SSYNC;
#define CSYNC(scratch) CSYNC;
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
