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: 29773 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f198.google.com (mail-ob0-f198.google.com [209.85.214.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4DCD2202E4 for ; Wed, 7 May 2014 14:47:50 +0000 (UTC) Received: by mail-ob0-f198.google.com with SMTP id va2sf5437698obc.1 for ; Wed, 07 May 2014 07:47:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=CUPQ1+fVVinQMIAQhRJkSna63kre1tQGBIbTJFPSnoI=; b=MrUM5bLMMLiWEF9Nz+/08NVjI2GQBoCJ8vt5slpNxi8vPfdgABw34WE+Mksofkawmb yL7G2FSIEw299wCxTj8PsRA8hdwfPq/JbDpZMxpRKDgj/LgD2NwiVXzGGKpiF/NPrtBm lskYFzlIgRPnQUZ+rf8D/PymWjyimpc1T+90Q87aSucTazbgpQtUyIqAMj4ThH6TBWoG EwskeAUeV4n852vUNsvOqWbk5uMqAVZbV4DNyToT7+DYetio7A3FSCyYYe5vZuFT4ZjD ulV58BtrlX+/pEOzD0aWiWYk/DX1WVTDrvijlp24eEFJYQBS4RtM+BGSPQQDZGM8PQFh +Zkg== X-Gm-Message-State: ALoCoQkz0NdbNJoT4mRVfiKiY5wQOpwqguvP0Mbsfh4IzJKK37TyppdC3rN7eAp6pwdqi4b6cV1l X-Received: by 10.182.78.97 with SMTP id a1mr4510708obx.33.1399474068846; Wed, 07 May 2014 07:47:48 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.50.81 with SMTP id r75ls3367921qga.71.gmail; Wed, 07 May 2014 07:47:48 -0700 (PDT) X-Received: by 10.220.205.3 with SMTP id fo3mr1071713vcb.57.1399474068720; Wed, 07 May 2014 07:47:48 -0700 (PDT) Received: from mail-ve0-f180.google.com (mail-ve0-f180.google.com [209.85.128.180]) by mx.google.com with ESMTPS id h11si2952071vcu.44.2014.05.07.07.47.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 07 May 2014 07:47:48 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.128.180; Received: by mail-ve0-f180.google.com with SMTP id db12so1358458veb.25 for ; Wed, 07 May 2014 07:47:48 -0700 (PDT) X-Received: by 10.58.220.161 with SMTP id px1mr40096042vec.13.1399474068648; Wed, 07 May 2014 07:47:48 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp315650vcb; Wed, 7 May 2014 07:47:47 -0700 (PDT) X-Received: by 10.224.64.132 with SMTP id e4mr66293839qai.16.1399474067222; Wed, 07 May 2014 07:47:47 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id l110si6895762qgf.59.2014.05.07.07.47.47 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 May 2014 07:47:47 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; 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-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 (/) X-Spam-Report: SpamAssassin version 3.3.2 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.220.46 listed in list.dnswl.org] 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+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: haojian.zhuang@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 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