diff options
| author | mjacob <mjacob@FreeBSD.org> | 2000-01-04 03:44:21 +0000 |
|---|---|---|
| committer | mjacob <mjacob@FreeBSD.org> | 2000-01-04 03:44:21 +0000 |
| commit | 981a7cc5f70519fff05d42d33d3e106929acf20a (patch) | |
| tree | 5921194551211a15575d4fdc15c8acacd6aa565c | |
| parent | 2fabb47dbda73382d124bb76b30cd353dba73514 (diff) | |
| download | FreeBSD-src-981a7cc5f70519fff05d42d33d3e106929acf20a.zip FreeBSD-src-981a7cc5f70519fff05d42d33d3e106929acf20a.tar.gz | |
Make Fibre Channel cards correctly note the presence/absence
of ARQ data and punt the dealing with its presence/absence
to the platform layers.
| -rw-r--r-- | sys/dev/isp/isp.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c index 966574e..0857bd9 100644 --- a/sys/dev/isp/isp.c +++ b/sys/dev/isp/isp.c @@ -2407,11 +2407,14 @@ isp_intr(arg) isp->isp_update |= (1 << XS_CHANNEL(xs)); } } else { - if (XS_STS(xs) == SCSI_CHECK) { + if (sp->req_scsi_status & RQCS_SV) { + int amt = min(XS_SNSLEN(xs), sp->req_sense_len); + MEMCPY(XS_SNSP(xs), sp->req_sense_data, amt); XS_SNS_IS_VALID(xs); - MEMCPY(XS_SNSP(xs), sp->req_sense_data, - XS_SNSLEN(xs)); sp->req_state_flags |= RQSF_GOT_SENSE; + } else if (XS_STS(xs) == SCSI_CHECK) { + IDPRINTF(1, ("%s: check condition with no sense" + " data\n", isp->isp_name)); } } if (XS_NOERR(xs) && XS_STS(xs) == SCSI_BUSY) { @@ -2454,6 +2457,10 @@ isp_intr(arg) ISP_DMAFREE(isp, xs, sp->req_handle); } /* + * Let the platforms cope. + */ +#if 0 + /* * XXX: If we have a check condition, but no Sense Data, * XXX: mark it as an error (ARQ failed). We need to * XXX: to do a more distinct job because there may @@ -2466,6 +2473,7 @@ isp_intr(arg) XS_SETERR(xs, HBA_ARQFAIL); } } +#endif if ((isp->isp_dblev >= 5) || (isp->isp_dblev > 2 && !XS_NOERR(xs))) { PRINTF("%s(%d.%d): FIN dl%d resid%d STS %x", |
