iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xen/scsifront: use new command result macros

Browse Source 
Add a translation layer for the command result values.

Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Link: https://lore.kernel.org/r/20220428075323.12853-4-jgross@suse.com
Signed-off-by: Juergen Gross <jgross@suse.com>
This commit is contained in:
Juergen Gross 2022-04-28 09:53:22 +02:00
parent 54aee68bb6
commit a2f6751d5a
1 changed files with 56 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
drivers/scsi/xen-scsifront.c
View File

@ -243,6 +243,56 @@ static void scsifront_gnttab_done(struct vscsifrnt_info *info,
kfree(shadow->sg);
}
static unsigned int scsifront_host_byte(int32_t rslt)
{
switch (XEN_VSCSIIF_RSLT_HOST(rslt)) {
case XEN_VSCSIIF_RSLT_HOST_OK:
return DID_OK;
case XEN_VSCSIIF_RSLT_HOST_NO_CONNECT:
return DID_NO_CONNECT;
case XEN_VSCSIIF_RSLT_HOST_BUS_BUSY:
return DID_BUS_BUSY;
case XEN_VSCSIIF_RSLT_HOST_TIME_OUT:
return DID_TIME_OUT;
case XEN_VSCSIIF_RSLT_HOST_BAD_TARGET:
return DID_BAD_TARGET;
case XEN_VSCSIIF_RSLT_HOST_ABORT:
return DID_ABORT;
case XEN_VSCSIIF_RSLT_HOST_PARITY:
return DID_PARITY;
case XEN_VSCSIIF_RSLT_HOST_ERROR:
return DID_ERROR;
case XEN_VSCSIIF_RSLT_HOST_RESET:
return DID_RESET;
case XEN_VSCSIIF_RSLT_HOST_BAD_INTR:
return DID_BAD_INTR;
case XEN_VSCSIIF_RSLT_HOST_PASSTHROUGH:
return DID_PASSTHROUGH;
case XEN_VSCSIIF_RSLT_HOST_SOFT_ERROR:
return DID_SOFT_ERROR;
case XEN_VSCSIIF_RSLT_HOST_IMM_RETRY:
return DID_IMM_RETRY;
case XEN_VSCSIIF_RSLT_HOST_REQUEUE:
return DID_REQUEUE;
case XEN_VSCSIIF_RSLT_HOST_TRANSPORT_DISRUPTED:
return DID_TRANSPORT_DISRUPTED;
case XEN_VSCSIIF_RSLT_HOST_TRANSPORT_FAILFAST:
return DID_TRANSPORT_FAILFAST;
case XEN_VSCSIIF_RSLT_HOST_TARGET_FAILURE:
return DID_TARGET_FAILURE;
case XEN_VSCSIIF_RSLT_HOST_NEXUS_FAILURE:
return DID_NEXUS_FAILURE;
case XEN_VSCSIIF_RSLT_HOST_ALLOC_FAILURE:
return DID_ALLOC_FAILURE;
case XEN_VSCSIIF_RSLT_HOST_MEDIUM_ERROR:
return DID_MEDIUM_ERROR;
case XEN_VSCSIIF_RSLT_HOST_TRANSPORT_MARGINAL:
return DID_TRANSPORT_MARGINAL;
default:
return DID_ERROR;
}
}
static void scsifront_cdb_cmd_done(struct vscsifrnt_info *info,
struct vscsiif_response *ring_rsp)
{
@ -250,7 +300,6 @@ static void scsifront_cdb_cmd_done(struct vscsifrnt_info *info,
struct scsi_cmnd *sc;
uint32_t id;
uint8_t sense_len;
int result;
id = ring_rsp->rqid;
shadow = info->shadow[id];
@ -261,12 +310,8 @@ static void scsifront_cdb_cmd_done(struct vscsifrnt_info *info,
scsifront_gnttab_done(info, shadow);
scsifront_put_rqid(info, id);
result = ring_rsp->rslt;
if (result >> 24)
set_host_byte(sc, DID_ERROR);
else
set_host_byte(sc, host_byte(result));
set_status_byte(sc, result & 0xff);
set_host_byte(sc, scsifront_host_byte(ring_rsp->rslt));
set_status_byte(sc, XEN_VSCSIIF_RSLT_STATUS(ring_rsp->rslt));
scsi_set_resid(sc, ring_rsp->residual_len);
sense_len = min_t(uint8_t, VSCSIIF_SENSE_BUFFERSIZE,
@ -290,7 +335,10 @@ static void scsifront_sync_cmd_done(struct vscsifrnt_info *info,
shadow->wait_reset = 1;
switch (shadow->rslt_reset) {
case RSLT_RESET_WAITING:
shadow->rslt_reset = ring_rsp->rslt;
if (ring_rsp->rslt == XEN_VSCSIIF_RSLT_RESET_SUCCESS)
shadow->rslt_reset = SUCCESS;
else
shadow->rslt_reset = FAILED;
break;
case RSLT_RESET_ERR:
kick = _scsifront_put_rqid(info, id);