From patchwork Thu Jun 30 08:36:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Murzin X-Patchwork-Id: 12901420 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 1FD1FC43334 for ; Thu, 30 Jun 2022 08:38:34 +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=pbUfx2xO8+W074QjY0r040WJp+lLiQ7hx+NDL2baoIo=; b=pqVcv+5SIpzlVj +xY7euwlHo41CF51G28VmzrHJ9DzKn/f9L69QEYoob4vK7f0i9AL9uebRL/lBaY/oj2yGLWKHu66x 2dl9MwZyySPgWHmuTiAl2UdoV/QJwqdAOudE5/eRp8qz9giZ8HvtdFj2S0pcM7NX8kQb/ph3yYfe2 Goi+mWpnefT8EdDxHGxEC4+D7tNq8EcdjDpcaIdxQ6+x/rcl1Hrl4FEC+1Qx5Bu/ER2kocKdxXFgT /+8BOClaw1XS+Z3bm7rPhG0tR/ICQAdxYtByp3ZZvOKahW4jOY5Ug7KV1HVGArhGp3Jnpu00SXbPa rxTFzCTG3S9LrWfNk1ew==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o6pg5-00G3a9-J3; Thu, 30 Jun 2022 08:37:33 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o6pfc-00G3RB-FG for linux-arm-kernel@lists.infradead.org; Thu, 30 Jun 2022 08:37:07 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 959BB1BCB; Thu, 30 Jun 2022 01:37:00 -0700 (PDT) Received: from login2.euhpc.arm.com (login2.euhpc.arm.com [10.6.27.34]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id AFEF53F66F; Thu, 30 Jun 2022 01:36:59 -0700 (PDT) From: Vladimir Murzin To: linux-arm-kernel@lists.infradead.org Cc: arnd@arndb.de, ayan.kumar.halder@xilinx.com, stefanos@xilinx.com Subject: [RFC PATCH 1/3] ARM: Introduce ARM_SINGLE_ARMV7R for ARMv7-R platforms Date: Thu, 30 Jun 2022 09:36:39 +0100 Message-Id: <20220630083641.21835-2-vladimir.murzin@arm.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20220630083641.21835-1-vladimir.murzin@arm.com> References: <20220630083641.21835-1-vladimir.murzin@arm.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220630_013704_667338_80B8B1AE X-CRM114-Status: GOOD ( 11.18 ) 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 Similar to ARM_SINGLE_ARMV7M introduce the new config symbol ARM_SINGLE_ARMV7R which groups config symbols required by ARMv7-R (and above) platforms. This would allow supporting multiple ARMv7-R platforms in one kernel image. However, to be bootable such kernel image requires to share the same main memory layout. Signed-off-by: Vladimir Murzin --- arch/arm/Kconfig | 19 ++++++++++++++++++- arch/arm/Kconfig.debug | 6 ++++-- arch/arm/Makefile | 2 ++ arch/arm/kernel/devtree.c | 3 ++- 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7630ba9cb6cc..0dda6523724d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -304,8 +304,13 @@ config MMU Select if you want MMU-based virtualised addressing space support by paged memory management. If unsure, say 'Y'. +choice + prompt "ARM system type" + depends on !MMU + default ARM_SINGLE_ARMV7M + config ARM_SINGLE_ARMV7M - def_bool !MMU + bool "ARM Cortex-M based platforms" select ARM_NVIC select AUTO_ZRELADDR select TIMER_OF @@ -315,6 +320,18 @@ config ARM_SINGLE_ARMV7M select SPARSE_IRQ select USE_OF +config ARM_SINGLE_ARMV7R + bool "ARM Cortex-R based platforms" + select AUTO_ZRELADDR + select TIMER_OF + select COMMON_CLK + select CPU_V7 + select NO_IOPORT_MAP + select SPARSE_IRQ + select USE_OF + +endchoice + config ARCH_MMAP_RND_BITS_MIN default 8 diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 9b0aa4822d69..832d624203b8 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -1904,7 +1904,8 @@ config DEBUG_UART_8250_PALMCHIP config DEBUG_UNCOMPRESS bool "Enable decompressor debugging via DEBUG_LL output" - depends on ARCH_MULTIPLATFORM || PLAT_SAMSUNG || ARM_SINGLE_ARMV7M + depends on ARCH_MULTIPLATFORM || PLAT_SAMSUNG || ARM_SINGLE_ARMV7M || \ + ARM_SINGLE_ARMV7R depends on DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \ (!DEBUG_TEGRA_UART || !ZBOOT_ROM) && \ !DEBUG_BRCMSTB_UART && !DEBUG_SEMIHOSTING @@ -1922,7 +1923,8 @@ config DEBUG_UNCOMPRESS config UNCOMPRESS_INCLUDE string default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \ - PLAT_SAMSUNG || ARM_SINGLE_ARMV7M + PLAT_SAMSUNG || ARM_SINGLE_ARMV7M || \ + ARM_SINGLE_ARMV7R default "mach/uncompress.h" config EARLY_PRINTK diff --git a/arch/arm/Makefile b/arch/arm/Makefile index c8e3633f5434..985df6b00b49 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -245,9 +245,11 @@ platdirs := $(patsubst %,arch/arm/plat-%/,$(sort $(plat-y))) ifneq ($(CONFIG_ARCH_MULTIPLATFORM),y) ifneq ($(CONFIG_ARM_SINGLE_ARMV7M),y) +ifneq ($(CONFIG_ARM_SINGLE_ARMV7R),y) KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(machdirs) $(platdirs)) endif endif +endif export TEXT_OFFSET GZFLAGS MMUEXT diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c index 02839d8b6202..ce2c67c9301e 100644 --- a/arch/arm/kernel/devtree.c +++ b/arch/arm/kernel/devtree.c @@ -194,7 +194,8 @@ const struct machine_desc * __init setup_machine_fdt(void *dt_virt) { const struct machine_desc *mdesc, *mdesc_best = NULL; -#if defined(CONFIG_ARCH_MULTIPLATFORM) || defined(CONFIG_ARM_SINGLE_ARMV7M) +#if defined(CONFIG_ARCH_MULTIPLATFORM) || defined(CONFIG_ARM_SINGLE_ARMV7M) || \ + defined(CONFIG_ARM_SINGLE_ARMV7R) DT_MACHINE_START(GENERIC_DT, "Generic DT based system") .l2c_aux_val = 0x0, .l2c_aux_mask = ~0x0,