| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1332915722-15963-8-git-send-email-ming.m.lin@intel.com>
Date: Wed, 28 Mar 2012 14:22:02 +0800
From: Lin Ming <ming.m.lin@...el.com>
To: Zhang Rui <rui.zhang@...el.com>, Jeff Garzik <jgarzik@...ox.com>,
Alan Stern <stern@...land.harvard.edu>,
"Rafael J. Wysocki" <rjw@...k.pl>, Tejun Heo <tj@...nel.org>,
Aaron Lu <aaron.lu@....com>
Cc: linux-kernel@...r.kernel.org, linux-ide@...r.kernel.org,
linux-scsi@...r.kernel.org, linux-pm@...r.kernel.org,
linux-acpi <linux-acpi@...r.kernel.org>
Subject: [PATCH v3 7/7] [SCSI] sr: adds Zero-power ODD support
ZPODD(Zero Power Optical Disk Drive) is a new feature in
SATA 3.1 specification. It provides a way to power off unused ODD.
ZPODD support is checked in in sr_probe().
can_power_off flag is set during suspend if ZPODD is supported.
ATA port's runtime suspend callback will actually power off the ODD
and its runtime resume callback will actually power on the ODD.
When ODD is powered off(D3Cold state), inserting disk will trigger a
wakeup event(GPE). GPE AML handler notifies the associated device. Then
ODD is resumed in the notify handler.
Signed-off-by: Lin Ming <ming.m.lin@...el.com>
---
drivers/ata/libata-acpi.c | 8 +++++++-
drivers/scsi/scsi_pm.c | 8 ++++++++
drivers/scsi/sr.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
drivers/scsi/sr.h | 2 ++
include/scsi/scsi_device.h | 2 ++
5 files changed, 63 insertions(+), 1 deletions(-)
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index 81ef0f5..3744761 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -859,8 +859,14 @@ void ata_acpi_set_state(struct ata_port *ap, pm_message_t state)
if (state.event != PM_EVENT_ON) {
acpi_state = acpi_pm_device_sleep_state(
&dev->sdev->sdev_gendev, NULL);
- if (acpi_state > 0)
+ if (acpi_state > 0) {
+ /* Check if the device is ready for power off */
+ if (acpi_state == ACPI_STATE_D3_COLD &&
+ !scsi_device_can_power_off(dev->sdev))
+ acpi_state = ACPI_STATE_D3;
+
acpi_bus_set_power(handle, acpi_state);
+ }
if (ap->tdev.power.request == RPM_REQ_SUSPEND)
acpi_pm_device_run_wake(
&dev->sdev->sdev_gendev, true);
diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c
index c467064..0dc7e74 100644
--- a/drivers/scsi/scsi_pm.c
+++ b/drivers/scsi/scsi_pm.c
@@ -224,6 +224,14 @@ void scsi_autopm_put_host(struct Scsi_Host *shost)
pm_runtime_put_sync(&shost->shost_gendev);
}
+bool scsi_device_can_power_off(struct scsi_device *sdev)
+{
+ struct device *dev = &sdev->sdev_gendev;
+
+ return !dev->power.subsys_data ? false :
+ dev->power.subsys_data->can_power_off;
+}
+
#else
#define scsi_runtime_suspend NULL
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 5fc97d2..265a8ea 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -45,6 +45,8 @@
#include <linux/blkdev.h>
#include <linux/mutex.h>
#include <linux/slab.h>
+#include <linux/pm_runtime.h>
+#include <linux/acpi.h>
#include <asm/uaccess.h>
#include <scsi/scsi.h>
@@ -80,12 +82,38 @@ static int sr_probe(struct device *);
static int sr_remove(struct device *);
static int sr_done(struct scsi_cmnd *);
+static int sr_suspend(struct device *dev, pm_message_t mesg)
+{
+ struct scsi_cd *cd;
+
+ cd = dev_get_drvdata(dev);
+ if (cd->device->power_off)
+ dev->power.subsys_data->can_power_off = true;
+
+ return 0;
+}
+
+static int sr_resume(struct device *dev)
+{
+ struct scsi_cd *cd;
+
+ cd = dev_get_drvdata(dev);
+ if (cd->device->power_off) {
+ dev->power.subsys_data->can_power_off = false;
+ cd->poweroff_event = 0;
+ }
+
+ return 0;
+}
+
static struct scsi_driver sr_template = {
.owner = THIS_MODULE,
.gendrv = {
.name = "sr",
.probe = sr_probe,
.remove = sr_remove,
+ .suspend = sr_suspend,
+ .resume = sr_resume,
},
.done = sr_done,
};
@@ -216,6 +244,11 @@ static unsigned int sr_check_events(struct cdrom_device_info *cdi,
unsigned int events;
int ret;
+ /* Not necessary to check events if enter ZPODD state */
+ if (cd->device->power_off &&
+ pm_runtime_suspended(&cd->device->sdev_gendev))
+ return 0;
+
/* no changer support */
if (CDSL_CURRENT != slot)
return 0;
@@ -260,6 +293,11 @@ static unsigned int sr_check_events(struct cdrom_device_info *cdi,
cd->media_present = scsi_status_is_good(ret) ||
(scsi_sense_valid(&sshdr) && sshdr.asc != 0x3a);
+ if (!cd->media_present && cd->device->power_off && !cd->poweroff_event) {
+ scsi_autopm_put_device(cd->device);
+ cd->poweroff_event = 1;
+ }
+
if (last_present != cd->media_present)
cd->device->changed = 1;
@@ -716,6 +754,9 @@ static int sr_probe(struct device *dev)
disk->flags |= GENHD_FL_REMOVABLE;
add_disk(disk);
+ if (sdev->power_off)
+ dev_pm_get_subsys_data(dev);
+
sdev_printk(KERN_DEBUG, sdev,
"Attached scsi CD-ROM %s\n", cd->cdi.name);
return 0;
@@ -972,6 +1013,9 @@ static int sr_remove(struct device *dev)
kref_put(&cd->kref, sr_kref_release);
mutex_unlock(&sr_ref_mutex);
+ if (cd->device->power_off)
+ dev_pm_put_subsys_data(dev);
+
return 0;
}
diff --git a/drivers/scsi/sr.h b/drivers/scsi/sr.h
index 37c8f6b..8b2840b 100644
--- a/drivers/scsi/sr.h
+++ b/drivers/scsi/sr.h
@@ -42,6 +42,8 @@ typedef struct scsi_cd {
unsigned readcd_cdda:1; /* reading audio data using READ_CD */
unsigned media_present:1; /* media is present */
+ unsigned poweroff_event:1;
+
/* GET_EVENT spurious event handling, blk layer guarantees exclusion */
int tur_mismatch; /* nr of get_event TUR mismatches */
bool tur_changed:1; /* changed according to TUR */
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 0f69612..4805d5a 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -389,9 +389,11 @@ extern int scsi_execute_req(struct scsi_device *sdev, const unsigned char *cmd,
#ifdef CONFIG_PM_RUNTIME
extern int scsi_autopm_get_device(struct scsi_device *);
extern void scsi_autopm_put_device(struct scsi_device *);
+extern bool scsi_device_can_power_off(struct scsi_device *);
#else
static inline int scsi_autopm_get_device(struct scsi_device *d) { return 0; }
static inline void scsi_autopm_put_device(struct scsi_device *d) {}
+static inline bool scsi_device_can_power_off(struct scsi_device *d) { return false; };
#endif /* CONFIG_PM_RUNTIME */
static inline int __must_check scsi_device_reprobe(struct scsi_device *sdev)
--
1.7.2.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists