2003-06-02 00:17:38

by Peter Chubb

Subject: Fix PS/2 keyboard and mouse on I2000

Hi,
The appended fix is needed on I2000 machines, to map the
legacy ISA interrupt onto the actual interrupt provided. Otherwise
the mouse and keyboard won't work. Patch against 2.5.70.


# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.1101 -> 1.1102
# drivers/input/serio/i8042-io.h 1.4 -> 1.5
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/05/27 [email protected] 1.1102
# IA64: Fix I2000 no keyboard interrupt problem.
# --------------------------------------------
#
diff -Nru a/drivers/input/serio/i8042-io.h b/drivers/input/serio/i8042-io.h
--- a/drivers/input/serio/i8042-io.h Tue May 27 14:07:29 2003
+++ b/drivers/input/serio/i8042-io.h Tue May 27 14:07:29 2003
@@ -20,11 +20,14 @@
*/

#ifdef __alpha__
-#define I8042_KBD_IRQ 1
-#define I8042_AUX_IRQ (RTC_PORT(0) == 0x170 ? 9 : 12) /* Jensen is special */
+# define I8042_KBD_IRQ 1
+# define I8042_AUX_IRQ (RTC_PORT(0) == 0x170 ? 9 : 12) /* Jensen is special */
+#elif defined(__ia64__)
+# define I8042_KBD_IRQ isa_irq_to_vector(1)
+# define I8042_AUX_IRQ isa_irq_to_vector(12)
#else
-#define I8042_KBD_IRQ 1
-#define I8042_AUX_IRQ 12
+# define I8042_KBD_IRQ 1
+# define I8042_AUX_IRQ 12
#endif

/*

2003-06-09 12:40:36

by Vojtech Pavlik

Subject: Re: Fix PS/2 keyboard and mouse on I2000

On Mon, Jun 02, 2003 at 10:30:35AM +1000, Peter Chubb wrote:
>
> Hi,
> The appended fix is needed on I2000 machines, to map the
> legacy ISA interrupt onto the actual interrupt provided. Otherwise
> the mouse and keyboard won't work. Patch against 2.5.70.

Thanks, applied.

> # This is a BitKeeper generated patch for the following project:
> # Project Name: Linux kernel tree
> # This patch format is intended for GNU patch command version 2.5 or higher.
> # This patch includes the following deltas:
> # ChangeSet 1.1101 -> 1.1102
> # drivers/input/serio/i8042-io.h 1.4 -> 1.5
> #
> # The following is the BitKeeper ChangeSet Log
> # --------------------------------------------
> # 03/05/27 [email protected] 1.1102
> # IA64: Fix I2000 no keyboard interrupt problem.
> # --------------------------------------------
> #
> diff -Nru a/drivers/input/serio/i8042-io.h b/drivers/input/serio/i8042-io.h
> --- a/drivers/input/serio/i8042-io.h Tue May 27 14:07:29 2003
> +++ b/drivers/input/serio/i8042-io.h Tue May 27 14:07:29 2003
> @@ -20,11 +20,14 @@
> */
>
> #ifdef __alpha__
> -#define I8042_KBD_IRQ 1
> -#define I8042_AUX_IRQ (RTC_PORT(0) == 0x170 ? 9 : 12) /* Jensen is special */
> +# define I8042_KBD_IRQ 1
> +# define I8042_AUX_IRQ (RTC_PORT(0) == 0x170 ? 9 : 12) /* Jensen is special */
> +#elif defined(__ia64__)
> +# define I8042_KBD_IRQ isa_irq_to_vector(1)
> +# define I8042_AUX_IRQ isa_irq_to_vector(12)
> #else
> -#define I8042_KBD_IRQ 1
> -#define I8042_AUX_IRQ 12
> +# define I8042_KBD_IRQ 1
> +# define I8042_AUX_IRQ 12
> #endif
>
> /*
>

--
Vojtech Pavlik
SuSE Labs, SuSE CR