Commit 4cb077d93a57fb8bb64c277ec4ce637823cd76f4
1 parent
927bc9165d
Exists in
master
and in
4 other branches
PM: Allow SCSI devices to suspend/resume asynchronously
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 <rjw@sisk.pl>
Showing 2 changed files with 8 additions and 0 deletions Side-by-side Diff
drivers/scsi/hosts.c
| ... | ... | @@ -215,12 +215,16 @@ |
| 215 | 215 | shost->shost_gendev.parent = dev ? dev : &platform_bus; |
| 216 | 216 | shost->dma_dev = dma_dev; |
| 217 | 217 | |
| 218 | + device_enable_async_suspend(&shost->shost_gendev); | |
| 219 | + | |
| 218 | 220 | error = device_add(&shost->shost_gendev); |
| 219 | 221 | if (error) |
| 220 | 222 | goto out; |
| 221 | 223 | |
| 222 | 224 | scsi_host_set_state(shost, SHOST_RUNNING); |
| 223 | 225 | get_device(shost->shost_gendev.parent); |
| 226 | + | |
| 227 | + device_enable_async_suspend(&shost->shost_dev); | |
| 224 | 228 | |
| 225 | 229 | error = device_add(&shost->shost_dev); |
| 226 | 230 | if (error) |
drivers/scsi/scsi_sysfs.c
| ... | ... | @@ -847,6 +847,8 @@ |
| 847 | 847 | if (starget->state != STARGET_CREATED) |
| 848 | 848 | return 0; |
| 849 | 849 | |
| 850 | + device_enable_async_suspend(&starget->dev); | |
| 851 | + | |
| 850 | 852 | error = device_add(&starget->dev); |
| 851 | 853 | if (error) { |
| 852 | 854 | dev_err(&starget->dev, "target device_add failed, error %d\n", error); |
| 853 | 855 | |
| ... | ... | @@ -886,11 +888,13 @@ |
| 886 | 888 | return error; |
| 887 | 889 | |
| 888 | 890 | transport_configure_device(&starget->dev); |
| 891 | + device_enable_async_suspend(&sdev->sdev_gendev); | |
| 889 | 892 | error = device_add(&sdev->sdev_gendev); |
| 890 | 893 | if (error) { |
| 891 | 894 | printk(KERN_INFO "error 1\n"); |
| 892 | 895 | goto out_remove; |
| 893 | 896 | } |
| 897 | + device_enable_async_suspend(&sdev->sdev_dev); | |
| 894 | 898 | error = device_add(&sdev->sdev_dev); |
| 895 | 899 | if (error) { |
| 896 | 900 | printk(KERN_INFO "error 2\n"); |