From patchwork Fri Apr 18 06:05:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haojian Zhuang X-Patchwork-Id: 4013161 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 1586C9F2BA for ; Fri, 18 Apr 2014 06:14:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4481320373 for ; Fri, 18 Apr 2014 06:14:56 +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 7970E20364 for ; Fri, 18 Apr 2014 06:14:55 +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 1Wb22n-0005GZ-7Y; Fri, 18 Apr 2014 06:13:01 +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 1Wb22l-0004z8-DI for linux-arm-kernel@lists.infradead.org; Fri, 18 Apr 2014 06:12:59 +0000 Received: by mail-pd0-f180.google.com with SMTP id v10so1148274pde.11 for ; Thu, 17 Apr 2014 23:12:37 -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=Qau6vOVlO1pavhE5xdWzsnnIRoGG8zL5f8gYslvFei0=; b=Kbt5Kl2hV9bAFW1bT6mQ6L/R/PD+gfIV09wgU4qmYAf2QOg+3yTcdnhTDsMUmmmq5v aNo2MF6eASphIBxLVEkgNh+jZjfzYmf8uUvxhuRtGiH/CPaT765mjgvzAtRy6KksDs29 NL35Gj44CdkEbFNLPOKK3616dyZ5Jcweh9TfRkvSl/2tKbWXfxJa6JKbTxEysBnzyimo oH7p+uupxIK6GotoqTRrFAQrX1tmvRf3+AzE9udVS2XkK7yPKVZVbBaubD011ylprGyx EyG600nUHCVL15zGiGywXyCNCuCpayD3Xs2RHOG6Jv/Wulrge17USAT7V144JLPNKw9D 4m+w== X-Gm-Message-State: ALoCoQkGodj25SNja+JGlyOp5bOrm2IbJESXn+7G3HnAzQf7Z+T0jCYJkk2VqzCtkCwv9N1aUQ9a X-Received: by 10.66.121.131 with SMTP id lk3mr20068544pab.61.1397801557094; Thu, 17 Apr 2014 23:12:37 -0700 (PDT) Received: from localhost.localdomain ([140.206.182.114]) by mx.google.com with ESMTPSA id tk5sm57498473pbc.63.2014.04.17.23.12.21 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 17 Apr 2014 23:12: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, marc.zyngier@arm.com, christoffer.dall@linaro.org, Dave.Martin@arm.com, nicolas.pitre@linaro.org Subject: [PATCH v3 06/13] ARM: mcpm: support 4 clusters in HiP04 Date: Fri, 18 Apr 2014 14:05:49 +0800 Message-Id: <1397801156-25682-7-git-send-email-haojian.zhuang@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1397801156-25682-1-git-send-email-haojian.zhuang@linaro.org> References: <1397801156-25682-1-git-send-email-haojian.zhuang@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140417_231259_469869_1636E61D X-CRM114-Status: UNSURE ( 9.86 ) X-CRM114-Notice: Please train this message. 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 Since 16 Cortex-A15 cores are used in HiP04 SoC, enlarge the maximum clusters from 2 to 4 if HiP04 SoC is built without CONFIG_BIG_LITTLE. Signed-off-by: Haojian Zhuang --- arch/arm/Kconfig | 8 ++++++++ arch/arm/include/asm/mcpm.h | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9a2214e..f2a25be 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1571,6 +1571,14 @@ config MCPM for (multi-)cluster based systems, such as big.LITTLE based systems. +config MCPM_QUAD_CLUSTER + bool "Enable Quad clusters in MPCM" + depends on MCPM + default n + help + This option enables quad clusters in MCPM. Quad clusters exist + in HiP04 SoC. + 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__