From: Jens Axboe Subject: Re: [PATCH] Re: 2.6.17-rc5-git1: regression: resume from suspend(RAM) fails: libata issue Date: Sat, 27 May 2006 23:26:30 +0200 Message-ID: <20060527212630.GB31752@suse.de> References: <1148634262.2310.7.camel@forrest26.sh.intel.com> <200605271423.40037.liml@rtr.ca> <200605272245.30108.axboe@suse.de> <4478BD60.40806@garzik.org> <20060527211157.GA31275@suse.de> <4478C1DD.2030204@garzik.org> <20060527212011.GA31551@suse.de> <4478C39A.9060302@garzik.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from ns.virtualhost.dk ([195.184.98.160]:16902 "EHLO virtualhost.dk") by vger.kernel.org with ESMTP id S964998AbWE0V0k (ORCPT ); Sat, 27 May 2006 17:26:40 -0400 Content-Disposition: inline In-Reply-To: <4478C39A.9060302@garzik.org> Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: Jeff Garzik Cc: Linus Torvalds , Mark Lord , "zhao, forrest" , Tejun Heo , linux-ide@vger.kernel.org On Sat, May 27 2006, Jeff Garzik wrote: > Jens Axboe wrote: > >Definitely, and we need to cover a lot more controllers than just piix > >and ahci. Being the selfish bastard that I am, I didn't care much about > >other devices... > > For 2.6.17 that's practical in any case: ata_piix is the only upstream > driver with a suspend method. > > > >diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c > >index fa476e7..28878f4 100644 > >--- a/drivers/scsi/libata-core.c > >+++ b/drivers/scsi/libata-core.c > >@@ -4297,6 +4297,7 @@ static int ata_start_drive(struct ata_po > > int ata_device_resume(struct ata_port *ap, struct ata_device *dev) > > { > > if (ap->flags & ATA_FLAG_SUSPENDED) { > >+ ata_busy_wait(ap, ATA_BUSY, 200000); > > ap->flags &= ~ATA_FLAG_SUSPENDED; > > ata_set_mode(ap); > > } > >@@ -4846,6 +4847,7 @@ int ata_pci_device_suspend(struct pci_de > > > > int ata_pci_device_resume(struct pci_dev *pdev) > > { > >+ msleep(500); > > pci_set_power_state(pdev, PCI_D0); > > pci_restore_state(pdev); > > pci_enable_device(pdev); > > Does it work if you move msleep() below pci_restore_state()? > " " " " below pci_enable_device()? > > I think the delay makes more sense after you wake up the controller... I'd be surprised if it didn't, let me do a reboot with it moved at the bottom of ata_pci_device_resume(). brb... -- Jens Axboe