Re: [BUG] via c3/2.6.20 -- ps/2 keyboard doesn't work with console

["Dmitry Torokhov" <dmitry.torokhov@gmail.com>]

On 6/12/07, Paul Albrecht <albrecht@rdi1.com> wrote:
> On Tue, 2007-06-12 at 01:14 -0400, Dmitry Torokhov wrote:
> > On Monday 11 June 2007 14:54, Paul Albrecht wrote:
> > >
> > > Is i8042.noaux a workaround or a fix?
> > >
> >
> > Just a workaround. Do you have a PS/2 mouse you could test with? If so could
> > you check if both keybioard and mouse work with mouse plugged in and without
> > i8042.noaux.
> >
>
> The system I'm using has only one ps/2 interface so I can't test with
> them both plugged in at the same time.
>
> > Also cxould you please try the patch below (again with mouse if you have one
> > and without).
> >
>
> I tried applying your patch to 2.6.21.5 and it failed. Here's the
> output:
>
> patch --dry-run -p1 < ../i8042.patch
> patching file drivers/input/serio/i8042-x86ia64io.h
> Hunk #1 FAILED at 356.
> Hunk #2 FAILED at 404.
> 2 out of 2 hunks FAILED -- saving rejects to file
> drivers/input/serio/i8042-x86ia64io.h.rej

Hmm, wierd:

[~] tar jxf downloads/linux-2.6.21.5.tar.bz2
[~] cd linux-2.6.21.5/
[~/linux-2.6.21.5] patch -p1 --dry-run < ../quilt/i8042-trust-pnp-more.patch
patching file drivers/input/serio/i8042-x86ia64io.h
Hunk #1 succeeded at 313 (offset -43 lines).
Hunk #2 succeeded at 361 (offset -43 lines).
[~/linux-2.6.21.5]

The patch must have gotten corrupted on the way to you. Let me try
resending it, but this time as an attachment.

--
Dmitry

Input: i8042 - give more trust PNP data on i386

On some boxes that don't have PS/2 mice connected at startup BIOS
completely disables AUX port and attempts to access it result in
hosed keyboard. Historically we do not trust ACPI/PNP data on
i386 and try to poke AUX port even if we did not find an active
PNP node for it. However in cases when BIOS writers got KBD port
properly described we can assume that they did the right thing
for AUX port as well.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---
 drivers/input/serio/i8042-x86ia64io.h |   36 +++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

Index: linux/drivers/input/serio/i8042-x86ia64io.h
===================================================================
--- linux.orig/drivers/input/serio/i8042-x86ia64io.h
+++ linux/drivers/input/serio/i8042-x86ia64io.h
@@ -356,6 +356,7 @@ static void i8042_pnp_exit(void)
 static int __init i8042_pnp_init(void)
 {
 	char kbd_irq_str[4] = { 0 }, aux_irq_str[4] = { 0 };
+	int pnp_data_busted = 0;
 	int err;
 
 	if (i8042_nopnp) {
@@ -403,27 +404,48 @@ static int __init i8042_pnp_init(void)
 #endif
 
 	if (((i8042_pnp_data_reg & ~0xf) == (i8042_data_reg & ~0xf) &&
-	      i8042_pnp_data_reg != i8042_data_reg) || !i8042_pnp_data_reg) {
-		printk(KERN_WARNING "PNP: PS/2 controller has invalid data port %#x; using default %#x\n",
+	      i8042_pnp_data_reg != i8042_data_reg) ||
+	    !i8042_pnp_data_reg) {
+		printk(KERN_WARNING
+			"PNP: PS/2 controller has invalid data port %#x; "
+			"using default %#x\n",
 			i8042_pnp_data_reg, i8042_data_reg);
 		i8042_pnp_data_reg = i8042_data_reg;
+		pnp_data_busted = 1;
 	}
 
 	if (((i8042_pnp_command_reg & ~0xf) == (i8042_command_reg & ~0xf) &&
-	      i8042_pnp_command_reg != i8042_command_reg) || !i8042_pnp_command_reg) {
-		printk(KERN_WARNING "PNP: PS/2 controller has invalid command port %#x; using default %#x\n",
+	      i8042_pnp_command_reg != i8042_command_reg) ||
+	    !i8042_pnp_command_reg) {
+		printk(KERN_WARNING
+			"PNP: PS/2 controller has invalid command port %#x; "
+			"using default %#x\n",
 			i8042_pnp_command_reg, i8042_command_reg);
 		i8042_pnp_command_reg = i8042_command_reg;
+		pnp_data_busted = 1;
 	}
 
 	if (!i8042_nokbd && !i8042_pnp_kbd_irq) {
-		printk(KERN_WARNING "PNP: PS/2 controller doesn't have KBD irq; using default %d\n", i8042_kbd_irq);
+		printk(KERN_WARNING
+			"PNP: PS/2 controller doesn't have KBD irq; "
+			"using default %d\n", i8042_kbd_irq);
 		i8042_pnp_kbd_irq = i8042_kbd_irq;
+		pnp_data_busted = 1;
 	}
 
 	if (!i8042_noaux && !i8042_pnp_aux_irq) {
-		printk(KERN_WARNING "PNP: PS/2 controller doesn't have AUX irq; using default %d\n", i8042_aux_irq);
-		i8042_pnp_aux_irq = i8042_aux_irq;
+		if (!pnp_data_busted && i8042_pnp_kbd_irq) {
+			printk(KERN_WARNING
+				"PNP: PS/2 appears to have AUX port disabled, "
+				"if this is incorrect please boot with "
+				"i8042.nopnp\n");
+			i8042_noaux = 1;
+		} else {
+			printk(KERN_WARNING
+				"PNP: PS/2 controller doesn't have AUX irq; "
+				"using default %d\n", i8042_aux_irq);
+			i8042_pnp_aux_irq = i8042_aux_irq;
+		}
 	}
 
 	i8042_data_reg = i8042_pnp_data_reg;