Coincident repair of enclosure and ses device support. Fix problems with setting enclosure values careful to preserve other settings. Corrected fault setting as well. Modernize code. Add support for Device Power Management via a new r/w device_power node in sysfs and some internal interfaces to permit them to be called in the future by error recovery escalation. Enclosures that do not support individual power management will always return a status that the device has power.
This patch has been adjusted to deal with review comments. The controversial adjustment in this patch is the support in the ses driver to punch-through error recovery, a specification requirement. scsi_error.c added an export for a scsi command queueing interface. This command scsi_execute_eh_req(struct scsi_device *sdev, unsigned char *cmd, int data_direction, void *buffer, unsigned buffoon) uses hard-coded timeouts.
Future: Add target device power-cycle to error recovery escalation before considering hba reset (back-port tested in a libsas skunkwork on a 2.6.32 vintage kernel, this patch compile tested with scsi-misc-2.6)
Signed-off-by: Mark Salyzyn <mark_salyzyn@xxxxxxxxxxx>
Cc: Douglas Gilbert <dgilbert@xxxxxxxxxxxx>
Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx>
drivers/misc/enclosure.c | 61 +++++++++++++++++++++++----
drivers/scsi/scsi_error.c | 49 +++++++++++++++++++++
drivers/scsi/ses.c | 103 +++++++++++++++++++++++++++++++++++-----------
include/linux/enclosure.h | 8 +++
include/scsi/scsi_eh.h | 3 +
5 files changed, 191 insertions(+), 33 deletions(-)
diff --git a/drivers/misc/enclosure.c b/drivers/misc/enclosure.c
index 00e5fca..06978f8 100644
--- a/drivers/misc/enclosure.c
+++ b/drivers/misc/enclosure.c
@@ -420,10 +420,10 @@ static ssize_t set_component_fault(struct device *cdev,
{
struct enclosure_device *edev = to_enclosure_device(cdev->parent);
struct enclosure_component *ecomp = to_enclosure_component(cdev);
- int val = simple_strtoul(buf, NULL, 0);
+ unsigned long val;
- if (edev->cb->set_fault)
- edev->cb->set_fault(edev, ecomp, val);
+ if (!kstrtoul(buf, 0, &val) && edev->cb->set_fault)
+ edev->cb->set_fault(edev, ecomp, (int)val);
return count;
}
@@ -478,10 +478,10 @@ static ssize_t set_component_active(struct device *cdev,
{
struct enclosure_device *edev = to_enclosure_device(cdev->parent);
struct enclosure_component *ecomp = to_enclosure_component(cdev);
- int val = simple_strtoul(buf, NULL, 0);
+ unsigned long val;
- if (edev->cb->set_active)
- edev->cb->set_active(edev, ecomp, val);
+ if (!kstrtoul(buf, 0, &val) && edev->cb->set_active)
+ edev->cb->set_active(edev, ecomp, (int)val);
return count;
}
@@ -502,13 +502,53 @@ static ssize_t set_component_locate(struct device *cdev,
{
struct enclosure_device *edev = to_enclosure_device(cdev->parent);
struct enclosure_component *ecomp = to_enclosure_component(cdev);
- int val = simple_strtoul(buf, NULL, 0);
+ unsigned long val;
- if (edev->cb->set_locate)
- edev->cb->set_locate(edev, ecomp, val);
+ if (!kstrtoul(buf, 0, &val) && edev->cb->set_locate)
+ edev->cb->set_locate(edev, ecomp, (int)val);
return count;
}
+int enclosure_get_device_power(struct device *cdev)
+{
+ struct enclosure_device *edev = to_enclosure_device(cdev->parent);
+ struct enclosure_component *ecomp = to_enclosure_component(cdev);
+
+ if (edev->cb->get_device_power)
+ edev->cb->get_device_power(edev, ecomp);
+ return ecomp->device_power;
+}
+EXPORT_SYMBOL_GPL(enclosure_get_device_power);
+
+void enclosure_set_device_power(struct device *cdev, int val)
+{
+ struct enclosure_device *edev = to_enclosure_device(cdev->parent);
+ struct enclosure_component *ecomp = to_enclosure_component(cdev);
+
+ if (edev->cb->set_device_power)
+ edev->cb->set_device_power(edev, ecomp, val);
+}
+EXPORT_SYMBOL_GPL(enclosure_set_device_power);
+
+#ifdef CONFIG_EXPERIMENTAL
+static ssize_t get_component_device_power(struct device *cdev,
+ struct device_attribute *attr, char *buf)
+{
+ return snprintf(buf, 40, "%d\n", enclosure_get_device_power(cdev));
+}
+
+static ssize_t set_component_device_power(struct device *cdev,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
+{
+ unsigned long val;
+
+ if (!kstrtoul(buf, 0, &val))
+ enclosure_set_device_power(cdev, (int)val);
+ return count;
+}
+#endif
+
static ssize_t get_component_type(struct device *cdev,
struct device_attribute *attr, char *buf)
{
@@ -526,6 +566,8 @@ static DEVICE_ATTR(active, S_IRUGO | S_IWUSR, get_component_active,
set_component_active);
static DEVICE_ATTR(locate, S_IRUGO | S_IWUSR, get_component_locate,
set_component_locate);
+static DEVICE_ATTR(device_power, S_IRUGO | S_IWUSR, get_component_device_power,
+ set_component_device_power);
static DEVICE_ATTR(type, S_IRUGO, get_component_type, NULL);
static struct attribute *enclosure_component_attrs[] = {
@@ -533,6 +575,7 @@ static struct attribute *enclosure_component_attrs[] = {
&dev_attr_status.attr,
&dev_attr_active.attr,
&dev_attr_locate.attr,
+ &dev_attr_device_power.attr,
&dev_attr_type.attr,
NULL
};
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 2cfcbff..3153609 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -842,6 +842,55 @@ static int scsi_send_eh_cmnd(struct scsi_cmnd *scmd, unsigned char *cmnd,
}
/**
+ * scsi_execute_eh_req - submit a scsi command to bypass error recovery.
+ * @scmd: SCSI command structure to hijack
+ * @cmnd: CDB to send
+ * @cmnd_size: size in bytes of @cmnd
+ * @timeout: timeout for this request
+ * @sense_bytes: size of sense data to copy or 0
+ *
+ * This function is used to send a scsi command down to a target device
+ * to bypass error recovery process.
+ *
+ * Return value:
+ * SUCCESS or FAILED or NEEDS_RETRY
+ */
+int
+scsi_execute_eh_req(struct scsi_device *sdev, unsigned char *cmd,
+ int data_direction, void *buffer, unsigned bufflen)
+{
+ struct scsi_cmnd *scmd;
+ struct request req;
+ int result = DRIVER_ERROR << 24;
+
+ blk_rq_init(NULL, &req);
+ req.cmd_len = COMMAND_SIZE(cmd[0]);
+ memcpy(req.cmd, cmd, req.cmd_len);
+ req.sense = NULL;
+ req.sense_len = 0;
+ req.retries = 3;
+ req.timeout = 30 * HZ;
+ req.cmd_type = REQ_TYPE_BLOCK_PC;
+ req.cmd_flags = REQ_QUIET | REQ_PREEMPT;
+ if (bufflen && blk_rq_map_kern(sdev->request_queue, &req,
+ buffer, bufflen, __GFP_WAIT))
+ return result;
+
+ scmd = scsi_get_command(sdev, GFP_KERNEL);
+ scmd->request = &req;
+ scmd->cmnd = req.cmd;
+ scmd->scsi_done = scsi_eh_done;
+ memset(&scmd->sdb, 0, sizeof(scmd->sdb));
+ scmd->cmd_len = 6;
+ scmd->sc_data_direction = data_direction;
+
+ result = scsi_send_eh_cmnd(scmd, cmd, 6, 30 * HZ, 0);
+
+ return result;
+}
+EXPORT_SYMBOL_GPL(scsi_execute_eh_req);
+
+/**
* scsi_request_sense - Request sense data from a particular target.
* @scmd: SCSI cmd for request sense.
*
diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c
index eba183c..2fa62e9 100644
--- a/drivers/scsi/ses.c
+++ b/drivers/scsi/ses.c
@@ -21,7 +21,6 @@
**-----------------------------------------------------------------------------
*/
-#include <linux/slab.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/enclosure.h>
@@ -32,6 +31,7 @@
#include <scsi/scsi_device.h>
#include <scsi/scsi_driver.h>
#include <scsi/scsi_host.h>
+#include <scsi/scsi_eh.h>
struct ses_device {
unsigned char *page1;
@@ -79,6 +79,13 @@ static int ses_recv_diag(struct scsi_device *sdev, int page_code,
0
};
+ /* Allow command to punch-through host error recovery? */
+ if (scsi_host_in_recovery(sdev->host) && !list_empty(&sdev->cmd_list))
+ return DRIVER_SOFT << 24;
+
+ if (scsi_host_in_recovery(sdev->host))
+ return scsi_execute_eh_req(sdev, cmd, DMA_FROM_DEVICE,
+ buf, bufflen);
return scsi_execute_req(sdev, cmd, DMA_FROM_DEVICE, buf, bufflen,
NULL, SES_TIMEOUT, SES_RETRIES, NULL);
}
@@ -97,7 +104,16 @@ static int ses_send_diag(struct scsi_device *sdev, int page_code,
0
};
- result = scsi_execute_req(sdev, cmd, DMA_TO_DEVICE, buf, bufflen,
+ /* Allow command to punch-through host error recovery? */
+ if (scsi_host_in_recovery(sdev->host) && !list_empty(&sdev->cmd_list))
+ return DRIVER_SOFT << 24;
+
+ if (scsi_host_in_recovery(sdev->host))
+ result = scsi_execute_eh_req(sdev, cmd, DMA_TO_DEVICE,
+ buf, bufflen);
+ else
+ result = scsi_execute_req(sdev, cmd, DMA_TO_DEVICE,
+ buf, bufflen,
NULL, SES_TIMEOUT, SES_RETRIES, NULL);
if (result)
sdev_printk(KERN_ERR, sdev, "SEND DIAGNOSTIC result: %8x\n",
@@ -174,18 +190,38 @@ static void ses_get_fault(struct enclosure_device *edev,
ecomp->fault = (desc[3] & 0x60) >> 4;
}
+static void ses_read_page2_descriptor(struct enclosure_device *edev,
+ struct enclosure_component *ecomp,
+ unsigned char *desc)
+{
+ unsigned char *desc_ptr = ses_get_page2_descriptor(edev, ecomp);
+
+ if (desc_ptr)
+ memcpy(desc, desc_ptr, 4);
+ /* preserve active state */
+ if (ecomp->active)
+ desc[2] |= 0x80;
+ else
+ desc[2] &= ~0x80;
+ /* Clear all reserved/alternate-purpose bits */
+ desc[2] &= 0xE7;
+ desc[3] &= 0x3C;
+}
+
static int ses_set_fault(struct enclosure_device *edev,
struct enclosure_component *ecomp,
enum enclosure_component_setting val)
{
unsigned char desc[4] = {0 };
+ ses_read_page2_descriptor(edev, ecomp, desc);
switch (val) {
case ENCLOSURE_SETTING_DISABLED:
/* zero is disabled */
+ desc[3] &= ~0x20;
break;
case ENCLOSURE_SETTING_ENABLED:
- desc[3] = 0x20;
+ desc[3] |= 0x20;
break;
default:
/* SES doesn't do the SGPIO blink settings */
@@ -221,12 +257,46 @@ static int ses_set_locate(struct enclosure_device *edev,
{
unsigned char desc[4] = {0 };
+ ses_read_page2_descriptor(edev, ecomp, desc);
switch (val) {
case ENCLOSURE_SETTING_DISABLED:
/* zero is disabled */
+ desc[2] &= ~0x02;
+ break;
+ case ENCLOSURE_SETTING_ENABLED:
+ desc[2] |= 0x02;
+ break;
+ default:
+ /* SES doesn't do the SGPIO blink settings */
+ return -EINVAL;
+ }
+ return ses_set_page2_descriptor(edev, ecomp, desc);
+}
+
+static void ses_get_device_power(struct enclosure_device *edev,
+ struct enclosure_component *ecomp)
+{
+ unsigned char *desc;
+
+ desc = ses_get_page2_descriptor(edev, ecomp);
+ if (desc)
+ ecomp->device_power = (desc[3] & 0x10) ? 0 : 1;
+}
+
+static int ses_set_device_power(struct enclosure_device *edev,
+ struct enclosure_component *ecomp,
+ enum enclosure_component_setting val)
+{
+ unsigned char desc[4] = {0 };
+
+ ses_read_page2_descriptor(edev, ecomp, desc);
+ switch (val) {
+ case ENCLOSURE_SETTING_DISABLED:
+ /* one is disabled */
+ desc[3] |= 0x10;
break;
case ENCLOSURE_SETTING_ENABLED:
- desc[2] = 0x02;
+ desc[3] &= ~0x10;
break;
default:
/* SES doesn't do the SGPIO blink settings */
@@ -241,13 +311,15 @@ static int ses_set_active(struct enclosure_device *edev,
{
unsigned char desc[4] = {0 };
+ ses_read_page2_descriptor(edev, ecomp, desc);
switch (val) {
case ENCLOSURE_SETTING_DISABLED:
/* zero is disabled */
+ desc[2] &= ~0x80;
ecomp->active = 0;
break;
case ENCLOSURE_SETTING_ENABLED:
- desc[2] = 0x80;
+ desc[2] |= 0x80;
ecomp->active = 1;
break;
default:
@@ -263,6 +335,8 @@ static struct enclosure_component_callbacks ses_enclosure_callbacks = {
.get_status = ses_get_status,
.get_locate = ses_get_locate,
.set_locate = ses_set_locate,
+ .get_device_power = ses_get_device_power,
+ .set_device_power = ses_set_device_power,
.set_active = ses_set_active,
};
@@ -271,25 +345,6 @@ struct ses_host_edev {
struct enclosure_device *edev;
};
-#if 0
-int ses_match_host(struct enclosure_device *edev, void *data)
-{
- struct ses_host_edev *sed = data;
- struct scsi_device *sdev;
-
- if (!scsi_is_sdev_device(edev->edev.parent))
- return 0;
-
- sdev = to_scsi_device(edev->edev.parent);
-
- if (sdev->host != sed->shost)
- return 0;
-
- sed->edev = edev;
- return 1;
-}
-#endif /* 0 */
-
static void ses_process_descriptor(struct enclosure_component *ecomp,
unsigned char *desc)
{
diff --git a/include/linux/enclosure.h b/include/linux/enclosure.h
index 9a33c5f..46f4482 100644
--- a/include/linux/enclosure.h
+++ b/include/linux/enclosure.h
@@ -79,6 +79,11 @@ struct enclosure_component_callbacks {
int (*set_locate)(struct enclosure_device *,
struct enclosure_component *,
enum enclosure_component_setting);
+ void (*get_device_power)(struct enclosure_device *,
+ struct enclosure_component *);
+ int (*set_device_power)(struct enclosure_device *,
+ struct enclosure_component *,
+ enum enclosure_component_setting);
};
@@ -91,6 +96,7 @@ struct enclosure_component {
int fault;
int active;
int locate;
+ int device_power;
enum enclosure_status status;
};
@@ -129,5 +135,7 @@ struct enclosure_device *enclosure_find(struct device *dev,
struct enclosure_device *start);
int enclosure_for_each_device(int (*fn)(struct enclosure_device *, void *),
void *data);
+int enclosure_get_device_power(struct device *cdev);
+void enclosure_set_device_power(struct device *cdev, int val);
#endif /* _LINUX_ENCLOSURE_H_ */
diff --git a/include/scsi/scsi_eh.h b/include/scsi/scsi_eh.h
index 06a8790..cac0809 100644
--- a/include/scsi/scsi_eh.h
+++ b/include/scsi/scsi_eh.h
@@ -92,4 +92,7 @@ extern void scsi_eh_prep_cmnd(struct scsi_cmnd *scmd,
extern void scsi_eh_restore_cmnd(struct scsi_cmnd* scmd,
struct scsi_eh_save *ses);
+extern int scsi_execute_eh_req(struct scsi_device *sdev, unsigned char *cmd,
+ int data_direction, void *buffer, unsigned bufflen);
+
#endif /* _SCSI_SCSI_EH_H */
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
