8042: Enable A20 using KBC to fix S3 resume on some MSI laptops

PATCH In review Ondrej Zary 4 participants 5 messages Dec 11, 2012 – Dec 12, 2012

Subsystems (3)

Stable branch ACPI Input drivers

lore

Share & tools

lore

Ondrej Zary

author

2012-12-11 21:18 UTC #0 lore raw

PATCH v4 1/1 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 <[email protected]>

---
 drivers/input/serio/i8042-x86ia64io.h |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

drivers/input/serio/i8042-x86ia64io.h +9 -0

index d6cc77a..5f306f7 100644
@@ -921,6 +921,7 @@ static int __init i8042_platform_init(void)
 	int retval;
 
 #ifdef CONFIG_X86
+	u8 a20_on = 0xdf;
 	/* Just return if pre-detection shows no i8042 controller exist */
 	if (!x86_platform.i8042_detect())
 		return -ENODEV;

@@ -960,6 +961,14 @@ static int __init i8042_platform_init(void)
 
 	if (dmi_check_system(i8042_dmi_dritek_table))
 		i8042_dritek = true;
+
+	/*
+	 * A20 was already enabled during early kernel init. But some buggy
+	 * BIOSes (in MSI Laptops) require A20 to be enabled using 8042 to
+	 * resume from S3. So we do it here and hope that nothing breaks.
+	 */
+	i8042_command(&a20_on, 0x10d1);
+	i8042_command(NULL, 0x00ff);	/* Null command for SMM firmware */
 #endif /* CONFIG_X86 */
 
 	return retval;

Signature · 1 line

Ondrej Zary

H. Peter Anvin

2012-12-12 00:45 UTC #1 lore raw

Looks good to me. Alan/Rafael/Dmitry, OK for me to commit this?

-hpa

Quoted 42 lines · Ondrej Zary

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 <[email protected]>
---
 drivers/input/serio/i8042-x86ia64io.h |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
drivers/input/serio/i8042-x86ia64io.h +9 -0
index d6cc77a..5f306f7 100644
@@ -921,6 +921,7 @@ static int __init i8042_platform_init(void)
 	int retval;
 
 #ifdef CONFIG_X86
+	u8 a20_on = 0xdf;
 	/* Just return if pre-detection shows no i8042 controller exist */
 	if (!x86_platform.i8042_detect())
 		return -ENODEV;
@@ -960,6 +961,14 @@ static int __init i8042_platform_init(void)
 
 	if (dmi_check_system(i8042_dmi_dritek_table))
 		i8042_dritek = true;
+
+	/*
+	 * A20 was already enabled during early kernel init. But some buggy
+	 * BIOSes (in MSI Laptops) require A20 to be enabled using 8042 to
+	 * resume from S3. So we do it here and hope that nothing breaks.
+	 */
+	i8042_command(&a20_on, 0x10d1);
+	i8042_command(NULL, 0x00ff);	/* Null command for SMM firmware */
 #endif /* CONFIG_X86 */
 
 	return retval;

Rafael J. Wysocki

2012-12-12 13:30 UTC #2 lore raw

Quoted 1 line · H. Peter Anvin

Looks good to me. Alan/Rafael/Dmitry, OK for me to commit this?

No objections from me.

Thanks,
Rafael

Quoted 44 lines · Ondrej Zary

Quoted 42 lines
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 <[email protected]>
---
 drivers/input/serio/i8042-x86ia64io.h |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
drivers/input/serio/i8042-x86ia64io.h +9 -0
index d6cc77a..5f306f7 100644
@@ -921,6 +921,7 @@ static int __init i8042_platform_init(void)
 	int retval;
 
 #ifdef CONFIG_X86
+	u8 a20_on = 0xdf;
 	/* Just return if pre-detection shows no i8042 controller exist */
 	if (!x86_platform.i8042_detect())
 		return -ENODEV;
@@ -960,6 +961,14 @@ static int __init i8042_platform_init(void)
 
 	if (dmi_check_system(i8042_dmi_dritek_table))
 		i8042_dritek = true;
+
+	/*
+	 * A20 was already enabled during early kernel init. But some buggy
+	 * BIOSes (in MSI Laptops) require A20 to be enabled using 8042 to
+	 * resume from S3. So we do it here and hope that nothing breaks.
+	 */
+	i8042_command(&a20_on, 0x10d1);
+	i8042_command(NULL, 0x00ff);	/* Null command for SMM firmware */
 #endif /* CONFIG_X86 */
 
 	return retval;

Signature · 2 lines

I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

Dmitry Torokhov

maintainer

2012-12-12 18:48 UTC #3 lore raw

In reply to H. Peter Anvin

Quoted 1 line · H. Peter Anvin

Looks good to me. Alan/Rafael/Dmitry, OK for me to commit this?

Sure. I hope it won't affect other boxes, otherwise more DMI tables will be needed.

Thanks.

Quoted 47 lines

-hpa
Quoted 42 lines · Ondrej Zary
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 <[email protected]>
---
 drivers/input/serio/i8042-x86ia64io.h |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)
drivers/input/serio/i8042-x86ia64io.h +9 -0
index d6cc77a..5f306f7 100644
@@ -921,6 +921,7 @@ static int __init i8042_platform_init(void)
 	int retval;
 
 #ifdef CONFIG_X86
+	u8 a20_on = 0xdf;
 	/* Just return if pre-detection shows no i8042 controller exist */
 	if (!x86_platform.i8042_detect())
 		return -ENODEV;
@@ -960,6 +961,14 @@ static int __init i8042_platform_init(void)
 
 	if (dmi_check_system(i8042_dmi_dritek_table))
 		i8042_dritek = true;
+
+	/*
+	 * A20 was already enabled during early kernel init. But some buggy
+	 * BIOSes (in MSI Laptops) require A20 to be enabled using 8042 to
+	 * resume from S3. So we do it here and hope that nothing breaks.
+	 */
+	i8042_command(&a20_on, 0x10d1);
+	i8042_command(NULL, 0x00ff);	/* Null command for SMM firmware */
 #endif /* CONFIG_X86 */
 
 	return retval;

Signature · 1 line

Dmitry

tip-bot for Ondrej Zary

author

2012-12-12 21:52 UTC #4 lore raw

[tip:x86/urgent] x86, 8042: Enable A20 using KBC to fix S3 resume on some MSI laptops

In reply to Ondrej Zary

Commit-ID:  ad68652412276f68ad4fe3e1ecf5ee6880876783
Gitweb:     http://git.kernel.org/tip/ad68652412276f68ad4fe3e1ecf5ee6880876783
Author:     Ondrej Zary <[email protected]>
AuthorDate: Tue, 11 Dec 2012 22:18:05 +0100
Committer:  H. Peter Anvin <[email protected]>
CommitDate: Tue, 11 Dec 2012 14:55:16 -0800

x86, 8042: Enable A20 using KBC to fix S3 resume on some MSI laptops

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 <[email protected]>

Cc Dmitry Torokhov <[email protected]>

Cc Alan Cox <[email protected]>

Cc Rafael J. Wysocki <[email protected]>

Cc <[email protected]>

Link http://lkml.kernel.org/r/[email protected] open here

Signed-off-by H. Peter Anvin <[email protected]>

---
 drivers/input/serio/i8042-x86ia64io.h | 9 +++++++++
 1 file changed, 9 insertions(+)

drivers/input/serio/i8042-x86ia64io.h +9 -0

index d6cc77a..5f306f7 100644
@@ -921,6 +921,7 @@ static int __init i8042_platform_init(void)
 	int retval;
 
 #ifdef CONFIG_X86
+	u8 a20_on = 0xdf;
 	/* Just return if pre-detection shows no i8042 controller exist */
 	if (!x86_platform.i8042_detect())
 		return -ENODEV;

@@ -960,6 +961,14 @@ static int __init i8042_platform_init(void)
 
 	if (dmi_check_system(i8042_dmi_dritek_table))
 		i8042_dritek = true;
+
+	/*
+	 * A20 was already enabled during early kernel init. But some buggy
+	 * BIOSes (in MSI Laptops) require A20 to be enabled using 8042 to
+	 * resume from S3. So we do it here and hope that nothing breaks.
+	 */
+	i8042_command(&a20_on, 0x10d1);
+	i8042_command(NULL, 0x00ff);	/* Null command for SMM firmware */
 #endif /* CONFIG_X86 */
 
 	return retval;