From patchwork Mon Apr 28 06:53:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 29178 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f200.google.com (mail-ig0-f200.google.com [209.85.213.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 579BE202FE for ; Mon, 28 Apr 2014 06:56:59 +0000 (UTC) Received: by mail-ig0-f200.google.com with SMTP id l13sf15651101iga.3 for ; Sun, 27 Apr 2014 23:56:58 -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=UlBW5sqkX3NMatlQD3bPbUAw4jy7a5jVRD50dGNxBOU=; b=H4gS+wC5ScgIMuTXccvrXnYWk3tm9eekT6raQIE9igkreKOr/tLWRliCveBRNyBAcU 35DtPZnndOGBek8eOKgsoTWMH2foufQdBZR2M1yP4UNqUJ0YjqridNRKLvAPLFhhc3ao 7tnZTG+WRkbRrBlSmJva820gO3QvGb5G4mbrKT93hwR9/5tp0rXMpTNSSSKO7ffFU2dG OtWcMkuUD4DN5SYDhWIcMHpbgayZV4jK4jWjW+l8HhoE8GB/Uo3UUj/59+MRfZ6V6feD GlwbdqFO5/vNJn3ohn8FiwKNCIW5yxlVv02/dMqve8XeQWojX96Q3Xjgmfn4c/TuE6dV svWg== X-Gm-Message-State: ALoCoQknTo1wrwPRA18vjWwb4xQPc51WBVemU7f8Vu6LxjE3zG9GzGM21Yfimp+jGkljSS34LcEZ X-Received: by 10.42.211.15 with SMTP id gm15mr10821903icb.28.1398668218772; Sun, 27 Apr 2014 23:56:58 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.21.40 with SMTP id 37ls2334165qgk.32.gmail; Sun, 27 Apr 2014 23:56:58 -0700 (PDT) X-Received: by 10.220.81.194 with SMTP id y2mr28084vck.29.1398668218637; Sun, 27 Apr 2014 23:56:58 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id fx7si3433853vcb.45.2014.04.27.23.56.58 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 27 Apr 2014 23:56:58 -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.180; Received: by mail-vc0-f180.google.com with SMTP id hq16so4930024vcb.25 for ; Sun, 27 Apr 2014 23:56:58 -0700 (PDT) X-Received: by 10.58.126.4 with SMTP id mu4mr22674551veb.0.1398668218562; Sun, 27 Apr 2014 23:56:58 -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 ib8csp95407vcb; Sun, 27 Apr 2014 23:56:58 -0700 (PDT) X-Received: by 10.224.168.206 with SMTP id v14mr17702614qay.40.1398668218105; Sun, 27 Apr 2014 23:56:58 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id s6si7322505qaj.269.2014.04.27.23.56.57 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 27 Apr 2014 23:56:58 -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 1WefTQ-0000lG-24; Mon, 28 Apr 2014 06:55:32 +0000 Received: from mail-pd0-f173.google.com ([209.85.192.173]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WefTI-0000BZ-Vl for linux-arm-kernel@lists.infradead.org; Mon, 28 Apr 2014 06:55:25 +0000 Received: by mail-pd0-f173.google.com with SMTP id p10so5048495pdj.18 for ; Sun, 27 Apr 2014 23:55:04 -0700 (PDT) X-Received: by 10.68.133.229 with SMTP id pf5mr23379230pbb.115.1398668104144; Sun, 27 Apr 2014 23:55:04 -0700 (PDT) Received: from localhost.localdomain ([140.206.182.114]) by mx.google.com with ESMTPSA id sy2sm32699307pbc.28.2014.04.27.23.54.55 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 27 Apr 2014 23:55:03 -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 v4 06/14] ARM: mcpm: support 4 clusters Date: Mon, 28 Apr 2014 14:53:44 +0800 Message-Id: <1398668032-8335-7-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1398668032-8335-1-git-send-email-haojian.zhuang@linaro.org> References: <1398668032-8335-1-git-send-email-haojian.zhuang@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140427_235525_040244_9D4431EE X-CRM114-Status: UNSURE ( 9.48 ) 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.173 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 --- arch/arm/Kconfig | 6 ++++++ arch/arm/include/asm/mcpm.h | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5ef96ea..58e995d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1572,6 +1572,12 @@ 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 + This option enables quad clusters in MCPM. + 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__