Regression?: keyboard state/LED inconsistency in 2.6.32-rc1/2,3,4

Marin Mitov
2009-10-12T08:21:43Z

Hello,

I'm testing 2.6.32-rc1/2,3,4 and I'm using 2.6.31.3.
There is a difference in keyboard/LED behavior.
If in BIOS NumLock is set on, when the kernel starts
it puts NumLock off and the LED state is off in 2.6.31.3
(which is consistent), but in 2.6.32-rc1/2,3,4 the LED
stays on (and this is not consistent with keyboard's state).

Comparing drivers/input/keyboard/atkbd.c (I'm using it)
in 2.6.31.3 and 2.6.32-rc1/2,3,4 among others changes I
found the following lines (see the patch bellow) deleted,
so I propose either to add them again (this will restore
keyboard/LED consistency) or revert the patch that has
deleted them.

The better solution will be if the kernel preserves the state
of the keyboard as set by BIOS.

Best regards.

Marin Mitov

P.S. The lines in the patch concerning "repeat rate" are
not related with the "keyboard state/LED inconsistency",
but have been also deleted (by mistake/intentionally) too.
Could be dropped if necessary.

Marin Mitov

Signed-off-by: Marin Mitov <mitov@issp.bas.bg>

======================================================
--- a/drivers/input/keyboard/atkbd.c 2009-10-11 20:15:27.000000000 +0300
+++ b/drivers/input/keyboard/atkbd.c 2009-10-11 20:17:34.000000000 +0300
@@ -773,6 +773,23 @@
static int atkbd_activate(struct atkbd *atkbd)
{
struct ps2dev *ps2dev = &atkbd->ps2dev;
+ unsigned char param[1];
+
+/*
+ * Set the LEDs to a defined state.
+ */
+
+ param[0] = 0;
+ if (ps2_command(ps2dev, param, ATKBD_CMD_SETLEDS))
+ return -1;
+
+/*
+ * Set autorepeat to fastest possible.
+ */
+
+ param[0] = 0;
+ if (ps2_command(ps2dev, param, ATKBD_CMD_SETREP))
+ return -1;

/*
* Enable the keyboard to receive keystrokes.
@@ -1141,6 +1158,14 @@
return -1;

atkbd_activate(atkbd);
+
+/*
+ * Restore repeat rate and LEDs (that were reset by atkbd_activate)
+ * to pre-resume state
+ */
+ if (!atkbd->softrepeat)
+ atkbd_set_repeat_rate(atkbd);
+ atkbd_set_leds(atkbd);
}

atkbd_enable(atkbd);