From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965317Ab2JXS53 (ORCPT ); Wed, 24 Oct 2012 14:57:29 -0400 Received: from ogre.sisk.pl ([193.178.161.156]:35116 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965177Ab2JXS50 (ORCPT ); Wed, 24 Oct 2012 14:57:26 -0400 From: "Rafael J. Wysocki" To: Ondrej Zary , hpa@zytor.com Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] Enable A20 using KBC for some MSI laptops to fix S3 resume Date: Wed, 24 Oct 2012 21:01:16 +0200 Message-ID: <450396555.xT2D53NWjT@vostro.rjw.lan> User-Agent: KMail/4.8.5 (Linux/3.6.2-6-desktop; KDE/4.8.5; x86_64; ; ) In-Reply-To: <201210240847.52417.linux@rainbow-software.org> References: <201210240847.52417.linux@rainbow-software.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wednesday 24 of October 2012 08:47:52 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. Affected laptop list and DMI data are from > bug reports at Ubuntu Launchpad. > > Tested with EX600 and PR200. > > Fixes https://bugzilla.kernel.org/show_bug.cgi?id=12878 > > Signed-off-by: Ondrej Zary Acked-by: Rafael J. Wysocki > --- a/arch/x86/kernel/acpi/boot.c > +++ b/arch/x86/kernel/acpi/boot.c > @@ -1349,6 +1349,20 @@ static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d) > } > > /* > + * Enable A20 line using KBC even if it's already enabled using other method. > + * This is needed for some MSI laptops to resume from S3. > + */ > +static int __init a20_enable_kbc(const struct dmi_system_id *d) > +{ > + printk(KERN_NOTICE "%s detected: enabling A20 using KBC\n", d->ident); > + outb(0xd1, 0x64); /* Command write */ > + outb(0xdf, 0x60); /* A20 on */ > + outb(0xff, 0x64); /* Null command, but UHCI wants it */ > + > + return 0; > +} > + > +/* > * If your system is blacklisted here, but you find that acpi=force > * works for you, please contact linux-acpi@vger.kernel.org > */ > @@ -1423,6 +1437,60 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = { > DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"), > }, > }, > + /* > + * 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. > + */ > + { > + .callback = a20_enable_kbc, > + .ident = "MSI EX600 Laptop", > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star International"), > + DMI_MATCH(DMI_PRODUCT_NAME, "MSI Notebook EX600"), > + }, > + }, > + { > + .callback = a20_enable_kbc, > + .ident = "MSI EX700 Laptop", > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star International"), > + DMI_MATCH(DMI_PRODUCT_NAME, "EX700"), > + }, > + }, > + { > + .callback = a20_enable_kbc, > + .ident = "MSI GX700 Laptop", > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star International"), > + DMI_MATCH(DMI_PRODUCT_NAME, "GX700"), > + }, > + }, > + { > + .callback = a20_enable_kbc, > + .ident = "MSI VR201 Laptop", > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star International"), > + DMI_MATCH(DMI_PRODUCT_NAME, "MSI Notebook VR201"), > + }, > + }, > + { > + .callback = a20_enable_kbc, > + .ident = "MSI VR601 Laptop", > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star International"), > + DMI_MATCH(DMI_PRODUCT_NAME, "MSI Notebook VR601"), > + }, > + }, > + { > + .callback = a20_enable_kbc, > + .ident = "MSI PR200 Laptop", > + .matches = { > + DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star International"), > + DMI_MATCH(DMI_PRODUCT_NAME, "MSI Notebook PR200"), > + }, > + }, > {} > }; > > > > -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.