From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Wed, 01 Jul 2009 23:36:15 +0200 (CEST) Received: from smtp1.tech.numericable.fr ([82.216.111.37]:57770 "EHLO smtp1.tech.numericable.fr" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S1491918AbZGAVgI (ORCPT ); Wed, 1 Jul 2009 23:36:08 +0200 Received: from [192.168.0.10] (abo-105-52-68.mts.modulonet.fr [85.68.52.105]) by smtp1.tech.numericable.fr (Postfix) with ESMTP id 1AC85E0811; Wed, 1 Jul 2009 23:30:32 +0200 (CEST) Message-ID: <4A4BD577.2080609@numericable.fr> Date: Wed, 01 Jul 2009 23:30:31 +0200 From: Etienne Basset User-Agent: Thunderbird 2.0.0.22 (X11/20090608) MIME-Version: 1.0 To: Jeff Chua CC: Bartlomiej Zolnierkiewicz , wuzhangjin@gmail.com, David Miller , rjw@sisk.pl, linux-kernel@vger.kernel.org, kernel-testers@vger.kernel.org, Ralf Baechle , linux-mips@linux-mips.org, linux-ide@vger.kernel.org Subject: Re: [Bug #13663] suspend to ram regression (IDE related) References: <1246459661.9660.40.camel@falcon> <200907011821.26091.bzolnier@gmail.com> <200907011829.16850.bzolnier@gmail.com> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 23586 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: etienne.basset@numericable.fr Precedence: bulk X-list: linux-mips Jeff Chua wrote: > On Thu, Jul 2, 2009 at 12:29 AM, Bartlomiej > Zolnierkiewicz wrote: >> Here is the more complete version, also taking into the account changes >> in ide_intr() and ide_timer_expiry(): > > This works great for. Survived STR, STD. I just applied on top vanilla > latest Linus's git pull. Nothing else to revert. > > Thanks, > Jeff. > > i confirm, this works for me too :) thanks, Etienne >> --- >> drivers/ide/ide-io.c | 15 ++++++++++----- >> 1 file changed, 10 insertions(+), 5 deletions(-) >> >> Index: b/drivers/ide/ide-io.c >> =================================================================== >> --- a/drivers/ide/ide-io.c >> +++ b/drivers/ide/ide-io.c >> @@ -532,7 +532,8 @@ repeat: >> >> if (startstop == ide_stopped) { >> rq = hwif->rq; >> - hwif->rq = NULL; >> + if ((drive->dev_flags & IDE_DFLAG_BLOCKED) == 0) >> + hwif->rq = NULL; >> goto repeat; >> } >> } else >> @@ -679,8 +680,10 @@ void ide_timer_expiry (unsigned long dat >> spin_lock_irq(&hwif->lock); >> enable_irq(hwif->irq); >> if (startstop == ide_stopped && hwif->polling == 0) { >> - rq_in_flight = hwif->rq; >> - hwif->rq = NULL; >> + if ((drive->dev_flags & IDE_DFLAG_BLOCKED) == 0) { >> + rq_in_flight = hwif->rq; >> + hwif->rq = NULL; >> + } >> ide_unlock_port(hwif); >> plug_device = 1; >> } >> @@ -856,8 +859,10 @@ irqreturn_t ide_intr (int irq, void *dev >> */ >> if (startstop == ide_stopped && hwif->polling == 0) { >> BUG_ON(hwif->handler); >> - rq_in_flight = hwif->rq; >> - hwif->rq = NULL; >> + if ((drive->dev_flags & IDE_DFLAG_BLOCKED) == 0) { >> + rq_in_flight = hwif->rq; >> + hwif->rq = NULL; >> + } >> ide_unlock_port(hwif); >> plug_device = 1; >> } >>