Re: Keyboard Jammed error patch 2.4.35-pre4

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: David W Studeman
Date: Wednesday, July 30, 2008 - 3:39 am

Willy Tarreau wrote:
  It didn't change the behaviour because it would not apply cleanly, 
kernel compilation stopped there.

A raq/qube3, raq4, raq550, and xtr are all x86 based but they do not use 
a typical bios and a bootloader to start the boot process but that part 
is not important here. When I made the regression patch, I simply diffed 
the dmi scan and keyboard drivers between the two kernels. The stock 
2.4.36.6 kernel cannot be compiled for x86 with no keyboard and vt 
support and I need no dummy driver even though it would not compile by 
choosing the dummy driver by itself either. Regression patching to 
2.4.34 restored the ability to compile without keyboard and vt support. 
This is what it took:

Dave

--- linux-2.4.36/arch/i386/kernel/dmi_scan.c.orig    2008-01-01 
12:06:40.000000000 +0000
+++ linux-2.4.36/arch/i386/kernel/dmi_scan.c    2008-07-16 
03:36:01.000000000 +0000
@@ -524,21 +524,6 @@
   */


-/*      IBM bladeservers have a USB console switch. The keyboard type 
is USB
- *      and the hardware does not have a console keyboard. We disable the
- *      console keyboard so the kernel does not try to initialize one and
- *      spew errors. This can be used for all systems without a console
- *      keyboard like systems with just a USB or IrDA keyboard.
- */
-static __init int disable_console_keyboard(struct dmi_blacklist *d)
-{
-        extern int keyboard_controller_present;
-        printk(KERN_INFO "*** Hardware has no console keyboard 
controller.\n");
-        printk(KERN_INFO "*** Disabling console keyboard.\n");
-        keyboard_controller_present = 0;
-        return 0;
-}
-
  /*
   *    This will be expanded over time to force things like the APM
   *    interrupt mask settings according to the laptop
@@ -825,15 +810,6 @@
              MATCH(DMI_SYS_VENDOR, "IBM"),
              NO_MATCH, NO_MATCH, NO_MATCH
              } },
- /*
-         *      IBM Bladeservers
-         */
-
-        { disable_console_keyboard, "IBM Server Blade", {
-                        MATCH(DMI_SYS_VENDOR,"IBM"),
-                        MATCH(DMI_BOARD_NAME, "Server Blade"),
-                        NO_MATCH, NO_MATCH
-                        } },

  #ifdef    CONFIG_ACPI_BOOT
      /*

--- linux-2.4.36/drivers/char/pc_keyb.c.orig    2008-01-01 
12:06:40.000000000 +0000
+++ linux-2.4.36/drivers/char/pc_keyb.c    2008-07-16 03:37:26.000000000 
+0000
@@ -61,14 +61,6 @@
      "\r\000/";                    /* 0x60 - 0x6f */
  #endif

-int keyboard_controller_present __initdata = 1;
-static int __init removable_keyb(char *str)
-{
-        keyboard_controller_present = 0;
-        return 0;
-}
-__setup("nokeyb", removable_keyb);
-
  static void kbd_write_command_w(int data);
  static void kbd_write_output_w(int data);
  #ifdef CONFIG_PSMOUSE
@@ -77,8 +69,9 @@
  static int aux_reconnect = 0;
  #endif

-#define kbd_controller_present() keyboard_controller_present
-
+#ifndef kbd_controller_present
+#define kbd_controller_present()    1
+#endif
  static spinlock_t kbd_controller_lock = SPIN_LOCK_UNLOCKED;
  static unsigned char handle_kbd_event(void);

@@ -905,7 +898,7 @@

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


--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Keyboard Jammed error patch 2.4.35-pre4, David W Studeman, (Sun Jul 27, 11:59 pm)
Re: Keyboard Jammed error patch 2.4.35-pre4, Willy Tarreau, (Mon Jul 28, 10:15 pm)
Re: Keyboard Jammed error patch 2.4.35-pre4, David W Studeman, (Wed Jul 30, 12:22 am)
Re: Keyboard Jammed error patch 2.4.35-pre4, Willy Tarreau, (Wed Jul 30, 12:51 am)
Re: Keyboard Jammed error patch 2.4.35-pre4, David W Studeman, (Wed Jul 30, 3:39 am)
Re: Keyboard Jammed error patch 2.4.35-pre4, Willy Tarreau, (Wed Jul 30, 5:38 am)