diff options
| author | Alexander Motin <mav@FreeBSD.org> | 2020-11-24 17:37:12 +0000 |
|---|---|---|
| committer | Alexander Motin <mav@FreeBSD.org> | 2020-11-24 17:37:12 +0000 |
| commit | 5bcbd98c8bea0119ef0b0521d8a2709078dcecda (patch) | |
| tree | c78c90156f3c5d3d92c57e07468996a554232d08 /sys/dev | |
| parent | d5325f2f3cc37996115e051d37ace36275184f20 (diff) | |
Notes
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/isp/isp.c | 23 | ||||
| -rw-r--r-- | sys/dev/isp/ispmbox.h | 6 |
2 files changed, 8 insertions, 21 deletions
diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c index cfac31fcdfe4..b68b5c15486a 100644 --- a/sys/dev/isp/isp.c +++ b/sys/dev/isp/isp.c @@ -3225,6 +3225,7 @@ isp_intr_respq(ispsoftc_t *isp) XS_T *xs, *cont_xs; uint8_t qe[QENTRY_LEN]; isp24xx_statusreq_t *sp = (isp24xx_statusreq_t *)qe; + ispstatus_cont_t *scp = (ispstatus_cont_t *)qe; isphdr_t *hp; uint8_t *resp, *snsp; int buddaboom, completion_status, cont = 0, etype, i; @@ -3272,7 +3273,6 @@ isp_intr_respq(ispsoftc_t *isp) req_state_flags = 0; resid = sp->req_resid; } else if (etype == RQSTYPE_STATUS_CONT) { - ispstatus_cont_t *scp = (ispstatus_cont_t *)qe; isp_get_cont_response(isp, (ispstatus_cont_t *)hp, scp); if (cont > 0) { i = min(cont, sizeof(scp->req_sense_data)); @@ -3310,24 +3310,13 @@ isp_intr_respq(ispsoftc_t *isp) buddaboom = 0; if (sp->req_header.rqs_flags & RQSFLAG_MASK) { - if (sp->req_header.rqs_flags & RQSFLAG_CONTINUATION) { - isp_print_qentry(isp, "unexpected continuation segment", - cptr, hp); - continue; - } - if (sp->req_header.rqs_flags & RQSFLAG_FULL) { - isp_prt(isp, ISP_LOG_WARN1, "internal queues full"); - /* - * We'll synthesize a QUEUE FULL message below. - */ - } - if (sp->req_header.rqs_flags & RQSFLAG_BADHEADER) { - isp_print_qentry(isp, "bad header flag", + if (sp->req_header.rqs_flags & RQSFLAG_BADTYPE) { + isp_print_qentry(isp, "invalid entry type", cptr, hp); buddaboom++; } - if (sp->req_header.rqs_flags & RQSFLAG_BADPACKET) { - isp_print_qentry(isp, "bad request packet", + if (sp->req_header.rqs_flags & RQSFLAG_BADPARAM) { + isp_print_qentry(isp, "invalid entry parameter", cptr, hp); buddaboom++; } @@ -3337,7 +3326,7 @@ isp_intr_respq(ispsoftc_t *isp) buddaboom++; } if (sp->req_header.rqs_flags & RQSFLAG_BADORDER) { - isp_print_qentry(isp, "invalid IOCB ordering", + isp_print_qentry(isp, "invalid entry order", cptr, hp); continue; } diff --git a/sys/dev/isp/ispmbox.h b/sys/dev/isp/ispmbox.h index 2cba05d20801..1af6ba13a1fc 100644 --- a/sys/dev/isp/ispmbox.h +++ b/sys/dev/isp/ispmbox.h @@ -353,10 +353,8 @@ typedef struct { } isphdr_t; /* RQS Flag definitions */ -#define RQSFLAG_CONTINUATION 0x01 -#define RQSFLAG_FULL 0x02 -#define RQSFLAG_BADHEADER 0x04 -#define RQSFLAG_BADPACKET 0x08 +#define RQSFLAG_BADTYPE 0x04 +#define RQSFLAG_BADPARAM 0x08 #define RQSFLAG_BADCOUNT 0x10 #define RQSFLAG_BADORDER 0x20 #define RQSFLAG_MASK 0x3f |