From patchwork Thu Mar 16 05:29:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 95381 Delivered-To: patch@linaro.org Received: by 10.140.89.134 with SMTP id v6csp660838qgd; Wed, 15 Mar 2017 22:31:08 -0700 (PDT) X-Received: by 10.99.49.13 with SMTP id x13mr5296230pgx.128.1489642268735; Wed, 15 Mar 2017 22:31:08 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d2si2965884pfk.113.2017.03.15.22.31.08; Wed, 15 Mar 2017 22:31:08 -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 S1751763AbdCPFat (ORCPT + 25 others); Thu, 16 Mar 2017 01:30:49 -0400 Received: from mail-pg0-f42.google.com ([74.125.83.42]:36176 "EHLO mail-pg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751722AbdCPFap (ORCPT ); Thu, 16 Mar 2017 01:30:45 -0400 Received: by mail-pg0-f42.google.com with SMTP id g2so19546817pge.3 for ; Wed, 15 Mar 2017 22:30:44 -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=GlzTatM5BBtgtVwJKIg5ErxQuKs6ZMm2CvfCbgjetiM=; b=RUE1W6jtxHMXdSnbNc8oiB2qkKiax5VVPQRpjZMvpZg8/kSvTEQRLE8ZOBR2488ZVm jOsYyNMieoImTtMkq/1fbkJoVM70DDjFiiznzObMkertwFSz3m4RAegGh5Jk56YJrOjd AmZrup1CgMjlY7gq9Q2Gv/TWXMhDm2LA4tTz0= 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=GlzTatM5BBtgtVwJKIg5ErxQuKs6ZMm2CvfCbgjetiM=; b=mFpDDFEg4VNgvmKG3t1qnQyc3qfC4OwHQMlfpLpSLVXrUQPcKKe31aVbL8Q93kRJll mVkmQu0Of2V/OCRJ+eL901VqE1tf8eUY13cZE3yb6vbjHJ0bO11v3vlwBCcbmQ/8MXv9 V+kwYu7pKY0MbcJCNo0HTwNudonfGD9BfpEWchyoZi6IRSjkGmMJa5V37uK5pKjc7jl4 r7j/3pERy0EHeBDOANiICkARMmXSISJsb36eZ7fewCKUlbLDItv5jH/VizUvXoFrrfnw 6jaY4jt8ncc8to4m7XljLwvU0iaPZUiyqvnvgL928UJixSwCd6p6pUGHYvBG8tUkNE7S QpYQ== X-Gm-Message-State: AFeK/H3GRBIdJlxAHeUAXa7YAznEtOFNy1IT+ulOt/f0XklI7LC3Xsnm+yeDyLNgiVu8UyX/ X-Received: by 10.99.173.69 with SMTP id y5mr7919976pgo.35.1489642239054; Wed, 15 Mar 2017 22:30:39 -0700 (PDT) Received: from localhost ([122.171.239.200]) by smtp.gmail.com with ESMTPSA id v186sm7441517pgv.44.2017.03.15.22.30.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Mar 2017 22:30:38 -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 13/17] thermal: cpu_cooling: create structure for idle time stats Date: Thu, 16 Mar 2017 10:59:48 +0530 Message-Id: <35e6886bbf741ed214416ab1d76dd46632888a66.1489640000.git.viresh.kumar@linaro.org> 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 We keep two arrays for idle time stats and allocate memory for them separately. It would be much easier to follow if we create an array of idle stats structure instead and allocate it once. Signed-off-by: Viresh Kumar --- drivers/thermal/cpu_cooling.c | 53 ++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 28 deletions(-) -- 2.7.1.410.g6faf27b diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c index 960135d85a71..69388a903706 100644 --- a/drivers/thermal/cpu_cooling.c +++ b/drivers/thermal/cpu_cooling.c @@ -62,6 +62,16 @@ struct freq_table { }; /** + * struct time_in_idle - Idle time stats + * @time: previous reading of the absolute time that this cpu was idle + * @timestamp: wall time of the last invocation of get_cpu_idle_time_us() + */ +struct time_in_idle { + u64 time; + u64 timestamp; +}; + +/** * struct cpufreq_cooling_device - data for cooling device with cpufreq * @id: unique integer value corresponding to each cpufreq_cooling_device * registered. @@ -76,9 +86,7 @@ struct freq_table { * cpufreq frequencies. * @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 - * @time_in_idle_timestamp: wall time of the last invocation of - * get_cpu_idle_time_us() + * @idle_time: idle time stats * @cpu_dev: the cpu_device of policy->cpu. * @plat_get_static_power: callback to calculate the static power * @@ -95,8 +103,7 @@ struct cpufreq_cooling_device { struct freq_table *freq_table; /* In descending order */ struct list_head node; u32 last_load; - u64 *time_in_idle; - u64 *time_in_idle_timestamp; + struct time_in_idle *idle_time; struct device *cpu_dev; get_static_t plat_get_static_power; }; @@ -297,18 +304,19 @@ static u32 get_load(struct cpufreq_cooling_device *cpufreq_dev, int cpu, { u32 load; u64 now, now_idle, delta_time, delta_idle; + struct time_in_idle *idle_time = &cpufreq_dev->idle_time[cpu_idx]; now_idle = get_cpu_idle_time(cpu, &now, 0); - delta_idle = now_idle - cpufreq_dev->time_in_idle[cpu_idx]; - delta_time = now - cpufreq_dev->time_in_idle_timestamp[cpu_idx]; + delta_idle = now_idle - idle_time->time; + delta_time = now - idle_time->timestamp; if (delta_time <= delta_idle) load = 0; else load = div64_u64(100 * (delta_time - delta_idle), delta_time); - cpufreq_dev->time_in_idle[cpu_idx] = now_idle; - cpufreq_dev->time_in_idle_timestamp[cpu_idx] = now; + idle_time->time = now_idle; + idle_time->timestamp = now; return load; } @@ -705,22 +713,14 @@ __cpufreq_cooling_register(struct device_node *np, return ERR_PTR(-ENOMEM); num_cpus = cpumask_weight(policy->related_cpus); - cpufreq_dev->time_in_idle = kcalloc(num_cpus, - sizeof(*cpufreq_dev->time_in_idle), - GFP_KERNEL); - if (!cpufreq_dev->time_in_idle) { + cpufreq_dev->idle_time = kcalloc(num_cpus, + sizeof(*cpufreq_dev->idle_time), + GFP_KERNEL); + if (!cpufreq_dev->idle_time) { cdev = ERR_PTR(-ENOMEM); goto free_cdev; } - cpufreq_dev->time_in_idle_timestamp = - kcalloc(num_cpus, sizeof(*cpufreq_dev->time_in_idle_timestamp), - GFP_KERNEL); - if (!cpufreq_dev->time_in_idle_timestamp) { - cdev = ERR_PTR(-ENOMEM); - goto free_time_in_idle; - } - /* max_level is an index, not a counter */ cpufreq_dev->max_level = i - 1; @@ -728,7 +728,7 @@ __cpufreq_cooling_register(struct device_node *np, GFP_KERNEL); if (!cpufreq_dev->freq_table) { cdev = ERR_PTR(-ENOMEM); - goto free_time_in_idle_timestamp; + goto free_idle_time; } if (capacitance) { @@ -791,10 +791,8 @@ __cpufreq_cooling_register(struct device_node *np, ida_simple_remove(&cpufreq_ida, cpufreq_dev->id); free_table: kfree(cpufreq_dev->freq_table); -free_time_in_idle_timestamp: - kfree(cpufreq_dev->time_in_idle_timestamp); -free_time_in_idle: - kfree(cpufreq_dev->time_in_idle); +free_idle_time: + kfree(cpufreq_dev->idle_time); free_cdev: kfree(cpufreq_dev); return cdev; @@ -935,8 +933,7 @@ void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev) thermal_cooling_device_unregister(cpufreq_dev->cdev); ida_simple_remove(&cpufreq_ida, cpufreq_dev->id); - kfree(cpufreq_dev->time_in_idle_timestamp); - kfree(cpufreq_dev->time_in_idle); + kfree(cpufreq_dev->idle_time); kfree(cpufreq_dev->freq_table); kfree(cpufreq_dev); }