From patchwork Fri Apr 18 06:05:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 28619 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f197.google.com (mail-pd0-f197.google.com [209.85.192.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 18A932013D for ; Fri, 18 Apr 2014 06:14:02 +0000 (UTC) Received: by mail-pd0-f197.google.com with SMTP id fp1sf4498722pdb.0 for ; Thu, 17 Apr 2014 23:14:02 -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=XJzEC2NUDqLr+yYQ60Y054ZKc0pmdT1d+pu5rKELZIA=; b=YRcDAhTnDR4jEE0KcHeBvchRkhYxgp52EXV361ojx5Pu5D5dtHS3JCV94cfuRy0WjK EuYC9h8ZNs3Q4h3ZIF8K8C2CE5Pa66Z4UinDwce1WV01Ls08FS1q1MfhcWP/SiUa9kqw BUjJ6N4aiFMkjNt64dRnlJAQ49Dx2d+VhToiQyk/knPXsfzXCgfNEQgyyha2cXbb/yTc PSePLFM57swFXkLKYmuWs4Un24QjL96NzegJs/Kd2w6RJ013v5OTxKD3Sb0T33QTlaz+ CebPrHWivZFgQC9qkde1xB4NQfhd6DcH2uDAEUq7CAJk6HRco3/W5TGZvFlVmTXjQwSH EoKg== X-Gm-Message-State: ALoCoQm7qREbr32Wclqme2DzjEiBWwtFEVcBT9lf0Zid4wpQEigr2fYPi28iySod08RvbyGHdpsk X-Received: by 10.66.173.75 with SMTP id bi11mr9990329pac.4.1397801642335; Thu, 17 Apr 2014 23:14:02 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.88.72 with SMTP id s66ls1470100qgd.11.gmail; Thu, 17 Apr 2014 23:14:02 -0700 (PDT) X-Received: by 10.220.190.197 with SMTP id dj5mr11482902vcb.19.1397801642224; Thu, 17 Apr 2014 23:14:02 -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 w5si4825269vcl.66.2014.04.17.23.14.02 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 17 Apr 2014 23:14:02 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.180; Received: by mail-ve0-f180.google.com with SMTP id jz11so2083719veb.39 for ; Thu, 17 Apr 2014 23:14:02 -0700 (PDT) X-Received: by 10.52.6.162 with SMTP id c2mr10494744vda.6.1397801642156; Thu, 17 Apr 2014 23:14:02 -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 ib8csp89471vcb; Thu, 17 Apr 2014 23:14:01 -0700 (PDT) X-Received: by 10.224.20.72 with SMTP id e8mr15932977qab.86.1397801641747; Thu, 17 Apr 2014 23:14:01 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id 63si4297604qgg.113.2014.04.17.23.14.01 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Apr 2014 23:14:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) 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 1Wb22n-0005GZ-7Y; Fri, 18 Apr 2014 06:13:01 +0000 Received: from mail-pd0-f180.google.com ([209.85.192.180]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wb22l-0004z8-DI for linux-arm-kernel@lists.infradead.org; Fri, 18 Apr 2014 06:12:59 +0000 Received: by mail-pd0-f180.google.com with SMTP id v10so1148274pde.11 for ; Thu, 17 Apr 2014 23:12:37 -0700 (PDT) X-Received: by 10.66.121.131 with SMTP id lk3mr20068544pab.61.1397801557094; Thu, 17 Apr 2014 23:12:37 -0700 (PDT) Received: from localhost.localdomain ([140.206.182.114]) by mx.google.com with ESMTPSA id tk5sm57498473pbc.63.2014.04.17.23.12.21 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 17 Apr 2014 23:12:36 -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, marc.zyngier@arm.com, christoffer.dall@linaro.org, Dave.Martin@arm.com, nicolas.pitre@linaro.org Subject: [PATCH v3 06/13] ARM: mcpm: support 4 clusters in HiP04 Date: Fri, 18 Apr 2014 14:05:49 +0800 Message-Id: <1397801156-25682-7-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1397801156-25682-1-git-send-email-haojian.zhuang@linaro.org> References: <1397801156-25682-1-git-send-email-haojian.zhuang@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140417_231259_469869_1636E61D X-CRM114-Status: UNSURE ( 9.86 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.3.2 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.192.180 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: 209.85.128.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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 16 Cortex-A15 cores are used in HiP04 SoC, enlarge the maximum clusters from 2 to 4 if HiP04 SoC is built without CONFIG_BIG_LITTLE. Signed-off-by: Haojian Zhuang --- arch/arm/Kconfig | 8 ++++++++ arch/arm/include/asm/mcpm.h | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9a2214e..f2a25be 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1571,6 +1571,14 @@ config MCPM for (multi-)cluster based systems, such as big.LITTLE based systems. +config MCPM_QUAD_CLUSTER + bool "Enable Quad clusters in MPCM" + depends on MCPM + default n + help + This option enables quad clusters in MCPM. Quad clusters exist + in HiP04 SoC. + config BIG_LITTLE bool "big.LITTLE support (Experimental)" depends on CPU_V7 && SMP diff --git a/arch/arm/include/asm/mcpm.h b/arch/arm/include/asm/mcpm.h index 608516e..fc8d70d 100644 --- a/arch/arm/include/asm/mcpm.h +++ b/arch/arm/include/asm/mcpm.h @@ -20,7 +20,12 @@ * to consider dynamic allocation. */ #define MAX_CPUS_PER_CLUSTER 4 + +#ifdef CONFIG_MCPM_QUAD_CLUSTER +#define MAX_NR_CLUSTERS 4 +#else #define MAX_NR_CLUSTERS 2 +#endif #ifndef __ASSEMBLY__