patch-2.4.0-test5 linux/arch/sh/kernel/io_generic.c

• Lines: 58
• Date: Fri Jul 21 14:21:06 2000
• Orig file: v2.4.0-test4/linux/arch/sh/kernel/io_generic.c
• Orig date: Tue May 23 15:31:34 2000

diff -u --recursive --new-file v2.4.0-test4/linux/arch/sh/kernel/io_generic.c linux/arch/sh/kernel/io_generic.c
@@ -6,11 +6,21 @@
  *
  * Generic I/O routine.
  *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
  */
 
 #include <linux/config.h>
 #include <asm/io.h>
 
+#if defined(__sh3__)
+/* I'm not sure SH7709 has this kind of bug */
+#define SH3_PCMCIA_BUG_WORKAROUND 1
+#define DUMMY_READ_AREA6	  0xba000000
+#endif
+
 #define PORT2ADDR(x) (CONFIG_IOPORT_START+(x))
 
 static inline void delay(void)
@@ -51,12 +61,18 @@
 {
 	unsigned short *buf=buffer;
 	while(count--) *buf++=inw(port);
+#ifdef SH3_PCMCIA_BUG_WORKAROUND
+	ctrl_inb (DUMMY_READ_AREA6);
+#endif
 }
 
 void insl(unsigned int port, void *buffer, unsigned long count)
 {
 	unsigned long *buf=buffer;
 	while(count--) *buf++=inl(port);
+#ifdef SH3_PCMCIA_BUG_WORKAROUND
+	ctrl_inb (DUMMY_READ_AREA6);
+#endif
 }
 
 void outb(unsigned long b, unsigned int port)
@@ -90,10 +106,16 @@
 {
 	const unsigned short *buf=buffer;
 	while(count--) outw(*buf++, port);
+#ifdef SH3_PCMCIA_BUG_WORKAROUND
+	ctrl_inb (DUMMY_READ_AREA6);
+#endif
 }
 
 void outsl(unsigned int port, const void *buffer, unsigned long count)
 {
 	const unsigned long *buf=buffer;
 	while(count--) outl(*buf++, port);
+#ifdef SH3_PCMCIA_BUG_WORKAROUND
+	ctrl_inb (DUMMY_READ_AREA6);
+#endif
 }