From patchwork Tue May 20 13:10:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 30433 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yk0-f198.google.com (mail-yk0-f198.google.com [209.85.160.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 864BC20C03 for ; Tue, 20 May 2014 13:13:40 +0000 (UTC) Received: by mail-yk0-f198.google.com with SMTP id 9sf927116ykp.5 for ; Tue, 20 May 2014 06:13:40 -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=HqLg8hCKDtt0zjRmD9iJT8ST2cgvnXo/QTCZYd6kVd4=; b=We+ZGpurD8IrbB+KsJMeuA5VqgLOOtM082sg1m03YHyvvrnfxqRCVzIy2HoNeIfVHy oOmiHtlHC74CVo155He2pjP3Bxe6Aia4rfsGzKk2pgtCr+0V+z3m4tgfea7MzxuLVtf8 JGJ7HCfDNfrePvO8I3RoBfoAcxMkuxWlhSoU5cUDjmZiscconQJPZeI80T0ADhVe+YFO A34R2eZWG4n9Uoemne6dTmGnUXG5QL3NHikHL7x5L2ZDgiFYlACAy0FpBBmaq9QQU/tR l7/lCTXVFGSNwRhlKHjWfoHzJmeeq73CGvv+hOZwMcA4kWp6HzV4It7uYq168j3wlSgs A9cw== X-Gm-Message-State: ALoCoQk+1+yQXH3UGzCLALYA8Czn/28L424mTcT6YAjaeZr3T2UunoQimM4Leq2ZhpDTpKhCFI45 X-Received: by 10.236.175.42 with SMTP id y30mr16829596yhl.42.1400591620367; Tue, 20 May 2014 06:13:40 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.40.209 with SMTP id x75ls282291qgx.46.gmail; Tue, 20 May 2014 06:13:40 -0700 (PDT) X-Received: by 10.220.50.18 with SMTP id x18mr343274vcf.66.1400591620221; Tue, 20 May 2014 06:13:40 -0700 (PDT) Received: from mail-ve0-f182.google.com (mail-ve0-f182.google.com [209.85.128.182]) by mx.google.com with ESMTPS id iz10si4953007vec.6.2014.05.20.06.13.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 20 May 2014 06:13:40 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.182 as permitted sender) client-ip=209.85.128.182; Received: by mail-ve0-f182.google.com with SMTP id sa20so555608veb.13 for ; Tue, 20 May 2014 06:13:40 -0700 (PDT) X-Received: by 10.52.2.229 with SMTP id 5mr3077119vdx.24.1400591620144; Tue, 20 May 2014 06:13:40 -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 ib8csp29541vcb; Tue, 20 May 2014 06:13:39 -0700 (PDT) X-Received: by 10.140.20.144 with SMTP id 16mr13713987qgj.114.1400591618894; Tue, 20 May 2014 06:13:38 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id k8si1274388qca.24.2014.05.20.06.13.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 May 2014 06:13:38 -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 1Wmjpo-0002yU-V8; Tue, 20 May 2014 13:12:00 +0000 Received: from mail-pa0-f41.google.com ([209.85.220.41]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wmjpm-0002nB-NY for linux-arm-kernel@lists.infradead.org; Tue, 20 May 2014 13:11:59 +0000 Received: by mail-pa0-f41.google.com with SMTP id lj1so313333pab.14 for ; Tue, 20 May 2014 06:11:38 -0700 (PDT) X-Received: by 10.66.177.102 with SMTP id cp6mr50233123pac.57.1400591498214; Tue, 20 May 2014 06:11:38 -0700 (PDT) Received: from localhost.localdomain ([140.206.182.114]) by mx.google.com with ESMTPSA id av4sm31085722pac.8.2014.05.20.06.11.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 20 May 2014 06:11: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, christoffer.dall@linaro.org, Dave.Martin@arm.com, nicolas.pitre@linaro.org, marc.zyngier@arm.com, jason@lakedaemon.net Subject: [PATCH v9 03/14] ARM: mcpm: support 4 clusters Date: Tue, 20 May 2014 21:10:16 +0800 Message-Id: <1400591427-21922-4-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1400591427-21922-1-git-send-email-haojian.zhuang@linaro.org> References: <1400591427-21922-1-git-send-email-haojian.zhuang@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140520_061158_782406_0A81BAC0 X-CRM114-Status: GOOD ( 10.02 ) 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.41 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 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=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.182 as permitted sender) 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 ab438cb..6ce4a49 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1564,6 +1564,15 @@ config MCPM for (multi-)cluster based systems, such as big.LITTLE based systems. +config MCPM_QUAD_CLUSTER + bool + 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__