From patchwork Wed May 7 14:44:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 29777 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yk0-f200.google.com (mail-yk0-f200.google.com [209.85.160.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 79070202E4 for ; Wed, 7 May 2014 14:48:51 +0000 (UTC) Received: by mail-yk0-f200.google.com with SMTP id q9sf2274141ykb.7 for ; Wed, 07 May 2014 07:48:51 -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=c2KIVDpGoRHMMGcsLnH11CRBQrVhiKQ9L5WJI0z/N64=; b=eK6dj/j3xC/ewdm1hiEEXmxSeCWWh1uvyu3m3cUklnG5h42/lDHGejKOBvBCDM9rSU 1mqGnuYinmqXNslbHKLzhvm/AFm2OQouKieBnfuYrLhELbcmx5LTImaKyrmJLSksL8Rr NpyronuCsqldmPzhnM4UeZiPAGOAQBR0zGz3+YSJWLbiRXpdZ0KYl9eQEsVjqgjg1mdN +NfOmqieUcKoxdXOe82RQ8VryQj+CqEhTNIwhKJV2e6J9zJAB55mA1Hy96HrbEsWwO28 H3Y6fM/Kmee6//pmVTJ/GcX0xCMNwwYGJ1l1INVXgeNWfZYGve/FC9lNnX4Ew29GgYUp phuw== X-Gm-Message-State: ALoCoQl76J9s6L2Lp5Rk1qJDb6jP5zZ1WA6KTqRlqGt2xdQ5UmXgV63l2doKqC3r+lvmjDyL1hLe X-Received: by 10.52.165.179 with SMTP id yz19mr3981134vdb.1.1399474131189; Wed, 07 May 2014 07:48:51 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.97.200 with SMTP id m66ls3297289qge.83.gmail; Wed, 07 May 2014 07:48:51 -0700 (PDT) X-Received: by 10.52.134.202 with SMTP id pm10mr900934vdb.55.1399474131015; Wed, 07 May 2014 07:48:51 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id i19si2952669vco.55.2014.05.07.07.48.51 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 07 May 2014 07:48:51 -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.220.169; Received: by mail-vc0-f169.google.com with SMTP id ij19so1451199vcb.0 for ; Wed, 07 May 2014 07:48:50 -0700 (PDT) X-Received: by 10.53.1.69 with SMTP id be5mr11688655vdd.27.1399474130935; Wed, 07 May 2014 07:48:50 -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 ib8csp315736vcb; Wed, 7 May 2014 07:48:49 -0700 (PDT) X-Received: by 10.224.164.197 with SMTP id f5mr19063941qay.32.1399474129324; Wed, 07 May 2014 07:48:49 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id g4si57332qai.212.2014.05.07.07.48.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 May 2014 07:48:49 -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 1Wi37q-0006Jp-6f; Wed, 07 May 2014 14:47:14 +0000 Received: from mail-pd0-f171.google.com ([209.85.192.171]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wi37L-0005bD-0l for linux-arm-kernel@lists.infradead.org; Wed, 07 May 2014 14:46:43 +0000 Received: by mail-pd0-f171.google.com with SMTP id r10so1158150pdi.30 for ; Wed, 07 May 2014 07:46:21 -0700 (PDT) X-Received: by 10.66.150.228 with SMTP id ul4mr19847706pab.16.1399473981089; Wed, 07 May 2014 07:46:21 -0700 (PDT) Received: from localhost.localdomain ([140.206.182.114]) by mx.google.com with ESMTPSA id nw13sm115484380pab.37.2014.05.07.07.46.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 May 2014 07:46:20 -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 06/14] ARM: mcpm: support 4 clusters Date: Wed, 7 May 2014 22:44:40 +0800 Message-Id: <1399473888-12947-7-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_074643_113246_5C60FDA5 X-CRM114-Status: GOOD ( 10.20 ) 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.171 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 Add the CONFIG_MCPM_QUAD_CLUSTER configuration to enlarge cluster number from 2 to 4. Signed-off-by: Haojian Zhuang Reviewed-by: Nicolas Pitre --- arch/arm/Kconfig | 9 +++++++++ arch/arm/include/asm/mcpm.h | 5 +++++ 2 files changed, 14 insertions(+) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 0e52a2c..624829f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1575,6 +1575,15 @@ config MCPM for (multi-)cluster based systems, such as big.LITTLE based systems. +config MCPM_QUAD_CLUSTER + bool "Enable Quad clusters in MCPM" + depends on MCPM + help + To avoid wasting resources unnecessarily, MCPM only supports up + to 2 clusters by default. + Platforms with 3 or 4 clusters that use MCPM must select this + option to allow the additional clusters to be managed. + 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__