From: Aaron Lu <aaron.lu@amd.com> To: James Bottomley <James.Bottomley@HansenPartnership.com>, Alan Stern <stern@rowland.harvard.edu> Cc: Jeff Garzik <jgarzik@pobox.com>, Lin Ming <minggr@gmail.com>, Jeff Wu <jeff.wu@amd.com>, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-scsi@vger.kernel.org, linux-ide@vger.kernel.org, Aaron Lu <aaron.lwe@gmail.com>, Aaron Lu <aaron.lu@amd.com> Subject: [PATCH v3 6/7] scsi: sr: balance sr disk events block depth Date: Thu, 26 Jul 2012 18:05:28 +0800 [thread overview] Message-ID: <1343297129-28174-7-git-send-email-aaron.lu@amd.com> (raw) In-Reply-To: <1343297129-28174-1-git-send-email-aaron.lu@amd.com> 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
WARNING: multiple messages have this Message-ID (diff)
From: Aaron Lu <aaron.lu@amd.com> To: James Bottomley <James.Bottomley@HansenPartnership.com>, Alan Stern <stern@rowland.harvard.edu> Cc: Jeff Garzik <jgarzik@pobox.com>, Lin Ming <minggr@gmail.com>, Jeff Wu <jeff.wu@amd.com>, <linux-kernel@vger.kernel.org>, <linux-pm@vger.kernel.org>, <linux-scsi@vger.kernel.org>, <linux-ide@vger.kernel.org>, Aaron Lu <aaron.lwe@gmail.com>, Aaron Lu <aaron.lu@amd.com> Subject: [PATCH v3 6/7] scsi: sr: balance sr disk events block depth Date: Thu, 26 Jul 2012 18:05:28 +0800 [thread overview] Message-ID: <1343297129-28174-7-git-send-email-aaron.lu@amd.com> (raw) In-Reply-To: <1343297129-28174-1-git-send-email-aaron.lu@amd.com> 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
next prev parent reply other threads:[~2012-07-26 10:06 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-07-26 10:05 [PATCH v3 0/7] ZPODD patches for scsi tree Aaron Lu 2012-07-26 10:05 ` Aaron Lu 2012-07-26 10:05 ` [PATCH v3 1/7] scsi: sr: check support for device busy class events Aaron Lu 2012-07-26 10:05 ` Aaron Lu 2012-07-26 10:05 ` [PATCH v3 2/7] scsi: pm: use autosuspend if device supports it Aaron Lu 2012-07-26 10:05 ` Aaron Lu 2012-07-26 10:44 ` Oliver Neukum 2012-07-26 12:43 ` Aaron Lu 2012-07-26 13:01 ` Oliver Neukum 2012-07-26 10:05 ` [PATCH v3 3/7] scsi: sr: support zero power ODD(ZPODD) Aaron Lu 2012-07-26 10:05 ` Aaron Lu 2012-07-26 10:05 ` [PATCH v3 4/7] scsi: sr: block events when runtime suspended Aaron Lu 2012-07-26 10:05 ` Aaron Lu 2012-07-26 10:05 ` [PATCH v3 5/7] scsi: pm: use runtime resume callback if available Aaron Lu 2012-07-26 10:05 ` Aaron Lu 2012-07-26 10:05 ` Aaron Lu [this message] 2012-07-26 10:05 ` [PATCH v3 6/7] scsi: sr: balance sr disk events block depth Aaron Lu 2012-07-26 10:54 ` Sergei Shtylyov 2012-07-26 12:47 ` Aaron Lu 2012-07-26 10:05 ` [PATCH v3 7/7] block: genhd: add an interface to set disk's poll interval Aaron Lu 2012-07-26 10:05 ` Aaron Lu 2012-07-26 13:43 ` [PATCH v3 0/7] ZPODD patches for scsi tree Jeff Garzik 2012-07-26 14:41 ` Aaron Lu 2012-07-26 18:04 ` Jeff Garzik
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=1343297129-28174-7-git-send-email-aaron.lu@amd.com \ --to=aaron.lu@amd.com \ --cc=James.Bottomley@HansenPartnership.com \ --cc=aaron.lwe@gmail.com \ --cc=jeff.wu@amd.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=minggr@gmail.com \ --cc=stern@rowland.harvard.edu \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.