86 lines
2.8 KiB
Diff
86 lines
2.8 KiB
Diff
From: "K. Y. Srinivasan" <kys@microsoft.com>
|
|
Date: Thu, 12 Jan 2012 12:37:57 -0800
|
|
Subject: [PATCH 51/77] Staging: hv: storvsc: Introduce defines for srb status
|
|
codes
|
|
|
|
commit 160463204f541cea112fd4d68422f297bd98ec51 upstream.
|
|
|
|
Introduce defines for srb status codes.
|
|
|
|
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/staging/hv/storvsc_drv.c | 21 ++++++++++++++++-----
|
|
1 file changed, 16 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
|
|
index 71e50c3..979f25b 100644
|
|
--- a/drivers/staging/hv/storvsc_drv.c
|
|
+++ b/drivers/staging/hv/storvsc_drv.c
|
|
@@ -257,6 +257,16 @@ enum storvsc_request_type {
|
|
UNKNOWN_TYPE,
|
|
};
|
|
|
|
+/*
|
|
+ * SRB status codes and masks; a subset of the codes used here.
|
|
+ */
|
|
+
|
|
+#define SRB_STATUS_AUTOSENSE_VALID 0x80
|
|
+#define SRB_STATUS_INVALID_LUN 0x20
|
|
+#define SRB_STATUS_SUCCESS 0x01
|
|
+#define SRB_STATUS_ERROR 0x04
|
|
+
|
|
+
|
|
|
|
struct hv_storvsc_request {
|
|
struct hv_device *device;
|
|
@@ -561,7 +571,7 @@ static void storvsc_on_io_completion(struct hv_device *device,
|
|
if ((stor_pkt->vm_srb.cdb[0] == INQUIRY) ||
|
|
(stor_pkt->vm_srb.cdb[0] == MODE_SENSE)) {
|
|
vstor_packet->vm_srb.scsi_status = 0;
|
|
- vstor_packet->vm_srb.srb_status = 0x1;
|
|
+ vstor_packet->vm_srb.srb_status = SRB_STATUS_SUCCESS;
|
|
}
|
|
|
|
|
|
@@ -572,7 +582,7 @@ static void storvsc_on_io_completion(struct hv_device *device,
|
|
vstor_packet->vm_srb.sense_info_length;
|
|
|
|
if (vstor_packet->vm_srb.scsi_status != 0 ||
|
|
- vstor_packet->vm_srb.srb_status != 1){
|
|
+ vstor_packet->vm_srb.srb_status != SRB_STATUS_SUCCESS){
|
|
dev_warn(&device->device,
|
|
"cmd 0x%x scsi status 0x%x srb status 0x%x\n",
|
|
stor_pkt->vm_srb.cdb[0],
|
|
@@ -582,7 +592,8 @@ static void storvsc_on_io_completion(struct hv_device *device,
|
|
|
|
if ((vstor_packet->vm_srb.scsi_status & 0xFF) == 0x02) {
|
|
/* CHECK_CONDITION */
|
|
- if (vstor_packet->vm_srb.srb_status & 0x80) {
|
|
+ if (vstor_packet->vm_srb.srb_status &
|
|
+ SRB_STATUS_AUTOSENSE_VALID) {
|
|
/* autosense data available */
|
|
dev_warn(&device->device,
|
|
"stor pkt %p autosense data valid - len %d\n",
|
|
@@ -1191,7 +1202,7 @@ static void storvsc_command_completion(struct hv_storvsc_request *request)
|
|
* error recovery strategies would have already been
|
|
* deployed on the host side.
|
|
*/
|
|
- if (vm_srb->srb_status == 0x4)
|
|
+ if (vm_srb->srb_status == SRB_STATUS_ERROR)
|
|
scmnd->result = DID_TARGET_FAILURE << 16;
|
|
else
|
|
scmnd->result = vm_srb->scsi_status;
|
|
@@ -1199,7 +1210,7 @@ static void storvsc_command_completion(struct hv_storvsc_request *request)
|
|
/*
|
|
* If the LUN is invalid; remove the device.
|
|
*/
|
|
- if (vm_srb->srb_status == 0x20) {
|
|
+ if (vm_srb->srb_status == SRB_STATUS_INVALID_LUN) {
|
|
struct storvsc_device *stor_dev;
|
|
struct hv_device *dev = host_dev->dev;
|
|
struct Scsi_Host *host;
|
|
--
|
|
1.7.9.5
|
|
|