From owner-svn-src-head@freebsd.org Tue Nov 24 17:37:13 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C3A462EC3FE; Tue, 24 Nov 2020 17:37:13 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CgWRs51PXz50Wx; Tue, 24 Nov 2020 17:37:13 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 904A0229BF; Tue, 24 Nov 2020 17:37:13 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0AOHbDdd011091; Tue, 24 Nov 2020 17:37:13 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AOHbDRX011089; Tue, 24 Nov 2020 17:37:13 GMT (envelope-from mav@FreeBSD.org) Message-Id: <202011241737.0AOHbDRX011089@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Tue, 24 Nov 2020 17:37:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r367991 - head/sys/dev/isp X-SVN-Group: head X-SVN-Commit-Author: mav X-SVN-Commit-Paths: head/sys/dev/isp X-SVN-Commit-Revision: 367991 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Nov 2020 17:37:13 -0000 Author: mav Date: Tue Nov 24 17:37:12 2020 New Revision: 367991 URL: https://svnweb.freebsd.org/changeset/base/367991 Log: Update RQSFLAG_* definitions. Modified: head/sys/dev/isp/isp.c head/sys/dev/isp/ispmbox.h Modified: head/sys/dev/isp/isp.c ============================================================================== --- head/sys/dev/isp/isp.c Tue Nov 24 17:32:49 2020 (r367990) +++ head/sys/dev/isp/isp.c Tue Nov 24 17:37:12 2020 (r367991) @@ -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", + if (sp->req_header.rqs_flags & RQSFLAG_BADTYPE) { + isp_print_qentry(isp, "invalid entry type", 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", - 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; } Modified: head/sys/dev/isp/ispmbox.h ============================================================================== --- head/sys/dev/isp/ispmbox.h Tue Nov 24 17:32:49 2020 (r367990) +++ head/sys/dev/isp/ispmbox.h Tue Nov 24 17:37:12 2020 (r367991) @@ -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