From 8566bb68fb48e1773c00807cbc5f3fe467c4ece0 Mon Sep 17 00:00:00 2001
From: Alexander Motin <mav@FreeBSD.org>
Date: Sun, 2 Jan 2022 17:10:51 -0500
Subject: [PATCH] Update kernel config

 - Add new igc(4) and kvm_clock drivers.
 - Move CTL into modules, matching upstream, to keep dtrace working.
 - Fix some non-significant textual differences.

Ticket:	NAS-114103
---
 build/profiles/freenas/config.pyd           |  3 +++
 build/profiles/freenas/kernel/TRUENAS.amd64 | 21 ++++++++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/build/profiles/freenas/config.pyd b/build/profiles/freenas/config.pyd
index 04bc4d4..0de85f0 100644
--- a/build/profiles/freenas/config.pyd
+++ b/build/profiles/freenas/config.pyd
@@ -40,6 +40,8 @@ kernel_modules = [
     "autofs",
     "bnxt",
     "cc",
+    "cfiscsi",
+    "ctl",
     "dtrace",
     "efirt",
     "evdev",
@@ -49,6 +51,7 @@ kernel_modules = [
     "i2c",
     "ipmi",
     "ipsec",
+    "iscsi",
     "khelp/h_ertt",
     "libiconv",
     "libmchain",
diff --git a/build/profiles/freenas/kernel/TRUENAS.amd64 b/build/profiles/freenas/kernel/TRUENAS.amd64
index e8e5215..e5d78de 100644
--- a/build/profiles/freenas/kernel/TRUENAS.amd64
+++ b/build/profiles/freenas/kernel/TRUENAS.amd64
@@ -126,6 +126,12 @@ options		PCI_IOV			# PCI SR-IOV support
 
 options 	COMPAT_LINUXKPI
 
+# Enable support for the kernel PLL to use an external PPS signal,
+# under supervision of [x]ntpd(8)
+# More info in ntpd documentation: http://www.eecis.udel.edu/~ntp
+
+options 	PPS_SYNC
+
 # Floppy drives
 #device		fdc
 
@@ -158,7 +164,7 @@ device		sa			# Sequential Access (tape etc)
 device		cd			# CD
 device		pass			# Passthrough device (direct ATA/SCSI access)
 device		ses			# Enclosure Services (SES and SAF-TE)
-device		ctl			# CAM Target Layer
+#device		ctl			# CAM Target Layer
 
 # RAID controllers interfaced to the SCSI subsystem
 device		amr			# AMI MegaRAID
@@ -190,8 +196,7 @@ device		nvme			# base NVMe driver
 device		nvd			# expose NVMe namespaces as disks, depends on nvme
 
 # Intel Volume Management Device (VMD) support
-device		vmd			# base VMD device
-device		vmd_bus			# bus for VMD children
+device		vmd
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
 device		atkbdc			# AT keyboard controller
@@ -205,11 +210,11 @@ device		kbdmux			# keyboard multiplexer
 
 #device		splash			# Splash screen and screen saver support
 
-# syscons is the default console driver, resembling an SCO console
+# syscons is the legacy console driver, resembling an SCO console
 #device		sc
 #options 	SC_PIXEL_MODE		# add support for the raster text mode
 
-# vt is the new video console driver
+# vt is the default video console driver
 device		vt
 device		vt_vga
 device		vt_efifb
@@ -238,6 +243,7 @@ device		uart			# Generic UART driver
 # PCI/PCI-X/PCIe Ethernet NICs that use iflib infrastructure
 device		iflib
 device		em			# Intel PRO/1000 Gigabit Ethernet Family
+device		igc			# Intel I225 2.5G Ethernet
 device		ix			# Intel PRO/10GbE PCIE PF Ethernet
 device		ixv			# Intel PRO/10GbE PCIE VF Ethernet
 device		ixl			# Intel 700 Series Physical Function
@@ -376,6 +382,9 @@ device		virtio_blk		# VirtIO Block device
 device		virtio_scsi		# VirtIO SCSI device
 device		virtio_balloon		# VirtIO Memory Balloon device
 
+# Linux KVM paravirtualization support
+device		kvm_clock		# KVM paravirtual clock driver
+
 # HyperV drivers and enhancement support
 device		hyperv			# HyperV drivers 
 
@@ -424,8 +433,6 @@ device		cryptodev		# /dev/crypto for access to h/w
 device		lagg			# Link aggregation
 device		carp
 device		pty			# BSD-style compatibility pseudo ttys
-device		iscsi
-device		cfiscsi			# CAM Target Layer iSCSI target frontend
 device		uhid
 device		ums
 device		wmt