From patchwork Tue Apr 22 18:32:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 341425 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E69881400FA for ; Wed, 23 Apr 2014 04:32:55 +1000 (EST) Received: from localhost ([::1]:56673 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcfUz-0003cb-Jt for incoming@patchwork.ozlabs.org; Tue, 22 Apr 2014 14:32:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45414) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcfUc-0003Lv-Cg for qemu-devel@nongnu.org; Tue, 22 Apr 2014 14:32:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WcfUW-00050d-2s for qemu-devel@nongnu.org; Tue, 22 Apr 2014 14:32:30 -0400 Received: from moutng.kundenserver.de ([212.227.126.130]:64173) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcfUV-00050G-Or for qemu-devel@nongnu.org; Tue, 22 Apr 2014 14:32:23 -0400 Received: from wuerfel.localnet (HSI-KBW-134-3-133-35.hsi14.kabel-badenwuerttemberg.de [134.3.133.35]) by mrelayeu.kundenserver.de (node=mreue007) with ESMTP (Nemesis) id 0MHvgn-1We2vm1jgr-003a5e; Tue, 22 Apr 2014 20:32:11 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Date: Tue, 22 Apr 2014 20:32:10 +0200 Message-ID: <15350123.PBHzyiOlX4@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.11.0-18-generic; KDE/4.11.5; x86_64; ; ) In-Reply-To: <20140422175325.GD23955@obsidianresearch.com> References: <534D0D91.8020406@linaro.org> <20140422171141.GW24070@n2100.arm.linux.org.uk> <20140422175325.GD23955@obsidianresearch.com> MIME-Version: 1.0 X-Provags-ID: V02:K0:38Jj3+vbQ5gxkjfP5lFTStGpw+r02gnB+95I/CRgCy5 0jlbfn6HuMAuXx8g8RHvbA0jNz3urbURExWDWLs6V1JxKmbCGf XesT7azyIh98Z2MuAXqwND1NlQuou14VqzgIib1j1UudzAyO4X SKH4pNFWpIxmQg7vkaKn1xWHqXCJbOZZpf8y5WizOD1O4yj+12 RIfk54r/T36x3dILd1svq0JVYOY7115uEIr8QALx0SbD9Y5eNG Y19XgR1fvoICJXF0uU8RYuBgvxcMQk9pz8vJNn5LD3XI2C57kI 2bQGdQ7Q1GeBklUUqaXLRW1T4ip7WbYThOsi4lHm6BDSFfLA9U iZ5aVJL0TfON1BMc8DS0= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 212.227.126.130 Cc: Nicolas Pitre , Peter Maydell , Michal Simek , Russell King - ARM Linux , Joel Fernandes , linux-arm-msm@vger.kernel.org, Stephen Boyd , Daniel Thompson , QEMU Developers , Jason Gunthorpe , Peter Crosthwaite , Christopher Covington Subject: Re: [Qemu-devel] Change of TEXT_OFFSET for multi_v7_defconfig X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org On Tuesday 22 April 2014 11:53:25 Jason Gunthorpe wrote: > On Tue, Apr 22, 2014 at 06:11:42PM +0100, Russell King - ARM Linux wrote: > > > Put another way, if your platform is part of the multi-platform kernel > > then you are *excluded* from being able to use this... unless you hack > > the Kconfig, and then also provide a constant value for PHYS_OFFSET, > > thereby _tying_ the kernel you built to a _single_ platform. > > That is exactly right. To get a fixed LMA you must commit to a > non-relocatable kernel image. > > Realistically this patch would need to be accompanied by something > that makes ARM_PATCH_PHYS_VIRT optional for multiplatform based on > EXPERT or similar. Incidentally, I have this experimental patch in my endless 'randconfig' queue of things to do properly at a later point. The idea is to let a person building a kernel intentionally do a number of things that result in a not-quite-multiplatform configuration when CONFIG_BROKEN_MULTIPLATFORM is disabled. The main intention is allow NOMMU builds on platforms that are already converted to multiplatform, and to prevent people from accidentally turning on DEBUG_LL, as that breaks all other machines. A couple of other things are in the same category. Arnd From c9917a4a1b3f326e84932d7e860597413a98643b Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Mon, 24 Feb 2014 16:38:34 +0100 Subject: [PATCH] ARM: add CONFIG_BROKEN_MULTIPLATFORM Signed-off-by: Arnd Bergmann diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 65ea715..9ae3c0b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -233,7 +233,7 @@ config VECTORS_BASE in size. config ARM_PATCH_PHYS_VIRT - bool "Patch physical to virtual translations at runtime" if EMBEDDED + bool "Patch physical to virtual translations at runtime" if BROKEN_MULTIPLATFORM default y depends on !XIP_KERNEL && MMU depends on !ARCH_REALVIEW || !SPARSEMEM @@ -302,16 +302,14 @@ config MMU # choice prompt "ARM system type" - default ARCH_VERSATILE if !MMU - default ARCH_MULTIPLATFORM if MMU + default ARCH_MULTIPLATFORM config ARCH_MULTIPLATFORM bool "Allow multiple platforms to be selected" - depends on MMU select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_HAS_SG_CHAIN - select ARM_PATCH_PHYS_VIRT select AUTO_ZRELADDR + select BROKEN_MULTIPLATFORM if !MMU select COMMON_CLK select GENERIC_CLOCKEVENTS select MULTI_IRQ_HANDLER @@ -865,6 +863,18 @@ config ARCH_OMAP1 endchoice +config BROKEN_MULTIPLATFORM + bool "Allow multiplatform builds that may be broken" if ARCH_MULTIPLATFORM && EXPERT + def_bool !ARCH_MULTIPLATFORM + help + This is a meta option that makes other options visible that + are normally hidden when building a kernel with ARCH_MULTIPLATFORM + support. + You have to enable this option in order to select any option + that can cause your kernel to only work on a subset of the + platforms that are enabled. This includes disabling MMU + or ARM_PATCH_PHYS_VIRT, or enabling ZBOOT_ROM. + menu "Multiple platform selection" depends on ARCH_MULTIPLATFORM @@ -1943,6 +1953,7 @@ config DEPRECATED_PARAM_STRUCT # TEXT and BSS so we preserve their values in the config files. config ZBOOT_ROM_TEXT hex "Compressed ROM boot loader base address" + depends on BROKEN_MULTIPLATFORM default "0" help The physical address at which the ROM-able zImage is to be @@ -1954,6 +1965,7 @@ config ZBOOT_ROM_TEXT config ZBOOT_ROM_BSS hex "Compressed ROM boot loader BSS address" + depends on BROKEN_MULTIPLATFORM default "0" help The base address of an area of read/write memory in the target @@ -1967,6 +1979,7 @@ config ZBOOT_ROM_BSS config ZBOOT_ROM bool "Compressed boot loader in ROM/flash" + depends on BROKEN_MULTIPLATFORM depends on ZBOOT_ROM_TEXT != ZBOOT_ROM_BSS depends on !ARM_APPENDED_DTB && !XIP_KERNEL && !AUTO_ZRELADDR help @@ -2092,7 +2105,7 @@ endchoice config XIP_KERNEL bool "Kernel Execute-In-Place from ROM" - depends on !ARM_LPAE && !ARCH_MULTIPLATFORM + depends on !ARM_LPAE && BROKEN_MULTIPLATFORM help Execute-In-Place allows the kernel to run from non-volatile storage directly addressable by the CPU, such as NOR flash. This saves RAM diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 6175b50..e193881 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -80,6 +80,7 @@ config DEBUG_USER config DEBUG_LL bool "Kernel low-level debugging functions (read help!)" depends on DEBUG_KERNEL + depends on BROKEN_MULTIPLATFORM help Say Y here to include definitions of printascii, printch, printhex in the kernel. This is helpful if you are debugging code that diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index cddfd2e..df61015 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -111,7 +111,7 @@ config SOC_IMX31 select CPU_V6 select IMX_HAVE_PLATFORM_MXC_RNGA select MXC_AVIC - select SMP_ON_UP if SMP + select SMP_ON_UP if SMP && !BROKEN_MULTIPLATFORM config SOC_IMX35 bool @@ -119,7 +119,7 @@ config SOC_IMX35 select HAVE_EPIT select MXC_AVIC select PINCTRL_IMX35 - select SMP_ON_UP if SMP + select SMP_ON_UP if SMP && !BROKEN_MULTIPLATFORM config SOC_IMX5 bool diff --git a/arch/arm/mach-prima2/Kconfig b/arch/arm/mach-prima2/Kconfig index e4e505f..05be41c 100644 --- a/arch/arm/mach-prima2/Kconfig +++ b/arch/arm/mach-prima2/Kconfig @@ -33,7 +33,6 @@ config ARCH_MARCO default y select ARM_GIC select HAVE_ARM_SCU if SMP - select SMP_ON_UP if SMP help Support for CSR SiRFSoC ARM Cortex A9 Platform