From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752938AbcFVRE3 (ORCPT ); Wed, 22 Jun 2016 13:04:29 -0400 Received: from foss.arm.com ([217.140.101.70]:49352 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753223AbcFVRCt (ORCPT ); Wed, 22 Jun 2016 13:02:49 -0400 From: Morten Rasmussen To: peterz@infradead.org, mingo@redhat.com Cc: dietmar.eggemann@arm.com, yuyang.du@intel.com, vincent.guittot@linaro.org, mgalbraith@suse.de, linux-kernel@vger.kernel.org, Morten Rasmussen , Russell King Subject: [PATCH v2 12/13] arm: Set SD_ASYM_CPUCAPACITY for big.LITTLE platforms Date: Wed, 22 Jun 2016 18:03:23 +0100 Message-Id: <1466615004-3503-13-git-send-email-morten.rasmussen@arm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466615004-3503-1-git-send-email-morten.rasmussen@arm.com> References: <1466615004-3503-1-git-send-email-morten.rasmussen@arm.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Set the SD_ASYM_CPUCAPACITY flag for DIE and MC level sched_domains on big.LITTLE systems. cc: Russell King Signed-off-by: Morten Rasmussen --- arch/arm/kernel/topology.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c index ec279d161b32..ab6d9c1835a4 100644 --- a/arch/arm/kernel/topology.c +++ b/arch/arm/kernel/topology.c @@ -78,6 +78,7 @@ static unsigned long *__cpu_capacity; #define cpu_capacity(cpu) __cpu_capacity[cpu] static unsigned long middle_capacity = 1; +static unsigned int big_little; /* * Iterate all CPUs' descriptor in DT and compute the efficiency @@ -151,6 +152,8 @@ static void __init parse_dt_topology(void) middle_capacity = ((max_capacity / 3) >> (SCHED_CAPACITY_SHIFT-1)) + 1; + if (max_capacity && max_capacity != min_capacity) + big_little = 1; } /* @@ -277,15 +280,29 @@ void store_cpu_topology(unsigned int cpuid) static inline int cpu_corepower_flags(void) { - return SD_SHARE_PKG_RESOURCES | SD_SHARE_POWERDOMAIN; + int flags = SD_SHARE_PKG_RESOURCES | SD_SHARE_POWERDOMAIN; + + return big_little ? SD_ASYM_CPUCAPACITY | flags : flags; +} + +static inline int arm_cpu_core_flags(void) +{ + int flags = SD_SHARE_PKG_RESOURCES; + + return big_little ? SD_ASYM_CPUCAPACITY | flags : flags; +} + +static inline int arm_cpu_cpu_flags(void) +{ + return big_little ? SD_ASYM_CPUCAPACITY : 0; } static struct sched_domain_topology_level arm_topology[] = { #ifdef CONFIG_SCHED_MC { cpu_corepower_mask, cpu_corepower_flags, SD_INIT_NAME(GMC) }, - { cpu_coregroup_mask, cpu_core_flags, SD_INIT_NAME(MC) }, + { cpu_coregroup_mask, arm_cpu_core_flags, SD_INIT_NAME(MC) }, #endif - { cpu_cpu_mask, SD_INIT_NAME(DIE) }, + { cpu_cpu_mask, arm_cpu_cpu_flags, SD_INIT_NAME(DIE) }, { NULL, }, }; -- 1.9.1