From nobody Wed Oct 20 17:39:40 2021 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 20D1E1812783; Wed, 20 Oct 2021 17:39:42 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HZHtP0gHrz3LpG; Wed, 20 Oct 2021 17:39:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8088E3F0F; Wed, 20 Oct 2021 17:39:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19KHde17094552; Wed, 20 Oct 2021 17:39:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19KHdeT1094551; Wed, 20 Oct 2021 17:39:40 GMT (envelope-from git) Date: Wed, 20 Oct 2021 17:39:40 GMT Message-Id: <202110201739.19KHdeT1094551@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Navdeep Parhar Subject: git: bcb2da3a6212 - stable/13 - cxgbe(4): Update firmwares to 1.26.2.0. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: bcb2da3a621273eeaf36342e0f786191f78ea3de Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=bcb2da3a621273eeaf36342e0f786191f78ea3de commit bcb2da3a621273eeaf36342e0f786191f78ea3de Author: Navdeep Parhar AuthorDate: 2021-09-27 23:45:56 +0000 Commit: Navdeep Parhar CommitDate: 2021-10-20 17:36:34 +0000 cxgbe(4): Update firmwares to 1.26.2.0. The firmwares and the following changelog are from the "Chelsio Unified Wire v3.15.0.0 for Linux." Version : 1.26.2.0 Date : 09/24/2021 ==================== FIXES ----- BASE: - Added support for SFP+ RJ45 (0x1C). - Fixing backward compatibility issue with older drivers when multiple speeds are passed to firmware. OFLD: - Do not touch tp_plen_max if driver is supplying tp_plen_max. This fixes a connection reset issue in iscsi. ENHANCEMENTS ------------ BASE: - Firmware header modified to add firmware binary signature. Sponsored by: Chelsio Communications (cherry picked from commit 45d6fbaec23eee457197a14517e715c947114d99) --- sys/conf/files | 6 +++--- .../{t4fw-1.26.0.0.bin => t4fw-1.26.2.0.bin} | Bin 570368 -> 570368 bytes sys/dev/cxgbe/firmware/t4fw_interface.h | 12 ++++++++---- .../{t5fw-1.26.0.0.bin => t5fw-1.26.2.0.bin} | Bin 675840 -> 676352 bytes .../{t6fw-1.26.0.0.bin => t6fw-1.26.2.0.bin} | Bin 729088 -> 729088 bytes sys/modules/cxgbe/t4_firmware/Makefile | 2 +- sys/modules/cxgbe/t5_firmware/Makefile | 2 +- sys/modules/cxgbe/t6_firmware/Makefile | 2 +- 8 files changed, 14 insertions(+), 10 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index 889e0289dfa8..2d3ae104753d 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1523,7 +1523,7 @@ t4fw.fwo optional cxgbe \ no-implicit-rule \ clean "t4fw.fwo" t4fw.fw optional cxgbe \ - dependency "$S/dev/cxgbe/firmware/t4fw-1.26.0.0.bin" \ + dependency "$S/dev/cxgbe/firmware/t4fw-1.26.2.0.bin" \ compile-with "${CP} ${.ALLSRC} ${.TARGET}" \ no-obj no-implicit-rule \ clean "t4fw.fw" @@ -1557,7 +1557,7 @@ t5fw.fwo optional cxgbe \ no-implicit-rule \ clean "t5fw.fwo" t5fw.fw optional cxgbe \ - dependency "$S/dev/cxgbe/firmware/t5fw-1.26.0.0.bin" \ + dependency "$S/dev/cxgbe/firmware/t5fw-1.26.2.0.bin" \ compile-with "${CP} ${.ALLSRC} ${.TARGET}" \ no-obj no-implicit-rule \ clean "t5fw.fw" @@ -1591,7 +1591,7 @@ t6fw.fwo optional cxgbe \ no-implicit-rule \ clean "t6fw.fwo" t6fw.fw optional cxgbe \ - dependency "$S/dev/cxgbe/firmware/t6fw-1.26.0.0.bin" \ + dependency "$S/dev/cxgbe/firmware/t6fw-1.26.2.0.bin" \ compile-with "${CP} ${.ALLSRC} ${.TARGET}" \ no-obj no-implicit-rule \ clean "t6fw.fw" diff --git a/sys/dev/cxgbe/firmware/t4fw-1.26.0.0.bin b/sys/dev/cxgbe/firmware/t4fw-1.26.2.0.bin similarity index 57% rename from sys/dev/cxgbe/firmware/t4fw-1.26.0.0.bin rename to sys/dev/cxgbe/firmware/t4fw-1.26.2.0.bin index 04e96d16c57a..a8f611628dcc 100644 Binary files a/sys/dev/cxgbe/firmware/t4fw-1.26.0.0.bin and b/sys/dev/cxgbe/firmware/t4fw-1.26.2.0.bin differ diff --git a/sys/dev/cxgbe/firmware/t4fw_interface.h b/sys/dev/cxgbe/firmware/t4fw_interface.h index acb7a6481d9c..876fd61b4b21 100644 --- a/sys/dev/cxgbe/firmware/t4fw_interface.h +++ b/sys/dev/cxgbe/firmware/t4fw_interface.h @@ -9952,7 +9952,10 @@ struct fw_hdr { __u32 reserved3; __be32 magic; /* runtime or bootstrap fw */ __be32 flags; - __be32 reserved6[23]; + __be32 reserved6[4]; + __u8 reserved7[3]; + __u8 dsign_len; + __u8 dsign[72]; /* fw binary digital signature */ }; enum fw_hdr_chip { @@ -9992,17 +9995,17 @@ enum fw_hdr_chip { enum { T4FW_VERSION_MAJOR = 1, T4FW_VERSION_MINOR = 26, - T4FW_VERSION_MICRO = 0, + T4FW_VERSION_MICRO = 2, T4FW_VERSION_BUILD = 0, T5FW_VERSION_MAJOR = 1, T5FW_VERSION_MINOR = 26, - T5FW_VERSION_MICRO = 0, + T5FW_VERSION_MICRO = 2, T5FW_VERSION_BUILD = 0, T6FW_VERSION_MAJOR = 1, T6FW_VERSION_MINOR = 26, - T6FW_VERSION_MICRO = 0, + T6FW_VERSION_MICRO = 2, T6FW_VERSION_BUILD = 0, }; @@ -10052,6 +10055,7 @@ enum { enum fw_hdr_flags { FW_HDR_FLAGS_RESET_HALT = 0x00000001, + FW_HDR_FLAGS_SIGNED_FW = 0x00000002, }; /* diff --git a/sys/dev/cxgbe/firmware/t5fw-1.26.0.0.bin b/sys/dev/cxgbe/firmware/t5fw-1.26.2.0.bin similarity index 55% rename from sys/dev/cxgbe/firmware/t5fw-1.26.0.0.bin rename to sys/dev/cxgbe/firmware/t5fw-1.26.2.0.bin index f72bd502ea1f..b11d6d0bf49f 100644 Binary files a/sys/dev/cxgbe/firmware/t5fw-1.26.0.0.bin and b/sys/dev/cxgbe/firmware/t5fw-1.26.2.0.bin differ diff --git a/sys/dev/cxgbe/firmware/t6fw-1.26.0.0.bin b/sys/dev/cxgbe/firmware/t6fw-1.26.2.0.bin similarity index 61% rename from sys/dev/cxgbe/firmware/t6fw-1.26.0.0.bin rename to sys/dev/cxgbe/firmware/t6fw-1.26.2.0.bin index ee4341d5074f..f43d9953a7a4 100644 Binary files a/sys/dev/cxgbe/firmware/t6fw-1.26.0.0.bin and b/sys/dev/cxgbe/firmware/t6fw-1.26.2.0.bin differ diff --git a/sys/modules/cxgbe/t4_firmware/Makefile b/sys/modules/cxgbe/t4_firmware/Makefile index a202c5d2a6a0..e525edf96ce2 100644 --- a/sys/modules/cxgbe/t4_firmware/Makefile +++ b/sys/modules/cxgbe/t4_firmware/Makefile @@ -17,7 +17,7 @@ FIRMWS+= ${F}:${F:C/.txt//}:1.0.0.0 .endif .endfor -T4FW_VER= 1.26.0.0 +T4FW_VER= 1.26.2.0 FIRMWS+= t4fw-${T4FW_VER}.bin:t4fw:${T4FW_VER} .include diff --git a/sys/modules/cxgbe/t5_firmware/Makefile b/sys/modules/cxgbe/t5_firmware/Makefile index 371df89f233b..74e89e4174b5 100644 --- a/sys/modules/cxgbe/t5_firmware/Makefile +++ b/sys/modules/cxgbe/t5_firmware/Makefile @@ -17,7 +17,7 @@ FIRMWS+= ${F}:${F:C/.txt//}:1.0.0.0 .endif .endfor -T5FW_VER= 1.26.0.0 +T5FW_VER= 1.26.2.0 FIRMWS+= t5fw-${T5FW_VER}.bin:t5fw:${T5FW_VER} .include diff --git a/sys/modules/cxgbe/t6_firmware/Makefile b/sys/modules/cxgbe/t6_firmware/Makefile index 074c3991bc37..2ea01e7b776a 100644 --- a/sys/modules/cxgbe/t6_firmware/Makefile +++ b/sys/modules/cxgbe/t6_firmware/Makefile @@ -17,7 +17,7 @@ FIRMWS+= ${F}:${F:C/.txt//}:1.0.0.0 .endif .endfor -T6FW_VER= 1.26.0.0 +T6FW_VER= 1.26.2.0 FIRMWS+= t6fw-${T6FW_VER}.bin:t6fw:${T6FW_VER} .include