kernel-6.0.8-200

* Fri Nov 11 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.8-0]
- PCI/PM: Always disable PTM for all devices during suspend (Mark Pearson)
- PCI/PTM: Consolidate PTM interface declarations (Mark Pearson)
- PCI/PTM: Reorder functions in logical order (Mark Pearson)
- PCI/PTM: Preserve RsvdP bits in PTM Control register (Mark Pearson)
- PCI/PTM: Move pci_ptm_info() body into its only caller (Mark Pearson)
- PCI/PTM: Add pci_suspend_ptm() and pci_resume_ptm() (Mark Pearson)
- PCI/PTM: Separate configuration and enable (Mark Pearson)
- PCI/PTM: Add pci_upstream_ptm() helper (Mark Pearson)
- PCI/PTM: Cache PTM Capability offset (Mark Pearson)
- Turn on dln2 support (RHBZ 2110372) (Justin M. Forbes)
- Fix up vc4 merge for Pi4 (Justin M. Forbes)
- Linux v6.0.8
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

26 files changed, 745 insertions, 94 deletions

diff --git a/Patchlist.changelog b/Patchlist.changelog
index a204a65e0..9d112d6f3 100644
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@@ -1,3 +1,33 @@
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/0ca565fc9cc218255dbee7dd5b13e24caa89e264
+ 0ca565fc9cc218255dbee7dd5b13e24caa89e264 PCI/PM: Always disable PTM for all devices during suspend
+
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/d252cb1403a0c129739c47cc34f8012cc68ad3ff
+ d252cb1403a0c129739c47cc34f8012cc68ad3ff PCI/PTM: Consolidate PTM interface declarations
+
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/e9f470095cfe434d44103d2852cf2d7b0166f27c
+ e9f470095cfe434d44103d2852cf2d7b0166f27c PCI/PTM: Reorder functions in logical order
+
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/d7d8a6a6ba0c9ecd540a879591f230589f7d4615
+ d7d8a6a6ba0c9ecd540a879591f230589f7d4615 PCI/PTM: Preserve RsvdP bits in PTM Control register
+
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/22de605c6ba5c3b5daa44bb3ff756cc0d48583e1
+ 22de605c6ba5c3b5daa44bb3ff756cc0d48583e1 PCI/PTM: Move pci_ptm_info() body into its only caller
+
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/60a99d0e61dc826fdcc99fa821c36291c320822f
+ 60a99d0e61dc826fdcc99fa821c36291c320822f PCI/PTM: Add pci_suspend_ptm() and pci_resume_ptm()
+
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/8ec77ade17e49ecaada21143a8940009ee2009dd
+ 8ec77ade17e49ecaada21143a8940009ee2009dd PCI/PTM: Separate configuration and enable
+
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/556acb9f02a6fe5e04eee30d9431980955f9687c
+ 556acb9f02a6fe5e04eee30d9431980955f9687c PCI/PTM: Add pci_upstream_ptm() helper
+
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/9778d298fa711edd16407e56c41718849b75da9d
+ 9778d298fa711edd16407e56c41718849b75da9d PCI/PTM: Cache PTM Capability offset
+
+"https://gitlab.com/cki-project/kernel-ark/-/commit"/03928964c7af719ea1e4ee7bd5681800543c6ed6
+ 03928964c7af719ea1e4ee7bd5681800543c6ed6 Fix up vc4 merge for Pi4
+
 "https://gitlab.com/cki-project/kernel-ark/-/commit"/bf2bceedcc5d66c041165b4db6aea032fd7f4b5c
  bf2bceedcc5d66c041165b4db6aea032fd7f4b5c drm/simpledrm: Only advertise formats that are supported
 
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index e2bc45603..d4fc43566 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -1671,6 +1671,7 @@ CONFIG_DL2K=m
 CONFIG_DLM_DEBUG=y
 # CONFIG_DLM_DEPRECATED_API is not set
 CONFIG_DLM=m
+CONFIG_DLN2_ADC=m
 CONFIG_DM9051=m
 CONFIG_DM9102=m
 CONFIG_DMA_API_DEBUG_SG=y
@@ -2471,6 +2472,7 @@ CONFIG_GPIO_BD9571MWV=m
 CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_DAVINCI=y
+CONFIG_GPIO_DLN2=m
 CONFIG_GPIO_DWAPB=m
 CONFIG_GPIO_EXAR=m
 # CONFIG_GPIO_FTGPIO010 is not set
@@ -2826,6 +2828,7 @@ CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_DESIGNWARE_SLAVE=y
 CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
 # CONFIG_I2C_EG20T is not set
 # CONFIG_I2C_EMEV2 is not set
 # CONFIG_I2C_FSI is not set
@@ -4010,7 +4013,7 @@ CONFIG_MFD_CROS_EC_DEV=m
 # CONFIG_MFD_DA9062 is not set
 # CONFIG_MFD_DA9063 is not set
 # CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
+CONFIG_MFD_DLN2=m
 CONFIG_MFD_ENE_KB3930=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
 CONFIG_MFD_HI6421_PMIC=m
@@ -7517,6 +7520,7 @@ CONFIG_SPI_CADENCE_QUADSPI=m
 CONFIG_SPI_CADENCE_XSPI=m
 # CONFIG_SPI_DEBUG is not set
 CONFIG_SPI_DESIGNWARE=m
+CONFIG_SPI_DLN2=m
 # CONFIG_SPI_DW_DMA is not set
 CONFIG_SPI_DW_MMIO=m
 CONFIG_SPI_DW_PCI=m
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index a9697eb8e..8a365803e 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -1280,6 +1280,7 @@ CONFIG_DIMLIB=y
 # CONFIG_DLHL60D is not set
 # CONFIG_DLM_DEPRECATED_API is not set
 # CONFIG_DLM is not set
+CONFIG_DLN2_ADC=m
 # CONFIG_DM9051 is not set
 CONFIG_DMA_API_DEBUG_SG=y
 CONFIG_DMA_API_DEBUG=y
@@ -1899,6 +1900,7 @@ CONFIG_GLOB=y
 # CONFIG_GPIO_BT8XX is not set
 # CONFIG_GPIO_CADENCE is not set
 CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_DLN2=m
 CONFIG_GPIO_DWAPB=m
 # CONFIG_GPIO_EXAR is not set
 # CONFIG_GPIO_F7188X is not set
@@ -2209,6 +2211,7 @@ CONFIG_I2C_COMPAT=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
 CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
 # CONFIG_I2C_EMEV2 is not set
 CONFIG_I2C_GPIO_FAULT_INJECTOR=y
 CONFIG_I2C_GPIO=m
@@ -3177,7 +3180,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_DA9062 is not set
 # CONFIG_MFD_DA9063 is not set
 # CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
+CONFIG_MFD_DLN2=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
 # CONFIG_MFD_HI655X_PMIC is not set
@@ -6000,6 +6003,7 @@ CONFIG_SPI_AMD=y
 # CONFIG_SPI_CADENCE_QUADSPI is not set
 CONFIG_SPI_DEBUG=y
 # CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_DLN2=m
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_GPIO is not set
 # CONFIG_SPI_HISI_KUNPENG is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 53cfb45ed..1b7a762a0 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -1664,6 +1664,7 @@ CONFIG_DL2K=m
 CONFIG_DLM_DEBUG=y
 # CONFIG_DLM_DEPRECATED_API is not set
 CONFIG_DLM=m
+CONFIG_DLN2_ADC=m
 CONFIG_DM9051=m
 CONFIG_DM9102=m
 # CONFIG_DMA_API_DEBUG is not set
@@ -2455,6 +2456,7 @@ CONFIG_GPIO_BD9571MWV=m
 CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_DAVINCI=y
+CONFIG_GPIO_DLN2=m
 CONFIG_GPIO_DWAPB=m
 CONFIG_GPIO_EXAR=m
 # CONFIG_GPIO_FTGPIO010 is not set
@@ -2810,6 +2812,7 @@ CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_DESIGNWARE_SLAVE=y
 CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
 # CONFIG_I2C_EG20T is not set
 # CONFIG_I2C_EMEV2 is not set
 # CONFIG_I2C_FSI is not set
@@ -3990,7 +3993,7 @@ CONFIG_MFD_CROS_EC_DEV=m
 # CONFIG_MFD_DA9062 is not set
 # CONFIG_MFD_DA9063 is not set
 # CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
+CONFIG_MFD_DLN2=m
 CONFIG_MFD_ENE_KB3930=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
 CONFIG_MFD_HI6421_PMIC=m
@@ -7494,6 +7497,7 @@ CONFIG_SPI_CADENCE_QUADSPI=m
 CONFIG_SPI_CADENCE_XSPI=m
 # CONFIG_SPI_DEBUG is not set
 CONFIG_SPI_DESIGNWARE=m
+CONFIG_SPI_DLN2=m
 # CONFIG_SPI_DW_DMA is not set
 CONFIG_SPI_DW_MMIO=m
 CONFIG_SPI_DW_PCI=m
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 624a51db4..08d2c4ebc 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -1272,6 +1272,7 @@ CONFIG_DIMLIB=y
 # CONFIG_DLHL60D is not set
 # CONFIG_DLM_DEPRECATED_API is not set
 # CONFIG_DLM is not set
+CONFIG_DLN2_ADC=m
 # CONFIG_DM9051 is not set
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_DMA_API_DEBUG_SG is not set
@@ -1883,6 +1884,7 @@ CONFIG_GLOB=y
 # CONFIG_GPIO_BT8XX is not set
 # CONFIG_GPIO_CADENCE is not set
 CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_DLN2=m
 CONFIG_GPIO_DWAPB=m
 # CONFIG_GPIO_EXAR is not set
 # CONFIG_GPIO_F7188X is not set
@@ -2193,6 +2195,7 @@ CONFIG_I2C_COMPAT=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
 CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
 # CONFIG_I2C_EMEV2 is not set
 # CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
 CONFIG_I2C_GPIO=m
@@ -3156,7 +3159,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_DA9062 is not set
 # CONFIG_MFD_DA9063 is not set
 # CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
+CONFIG_MFD_DLN2=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
 # CONFIG_MFD_HI655X_PMIC is not set
@@ -5975,6 +5978,7 @@ CONFIG_SPI_AMD=y
 # CONFIG_SPI_CADENCE_QUADSPI is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_DLN2=m
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_GPIO is not set
 # CONFIG_SPI_HISI_KUNPENG is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 1fdd5128a..f190a8a60 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -1642,6 +1642,7 @@ CONFIG_DL2K=m
 CONFIG_DLM_DEBUG=y
 # CONFIG_DLM_DEPRECATED_API is not set
 CONFIG_DLM=m
+CONFIG_DLN2_ADC=m
 # CONFIG_DM9000 is not set
 CONFIG_DM9051=m
 CONFIG_DM9102=m
@@ -2463,6 +2464,7 @@ CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_DA9052=m
 CONFIG_GPIO_DA9055=m
+CONFIG_GPIO_DLN2=m
 CONFIG_GPIO_DWAPB=m
 CONFIG_GPIO_EXAR=m
 # CONFIG_GPIO_FTGPIO010 is not set
@@ -2801,6 +2803,7 @@ CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_DESIGNWARE_SLAVE=y
 CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
 # CONFIG_I2C_EG20T is not set
 # CONFIG_I2C_EMEV2 is not set
 CONFIG_I2C_EXYNOS5=m
@@ -3994,7 +3997,7 @@ CONFIG_MFD_DA9055=y
 # CONFIG_MFD_DA9062 is not set
 CONFIG_MFD_DA9063=m
 # CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
+CONFIG_MFD_DLN2=m
 CONFIG_MFD_ENE_KB3930=m
 CONFIG_MFD_EXYNOS_LPASS=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
@@ -7587,6 +7590,7 @@ CONFIG_SPI_CADENCE_XSPI=m
 CONFIG_SPI_DAVINCI=m
 # CONFIG_SPI_DEBUG is not set
 CONFIG_SPI_DESIGNWARE=m
+CONFIG_SPI_DLN2=m
 # CONFIG_SPI_DW_DMA is not set
 CONFIG_SPI_DW_MMIO=m
 CONFIG_SPI_DW_PCI=m
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index f335b73ad..bb948e32a 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -1635,6 +1635,7 @@ CONFIG_DL2K=m
 CONFIG_DLM_DEBUG=y
 # CONFIG_DLM_DEPRECATED_API is not set
 CONFIG_DLM=m
+CONFIG_DLN2_ADC=m
 # CONFIG_DM9000 is not set
 CONFIG_DM9051=m
 CONFIG_DM9102=m
@@ -2448,6 +2449,7 @@ CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_DA9052=m
 CONFIG_GPIO_DA9055=m
+CONFIG_GPIO_DLN2=m
 CONFIG_GPIO_DWAPB=m
 CONFIG_GPIO_EXAR=m
 # CONFIG_GPIO_FTGPIO010 is not set
@@ -2786,6 +2788,7 @@ CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_DESIGNWARE_SLAVE=y
 CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
 # CONFIG_I2C_EG20T is not set
 # CONFIG_I2C_EMEV2 is not set
 CONFIG_I2C_EXYNOS5=m
@@ -3976,7 +3979,7 @@ CONFIG_MFD_DA9055=y
 # CONFIG_MFD_DA9062 is not set
 CONFIG_MFD_DA9063=m
 # CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
+CONFIG_MFD_DLN2=m
 CONFIG_MFD_ENE_KB3930=m
 CONFIG_MFD_EXYNOS_LPASS=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
@@ -7566,6 +7569,7 @@ CONFIG_SPI_CADENCE_XSPI=m
 CONFIG_SPI_DAVINCI=m
 # CONFIG_SPI_DEBUG is not set
 CONFIG_SPI_DESIGNWARE=m
+CONFIG_SPI_DLN2=m
 # CONFIG_SPI_DW_DMA is not set
 CONFIG_SPI_DW_MMIO=m
 CONFIG_SPI_DW_PCI=m
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index b4c4345d1..6749d5cbc 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -1611,6 +1611,7 @@ CONFIG_DL2K=m
 CONFIG_DLM_DEBUG=y
 # CONFIG_DLM_DEPRECATED_API is not set
 CONFIG_DLM=m
+CONFIG_DLN2_ADC=m
 # CONFIG_DM9000 is not set
 CONFIG_DM9051=m
 CONFIG_DM9102=m
@@ -2415,6 +2416,7 @@ CONFIG_GPIO_BD9571MWV=m
 CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_DAVINCI=y
+CONFIG_GPIO_DLN2=m
 CONFIG_GPIO_DWAPB=m
 CONFIG_GPIO_EXAR=m
 # CONFIG_GPIO_FTGPIO010 is not set
@@ -2748,6 +2750,7 @@ CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_DESIGNWARE_SLAVE=y
 CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
 # CONFIG_I2C_EG20T is not set
 # CONFIG_I2C_EMEV2 is not set
 CONFIG_I2C_EXYNOS5=m
@@ -3915,7 +3918,7 @@ CONFIG_MFD_CROS_EC_DEV=m
 # CONFIG_MFD_DA9062 is not set
 # CONFIG_MFD_DA9063 is not set
 # CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
+CONFIG_MFD_DLN2=m
 CONFIG_MFD_ENE_KB3930=m
 CONFIG_MFD_EXYNOS_LPASS=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
@@ -7366,6 +7369,7 @@ CONFIG_SPI_CADENCE_XSPI=m
 CONFIG_SPI_DAVINCI=m
 # CONFIG_SPI_DEBUG is not set
 CONFIG_SPI_DESIGNWARE=m
+CONFIG_SPI_DLN2=m
 # CONFIG_SPI_DW_DMA is not set
 CONFIG_SPI_DW_MMIO=m
 CONFIG_SPI_DW_PCI=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 20460a111..3872d4f03 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -1604,6 +1604,7 @@ CONFIG_DL2K=m
 CONFIG_DLM_DEBUG=y
 # CONFIG_DLM_DEPRECATED_API is not set
 CONFIG_DLM=m
+CONFIG_DLN2_ADC=m
 # CONFIG_DM9000 is not set
 CONFIG_DM9051=m
 CONFIG_DM9102=m
@@ -2400,6 +2401,7 @@ CONFIG_GPIO_BD9571MWV=m
 CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_DAVINCI=y
+CONFIG_GPIO_DLN2=m
 CONFIG_GPIO_DWAPB=m
 CONFIG_GPIO_EXAR=m
 # CONFIG_GPIO_FTGPIO010 is not set
@@ -2733,6 +2735,7 @@ CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_DESIGNWARE_SLAVE=y
 CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
 # CONFIG_I2C_EG20T is not set
 # CONFIG_I2C_EMEV2 is not set
 CONFIG_I2C_EXYNOS5=m
@@ -3897,7 +3900,7 @@ CONFIG_MFD_CROS_EC_DEV=m
 # CONFIG_MFD_DA9062 is not set
 # CONFIG_MFD_DA9063 is not set
 # CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
+CONFIG_MFD_DLN2=m
 CONFIG_MFD_ENE_KB3930=m
 CONFIG_MFD_EXYNOS_LPASS=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
@@ -7345,6 +7348,7 @@ CONFIG_SPI_CADENCE_XSPI=m
 CONFIG_SPI_DAVINCI=m
 # CONFIG_SPI_DEBUG is not set
 CONFIG_SPI_DESIGNWARE=m
+CONFIG_SPI_DLN2=m
 # CONFIG_SPI_DW_DMA is not set
 CONFIG_SPI_DW_MMIO=m
 CONFIG_SPI_DW_PCI=m
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 821a22fcc..d14360ab4 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -1271,6 +1271,7 @@ CONFIG_DL2K=m
 CONFIG_DLM_DEBUG=y
 # CONFIG_DLM_DEPRECATED_API is not set
 CONFIG_DLM=m
+CONFIG_DLN2_ADC=m
 CONFIG_DM9051=m
 CONFIG_DM9102=m
 CONFIG_DMA_API_DEBUG_SG=y
@@ -1966,6 +1967,7 @@ CONFIG_GPIO_AGGREGATOR=m
 CONFIG_GPIO_BD9571MWV=m
 CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_DLN2=m
 # CONFIG_GPIO_DWAPB is not set
 CONFIG_GPIO_EXAR=m
 # CONFIG_GPIO_FTGPIO010 is not set
@@ -2270,6 +2272,7 @@ CONFIG_I2C_DESIGNWARE_PCI=m
 # CONFIG_I2C_DESIGNWARE_PLATFORM is not set
 CONFIG_I2C_DESIGNWARE_SLAVE=y
 CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
 # CONFIG_I2C_EG20T is not set
 # CONFIG_I2C_EMEV2 is not set
 # CONFIG_I2C_FSI is not set
@@ -3332,7 +3335,7 @@ CONFIG_MFD_CORE=m
 # CONFIG_MFD_DA9062 is not set
 # CONFIG_MFD_DA9063 is not set
 # CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
+CONFIG_MFD_DLN2=m
 CONFIG_MFD_ENE_KB3930=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
@@ -6356,6 +6359,7 @@ CONFIG_SPI_AX88796C=m
 # CONFIG_SPI_CADENCE_XSPI is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_DLN2=m
 CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_GPIO is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index ff489546d..4c985c23c 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -1130,6 +1130,7 @@ CONFIG_DIMLIB=y
 CONFIG_DLM_DEBUG=y
 # CONFIG_DLM_DEPRECATED_API is not set
 CONFIG_DLM=m
+CONFIG_DLN2_ADC=m
 # CONFIG_DM9051 is not set
 CONFIG_DMA_API_DEBUG_SG=y
 CONFIG_DMA_API_DEBUG=y
@@ -1735,6 +1736,7 @@ CONFIG_GLOB=y
 # CONFIG_GPIO_BT8XX is not set
 # CONFIG_GPIO_CADENCE is not set
 CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_DLN2=m
 # CONFIG_GPIO_DWAPB is not set
 # CONFIG_GPIO_EXAR is not set
 # CONFIG_GPIO_F7188X is not set
@@ -2036,6 +2038,7 @@ CONFIG_I2C_COMPAT=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
 CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
 # CONFIG_I2C_EMEV2 is not set
 CONFIG_I2C_GPIO_FAULT_INJECTOR=y
 # CONFIG_I2C_GPIO is not set
@@ -3001,7 +3004,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_DA9062 is not set
 # CONFIG_MFD_DA9063 is not set
 # CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
+CONFIG_MFD_DLN2=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
 # CONFIG_MFD_HI655X_PMIC is not set
@@ -5779,6 +5782,7 @@ CONFIG_SPI_AMD=y
 # CONFIG_SPI_CADENCE_QUADSPI is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_DLN2=m
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_GPIO is not set
 # CONFIG_SPI_HISI_KUNPENG is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 95fa0070e..8618357d1 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -1263,6 +1263,7 @@ CONFIG_DL2K=m
 CONFIG_DLM_DEBUG=y
 # CONFIG_DLM_DEPRECATED_API is not set
 CONFIG_DLM=m
+CONFIG_DLN2_ADC=m
 CONFIG_DM9051=m
 CONFIG_DM9102=m
 # CONFIG_DMA_API_DEBUG is not set
@@ -1949,6 +1950,7 @@ CONFIG_GPIO_AGGREGATOR=m
 CONFIG_GPIO_BD9571MWV=m
 CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_DLN2=m
 # CONFIG_GPIO_DWAPB is not set
 CONFIG_GPIO_EXAR=m
 # CONFIG_GPIO_FTGPIO010 is not set
@@ -2253,6 +2255,7 @@ CONFIG_I2C_DESIGNWARE_PCI=m
 # CONFIG_I2C_DESIGNWARE_PLATFORM is not set
 CONFIG_I2C_DESIGNWARE_SLAVE=y
 CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
 # CONFIG_I2C_EG20T is not set
 # CONFIG_I2C_EMEV2 is not set
 # CONFIG_I2C_FSI is not set
@@ -3312,7 +3315,7 @@ CONFIG_MFD_CORE=m
 # CONFIG_MFD_DA9062 is not set
 # CONFIG_MFD_DA9063 is not set
 # CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
+CONFIG_MFD_DLN2=m
 CONFIG_MFD_ENE_KB3930=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
@@ -6333,6 +6336,7 @@ CONFIG_SPI_AX88796C=m
 # CONFIG_SPI_CADENCE_XSPI is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_DLN2=m
 CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_GPIO is not set
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index e05237324..0b030e3aa 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -1122,6 +1122,7 @@ CONFIG_DIMLIB=y
 CONFIG_DLM_DEBUG=y
 # CONFIG_DLM_DEPRECATED_API is not set
 CONFIG_DLM=m
+CONFIG_DLN2_ADC=m
 # CONFIG_DM9051 is not set
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_DMA_API_DEBUG_SG is not set
@@ -1719,6 +1720,7 @@ CONFIG_GLOB=y
 # CONFIG_GPIO_BT8XX is not set
 # CONFIG_GPIO_CADENCE is not set
 CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_DLN2=m
 # CONFIG_GPIO_DWAPB is not set
 # CONFIG_GPIO_EXAR is not set
 # CONFIG_GPIO_F7188X is not set
@@ -2020,6 +2022,7 @@ CONFIG_I2C_COMPAT=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
 CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
 # CONFIG_I2C_EMEV2 is not set
 # CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
 # CONFIG_I2C_GPIO is not set
@@ -2981,7 +2984,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_DA9062 is not set
 # CONFIG_MFD_DA9063 is not set
 # CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
+CONFIG_MFD_DLN2=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
 # CONFIG_MFD_HI655X_PMIC is not set
@@ -5756,6 +5759,7 @@ CONFIG_SPI_AMD=y
 # CONFIG_SPI_CADENCE_QUADSPI is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_DLN2=m
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_GPIO is not set
 # CONFIG_SPI_HISI_KUNPENG is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index c32711960..651886784 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -1279,6 +1279,7 @@ CONFIG_DL2K=m
 CONFIG_DLM_DEBUG=y
 # CONFIG_DLM_DEPRECATED_API is not set
 CONFIG_DLM=m
+CONFIG_DLN2_ADC=m
 CONFIG_DM9051=m
 CONFIG_DM9102=m
 CONFIG_DMA_API_DEBUG_SG=y
@@ -1962,6 +1963,7 @@ CONFIG_GPIO_AGGREGATOR=m
 CONFIG_GPIO_BD9571MWV=m
 CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_DLN2=m
 # CONFIG_GPIO_DWAPB is not set
 CONFIG_GPIO_EXAR=m
 # CONFIG_GPIO_FTGPIO010 is not set
@@ -2254,6 +2256,7 @@ CONFIG_I2C_CP2615=m
 # CONFIG_I2C_DESIGNWARE_PLATFORM is not set
 CONFIG_I2C_DESIGNWARE_SLAVE=y
 CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
 # CONFIG_I2C_EG20T is not set
 # CONFIG_I2C_EMEV2 is not set
 # CONFIG_I2C_FSI is not set
@@ -3313,7 +3316,7 @@ CONFIG_MFD_CORE=m
 # CONFIG_MFD_DA9062 is not set
 # CONFIG_MFD_DA9063 is not set
 # CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
+CONFIG_MFD_DLN2=m
 CONFIG_MFD_ENE_KB3930=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
@@ -6299,6 +6302,7 @@ CONFIG_SPI_AX88796C=m
 # CONFIG_SPI_CADENCE_XSPI is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_DLN2=m
 CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_GPIO is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 2fd0186e0..8a4997acb 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -1136,6 +1136,7 @@ CONFIG_DIMLIB=y
 CONFIG_DLM_DEBUG=y
 # CONFIG_DLM_DEPRECATED_API is not set
 CONFIG_DLM=m
+CONFIG_DLN2_ADC=m
 # CONFIG_DM9051 is not set
 CONFIG_DMA_API_DEBUG_SG=y
 CONFIG_DMA_API_DEBUG=y
@@ -1736,6 +1737,7 @@ CONFIG_GLOB=y
 # CONFIG_GPIO_BT8XX is not set
 # CONFIG_GPIO_CADENCE is not set
 CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_DLN2=m
 # CONFIG_GPIO_DWAPB is not set
 # CONFIG_GPIO_EXAR is not set
 # CONFIG_GPIO_F7188X is not set
@@ -2027,6 +2029,7 @@ CONFIG_I2C_ALGOBIT=m
 # CONFIG_I2C_DESIGNWARE_PLATFORM is not set
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
 CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
 # CONFIG_I2C_EMEV2 is not set
 CONFIG_I2C_GPIO_FAULT_INJECTOR=y
 # CONFIG_I2C_GPIO is not set
@@ -2987,7 +2990,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_DA9062 is not set
 # CONFIG_MFD_DA9063 is not set
 # CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
+CONFIG_MFD_DLN2=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
 # CONFIG_MFD_HI655X_PMIC is not set
@@ -5753,6 +5756,7 @@ CONFIG_SPI_AMD=y
 # CONFIG_SPI_CADENCE_QUADSPI is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_DLN2=m
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_GPIO is not set
 # CONFIG_SPI_HISI_KUNPENG is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index c7a8f9488..31ac37727 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -1271,6 +1271,7 @@ CONFIG_DL2K=m
 CONFIG_DLM_DEBUG=y
 # CONFIG_DLM_DEPRECATED_API is not set
 CONFIG_DLM=m
+CONFIG_DLN2_ADC=m
 CONFIG_DM9051=m
 CONFIG_DM9102=m
 # CONFIG_DMA_API_DEBUG is not set
@@ -1945,6 +1946,7 @@ CONFIG_GPIO_AGGREGATOR=m
 CONFIG_GPIO_BD9571MWV=m
 CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_DLN2=m
 # CONFIG_GPIO_DWAPB is not set
 CONFIG_GPIO_EXAR=m
 # CONFIG_GPIO_FTGPIO010 is not set
@@ -2237,6 +2239,7 @@ CONFIG_I2C_CP2615=m
 # CONFIG_I2C_DESIGNWARE_PLATFORM is not set
 CONFIG_I2C_DESIGNWARE_SLAVE=y
 CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
 # CONFIG_I2C_EG20T is not set
 # CONFIG_I2C_EMEV2 is not set
 # CONFIG_I2C_FSI is not set
@@ -3293,7 +3296,7 @@ CONFIG_MFD_CORE=m
 # CONFIG_MFD_DA9062 is not set
 # CONFIG_MFD_DA9063 is not set
 # CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
+CONFIG_MFD_DLN2=m
 CONFIG_MFD_ENE_KB3930=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
@@ -6276,6 +6279,7 @@ CONFIG_SPI_AX88796C=m
 # CONFIG_SPI_CADENCE_XSPI is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_DLN2=m
 CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_GPIO is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 850349730..1d776f53d 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -1128,6 +1128,7 @@ CONFIG_DIMLIB=y
 CONFIG_DLM_DEBUG=y
 # CONFIG_DLM_DEPRECATED_API is not set
 CONFIG_DLM=m
+CONFIG_DLN2_ADC=m
 # CONFIG_DM9051 is not set
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_DMA_API_DEBUG_SG is not set
@@ -1720,6 +1721,7 @@ CONFIG_GLOB=y
 # CONFIG_GPIO_BT8XX is not set
 # CONFIG_GPIO_CADENCE is not set
 CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_DLN2=m
 # CONFIG_GPIO_DWAPB is not set
 # CONFIG_GPIO_EXAR is not set
 # CONFIG_GPIO_F7188X is not set
@@ -2011,6 +2013,7 @@ CONFIG_I2C_ALGOBIT=m
 # CONFIG_I2C_DESIGNWARE_PLATFORM is not set
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
 CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
 # CONFIG_I2C_EMEV2 is not set
 # CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
 # CONFIG_I2C_GPIO is not set
@@ -2967,7 +2970,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_DA9062 is not set
 # CONFIG_MFD_DA9063 is not set
 # CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
+CONFIG_MFD_DLN2=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
 # CONFIG_MFD_HI655X_PMIC is not set
@@ -5730,6 +5733,7 @@ CONFIG_SPI_AMD=y
 # CONFIG_SPI_CADENCE_QUADSPI is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_DLN2=m
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_GPIO is not set
 # CONFIG_SPI_HISI_KUNPENG is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 0ff508460..1ebbf068c 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -1133,6 +1133,7 @@ CONFIG_DIMLIB=y
 CONFIG_DLM_DEBUG=y
 # CONFIG_DLM_DEPRECATED_API is not set
 CONFIG_DLM=m
+CONFIG_DLN2_ADC=m
 # CONFIG_DM9051 is not set
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_DMA_API_DEBUG_SG is not set
@@ -1729,6 +1730,7 @@ CONFIG_GLOB=y
 # CONFIG_GPIO_BT8XX is not set
 # CONFIG_GPIO_CADENCE is not set
 CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_DLN2=m
 # CONFIG_GPIO_DWAPB is not set
 # CONFIG_GPIO_EXAR is not set
 # CONFIG_GPIO_F7188X is not set
@@ -2021,6 +2023,7 @@ CONFIG_I2C_ALGOBIT=m
 # CONFIG_I2C_DESIGNWARE_PLATFORM is not set
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
 CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
 # CONFIG_I2C_EMEV2 is not set
 # CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
 # CONFIG_I2C_GPIO is not set
@@ -2979,7 +2982,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_DA9062 is not set
 # CONFIG_MFD_DA9063 is not set
 # CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
+CONFIG_MFD_DLN2=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
 # CONFIG_MFD_HI655X_PMIC is not set
@@ -5750,6 +5753,7 @@ CONFIG_SPI_AMD=y
 # CONFIG_SPI_CADENCE_QUADSPI is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_DLN2=m
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_GPIO is not set
 # CONFIG_SPI_HISI_KUNPENG is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 03b8d7fb8..5ca25b0d5 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -1386,6 +1386,7 @@ CONFIG_DL2K=m
 CONFIG_DLM_DEBUG=y
 # CONFIG_DLM_DEPRECATED_API is not set
 CONFIG_DLM=m
+CONFIG_DLN2_ADC=m
 CONFIG_DM9051=m
 CONFIG_DM9102=m
 CONFIG_DMA_API_DEBUG_SG=y
@@ -2136,6 +2137,7 @@ CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_CRYSTAL_COVE=y
 # CONFIG_GPIO_CS5535 is not set
+CONFIG_GPIO_DLN2=m
 # CONFIG_GPIO_DWAPB is not set
 CONFIG_GPIO_EXAR=m
 # CONFIG_GPIO_F7188X is not set
@@ -2457,6 +2459,7 @@ CONFIG_I2C_DESIGNWARE_PCI=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_DESIGNWARE_SLAVE=y
 CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
 # CONFIG_I2C_EG20T is not set
 # CONFIG_I2C_EMEV2 is not set
 # CONFIG_I2C_FSI is not set
@@ -3614,7 +3617,7 @@ CONFIG_MFD_CROS_EC_DEV=m
 # CONFIG_MFD_DA9062 is not set
 # CONFIG_MFD_DA9063 is not set
 # CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
+CONFIG_MFD_DLN2=m
 CONFIG_MFD_ENE_KB3930=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
@@ -6755,6 +6758,7 @@ CONFIG_SPI_AX88796C=m
 # CONFIG_SPI_CADENCE_XSPI is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_DLN2=m
 CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_GPIO is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 08bdde00b..b7997720d 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -1203,6 +1203,7 @@ CONFIG_DL2K=m
 CONFIG_DLM_DEBUG=y
 # CONFIG_DLM_DEPRECATED_API is not set
 CONFIG_DLM=m
+CONFIG_DLN2_ADC=m
 # CONFIG_DM9051 is not set
 CONFIG_DMA_API_DEBUG_SG=y
 CONFIG_DMA_API_DEBUG=y
@@ -1839,6 +1840,7 @@ CONFIG_GPIO_AMDPT=m
 # CONFIG_GPIO_BT8XX is not set
 # CONFIG_GPIO_CADENCE is not set
 CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_DLN2=m
 # CONFIG_GPIO_DWAPB is not set
 # CONFIG_GPIO_EXAR is not set
 # CONFIG_GPIO_F7188X is not set
@@ -2157,6 +2159,7 @@ CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
 CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
 # CONFIG_I2C_EMEV2 is not set
 CONFIG_I2C_GPIO_FAULT_INJECTOR=y
 # CONFIG_I2C_GPIO is not set
@@ -3162,7 +3165,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_DA9062 is not set
 # CONFIG_MFD_DA9063 is not set
 # CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
+CONFIG_MFD_DLN2=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
 # CONFIG_MFD_HI655X_PMIC is not set
@@ -5987,6 +5990,7 @@ CONFIG_SPI_AMD=y
 # CONFIG_SPI_CADENCE_QUADSPI is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_DLN2=m
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_GPIO is not set
 # CONFIG_SPI_HISI_KUNPENG is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index d12d426b4..fec79aeb5 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -1378,6 +1378,7 @@ CONFIG_DL2K=m
 CONFIG_DLM_DEBUG=y
 # CONFIG_DLM_DEPRECATED_API is not set
 CONFIG_DLM=m
+CONFIG_DLN2_ADC=m
 CONFIG_DM9051=m
 CONFIG_DM9102=m
 # CONFIG_DMA_API_DEBUG is not set
@@ -2119,6 +2120,7 @@ CONFIG_GPIO_CADENCE=m
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_CRYSTAL_COVE=y
 # CONFIG_GPIO_CS5535 is not set
+CONFIG_GPIO_DLN2=m
 # CONFIG_GPIO_DWAPB is not set
 CONFIG_GPIO_EXAR=m
 # CONFIG_GPIO_F7188X is not set
@@ -2440,6 +2442,7 @@ CONFIG_I2C_DESIGNWARE_PCI=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=y
 CONFIG_I2C_DESIGNWARE_SLAVE=y
 CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
 # CONFIG_I2C_EG20T is not set
 # CONFIG_I2C_EMEV2 is not set
 # CONFIG_I2C_FSI is not set
@@ -3595,7 +3598,7 @@ CONFIG_MFD_CROS_EC_DEV=m
 # CONFIG_MFD_DA9062 is not set
 # CONFIG_MFD_DA9063 is not set
 # CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
+CONFIG_MFD_DLN2=m
 CONFIG_MFD_ENE_KB3930=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
@@ -6733,6 +6736,7 @@ CONFIG_SPI_AX88796C=m
 # CONFIG_SPI_CADENCE_XSPI is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_DLN2=m
 CONFIG_SPI_FSL_LPSPI=m
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_GPIO is not set
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 76fea7fdb..5a1f2baa5 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -1195,6 +1195,7 @@ CONFIG_DL2K=m
 CONFIG_DLM_DEBUG=y
 # CONFIG_DLM_DEPRECATED_API is not set
 CONFIG_DLM=m
+CONFIG_DLN2_ADC=m
 # CONFIG_DM9051 is not set
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_DMA_API_DEBUG_SG is not set
@@ -1823,6 +1824,7 @@ CONFIG_GPIO_AMDPT=m
 # CONFIG_GPIO_BT8XX is not set
 # CONFIG_GPIO_CADENCE is not set
 CONFIG_GPIO_CDEV_V1=y
+CONFIG_GPIO_DLN2=m
 # CONFIG_GPIO_DWAPB is not set
 # CONFIG_GPIO_EXAR is not set
 # CONFIG_GPIO_F7188X is not set
@@ -2141,6 +2143,7 @@ CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 # CONFIG_I2C_DESIGNWARE_SLAVE is not set
 CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
 # CONFIG_I2C_EMEV2 is not set
 # CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
 # CONFIG_I2C_GPIO is not set
@@ -3142,7 +3145,7 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_DA9062 is not set
 # CONFIG_MFD_DA9063 is not set
 # CONFIG_MFD_DA9150 is not set
-# CONFIG_MFD_DLN2 is not set
+CONFIG_MFD_DLN2=m
 # CONFIG_MFD_GATEWORKS_GSC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
 # CONFIG_MFD_HI655X_PMIC is not set
@@ -5963,6 +5966,7 @@ CONFIG_SPI_AMD=y
 # CONFIG_SPI_CADENCE_QUADSPI is not set
 # CONFIG_SPI_DEBUG is not set
 # CONFIG_SPI_DESIGNWARE is not set
+CONFIG_SPI_DLN2=m
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_GPIO is not set
 # CONFIG_SPI_HISI_KUNPENG is not set
diff --git a/kernel.spec b/kernel.spec
index aaefe187b..09d386023 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -122,17 +122,17 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 1
 # define buildid .local
-%define specversion 6.0.7
+%define specversion 6.0.8
 %define patchversion 6.0
 %define pkgrelease 200
 %define kversion 6
-%define tarfile_release 6.0.7
+%define tarfile_release 6.0.8
 # This is needed to do merge window version magic
 %define patchlevel 0
 # This allows pkg_release to have configurable %%{?dist} tag
 %define specrelease 200%{?buildid}%{?dist}
 # This defines the kabi tarball version
-%define kabiversion 6.0.7
+%define kabiversion 6.0.8
 
 # If this variable is set to 1, a bpf selftests build failure will cause a
 # fatal kernel package build error
@@ -3180,6 +3180,20 @@ fi
 #
 #
 %changelog
+* Fri Nov 11 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.8-0]
+- PCI/PM: Always disable PTM for all devices during suspend (Mark Pearson)
+- PCI/PTM: Consolidate PTM interface declarations (Mark Pearson)
+- PCI/PTM: Reorder functions in logical order (Mark Pearson)
+- PCI/PTM: Preserve RsvdP bits in PTM Control register (Mark Pearson)
+- PCI/PTM: Move pci_ptm_info() body into its only caller (Mark Pearson)
+- PCI/PTM: Add pci_suspend_ptm() and pci_resume_ptm() (Mark Pearson)
+- PCI/PTM: Separate configuration and enable (Mark Pearson)
+- PCI/PTM: Add pci_upstream_ptm() helper (Mark Pearson)
+- PCI/PTM: Cache PTM Capability offset (Mark Pearson)
+- Turn on dln2 support (RHBZ 2110372) (Justin M. Forbes)
+- Fix up vc4 merge for Pi4 (Justin M. Forbes)
+- Linux v6.0.8
+
 * Thu Nov 03 2022 Justin M. Forbes <jforbes@fedoraproject.org> [6.0.7-0]
 - Add revert patch for BTF workaround (Justin M. Forbes)
 - Linux v6.0.7
diff --git a/mod-extra.list.fedora b/mod-extra.list.fedora
index c83fc33a9..327c7fea1 100644
--- a/mod-extra.list.fedora
+++ b/mod-extra.list.fedora
@@ -39,6 +39,8 @@ dccp_probe.ko
 diva_idi.ko
 divas.ko
 dlm.ko
+dln2-adc.ko
+dln2.ko
 ds1wm.ko
 ds2482.ko
 ds2490.ko
@@ -54,6 +56,7 @@ gf2k.ko
 gfs2.ko
 gigaset.ko
 girbil-sir.ko
+gpio-dln2.ko
 grip.ko
 grip_mp.ko
 guillemot.ko
@@ -67,6 +70,7 @@ hysdn.ko
 i2400m.ko
 i2400m-sdio.ko
 i2400m-usb.ko
+i2c-dln2.ko
 ieee802154.ko
 iforce.ko
 interact.ko
@@ -147,6 +151,7 @@ softing_cs.ko
 softing.ko
 spaceball.ko
 spaceorb.ko
+spi-dln2.ko
 stinger.ko
 sysv.ko
 tcp_bic.ko
diff --git a/patch-6.0-redhat.patch b/patch-6.0-redhat.patch
index d780947ee..fef59ec2e 100644
--- a/patch-6.0-redhat.patch
+++ b/patch-6.0-redhat.patch
@@ -4,32 +4,37 @@
  arch/s390/include/asm/ipl.h                        |   1 +
  arch/s390/kernel/ipl.c                             |   5 +
  arch/s390/kernel/setup.c                           |   4 +
- arch/x86/kernel/setup.c                            |  22 ++--
- drivers/acpi/apei/hest.c                           |   8 ++
- drivers/acpi/irq.c                                 |  17 ++-
- drivers/acpi/scan.c                                |   9 ++
- drivers/ata/libahci.c                              |  18 +++
- drivers/char/ipmi/ipmi_dmi.c                       |  15 +++
- drivers/char/ipmi/ipmi_msghandler.c                |  16 ++-
+ arch/x86/kernel/setup.c                            |  22 +-
+ drivers/acpi/apei/hest.c                           |   8 +
+ drivers/acpi/irq.c                                 |  17 +-
+ drivers/acpi/scan.c                                |   9 +
+ drivers/ata/libahci.c                              |  18 ++
+ drivers/char/ipmi/ipmi_dmi.c                       |  15 ++
+ drivers/char/ipmi/ipmi_msghandler.c                |  16 +-
  drivers/firmware/efi/Makefile                      |   1 +
- drivers/firmware/efi/efi.c                         | 124 +++++++++++++++------
- drivers/firmware/efi/secureboot.c                  |  38 +++++++
- drivers/firmware/sysfb.c                           |  18 ++-
- drivers/gpu/drm/tiny/simpledrm.c                   |  65 +++++++++--
- drivers/gpu/drm/vc4/vc4_hdmi.c                     |  39 ++++++-
+ drivers/firmware/efi/efi.c                         | 124 ++++++---
+ drivers/firmware/efi/secureboot.c                  |  38 +++
+ drivers/firmware/sysfb.c                           |  18 +-
+ drivers/gpu/drm/tiny/simpledrm.c                   |  65 ++++-
+ drivers/gpu/drm/vc4/vc4_hdmi.c                     |  21 +-
  drivers/gpu/drm/vc4/vc4_hdmi.h                     |   1 +
- drivers/hid/hid-rmi.c                              |  64 -----------
- drivers/hwtracing/coresight/coresight-etm4x-core.c |  19 ++++
- drivers/input/rmi4/rmi_driver.c                    | 124 ++++++++++++---------
- drivers/iommu/iommu.c                              |  22 ++++
- drivers/nvme/host/core.c                           |  22 +++-
- drivers/nvme/host/multipath.c                      |  19 ++--
+ drivers/hid/hid-rmi.c                              |  64 -----
+ drivers/hwtracing/coresight/coresight-etm4x-core.c |  19 ++
+ drivers/input/rmi4/rmi_driver.c                    | 124 +++++----
+ drivers/iommu/iommu.c                              |  22 ++
+ drivers/nvme/host/core.c                           |  22 +-
+ drivers/nvme/host/multipath.c                      |  19 +-
  drivers/nvme/host/nvme.h                           |   4 +
- drivers/pci/quirks.c                               |  24 ++++
- drivers/usb/core/hub.c                             |   7 ++
- include/linux/efi.h                                |  22 ++--
+ drivers/pci/pci-driver.c                           |  11 +
+ drivers/pci/pci.c                                  |  28 +-
+ drivers/pci/pci.h                                  |  14 +-
+ drivers/pci/pcie/ptm.c                             | 300 ++++++++++++---------
+ drivers/pci/quirks.c                               |  24 ++
+ drivers/usb/core/hub.c                             |   7 +
+ include/linux/efi.h                                |  22 +-
  include/linux/lsm_hook_defs.h                      |   2 +
  include/linux/lsm_hooks.h                          |   6 +
+ include/linux/pci.h                                |   3 +
  include/linux/rmi.h                                |   1 +
  include/linux/security.h                           |   5 +
  init/Kconfig                                       |   2 +-
@@ -38,14 +43,14 @@
  scripts/pahole-flags.sh                            |   3 +
  scripts/tags.sh                                    |   2 +
  security/integrity/platform_certs/load_uefi.c      |   6 +-
- security/lockdown/Kconfig                          |  13 +++
+ security/lockdown/Kconfig                          |  13 +
  security/lockdown/lockdown.c                       |   1 +
  security/security.c                                |   6 +
  tools/testing/selftests/net/fib_nexthops.sh        |   5 +
- 44 files changed, 609 insertions(+), 199 deletions(-)
+ 49 files changed, 780 insertions(+), 366 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index c2144a4bb2ef..4e8ae58e2ec1 100644
+index bcb76d4fdbc1..504aa3071925 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -375,7 +380,7 @@ index 8d151e332584..bd29fe4ddbf3 100644
  obj-$(CONFIG_EFI_RCI2_TABLE)		+= rci2-table.o
  obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE)	+= embedded-firmware.o
 diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
-index aa6d109fac08..a606fcc42649 100644
+index a06decee51e0..039897a56c5c 100644
 --- a/drivers/firmware/efi/efi.c
 +++ b/drivers/firmware/efi/efi.c
 @@ -31,6 +31,7 @@
@@ -702,7 +707,7 @@ index 5422363690e7..a5b500811892 100644
  	}
 
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 780a19a75c3f..281f01e8cbca 100644
+index 874c6bd787c5..4e5bba0822a5 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -2712,9 +2712,16 @@ static int vc4_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi)
@@ -744,51 +749,29 @@ index 780a19a75c3f..281f01e8cbca 100644
 
  	return 0;
  }
-@@ -2869,6 +2882,7 @@ static int vc4_hdmi_runtime_resume(struct device *dev)
- 	struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev);
- 	unsigned long __maybe_unused flags;
- 	u32 __maybe_unused value;
-+	unsigned long rate;
- 	int ret;
-
- 	/*
-@@ -2884,6 +2898,25 @@ static int vc4_hdmi_runtime_resume(struct device *dev)
+@@ -2877,11 +2890,11 @@ static int vc4_hdmi_runtime_resume(struct device *dev)
+ 	 * its frequency while the power domain is active so that it
+ 	 * keeps its rate.
+ 	 */
+-	ret = clk_set_min_rate(vc4_hdmi->hsm_clock, HSM_MIN_CLOCK_FREQ);
++	ret = clk_set_min_rate(vc4_hdmi->hsm_rpm_clock, HSM_MIN_CLOCK_FREQ);
  	if (ret)
  		return ret;
 
+-	ret = clk_prepare_enable(vc4_hdmi->hsm_clock);
 +	ret = clk_prepare_enable(vc4_hdmi->hsm_rpm_clock);
-+	if (ret)
-+		return ret;
-+
-+	/*
-+	 * Whenever the RaspberryPi boots without an HDMI monitor
-+	 * plugged in, the firmware won't have initialized the HSM clock
-+	 * rate and it will be reported as 0.
-+	 *
-+	 * If we try to access a register of the controller in such a
-+	 * case, it will lead to a silent CPU stall. Let's make sure we
-+	 * prevent such a case.
-+	 */
-+	rate = clk_get_rate(vc4_hdmi->hsm_rpm_clock);
-+	if (!rate) {
-+		ret = -EINVAL;
-+		goto err_disable_clk;
-+	}
-+
- 	if (vc4_hdmi->variant->reset)
- 		vc4_hdmi->variant->reset(vc4_hdmi);
-
-@@ -2905,6 +2938,10 @@ static int vc4_hdmi_runtime_resume(struct device *dev)
- #endif
-
- 	return 0;
-+
-+err_disable_clk:
-+	clk_disable_unprepare(vc4_hdmi->hsm_clock);
-+	return ret;
- }
+ 	if (ret)
+ 		return ret;
 
- static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
+@@ -2894,7 +2907,7 @@ static int vc4_hdmi_runtime_resume(struct device *dev)
+ 	 * case, it will lead to a silent CPU stall. Let's make sure we
+ 	 * prevent such a case.
+ 	 */
+-	rate = clk_get_rate(vc4_hdmi->hsm_clock);
++	rate = clk_get_rate(vc4_hdmi->hsm_rpm_clock);
+ 	if (!rate) {
+ 		ret = -EINVAL;
+ 		goto err_disable_clk;
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h
 index c3ed2b07df23..47f141ec8c40 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.h
@@ -1320,6 +1303,516 @@ index a0bf9560cf67..2a226be9b32a 100644
  static inline void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl)
  {
  }
+diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
+index 49238ddd39ee..5d8c37c3e15a 100644
+--- a/drivers/pci/pci-driver.c
++++ b/drivers/pci/pci-driver.c
+@@ -774,6 +774,12 @@ static int pci_pm_suspend(struct device *dev)
+
+ 	pci_dev->skip_bus_pm = false;
+
++	/*
++	 * Disabling PTM allows some systems, e.g., Intel mobile chips
++	 * since Coffee Lake, to enter a lower-power PM state.
++	 */
++	pci_suspend_ptm(pci_dev);
++
+ 	if (pci_has_legacy_pm_support(pci_dev))
+ 		return pci_legacy_suspend(dev, PMSG_SUSPEND);
+
+@@ -987,6 +993,8 @@ static int pci_pm_resume(struct device *dev)
+ 	if (pci_dev->state_saved)
+ 		pci_restore_standard_config(pci_dev);
+
++	pci_resume_ptm(pci_dev);
++
+ 	if (pci_has_legacy_pm_support(pci_dev))
+ 		return pci_legacy_resume(dev);
+
+@@ -1274,6 +1282,8 @@ static int pci_pm_runtime_suspend(struct device *dev)
+ 	pci_power_t prev = pci_dev->current_state;
+ 	int error;
+
++	pci_suspend_ptm(pci_dev);
++
+ 	/*
+ 	 * If pci_dev->driver is not set (unbound), we leave the device in D0,
+ 	 * but it may go to D3cold when the bridge above it runtime suspends.
+@@ -1335,6 +1345,7 @@ static int pci_pm_runtime_resume(struct device *dev)
+ 	 * D3cold when the bridge above it runtime suspended.
+ 	 */
+ 	pci_pm_default_resume_early(pci_dev);
++	pci_resume_ptm(pci_dev);
+
+ 	if (!pci_dev->driver)
+ 		return 0;
+diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
+index 95bc329e74c0..107afa0a5b03 100644
+--- a/drivers/pci/pci.c
++++ b/drivers/pci/pci.c
+@@ -2706,24 +2706,12 @@ int pci_prepare_to_sleep(struct pci_dev *dev)
+ 	if (target_state == PCI_POWER_ERROR)
+ 		return -EIO;
+
+-	/*
+-	 * There are systems (for example, Intel mobile chips since Coffee
+-	 * Lake) where the power drawn while suspended can be significantly
+-	 * reduced by disabling PTM on PCIe root ports as this allows the
+-	 * port to enter a lower-power PM state and the SoC to reach a
+-	 * lower-power idle state as a whole.
+-	 */
+-	if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT)
+-		pci_disable_ptm(dev);
+-
+ 	pci_enable_wake(dev, target_state, wakeup);
+
+ 	error = pci_set_power_state(dev, target_state);
+
+-	if (error) {
++	if (error)
+ 		pci_enable_wake(dev, target_state, false);
+-		pci_restore_ptm_state(dev);
+-	}
+
+ 	return error;
+ }
+@@ -2764,24 +2752,12 @@ int pci_finish_runtime_suspend(struct pci_dev *dev)
+ 	if (target_state == PCI_POWER_ERROR)
+ 		return -EIO;
+
+-	/*
+-	 * There are systems (for example, Intel mobile chips since Coffee
+-	 * Lake) where the power drawn while suspended can be significantly
+-	 * reduced by disabling PTM on PCIe root ports as this allows the
+-	 * port to enter a lower-power PM state and the SoC to reach a
+-	 * lower-power idle state as a whole.
+-	 */
+-	if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT)
+-		pci_disable_ptm(dev);
+-
+ 	__pci_enable_wake(dev, target_state, pci_dev_run_wake(dev));
+
+ 	error = pci_set_power_state(dev, target_state);
+
+-	if (error) {
++	if (error)
+ 		pci_enable_wake(dev, target_state, false);
+-		pci_restore_ptm_state(dev);
+-	}
+
+ 	return error;
+ }
+diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
+index 785f31086313..5cca2e58cce8 100644
+--- a/drivers/pci/pci.h
++++ b/drivers/pci/pci.h
+@@ -505,13 +505,17 @@ static inline int pci_iov_bus_range(struct pci_bus *bus)
+ #endif /* CONFIG_PCI_IOV */
+
+ #ifdef CONFIG_PCIE_PTM
++void pci_ptm_init(struct pci_dev *dev);
+ void pci_save_ptm_state(struct pci_dev *dev);
+ void pci_restore_ptm_state(struct pci_dev *dev);
+-void pci_disable_ptm(struct pci_dev *dev);
++void pci_suspend_ptm(struct pci_dev *dev);
++void pci_resume_ptm(struct pci_dev *dev);
+ #else
++static inline void pci_ptm_init(struct pci_dev *dev) { }
+ static inline void pci_save_ptm_state(struct pci_dev *dev) { }
+ static inline void pci_restore_ptm_state(struct pci_dev *dev) { }
+-static inline void pci_disable_ptm(struct pci_dev *dev) { }
++static inline void pci_suspend_ptm(struct pci_dev *dev) { }
++static inline void pci_resume_ptm(struct pci_dev *dev) { }
+ #endif
+
+ unsigned long pci_cardbus_resource_alignment(struct resource *);
+@@ -575,12 +579,6 @@ static inline void pcie_set_ecrc_checking(struct pci_dev *dev) { }
+ static inline void pcie_ecrc_get_policy(char *str) { }
+ #endif
+
+-#ifdef CONFIG_PCIE_PTM
+-void pci_ptm_init(struct pci_dev *dev);
+-#else
+-static inline void pci_ptm_init(struct pci_dev *dev) { }
+-#endif
+-
+ struct pci_dev_reset_methods {
+ 	u16 vendor;
+ 	u16 device;
+diff --git a/drivers/pci/pcie/ptm.c b/drivers/pci/pcie/ptm.c
+index 368a254e3124..b4e5f553467c 100644
+--- a/drivers/pci/pcie/ptm.c
++++ b/drivers/pci/pcie/ptm.c
+@@ -9,30 +9,38 @@
+ #include <linux/pci.h>
+ #include "../pci.h"
+
+-static void pci_ptm_info(struct pci_dev *dev)
++/*
++ * If the next upstream device supports PTM, return it; otherwise return
++ * NULL.  PTM Messages are local, so both link partners must support it.
++ */
++static struct pci_dev *pci_upstream_ptm(struct pci_dev *dev)
+ {
+-	char clock_desc[8];
++	struct pci_dev *ups = pci_upstream_bridge(dev);
+
+-	switch (dev->ptm_granularity) {
+-	case 0:
+-		snprintf(clock_desc, sizeof(clock_desc), "unknown");
+-		break;
+-	case 255:
+-		snprintf(clock_desc, sizeof(clock_desc), ">254ns");
+-		break;
+-	default:
+-		snprintf(clock_desc, sizeof(clock_desc), "%uns",
+-			 dev->ptm_granularity);
+-		break;
+-	}
+-	pci_info(dev, "PTM enabled%s, %s granularity\n",
+-		 dev->ptm_root ? " (root)" : "", clock_desc);
++	/*
++	 * Switch Downstream Ports are not permitted to have a PTM
++	 * capability; their PTM behavior is controlled by the Upstream
++	 * Port (PCIe r5.0, sec 7.9.16), so if the upstream bridge is a
++	 * Switch Downstream Port, look up one more level.
++	 */
++	if (ups && pci_pcie_type(ups) == PCI_EXP_TYPE_DOWNSTREAM)
++		ups = pci_upstream_bridge(ups);
++
++	if (ups && ups->ptm_cap)
++		return ups;
++
++	return NULL;
+ }
+
+-void pci_disable_ptm(struct pci_dev *dev)
++/*
++ * Find the PTM Capability (if present) and extract the information we need
++ * to use it.
++ */
++void pci_ptm_init(struct pci_dev *dev)
+ {
+-	int ptm;
+-	u16 ctrl;
++	u16 ptm;
++	u32 cap;
++	struct pci_dev *ups;
+
+ 	if (!pci_is_pcie(dev))
+ 		return;
+@@ -41,21 +49,47 @@ void pci_disable_ptm(struct pci_dev *dev)
+ 	if (!ptm)
+ 		return;
+
+-	pci_read_config_word(dev, ptm + PCI_PTM_CTRL, &ctrl);
+-	ctrl &= ~(PCI_PTM_CTRL_ENABLE | PCI_PTM_CTRL_ROOT);
+-	pci_write_config_word(dev, ptm + PCI_PTM_CTRL, ctrl);
++	dev->ptm_cap = ptm;
++	pci_add_ext_cap_save_buffer(dev, PCI_EXT_CAP_ID_PTM, sizeof(u32));
++
++	pci_read_config_dword(dev, ptm + PCI_PTM_CAP, &cap);
++	dev->ptm_granularity = (cap & PCI_PTM_GRANULARITY_MASK) >> 8;
++
++	/*
++	 * Per the spec recommendation (PCIe r6.0, sec 7.9.15.3), select the
++	 * furthest upstream Time Source as the PTM Root.  For Endpoints,
++	 * "the Effective Granularity is the maximum Local Clock Granularity
++	 * reported by the PTM Root and all intervening PTM Time Sources."
++	 */
++	ups = pci_upstream_ptm(dev);
++	if (ups) {
++		if (ups->ptm_granularity == 0)
++			dev->ptm_granularity = 0;
++		else if (ups->ptm_granularity > dev->ptm_granularity)
++			dev->ptm_granularity = ups->ptm_granularity;
++	} else if (cap & PCI_PTM_CAP_ROOT) {
++		dev->ptm_root = 1;
++	} else if (pci_pcie_type(dev) == PCI_EXP_TYPE_RC_END) {
++
++		/*
++		 * Per sec 7.9.15.3, this should be the Local Clock
++		 * Granularity of the associated Time Source.  But it
++		 * doesn't say how to find that Time Source.
++		 */
++		dev->ptm_granularity = 0;
++	}
++
++	if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT ||
++	    pci_pcie_type(dev) == PCI_EXP_TYPE_UPSTREAM)
++		pci_enable_ptm(dev, NULL);
+ }
+
+ void pci_save_ptm_state(struct pci_dev *dev)
+ {
+-	int ptm;
++	u16 ptm = dev->ptm_cap;
+ 	struct pci_cap_saved_state *save_state;
+-	u16 *cap;
++	u32 *cap;
+
+-	if (!pci_is_pcie(dev))
+-		return;
+-
+-	ptm = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_PTM);
+ 	if (!ptm)
+ 		return;
+
+@@ -63,146 +97,152 @@ void pci_save_ptm_state(struct pci_dev *dev)
+ 	if (!save_state)
+ 		return;
+
+-	cap = (u16 *)&save_state->cap.data[0];
+-	pci_read_config_word(dev, ptm + PCI_PTM_CTRL, cap);
++	cap = (u32 *)&save_state->cap.data[0];
++	pci_read_config_dword(dev, ptm + PCI_PTM_CTRL, cap);
+ }
+
+ void pci_restore_ptm_state(struct pci_dev *dev)
+ {
++	u16 ptm = dev->ptm_cap;
+ 	struct pci_cap_saved_state *save_state;
+-	int ptm;
+-	u16 *cap;
++	u32 *cap;
+
+-	if (!pci_is_pcie(dev))
++	if (!ptm)
+ 		return;
+
+ 	save_state = pci_find_saved_ext_cap(dev, PCI_EXT_CAP_ID_PTM);
+-	ptm = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_PTM);
+-	if (!save_state || !ptm)
++	if (!save_state)
+ 		return;
+
+-	cap = (u16 *)&save_state->cap.data[0];
+-	pci_write_config_word(dev, ptm + PCI_PTM_CTRL, *cap);
++	cap = (u32 *)&save_state->cap.data[0];
++	pci_write_config_dword(dev, ptm + PCI_PTM_CTRL, *cap);
+ }
+
+-void pci_ptm_init(struct pci_dev *dev)
++/* Enable PTM in the Control register if possible */
++static int __pci_enable_ptm(struct pci_dev *dev)
+ {
+-	int pos;
+-	u32 cap, ctrl;
+-	u8 local_clock;
++	u16 ptm = dev->ptm_cap;
+ 	struct pci_dev *ups;
++	u32 ctrl;
+
+-	if (!pci_is_pcie(dev))
+-		return;
+-
+-	/*
+-	 * Enable PTM only on interior devices (root ports, switch ports,
+-	 * etc.) on the assumption that it causes no link traffic until an
+-	 * endpoint enables it.
+-	 */
+-	if ((pci_pcie_type(dev) == PCI_EXP_TYPE_ENDPOINT ||
+-	     pci_pcie_type(dev) == PCI_EXP_TYPE_RC_END))
+-		return;
++	if (!ptm)
++		return -EINVAL;
+
+ 	/*
+-	 * Switch Downstream Ports are not permitted to have a PTM
+-	 * capability; their PTM behavior is controlled by the Upstream
+-	 * Port (PCIe r5.0, sec 7.9.16).
++	 * A device uses local PTM Messages to request time information
++	 * from a PTM Root that's farther upstream.  Every device along the
++	 * path must support PTM and have it enabled so it can handle the
++	 * messages.  Therefore, if this device is not a PTM Root, the
++	 * upstream link partner must have PTM enabled before we can enable
++	 * PTM.
+ 	 */
+-	ups = pci_upstream_bridge(dev);
+-	if (pci_pcie_type(dev) == PCI_EXP_TYPE_DOWNSTREAM &&
+-	    ups && ups->ptm_enabled) {
+-		dev->ptm_granularity = ups->ptm_granularity;
+-		dev->ptm_enabled = 1;
+-		return;
++	if (!dev->ptm_root) {
++		ups = pci_upstream_ptm(dev);
++		if (!ups || !ups->ptm_enabled)
++			return -EINVAL;
+ 	}
+
+-	pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_PTM);
+-	if (!pos)
+-		return;
+-
+-	pci_add_ext_cap_save_buffer(dev, PCI_EXT_CAP_ID_PTM, sizeof(u16));
+-
+-	pci_read_config_dword(dev, pos + PCI_PTM_CAP, &cap);
+-	local_clock = (cap & PCI_PTM_GRANULARITY_MASK) >> 8;
+-
+-	/*
+-	 * There's no point in enabling PTM unless it's enabled in the
+-	 * upstream device or this device can be a PTM Root itself.  Per
+-	 * the spec recommendation (PCIe r3.1, sec 7.32.3), select the
+-	 * furthest upstream Time Source as the PTM Root.
+-	 */
+-	if (ups && ups->ptm_enabled) {
+-		ctrl = PCI_PTM_CTRL_ENABLE;
+-		if (ups->ptm_granularity == 0)
+-			dev->ptm_granularity = 0;
+-		else if (ups->ptm_granularity > local_clock)
+-			dev->ptm_granularity = ups->ptm_granularity;
+-	} else {
+-		if (cap & PCI_PTM_CAP_ROOT) {
+-			ctrl = PCI_PTM_CTRL_ENABLE | PCI_PTM_CTRL_ROOT;
+-			dev->ptm_root = 1;
+-			dev->ptm_granularity = local_clock;
+-		} else
+-			return;
+-	}
++	pci_read_config_dword(dev, ptm + PCI_PTM_CTRL, &ctrl);
+
++	ctrl |= PCI_PTM_CTRL_ENABLE;
++	ctrl &= ~PCI_PTM_GRANULARITY_MASK;
+ 	ctrl |= dev->ptm_granularity << 8;
+-	pci_write_config_dword(dev, pos + PCI_PTM_CTRL, ctrl);
+-	dev->ptm_enabled = 1;
++	if (dev->ptm_root)
++		ctrl |= PCI_PTM_CTRL_ROOT;
+
+-	pci_ptm_info(dev);
++	pci_write_config_dword(dev, ptm + PCI_PTM_CTRL, ctrl);
++	return 0;
+ }
+
++/**
++ * pci_enable_ptm() - Enable Precision Time Measurement
++ * @dev: PCI device
++ * @granularity: pointer to return granularity
++ *
++ * Enable Precision Time Measurement for @dev.  If successful and
++ * @granularity is non-NULL, return the Effective Granularity.
++ *
++ * Return: zero if successful, or -EINVAL if @dev lacks a PTM Capability or
++ * is not a PTM Root and lacks an upstream path of PTM-enabled devices.
++ */
+ int pci_enable_ptm(struct pci_dev *dev, u8 *granularity)
+ {
+-	int pos;
+-	u32 cap, ctrl;
+-	struct pci_dev *ups;
+-
+-	if (!pci_is_pcie(dev))
+-		return -EINVAL;
+-
+-	pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_PTM);
+-	if (!pos)
+-		return -EINVAL;
+-
+-	pci_read_config_dword(dev, pos + PCI_PTM_CAP, &cap);
+-	if (!(cap & PCI_PTM_CAP_REQ))
+-		return -EINVAL;
+-
+-	/*
+-	 * For a PCIe Endpoint, PTM is only useful if the endpoint can
+-	 * issue PTM requests to upstream devices that have PTM enabled.
+-	 *
+-	 * For Root Complex Integrated Endpoints, there is no upstream
+-	 * device, so there must be some implementation-specific way to
+-	 * associate the endpoint with a time source.
+-	 */
+-	if (pci_pcie_type(dev) == PCI_EXP_TYPE_ENDPOINT) {
+-		ups = pci_upstream_bridge(dev);
+-		if (!ups || !ups->ptm_enabled)
+-			return -EINVAL;
++	int rc;
++	char clock_desc[8];
+
+-		dev->ptm_granularity = ups->ptm_granularity;
+-	} else if (pci_pcie_type(dev) == PCI_EXP_TYPE_RC_END) {
+-		dev->ptm_granularity = 0;
+-	} else
+-		return -EINVAL;
++	rc = __pci_enable_ptm(dev);
++	if (rc)
++		return rc;
+
+-	ctrl = PCI_PTM_CTRL_ENABLE;
+-	ctrl |= dev->ptm_granularity << 8;
+-	pci_write_config_dword(dev, pos + PCI_PTM_CTRL, ctrl);
+ 	dev->ptm_enabled = 1;
+
+-	pci_ptm_info(dev);
+-
+ 	if (granularity)
+ 		*granularity = dev->ptm_granularity;
++
++	switch (dev->ptm_granularity) {
++	case 0:
++		snprintf(clock_desc, sizeof(clock_desc), "unknown");
++		break;
++	case 255:
++		snprintf(clock_desc, sizeof(clock_desc), ">254ns");
++		break;
++	default:
++		snprintf(clock_desc, sizeof(clock_desc), "%uns",
++			 dev->ptm_granularity);
++		break;
++	}
++	pci_info(dev, "PTM enabled%s, %s granularity\n",
++		 dev->ptm_root ? " (root)" : "", clock_desc);
++
+ 	return 0;
+ }
+ EXPORT_SYMBOL(pci_enable_ptm);
+
++static void __pci_disable_ptm(struct pci_dev *dev)
++{
++	u16 ptm = dev->ptm_cap;
++	u32 ctrl;
++
++	if (!ptm)
++		return;
++
++	pci_read_config_dword(dev, ptm + PCI_PTM_CTRL, &ctrl);
++	ctrl &= ~(PCI_PTM_CTRL_ENABLE | PCI_PTM_CTRL_ROOT);
++	pci_write_config_dword(dev, ptm + PCI_PTM_CTRL, ctrl);
++}
++
++/**
++ * pci_disable_ptm() - Disable Precision Time Measurement
++ * @dev: PCI device
++ *
++ * Disable Precision Time Measurement for @dev.
++ */
++void pci_disable_ptm(struct pci_dev *dev)
++{
++	if (dev->ptm_enabled) {
++		__pci_disable_ptm(dev);
++		dev->ptm_enabled = 0;
++	}
++}
++EXPORT_SYMBOL(pci_disable_ptm);
++
++/*
++ * Disable PTM, but preserve dev->ptm_enabled so we silently re-enable it on
++ * resume if necessary.
++ */
++void pci_suspend_ptm(struct pci_dev *dev)
++{
++	if (dev->ptm_enabled)
++		__pci_disable_ptm(dev);
++}
++
++/* If PTM was enabled before suspend, re-enable it when resuming */
++void pci_resume_ptm(struct pci_dev *dev)
++{
++	if (dev->ptm_enabled)
++		__pci_enable_ptm(dev);
++}
++
+ bool pcie_ptm_enabled(struct pci_dev *dev)
+ {
+ 	if (!dev)
 diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
 index 4944798e75b5..079a29ef1bf2 100644
 --- a/drivers/pci/quirks.c
@@ -1374,7 +1867,7 @@ index bbab424b0d55..ed86042fb57b 100644
  	 * disconnected while waiting for the lock to succeed. */
  	usb_lock_device(hdev);
 diff --git a/include/linux/efi.h b/include/linux/efi.h
-index 4459794b65db..79735fc77198 100644
+index f87b2f5db9f8..0b156c2a4ab3 100644
 --- a/include/linux/efi.h
 +++ b/include/linux/efi.h
 @@ -43,6 +43,8 @@
@@ -1471,6 +1964,31 @@ index 3aa6030302f5..23b63de268a3 100644
   * Security hooks for perf events
   *
   * @perf_event_open:
+diff --git a/include/linux/pci.h b/include/linux/pci.h
+index 060af91bafcd..cb5f796e3319 100644
+--- a/include/linux/pci.h
++++ b/include/linux/pci.h
+@@ -475,6 +475,7 @@ struct pci_dev {
+ 	unsigned int	broken_cmd_compl:1;	/* No compl for some cmds */
+ #endif
+ #ifdef CONFIG_PCIE_PTM
++	u16		ptm_cap;		/* PTM Capability */
+ 	unsigned int	ptm_root:1;
+ 	unsigned int	ptm_enabled:1;
+ 	u8		ptm_granularity;
+@@ -1677,10 +1678,12 @@ bool pci_ats_disabled(void);
+
+ #ifdef CONFIG_PCIE_PTM
+ int pci_enable_ptm(struct pci_dev *dev, u8 *granularity);
++void pci_disable_ptm(struct pci_dev *dev);
+ bool pcie_ptm_enabled(struct pci_dev *dev);
+ #else
+ static inline int pci_enable_ptm(struct pci_dev *dev, u8 *granularity)
+ { return -EINVAL; }
++static inline void pci_disable_ptm(struct pci_dev *dev) { }
+ static inline bool pcie_ptm_enabled(struct pci_dev *dev)
+ { return false; }
+ #endif
 diff --git a/include/linux/rmi.h b/include/linux/rmi.h
 index ab7eea01ab42..fff7c5f737fc 100644
 --- a/include/linux/rmi.h
diff --git a/sources b/sources
index 0597d7cfb..d24b15041 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.0.7.tar.xz) = a7b298fbf3ff5bf759755589748b16428fdf35225013709eeb645bd09368937ed4f7f6c23c70cdfa077e8d20cffa2ee4fbb24e4e3023bafcb46c845aeeaff19e
-SHA512 (kernel-abi-stablelists-6.0.7.tar.bz2) = ac411ab1976e636645e07f0e54a41b268820c27067b51de9ad881f57ef3ea31caf4dd96623d38a56a820282577906816e3c740087961982754d49022b0bafcaf
-SHA512 (kernel-kabi-dw-6.0.7.tar.bz2) = 5aa98ec0bc19d220383ea9d869254b8d998bd7a591206079d254a5249c0d3e7c17391cbe7e4789d63003ee2e2b971ab40255f38b9404462012d17421bd1eb7a4
+SHA512 (linux-6.0.8.tar.xz) = 8ad070d2d10c424e6d1c7f25558b08274b9e9e2ebe5861a1eaf168fbe51e4a6ed8a4848a66b51db7fcbb2d641f3729efa0e5070a1ff99728be7b9c7a8059815d
+SHA512 (kernel-abi-stablelists-6.0.8.tar.bz2) = 1855b59b21c1b6e2d2217e8b6ad525682cbae1051cf0921aaeac7e2dea75b90d36baed8feba440a0da6a46298f2a7144eee405f434ca4930764c78558dbaf6eb
+SHA512 (kernel-kabi-dw-6.0.8.tar.bz2) = 5898af8b913a1206073d7b6cf107fe948ee514b7d1a56a9460a6851d47b7d0ce95929688d4ccb15ee44534f6adae3cbfac01ab90929b7eddc9704f8563335eb6