Skip to content

Commit ad68652

Browse files
Ondrej ZaryH. Peter Anvin
authored andcommitted
x86, 8042: Enable A20 using KBC to fix S3 resume on some MSI laptops
Some MSI laptop BIOSes are broken - INT 15h code uses port 92h to enable A20 line but resume code assumes that KBC was used. The laptop will not resume from S3 otherwise but powers off after a while and then powers on again stuck with a blank screen. Fix it by enabling A20 using KBC in i8042_platform_init for x86. Fixes https://bugzilla.kernel.org/show_bug.cgi?id=12878 Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Rafael J. Wysocki <rjw@sisk.pl> Cc: <stable@vger.kernel.org> Link: http://lkml.kernel.org/r/201212112218.06551.linux@rainbow-software.org Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
1 parent 2959440 commit ad68652

1 file changed

Lines changed: 9 additions & 0 deletions

File tree

drivers/input/serio/i8042-x86ia64io.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -921,6 +921,7 @@ static int __init i8042_platform_init(void)
921921
int retval;
922922

923923
#ifdef CONFIG_X86
924+
u8 a20_on = 0xdf;
924925
/* Just return if pre-detection shows no i8042 controller exist */
925926
if (!x86_platform.i8042_detect())
926927
return -ENODEV;
@@ -960,6 +961,14 @@ static int __init i8042_platform_init(void)
960961

961962
if (dmi_check_system(i8042_dmi_dritek_table))
962963
i8042_dritek = true;
964+
965+
/*
966+
* A20 was already enabled during early kernel init. But some buggy
967+
* BIOSes (in MSI Laptops) require A20 to be enabled using 8042 to
968+
* resume from S3. So we do it here and hope that nothing breaks.
969+
*/
970+
i8042_command(&a20_on, 0x10d1);
971+
i8042_command(NULL, 0x00ff); /* Null command for SMM firmware */
963972
#endif /* CONFIG_X86 */
964973

965974
return retval;

0 commit comments

Comments
 (0)