From patchwork Wed May 7 14:44:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 4129021 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1F71ABFF02 for ; Wed, 7 May 2014 14:48:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4F52E20259 for ; Wed, 7 May 2014 14:48:50 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6B55B20253 for ; Wed, 7 May 2014 14:48:49 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wi36e-0005O5-8C; Wed, 07 May 2014 14:46:00 +0000 Received: from mail-pa0-f46.google.com ([209.85.220.46]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wi36Z-0005E6-QH for linux-arm-kernel@lists.infradead.org; Wed, 07 May 2014 14:45:56 +0000 Received: by mail-pa0-f46.google.com with SMTP id kx10so1259784pab.19 for ; Wed, 07 May 2014 07:45:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lyfI13bjZu4lWFlpF1W1cFRd+XPgGsawBy2dva3gynQ=; b=CVGz+dlNvN8NJ6bKmcOtsbpmwcZJLjpWdUhrMye42N1ISdhPEtvFFrRAl96zCoq+cu WvtxapOI4bO1OhQe2mtwGjSG0G7NqikADySQDO1wxJp1d8Q0NQr3dpYUkJnTvXaFTAIh CquRPowTi6rC0Vv+Q4+j9xtPXDB+DsaX4JsSqpYWiP7C44GeHqyVhn7gkLVXsIZoSUbD 9j7uLI9D45g0EvV7iLTJ4YMGseLmQ/s1un4drBVde1iKePVXQbO1f0awZJbT4hUrQznX eY2HLltPHvdHuogqn51WBZpE8Ec62MJZFJXEy4xRmrFAWX5r6sQLVhX/P1kxdrg1QAha LraA== X-Gm-Message-State: ALoCoQn963CZNrw/nWdBiIB3zFo9VA2UAs3q/is5r8lsQD2QFbBK4oiY7vFWHSe5EHD5BAZWgCqf X-Received: by 10.66.148.197 with SMTP id tu5mr19849728pab.108.1399473934481; Wed, 07 May 2014 07:45:34 -0700 (PDT) Received: from localhost.localdomain ([140.206.182.114]) by mx.google.com with ESMTPSA id nw13sm115484380pab.37.2014.05.07.07.45.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 May 2014 07:45:33 -0700 (PDT) From: Haojian Zhuang To: tglx@linutronix.de, linux@arm.linux.org.uk, linux-arm-kernel@lists.infradead.org, arnd@arndb.de, olof@lixom.net, khilman@kernel.org, xuwei5@hisilicon.com, christoffer.dall@linaro.org, Dave.Martin@arm.com, nicolas.pitre@linaro.org, marc.zyngier@arm.com Subject: [PATCH v5 02/14] ARM: add V7_NONLPAE && V7_LPAE sub config Date: Wed, 7 May 2014 22:44:36 +0800 Message-Id: <1399473888-12947-3-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1399473888-12947-1-git-send-email-haojian.zhuang@linaro.org> References: <1399473888-12947-1-git-send-email-haojian.zhuang@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140507_074555_885842_0EBC59CA X-CRM114-Status: GOOD ( 11.95 ) X-Spam-Score: -0.7 (/) Cc: Haojian Zhuang X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since CONFIG_ARM_LPAE could be set in ARM V7, add new two configurations CONFIG_ARCH_MULTI_V7_NONLPAE & CONFIG_ARCH_MULTI_V7_LPAE. If we want to enable CONFIG_ARM_LPAE configuration, we should enable CONFIG_ARCH_MULTI_V7 & disable both CONFIG_ARCH_MULTI_V6 and CONFIG_ARCH_MULTI_V7_NONLPAE. Signed-off-by: Haojian Zhuang --- arch/arm/Kconfig | 13 ++++++++++++- arch/arm/mm/Kconfig | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index ab438cb..0e52a2c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -918,12 +918,23 @@ config ARCH_MULTI_V6 select CPU_V6K config ARCH_MULTI_V7 - bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)" + bool "ARMv7 based platforms" default y select ARCH_MULTI_V6_V7 select CPU_V7 select HAVE_SMP +config ARCH_MULTI_V7_NONLPAE + bool "ARMv7 non-LPAE based platforms (Cortex-A5/A8/A9, PJ4, PJ4B, Scorpion)" + depends on ARCH_MULTI_V7 + default y + +config ARCH_MULTI_V7_LPAE + bool "ARMv7 LPAE based platforms (Cortex-A7/A12/A15/A17, Brahma-B15, PJ4B-MP, Krait)" + depends on ARCH_MULTI_V7 + default y + select ARM_LPAE if !(ARCH_MULTI_V6 || ARCH_MULTI_V7_NONLPAE) + config ARCH_MULTI_V6_V7 bool select MIGHT_HAVE_CACHE_L2X0 diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index f5ad9ee..1c1576c 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig @@ -615,7 +615,7 @@ comment "Processor Features" config ARM_LPAE bool "Support for the Large Physical Address Extension" depends on MMU && CPU_32v7 && !CPU_32v6 && !CPU_32v5 && \ - !CPU_32v4 && !CPU_32v3 + !CPU_32v4 && !CPU_32v3 && !ARCH_MULTI_V7_NONLPAE help Say Y if you have an ARMv7 processor supporting the LPAE page table format and you would like to access memory beyond the