From patchwork Sun May 11 08:06:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 29937 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 C7464208CF for ; Sun, 11 May 2014 08:09:16 +0000 (UTC) Received: by mail-pd0-f197.google.com with SMTP id g10sf25393833pdj.8 for ; Sun, 11 May 2014 01:09:16 -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=KpsB02YRAfakoKLL5LAtm7IAFMoTCvzqMy+vB9kFK4sTnRm8VMNj6enTXxW7fzk6ay 4VyOmqs9AtvaX5xxz+M35lcVH7WEgLcx5q5qQ825SBOZICXONflnX5bEzsP5uZOJvJQr 232BSA68X6jpX/vjjleLoqFmMAqnH24tGhkVHUaXXVNy96ssQyvv6wpqFT1W/ddrq5g0 p0kn+TNUNKlrOM2S4DM4vsdX4dX0wHmrV/Sf7VkeNqK1O923kfqcSnOdvfesVRFmEJum txFDT0ts5+jshjEBeIUQ2qIRQa+J3u2rIcdEQHaazS1YnMAIbLlwj78TC+vzRtK3Cli9 vY2w== X-Gm-Message-State: ALoCoQmin+jaj+IAGm0vfliHQ1mA7LsPYukvLUcpLSCdFk9gHIXA13l1ALH04xk/vEht0oTmWBOt X-Received: by 10.66.137.105 with SMTP id qh9mr8433850pab.30.1399795756065; Sun, 11 May 2014 01:09:16 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.29.225 with SMTP id b88ls202051qgb.32.gmail; Sun, 11 May 2014 01:09:15 -0700 (PDT) X-Received: by 10.58.107.65 with SMTP id ha1mr17365916veb.1.1399795755962; Sun, 11 May 2014 01:09:15 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id xc8si1533389vcb.126.2014.05.11.01.09.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 11 May 2014 01:09:15 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id lg15so7223571vcb.7 for ; Sun, 11 May 2014 01:09:15 -0700 (PDT) X-Received: by 10.52.185.105 with SMTP id fb9mr14331346vdc.12.1399795755896; Sun, 11 May 2014 01:09:15 -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 ib8csp128008vcb; Sun, 11 May 2014 01:09:15 -0700 (PDT) X-Received: by 10.224.47.130 with SMTP id n2mr28561135qaf.26.1399795755515; Sun, 11 May 2014 01:09:15 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id u15si4415332qga.38.2014.05.11.01.09.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 May 2014 01:09:15 -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 1WjOnV-0004Ty-Pk; Sun, 11 May 2014 08:07:49 +0000 Received: from mail-pd0-f178.google.com ([209.85.192.178]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WjOnL-0003m2-AP for linux-arm-kernel@lists.infradead.org; Sun, 11 May 2014 08:07:39 +0000 Received: by mail-pd0-f178.google.com with SMTP id r10so5376520pdi.23 for ; Sun, 11 May 2014 01:07:18 -0700 (PDT) X-Received: by 10.66.122.1 with SMTP id lo1mr41956501pab.118.1399795638123; Sun, 11 May 2014 01:07:18 -0700 (PDT) Received: from localhost.localdomain ([140.206.182.114]) by mx.google.com with ESMTPSA id i10sm32062137pat.36.2014.05.11.01.07.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 11 May 2014 01:07:16 -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 v6 04/15] ARM: mcpm: support 4 clusters Date: Sun, 11 May 2014 16:06:00 +0800 Message-Id: <1399795571-17231-5-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1399795571-17231-1-git-send-email-haojian.zhuang@linaro.org> References: <1399795571-17231-1-git-send-email-haojian.zhuang@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140511_010739_389165_BD469423 X-CRM114-Status: UNSURE ( 9.57 ) 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.178 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.220.176 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__