[patch 1/2] x86: define outb_pic and inb_pic to stop using outb_p and inb_p

["David P. Reed" <dpreed@reed.com>]

[-- Attachment #1: fix-8259-iodelay.patch --]
[-- Type: text/plain, Size: 2903 bytes --]

The delay between io port accesses to the PIC is now defined using outb_pic
and inb_pic.  This fix provides the next step, using udelay(2) to define the
*PIC specific* timing requirements, rather than on bus-oriented timing, which
is not well calibrated.

Again, the primary reason for fixing this is to use proper delay strategy,
and in particular to fix crashes that can result from using port 80 writes
on machines that have resources on port 80, such as the ENE chips used by Quanta
in latops it designs and sells to, e.g. HP.

Signed-off-by: David P. Reed <dpreed@reed.com>
Index: linux-2.6/arch/x86/kernel/i8259_32.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/i8259_32.c
+++ linux-2.6/arch/x86/kernel/i8259_32.c
@@ -277,6 +277,23 @@ static int __init i8259A_init_sysfs(void
 
 device_initcall(i8259A_init_sysfs);
 
+unsigned char inb_pic(unsigned int port)
+{
+	/* delay for some accesses to PIC on motherboard or in chipset must be
+	   at least one microsecond, but be safe here. */
+	unsigned char value = inb(port);
+	udelay(2);
+	return value;
+}
+
+void outb_pic(unsigned char value, unsigned int port)
+{
+	/* delay for some accesses to PIC on motherboard or in chipset must be
+	   at least one microsecond, but be safe here. */
+	outb(value, port);
+	udelay(2);
+}
+
 void init_8259A(int auto_eoi)
 {
 	unsigned long flags;
Index: linux-2.6/arch/x86/kernel/i8259_64.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/i8259_64.c
+++ linux-2.6/arch/x86/kernel/i8259_64.c
@@ -347,6 +347,23 @@ static int __init i8259A_init_sysfs(void
 
 device_initcall(i8259A_init_sysfs);
 
+unsigned char inb_pic(unsigned int port)
+{
+	/* delay for some accesses to PIC on motherboard or in chipset must be
+	   at least one microsecond, but be safe here. */
+	unsigned char value = inb(port);
+	udelay(2);
+	return value;
+}
+
+void outb_pic(unsigned char value, unsigned int port)
+{
+	/* delay for some accesses to PIC on motherboard or in chipset must be
+	   at least one microsecond, but be safe here. */
+	outb(value, port);
+	udelay(2);
+}
+
 void init_8259A(int auto_eoi)
 {
 	unsigned long flags;
Index: linux-2.6/include/asm-x86/i8259.h
===================================================================
--- linux-2.6.orig/include/asm-x86/i8259.h
+++ linux-2.6/include/asm-x86/i8259.h
@@ -28,8 +28,8 @@ extern void init_8259A(int auto_eoi);
 extern void enable_8259A_irq(unsigned int irq);
 extern void disable_8259A_irq(unsigned int irq);
 extern unsigned int startup_8259A_irq(unsigned int irq);
-
-#define inb_pic		inb_p
-#define outb_pic	outb_p
+/* the PIC may need a careful delay on some platforms, hence specific calls */
+extern unsigned char inb_pic(unsigned int port);
+extern void outb_pic(unsigned char value, unsigned int port);
 
 #endif	/* __ASM_I8259_H__ */

--