Input: resume support for i8042 (atkbd & psmouse)
A message that is not in the archive (sent off-list or not yet received): [email protected]
Thus wrote Dmitry Torokhov:
Quoted 6 lines
Here is an attempt to implement resume for i8042 using
serio_reconnectfacility that can be found in -mm kernels. It also depends on bunch of other changes in input subsystem all of which can be found here:
http://www.geocities.com/dt_or/inputThey should apply cleanly to -test11.
Your patches seem to work fine for my keyboard -- it reconnects and works smoothly (the interrupts are fine). My Synaptics touchpad is however not present after resume -- no response and no mention of i8042 in /proc/interrupts after S3 resume. I attach a dmesg excerpt in hope that helps you in any way. Thanks for the good work!
Signature · 27 lines
Karol 'sziwan' Kozimor [email protected] [...] mice: PS/2 mouse device common for all mice i8042.c: Detected active multiplexing controller, rev 1.1. serio: i8042 AUX0 port at 0x60,0x64 irq 12 serio: i8042 AUX1 port at 0x60,0x64 irq 12 serio: i8042 AUX2 port at 0x60,0x64 irq 12 serio: i8042 AUX3 port at 0x60,0x64 irq 12 Synaptics Touchpad, model: 1 Firmware: 4.6 180 degree mounted touchpad Sensor: 18 new absolute packet format Touchpad has extended capability bits -> four buttons -> multifinger detection -> palm detection input: SynPS/2 Synaptics TouchPad on isa0060/serio4 serio: i8042 KBD port at 0x60,0x64 irq 1 input: AT Translated Set 2 keyboard on isa0060/serio0 [...] hwsleep-0257 [28] acpi_enter_sleep_state: Entering sleep state [S3] [...] Restarting tasks...<6>input: AT Translated Set 2 keyboard on isa0060/serio0 (reconnected) done
Quoted 6 lines · Karol Kozimor
Thus wrote Dmitry Torokhov:
Quoted 5 lines
Here is an attempt to implement resume for i8042 using
serio_reconnectfacility that can be found in -mm kernels. It also depends on bunch of other changes in input subsystem all of which can be found here: http://www.geocities.com/dt_or/input
Quoted 7 lines
Quoted 1 line
They should apply cleanly to -test11.
Your patches seem to work fine for my keyboard -- it reconnects and works smoothly (the interrupts are fine). My Synaptics touchpad is however not present after resume -- no response and no mention of i8042 in
/proc/interruptsafter S3 resume. I attach a dmesg excerpt in hope that helps you in any way. Thanks for the good work!
Karol,
I realized that I was not switching from the Legacy to Multiplexed mode and that could (or even should I might say) cause dead mouse. I have passive multiplexor so the old code worked for me.
Could you please try this patch (on top of everything else). It complies but I have not booted with it.
Thank you,
Dmitry
===== drivers/input/serio/i8042.c 1.35 vs edited =====
drivers/input/serio/i8042.c +85 -50
@@ -60,6 +60,7 @@static unsigned char i8042_initial_ctr;static unsigned char i8042_ctr;static unsigned char i8042_mux_open; +static unsigned char i8042_mux_present;struct timer_list i8042_timer;static int i8042_sysdev_initialized;
@@ -565,58 +566,16 @@ } -/* -* Here we try to reset everything back to a state in which suspended -*/ - -static int i8042_controller_resume (struct sys_device *dev) -{ -int i; - -if (i8042_controller_init ()) { -printk (KERN_ERR "i8042: resume failed\n" ); -return -1 ; - }/* -* Reconnect anything that was connected to the ports. +* i8042_enable_mux_mode checks whether the controller has an active +* multiplexor and puts the chip into Multiplexed (as opposed to +* Legacy) mode. */ - -if (i8042_kbd_values.exists &&i8042_activate_port (&i8042_kbd_port) ==0 ) -serio_reconnect (&i8042_kbd_port); - -if (i8042_aux_values.exists &&i8042_activate_port (&i8042_aux_port) ==0 ) -serio_reconnect (&i8042_aux_port); - -for (i =0 ; i <4 ; i++) -if (i8042_mux_values[i].exists &&i8042_activate_port (i8042_mux_port + i) ==0 ) -serio_reconnect (i8042_mux_port + i); - -return 0 ; -} - - -/* -* i8042_check_mux() checks whether the controller supports the PS/2 Active -* Multiplexing specification by Synaptics, Phoenix, Insyde and -* LCS/Telegraphics. -*/ - -static int __init i8042_check_mux (struct i8042_values *values) +static int i8042_enable_mux_mode (struct i8042_values *values) { -unsigned char param; -static int i8042_check_mux_cookie; -int i; - -/* -* Check if AUX irq is available. -*/ - -if (request_irq (values->irq, i8042_interrupt,SA_SHIRQ , -"i8042" , &i8042_check_mux_cookie)) -return -1 ; -free_irq (values->irq, &i8042_check_mux_cookie); +unsigned char param;/* * Get rid of bytes in the queue. */
@@ -639,9 +598,14 @@if (i8042_command (¶m,I8042_CMD_AUX_LOOP ) || param ==0x5b )return -1 ; -printk (KERN_INFO "i8042.c: Detected active multiplexing controller, rev %d.%d.\n" , - (~param >>4 ) &0xf , ~param &0xf ); +return ~param; +} + +static int i8042_activate_mux (struct i8042_values *values) +{ +unsigned char param; +int i;/* * Disable all muxed ports by disabling AUX. */
@@ -649,8 +613,10 @@ i8042_ctr |=I8042_CTR_AUXDIS ; i8042_ctr &= ~I8042_CTR_AUXINT ; -if (i8042_command (&i8042_ctr,I8042_CMD_CTL_WCTR )) +if (i8042_command (&i8042_ctr,I8042_CMD_CTL_WCTR )) { +printk (KERN_ERR "i8042.c: Failed to disable AUX port, can't use MUX.\n" );return -1 ; + }/* * Enable all muxed ports.
@@ -664,6 +630,40 @@return 0 ; } + +/* +* i8042_check_mux() checks whether the controller supports the PS/2 Active +* Multiplexing specification by Synaptics, Phoenix, Insyde and +* LCS/Telegraphics. +*/ + +static int __init i8042_check_mux (struct i8042_values *values) +{ +static int i8042_check_mux_cookie; +int mux_version; + +/* +* Check if AUX irq is available. +*/ +if (request_irq (values->irq, i8042_interrupt,SA_SHIRQ , +"i8042" , &i8042_check_mux_cookie)) +return -1 ; +free_irq (values->irq, &i8042_check_mux_cookie); + +if ((mux_version =i8042_enable_mux_mode (values)) <0 ) +return 0 ; + +printk (KERN_INFO "i8042.c: Detected active multiplexing controller, rev %d.%d.\n" , + (mux_version >>4 ) &0xf , mux_version &0xf ); + +if (i8042_activate_mux (values)) +return -1 ; + + i8042_mux_present =1 ; +return 0 ; +} + +/* * i8042_check_aux() applies as much paranoia as it can at detecting * the presence of an AUX interface.
@@ -846,6 +846,41 @@ values->name = i8042_mux_short[index]; values->mux = index; } + +/* +* Here we try to reset everything back to a state in which suspended +*/ +static int i8042_controller_resume (struct sys_device *dev) +{ +int i; + +if (i8042_controller_init ()) { +printk (KERN_ERR "i8042: resume failed\n" ); +return -1 ; + } + +if (i8042_mux_present && + (i8042_enable_mux_mode (&i8042_aux_values) <0 ||i8042_activate_mux (&i8042_aux_values))) { +printk (KERN_WARNING "i8042: failed to resume active multiplexor, mouse won't wotk.\n" ); + } + +/* +* Reconnect anything that was connected to the ports. +*/ + +if (i8042_kbd_values.exists &&i8042_activate_port (&i8042_kbd_port) ==0 ) +serio_reconnect (&i8042_kbd_port); + +if (i8042_aux_values.exists &&i8042_activate_port (&i8042_aux_port) ==0 ) +serio_reconnect (&i8042_aux_port); + +for (i =0 ; i <4 ; i++) +if (i8042_mux_values[i].exists &&i8042_activate_port (i8042_mux_port + i) ==0 ) +serio_reconnect (i8042_mux_port + i); + +return 0 ; +} +static struct sysdev_class kbc_sysclass = {set_kset_name ("i8042" ),