Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753669Ab0AWXmn (ORCPT ); Sat, 23 Jan 2010 18:42:43 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753162Ab0AWXmL (ORCPT ); Sat, 23 Jan 2010 18:42:11 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:43519 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753100Ab0AWXmC (ORCPT ); Sat, 23 Jan 2010 18:42:02 -0500 From: "Rafael J. Wysocki" To: LKML Subject: [PATCH 8/8] PM: Allow SCSI devices to suspend/resume asynchronously Date: Sun, 24 Jan 2010 00:41:30 +0100 User-Agent: KMail/1.12.3 (Linux/2.6.33-rc4-rjw; KDE/4.3.3; x86_64; ; ) Cc: Alan Stern , Linus Torvalds , Linux PCI , pm list , linux-usb@vger.kernel.org, Greg KH , Jesse Barnes , James Bottomley , Linux SCSI , Arjan van de Ven , ACPI Devel Maling List , Len Brown , Nigel Cunningham References: <201001240033.34253.rjw@sisk.pl> In-Reply-To: <201001240033.34253.rjw@sisk.pl> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201001240041.30899.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2744 Lines: 76 From: Rafael J. Wysocki Set power.async_suspend for all SCSI devices, targets and hosts, so that they can be suspended and resumed in parallel with the main suspend/resume thread and possibly with other devices they don't depend on in a known way (i.e. devices which are not their parents or children). The power.async_suspend flag is also set for devices that don't have suspend or resume callbacks, because otherwise they would make the main suspend/resume thread wait for their "asynchronous" children (during suspend) or parents (during resume), effectively negating the possible gains from executing these devices' suspend and resume callbacks asynchronously. Signed-off-by: Rafael J. Wysocki --- drivers/scsi/hosts.c | 4 ++++ drivers/scsi/scsi_sysfs.c | 4 ++++ 2 files changed, 8 insertions(+) Index: linux-2.6/drivers/scsi/hosts.c =================================================================== --- linux-2.6.orig/drivers/scsi/hosts.c +++ linux-2.6/drivers/scsi/hosts.c @@ -215,6 +215,8 @@ int scsi_add_host_with_dma(struct Scsi_H shost->shost_gendev.parent = dev ? dev : &platform_bus; shost->dma_dev = dma_dev; + device_enable_async_suspend(&shost->shost_gendev); + error = device_add(&shost->shost_gendev); if (error) goto out; @@ -222,6 +224,8 @@ int scsi_add_host_with_dma(struct Scsi_H scsi_host_set_state(shost, SHOST_RUNNING); get_device(shost->shost_gendev.parent); + device_enable_async_suspend(&shost->shost_dev); + error = device_add(&shost->shost_dev); if (error) goto out_del_gendev; Index: linux-2.6/drivers/scsi/scsi_sysfs.c =================================================================== --- linux-2.6.orig/drivers/scsi/scsi_sysfs.c +++ linux-2.6/drivers/scsi/scsi_sysfs.c @@ -847,6 +847,8 @@ static int scsi_target_add(struct scsi_t if (starget->state != STARGET_CREATED) return 0; + device_enable_async_suspend(&starget->dev); + error = device_add(&starget->dev); if (error) { dev_err(&starget->dev, "target device_add failed, error %d\n", error); @@ -886,11 +888,13 @@ int scsi_sysfs_add_sdev(struct scsi_devi return error; transport_configure_device(&starget->dev); + device_enable_async_suspend(&sdev->sdev_gendev); error = device_add(&sdev->sdev_gendev); if (error) { printk(KERN_INFO "error 1\n"); goto out_remove; } + device_enable_async_suspend(&sdev->sdev_dev); error = device_add(&sdev->sdev_dev); if (error) { printk(KERN_INFO "error 2\n"); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/