From 3013c5c192495258f9295c447a79181b4034ac17 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 11 Sep 2023 12:22:33 -0500 Subject: [PATCH] kernel-6.5.2-301 * Wed Sep 06 2023 Justin M. Forbes [6.5.2-0] - Move squashfs to kernel-modules-core (Justin M. Forbes) - Add TPM bug to BugsFixed (Justin M. Forbes) - tpm: Enable hwrng only for Pluton on AMD CPUs (Jarkko Sakkinen) - Linux v6.5.2 Resolves: Signed-off-by: Justin M. Forbes --- Patchlist.changelog | 3 + kernel-aarch64-16k-debug-fedora.config | 5 +- kernel-aarch64-16k-fedora.config | 5 +- kernel-aarch64-64k-debug-rhel.config | 3 +- kernel-aarch64-64k-rhel.config | 3 +- kernel-aarch64-debug-fedora.config | 5 +- kernel-aarch64-debug-rhel.config | 3 +- kernel-aarch64-fedora.config | 5 +- kernel-aarch64-rhel.config | 3 +- kernel-aarch64-rt-debug-rhel.config | 3 +- kernel-aarch64-rt-rhel.config | 3 +- kernel-ppc64le-debug-fedora.config | 1 + kernel-ppc64le-debug-rhel.config | 3 +- kernel-ppc64le-fedora.config | 1 + kernel-ppc64le-rhel.config | 3 +- kernel-s390x-debug-fedora.config | 1 + kernel-s390x-debug-rhel.config | 3 +- kernel-s390x-fedora.config | 1 + kernel-s390x-rhel.config | 3 +- kernel-s390x-zfcpdump-rhel.config | 3 +- kernel-x86_64-debug-fedora.config | 1 + kernel-x86_64-debug-rhel.config | 3 +- kernel-x86_64-fedora.config | 1 + kernel-x86_64-rhel.config | 3 +- kernel-x86_64-rt-debug-rhel.config | 3 +- kernel-x86_64-rt-rhel.config | 3 +- kernel.spec | 11 +- patch-6.5-redhat.patch | 176 ++++++++++++++++++++++++- sources | 4 +- 29 files changed, 236 insertions(+), 29 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index 61e3ac32d..d2fb036bc 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/80c615ec2edb4aadded21fe924e2caa172d59577 + 80c615ec2edb4aadded21fe924e2caa172d59577 Revert "misc: rtsx: judge ASPM Mode to set PETXCFG Reg" + "https://gitlab.com/cki-project/kernel-ark/-/commit"/c53302b2ed77cf6f3a125135a1f85af8cbc0ba4b c53302b2ed77cf6f3a125135a1f85af8cbc0ba4b tpm: Enable hwrng only for Pluton on AMD CPUs diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index c399f619c..53709e16a 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -1263,7 +1263,7 @@ CONFIG_COMMON_CLK_MESON_SCLK_DIV=y # CONFIG_COMMON_CLK_MMP2_AUDIO is not set CONFIG_COMMON_CLK_PWM=m CONFIG_COMMON_CLK_QCOM=y -CONFIG_COMMON_CLK_RK808=y +CONFIG_COMMON_CLK_RK808=m CONFIG_COMMON_CLK_ROCKCHIP=y CONFIG_COMMON_CLK_RS9_PCIE=m CONFIG_COMMON_CLK_SCMI=y @@ -6299,7 +6299,7 @@ CONFIG_REGULATOR_QCOM_SPMI=m CONFIG_REGULATOR_QCOM_USB_VBUS=m CONFIG_REGULATOR_RAA215300=m CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m -CONFIG_REGULATOR_RK808=y +CONFIG_REGULATOR_RK808=m CONFIG_REGULATOR_RT4801=m CONFIG_REGULATOR_RT4803=m CONFIG_REGULATOR_RT4831=m @@ -9200,6 +9200,7 @@ CONFIG_VIDEO_CADENCE_CSI2RX=m CONFIG_VIDEO_CADENCE_CSI2TX=m # CONFIG_VIDEO_CADENCE is not set # CONFIG_VIDEO_CAFE_CCIC is not set +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_CCS=m CONFIG_VIDEO_CODA=m CONFIG_VIDEO_CS5345=m diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index 1c67df428..031a381e3 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -1263,7 +1263,7 @@ CONFIG_COMMON_CLK_MESON_SCLK_DIV=y # CONFIG_COMMON_CLK_MMP2_AUDIO is not set CONFIG_COMMON_CLK_PWM=m CONFIG_COMMON_CLK_QCOM=y -CONFIG_COMMON_CLK_RK808=y +CONFIG_COMMON_CLK_RK808=m CONFIG_COMMON_CLK_ROCKCHIP=y CONFIG_COMMON_CLK_RS9_PCIE=m CONFIG_COMMON_CLK_SCMI=y @@ -6272,7 +6272,7 @@ CONFIG_REGULATOR_QCOM_SPMI=m CONFIG_REGULATOR_QCOM_USB_VBUS=m CONFIG_REGULATOR_RAA215300=m CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m -CONFIG_REGULATOR_RK808=y +CONFIG_REGULATOR_RK808=m CONFIG_REGULATOR_RT4801=m CONFIG_REGULATOR_RT4803=m CONFIG_REGULATOR_RT4831=m @@ -9171,6 +9171,7 @@ CONFIG_VIDEO_CADENCE_CSI2RX=m CONFIG_VIDEO_CADENCE_CSI2TX=m # CONFIG_VIDEO_CADENCE is not set # CONFIG_VIDEO_CAFE_CCIC is not set +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_CCS=m CONFIG_VIDEO_CODA=m CONFIG_VIDEO_CS5345=m diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 29fb3bad9..afab9cd24 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -7416,6 +7416,7 @@ CONFIG_VIDEO_BT848=m # CONFIG_VIDEO_BT866 is not set # CONFIG_VIDEOBUF2_DMA_SG is not set # CONFIG_VIDEOBUF2_DVB is not set +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -7591,7 +7592,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_UPD64083 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VP27SMPX is not set # CONFIG_VIDEO_VPX3220 is not set # CONFIG_VIDEO_VS6624 is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index c51a9574c..a0277226c 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -7391,6 +7391,7 @@ CONFIG_VIDEO_BT848=m # CONFIG_VIDEO_BT866 is not set # CONFIG_VIDEOBUF2_DMA_SG is not set # CONFIG_VIDEOBUF2_DVB is not set +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -7566,7 +7567,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_UPD64083 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VP27SMPX is not set # CONFIG_VIDEO_VPX3220 is not set # CONFIG_VIDEO_VS6624 is not set diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 2aa73c8bc..24ac32264 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1263,7 +1263,7 @@ CONFIG_COMMON_CLK_MESON_SCLK_DIV=y # CONFIG_COMMON_CLK_MMP2_AUDIO is not set CONFIG_COMMON_CLK_PWM=m CONFIG_COMMON_CLK_QCOM=y -CONFIG_COMMON_CLK_RK808=y +CONFIG_COMMON_CLK_RK808=m CONFIG_COMMON_CLK_ROCKCHIP=y CONFIG_COMMON_CLK_RS9_PCIE=m CONFIG_COMMON_CLK_SCMI=y @@ -6299,7 +6299,7 @@ CONFIG_REGULATOR_QCOM_SPMI=m CONFIG_REGULATOR_QCOM_USB_VBUS=m CONFIG_REGULATOR_RAA215300=m CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m -CONFIG_REGULATOR_RK808=y +CONFIG_REGULATOR_RK808=m CONFIG_REGULATOR_RT4801=m CONFIG_REGULATOR_RT4803=m CONFIG_REGULATOR_RT4831=m @@ -9200,6 +9200,7 @@ CONFIG_VIDEO_CADENCE_CSI2RX=m CONFIG_VIDEO_CADENCE_CSI2TX=m # CONFIG_VIDEO_CADENCE is not set # CONFIG_VIDEO_CAFE_CCIC is not set +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_CCS=m CONFIG_VIDEO_CODA=m CONFIG_VIDEO_CS5345=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index bae67eca8..59736167f 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -7412,6 +7412,7 @@ CONFIG_VIDEO_BT848=m # CONFIG_VIDEO_BT866 is not set # CONFIG_VIDEOBUF2_DMA_SG is not set # CONFIG_VIDEOBUF2_DVB is not set +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -7587,7 +7588,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_UPD64083 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VP27SMPX is not set # CONFIG_VIDEO_VPX3220 is not set # CONFIG_VIDEO_VS6624 is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 4d9a88205..a71de69c4 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -1263,7 +1263,7 @@ CONFIG_COMMON_CLK_MESON_SCLK_DIV=y # CONFIG_COMMON_CLK_MMP2_AUDIO is not set CONFIG_COMMON_CLK_PWM=m CONFIG_COMMON_CLK_QCOM=y -CONFIG_COMMON_CLK_RK808=y +CONFIG_COMMON_CLK_RK808=m CONFIG_COMMON_CLK_ROCKCHIP=y CONFIG_COMMON_CLK_RS9_PCIE=m CONFIG_COMMON_CLK_SCMI=y @@ -6272,7 +6272,7 @@ CONFIG_REGULATOR_QCOM_SPMI=m CONFIG_REGULATOR_QCOM_USB_VBUS=m CONFIG_REGULATOR_RAA215300=m CONFIG_REGULATOR_RASPBERRYPI_TOUCHSCREEN_ATTINY=m -CONFIG_REGULATOR_RK808=y +CONFIG_REGULATOR_RK808=m CONFIG_REGULATOR_RT4801=m CONFIG_REGULATOR_RT4803=m CONFIG_REGULATOR_RT4831=m @@ -9171,6 +9171,7 @@ CONFIG_VIDEO_CADENCE_CSI2RX=m CONFIG_VIDEO_CADENCE_CSI2TX=m # CONFIG_VIDEO_CADENCE is not set # CONFIG_VIDEO_CAFE_CCIC is not set +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_CCS=m CONFIG_VIDEO_CODA=m CONFIG_VIDEO_CS5345=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 9855ee6fa..468a01506 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -7387,6 +7387,7 @@ CONFIG_VIDEO_BT848=m # CONFIG_VIDEO_BT866 is not set # CONFIG_VIDEOBUF2_DMA_SG is not set # CONFIG_VIDEOBUF2_DVB is not set +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -7562,7 +7563,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_UPD64083 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VP27SMPX is not set # CONFIG_VIDEO_VPX3220 is not set # CONFIG_VIDEO_VS6624 is not set diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index d9a3a9825..aecaf9e0c 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -7467,6 +7467,7 @@ CONFIG_VIDEO_BT848=m # CONFIG_VIDEO_BT866 is not set # CONFIG_VIDEOBUF2_DMA_SG is not set # CONFIG_VIDEOBUF2_DVB is not set +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -7642,7 +7643,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_UPD64083 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VP27SMPX is not set # CONFIG_VIDEO_VPX3220 is not set # CONFIG_VIDEO_VS6624 is not set diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index f6861cc4a..24bd5fdb4 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -7442,6 +7442,7 @@ CONFIG_VIDEO_BT848=m # CONFIG_VIDEO_BT866 is not set # CONFIG_VIDEOBUF2_DMA_SG is not set # CONFIG_VIDEOBUF2_DVB is not set +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -7617,7 +7618,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_UPD64083 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VP27SMPX is not set # CONFIG_VIDEO_VPX3220 is not set # CONFIG_VIDEO_VS6624 is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index aa3242cec..9a8ea730a 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -7707,6 +7707,7 @@ CONFIG_VIDEO_CADENCE_CSI2RX=m CONFIG_VIDEO_CADENCE_CSI2TX=m # CONFIG_VIDEO_CADENCE is not set # CONFIG_VIDEO_CAFE_CCIC is not set +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_CCS=m CONFIG_VIDEO_CS5345=m CONFIG_VIDEO_CS53L32A=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index a4dc991b0..d26e51746 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -6956,6 +6956,7 @@ CONFIG_VIDEO_BT848=m # CONFIG_VIDEO_BT866 is not set CONFIG_VIDEOBUF2_DMA_SG=m CONFIG_VIDEOBUF2_DVB=m +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -7131,7 +7132,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_UPD64083 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VP27SMPX is not set # CONFIG_VIDEO_VPX3220 is not set # CONFIG_VIDEO_VS6624 is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index aaee6d88e..9fa997364 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -7676,6 +7676,7 @@ CONFIG_VIDEO_CADENCE_CSI2RX=m CONFIG_VIDEO_CADENCE_CSI2TX=m # CONFIG_VIDEO_CADENCE is not set # CONFIG_VIDEO_CAFE_CCIC is not set +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_CCS=m CONFIG_VIDEO_CS5345=m CONFIG_VIDEO_CS53L32A=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 3d4adb824..0530d62f1 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -6933,6 +6933,7 @@ CONFIG_VIDEO_BT848=m # CONFIG_VIDEO_BT866 is not set CONFIG_VIDEOBUF2_DMA_SG=m CONFIG_VIDEOBUF2_DVB=m +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -7108,7 +7109,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_UPD64083 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VP27SMPX is not set # CONFIG_VIDEO_VPX3220 is not set # CONFIG_VIDEO_VS6624 is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index fc1bb9a0f..d527caaf5 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -7647,6 +7647,7 @@ CONFIG_VIDEO_CADENCE_CSI2RX=m CONFIG_VIDEO_CADENCE_CSI2TX=m # CONFIG_VIDEO_CADENCE is not set # CONFIG_VIDEO_CAFE_CCIC is not set +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_CCS=m CONFIG_VIDEO_CS5345=m CONFIG_VIDEO_CS53L32A=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 5c5922116..be4a0be69 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -6940,6 +6940,7 @@ CONFIG_VIDEO_BT848=m # CONFIG_VIDEO_BT866 is not set # CONFIG_VIDEOBUF2_DMA_SG is not set # CONFIG_VIDEOBUF2_DVB is not set +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -7115,7 +7116,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_UPD64083 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VP27SMPX is not set # CONFIG_VIDEO_VPX3220 is not set # CONFIG_VIDEO_VS6624 is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 64b82bb75..e68fe3f8e 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -7616,6 +7616,7 @@ CONFIG_VIDEO_CADENCE_CSI2RX=m CONFIG_VIDEO_CADENCE_CSI2TX=m # CONFIG_VIDEO_CADENCE is not set # CONFIG_VIDEO_CAFE_CCIC is not set +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_CCS=m CONFIG_VIDEO_CS5345=m CONFIG_VIDEO_CS53L32A=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 450241cf7..e6ed3da9e 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -6917,6 +6917,7 @@ CONFIG_VIDEO_BT848=m # CONFIG_VIDEO_BT866 is not set # CONFIG_VIDEOBUF2_DMA_SG is not set # CONFIG_VIDEOBUF2_DVB is not set +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -7092,7 +7093,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_UPD64083 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VP27SMPX is not set # CONFIG_VIDEO_VPX3220 is not set # CONFIG_VIDEO_VS6624 is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index c412efb6b..26176603f 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -6940,6 +6940,7 @@ CONFIG_VIDEO_BT848=m # CONFIG_VIDEO_BT866 is not set # CONFIG_VIDEOBUF2_DMA_SG is not set # CONFIG_VIDEOBUF2_DVB is not set +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -7115,7 +7116,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_UPD64083 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VP27SMPX is not set # CONFIG_VIDEO_VPX3220 is not set # CONFIG_VIDEO_VS6624 is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 86fb564ff..a739ef29d 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -8143,6 +8143,7 @@ CONFIG_VIDEO_CADENCE_CSI2RX=m CONFIG_VIDEO_CADENCE_CSI2TX=m # CONFIG_VIDEO_CADENCE is not set # CONFIG_VIDEO_CAFE_CCIC is not set +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_CCS=m CONFIG_VIDEO_CS5345=m CONFIG_VIDEO_CS53L32A=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 04f033427..57fbdad0d 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -7203,6 +7203,7 @@ CONFIG_VIDEO_BT848=m # CONFIG_VIDEO_BT866 is not set CONFIG_VIDEOBUF2_DMA_SG=m CONFIG_VIDEOBUF2_DVB=m +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -7378,7 +7379,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_UPD64083 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VP27SMPX is not set # CONFIG_VIDEO_VPX3220 is not set # CONFIG_VIDEO_VS6624 is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 12c428989..3b22fee8f 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -8113,6 +8113,7 @@ CONFIG_VIDEO_CADENCE_CSI2RX=m CONFIG_VIDEO_CADENCE_CSI2TX=m # CONFIG_VIDEO_CADENCE is not set # CONFIG_VIDEO_CAFE_CCIC is not set +CONFIG_VIDEO_CAMERA_SENSOR=y CONFIG_VIDEO_CCS=m CONFIG_VIDEO_CS5345=m CONFIG_VIDEO_CS53L32A=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index bd986dfb7..11a32eb8c 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -7179,6 +7179,7 @@ CONFIG_VIDEO_BT848=m # CONFIG_VIDEO_BT866 is not set CONFIG_VIDEOBUF2_DMA_SG=m CONFIG_VIDEOBUF2_DVB=m +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -7354,7 +7355,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_UPD64083 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VP27SMPX is not set # CONFIG_VIDEO_VPX3220 is not set # CONFIG_VIDEO_VS6624 is not set diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index bf0428e55..2edea8f7c 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -7258,6 +7258,7 @@ CONFIG_VIDEO_BT848=m # CONFIG_VIDEO_BT866 is not set CONFIG_VIDEOBUF2_DMA_SG=m CONFIG_VIDEOBUF2_DVB=m +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -7433,7 +7434,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_UPD64083 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VP27SMPX is not set # CONFIG_VIDEO_VPX3220 is not set # CONFIG_VIDEO_VS6624 is not set diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index e3e96dab9..493e15cc3 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -7234,6 +7234,7 @@ CONFIG_VIDEO_BT848=m # CONFIG_VIDEO_BT866 is not set CONFIG_VIDEOBUF2_DMA_SG=m CONFIG_VIDEOBUF2_DVB=m +CONFIG_VIDEO_CAMERA_SENSOR=y # CONFIG_VIDEO_CCS is not set # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_CS3308=m @@ -7409,7 +7410,7 @@ CONFIG_VIDEO_TUNER=m # CONFIG_VIDEO_UPD64083 is not set # CONFIG_VIDEO_USBTV is not set CONFIG_VIDEO_V4L2=m -# CONFIG_VIDEO_V4L2_SUBDEV_API is not set +CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_VIDEO_VP27SMPX is not set # CONFIG_VIDEO_VPX3220 is not set # CONFIG_VIDEO_VS6624 is not set diff --git a/kernel.spec b/kernel.spec index cc99a6df0..1c92c4df8 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.5.2 %define specversion 6.5.2 %define patchversion 6.5 -%define pkgrelease 300 +%define pkgrelease 301 %define kversion 6 %define tarfile_release 6.5.2 # This is needed to do merge window version magic %define patchlevel 5 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 300%{?buildid}%{?dist} +%define specrelease 301%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.5.2 @@ -789,7 +789,7 @@ BuildRequires: binutils BuildRequires: lvm2 BuildRequires: systemd-boot-unsigned # For systemd-stub and systemd-pcrphase -BuildRequires: systemd-udev >= 252-1 +BuildRequires: systemd-udev # For TPM operations in UKI initramfs BuildRequires: tpm2-tools %endif @@ -3702,6 +3702,11 @@ fi\ # # %changelog +* Mon Sep 11 2023 Justin M. Forbes [6.5.2-301] +- Revert "misc: rtsx: judge ASPM Mode to set PETXCFG Reg" (Justin M. Forbes) +- Config updates for 6.5.3 (Justin M. Forbes) +- Fix up buildReqs for UKI (Justin M. Forbes) + * Wed Sep 06 2023 Justin M. Forbes [6.5.2-0] - Move squashfs to kernel-modules-core (Justin M. Forbes) - Add TPM bug to BugsFixed (Justin M. Forbes) diff --git a/patch-6.5-redhat.patch b/patch-6.5-redhat.patch index d35e95459..40a2dc709 100644 --- a/patch-6.5-redhat.patch +++ b/patch-6.5-redhat.patch @@ -19,6 +19,12 @@ drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 ++++ drivers/input/rmi4/rmi_driver.c | 124 ++++++++++++--------- drivers/iommu/iommu.c | 22 ++++ + drivers/misc/cardreader/rts5227.c | 2 +- + drivers/misc/cardreader/rts5228.c | 18 +++ + drivers/misc/cardreader/rts5249.c | 3 +- + drivers/misc/cardreader/rts5260.c | 18 +++ + drivers/misc/cardreader/rts5261.c | 18 +++ + drivers/misc/cardreader/rtsx_pcr.c | 5 +- drivers/nvme/host/core.c | 22 +++- drivers/nvme/host/multipath.c | 19 ++-- drivers/nvme/host/nvme.h | 4 + @@ -35,7 +41,7 @@ security/lockdown/Kconfig | 13 +++ security/lockdown/lockdown.c | 1 + security/security.c | 12 ++ - 37 files changed, 523 insertions(+), 210 deletions(-) + 43 files changed, 581 insertions(+), 216 deletions(-) diff --git a/Makefile b/Makefile index c47558bc00aa..ed7450da2c78 100644 @@ -1012,6 +1018,174 @@ index caaf563d38ae..d9c4d039c4e7 100644 /** * iommu_setup_default_domain - Set the default_domain for the group * @group: Group to change +diff --git a/drivers/misc/cardreader/rts5227.c b/drivers/misc/cardreader/rts5227.c +index 3dae5e3a1697..d676cf63a966 100644 +--- a/drivers/misc/cardreader/rts5227.c ++++ b/drivers/misc/cardreader/rts5227.c +@@ -195,7 +195,7 @@ static int rts5227_extra_init_hw(struct rtsx_pcr *pcr) + } + } + +- if (option->force_clkreq_0 && pcr->aspm_mode == ASPM_MODE_CFG) ++ if (option->force_clkreq_0) + rtsx_pci_add_cmd(pcr, WRITE_REG_CMD, PETXCFG, + FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW); + else +diff --git a/drivers/misc/cardreader/rts5228.c b/drivers/misc/cardreader/rts5228.c +index f4ab09439da7..cfebad51d1d8 100644 +--- a/drivers/misc/cardreader/rts5228.c ++++ b/drivers/misc/cardreader/rts5228.c +@@ -435,10 +435,17 @@ static void rts5228_init_from_cfg(struct rtsx_pcr *pcr) + option->ltr_enabled = false; + } + } ++ ++ if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN | ASPM_L1_2_EN ++ | PM_L1_1_EN | PM_L1_2_EN)) ++ option->force_clkreq_0 = false; ++ else ++ option->force_clkreq_0 = true; + } + + static int rts5228_extra_init_hw(struct rtsx_pcr *pcr) + { ++ struct rtsx_cr_option *option = &pcr->option; + + rtsx_pci_write_register(pcr, RTS5228_AUTOLOAD_CFG1, + CD_RESUME_EN_MASK, CD_RESUME_EN_MASK); +@@ -469,6 +476,17 @@ static int rts5228_extra_init_hw(struct rtsx_pcr *pcr) + else + rtsx_pci_write_register(pcr, PETXCFG, 0x30, 0x00); + ++ /* ++ * If u_force_clkreq_0 is enabled, CLKREQ# PIN will be forced ++ * to drive low, and we forcibly request clock. ++ */ ++ if (option->force_clkreq_0) ++ rtsx_pci_write_register(pcr, PETXCFG, ++ FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW); ++ else ++ rtsx_pci_write_register(pcr, PETXCFG, ++ FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH); ++ + rtsx_pci_write_register(pcr, PWD_SUSPEND_EN, 0xFF, 0xFB); + + if (pcr->rtd3_en) { +diff --git a/drivers/misc/cardreader/rts5249.c b/drivers/misc/cardreader/rts5249.c +index 47ab72a43256..91d240dd68fa 100644 +--- a/drivers/misc/cardreader/rts5249.c ++++ b/drivers/misc/cardreader/rts5249.c +@@ -327,11 +327,12 @@ static int rts5249_extra_init_hw(struct rtsx_pcr *pcr) + } + } + ++ + /* + * If u_force_clkreq_0 is enabled, CLKREQ# PIN will be forced + * to drive low, and we forcibly request clock. + */ +- if (option->force_clkreq_0 && pcr->aspm_mode == ASPM_MODE_CFG) ++ if (option->force_clkreq_0) + rtsx_pci_write_register(pcr, PETXCFG, + FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW); + else +diff --git a/drivers/misc/cardreader/rts5260.c b/drivers/misc/cardreader/rts5260.c +index 79b18f6f73a8..9b42b20a3e5a 100644 +--- a/drivers/misc/cardreader/rts5260.c ++++ b/drivers/misc/cardreader/rts5260.c +@@ -517,10 +517,17 @@ static void rts5260_init_from_cfg(struct rtsx_pcr *pcr) + option->ltr_enabled = false; + } + } ++ ++ if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN | ASPM_L1_2_EN ++ | PM_L1_1_EN | PM_L1_2_EN)) ++ option->force_clkreq_0 = false; ++ else ++ option->force_clkreq_0 = true; + } + + static int rts5260_extra_init_hw(struct rtsx_pcr *pcr) + { ++ struct rtsx_cr_option *option = &pcr->option; + + /* Set mcu_cnt to 7 to ensure data can be sampled properly */ + rtsx_pci_write_register(pcr, 0xFC03, 0x7F, 0x07); +@@ -539,6 +546,17 @@ static int rts5260_extra_init_hw(struct rtsx_pcr *pcr) + + rts5260_init_hw(pcr); + ++ /* ++ * If u_force_clkreq_0 is enabled, CLKREQ# PIN will be forced ++ * to drive low, and we forcibly request clock. ++ */ ++ if (option->force_clkreq_0) ++ rtsx_pci_write_register(pcr, PETXCFG, ++ FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW); ++ else ++ rtsx_pci_write_register(pcr, PETXCFG, ++ FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH); ++ + rtsx_pci_write_register(pcr, pcr->reg_pm_ctrl3, 0x10, 0x00); + + return 0; +diff --git a/drivers/misc/cardreader/rts5261.c b/drivers/misc/cardreader/rts5261.c +index 94af6bf8a25a..b1e76030cafd 100644 +--- a/drivers/misc/cardreader/rts5261.c ++++ b/drivers/misc/cardreader/rts5261.c +@@ -498,10 +498,17 @@ static void rts5261_init_from_cfg(struct rtsx_pcr *pcr) + option->ltr_enabled = false; + } + } ++ ++ if (rtsx_check_dev_flag(pcr, ASPM_L1_1_EN | ASPM_L1_2_EN ++ | PM_L1_1_EN | PM_L1_2_EN)) ++ option->force_clkreq_0 = false; ++ else ++ option->force_clkreq_0 = true; + } + + static int rts5261_extra_init_hw(struct rtsx_pcr *pcr) + { ++ struct rtsx_cr_option *option = &pcr->option; + u32 val; + + rtsx_pci_write_register(pcr, RTS5261_AUTOLOAD_CFG1, +@@ -547,6 +554,17 @@ static int rts5261_extra_init_hw(struct rtsx_pcr *pcr) + else + rtsx_pci_write_register(pcr, PETXCFG, 0x30, 0x00); + ++ /* ++ * If u_force_clkreq_0 is enabled, CLKREQ# PIN will be forced ++ * to drive low, and we forcibly request clock. ++ */ ++ if (option->force_clkreq_0) ++ rtsx_pci_write_register(pcr, PETXCFG, ++ FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_LOW); ++ else ++ rtsx_pci_write_register(pcr, PETXCFG, ++ FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH); ++ + rtsx_pci_write_register(pcr, PWD_SUSPEND_EN, 0xFF, 0xFB); + + if (pcr->rtd3_en) { +diff --git a/drivers/misc/cardreader/rtsx_pcr.c b/drivers/misc/cardreader/rtsx_pcr.c +index a3f4b52bb159..32b7783e9d4f 100644 +--- a/drivers/misc/cardreader/rtsx_pcr.c ++++ b/drivers/misc/cardreader/rtsx_pcr.c +@@ -1326,11 +1326,8 @@ static int rtsx_pci_init_hw(struct rtsx_pcr *pcr) + return err; + } + +- if (pcr->aspm_mode == ASPM_MODE_REG) { ++ if (pcr->aspm_mode == ASPM_MODE_REG) + rtsx_pci_write_register(pcr, ASPM_FORCE_CTL, 0x30, 0x30); +- rtsx_pci_write_register(pcr, PETXCFG, +- FORCE_CLKREQ_DELINK_MASK, FORCE_CLKREQ_HIGH); +- } + + /* No CD interrupt if probing driver with card inserted. + * So we need to initialize pcr->card_exist here. diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index f3a01b79148c..9a1a74d183ce 100644 --- a/drivers/nvme/host/core.c diff --git a/sources b/sources index 061f3e59f..0a280bc75 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-6.5.2.tar.xz) = 9aaf88d58a27576e7ce8378480718f44f140511494bb1ef6872521c94536f798d7b2adc5070f2686872cc0ea14b5412750bfaa31fb760db68901f351fd802321 -SHA512 (kernel-abi-stablelists-6.5.2.tar.bz2) = 49538acf1c4bca15e6ab2ccf497c5dca5e90a725f50273e37db94c74c74c9158933d0a597c6fb13e6b74d88e62f162659a29f1b44ab615b844b784af5e1aa94b -SHA512 (kernel-kabi-dw-6.5.2.tar.bz2) = e5b298f0acf22d64af510e847b43b734b35ad45494ec5579272a760f7d799d324f5965b0a2b2f1a003567e971da5058b767a155e820085f1ce809980e6c34a35 +SHA512 (kernel-abi-stablelists-6.5.2.tar.bz2) = 7c328de94454d54b3e2fbe93c3b0099724ffc6c22f6c304f98ff88f72a7eb3de1d3476f4b9d5fbfaf68eb95f1f5e1d6d2a4fec32e519cfbeb4102a9d56898d37 +SHA512 (kernel-kabi-dw-6.5.2.tar.bz2) = 73379173c6af0d7517af2adb440470d2d8b34151cad7b4a9511f480f0fc9092a9629fea582b095fa56f28eb9e56919191828e0e5f34b0415f831cb0278a149b8