lkml.org 
[lkml]   [2012]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v3 6/7] scsi: sr: balance sr disk events block depth
Date
When the ODD is resumed, disk_unblock_events should be called when:
1 The ODD is runtime resumed;
2 System is resuming from S3 and the ODD is runtime suspended before S3;
But not when the system is resuming from S3 and the ODD is runtime
active before S3.

So seperate the resume calls, one for system resume and one for runtime
resume to do different things accordingly.

Signed-off-by: Aaron Lu <aaron.lu@amd.com>
---
drivers/scsi/sr.c | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)

diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index fd1c2f6..b8c2f9d 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -82,6 +82,11 @@ static int sr_remove(struct device *);
static int sr_done(struct scsi_cmnd *);
static int sr_suspend(struct device *dev, pm_message_t msg);
static int sr_resume(struct device *dev);
+static int sr_runtime_resume(struct device *dev);
+
+static struct dev_pm_ops sr_pm_ops = {
+ .runtime_resume = sr_runtime_resume,
+};

static struct scsi_driver sr_template = {
.owner = THIS_MODULE,
@@ -91,6 +96,7 @@ static struct scsi_driver sr_template = {
.remove = sr_remove,
.suspend = sr_suspend,
.resume = sr_resume,
+ .pm = &sr_pm_ops,
},
.done = sr_done,
};
@@ -211,6 +217,21 @@ static int sr_suspend(struct device *dev, pm_message_t msg)

static int sr_resume(struct device *dev)
{
+ struct scsi_cd *cd = dev_get_drvdata(dev);
+
+ /*
+ * If ODD is runtime suspended before system pm, unblock disk
+ * events now since on system resume, we will fully resume it
+ * and set its rumtime status to active.
+ */
+ if (pm_runtime_suspended(dev))
+ disk_unblock_events(cd->disk);
+
+ return 0;
+}
+
+static int sr_runtime_resume(struct device *dev)
+{
struct scsi_cd *cd;
struct scsi_sense_hdr sshdr;

--
1.7.11.3



\
 
 \ /
  Last update: 2012-07-26 13:01    [W:0.093 / U:1.112 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site