From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Subject: Re: [PATCH 1/2] ACPI PM: Add suspend sequence workaround
Date: Fri, 9 May 2008 19:20:26 +0200
Message-ID: <200805091920.27756.rjw@sisk.pl>
References: <200805062342.42789.rjw@sisk.pl> <20080507092931.GD13858@elf.ucw.cz> <200805071421.19788.rjw@sisk.pl>
Mime-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Return-path: <linux-acpi-owner@vger.kernel.org>
Received: from ogre.sisk.pl ([217.79.144.158]:51164 "EHLO ogre.sisk.pl"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752700AbYEIRXp (ORCPT <rfc822;linux-acpi@vger.kernel.org>);
	Fri, 9 May 2008 13:23:45 -0400
In-Reply-To: <200805071421.19788.rjw@sisk.pl>
Content-Disposition: inline
Sender: linux-acpi-owner@vger.kernel.org
List-Id: linux-acpi@vger.kernel.org
To: Pavel Machek <pavel@suse.cz>
Cc: Len Brown <lenb@kernel.org>, ACPI Devel Maling List <linux-acpi@vger.kernel.org>, Jesse Barnes <jbarnes@virtuousgeek.org>, pm list <linux-pm@lists.linux-foundation.org>, Greg KH <greg@kroah.com>

On Wednesday, 7 of May 2008, Rafael J. Wysocki wrote:
> On Wednesday, 7 of May 2008, Pavel Machek wrote:
> > Hi!
> > > ---
> > >  Documentation/kernel-parameters.txt |    5 
> > >  drivers/acpi/sleep/main.c           |  301 +++++++++++++++++++++---------------
> > >  drivers/base/power/main.c           |   15 +
> > >  include/linux/pm.h                  |    2 
> > >  4 files changed, 201 insertions(+), 122 deletions(-)
> > > 
> > > Index: linux-2.6/Documentation/kernel-parameters.txt
> > > ===================================================================
> > > --- linux-2.6.orig/Documentation/kernel-parameters.txt
> > > +++ linux-2.6/Documentation/kernel-parameters.txt
> > > @@ -170,6 +170,11 @@ and is between 256 and 4096 characters. 
> > >  	acpi_irq_isa=	[HW,ACPI] If irq_balance, mark listed IRQs used by ISA
> > >  			Format: <irq>,<irq>...
> > >  
> > > +       acpi_old_suspend_ordering [HW,ACPI]
> > > +                       Enforce the ACPI 1.0 ordering of the _PTS control
> > > +                       method wrt putting devices into low power states
> > > +                       default: ACPI 2.0 ordering of _PTS
> > > +
> > 
> > Space vs. tabs issue here, not too important...
> > 
> > > +#ifdef CONFIG_PM_SLEEP
> > > +static u32 acpi_target_sleep_state = ACPI_STATE_S0;
> > > +
> > > +static int init_8259A_after_S1;
> > 
> > 8259A after S1 init is workaround for bug in toshiba 4030cdt. We can
> > probably remove it now.
> > 
> > > +#ifdef CONFIG_X86
> > > +	if (acpi_state == ACPI_STATE_S1 && init_8259A_after_S1) {
> > > +		printk("Broken toshiba laptop -> kicking interrupts\n");
> > > +		init_8259A(0);
> > > +	}
> > > +#endif
> > 
> > This can die. I believe I've removed it already, but apparently not.
> 
> Yes, but I'm going to add some analogous code for machines that are known to
> need the "old" suspend ordering, so I've left that as a template. ;-)

Okay, I guess we the $subject patch can be replaced with the two following
ones.

The first of them removes the Toshiba hook.

The second one adds a suspend sequence workaround by midifying the high-level
code and introducing new "recover" callbacks for the platform.

Then have only been compilation tested.

Please have a look.

Thanks,
Rafael