mirror of
https://github.com/opnsense/src.git
synced 2026-04-02 16:05:17 -04:00
Use CAM_DEV_NOT_THERE instead of CAM_SEL_TIMEOUT to report nonexistent
LUNs for the virtual processor device. This removes lots of CAM warnings, and follows similar recent changes to tws(4) and twa(4) drivers. Also fix case where CAM_REQ_CMP was getting OR'd with CAM_DEV_NOT_THERE in the nonexistent LUN case, resulting in different CAM status (CAM_UA_TERMIO) getting reported to CAM. This issue existing previously, but was more subtle because it changed CAM_SEL_TIMEOUT to CAM_CMD_TIMEOUT. Sponsored by: Intel Reported and tested by: Willem Jan Withagen <wjw@digiware.nl> MFC after: 1 week
This commit is contained in:
parent
44383aa35e
commit
61ba2ac6b4
1 changed files with 4 additions and 2 deletions
|
|
@ -2432,14 +2432,13 @@ static void arcmsr_bus_reset(struct AdapterControlBlock *acb)
|
|||
static void arcmsr_handle_virtual_command(struct AdapterControlBlock *acb,
|
||||
union ccb * pccb)
|
||||
{
|
||||
pccb->ccb_h.status |= CAM_REQ_CMP;
|
||||
switch (pccb->csio.cdb_io.cdb_bytes[0]) {
|
||||
case INQUIRY: {
|
||||
unsigned char inqdata[36];
|
||||
char *buffer=pccb->csio.data_ptr;
|
||||
|
||||
if (pccb->ccb_h.target_lun) {
|
||||
pccb->ccb_h.status |= CAM_SEL_TIMEOUT;
|
||||
pccb->ccb_h.status |= CAM_DEV_NOT_THERE;
|
||||
xpt_done(pccb);
|
||||
return;
|
||||
}
|
||||
|
|
@ -2455,6 +2454,7 @@ static void arcmsr_handle_virtual_command(struct AdapterControlBlock *acb,
|
|||
strncpy(&inqdata[16], "RAID controller ", 16); /* Product Identification */
|
||||
strncpy(&inqdata[32], "R001", 4); /* Product Revision */
|
||||
memcpy(buffer, inqdata, sizeof(inqdata));
|
||||
pccb->ccb_h.status |= CAM_REQ_CMP;
|
||||
xpt_done(pccb);
|
||||
}
|
||||
break;
|
||||
|
|
@ -2464,10 +2464,12 @@ static void arcmsr_handle_virtual_command(struct AdapterControlBlock *acb,
|
|||
pccb->ccb_h.status |= CAM_SCSI_STATUS_ERROR;
|
||||
pccb->csio.scsi_status = SCSI_STATUS_CHECK_COND;
|
||||
}
|
||||
pccb->ccb_h.status |= CAM_REQ_CMP;
|
||||
xpt_done(pccb);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
pccb->ccb_h.status |= CAM_REQ_CMP;
|
||||
xpt_done(pccb);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue