diff mbox series

[5.15,28/28] mtd: fixup CFI on ixp4xx

Message ID	20220118160452.812621295@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>, Linus Walleij <linus.walleij@linaro.org>, Miquel Raynal <miquel.raynal@bootlin.com>, Anders Roxell <anders.roxell@linaro.org> Subject: [PATCH 5.15 28/28] mtd: fixup CFI on ixp4xx Date: Tue, 18 Jan 2022 17:06:14 +0100 Message-Id: <20220118160452.812621295@linuxfoundation.org> In-Reply-To: <20220118160451.879092022@linuxfoundation.org> References: <20220118160451.879092022@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.15,02/28] drm/amd/display: explicitly set is_dsc_supported to false before use [5.15,03/28] orangefs: Fix the size of a memory allocation in orangefs_bufmap_alloc() [5.15,04/28] remoteproc: qcom: pil_info: Dont memcpy_toio more than is provided [5.15,05/28] vfs: fs_context: fix up param length parsing in legacy_parse_param [5.15,06/28] perf: Protect perf_guest_cbs with RCU [5.15,07/28] KVM: x86: Register perf callbacks after calling vendors hardware_setup() [5.15,08/28] KVM: x86: Register Processor Trace interrupt hook iff PT enabled in guest [5.15,10/28] KVM: s390: Clarify SIGP orders versus STOP/RESTART [5.15,11/28] remoteproc: qcom: pas: Add missing power-domain "mxc" for CDSP [5.15,12/28] 9p: only copy valid iattrs in 9P2000.L setattr implementation [5.15,13/28] video: vga16fb: Only probe for EGA and VGA 16 color graphic cards [5.15,14/28] media: uvcvideo: fix division by zero at stream start [5.15,15/28] rtlwifi: rtl8192cu: Fix WARNING when calling local_irq_restore() with interrupts ena... [5.15,17/28] firmware: qemu_fw_cfg: fix NULL-pointer deref on duplicate entries [5.15,18/28] firmware: qemu_fw_cfg: fix kobject leak in probe error path [5.15,19/28] perf annotate: Avoid TUI crash when navigating in the annotation of recursive functions [5.15,20/28] KVM: x86: remove PMU FIXED_CTR3 from msrs_to_save_all [5.15,21/28] ALSA: hda/realtek: Add speaker fixup for some Yoga 15ITL5 devices [5.15,22/28] ALSA: hda/realtek: Use ALC285_FIXUP_HP_GPIO_LED on another HP laptop [5.15,23/28] ALSA: hda/realtek - Fix silent output on Gigabyte X570 Aorus Master after reboot fro... [5.15,24/28] ALSA: hda: ALC287: Add Lenovo IdeaPad Slim 9i 14ITL5 speaker quirk [5.15,25/28] ALSA: hda/tegra: Fix Tegra194 HDA reset failure [5.15,26/28] ALSA: hda/realtek: Add quirk for Legion Y9000X 2020 [5.15,27/28] ALSA: hda/realtek: Re-order quirk entries for Lenovo [5.15,28/28] mtd: fixup CFI on ixp4xx

Commit Message

Greg Kroah-Hartman Jan. 18, 2022, 4:06 p.m. UTC

From: Arnd Bergmann <arnd@arndb.de>

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 <arnd@arndb.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20210927141045.1597593-1-arnd@kernel.org
Cc: Anders Roxell <anders.roxell@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/mtd/chips/Kconfig |    2 ++
 drivers/mtd/maps/Kconfig  |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff mbox series

Patch

--- 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
@@ -302,7 +302,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