From patchwork Thu Aug 7 10:51:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 35026 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f198.google.com (mail-vc0-f198.google.com [209.85.220.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 96E6C21137 for ; Thu, 7 Aug 2014 10:53:41 +0000 (UTC) Received: by mail-vc0-f198.google.com with SMTP id le20sf10806656vcb.1 for ; Thu, 07 Aug 2014 03:53:41 -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=BDXBrl5vC2KnNFWud/Jmp/DLZMdP38G4bHgIsMfEOps=; b=cf1oQ8f2y+d/ZQM+E6PLkAwQHMw0qGojqVE9ag33AUyUk6ZhfIjbM3bzvYajln4MZE 02sLdSYlvOVZbVHXdimZ/5J6tNJdu72YJwo6R5Ajka4J8ee4GtKTD1vdIY1yzPIOewFr nJIJa/uR6WUzaoKUanrSRIdvWkszWbqg1mSa702qeiUYOxv7eAqjxaj2VteBapjAg8ZS 35Lha441GRdCCtsq4LmTegSgxpnQog4+0l0AIHc5EW+8FUCTFdNZoWxA7pSRS9wZgpxH sSja9qMaWTnd0/KBY/TD/ArhBdGsgICQulqyomWiWujvbRsqEqU+G8lSYb1CqbYuuLBn kgew== X-Gm-Message-State: ALoCoQnJUuE6RxIkqa0AznKIJskijAaW3ek1du9CBc4XoPMJpEwkhSbIMqz3YDw/P+DrxtmglWwB X-Received: by 10.52.186.103 with SMTP id fj7mr1154583vdc.8.1407408821386; Thu, 07 Aug 2014 03:53:41 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.84.47 with SMTP id k44ls109270qgd.73.gmail; Thu, 07 Aug 2014 03:53:41 -0700 (PDT) X-Received: by 10.52.88.74 with SMTP id be10mr367116vdb.54.1407408821312; Thu, 07 Aug 2014 03:53:41 -0700 (PDT) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id r4si1633901vdr.12.2014.08.07.03.53.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 07 Aug 2014 03:53:41 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id lf12so5800997vcb.40 for ; Thu, 07 Aug 2014 03:53:41 -0700 (PDT) X-Received: by 10.220.95.132 with SMTP id d4mr15606671vcn.33.1407408821203; Thu, 07 Aug 2014 03:53:41 -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.221.37.5 with SMTP id tc5csp19499vcb; Thu, 7 Aug 2014 03:53:40 -0700 (PDT) X-Received: by 10.70.131.12 with SMTP id oi12mr17128998pdb.116.1407408819953; Thu, 07 Aug 2014 03:53:39 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id qb8si3183186pac.142.2014.08.07.03.53.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Aug 2014 03:53:39 -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 1XFLJL-0008Ii-Nz; Thu, 07 Aug 2014 10:52:43 +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 1XFLJG-0007qc-Pp for linux-arm-kernel@lists.infradead.org; Thu, 07 Aug 2014 10:52:39 +0000 Received: by mail-pd0-f180.google.com with SMTP id v10so3300629pde.11 for ; Thu, 07 Aug 2014 03:52:18 -0700 (PDT) X-Received: by 10.70.38.134 with SMTP id g6mr16939228pdk.135.1407408737829; Thu, 07 Aug 2014 03:52:17 -0700 (PDT) Received: from localhost.localdomain ([61.172.253.147]) by mx.google.com with ESMTPSA id k9sm5937741pdo.28.2014.08.07.03.52.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Aug 2014 03:52:17 -0700 (PDT) From: Haojian Zhuang To: nicolas.pitre@linaro.org, arnd@arndb.de, olof@lixom.net, marc.zyngier@arm.com, jason@lakedaemon.net, linux-arm-kernel@lists.infradead.org, khilman@linaro.org, xuwei5@hisilicon.com Subject: [PATCH v17 1/9] ARM: mcpm: support 4 clusters Date: Thu, 7 Aug 2014 18:51:27 +0800 Message-Id: <1407408695-19626-2-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1407408695-19626-1-git-send-email-haojian.zhuang@linaro.org> References: <1407408695-19626-1-git-send-email-haojian.zhuang@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140807_035238_866442_FC844712 X-CRM114-Status: GOOD ( 10.14 ) X-Spam-Score: -1.4 (-) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-1.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.192.180 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.192.180 listed in wl.mailspike.net] Cc: Haojian Zhuang X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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.181 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 87b63fd..10cc6ec 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1490,6 +1490,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 d9702eb..a4fbacc 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__