| Message ID | 20090814071438.6C860526EC9@mailhub.coreip.homeip.net (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Thu, 13 Aug 2009, Dmitry Torokhov wrote: > It seems that many laptops do not fully implement AUX LOOP command > in their keyboard controllers, causing issues with touchpad detection. > Hovewer we know that almost every laptop/portable uses PS/2 pointing > device and even if user disables it in favor of external mouse the > system will not use IRQ 12 for anything else. Therefore we may bypass > AUX IRQ delivery test when running on a laptop and assume that it is > routed properly. > > Just to be safe we require the box to have good PNP data in order to > bypass the test. > > Signed-off-by: Dmitry Torokhov <dtor@mail.ru> > --- > > drivers/input/serio/i8042-x86ia64io.h | 34 +++++++++++++++++++++++++++++++++ > drivers/input/serio/i8042.c | 4 +++- > 2 files changed, 37 insertions(+), 1 deletions(-) > > > diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h > index ae04d8a..6747b9d 100644 > --- a/drivers/input/serio/i8042-x86ia64io.h > +++ b/drivers/input/serio/i8042-x86ia64io.h > @@ -449,6 +449,34 @@ static struct dmi_system_id __initdata i8042_dmi_nopnp_table[] = { > }, > { } > }; > + > +static struct dmi_system_id __initdata i8042_dmi_laptop_table[] = { > + { > + .ident = "Portable", > + .matches = { > + DMI_MATCH(DMI_CHASSIS_TYPE, "8"), /* Portable */ > + }, > + }, > + { > + .ident = "Laptop", > + .matches = { > + DMI_MATCH(DMI_CHASSIS_TYPE, "9"), /* Laptop */ > + }, > + }, > + { > + .ident = "Notebook", > + .matches = { > + DMI_MATCH(DMI_CHASSIS_TYPE, "10"), /* Notebook */ > + }, > + }, > + { > + .ident = "Sub-Notebook", > + .matches = { > + DMI_MATCH(DMI_CHASSIS_TYPE, "14"), /* Sub-Notebook */ > + }, > + }, > + > +}; > #endif > > /* > @@ -727,6 +755,12 @@ static int __init i8042_pnp_init(void) > i8042_kbd_irq = i8042_pnp_kbd_irq; > i8042_aux_irq = i8042_pnp_aux_irq; > > +#ifdef CONFIG_X86 > + i8042_bypass_aux_irq_test = !i8042_noaux && > + !pnp_data_busted && > + dmi_check_system(i8042_dmi_laptop_table); > +#endif > + > return 0; > } > > diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c > index 9f5c050..b53a015 100644 > --- a/drivers/input/serio/i8042.c > +++ b/drivers/input/serio/i8042.c > @@ -83,6 +83,8 @@ module_param_named(debug, i8042_debug, bool, 0600); > MODULE_PARM_DESC(debug, "Turn i8042 debugging mode on and off"); > #endif > > +static bool i8042_bypass_aux_irq_test; > + > #include "i8042.h" > > static DEFINE_SPINLOCK(i8042_lock); > @@ -641,7 +643,7 @@ static int __devinit i8042_check_aux(void) > * used it for a PCI card or somethig else. > */ > > - if (i8042_noloop || aux_loop_broken) { > + if (i8042_noloop || i8042_bypass_aux_irq_test || aux_loop_broken) { I guess some entries could then be nuked from i8042_dmi_noloop_table[]?
On Tue, Aug 18, 2009 at 03:16:29PM +0200, Jiri Kosina wrote: > On Thu, 13 Aug 2009, Dmitry Torokhov wrote: > > > @@ -641,7 +643,7 @@ static int __devinit i8042_check_aux(void) > > * used it for a PCI card or somethig else. > > */ > > > > - if (i8042_noloop || aux_loop_broken) { > > + if (i8042_noloop || i8042_bypass_aux_irq_test || aux_loop_broken) { > > I guess some entries could then be nuked from i8042_dmi_noloop_table[]? > I will have to try and locate the dmidecode outputs in mu inbox - some of them might not have the proper chassis type set up.
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index ae04d8a..6747b9d 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h @@ -449,6 +449,34 @@ static struct dmi_system_id __initdata i8042_dmi_nopnp_table[] = { }, { } }; + +static struct dmi_system_id __initdata i8042_dmi_laptop_table[] = { + { + .ident = "Portable", + .matches = { + DMI_MATCH(DMI_CHASSIS_TYPE, "8"), /* Portable */ + }, + }, + { + .ident = "Laptop", + .matches = { + DMI_MATCH(DMI_CHASSIS_TYPE, "9"), /* Laptop */ + }, + }, + { + .ident = "Notebook", + .matches = { + DMI_MATCH(DMI_CHASSIS_TYPE, "10"), /* Notebook */ + }, + }, + { + .ident = "Sub-Notebook", + .matches = { + DMI_MATCH(DMI_CHASSIS_TYPE, "14"), /* Sub-Notebook */ + }, + }, + +}; #endif /* @@ -727,6 +755,12 @@ static int __init i8042_pnp_init(void) i8042_kbd_irq = i8042_pnp_kbd_irq; i8042_aux_irq = i8042_pnp_aux_irq; +#ifdef CONFIG_X86 + i8042_bypass_aux_irq_test = !i8042_noaux && + !pnp_data_busted && + dmi_check_system(i8042_dmi_laptop_table); +#endif + return 0; } diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index 9f5c050..b53a015 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c @@ -83,6 +83,8 @@ module_param_named(debug, i8042_debug, bool, 0600); MODULE_PARM_DESC(debug, "Turn i8042 debugging mode on and off"); #endif +static bool i8042_bypass_aux_irq_test; + #include "i8042.h" static DEFINE_SPINLOCK(i8042_lock); @@ -641,7 +643,7 @@ static int __devinit i8042_check_aux(void) * used it for a PCI card or somethig else. */ - if (i8042_noloop || aux_loop_broken) { + if (i8042_noloop || i8042_bypass_aux_irq_test || aux_loop_broken) { /* * Without LOOP command we can't test AUX IRQ delivery. Assume the port * is working and hope we are right.
It seems that many laptops do not fully implement AUX LOOP command in their keyboard controllers, causing issues with touchpad detection. Hovewer we know that almost every laptop/portable uses PS/2 pointing device and even if user disables it in favor of external mouse the system will not use IRQ 12 for anything else. Therefore we may bypass AUX IRQ delivery test when running on a laptop and assume that it is routed properly. Just to be safe we require the box to have good PNP data in order to bypass the test. Signed-off-by: Dmitry Torokhov <dtor@mail.ru> --- drivers/input/serio/i8042-x86ia64io.h | 34 +++++++++++++++++++++++++++++++++ drivers/input/serio/i8042.c | 4 +++- 2 files changed, 37 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html