svn commit: r363712 - in stable/12/sys: conf modules powerpc/conf

[Eric Joyner]

Author: erj
Date: Thu Jul 30 19:11:01 2020
New Revision: 363712
URL: https://svnweb.freebsd.org/changeset/base/363712

Log:
  MFC r358908: Enable ixl device on PowerPC64
  
  Relnotes:	yes

Modified:
  stable/12/sys/conf/files.powerpc
  stable/12/sys/conf/options.powerpc
  stable/12/sys/modules/Makefile
  stable/12/sys/powerpc/conf/GENERIC64
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/conf/files.powerpc
==============================================================================
--- stable/12/sys/conf/files.powerpc	Thu Jul 30 18:31:25 2020	(r363711)
+++ stable/12/sys/conf/files.powerpc	Thu Jul 30 19:11:01 2020	(r363712)
@@ -43,6 +43,43 @@ dev/iicbus/max6690.c		optional	max6690 powermac
 dev/iicbus/ofw_iicbus.c		optional	iicbus aim
 dev/ipmi/ipmi.c			optional	ipmi
 dev/ipmi/ipmi_opal.c		optional	powernv ipmi
+dev/ixl/if_ixl.c		optional	ixl pci powerpc64 \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/ixl_pf_main.c		optional	ixl pci powerpc64 \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/ixl_pf_qmgr.c		optional	ixl pci powerpc64 \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/ixl_pf_iov.c		optional	ixl pci pci_iov powerpc64 \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/ixl_pf_i2c.c		optional	ixl pci powerpc64 \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/if_iavf.c		optional	iavf pci powerpc64 \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/iavf_vc.c		optional	iavf pci powerpc64 \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/ixl_txrx.c		optional	ixl pci powerpc64 | \
+						iavf pci powerpc64 \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/i40e_osdep.c		optional	ixl pci powerpc64 | \
+						iavf pci powerpc64 \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/i40e_lan_hmc.c		optional	ixl pci powerpc64 | \
+						iavf pci powerpc64 \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/i40e_hmc.c		optional	ixl pci powerpc64 | \
+						iavf pci powerpc64 \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/i40e_common.c		optional	ixl pci powerpc64 | \
+						iavf pci powerpc64 \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/i40e_nvm.c		optional	ixl pci powerpc64 | \
+						iavf pci powerpc64 \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/i40e_adminq.c		optional	ixl pci powerpc64 | \
+						iavf pci powerpc64 \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/i40e_dcb.c		optional	ixl pci powerpc64 \
+	compile-with "${NORMAL_C} -I$S/dev/ixl"
 dev/nand/nfc_fsl.c		optional	nand mpc85xx
 dev/nand/nfc_rb.c		optional	nand mpc85xx
 # Most ofw stuff below is brought in by conf/files for options FDT, but

Modified: stable/12/sys/conf/options.powerpc
==============================================================================
--- stable/12/sys/conf/options.powerpc	Thu Jul 30 18:31:25 2020	(r363711)
+++ stable/12/sys/conf/options.powerpc	Thu Jul 30 19:11:01 2020	(r363712)
@@ -35,3 +35,6 @@ OFWCONS_POLL_HZ		opt_ofw.h
 AGP_DEBUG		opt_agp.h
 
 MIKROTIK
+
+# iWARP client interface support in ixl
+IXL_IW			opt_ixl.h

Modified: stable/12/sys/modules/Makefile
==============================================================================
--- stable/12/sys/modules/Makefile	Thu Jul 30 18:31:25 2020	(r363711)
+++ stable/12/sys/modules/Makefile	Thu Jul 30 19:11:01 2020	(r363712)
@@ -824,6 +824,8 @@ _wi=		wi
 _drm2=		drm2
 .endif
 _ipmi=		ipmi
+_ixl=		ixl
+_nvram=		opal_nvram
 .endif
 .if ${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "powerpc"
 # Don't build powermac_nvram for powerpcspe, it's never supported.

Modified: stable/12/sys/powerpc/conf/GENERIC64
==============================================================================
--- stable/12/sys/powerpc/conf/GENERIC64	Thu Jul 30 18:31:25 2020	(r363711)
+++ stable/12/sys/powerpc/conf/GENERIC64	Thu Jul 30 19:11:01 2020	(r363712)
@@ -146,6 +146,7 @@ device		iflib
 # Ethernet hardware
 device		em		# Intel PRO/1000 Gigabit Ethernet Family
 device		ix		# Intel PRO/10GbE PCIE PF Ethernet Family
+device		ixl		# Intel 700 Series Physical Function
 device		ixv		# Intel PRO/10GbE PCIE VF Ethernet Family
 device		glc		# Sony Playstation 3 Ethernet
 device		llan		# IBM pSeries Virtual Ethernet