diff mbox

input: i8042 - add Acer Aspire 5536 to the noloop list

Message ID 20090818055542.CB3F6526EA5@mailhub.coreip.homeip.net
State New, archived
Headers show

Commit Message

Dmitry Torokhov Aug. 18, 2009, 5:24 a.m. UTC
On Mon, Aug 17, 2009 at 03:03:22AM +0200, Eugeniy Meshcheryakov wrote:
> Without this patch it is not possible to reenable touchpad
> after disabling it using disable button.

Applied, thank you Eugeniy.

However for 2.6.32 I am looking for more generic solution,
could you please try the patch below (without yours applied)?

Thanks!

Comments

Eugeniy Meshcheryakov Aug. 18, 2009, 4:53 p.m. UTC | #1
Hello,

I tried your patch and it does not fix the problem. I still need to add
i8042.noloop=1 to the kernel command line to be able to reenable the
touchpad. Also at this laptop touchpad is detected correctly, it only
stops working after disabling and reenabling (also once or twice it
stopped working even without pressing the disable button, this can be
related).

17 серпня 2009 о 22:24 -0700 Dmitry Torokhov написав(-ла):
> On Mon, Aug 17, 2009 at 03:03:22AM +0200, Eugeniy Meshcheryakov wrote:
> > Without this patch it is not possible to reenable touchpad
> > after disabling it using disable button.
> 
> Applied, thank you Eugeniy.
> 
> However for 2.6.32 I am looking for more generic solution,
> could you please try the patch below (without yours applied)?
> 
> Thanks!
> 
> -- 
> Dmitry
> 
> Input: i8042 - bypass AUX IRQ delivery test on laptops
> 
> From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> 
> 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.
Jiri Kosina Aug. 19, 2009, 8:56 a.m. UTC | #2
On Tue, 18 Aug 2009, Eugeniy Meshcheryakov wrote:

> I tried your patch and it does not fix the problem. I still need to add
> i8042.noloop=1 to the kernel command line to be able to reenable the
> touchpad. 

What chasis type do you see in the 'dmidecode' output on the affected 
system?
Eugeniy Meshcheryakov Aug. 19, 2009, 11:51 a.m. UTC | #3
19 серпня 2009 о 10:56 +0200 Jiri Kosina написав(-ла):
> What chasis type do you see in the 'dmidecode' output on the affected 
> system?

Notebook

Regards,
Eugeniy Meshcheryakov
--
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
Dmitry Torokhov Aug. 21, 2009, 3:51 a.m. UTC | #4
On Wed, Aug 19, 2009 at 01:51:25PM +0200, Eugeniy Meshcheryakov wrote:
> 19 серпня 2009 о 10:56 +0200 Jiri Kosina написав(-ла):
> > What chasis type do you see in the 'dmidecode' output on the affected 
> > system?
> 
> Notebook
> 

I really need to see dmesg with i8042.debug to see what is going on. The
patch should only help with initial AUX discovery at startup; Eugeniy
however only has trouble re-enabling the touchpad with special button.
diff mbox

Patch

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.