From: Aaron Lu <aaron.lu@intel.com>
To: Alan Stern <stern@rowland.harvard.edu>,
James Bottomley <James.Bottomley@HansenPartnership.com>,
Jeff Garzik <jgarzik@pobox.com>
Cc: linux-scsi@vger.kernel.org, linux-ide@vger.kernel.org,
linux-pm@vger.kernel.org, linux-acpi@vger.kernel.org,
Aaron Lu <aaron.lwe@gmail.com>, Aaron Lu <aaron.lu@intel.com>
Subject: [PATCH v5 5/7] scsi: pm: add may_power_off flag
Date: Fri, 31 Aug 2012 17:42:33 +0800 [thread overview]
Message-ID: <1346406155-4768-6-git-send-email-aaron.lu@intel.com> (raw)
In-Reply-To: <1346406155-4768-1-git-send-email-aaron.lu@intel.com>
Add a new flag may_power_off for scsi device, it gives the user a chance
to control when the device is runtime suspended, can we remove its power
if possible.
And if the device can be powered off(reflected by can_power_off flag,
determined by individual driver), create a sysfs entry named
may_power_off to let user control the flag.
I'm planning using this flag for sr and sd.
Signed-off-by: Aaron Lu <aaron.lu@intel.com>
---
drivers/scsi/scsi_sysfs.c | 10 ++++++----
include/scsi/scsi_device.h | 1 +
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 093d4f6..92ea17c 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -484,9 +484,6 @@ sdev_store_##field (struct device *dev, struct device_attribute *attr, \
} \
static DEVICE_ATTR(field, S_IRUGO | S_IWUSR, sdev_show_##field, sdev_store_##field);
-/* Currently we don't export bit fields, but we might in future,
- * so leave this code in */
-#if 0
/*
* sdev_rd_attr: create a function and attribute variable for a
* read/write bit field.
@@ -526,7 +523,7 @@ static int scsi_sdev_check_buf_bit(const char *buf)
} else
return -EINVAL;
}
-#endif
+
/*
* Create the actual show/store functions and data structures.
*/
@@ -860,6 +857,8 @@ static struct device_attribute sdev_attr_queue_type_rw =
__ATTR(queue_type, S_IRUGO | S_IWUSR, show_queue_type_field,
sdev_store_queue_type_rw);
+sdev_rw_attr_bit (may_power_off);
+
/**
* scsi_sysfs_add_sdev - add scsi device to sysfs
* @sdev: scsi_device to add
@@ -950,6 +949,9 @@ int scsi_sysfs_add_sdev(struct scsi_device *sdev)
}
}
+ if (sdev->can_power_off)
+ device_create_file(&sdev->sdev_gendev, &dev_attr_may_power_off);
+
return error;
}
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 72d946f..41cec7f 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -157,6 +157,7 @@ struct scsi_device {
unsigned can_power_off:1; /* Device supports runtime power off */
unsigned wce_default_on:1; /* Cache is ON by default */
unsigned wakeup_by_user:1; /* User wakes up the device */
+ unsigned may_power_off:1; /* Power off is allowed by user */
DECLARE_BITMAP(supported_events, SDEV_EVT_MAXBITS); /* supported events */
struct list_head event_list; /* asserted events */
--
1.7.11.5
next prev parent reply other threads:[~2012-08-31 9:43 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-31 9:42 [PATCH v5 0/7] ZPODD patches Aaron Lu
2012-08-31 9:42 ` [PATCH v5 1/7] scsi: sr: support runtime pm for ODD Aaron Lu
2012-08-31 9:42 ` [PATCH v5 2/7] block: genhd: export disk_(un)block_events Aaron Lu
2012-08-31 9:42 ` [PATCH v5 3/7] scsi: sr: block events checking when suspended for zpodd Aaron Lu
2012-08-31 9:42 ` [PATCH v5 4/7] libata: acpi: set can_power_off for both ODD and HD Aaron Lu
2012-08-31 9:42 ` Aaron Lu [this message]
2012-08-31 9:42 ` [PATCH v5 6/7] scsi: sr: use may_power_off Aaron Lu
2012-08-31 9:42 ` [PATCH v5 7/7] libata: acpi: respect may_power_off flag Aaron Lu
2012-08-31 14:33 ` [PATCH v5 0/7] ZPODD patches Alan Stern
2012-08-31 15:43 ` Aaron Lu
2012-08-31 17:10 ` Alan Stern
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=1346406155-4768-6-git-send-email-aaron.lu@intel.com \
--to=aaron.lu@intel.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=aaron.lwe@gmail.com \
--cc=jgarzik@pobox.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--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: 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;
as well as URLs for NNTP newsgroup(s).