svn commit: r347838 - in stable/11: share/man/man4 sys/conf sys/dev/mlxfw sys/modules sys/modules/mlxfw

[Hans Petter Selasky]

Author: hselasky
Date: Thu May 16 17:48:36 2019
New Revision: 347838
URL: https://svnweb.freebsd.org/changeset/base/347838

Log:
  MFC r347285 and r347327:
  Initial version of Mellanox in-kernel firmware upgrade support.
  
  Submitted by:	slavash@
  Sponsored by:	Mellanox Technologies

Added:
  stable/11/sys/dev/mlxfw/
     - copied from r347285, head/sys/dev/mlxfw/
  stable/11/sys/modules/mlxfw/
     - copied from r347285, head/sys/modules/mlxfw/
Modified:
  stable/11/share/man/man4/mlx5en.4
  stable/11/sys/conf/NOTES
  stable/11/sys/conf/files
  stable/11/sys/conf/kern.pre.mk
  stable/11/sys/modules/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/share/man/man4/mlx5en.4
==============================================================================
--- stable/11/share/man/man4/mlx5en.4	Thu May 16 17:44:17 2019	(r347837)
+++ stable/11/share/man/man4/mlx5en.4	Thu May 16 17:48:36 2019	(r347838)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd December 3, 2015
+.Dd May 8, 2019
 .Dt MLX5EN 4
 .Os
 .Sh NAME
@@ -36,6 +36,9 @@ place the following lines in your
 kernel configuration file:
 .Bd -ragged -offset indent
 .Cd "options COMPAT_LINUXKPI"
+.Cd "device xz"
+.Cd "device mlxfw"
+.Cd "device firmware"
 .Cd "device mlx5"
 .Cd "device mlx5en"
 .Ed

Modified: stable/11/sys/conf/NOTES
==============================================================================
--- stable/11/sys/conf/NOTES	Thu May 16 17:44:17 2019	(r347837)
+++ stable/11/sys/conf/NOTES	Thu May 16 17:48:36 2019	(r347838)
@@ -1983,6 +1983,7 @@ device		xmphy		# XaQti XMAC II
 #	88E8062, 88E8035, 88E8036, 88E8038, 88E8050, 88E8052, 88E8053,
 #	88E8055, 88E8056 and D-Link 560T/550SX.
 # lmc:	Support for the LMC/SBE wide-area network interface cards.
+# 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)
@@ -2102,6 +2103,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/11/sys/conf/files
==============================================================================
--- stable/11/sys/conf/files	Thu May 16 17:44:17 2019	(r347837)
+++ stable/11/sys/conf/files	Thu May 16 17:48:36 2019	(r347838)
@@ -2390,6 +2390,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/11/sys/conf/kern.pre.mk
==============================================================================
--- stable/11/sys/conf/kern.pre.mk	Thu May 16 17:44:17 2019	(r347837)
+++ stable/11/sys/conf/kern.pre.mk	Thu May 16 17:48:36 2019	(r347838)
@@ -183,6 +183,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$S/contrib/xz-embedded/freebsd \
+		-I$S/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/11/sys/modules/Makefile
==============================================================================
--- stable/11/sys/modules/Makefile	Thu May 16 17:44:17 2019	(r347837)
+++ stable/11/sys/modules/Makefile	Thu May 16 17:48:36 2019	(r347838)
@@ -246,6 +246,7 @@ SUBDIR=	\
 	mfi \
 	mii \
 	mlx \
+	mlxfw \
 	${_mlx4} \
 	${_mlx4ib} \
 	${_mlx4en} \