From owner-svn-src-all@freebsd.org Fri Nov 13 19:33:14 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 84EB6A2E469; Fri, 13 Nov 2015 19:33:14 +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 mx1.freebsd.org (Postfix) with ESMTPS id 4641612C7; Fri, 13 Nov 2015 19:33:14 +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 tADJXDdF092330; Fri, 13 Nov 2015 19:33:13 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tADJXDpt092328; Fri, 13 Nov 2015 19:33:13 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201511131933.tADJXDpt092328@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Fri, 13 Nov 2015 19:33:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r290780 - stable/10/sys/dev/isp X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Nov 2015 19:33:14 -0000 Author: mav Date: Fri Nov 13 19:33:13 2015 New Revision: 290780 URL: https://svnweb.freebsd.org/changeset/base/290780 Log: MFC r289620: Decode more firmware attributes. Modified: stable/10/sys/dev/isp/isp.c stable/10/sys/dev/isp/ispmbox.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/isp/isp.c ============================================================================== --- stable/10/sys/dev/isp/isp.c Fri Nov 13 19:32:17 2015 (r290779) +++ stable/10/sys/dev/isp/isp.c Fri Nov 13 19:33:13 2015 (r290780) @@ -1090,8 +1090,13 @@ isp_reset(ispsoftc_t *isp, int do_load_d } else { isp->isp_fwattr = mbs.param[6]; } - if (IS_24XX(isp) && (isp->isp_fwattr & ISP2400_FW_ATTR_EXTNDED)) { - isp->isp_fwattr |= (((uint64_t) mbs.param[15]) << 16) | (((uint64_t) mbs.param[16]) << 32) | (((uint64_t) mbs.param[17]) << 48); + if (IS_24XX(isp)) { + isp->isp_fwattr |= ((uint64_t) mbs.param[15]) << 16; + if (isp->isp_fwattr & ISP2400_FW_ATTR_EXTNDED) { + isp->isp_fwattr |= + (((uint64_t) mbs.param[16]) << 32) | + (((uint64_t) mbs.param[17]) << 48); + } } } else if (IS_SCSI(isp)) { #ifndef ISP_TARGET_MODE @@ -1132,6 +1137,18 @@ isp_reset(ispsoftc_t *isp, int do_load_d fwt ^=ISP2400_FW_ATTR_VI; ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s VI", buf); } + if (fwt & ISP2400_FW_ATTR_MQ) { + fwt ^=ISP2400_FW_ATTR_MQ; + ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s MQ", buf); + } + if (fwt & ISP2400_FW_ATTR_MSIX) { + fwt ^=ISP2400_FW_ATTR_MSIX; + ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s MSIX", buf); + } + if (fwt & ISP2400_FW_ATTR_FCOE) { + fwt ^=ISP2400_FW_ATTR_FCOE; + ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s FCOE", buf); + } if (fwt & ISP2400_FW_ATTR_VP0) { fwt ^= ISP2400_FW_ATTR_VP0; ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s VP0_Decoupling", buf); @@ -1140,7 +1157,43 @@ isp_reset(ispsoftc_t *isp, int do_load_d fwt ^= ISP2400_FW_ATTR_EXPFW; ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s (Experimental)", buf); } + if (fwt & ISP2400_FW_ATTR_HOTFW) { + fwt ^= ISP2400_FW_ATTR_HOTFW; + ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s HotFW", buf); + } fwt &= ~ISP2400_FW_ATTR_EXTNDED; + if (fwt & ISP2400_FW_ATTR_EXTVP) { + fwt ^= ISP2400_FW_ATTR_EXTVP; + ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s ExtVP", buf); + } + if (fwt & ISP2400_FW_ATTR_VN2VN) { + fwt ^= ISP2400_FW_ATTR_VN2VN; + ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s VN2VN", buf); + } + if (fwt & ISP2400_FW_ATTR_EXMOFF) { + fwt ^= ISP2400_FW_ATTR_EXMOFF; + ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s EXMOFF", buf); + } + if (fwt & ISP2400_FW_ATTR_NPMOFF) { + fwt ^= ISP2400_FW_ATTR_NPMOFF; + ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s NPMOFF", buf); + } + if (fwt & ISP2400_FW_ATTR_DIFCHOP) { + fwt ^= ISP2400_FW_ATTR_DIFCHOP; + ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s DIFCHOP", buf); + } + if (fwt & ISP2400_FW_ATTR_SRIOV) { + fwt ^= ISP2400_FW_ATTR_SRIOV; + ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s SRIOV", buf); + } + if (fwt & ISP2400_FW_ATTR_ASICTMP) { + fwt ^= ISP2400_FW_ATTR_ASICTMP; + ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s ASICTMP", buf); + } + if (fwt & ISP2400_FW_ATTR_ATIOMQ) { + fwt ^= ISP2400_FW_ATTR_ATIOMQ; + ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s ATIOMQ", buf); + } if (fwt) { ISP_SNPRINTF(buf, ISP_FC_SCRLEN - strlen(buf), "%s (unknown 0x%08x%08x)", buf, (uint32_t) (fwt >> 32), (uint32_t) fwt); Modified: stable/10/sys/dev/isp/ispmbox.h ============================================================================== --- stable/10/sys/dev/isp/ispmbox.h Fri Nov 13 19:32:17 2015 (r290779) +++ stable/10/sys/dev/isp/ispmbox.h Fri Nov 13 19:33:13 2015 (r290780) @@ -820,9 +820,21 @@ typedef struct { #define ISP2400_FW_ATTR_SB2 0x0008 #define ISP2400_FW_ATTR_T10CRC 0x0010 #define ISP2400_FW_ATTR_VI 0x0020 +#define ISP2400_FW_ATTR_MQ 0x0040 +#define ISP2400_FW_ATTR_MSIX 0x0080 +#define ISP2400_FW_ATTR_FCOE 0x0800 #define ISP2400_FW_ATTR_VP0 0x1000 #define ISP2400_FW_ATTR_EXPFW 0x2000 +#define ISP2400_FW_ATTR_HOTFW 0x4000 #define ISP2400_FW_ATTR_EXTNDED 0x8000 +#define ISP2400_FW_ATTR_EXTVP 0x00010000 +#define ISP2400_FW_ATTR_VN2VN 0x00040000 +#define ISP2400_FW_ATTR_EXMOFF 0x00080000 +#define ISP2400_FW_ATTR_NPMOFF 0x00100000 +#define ISP2400_FW_ATTR_DIFCHOP 0x00400000 +#define ISP2400_FW_ATTR_SRIOV 0x02000000 +#define ISP2400_FW_ATTR_ASICTMP 0x0200000000 +#define ISP2400_FW_ATTR_ATIOMQ 0x0400000000 /* * These are either manifestly true or are dependent on f/w attributes