From: Aaron Lu <aaron.lu@amd.com> To: Jeff Garzik <jgarzik@pobox.com>, Alan Stern <stern@rowland.harvard.edu>, Lin Ming <minggr@gmail.com> Cc: 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 4/5] scsi: pm: use runtime resume callback if available Date: Mon, 23 Jul 2012 14:49:39 +0800 [thread overview] Message-ID: <1343026180-22236-5-git-send-email-aaron.lu@amd.com> (raw) In-Reply-To: <1343026180-22236-1-git-send-email-aaron.lu@amd.com> When runtime resume a scsi device, if the device's driver has implemented runtime resume callback, use that instead of the resume callback. sr driver needs this to properly do different things for system resume and runtime resume. Signed-off-by: Aaron Lu <aaron.lu@amd.com> --- drivers/scsi/scsi_pm.c | 14 +++++++++----- drivers/scsi/sr.c | 21 +++++++++++++++++++++ 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c index d4201de..19bba47 100644 --- a/drivers/scsi/scsi_pm.c +++ b/drivers/scsi/scsi_pm.c @@ -34,14 +34,18 @@ static int scsi_dev_type_suspend(struct device *dev, pm_message_t msg) return err; } -static int scsi_dev_type_resume(struct device *dev) +static int scsi_dev_type_resume(struct device *dev, bool runtime) { struct device_driver *drv; int err = 0; + int (*resume)(struct device *); drv = dev->driver; - if (drv && drv->resume) - err = drv->resume(dev); + if (runtime && drv && drv->pm && drv->pm->runtime_resume) + resume = drv->pm->runtime_resume; + else + resume = drv ? drv->resume : NULL; + err = resume(dev); scsi_device_resume(to_scsi_device(dev)); dev_dbg(dev, "scsi resume: %d\n", err); return err; @@ -84,7 +88,7 @@ static int scsi_bus_resume_common(struct device *dev) * Resume it on behalf of child. */ pm_runtime_get_sync(dev->parent); - err = scsi_dev_type_resume(dev); + err = scsi_dev_type_resume(dev, false); pm_runtime_put_sync(dev->parent); } @@ -159,7 +163,7 @@ static int scsi_runtime_resume(struct device *dev) dev_dbg(dev, "scsi_runtime_resume\n"); if (scsi_is_sdev_device(dev)) - err = scsi_dev_type_resume(dev); + err = scsi_dev_type_resume(dev, true); /* Insert hooks here for targets, hosts, and transport classes */ diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 69c9e22..2f159aa 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, }; @@ -215,6 +221,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: Jeff Garzik <jgarzik@pobox.com>, Alan Stern <stern@rowland.harvard.edu>, Lin Ming <minggr@gmail.com> Cc: <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 4/5] scsi: pm: use runtime resume callback if available Date: Mon, 23 Jul 2012 14:49:39 +0800 [thread overview] Message-ID: <1343026180-22236-5-git-send-email-aaron.lu@amd.com> (raw) In-Reply-To: <1343026180-22236-1-git-send-email-aaron.lu@amd.com> When runtime resume a scsi device, if the device's driver has implemented runtime resume callback, use that instead of the resume callback. sr driver needs this to properly do different things for system resume and runtime resume. Signed-off-by: Aaron Lu <aaron.lu@amd.com> --- drivers/scsi/scsi_pm.c | 14 +++++++++----- drivers/scsi/sr.c | 21 +++++++++++++++++++++ 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c index d4201de..19bba47 100644 --- a/drivers/scsi/scsi_pm.c +++ b/drivers/scsi/scsi_pm.c @@ -34,14 +34,18 @@ static int scsi_dev_type_suspend(struct device *dev, pm_message_t msg) return err; } -static int scsi_dev_type_resume(struct device *dev) +static int scsi_dev_type_resume(struct device *dev, bool runtime) { struct device_driver *drv; int err = 0; + int (*resume)(struct device *); drv = dev->driver; - if (drv && drv->resume) - err = drv->resume(dev); + if (runtime && drv && drv->pm && drv->pm->runtime_resume) + resume = drv->pm->runtime_resume; + else + resume = drv ? drv->resume : NULL; + err = resume(dev); scsi_device_resume(to_scsi_device(dev)); dev_dbg(dev, "scsi resume: %d\n", err); return err; @@ -84,7 +88,7 @@ static int scsi_bus_resume_common(struct device *dev) * Resume it on behalf of child. */ pm_runtime_get_sync(dev->parent); - err = scsi_dev_type_resume(dev); + err = scsi_dev_type_resume(dev, false); pm_runtime_put_sync(dev->parent); } @@ -159,7 +163,7 @@ static int scsi_runtime_resume(struct device *dev) dev_dbg(dev, "scsi_runtime_resume\n"); if (scsi_is_sdev_device(dev)) - err = scsi_dev_type_resume(dev); + err = scsi_dev_type_resume(dev, true); /* Insert hooks here for targets, hosts, and transport classes */ diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 69c9e22..2f159aa 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, }; @@ -215,6 +221,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-23 6:49 UTC|newest] Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-07-23 6:49 [PATCH 0/5] Fix for ZPODD Aaron Lu 2012-07-23 6:49 ` Aaron Lu 2012-07-23 6:49 ` [PATCH 1/5] scsi: sr: fix for sr suspend and resume Aaron Lu 2012-07-23 6:49 ` Aaron Lu 2012-07-23 14:50 ` Alan Stern 2012-07-23 14:50 ` Alan Stern 2012-07-23 6:49 ` [PATCH 2/5] scsi: sr: runtime pm when ODD is open/closed Aaron Lu 2012-07-23 6:49 ` Aaron Lu 2012-07-23 14:57 ` Alan Stern 2012-07-23 14:57 ` Alan Stern 2012-07-23 6:49 ` [PATCH 3/5] scsi: sr: block events when runtime suspended Aaron Lu 2012-07-23 6:49 ` Aaron Lu 2012-07-23 6:49 ` Aaron Lu [this message] 2012-07-23 6:49 ` [PATCH 4/5] scsi: pm: use runtime resume callback if available Aaron Lu 2012-07-23 14:36 ` Sergei Shtylyov 2012-07-23 23:30 ` Aaron Lu 2012-07-23 6:49 ` [PATCH 5/5] block: genhd: add an interface to set disk's poll interval Aaron Lu 2012-07-23 6:49 ` Aaron Lu 2012-07-23 18:43 ` Betty Dall 2012-07-23 23:52 ` Aaron Lu 2012-07-24 18:55 ` Betty Dall 2012-07-25 2:47 ` Aaron Lu 2012-07-25 2:47 ` Aaron Lu
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=1343026180-22236-5-git-send-email-aaron.lu@amd.com \ --to=aaron.lu@amd.com \ --cc=aaron.lwe@gmail.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.