Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3a3b55a authored by Brian King's avatar Brian King Committed by James Bottomley
Browse files

[SCSI] ibmvscsi: Handle non SCSI error status 



Adds support to the ibmvscsi driver to handle non SCSI error
status. This is needed to support some new VIOS enhancements.

Signed-off-by: default avatarBrian King <brking@linux.vnet.ibm.com>
Signed-off-by: default avatarSantiago Leon <santil@us.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 61d7416a

drivers/scsi/ibmvscsi/ibmvscsi.c

+4 −1
Original line number Diff line number Diff line
@@ -686,7 +686,7 @@ static void handle_cmd_rsp(struct srp_event_struct *evt_struct) 
	}

	

	if (cmnd) {

		cmnd->result = rsp->status;

		cmnd->result |= rsp->status;

		if (((cmnd->result >> 1) & 0x1f) == CHECK_CONDITION)

			memcpy(cmnd->sense_buffer,

			       rsp->data,
@@ -730,6 +730,7 @@ static int ibmvscsi_queuecommand(struct scsi_cmnd *cmnd, 
	u16 lun = lun_from_dev(cmnd->device);

	u8 out_fmt, in_fmt;



	cmnd->result = (DID_OK << 16);

	evt_struct = get_event_struct(&hostdata->pool);

	if (!evt_struct)

		return SCSI_MLQUEUE_HOST_BUSY;
@@ -1347,6 +1348,8 @@ void ibmvscsi_handle_crq(struct viosrp_crq *crq, 


	del_timer(&evt_struct->timer);



	if (crq->status != VIOSRP_OK && evt_struct->cmnd)

		evt_struct->cmnd->result = DID_ERROR << 16;

	if (evt_struct->done)

		evt_struct->done(evt_struct);

	else

drivers/scsi/ibmvscsi/viosrp.h

+9 −0
Original line number Diff line number Diff line
@@ -59,6 +59,15 @@ enum viosrp_crq_formats { 
	VIOSRP_INLINE_FORMAT = 0x07

};



enum viosrp_crq_status {

	VIOSRP_OK = 0x0,

	VIOSRP_NONRECOVERABLE_ERR = 0x1,

	VIOSRP_VIOLATES_MAX_XFER = 0x2,

	VIOSRP_PARTNER_PANIC = 0x3,

	VIOSRP_DEVICE_BUSY = 0x8,

	VIOSRP_ADAPTER_FAIL = 0x10

};



struct viosrp_crq {

	u8 valid;		/* used by RPA */

	u8 format;		/* SCSI vs out-of-band */