public inbox for linux-scsi@vger.kernel.org
 help / color / mirror / Atom feed
From: Lin Ming <ming.m.lin@intel.com>
To: Jeff Garzik <jgarzik@pobox.com>,
	James Bottomley <JBottomley@parallels.com>,
	Alan Stern <stern@rowland.harvard.edu>, Tejun Heo <tj@kernel.org>
Cc: linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org,
	linux-scsi@vger.kernel.org, linux-pm@vger.kernel.org,
	"Rafael J. Wysocki" <rjw@sisk.pl>,
	Huang Ying <ying.huang@intel.com>,
	Zhang Rui <rui.zhang@intel.com>
Subject: [PATCH v5 4/6] [SCSI] sd: check runtime PM status in sd_shutdown
Date: Mon,  5 Dec 2011 09:20:26 +0800	[thread overview]
Message-ID: <1323048028-10421-5-git-send-email-ming.m.lin@intel.com> (raw)
In-Reply-To: <1323048028-10421-1-git-send-email-ming.m.lin@intel.com>

sd_shutdown is called during reboot/poweroff.
It may fail if parent device, for example, ata port, was runtime suspended.

Fix it by checking runtime PM status of sd.
Exit immediately if sd was runtime suspended already.

Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
---
 drivers/scsi/sd.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index fa3a591..7b3f807 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -50,6 +50,7 @@
 #include <linux/string_helpers.h>
 #include <linux/async.h>
 #include <linux/slab.h>
+#include <linux/pm_runtime.h>
 #include <asm/uaccess.h>
 #include <asm/unaligned.h>
 
@@ -2741,6 +2742,9 @@ static void sd_shutdown(struct device *dev)
 	if (!sdkp)
 		return;         /* this can happen */
 
+	if (pm_runtime_suspended(dev))
+		goto exit;
+
 	if (sdkp->WCE) {
 		sd_printk(KERN_NOTICE, sdkp, "Synchronizing SCSI cache\n");
 		sd_sync_cache(sdkp);
@@ -2751,6 +2755,7 @@ static void sd_shutdown(struct device *dev)
 		sd_start_stop_device(sdkp, 0);
 	}
 
+exit:
 	scsi_disk_put(sdkp);
 }
 
-- 
1.7.2.5

  parent reply	other threads:[~2011-12-05  1:20 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-05  1:20 [PATCH v5 0/6] ata port runtime power management support Lin Ming
2011-12-05  1:20 ` [PATCH v5 1/6] ata: make ata port as parent device of scsi host Lin Ming
2011-12-07 20:04   ` Jeff Garzik
2011-12-05  1:20 ` [PATCH v5 2/6] [SCSI] add flag to skip the runtime PM calls on the host Lin Ming
2011-12-05  1:20 ` [PATCH v5 3/6] [SCSI] check runtime PM status in system PM Lin Ming
2011-12-05  1:20 ` Lin Ming [this message]
2011-12-05  1:20 ` [PATCH v5 5/6] ata: add ata port system PM callbacks Lin Ming
2011-12-07  8:38   ` Lin Ming
     [not found]   ` <CAF1ivSbRejpSEVfHAhOUxaqAedkCQVHWOgsJGFLM2yt2QaxtuQ@mail.gmail.com>
2011-12-13 14:20     ` Lin Ming
2011-12-13 15:47       ` Alan Stern
2011-12-13 18:57         ` Lin Ming
2011-12-13 19:07           ` Alan Stern
2011-12-05  1:20 ` [PATCH v5 6/6] ata: add ata port runtime " Lin Ming
2011-12-07  8:42   ` Lin Ming
2011-12-07 18:29     ` Tejun Heo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1323048028-10421-5-git-send-email-ming.m.lin@intel.com \
    --to=ming.m.lin@intel.com \
    --cc=JBottomley@parallels.com \
    --cc=jgarzik@pobox.com \
    --cc=linux-ide@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=rjw@sisk.pl \
    --cc=rui.zhang@intel.com \
    --cc=stern@rowland.harvard.edu \
    --cc=tj@kernel.org \
    --cc=ying.huang@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox