Date: Tue, 10 Dec 2019 07:45:10 +0000 (UTC) From: Navdeep Parhar <np@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r355579 - in head/sys: conf dev/cxgbe/firmware modules/cxgbe/t4_firmware modules/cxgbe/t5_firmware modules/cxgbe/t6_firmware Message-ID: <201912100745.xBA7jAeu062121@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: np Date: Tue Dec 10 07:45:10 2019 New Revision: 355579 URL: https://svnweb.freebsd.org/changeset/base/355579 Log: cxgbe(4): Update T4/5/6 firmwares to 1.24.11.0. These were obtained from the Chelsio Unified Wire v3.12.0.1 beta release. Note that the firmwares are not uuencoded any more. MFH: 1 month Sponsored by: Chelsio Communications Added: head/sys/dev/cxgbe/firmware/t4fw-1.24.11.0.bin (contents, props changed) head/sys/dev/cxgbe/firmware/t5fw-1.24.11.0.bin (contents, props changed) head/sys/dev/cxgbe/firmware/t6fw-1.24.11.0.bin (contents, props changed) Deleted: head/sys/dev/cxgbe/firmware/t4fw-1.23.0.0.bin.uu head/sys/dev/cxgbe/firmware/t5fw-1.23.0.0.bin.uu head/sys/dev/cxgbe/firmware/t6fw-1.23.0.0.bin.uu Modified: head/sys/conf/files head/sys/dev/cxgbe/firmware/t4fw_interface.h head/sys/dev/cxgbe/firmware/t6fw_cfg_uwire.txt head/sys/modules/cxgbe/t4_firmware/Makefile head/sys/modules/cxgbe/t5_firmware/Makefile head/sys/modules/cxgbe/t6_firmware/Makefile Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Tue Dec 10 07:07:17 2019 (r355578) +++ head/sys/conf/files Tue Dec 10 07:45:10 2019 (r355579) @@ -1469,8 +1469,8 @@ t4fw.fwo optional cxgbe \ no-implicit-rule \ clean "t4fw.fwo" t4fw.fw optional cxgbe \ - dependency "$S/dev/cxgbe/firmware/t4fw-1.23.0.0.bin.uu" \ - compile-with "${NORMAL_FW}" \ + dependency "$S/dev/cxgbe/firmware/t4fw-1.24.11.0.bin" \ + compile-with "${CP} ${.ALLSRC} ${.TARGET}" \ no-obj no-implicit-rule \ clean "t4fw.fw" t5fw_cfg.c optional cxgbe \ @@ -1503,8 +1503,8 @@ t5fw.fwo optional cxgbe \ no-implicit-rule \ clean "t5fw.fwo" t5fw.fw optional cxgbe \ - dependency "$S/dev/cxgbe/firmware/t5fw-1.23.0.0.bin.uu" \ - compile-with "${NORMAL_FW}" \ + dependency "$S/dev/cxgbe/firmware/t5fw-1.24.11.0.bin" \ + compile-with "${CP} ${.ALLSRC} ${.TARGET}" \ no-obj no-implicit-rule \ clean "t5fw.fw" t6fw_cfg.c optional cxgbe \ @@ -1537,8 +1537,8 @@ t6fw.fwo optional cxgbe \ no-implicit-rule \ clean "t6fw.fwo" t6fw.fw optional cxgbe \ - dependency "$S/dev/cxgbe/firmware/t6fw-1.23.0.0.bin.uu" \ - compile-with "${NORMAL_FW}" \ + dependency "$S/dev/cxgbe/firmware/t6fw-1.24.11.0.bin" \ + compile-with "${CP} ${.ALLSRC} ${.TARGET}" \ no-obj no-implicit-rule \ clean "t6fw.fw" dev/cxgbe/crypto/t4_crypto.c optional ccr \ Added: head/sys/dev/cxgbe/firmware/t4fw-1.24.11.0.bin ============================================================================== Binary file. No diff available. Modified: head/sys/dev/cxgbe/firmware/t4fw_interface.h ============================================================================== --- head/sys/dev/cxgbe/firmware/t4fw_interface.h Tue Dec 10 07:07:17 2019 (r355578) +++ head/sys/dev/cxgbe/firmware/t4fw_interface.h Tue Dec 10 07:45:10 2019 (r355579) @@ -9938,20 +9938,20 @@ enum fw_hdr_chip { (((x) >> S_FW_HDR_FW_VER_BUILD) & M_FW_HDR_FW_VER_BUILD) enum { - T4FW_VERSION_MAJOR = 0x01, - T4FW_VERSION_MINOR = 0x17, - T4FW_VERSION_MICRO = 0x00, - T4FW_VERSION_BUILD = 0x00, + T4FW_VERSION_MAJOR = 1, + T4FW_VERSION_MINOR = 24, + T4FW_VERSION_MICRO = 11, + T4FW_VERSION_BUILD = 0, - T5FW_VERSION_MAJOR = 0x01, - T5FW_VERSION_MINOR = 0x17, - T5FW_VERSION_MICRO = 0x00, - T5FW_VERSION_BUILD = 0x00, + T5FW_VERSION_MAJOR = 1, + T5FW_VERSION_MINOR = 24, + T5FW_VERSION_MICRO = 11, + T5FW_VERSION_BUILD = 0, - T6FW_VERSION_MAJOR = 0x01, - T6FW_VERSION_MINOR = 0x17, - T6FW_VERSION_MICRO = 0x00, - T6FW_VERSION_BUILD = 0x00, + T6FW_VERSION_MAJOR = 1, + T6FW_VERSION_MINOR = 24, + T6FW_VERSION_MICRO = 11, + T6FW_VERSION_BUILD = 0, }; enum { Added: head/sys/dev/cxgbe/firmware/t5fw-1.24.11.0.bin ============================================================================== Binary file. No diff available. Added: head/sys/dev/cxgbe/firmware/t6fw-1.24.11.0.bin ============================================================================== Binary file. No diff available. Modified: head/sys/dev/cxgbe/firmware/t6fw_cfg_uwire.txt ============================================================================== --- head/sys/dev/cxgbe/firmware/t6fw_cfg_uwire.txt Tue Dec 10 07:07:17 2019 (r355578) +++ head/sys/dev/cxgbe/firmware/t6fw_cfg_uwire.txt Tue Dec 10 07:45:10 2019 (r355579) @@ -95,12 +95,19 @@ sge_timer_value = 5, 10, 20, 50, 100, 200 # SGE_TIMER_VALUE* in usecs reg[0x10c4] = 0x20000000/0x20000000 # GK_CONTROL, enable 5th thread - # Set the SGE Doorbell Queue Timer "tick" to 5us and initialize + # Set the SGE Doorbell Queue Timer "tick" to 50us and initialize # the Timer Table to a default set of values (which are multiples - # of the Timer Tick). + # of the Timer Tick). Note that the set of Tick Multipliers are + # NOT sorted. The Host Drivers are expected to pick amongst them + # for (Tick * Multiplier[i]) values which most closely match the Host + # Drivers' needs. Also, most Host Drivers will be default start + # start with (Tick * Multiplier[0]), so this gives us some flexibility + # in terms of picking a Tick and a default Multiplier somewhere in + # the middle of the achievable set of (Tick * Multiplier[i]) values. + # Thus, the below select for 150us by this default. # - sge_dbq_timertick = 5 - sge_dbq_timer = 1, 2, 3, 5, 7, 9, 12, 16 + sge_dbq_timertick = 50 + sge_dbq_timer = 3, 2, 1, 5, 7, 9, 12, 16 # enable TP_OUT_CONFIG.IPIDSPLITMODE reg[0x7d04] = 0x00010000/0x00010000 @@ -423,10 +430,10 @@ tp_l2t = 3072 tp_ddp = 2 tp_ddp_iscsi = 2 - tp_tls_key = 3 + tp_tls_key = 2 tp_tls_mxrxsize = 17408 # 16384 + 1024, governs max rx data, pm max xfer len, rx coalesce sizes tp_stag = 2 - tp_pbl = 5 + tp_pbl = 7 tp_rq = 7 tp_srq = 128 @@ -471,7 +478,7 @@ nhash = 2048 tp_l2t = 4 protocol = fcoe_initiator - tp_ddp = 2 + tp_ddp = 1 fcoe_nfcf = 16 fcoe_nvnp = 32 fcoe_nssn = 1024 @@ -581,7 +588,7 @@ [fini] version = 0x1425001d - checksum = 0xdbff9437 + checksum = 0x14a022cd # Total resources used by above allocations: # Virtual Interfaces: 104 @@ -592,4 +599,4 @@ # Virtual Functions: 64 # # $FreeBSD$ -# +# \ No newline at end of file Modified: head/sys/modules/cxgbe/t4_firmware/Makefile ============================================================================== --- head/sys/modules/cxgbe/t4_firmware/Makefile Tue Dec 10 07:07:17 2019 (r355578) +++ head/sys/modules/cxgbe/t4_firmware/Makefile Tue Dec 10 07:45:10 2019 (r355579) @@ -17,11 +17,7 @@ FIRMWS+= ${F}:${F:C/.txt//}:1.0.0.0 .endif .endfor -T4FW_VER= 1.23.0.0 -FIRMWS+= t4fw.fw:t4fw:${T4FW_VER} -CLEANFILES+= t4fw.fw - -t4fw.fw: t4fw-${T4FW_VER}.bin.uu - uudecode -o ${.TARGET} ${.ALLSRC} +T4FW_VER= 1.24.11.0 +FIRMWS+= t4fw-${T4FW_VER}.bin:t4fw:${T4FW_VER} .include <bsd.kmod.mk> Modified: head/sys/modules/cxgbe/t5_firmware/Makefile ============================================================================== --- head/sys/modules/cxgbe/t5_firmware/Makefile Tue Dec 10 07:07:17 2019 (r355578) +++ head/sys/modules/cxgbe/t5_firmware/Makefile Tue Dec 10 07:45:10 2019 (r355579) @@ -17,11 +17,7 @@ FIRMWS+= ${F}:${F:C/.txt//}:1.0.0.0 .endif .endfor -T5FW_VER= 1.23.0.0 -FIRMWS+= t5fw.fw:t5fw:${T5FW_VER} -CLEANFILES+= t5fw.fw - -t5fw.fw: t5fw-${T5FW_VER}.bin.uu - uudecode -o ${.TARGET} ${.ALLSRC} +T5FW_VER= 1.24.11.0 +FIRMWS+= t5fw-${T5FW_VER}.bin:t5fw:${T5FW_VER} .include <bsd.kmod.mk> Modified: head/sys/modules/cxgbe/t6_firmware/Makefile ============================================================================== --- head/sys/modules/cxgbe/t6_firmware/Makefile Tue Dec 10 07:07:17 2019 (r355578) +++ head/sys/modules/cxgbe/t6_firmware/Makefile Tue Dec 10 07:45:10 2019 (r355579) @@ -17,11 +17,7 @@ FIRMWS+= ${F}:${F:C/.txt//}:1.0.0.0 .endif .endfor -T6FW_VER= 1.23.0.0 -FIRMWS+= t6fw.fw:t6fw:${T6FW_VER} -CLEANFILES+= t6fw.fw - -t6fw.fw: t6fw-${T6FW_VER}.bin.uu - uudecode -o ${.TARGET} ${.ALLSRC} +T6FW_VER= 1.24.11.0 +FIRMWS+= t6fw-${T6FW_VER}.bin:t6fw:${T6FW_VER} .include <bsd.kmod.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201912100745.xBA7jAeu062121>