From patchwork Thu Mar 16 05:29:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 95379 Delivered-To: patch@linaro.org Received: by 10.140.89.134 with SMTP id v6csp660751qgd; Wed, 15 Mar 2017 22:30:47 -0700 (PDT) X-Received: by 10.99.115.12 with SMTP id o12mr7934951pgc.165.1489642247829; Wed, 15 Mar 2017 22:30:47 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b189si4145766pga.296.2017.03.15.22.30.47; Wed, 15 Mar 2017 22:30:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751698AbdCPFam (ORCPT + 25 others); Thu, 16 Mar 2017 01:30:42 -0400 Received: from mail-pg0-f49.google.com ([74.125.83.49]:34047 "EHLO mail-pg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751659AbdCPFai (ORCPT ); Thu, 16 Mar 2017 01:30:38 -0400 Received: by mail-pg0-f49.google.com with SMTP id 141so19600619pgd.1 for ; Wed, 15 Mar 2017 22:30:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=u/n/G9DaXdEmSEJ2Dc+glzJTFTzTdQV/7ULdVTJO224=; b=IySGXHNtTep0R44tWjtMr5pzojBvt1g1f2wR+LcekInFP60prR9tustUZnTME8igEM SHY3N3BTIeLcrgXwpmSlMs9/fzB0u7eh0FNJ5FpF15qv70FFCVnRzZcJyR6pfcCEEhYi EglPneX5HTbE18O7Q7zIUlXzC5Ol7C1p70qsw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=u/n/G9DaXdEmSEJ2Dc+glzJTFTzTdQV/7ULdVTJO224=; b=lONvhEXkzzZPAwMwes6L6MeoapmOS4dGWiupnUQnqkn/6kuhxUWFgdbLkhkh0iGpbi lhU9QB2r6SXWaL2Q6htg6bVypLBgmcCqvX3gasybpy+6IO4TStVXvP8UaWwINwqnLn7+ bn9OjXeQ7AX6ZCpA4veafs469fj0UOF/hkUQtHlTyDb8Pn5XJklFrV2px54DtLl1Plgj maWOBWFw1HmNAOid8DpHQEBLElVhda291ZqKH1GrabFZ9uWtVCc2TaFN9vvzp/1VrkSX pLa+ymQsAH+wexPZc1pOV+X0C79+8lMibD9EwbthQig2Z6NrFe/m0AdwKLYEJeL7D3FT 9Zdg== X-Gm-Message-State: AFeK/H2THQx1RU8MD4S57YZnWq7jtfph1zvYbsXhZDU6sxfjmtaAYRDeoiBrouP4cfVOmyqy X-Received: by 10.98.105.134 with SMTP id e128mr7865952pfc.19.1489642232348; Wed, 15 Mar 2017 22:30:32 -0700 (PDT) Received: from localhost ([122.171.239.200]) by smtp.gmail.com with ESMTPSA id b76sm1902204pfd.90.2017.03.15.22.30.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Mar 2017 22:30:31 -0700 (PDT) From: Viresh Kumar To: Rafael Wysocki , Javi Merino , Zhang Rui , Eduardo Valentin , Amit Daniel Kachhap , Viresh Kumar Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Vincent Guittot Subject: [PATCH 11/17] thermal: cpu_cooling: get rid of 'allowed_cpus' Date: Thu, 16 Mar 2017 10:59:46 +0530 Message-Id: X-Mailer: git-send-email 2.7.1.410.g6faf27b In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 'allowed_cpus' is a copy of policy->related_cpus and can be replaced by it directly. At some places we are only concerned about online CPUs and policy->cpus can be used there. Signed-off-by: Viresh Kumar --- drivers/thermal/cpu_cooling.c | 77 ++++++++++++------------------------------- 1 file changed, 21 insertions(+), 56 deletions(-) -- 2.7.1.410.g6faf27b diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c index 1df6c9039e45..b7b193cb0e7a 100644 --- a/drivers/thermal/cpu_cooling.c +++ b/drivers/thermal/cpu_cooling.c @@ -74,7 +74,6 @@ struct power_table { * frequency. * @max_level: maximum cooling level. One less than total number of valid * cpufreq frequencies. - * @allowed_cpus: all the cpus involved for this cpufreq_cooling_device. * @node: list_head to link all cpufreq_cooling_device together. * @last_load: load measured by the latest call to cpufreq_get_requested_power() * @time_in_idle: previous reading of the absolute time that this cpu was idle @@ -97,7 +96,6 @@ struct cpufreq_cooling_device { unsigned int clipped_freq; unsigned int max_level; unsigned int *freq_table; /* In descending order */ - struct cpumask allowed_cpus; struct list_head node; u32 last_load; u64 *time_in_idle; @@ -162,7 +160,7 @@ static int cpufreq_thermal_notifier(struct notifier_block *nb, mutex_lock(&cooling_list_lock); list_for_each_entry(cpufreq_dev, &cpufreq_dev_list, node) { - if (!cpumask_test_cpu(policy->cpu, &cpufreq_dev->allowed_cpus)) + if (policy != cpufreq_dev->policy) continue; /* @@ -305,7 +303,7 @@ static u32 cpu_power_to_freq(struct cpufreq_cooling_device *cpufreq_dev, * get_load() - get load for a cpu since last updated * @cpufreq_dev: &struct cpufreq_cooling_device for this cpu * @cpu: cpu number - * @cpu_idx: index of the cpu in cpufreq_dev->allowed_cpus + * @cpu_idx: index of the cpu in time_in_idle* * * Return: The average load of cpu @cpu in percentage since this * function was last called. @@ -352,7 +350,7 @@ static int get_static_power(struct cpufreq_cooling_device *cpufreq_dev, { struct dev_pm_opp *opp; unsigned long voltage; - struct cpumask *cpumask = &cpufreq_dev->allowed_cpus; + struct cpumask *cpumask = cpufreq_dev->policy->related_cpus; unsigned long freq_hz = freq * 1000; if (!cpufreq_dev->plat_get_static_power || !cpufreq_dev->cpu_dev) { @@ -469,7 +467,7 @@ static int cpufreq_set_cur_state(struct thermal_cooling_device *cdev, cpufreq_dev->cpufreq_state = state; cpufreq_dev->clipped_freq = clip_freq; - cpufreq_update_policy(cpumask_any(&cpufreq_dev->allowed_cpus)); + cpufreq_update_policy(cpufreq_dev->policy->cpu); return 0; } @@ -505,28 +503,18 @@ static int cpufreq_get_requested_power(struct thermal_cooling_device *cdev, int i = 0, cpu, ret; u32 static_power, dynamic_power, total_load = 0; struct cpufreq_cooling_device *cpufreq_dev = cdev->devdata; + struct cpufreq_policy *policy = cpufreq_dev->policy; u32 *load_cpu = NULL; - cpu = cpumask_any_and(&cpufreq_dev->allowed_cpus, cpu_online_mask); - - /* - * All the CPUs are offline, thus the requested power by - * the cdev is 0 - */ - if (cpu >= nr_cpu_ids) { - *power = 0; - return 0; - } - - freq = cpufreq_quick_get(cpu); + freq = cpufreq_quick_get(policy->cpu); if (trace_thermal_power_cpu_get_power_enabled()) { - u32 ncpus = cpumask_weight(&cpufreq_dev->allowed_cpus); + u32 ncpus = cpumask_weight(policy->related_cpus); load_cpu = kcalloc(ncpus, sizeof(*load_cpu), GFP_KERNEL); } - for_each_cpu(cpu, &cpufreq_dev->allowed_cpus) { + for_each_cpu(cpu, policy->related_cpus) { u32 load; if (cpu_online(cpu)) @@ -551,9 +539,9 @@ static int cpufreq_get_requested_power(struct thermal_cooling_device *cdev, } if (load_cpu) { - trace_thermal_power_cpu_get_power( - &cpufreq_dev->allowed_cpus, - freq, load_cpu, i, dynamic_power, static_power); + trace_thermal_power_cpu_get_power(policy->related_cpus, freq, + load_cpu, i, dynamic_power, + static_power); kfree(load_cpu); } @@ -582,38 +570,22 @@ static int cpufreq_state2power(struct thermal_cooling_device *cdev, unsigned long state, u32 *power) { unsigned int freq, num_cpus; - cpumask_var_t cpumask; u32 static_power, dynamic_power; int ret; struct cpufreq_cooling_device *cpufreq_dev = cdev->devdata; - if (!alloc_cpumask_var(&cpumask, GFP_KERNEL)) - return -ENOMEM; - - cpumask_and(cpumask, &cpufreq_dev->allowed_cpus, cpu_online_mask); - num_cpus = cpumask_weight(cpumask); - - /* None of our cpus are online, so no power */ - if (num_cpus == 0) { - *power = 0; - ret = 0; - goto out; - } + num_cpus = cpumask_weight(cpufreq_dev->policy->cpus); freq = cpufreq_dev->freq_table[state]; - if (!freq) { - ret = -EINVAL; - goto out; - } + if (!freq) + return -EINVAL; dynamic_power = cpu_freq_to_power(cpufreq_dev, freq) * num_cpus; ret = get_static_power(cpufreq_dev, tz, freq, &static_power); if (ret) - goto out; + return ret; *power = static_power + dynamic_power; -out: - free_cpumask_var(cpumask); return ret; } @@ -641,19 +613,14 @@ static int cpufreq_power2state(struct thermal_cooling_device *cdev, struct thermal_zone_device *tz, u32 power, unsigned long *state) { - unsigned int cpu, cur_freq, target_freq; + unsigned int cur_freq, target_freq; int ret; s32 dyn_power; u32 last_load, normalised_power, static_power; struct cpufreq_cooling_device *cpufreq_dev = cdev->devdata; + struct cpufreq_policy *policy = cpufreq_dev->policy; - cpu = cpumask_any_and(&cpufreq_dev->allowed_cpus, cpu_online_mask); - - /* None of our cpus are online */ - if (cpu >= nr_cpu_ids) - return -ENODEV; - - cur_freq = cpufreq_quick_get(cpu); + cur_freq = cpufreq_quick_get(policy->cpu); ret = get_static_power(cpufreq_dev, tz, cur_freq, &static_power); if (ret) return ret; @@ -668,12 +635,12 @@ static int cpufreq_power2state(struct thermal_cooling_device *cdev, if (*state == THERMAL_CSTATE_INVALID) { dev_err_ratelimited(&cdev->device, "Failed to convert %dKHz for cpu %d into a cdev state\n", - target_freq, cpu); + target_freq, policy->cpu); return -EINVAL; } - trace_thermal_power_cpu_limit(&cpufreq_dev->allowed_cpus, - target_freq, *state, power); + trace_thermal_power_cpu_limit(policy->related_cpus, target_freq, *state, + power); return 0; } @@ -780,8 +747,6 @@ __cpufreq_cooling_register(struct device_node *np, goto free_time_in_idle_timestamp; } - cpumask_copy(&cpufreq_dev->allowed_cpus, policy->related_cpus); - if (capacitance) { cpufreq_dev->plat_get_static_power = plat_static_func;