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: 4129051 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 125E99F3EE for ; Wed, 7 May 2014 14:49:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1A81C20259 for ; Wed, 7 May 2014 14:49:40 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 000FB20253 for ; Wed, 7 May 2014 14:49:38 +0000 (UTC) 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-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QcMN0BYpUg/2FOn4bCglXDUAwk6BJxVzMNSmJIJHJas=; b=G0TVeZ0cycUuzVrn51x1iCUAi+vqPOxxq9dbwDbwRSwSP+8RsWsb06D8j8Vu/laji9 SZFdQe8UTXU23YzUgQHq27ljzimjjCuzprc8iRd/YRazcb5wsa48MoYYEazslTDFKsdG pjew3hkSb2rzX5DgbqGH+8vXHnAGSHY2QmRSAoDSwdGUMMTOXPxL1mvE7W0mGj7Nc5+d Olp9Zv7BTxX8XUaclE+GEWFNLYNA0bzWzluGVrspiATMauP1u622Le/9Q0OvKvru9ut1 xH3blZU0MqKf6UyXPr2VQkTLj4F77J0biFLyapM6x+Meg1Hl+cOw13fs13cmAKvUd/hP TUMA== X-Gm-Message-State: ALoCoQlzso8yWqW8eDsJN4c4l8HwCP/M+PPD0o7QhiE4Ni0/qb1QY4PC3Z84nFQvhwdfyP2ooudY 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 (/) 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+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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__