The branch main has been updated by np:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=357ba2cf17bf2a201ada5c54822e4f92ff2df296

commit 357ba2cf17bf2a201ada5c54822e4f92ff2df296
Author:     Navdeep Parhar <[email protected]>
AuthorDate: 2021-12-09 19:10:48 +0000
Commit:     Navdeep Parhar <[email protected]>
CommitDate: 2021-12-09 19:25:31 +0000

    cxgbe(4): Update firmwares to 1.26.4.0
    
    (Rest is from the README that came with the firmware)
    
    Version : 1.26.4.0
    Date    : 12/02/2021
    
    Fixes
    -----
    
    BASE:
    - Fixed error on setting 25G speed on 100G copper with multiple FEC set in
      firmware commands.
    - Handle link of unknown optics modules by enabling module tx 
unconditionally.
    - Fixed link not coming up for 25G CRS phys. Firmware incorrectly tried to
      bring up the link in RS-FEC but as per IEEE spec, it must be BASER FEC.
    - Fixed an issue where firmware doesn't automatically retry next FEC if 
driver
      asks to bring up the link using RS-FEC and link doesn't come up.
    
    Obtained from:  Chelsio Communications
    MFC after:      1 month
    Sponsored by:   Chelsio Communications
---
 sys/conf/files                                     |   6 +++---
 sys/dev/cxgbe/firmware/t4fw-1.26.2.0.bin           | Bin 570368 -> 0 bytes
 sys/dev/cxgbe/firmware/t4fw-1.26.4.0.bin           | Bin 0 -> 570880 bytes
 sys/dev/cxgbe/firmware/t4fw_interface.h            |   6 +++---
 .../{t5fw-1.26.2.0.bin => t5fw-1.26.4.0.bin}       | Bin 676352 -> 676352 bytes
 .../{t6fw-1.26.2.0.bin => t6fw-1.26.4.0.bin}       | Bin 729088 -> 729600 bytes
 sys/modules/cxgbe/t4_firmware/Makefile             |   2 +-
 sys/modules/cxgbe/t5_firmware/Makefile             |   2 +-
 sys/modules/cxgbe/t6_firmware/Makefile             |   2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sys/conf/files b/sys/conf/files
index 476437847a78..155015978177 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1497,7 +1497,7 @@ t4fw.fwo          optional cxgbe                          
        \
        no-implicit-rule                                                \
        clean           "t4fw.fwo"
 t4fw.fw                        optional cxgbe                                  
\
-       dependency      "$S/dev/cxgbe/firmware/t4fw-1.26.2.0.bin"       \
+       dependency      "$S/dev/cxgbe/firmware/t4fw-1.26.4.0.bin"       \
        compile-with    "${CP} ${.ALLSRC} ${.TARGET}"                   \
        no-obj no-implicit-rule                                         \
        clean           "t4fw.fw"
@@ -1531,7 +1531,7 @@ t5fw.fwo          optional cxgbe                          
        \
        no-implicit-rule                                                \
        clean           "t5fw.fwo"
 t5fw.fw                        optional cxgbe                                  
\
-       dependency      "$S/dev/cxgbe/firmware/t5fw-1.26.2.0.bin"       \
+       dependency      "$S/dev/cxgbe/firmware/t5fw-1.26.4.0.bin"       \
        compile-with    "${CP} ${.ALLSRC} ${.TARGET}"                   \
        no-obj no-implicit-rule                                         \
        clean           "t5fw.fw"
@@ -1565,7 +1565,7 @@ t6fw.fwo          optional cxgbe                          
        \
        no-implicit-rule                                                \
        clean           "t6fw.fwo"
 t6fw.fw                        optional cxgbe                                  
\
-       dependency      "$S/dev/cxgbe/firmware/t6fw-1.26.2.0.bin"       \
+       dependency      "$S/dev/cxgbe/firmware/t6fw-1.26.4.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.2.0.bin 
b/sys/dev/cxgbe/firmware/t4fw-1.26.2.0.bin
deleted file mode 100644
index a8f611628dcc..000000000000
Binary files a/sys/dev/cxgbe/firmware/t4fw-1.26.2.0.bin and /dev/null differ
diff --git a/sys/dev/cxgbe/firmware/t4fw-1.26.4.0.bin 
b/sys/dev/cxgbe/firmware/t4fw-1.26.4.0.bin
new file mode 100644
index 000000000000..53d99c0dd38a
Binary files /dev/null and b/sys/dev/cxgbe/firmware/t4fw-1.26.4.0.bin differ
diff --git a/sys/dev/cxgbe/firmware/t4fw_interface.h 
b/sys/dev/cxgbe/firmware/t4fw_interface.h
index 93e5f2207411..0469a2a12f9b 100644
--- a/sys/dev/cxgbe/firmware/t4fw_interface.h
+++ b/sys/dev/cxgbe/firmware/t4fw_interface.h
@@ -10003,17 +10003,17 @@ enum fw_hdr_chip {
 enum {
        T4FW_VERSION_MAJOR      = 1,
        T4FW_VERSION_MINOR      = 26,
-       T4FW_VERSION_MICRO      = 2,
+       T4FW_VERSION_MICRO      = 4,
        T4FW_VERSION_BUILD      = 0,
 
        T5FW_VERSION_MAJOR      = 1,
        T5FW_VERSION_MINOR      = 26,
-       T5FW_VERSION_MICRO      = 2,
+       T5FW_VERSION_MICRO      = 4,
        T5FW_VERSION_BUILD      = 0,
 
        T6FW_VERSION_MAJOR      = 1,
        T6FW_VERSION_MINOR      = 26,
-       T6FW_VERSION_MICRO      = 2,
+       T6FW_VERSION_MICRO      = 4,
        T6FW_VERSION_BUILD      = 0,
 };
 
diff --git a/sys/dev/cxgbe/firmware/t5fw-1.26.2.0.bin 
b/sys/dev/cxgbe/firmware/t5fw-1.26.4.0.bin
similarity index 77%
rename from sys/dev/cxgbe/firmware/t5fw-1.26.2.0.bin
rename to sys/dev/cxgbe/firmware/t5fw-1.26.4.0.bin
index b11d6d0bf49f..64134d37c4c5 100644
Binary files a/sys/dev/cxgbe/firmware/t5fw-1.26.2.0.bin and 
b/sys/dev/cxgbe/firmware/t5fw-1.26.4.0.bin differ
diff --git a/sys/dev/cxgbe/firmware/t6fw-1.26.2.0.bin 
b/sys/dev/cxgbe/firmware/t6fw-1.26.4.0.bin
similarity index 64%
rename from sys/dev/cxgbe/firmware/t6fw-1.26.2.0.bin
rename to sys/dev/cxgbe/firmware/t6fw-1.26.4.0.bin
index f43d9953a7a4..d922781c4f69 100644
Binary files a/sys/dev/cxgbe/firmware/t6fw-1.26.2.0.bin and 
b/sys/dev/cxgbe/firmware/t6fw-1.26.4.0.bin differ
diff --git a/sys/modules/cxgbe/t4_firmware/Makefile 
b/sys/modules/cxgbe/t4_firmware/Makefile
index e525edf96ce2..84c8c885ff4e 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.2.0
+T4FW_VER=      1.26.4.0
 FIRMWS+=       t4fw-${T4FW_VER}.bin:t4fw:${T4FW_VER}
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/cxgbe/t5_firmware/Makefile 
b/sys/modules/cxgbe/t5_firmware/Makefile
index 74e89e4174b5..767feeadfc42 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.2.0
+T5FW_VER=      1.26.4.0
 FIRMWS+=       t5fw-${T5FW_VER}.bin:t5fw:${T5FW_VER}
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/cxgbe/t6_firmware/Makefile 
b/sys/modules/cxgbe/t6_firmware/Makefile
index 2ea01e7b776a..d2860dda0ec7 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.2.0
+T6FW_VER=      1.26.4.0
 FIRMWS+=       t6fw-${T6FW_VER}.bin:t6fw:${T6FW_VER}
 
 .include <bsd.kmod.mk>

Reply via email to