Author: hselasky
Date: Thu May 16 16:09:16 2019
New Revision: 347749
URL: https://svnweb.freebsd.org/changeset/base/347749
Log:
MFC r347285 and r347327:
Initial version of Mellanox in-kernel firmware upgrade support.
Submitted by: slavash@
Sponsored by: Mellanox Technologies
Added:
stable/12/sys/dev/mlxfw/
- copied from r347285, head/sys/dev/mlxfw/
stable/12/sys/modules/mlxfw/
- copied from r347285, head/sys/modules/mlxfw/
Modified:
stable/12/share/man/man4/mlx5en.4
stable/12/sys/conf/NOTES
stable/12/sys/conf/files
stable/12/sys/conf/kern.pre.mk
stable/12/sys/modules/Makefile
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/share/man/man4/mlx5en.4
==============================================================================
--- stable/12/share/man/man4/mlx5en.4 Thu May 16 16:08:01 2019
(r347748)
+++ stable/12/share/man/man4/mlx5en.4 Thu May 16 16:09:16 2019
(r347749)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 29, 2018
+.Dd May 8, 2019
.Dt MLX5EN 4
.Os
.Sh NAME
@@ -37,6 +37,9 @@ kernel configuration file:
.Bd -ragged -offset indent
.Cd "options COMPAT_LINUXKPI"
.Cd "options RATELIMIT"
+.Cd "device xz"
+.Cd "device mlxfw"
+.Cd "device firmware"
.Cd "device mlx5"
.Cd "device mlx5en"
.Ed
Modified: stable/12/sys/conf/NOTES
==============================================================================
--- stable/12/sys/conf/NOTES Thu May 16 16:08:01 2019 (r347748)
+++ stable/12/sys/conf/NOTES Thu May 16 16:09:16 2019 (r347749)
@@ -2005,6 +2005,7 @@ device xmphy # XaQti XMAC II
# Yukon II Gigabit controllers, including 88E8021, 88E8022, 88E8061,
# 88E8062, 88E8035, 88E8036, 88E8038, 88E8050, 88E8052, 88E8053,
# 88E8055, 88E8056 and D-Link 560T/550SX.
+# mlxfw: Mellanox firmware update module.
# mlx5: Mellanox ConnectX-4 and ConnectX-4 LX IB and Eth shared code
module.
# mlx5en:Mellanox ConnectX-4 and ConnectX-4 LX PCIe Ethernet adapters.
# my: Myson Fast Ethernet (MTD80X, MTD89X)
@@ -2118,6 +2119,7 @@ device gem # Apple GMAC/Sun
ERI/Sun GEM
device hme # Sun HME (Happy Meal Ethernet)
device jme # JMicron JMC250 Gigabit/JMC260 Fast Ethernet
device lge # Level 1 LXT1001 gigabit Ethernet
+device mlxfw # Mellanox firmware update module
device mlx5 # Shared code module between IB and Ethernet
device mlx5en # Mellanox ConnectX-4 and ConnectX-4 LX
device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet
Modified: stable/12/sys/conf/files
==============================================================================
--- stable/12/sys/conf/files Thu May 16 16:08:01 2019 (r347748)
+++ stable/12/sys/conf/files Thu May 16 16:09:16 2019 (r347749)
@@ -2440,6 +2440,12 @@ dev/mii/ukphy_subr.c optional miibus | mii
dev/mii/vscphy.c optional miibus | vscphy
dev/mii/xmphy.c optional miibus | xmphy
dev/mk48txx/mk48txx.c optional mk48txx
+dev/mlxfw/mlxfw_fsm.c optional mlxfw \
+ compile-with "${MLXFW_C}"
+dev/mlxfw/mlxfw_mfa2.c optional mlxfw \
+ compile-with "${MLXFW_C}"
+dev/mlxfw/mlxfw_mfa2_tlv_multi.c optional mlxfw \
+ compile-with "${MLXFW_C}"
dev/mlx/mlx.c optional mlx
dev/mlx/mlx_disk.c optional mlx
dev/mlx/mlx_pci.c optional mlx pci
Modified: stable/12/sys/conf/kern.pre.mk
==============================================================================
--- stable/12/sys/conf/kern.pre.mk Thu May 16 16:08:01 2019
(r347748)
+++ stable/12/sys/conf/kern.pre.mk Thu May 16 16:09:16 2019
(r347749)
@@ -203,6 +203,12 @@ OFEDCFLAGS= ${CFLAGS:N-I*}
-DCONFIG_INFINIBAND_USER_ME
OFED_C_NOIMP= ${CC} -c -o ${.TARGET} ${OFEDCFLAGS} ${WERROR} ${PROF}
OFED_C= ${OFED_C_NOIMP} ${.IMPSRC}
+# mlxfw C flags.
+MLXFW_C= ${OFED_C_NOIMP} \
+ -I${SRCTOP}/sys/contrib/xz-embedded/freebsd \
+ -I${SRCTOP}/sys/contrib/xz-embedded/linux/lib/xz \
+ ${.IMPSRC}
+
GEN_CFILES= $S/$M/$M/genassym.c ${MFILES:T:S/.m$/.c/}
SYSTEM_CFILES= config.c env.c hints.c vnode_if.c
SYSTEM_DEP= Makefile ${SYSTEM_OBJS}
Modified: stable/12/sys/modules/Makefile
==============================================================================
--- stable/12/sys/modules/Makefile Thu May 16 16:08:01 2019
(r347748)
+++ stable/12/sys/modules/Makefile Thu May 16 16:09:16 2019
(r347749)
@@ -246,6 +246,7 @@ SUBDIR= \
mfi \
mii \
mlx \
+ mlxfw \
${_mlx4} \
${_mlx4ib} \
${_mlx4en} \
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
