[SPARC32]: sun4d needs ZS_WSYNC() zilog reg flushing too

Linux Kernel Mailing List <[email protected]> Wed, 16 Mar 2005 19:00:29 +0000
Newsgroups gmane.linux.kernel.commits.2-4
Message-ID <[email protected]>
ChangeSet 1.1560.1.7, 2005/03/16 11:00:29-08:00, [email protected]

	[SPARC32]: sun4d needs ZS_WSYNC() zilog reg flushing too
	
	Signed-off-by: David S. Miller <[email protected]>



 zs.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


diff -Nru a/drivers/sbus/char/zs.c b/drivers/sbus/char/zs.c
--- a/drivers/sbus/char/zs.c	2005-03-16 15:02:59 -08:00
+++ b/drivers/sbus/char/zs.c	2005-03-16 15:02:59 -08:00
@@ -65,19 +65,19 @@
 
 /* On 32-bit sparcs we need to delay after register accesses
  * to accomodate sun4 systems, but we do not need to flush writes.
- * On 64-bit sparc we only need to flush single writes to ensure
+ * On 64-bit and sun4d we need to flush single writes to ensure
  * completion.
  */
 #ifndef __sparc_v9__
 #define ZSDELAY()		udelay(5)
 #define ZSDELAY_LONG()		udelay(20)
-#define ZS_WSYNC(channel)	do { } while(0)
 #else
 #define ZSDELAY()
 #define ZSDELAY_LONG()
+#endif
+
 #define ZS_WSYNC(__channel) \
 	sbus_readb(&((__channel)->control))
-#endif
 
 struct sun_zslayout **zs_chips;
 struct sun_zschannel **zs_channels;