From patchwork Wed Apr 19 05:29:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 97598 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp159352qgf; Tue, 18 Apr 2017 22:31:36 -0700 (PDT) X-Received: by 10.99.123.72 with SMTP id k8mr1216838pgn.6.1492579896590; Tue, 18 Apr 2017 22:31:36 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t65si1299733pfg.280.2017.04.18.22.31.36; Tue, 18 Apr 2017 22:31:36 -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 S1759966AbdDSFbZ (ORCPT + 17 others); Wed, 19 Apr 2017 01:31:25 -0400 Received: from mail-pg0-f44.google.com ([74.125.83.44]:33592 "EHLO mail-pg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759927AbdDSFbS (ORCPT ); Wed, 19 Apr 2017 01:31:18 -0400 Received: by mail-pg0-f44.google.com with SMTP id 63so7412622pgh.0 for ; Tue, 18 Apr 2017 22:31:13 -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=hYyHMeC7VXANBPHeJx84iO9Kp1b9PHCjQsjW/GMkZMA=; b=bcu89A1tI+0HQg3aZ+sOTn/IDunAt/ByE2PV8UZe+CwWGpI/J2BcVCd3gm8emAoh8W UQJsNXYfE03h5g7Jz289d/02Lbyb+hjde5dxRl/cbt20rUrl/3BpBaY5RRfsxtqwt3Wd tSsbxvFZSzLyHQ3QMn8xOURRsAJlsEAxLrE3c= 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=hYyHMeC7VXANBPHeJx84iO9Kp1b9PHCjQsjW/GMkZMA=; b=EDDMUe1WfND+idqvFNwAh5k5pPoen08+alqhd6vM6fiUb3PTi0/zQGpCJfIdlsiPWb 2j0gHsHC+e6OG1wyvqjLsja64PU3lBztm2Y3TDjvtP04xhR6WLBNmCiuBc+Rtg4oO7Lc ibocMdjl2c5fu23jKPedvzzNugxEYFFbVM4jQqDmzX8hJ/Edr+K4USeT+ejIJIQh1Vlk pUO0fDiN952djesIc9GnsOvF+eLPbm128h8pWNoi+q4EoUXNnbz4kzgAY77alWp/9qMy mIffHxS62nd9Igk0yDpazKypJNMLESsNUWG+ZHVsUoGjDROZAA/QoHuOUcmJVGCXM94b Xoww== X-Gm-Message-State: AN3rC/6w4lqltiL7yaeEjeHc6df9U5Bb5TNPIsNC4KlWB2GeyjZzXMYP jDrpgSSKYWzRZtiV X-Received: by 10.99.114.80 with SMTP id c16mr1176203pgn.121.1492579868094; Tue, 18 Apr 2017 22:31:08 -0700 (PDT) Received: from localhost ([122.172.121.5]) by smtp.gmail.com with ESMTPSA id y184sm1671614pgb.33.2017.04.18.22.31.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Apr 2017 22:31:07 -0700 (PDT) From: Viresh Kumar To: Javi Merino , Zhang Rui , Eduardo Valentin , Lukasz Luba , Amit Daniel Kachhap , Viresh Kumar Cc: linaro-kernel@lists.linaro.org, Rafael Wysocki , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Vincent Guittot , Punit Agrawal Subject: [PATCH V3 10/17] thermal: cpu_cooling: OPPs are registered for all CPUs Date: Wed, 19 Apr 2017 10:59:05 +0530 Message-Id: X-Mailer: git-send-email 2.12.0.432.g71c3a4f4ba37 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 The OPPs are registered for all CPUs of a cpufreq policy now and we don't need to run the loop in build_dyn_power_table(). Just check for the policy->cpu and we should be fine. Signed-off-by: Viresh Kumar --- drivers/thermal/cpu_cooling.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) -- 2.12.0.432.g71c3a4f4ba37 diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c index 7dddc7443f5d..ce387f62c93e 100644 --- a/drivers/thermal/cpu_cooling.c +++ b/drivers/thermal/cpu_cooling.c @@ -83,7 +83,7 @@ struct power_table { * @dyn_power_table: array of struct power_table for frequency to power * conversion, sorted in ascending order. * @dyn_power_table_entries: number of entries in the @dyn_power_table array - * @cpu_dev: the first cpu_device from @allowed_cpus that has OPPs registered + * @cpu_dev: the cpu_device of policy->cpu. * @plat_get_static_power: callback to calculate the static power * * This structure is required for keeping information of each registered @@ -207,24 +207,20 @@ static int build_dyn_power_table(struct cpufreq_cooling_device *cpufreq_cdev, struct power_table *power_table; struct dev_pm_opp *opp; struct device *dev = NULL; - int num_opps = 0, cpu, i, ret = 0; + int num_opps = 0, cpu = cpufreq_cdev->policy->cpu, i, ret = 0; unsigned long freq; - for_each_cpu(cpu, &cpufreq_cdev->allowed_cpus) { - dev = get_cpu_device(cpu); - if (!dev) { - dev_warn(&cpufreq_cdev->cdev->device, - "No cpu device for cpu %d\n", cpu); - continue; - } - - num_opps = dev_pm_opp_get_opp_count(dev); - if (num_opps > 0) - break; - else if (num_opps < 0) - return num_opps; + dev = get_cpu_device(cpu); + if (unlikely(!dev)) { + dev_warn(&cpufreq_cdev->cdev->device, + "No cpu device for cpu %d\n", cpu); + return -ENODEV; } + num_opps = dev_pm_opp_get_opp_count(dev); + if (num_opps < 0) + return num_opps; + if (num_opps == 0) return -EINVAL;