From patchwork Thu Aug 18 14:56:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 12947265 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 59B05C00140 for ; Thu, 18 Aug 2022 15:01:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=0W+gU5enUvdBWX96GQXqwsAd6VUsvRH6Sxh2rfNV4/k=; b=C1owxG4WM/vYRT CtzUjti/KsAq0CS9av6672avm8hZF2677ugjmR+YI59mV5Q5GNqqcd1p90T786H30aWmQLUc5DMw4 OBB0UV827KVAvzmoKPuqAGayO1/ymr7PDgvJLZitMuUcU/oGu0BaDCqTnRKRaePgDt8ZgDYBgLj7j W+QLcZO9QabPApGDzkZP/YGdBc+4ReU2AjOYUjP5KWcCYJhSR+CZOcsKWOo6i+7UOm644Bh8FFw6r NO+aD1OND9NCu1Qrgc4XAug9omQXjOc3Onljb/JgwyP6hlaw3chukPfIIlzC4GMVCuncAOB19hyrS TdxK8QfXYAw4zOU8WXGQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oOh0F-006MMI-7u; Thu, 18 Aug 2022 15:00:13 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oOgx0-006KgO-PU for linux-arm-kernel@lists.infradead.org; Thu, 18 Aug 2022 14:56:52 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3AFD2612AF; Thu, 18 Aug 2022 14:56:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4D519C43470; Thu, 18 Aug 2022 14:56:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660834609; bh=RlvIHjnFmvmSJ2Sj9XCES+dsJBYvTPzMIPgDbH08k5E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ICT3toaNk/oHDQKBfW01iuipifxP+CV77V0ELUgSduNyT+8gvtSCw90om68kyv4V9 FCyNVZiTMCH8uB9CmGBFkXGEvvoBh5R+Z6rqltTPEuDbvnExjLuLyXZlViM9pas96d okW6ameFgTn3ynwtOTKLUkZQtcwjFDwG88Us9fNGXj2Peu6/7b3pvR7IsYJx1PO0sj VIi5l9bCVrtHLzVDU71E+q6SadVoKAspRKy1aFsH0CZKpejrFv4B4CqFUs3C43A4EJ i+BoTAznr94FEShmCTEUv+VyM1anlTJZp7UxpDyld1v502sD7pVkcM1VTuis+SQvfV 56W9AKtOe53LA== From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Arnd Bergmann , Russell King , Linus Walleij , Geert Uytterhoeven , Krzysztof Kozlowski , Ard Biesheuvel , Sekhar Nori , Bartosz Golaszewski , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth Subject: [PATCH 4/5] ARM: fix CPU_V6 dependencies Date: Thu, 18 Aug 2022 16:56:15 +0200 Message-Id: <20220818145616.3156379-5-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20220818145616.3156379-1-arnd@kernel.org> References: <20220818145616.3156379-1-arnd@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220818_075650_913124_48FEA71E X-CRM114-Status: GOOD ( 12.84 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann CONFIG_XIP_KERNEL must not be combined with CONFIG_SMP_ON_UP because the patching of read-only data does not work. Signed-off-by: Arnd Bergmann --- arch/arm/mach-imx/Kconfig | 1 + arch/arm/mach-omap2/Kconfig | 1 + arch/arm/mach-versatile/Kconfig | 2 ++ 3 files changed, 4 insertions(+) diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index ab767f059929..9308e9894be5 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -41,6 +41,7 @@ comment "ARM1136 platforms" config SOC_IMX31 bool "i.MX31 support" + depends on !SMP || !XIP_KERNEL # for SMP_ON_UP select CPU_V6 select MXC_AVIC help diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 3b53dda9ec79..f2ce262958c4 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -8,6 +8,7 @@ config OMAP_HWMOD config ARCH_OMAP2 bool "TI OMAP2" depends on ARCH_MULTI_V6 + depends on !SMP || !XIP_KERNEL # for SMP_ON_UP select ARCH_OMAP2PLUS select CPU_V6 select OMAP_HWMOD diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig index 2ef226194c3a..25723b0c63dd 100644 --- a/arch/arm/mach-versatile/Kconfig +++ b/arch/arm/mach-versatile/Kconfig @@ -21,6 +21,7 @@ menuconfig ARCH_INTEGRATOR bool "ARM Ltd. Integrator family" depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V6 depends on CPU_LITTLE_ENDIAN || ARCH_MULTI_V6 + depends on !SMP || !XIP_KERNEL # for SMP_ON_UP select ARM_AMBA select CMA select DMA_CMA @@ -146,6 +147,7 @@ endif menuconfig ARCH_REALVIEW bool "ARM Ltd. RealView family" depends on (CPU_LITTLE_ENDIAN && ARCH_MULTI_V5) || ARCH_MULTI_V6 || ARCH_MULTI_V7 + depends on !SMP || !XIP_KERNEL # for SMP_ON_UP select ARM_AMBA select ARM_GIC select ARM_TIMER_SP804