From owner-svn-src-all@freebsd.org Thu Nov 26 02:14:53 2020 Return-Path: Delivered-To: svn-src-all@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 2B8C147CCE1; Thu, 26 Nov 2020 02:14:53 +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 4ChLtj0bMcz4nqL; Thu, 26 Nov 2020 02:14:53 +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 073371BB9D; Thu, 26 Nov 2020 02:14:53 +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 0AQ2Eq8O042624; Thu, 26 Nov 2020 02:14:52 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0AQ2Eqt3042621; Thu, 26 Nov 2020 02:14:52 GMT (envelope-from mav@FreeBSD.org) Message-Id: <202011260214.0AQ2Eqt3042621@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Thu, 26 Nov 2020 02:14:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r368044 - 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: 368044 X-SVN-Commit-Repository: base 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.34 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: Thu, 26 Nov 2020 02:14:53 -0000 Author: mav Date: Thu Nov 26 02:14:52 2020 New Revision: 368044 URL: https://svnweb.freebsd.org/changeset/base/368044 Log: Some minor FCoE bits I had lying around. Modified: head/sys/dev/isp/isp.c head/sys/dev/isp/isp_library.c head/sys/dev/isp/ispmbox.h Modified: head/sys/dev/isp/isp.c ============================================================================== --- head/sys/dev/isp/isp.c Thu Nov 26 01:59:44 2020 (r368043) +++ head/sys/dev/isp/isp.c Thu Nov 26 02:14:52 2020 (r368044) @@ -3696,12 +3696,24 @@ isp_intr_async(ispsoftc_t *isp, uint16_t mbox) isp_prt(isp, ISP_LOGERR, "Temperature alert (subcode 0x%x)", ISP_READ(isp, OUTMAILBOX1)); break; + case ASYNC_INTER_DRIVER_COMP: + isp_prt(isp, ISP_LOGDEBUG0, "Inter-driver communication complete"); + break; + case ASYNC_INTER_DRIVER_NOTIFY: + isp_prt(isp, ISP_LOGDEBUG0, "Inter-driver communication notification"); + break; + case ASYNC_INTER_DRIVER_TIME_EXT: + isp_prt(isp, ISP_LOGDEBUG0, "Inter-driver communication time extended"); + break; case ASYNC_TRANSCEIVER_INSERTION: isp_prt(isp, ISP_LOGDEBUG0, "Transceiver insertion (0x%x)", ISP_READ(isp, OUTMAILBOX1)); break; case ASYNC_TRANSCEIVER_REMOVAL: isp_prt(isp, ISP_LOGDEBUG0, "Transceiver removal"); + break; + case ASYNC_NIC_FW_STATE_CHANGE: + isp_prt(isp, ISP_LOGDEBUG0, "NIC Firmware State Change"); break; case ASYNC_AUTOLOAD_FW_COMPLETE: isp_prt(isp, ISP_LOGDEBUG0, "Autoload FW init complete"); Modified: head/sys/dev/isp/isp_library.c ============================================================================== --- head/sys/dev/isp/isp_library.c Thu Nov 26 01:59:44 2020 (r368043) +++ head/sys/dev/isp/isp_library.c Thu Nov 26 02:14:52 2020 (r368044) @@ -782,8 +782,8 @@ isp_put_icb_2400(ispsoftc_t *isp, isp_icb_2400_t *src, ISP_IOXPUT_16(isp, src->icb_qos, &dst->icb_qos); for (i = 0; i < 3; i++) ISP_IOXPUT_16(isp, src->icb_reserved2[i], &dst->icb_reserved2[i]); - for (i = 0; i < 3; i++) - ISP_IOXPUT_16(isp, src->icb_enodemac[i], &dst->icb_enodemac[i]); + for (i = 0; i < 6; i++) + ISP_IOXPUT_8(isp, src->icb_enodemac[i], &dst->icb_enodemac[i]); ISP_IOXPUT_16(isp, src->icb_disctime, &dst->icb_disctime); for (i = 0; i < 4; i++) ISP_IOXPUT_16(isp, src->icb_reserved3[i], &dst->icb_reserved3[i]); Modified: head/sys/dev/isp/ispmbox.h ============================================================================== --- head/sys/dev/isp/ispmbox.h Thu Nov 26 01:59:44 2020 (r368043) +++ head/sys/dev/isp/ispmbox.h Thu Nov 26 02:14:52 2020 (r368044) @@ -805,7 +805,7 @@ typedef struct { uint32_t icb_fwoptions3; uint16_t icb_qos; uint16_t icb_reserved2[3]; - uint16_t icb_enodemac[3]; + uint8_t icb_enodemac[6]; uint16_t icb_disctime; uint16_t icb_reserved3[4]; } isp_icb_2400_t;