From: Greg Kroah-Hartman Date: Tue, 18 Jan 2022 15:40:11 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v5.16.2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bda0e038a8989ff40f65b0161b7bc9eef3f1b9f6;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: arm-9025-1-kconfig-cpu_big_endian-depends-on-ld_is_lld.patch mtd-fixup-cfi-on-ixp4xx.patch --- diff --git a/queue-5.4/arm-9025-1-kconfig-cpu_big_endian-depends-on-ld_is_lld.patch b/queue-5.4/arm-9025-1-kconfig-cpu_big_endian-depends-on-ld_is_lld.patch new file mode 100644 index 00000000000..2bf23b8f135 --- /dev/null +++ b/queue-5.4/arm-9025-1-kconfig-cpu_big_endian-depends-on-ld_is_lld.patch @@ -0,0 +1,35 @@ +From 28187dc8ebd938d574edfc6d9e0f9c51c21ff3f4 Mon Sep 17 00:00:00 2001 +From: Nick Desaulniers +Date: Tue, 17 Nov 2020 00:46:39 +0100 +Subject: ARM: 9025/1: Kconfig: CPU_BIG_ENDIAN depends on !LD_IS_LLD + +From: Nick Desaulniers + +commit 28187dc8ebd938d574edfc6d9e0f9c51c21ff3f4 upstream. + +LLD does not yet support any big endian architectures. Make this config +non-selectable when using LLD until LLD is fixed. + +Link: https://github.com/ClangBuiltLinux/linux/issues/965 + +Signed-off-by: Nick Desaulniers +Tested-by: Nathan Chancellor +Reviewed-by: Nathan Chancellor +Reported-by: kbuild test robot +Signed-off-by: Russell King +Cc: Anders Roxell +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm/mm/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm/mm/Kconfig ++++ b/arch/arm/mm/Kconfig +@@ -743,6 +743,7 @@ config SWP_EMULATE + config CPU_BIG_ENDIAN + bool "Build big-endian kernel" + depends on ARCH_SUPPORTS_BIG_ENDIAN ++ depends on !LD_IS_LLD + help + Say Y if you plan on running a kernel in big-endian mode. + Note that your board must be properly built and your board diff --git a/queue-5.4/mtd-fixup-cfi-on-ixp4xx.patch b/queue-5.4/mtd-fixup-cfi-on-ixp4xx.patch new file mode 100644 index 00000000000..fb2abdb5bf6 --- /dev/null +++ b/queue-5.4/mtd-fixup-cfi-on-ixp4xx.patch @@ -0,0 +1,57 @@ +From 603362b4a58393061dcfed1c7f0d0fd4aba61126 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Mon, 27 Sep 2021 16:10:37 +0200 +Subject: mtd: fixup CFI on ixp4xx + +From: Arnd Bergmann + +commit 603362b4a58393061dcfed1c7f0d0fd4aba61126 upstream. + +drivers/mtd/maps/ixp4xx.c requires MTD_CFI_BE_BYTE_SWAP to be set +in order to compile. + +drivers/mtd/maps/ixp4xx.c:57:4: error: #error CONFIG_MTD_CFI_BE_BYTE_SWAP required + +This patch avoids the #error output by enforcing the policy in +Kconfig. Not sure if this is the right approach, but it helps doing +randconfig builds. + +Signed-off-by: Arnd Bergmann +Acked-by: Linus Walleij +Signed-off-by: Miquel Raynal +Link: https://lore.kernel.org/linux-mtd/20210927141045.1597593-1-arnd@kernel.org +Cc: Anders Roxell +Signed-off-by: Greg Kroah-Hartman +--- + drivers/mtd/chips/Kconfig | 2 ++ + drivers/mtd/maps/Kconfig | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +--- a/drivers/mtd/chips/Kconfig ++++ b/drivers/mtd/chips/Kconfig +@@ -55,12 +55,14 @@ choice + LITTLE_ENDIAN_BYTE, if the bytes are reversed. + + config MTD_CFI_NOSWAP ++ depends on !ARCH_IXP4XX || CPU_BIG_ENDIAN + bool "NO" + + config MTD_CFI_BE_BYTE_SWAP + bool "BIG_ENDIAN_BYTE" + + config MTD_CFI_LE_BYTE_SWAP ++ depends on !ARCH_IXP4XX + bool "LITTLE_ENDIAN_BYTE" + + endchoice +--- a/drivers/mtd/maps/Kconfig ++++ b/drivers/mtd/maps/Kconfig +@@ -303,7 +303,7 @@ config MTD_DC21285 + + config MTD_IXP4XX + tristate "CFI Flash device mapped on Intel IXP4xx based systems" +- depends on MTD_CFI && MTD_COMPLEX_MAPPINGS && ARCH_IXP4XX ++ depends on MTD_CFI && MTD_COMPLEX_MAPPINGS && ARCH_IXP4XX && MTD_CFI_ADV_OPTIONS + help + This enables MTD access to flash devices on platforms based + on Intel's IXP4xx family of network processors such as the diff --git a/queue-5.4/series b/queue-5.4/series index 8bf39e5be52..32b0b61f9ff 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -11,3 +11,5 @@ firmware-qemu_fw_cfg-fix-null-pointer-deref-on-duplicate-entries.patch firmware-qemu_fw_cfg-fix-kobject-leak-in-probe-error-path.patch kvm-x86-remove-pmu-fixed_ctr3-from-msrs_to_save_all.patch alsa-hda-realtek-fix-silent-output-on-gigabyte-x570-aorus-master-after-reboot-from-windows.patch +mtd-fixup-cfi-on-ixp4xx.patch +arm-9025-1-kconfig-cpu_big_endian-depends-on-ld_is_lld.patch