From a99c8743d66637285929dd64442e7bc72c8d39aa Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com>
Date: Thu, 16 Dec 2021 10:23:19 -0500
Subject: [PATCH] Linux kernel 5.15.8

---
 .../recipes-citadel/images/citadel-image.inc  |  2 +-
 ...nel_5.15.5.bb => citadel-kernel_5.15.8.bb} |  2 +-
 .../citadel-kernel/files/defconfig            | 55 +++++++++++++++----
 3 files changed, 46 insertions(+), 13 deletions(-)
 rename meta-citadel/recipes-kernel/citadel-kernel/{citadel-kernel_5.15.5.bb => citadel-kernel_5.15.8.bb} (93%)

diff --git a/meta-citadel/recipes-citadel/images/citadel-image.inc b/meta-citadel/recipes-citadel/images/citadel-image.inc
index a861a03..557de7f 100644
--- a/meta-citadel/recipes-citadel/images/citadel-image.inc
+++ b/meta-citadel/recipes-citadel/images/citadel-image.inc
@@ -5,7 +5,7 @@ CITADEL_IMAGE_VERSION_rootfs = "1"
 CITADEL_IMAGE_VERSION_extra = "1"
 CITADEL_IMAGE_VERSION_kernel = "1"
 
-CITADEL_KERNEL_VERSION = "5.15.5"
+CITADEL_KERNEL_VERSION = "5.15.8"
 
 CITADEL_KERNEL_CONFIG = "${COREBASE}/../meta-citadel/recipes-kernel/citadel-kernel/files/defconfig"
 
diff --git a/meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel_5.15.5.bb b/meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel_5.15.8.bb
similarity index 93%
rename from meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel_5.15.5.bb
rename to meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel_5.15.8.bb
index 6af0d24..5893efb 100644
--- a/meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel_5.15.5.bb
+++ b/meta-citadel/recipes-kernel/citadel-kernel/citadel-kernel_5.15.8.bb
@@ -9,7 +9,7 @@ SRC_URI = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${PV}.tar.xz\
     file://defconfig \
 "
 
-SRC_URI[sha256sum] = "e9565a301525ac81c142ceb832f9053dd5685e107dbcf753d0de4c58bc98851f"
+SRC_URI[sha256sum] = "d756527313ee09c8b0376975fb7890e2eddce9714967504093b2c0fab5c0f3bd"
 
 LINUX_VERSION ?= "${PV}"
 S = "${WORKDIR}/linux-${LINUX_VERSION}"
diff --git a/meta-citadel/recipes-kernel/citadel-kernel/files/defconfig b/meta-citadel/recipes-kernel/citadel-kernel/files/defconfig
index a011b1e..4b0d7b7 100644
--- a/meta-citadel/recipes-kernel/citadel-kernel/files/defconfig
+++ b/meta-citadel/recipes-kernel/citadel-kernel/files/defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.15.5 Kernel Configuration
+# Linux/x86 5.15.8 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (Debian 10.2.1-6) 10.2.1 20210110"
 CONFIG_CC_IS_GCC=y
@@ -1466,13 +1466,16 @@ CONFIG_HOTPLUG_PCI_ACPI_IBM=m
 #
 # PCI controller drivers
 #
-# CONFIG_VMD is not set
+CONFIG_VMD=m
 
 #
 # DesignWare PCI Core Support
 #
-# CONFIG_PCIE_DW_PLAT_HOST is not set
-# CONFIG_PCI_MESON is not set
+CONFIG_PCIE_DW=y
+CONFIG_PCIE_DW_HOST=y
+CONFIG_PCIE_DW_PLAT=y
+CONFIG_PCIE_DW_PLAT_HOST=y
+CONFIG_PCI_MESON=y
 # end of DesignWare PCI Core Support
 
 #
@@ -1650,7 +1653,11 @@ CONFIG_NVME_MULTIPATH=y
 CONFIG_NVME_HWMON=y
 # CONFIG_NVME_FC is not set
 # CONFIG_NVME_TCP is not set
-# CONFIG_NVME_TARGET is not set
+CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_PASSTHRU=y
+# CONFIG_NVME_TARGET_LOOP is not set
+# CONFIG_NVME_TARGET_FC is not set
+# CONFIG_NVME_TARGET_TCP is not set
 # end of NVME Support
 
 #
@@ -3249,7 +3256,7 @@ CONFIG_SENSORS_CORETEMP=m
 CONFIG_SENSORS_ACPI_POWER=m
 # CONFIG_SENSORS_ATK0110 is not set
 CONFIG_THERMAL=y
-# CONFIG_THERMAL_NETLINK is not set
+CONFIG_THERMAL_NETLINK=y
 # CONFIG_THERMAL_STATISTICS is not set
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_HWMON=y
@@ -3263,7 +3270,7 @@ CONFIG_THERMAL_GOV_BANG_BANG=y
 CONFIG_THERMAL_GOV_USER_SPACE=y
 # CONFIG_THERMAL_GOV_POWER_ALLOCATOR is not set
 # CONFIG_DEVFREQ_THERMAL is not set
-CONFIG_THERMAL_EMULATION=y
+# CONFIG_THERMAL_EMULATION is not set
 
 #
 # Intel thermal drivers
@@ -3284,7 +3291,7 @@ CONFIG_PROC_THERMAL_MMIO_RAPL=m
 # end of ACPI INT340X thermal drivers
 
 CONFIG_INTEL_PCH_THERMAL=m
-# CONFIG_INTEL_TCC_COOLING is not set
+CONFIG_INTEL_TCC_COOLING=m
 # CONFIG_INTEL_MENLOW is not set
 # end of Intel thermal drivers
 
@@ -5075,8 +5082,34 @@ CONFIG_APPLE_MFI_FASTCHARGE=m
 # end of USB Physical Layer drivers
 
 # CONFIG_USB_GADGET is not set
-# CONFIG_TYPEC is not set
-# CONFIG_USB_ROLE_SWITCH is not set
+CONFIG_TYPEC=m
+CONFIG_TYPEC_TCPM=m
+CONFIG_TYPEC_TCPCI=m
+# CONFIG_TYPEC_RT1711H is not set
+CONFIG_TYPEC_TCPCI_MAXIM=m
+CONFIG_TYPEC_FUSB302=m
+CONFIG_TYPEC_UCSI=m
+CONFIG_UCSI_CCG=m
+CONFIG_UCSI_ACPI=m
+CONFIG_TYPEC_TPS6598X=m
+CONFIG_TYPEC_HD3SS3220=m
+CONFIG_TYPEC_STUSB160X=m
+
+#
+# USB Type-C Multiplexer/DeMultiplexer Switch support
+#
+CONFIG_TYPEC_MUX_PI3USB30532=m
+# end of USB Type-C Multiplexer/DeMultiplexer Switch support
+
+#
+# USB Type-C Alternate Mode drivers
+#
+CONFIG_TYPEC_DP_ALTMODE=m
+# CONFIG_TYPEC_NVIDIA_ALTMODE is not set
+# end of USB Type-C Alternate Mode drivers
+
+CONFIG_USB_ROLE_SWITCH=m
+CONFIG_USB_ROLES_INTEL_XHCI=m
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_MINORS=8
@@ -5476,7 +5509,7 @@ CONFIG_INTEL_PMC_CORE=y
 # CONFIG_INTEL_WMI_SBL_FW_UPDATE is not set
 # CONFIG_INTEL_WMI_THUNDERBOLT is not set
 CONFIG_INTEL_HID_EVENT=m
-# CONFIG_INTEL_VBTN is not set
+CONFIG_INTEL_VBTN=m
 # CONFIG_INTEL_INT0002_VGPIO is not set
 # CONFIG_INTEL_OAKTRAIL is not set
 CONFIG_INTEL_PUNIT_IPC=m