Re: Keyboard Jammed error patch 2.4.35-pre4

[David W Studeman]

Willy Tarreau wrote:
> Hello David,
>
> On Sun, Jul 27, 2008 at 11:59:47PM -0700, David W Studeman wrote:
>    
> >   Hello! The changes that were made on 04-25-2007 as "[PATCH
> > 2.4.35-pre4] fix 'pc_keyb: controller jammed (0xA7)' error" have broken
> > the ability to compile with no keyboard and no VT support. This mainly
> > affects Cobalt machines which do not have dmi present as these use a
> > flashrom to boot with and not a typical bios so dmi blacklisting would
> > be pointless unless it allowed for no dmi present and then blacklist. I
> > had to create a patch against 2.4.34 to restore the ability to compile
> > with no keyboard and VT support.
> >      
>
> Grrr... I see what's happening. I remember having checked that the
> kbd_controller_present macro was really not used before merging the
> patch, but obviously I had not looked deep enough. It's defined by
> ia64, mips and mips64 in include/asm.
>
> Could you please test the patch below (untested here). It should revert
> to pre-2.4.35 behaviour on all architectures cited above. If you confirm
> that it works, I'll merge it.
>
> BTW, in the mean time, you can boot with the "nokeyb" option. It will
> disable the keyboard. This is what I use on some non-blacklisted systems,
> and the option was precisely provided by this patch.
>
>    
No I can't use the nokeybd option as a Cobalt uses no bootloader on the 
mbr. The arguments would have to be embedded into the flashrom image and 
it isn't something most people want to deal with.
> Also, if you don't have any PC keyboard on your machines, you can
> build without support for any VT/keyboard. I'm already doing this
> on some embedded systems, and it works fine. If your platform still
> requires that some keyboard is enabled, you may want to try to enable
> CONFIG_DUMMY_KEYB which I've been using in the past.
>    
That didn't work either, what did save me was patching back to 2.4.34 
for the dmi and keyboard headers and compiling without any keyboard 
support at all. Also, since this is essentially a PC without a normal 
bios, the kernel reports that there is no dmi present. The boot method 
here reminds me of EFI but it isn't.
> Regards,
> Willy
>
>  From e4827f141dc86c540971082877124b213557ece0 Mon Sep 17 00:00:00 2001
> From: Willy Tarreau<w@xxxxxx>
> Date: Tue, 29 Jul 2008 07:06:00 +0200
> Subject: pc_keyb: fix breakage on ia64/mips/mips64
>
> Commit f8db8c9c81afb4b04c146cae0e2a1fd311de1f22 fixed the keyboard
> controller jammed issue on keyboard-less PCs, but introduced the
> problem for other architectures (ia64/mips/mips64) which already
> define their own keyboard probing method.
>
> This patch gives precedence to these archs' probing method and only
> defines the setup option if no arch-specific method was defined.
>
> Problem reported by David W Studeman.
>
> Signed-off-by: Willy Tarreau<w@xxxxxx>
> ---
>   drivers/char/pc_keyb.c |    9 ++++++---
>   1 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/char/pc_keyb.c b/drivers/char/pc_keyb.c
> index d4e1611..b90e659 100644
> --- a/drivers/char/pc_keyb.c
> +++ b/drivers/char/pc_keyb.c
> @@ -61,6 +61,10 @@ unsigned char pckbd_sysrq_xlate[128] =
>      "\r\000/";                  /* 0x60 - 0x6f */
>   #endif
>
> +/* Warning: do not redefine kbd_controller_present on ia64, mips and mips64 */
> +#ifndef kbd_controller_present
> +#define kbd_controller_present() keyboard_controller_present
> +
>   int keyboard_controller_present __initdata = 1;
>   static int __init removable_keyb(char *str)
>   {
> @@ -68,6 +72,7 @@ static int __init removable_keyb(char *str)
>           return 0;
>   }
>   __setup("nokeyb", removable_keyb);
> +#endif
>
>   static void kbd_write_command_w(int data);
>   static void kbd_write_output_w(int data);
> @@ -77,8 +82,6 @@ static void __aux_write_ack(int val);
>   static int aux_reconnect = 0;
>   #endif
>
> -#define kbd_controller_present() keyboard_controller_present
> -
>   static spinlock_t kbd_controller_lock = SPIN_LOCK_UNLOCKED;
>   static unsigned char handle_kbd_event(void);
>
> @@ -905,7 +908,7 @@ static char * __init initialize_kbd(void)
>
>   void __init pckbd_init_hw(void)
>   {
> -   if (!keyboard_controller_present) {
> +   if (!kbd_controller_present()) {
>          kbd_exists = 0;
>          return;
>      }
>    
The last hunk at 905 fails to apply, line 61 passes due to some fuzz 
factor although I can't see what is different and why it needs to fuzz 
but line 61 still passes. Here is a snip from the log:

patching file drivers/char/pc_keyb.c
Hunk #1 succeeded at 61 with fuzz 1.
Hunk #4 FAILED at 908.
1 out of 4 hunks FAILED -- saving rejects to file drivers/char/pc_keyb.c.rej
make: *** [/usr/src/log/linux-2.4.36.6] Error 1

And here is the pc_keyb.c.rej:

***************
*** 905,911 ****

  void __init pckbd_init_hw(void)
  {
-    if (!keyboard_controller_present) {
         kbd_exists = 0;
         return;
     }
--- 908,914 ----

  void __init pckbd_init_hw(void)
  {
+    if (!kbd_controller_present()) {
         kbd_exists = 0;
         return;
     }


Dave



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/