* [PATCH v4] 8042: Enable A20 using KBC to fix S3 resume on some MSI laptops
@ 2012-12-11 21:18 Ondrej Zary
2012-12-12 0:45 ` H. Peter Anvin
0 siblings, 1 reply; 4+ messages in thread
From: Ondrej Zary @ 2012-12-11 21:18 UTC (permalink / raw)
To: hpa; +Cc: Alan Cox, Rafael J. Wysocki, linux-acpi, linux-kernel
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>
---
drivers/input/serio/i8042-x86ia64io.h | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index d6cc77a..5f306f7 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -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;
--
Ondrej Zary
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v4] 8042: Enable A20 using KBC to fix S3 resume on some MSI laptops
2012-12-11 21:18 [PATCH v4] 8042: Enable A20 using KBC to fix S3 resume on some MSI laptops Ondrej Zary
@ 2012-12-12 0:45 ` H. Peter Anvin
2012-12-12 13:35 ` Rafael J. Wysocki
2012-12-12 18:48 ` Dmitry Torokhov
0 siblings, 2 replies; 4+ messages in thread
From: H. Peter Anvin @ 2012-12-12 0:45 UTC (permalink / raw)
To: Ondrej Zary
Cc: Alan Cox, Rafael J. Wysocki, linux-acpi, linux-kernel,
Dmitry Torokhov
Looks good to me. Alan/Rafael/Dmitry, OK for me to commit this?
-hpa
On 12/11/2012 01:18 PM, Ondrej Zary wrote:
> 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>
> ---
> drivers/input/serio/i8042-x86ia64io.h | 9 +++++++++
> 1 files changed, 9 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
> index d6cc77a..5f306f7 100644
> --- a/drivers/input/serio/i8042-x86ia64io.h
> +++ b/drivers/input/serio/i8042-x86ia64io.h
> @@ -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;
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v4] 8042: Enable A20 using KBC to fix S3 resume on some MSI laptops
2012-12-12 0:45 ` H. Peter Anvin
@ 2012-12-12 13:35 ` Rafael J. Wysocki
2012-12-12 18:48 ` Dmitry Torokhov
1 sibling, 0 replies; 4+ messages in thread
From: Rafael J. Wysocki @ 2012-12-12 13:35 UTC (permalink / raw)
To: H. Peter Anvin
Cc: Ondrej Zary, Alan Cox, linux-acpi, linux-kernel, Dmitry Torokhov
On Tuesday, December 11, 2012 04:45:31 PM H. Peter Anvin wrote:
> Looks good to me. Alan/Rafael/Dmitry, OK for me to commit this?
No objections from me.
Thanks,
Rafael
> On 12/11/2012 01:18 PM, Ondrej Zary wrote:
> > 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>
> > ---
> > drivers/input/serio/i8042-x86ia64io.h | 9 +++++++++
> > 1 files changed, 9 insertions(+), 0 deletions(-)
> >
> > diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
> > index d6cc77a..5f306f7 100644
> > --- a/drivers/input/serio/i8042-x86ia64io.h
> > +++ b/drivers/input/serio/i8042-x86ia64io.h
> > @@ -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;
> >
>
--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v4] 8042: Enable A20 using KBC to fix S3 resume on some MSI laptops
2012-12-12 0:45 ` H. Peter Anvin
2012-12-12 13:35 ` Rafael J. Wysocki
@ 2012-12-12 18:48 ` Dmitry Torokhov
1 sibling, 0 replies; 4+ messages in thread
From: Dmitry Torokhov @ 2012-12-12 18:48 UTC (permalink / raw)
To: H. Peter Anvin
Cc: Ondrej Zary, Alan Cox, Rafael J. Wysocki, linux-acpi,
linux-kernel
On Tue, Dec 11, 2012 at 04:45:31PM -0800, H. Peter Anvin wrote:
> 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.
>
> -hpa
>
> On 12/11/2012 01:18 PM, Ondrej Zary wrote:
> > 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>
> > ---
> > drivers/input/serio/i8042-x86ia64io.h | 9 +++++++++
> > 1 files changed, 9 insertions(+), 0 deletions(-)
> >
> > diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
> > index d6cc77a..5f306f7 100644
> > --- a/drivers/input/serio/i8042-x86ia64io.h
> > +++ b/drivers/input/serio/i8042-x86ia64io.h
> > @@ -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;
> >
>
--
Dmitry
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-12-12 18:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-11 21:18 [PATCH v4] 8042: Enable A20 using KBC to fix S3 resume on some MSI laptops Ondrej Zary
2012-12-12 0:45 ` H. Peter Anvin
2012-12-12 13:35 ` Rafael J. Wysocki
2012-12-12 18:48 ` Dmitry Torokhov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).