From 62fb066ca38589437aa82fe9eda055b89291223e Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 31 Aug 2022 11:32:20 -0500 Subject: kernel-5.19.6-200 * Wed Aug 31 2022 Justin M. Forbes [5.19.6-0] - Revert "block: freeze the queue earlier in del_gendisk" (Justin M. Forbes) - redhat/configs: aarch64: Turn on Apple Silicon configs for Fedora (Eric Curtin) - redhat/Makefile: Always set UPSTREAM (Prarit Bhargava) - Linux v5.19.6 Resolves: Signed-off-by: Justin M. Forbes --- Patchlist.changelog | 3 +++ kernel-aarch64-debug-fedora.config | 21 ++++++++++++++++++++- kernel-aarch64-fedora.config | 21 ++++++++++++++++++++- kernel.spec | 12 +++++++++--- patch-5.19-redhat.patch | 26 ++++++++++++++++++++++++-- sources | 6 +++--- 6 files changed, 79 insertions(+), 10 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index fe6cc02f4..a215fe6f6 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/b9dfa5218351f6286e97beba802c14813735f255 + b9dfa5218351f6286e97beba802c14813735f255 Revert "block: freeze the queue earlier in del_gendisk" + "https://gitlab.com/cki-project/kernel-ark/-/commit"/3f1696ca1e6762e9774ecb4d0dedbc54dedb284d 3f1696ca1e6762e9774ecb4d0dedbc54dedb284d drivers/firmware: skip simpledrm if nvidia-drm.modeset=1 is set diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index d03321882..b34baba7c 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -250,8 +250,17 @@ CONFIG_ANDROID=y # CONFIG_APDS9300 is not set CONFIG_APDS9802ALS=m CONFIG_APDS9960=m +CONFIG_APPLE_ADMAC=m +CONFIG_APPLE_AIC=y +CONFIG_APPLE_DART=m +CONFIG_APPLE_M1_CPU_PMU=y +CONFIG_APPLE_MAILBOX=m CONFIG_APPLE_MFI_FASTCHARGE=m +CONFIG_APPLE_PMGR_PWRSTATE=y # CONFIG_APPLE_PROPERTIES is not set +CONFIG_APPLE_RTKIT=m +CONFIG_APPLE_SART=m +CONFIG_APPLE_WATCHDOG=m # CONFIG_APPLICOM is not set CONFIG_APQ_GCC_8084=y CONFIG_APQ_MMCC_8084=m @@ -261,7 +270,7 @@ CONFIG_AR5523=m # CONFIG_ARCH_ACTIONS is not set # CONFIG_ARCH_AIROHA is not set # CONFIG_ARCH_ALPINE is not set -# CONFIG_ARCH_APPLE is not set +CONFIG_ARCH_APPLE=y # CONFIG_ARCH_BCM_21664 is not set # CONFIG_ARCH_BCM_23550 is not set # CONFIG_ARCH_BCM_281XX is not set @@ -297,6 +306,7 @@ CONFIG_ARCH_MESON=y CONFIG_ARCH_MULTIPLATFORM=y CONFIG_ARCH_MVEBU=y CONFIG_ARCH_MXC=y +CONFIG_ARCH_NR_GPIO=2048 # CONFIG_ARCH_OMAP1 is not set # CONFIG_ARCH_PXA is not set CONFIG_ARCH_QCOM=y @@ -1150,6 +1160,7 @@ CONFIG_CNIC=m # CONFIG_CODA_FS is not set # CONFIG_COMEDI is not set CONFIG_COMMAND_LINE_SIZE=4096 +CONFIG_COMMON_CLK_APPLE_NCO=m CONFIG_COMMON_CLK_AXG_AUDIO=y CONFIG_COMMON_CLK_AXG=y CONFIG_COMMON_CLK_AXI_CLKGEN=m @@ -2754,6 +2765,7 @@ CONFIG_I2C_ALGOPCF=m # CONFIG_I2C_AMD756_S4882 is not set # CONFIG_I2C_AMD8111 is not set CONFIG_I2C_AMD_MP2=m +CONFIG_I2C_APPLE=m CONFIG_I2C_ARB_GPIO_CHALLENGE=m CONFIG_I2C_BCM2835=m CONFIG_I2C_BOARDINFO=y @@ -4996,8 +5008,10 @@ CONFIG_NVDIMM_PFN=y # CONFIG_NVHE_EL2_DEBUG is not set CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set +CONFIG_NVME_APPLE=m CONFIG_NVME_FC=m CONFIG_NVME_HWMON=y +CONFIG_NVMEM_APPLE_EFUSES=m # CONFIG_NVMEM_IMX_IIM is not set CONFIG_NVMEM_IMX_OCOTP=m CONFIG_NVMEM_IMX_OCOTP_SCU=m @@ -5164,6 +5178,8 @@ CONFIG_PCIEAER_INJECT=m CONFIG_PCIEAER=y # CONFIG_PCIE_AL is not set # CONFIG_PCIE_ALTERA is not set +CONFIG_PCIE_APPLE_MSI_DOORBELL_ADDR=0xfffff000 +CONFIG_PCIE_APPLE=y CONFIG_PCIE_ARMADA_8K=y CONFIG_PCIEASPM_DEFAULT=y # CONFIG_PCIEASPM_PERFORMANCE is not set @@ -5324,6 +5340,7 @@ CONFIG_PID_NS=y CONFIG_PINCONF=y CONFIG_PINCTRL_ALDERLAKE=m CONFIG_PINCTRL_AMD=y +CONFIG_PINCTRL_APPLE_GPIO=m # CONFIG_PINCTRL_APQ8064 is not set # CONFIG_PINCTRL_APQ8084 is not set CONFIG_PINCTRL_AS3722=y @@ -6670,6 +6687,8 @@ CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_QCOM_GENI_CONSOLE=y CONFIG_SERIAL_QCOM_GENI=y # CONFIG_SERIAL_RP2 is not set +CONFIG_SERIAL_SAMSUNG_CONSOLE=y +CONFIG_SERIAL_SAMSUNG=y # CONFIG_SERIAL_SC16IS7XX_I2C is not set CONFIG_SERIAL_SC16IS7XX=m CONFIG_SERIAL_SC16IS7XX_SPI=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 118ebadc6..42fafc462 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -250,8 +250,17 @@ CONFIG_ANDROID=y # CONFIG_APDS9300 is not set CONFIG_APDS9802ALS=m CONFIG_APDS9960=m +CONFIG_APPLE_ADMAC=m +CONFIG_APPLE_AIC=y +CONFIG_APPLE_DART=m +CONFIG_APPLE_M1_CPU_PMU=y +CONFIG_APPLE_MAILBOX=m CONFIG_APPLE_MFI_FASTCHARGE=m +CONFIG_APPLE_PMGR_PWRSTATE=y # CONFIG_APPLE_PROPERTIES is not set +CONFIG_APPLE_RTKIT=m +CONFIG_APPLE_SART=m +CONFIG_APPLE_WATCHDOG=m # CONFIG_APPLICOM is not set CONFIG_APQ_GCC_8084=y CONFIG_APQ_MMCC_8084=m @@ -261,7 +270,7 @@ CONFIG_AR5523=m # CONFIG_ARCH_ACTIONS is not set # CONFIG_ARCH_AIROHA is not set # CONFIG_ARCH_ALPINE is not set -# CONFIG_ARCH_APPLE is not set +CONFIG_ARCH_APPLE=y # CONFIG_ARCH_BCM_21664 is not set # CONFIG_ARCH_BCM_23550 is not set # CONFIG_ARCH_BCM_281XX is not set @@ -297,6 +306,7 @@ CONFIG_ARCH_MESON=y CONFIG_ARCH_MULTIPLATFORM=y CONFIG_ARCH_MVEBU=y CONFIG_ARCH_MXC=y +CONFIG_ARCH_NR_GPIO=2048 # CONFIG_ARCH_OMAP1 is not set # CONFIG_ARCH_PXA is not set CONFIG_ARCH_QCOM=y @@ -1150,6 +1160,7 @@ CONFIG_CNIC=m # CONFIG_CODA_FS is not set # CONFIG_COMEDI is not set CONFIG_COMMAND_LINE_SIZE=4096 +CONFIG_COMMON_CLK_APPLE_NCO=m CONFIG_COMMON_CLK_AXG_AUDIO=y CONFIG_COMMON_CLK_AXG=y CONFIG_COMMON_CLK_AXI_CLKGEN=m @@ -2738,6 +2749,7 @@ CONFIG_I2C_ALGOPCF=m # CONFIG_I2C_AMD756_S4882 is not set # CONFIG_I2C_AMD8111 is not set CONFIG_I2C_AMD_MP2=m +CONFIG_I2C_APPLE=m CONFIG_I2C_ARB_GPIO_CHALLENGE=m CONFIG_I2C_BCM2835=m CONFIG_I2C_BOARDINFO=y @@ -4976,8 +4988,10 @@ CONFIG_NVDIMM_PFN=y # CONFIG_NVHE_EL2_DEBUG is not set CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y # CONFIG_NVIDIA_WMI_EC_BACKLIGHT is not set +CONFIG_NVME_APPLE=m CONFIG_NVME_FC=m CONFIG_NVME_HWMON=y +CONFIG_NVMEM_APPLE_EFUSES=m # CONFIG_NVMEM_IMX_IIM is not set CONFIG_NVMEM_IMX_OCOTP=m CONFIG_NVMEM_IMX_OCOTP_SCU=m @@ -5143,6 +5157,8 @@ CONFIG_PCIEAER_INJECT=m CONFIG_PCIEAER=y # CONFIG_PCIE_AL is not set # CONFIG_PCIE_ALTERA is not set +CONFIG_PCIE_APPLE_MSI_DOORBELL_ADDR=0xfffff000 +CONFIG_PCIE_APPLE=y CONFIG_PCIE_ARMADA_8K=y CONFIG_PCIEASPM_DEFAULT=y # CONFIG_PCIEASPM_PERFORMANCE is not set @@ -5303,6 +5319,7 @@ CONFIG_PID_NS=y CONFIG_PINCONF=y CONFIG_PINCTRL_ALDERLAKE=m CONFIG_PINCTRL_AMD=y +CONFIG_PINCTRL_APPLE_GPIO=m # CONFIG_PINCTRL_APQ8064 is not set # CONFIG_PINCTRL_APQ8084 is not set CONFIG_PINCTRL_AS3722=y @@ -6649,6 +6666,8 @@ CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_QCOM_GENI_CONSOLE=y CONFIG_SERIAL_QCOM_GENI=y # CONFIG_SERIAL_RP2 is not set +CONFIG_SERIAL_SAMSUNG_CONSOLE=y +CONFIG_SERIAL_SAMSUNG=y # CONFIG_SERIAL_SC16IS7XX_I2C is not set CONFIG_SERIAL_SC16IS7XX=m CONFIG_SERIAL_SC16IS7XX_SPI=y diff --git a/kernel.spec b/kernel.spec index 3a45243c0..da68749e7 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 5.19.4 +%define specversion 5.19.6 %define patchversion 5.19 %define pkgrelease 200 %define kversion 5 -%define tarfile_release 5.19.4 +%define tarfile_release 5.19.6 # This is needed to do merge window version magic %define patchlevel 19 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 200%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 5.19.4 +%define kabiversion 5.19.6 # # End of genspec.sh variables @@ -3138,6 +3138,12 @@ fi # # %changelog +* Wed Aug 31 2022 Justin M. Forbes [5.19.6-0] +- Revert "block: freeze the queue earlier in del_gendisk" (Justin M. Forbes) +- redhat/configs: aarch64: Turn on Apple Silicon configs for Fedora (Eric Curtin) +- redhat/Makefile: Always set UPSTREAM (Prarit Bhargava) +- Linux v5.19.6 + * Thu Aug 25 2022 Justin M. Forbes [5.19.4-0] - Linux v5.19.4 diff --git a/patch-5.19-redhat.patch b/patch-5.19-redhat.patch index cc73ad29f..f5d5aee6a 100644 --- a/patch-5.19-redhat.patch +++ b/patch-5.19-redhat.patch @@ -16,6 +16,7 @@ arch/s390/kernel/ipl.c | 5 + arch/s390/kernel/setup.c | 4 + arch/x86/kernel/setup.c | 22 +- + block/genhd.c | 3 +- drivers/acpi/apei/hest.c | 8 + drivers/acpi/irq.c | 17 +- drivers/acpi/scan.c | 9 + @@ -58,7 +59,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 60 files changed, 1727 insertions(+), 313 deletions(-) + 61 files changed, 1729 insertions(+), 314 deletions(-) diff --git a/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml b/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml index e6485f7b046f..217c42874f41 100644 @@ -250,7 +251,7 @@ index 000000000000..733a26bd887a + +endmenu diff --git a/Makefile b/Makefile -index 65dc4f93ffdb..f305e434bc0c 100644 +index cb68101ea070..da893ccb2025 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -495,6 +496,27 @@ index bd6c6fd373ae..3333b08a778d 100644 reserve_initrd(); +diff --git a/block/genhd.c b/block/genhd.c +index 278227ba1d53..e0675772178b 100644 +--- a/block/genhd.c ++++ b/block/genhd.c +@@ -623,7 +623,6 @@ void del_gendisk(struct gendisk *disk) + * Prevent new I/O from crossing bio_queue_enter(). + */ + blk_queue_start_drain(q); +- blk_mq_freeze_queue_wait(q); + + if (!(disk->flags & GENHD_FL_HIDDEN)) { + sysfs_remove_link(&disk_to_dev(disk)->kobj, "bdi"); +@@ -647,6 +646,8 @@ void del_gendisk(struct gendisk *disk) + pm_runtime_set_memalloc_noio(disk_to_dev(disk), false); + device_del(disk_to_dev(disk)); + ++ blk_mq_freeze_queue_wait(q); ++ + blk_throtl_cancel_bios(disk->queue); + + blk_sync_queue(q); diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c index 6aef1ee5e1bd..8f146b1b4972 100644 --- a/drivers/acpi/apei/hest.c diff --git a/sources b/sources index b81016e39..5a6e59d6a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.19.4.tar.xz) = f3eb340711f30a3f640e1d54338cf33a46051e9ebd03739eec0b9e217b64efe0413c91ebb9c5c118c580bd1f94e51ec407f3e3f0722ea2322d278ff4da1ff198 -SHA512 (kernel-abi-stablelists-5.19.4.tar.bz2) = b0fae5b2a1278ee52991c1853183978dc948d9a753bf4aa061b475b6dccdc3af355b65811ec7e0ce0d643cf2d572aba6c309eaa4f67afc523f78a9abe499df73 -SHA512 (kernel-kabi-dw-5.19.4.tar.bz2) = 991004e1fceb98fc1cea720214708fc800595b41a6ad6e1f236fa8d96e933e6176f00ac1478b3d851840233ed82f3826bfd8f431f7eb67def9dc8fa9f375e4fa +SHA512 (linux-5.19.6.tar.xz) = d3303075a41dcb34454420b6c46fa73d8a9724e730a1bcd45f2437094e53629db228e049032c694ee85e6d718158dc9df31cfa8ef927c4a6390dccd181c0a3cf +SHA512 (kernel-abi-stablelists-5.19.6.tar.bz2) = 53e126dde40bea6d4c8a4662a33322633ad6ee1b1457c1cc00e5717f3a8ca6533c161fb05f9f74ef73373ce8314ddee624d49ed1dee74fa4e61c0b15192127e8 +SHA512 (kernel-kabi-dw-5.19.6.tar.bz2) = 144ad5931c9be1a9b3207ac8895a53844b7e734ab2d92eea6c987432f9f08a4480287a6f01398d0f14d6e9416a98af316589a641d7ab9ee7bda0d49fc7dadc4f -- cgit