From patchwork Wed Jun 21 04:46:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 106037 Delivered-To: patch@linaro.org Received: by 10.140.91.2 with SMTP id y2csp1744156qgd; Tue, 20 Jun 2017 21:47:21 -0700 (PDT) X-Received: by 10.101.85.199 with SMTP id k7mr35694089pgs.172.1498020441451; Tue, 20 Jun 2017 21:47:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498020441; cv=none; d=google.com; s=arc-20160816; b=b2zeeOixkcDzyRib6VscDZzn8n5rJBCbZ7GEEQ/GWN348D6ttTBIy5VlV5rtMI1W6Y kKl/0Z0wVETmgwXBD8+23DwQ0gyx6argY0rK0D71ihWl9K/KO5Fi3h+ipyRaREOKmKZu j2sq3OTU8BoZYFxBEGcXELp/D+zLU3m+z9dSU4519sV5f5iPv2+8O151JTmvvR+JX+cg 0TmjsmFH3msMoRRt6WSWSqiS0O+sETIFrbYDfVAiZkQ6/tr83auEDSO/KuFByk5GTM/z w3fMb9gYJLcuxEwn72mUYQuY2crt+hBy05NWKZ6zq9aMxkdPTfsCIhh9unUONmg3hp/R QVxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=miVYgfFmF0t57Jw1a+CkapQkG1UMfTn9mvAECtEECAI=; b=brleEQPFhFddIYOR/+BAbmmYpUhjtbHgB6KLib14P6G8m9XzRgXx3sC39cf6uYBEm7 b7zsZkQNcLxHQ/PVY6X+ws43udN/neE0eECzSNk8yEf7rf4lnBIWddpnHdDlXFGbKZVx 5Kuu6fdXb2nCRCxlY4mza5cHA3cMKoG5u3+ZpLOEtyVk9IXbFX+YMsAjt5YdP5t2rxY8 sAthYQ5cQc+OYxbKXOooB8f140m+M90NFxL1FTTIOQqy21xcy3JBDbh26GIlNOKP+3CE mzMsgGf80Pdq0HYlimMCeQyY16vee1U1ckjYcDA5N74LXhJEToz402HPFws5RB8kWR4I 68QA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.b=KCgXGlrF; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c19si12534085pgk.501.2017.06.20.21.47.21; Tue, 20 Jun 2017 21:47:21 -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 header.b=KCgXGlrF; 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 S1753033AbdFUErL (ORCPT + 25 others); Wed, 21 Jun 2017 00:47:11 -0400 Received: from mail-pf0-f169.google.com ([209.85.192.169]:34794 "EHLO mail-pf0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752917AbdFUErI (ORCPT ); Wed, 21 Jun 2017 00:47:08 -0400 Received: by mail-pf0-f169.google.com with SMTP id s66so79587880pfs.1 for ; Tue, 20 Jun 2017 21:47:08 -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=miVYgfFmF0t57Jw1a+CkapQkG1UMfTn9mvAECtEECAI=; b=KCgXGlrFiMbXu1QHf8NvYV5JTufTnR+vCZDh+txiVvEfaGz9GEDWs5SCsGG6UwP0VH OwijC8CPfS21l9mE1cbR+2ldPUnO/8DoCmdZlppLR/mHpd7oQVj+jIpvIJdcrByoZ+AG R7zNMP7mD7c80A+FivINJyq5bhzejOtemHStY= 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=miVYgfFmF0t57Jw1a+CkapQkG1UMfTn9mvAECtEECAI=; b=Am6KcPma0of7s/vT0kutKkRizMxnNKrDpWr4Qk9MJc+PI/opAAtxMqZ+yfmPRncmQo 6sDp56EzDS8eoJnwEMRk5dtdFmFP1oXEPucXl7eY9qIhH77JRYSFGPfKGKNHLRnBLq/B IW8PmQbsZoj8gzwE0yjqkSPusxuAq//Dlsf6QSYPKWI8XFAShNnTswQC9hciDuTxzsNO Srr/2UIpZrgTdC+NDwPTgy3emFp14awBOzIaVM+0ENPAXBQ44NwBZcrcNFJtcKvRKWCC aIYuTcyV6RY8tvBqj+q5vpqpZGCZhIsqUYhiYuUC6h5UmWuB0o7dVRdQ6o63sc4DYPSF MsgA== X-Gm-Message-State: AKS2vOwhRtFjRXHAkI9emRWy8nnr+Gps0nxi7B8GzZtpt5Lea6TtfLAE 6OM845ZP+BZTisA1 X-Received: by 10.84.224.206 with SMTP id k14mr10073740pln.72.1498020427847; Tue, 20 Jun 2017 21:47:07 -0700 (PDT) Received: from localhost ([122.172.59.234]) by smtp.gmail.com with ESMTPSA id 66sm35409662pgh.59.2017.06.20.21.47.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Jun 2017 21:47:07 -0700 (PDT) From: Viresh Kumar To: Juri Lelli , Greg Kroah-Hartman Cc: Viresh Kumar , linux-arm-kernel@lists.infradead.org, Catalin Marinas , linux@arm.linux.org.uk, Will Deacon , Vincent Guittot , arnd.bergmann@linaro.org, linux-kernel@vger.kernel.org Subject: [PATCH V2 5/5] arch_topology: Localize cap_parsing_failed to topology_parse_cpu_capacity() Date: Wed, 21 Jun 2017 10:16:44 +0530 Message-Id: <49121c2925a65bc5a0f2be2542abf9a4be9becef.1498019799.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.13.0.71.gd7076ec9c9cb 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 cap_parsing_failed is only required in topology_parse_cpu_capacity() to know if we have already tried to allocate raw_capacity and failed, or if at least one of the cpu_node didn't had the required "capacity-dmips-mhz" property. All other users can use raw_capacity instead of cap_parsing_failed. Make sure we set raw_capacity to NULL after we free it. Signed-off-by: Viresh Kumar --- drivers/base/arch_topology.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) -- 2.13.0.71.gd7076ec9c9cb diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c index ff8713b83090..d8923f89724f 100644 --- a/drivers/base/arch_topology.c +++ b/drivers/base/arch_topology.c @@ -95,14 +95,21 @@ subsys_initcall(register_cpu_capacity_sysctl); static u32 capacity_scale; static u32 *raw_capacity; -static bool cap_parsing_failed; + +static int __init free_raw_capacity(void) +{ + kfree(raw_capacity); + raw_capacity = NULL; + + return 0; +} void topology_normalize_cpu_scale(void) { u64 capacity; int cpu; - if (!raw_capacity || cap_parsing_failed) + if (!raw_capacity) return; pr_debug("cpu_capacity: capacity_scale=%u\n", capacity_scale); @@ -121,6 +128,7 @@ void topology_normalize_cpu_scale(void) int __init topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu) { + static bool cap_parsing_failed; int ret; u32 cpu_capacity; @@ -151,7 +159,7 @@ int __init topology_parse_cpu_capacity(struct device_node *cpu_node, int cpu) pr_err("cpu_capacity: partial information: fallback to 1024 for all CPUs\n"); } cap_parsing_failed = true; - kfree(raw_capacity); + free_raw_capacity(); } return ret; @@ -170,7 +178,7 @@ init_cpu_capacity_callback(struct notifier_block *nb, struct cpufreq_policy *policy = data; int cpu; - if (cap_parsing_failed) + if (!raw_capacity) return 0; if (val != CPUFREQ_NOTIFY) @@ -190,9 +198,8 @@ init_cpu_capacity_callback(struct notifier_block *nb, if (cpumask_empty(cpus_to_visit)) { topology_normalize_cpu_scale(); - kfree(raw_capacity); + free_raw_capacity(); pr_debug("cpu_capacity: parsing done\n"); - cap_parsing_failed = true; schedule_work(&parsing_done_work); } @@ -232,11 +239,5 @@ static void parsing_done_workfn(struct work_struct *work) } #else -static int __init free_raw_capacity(void) -{ - kfree(raw_capacity); - - return 0; -} core_initcall(free_raw_capacity); #endif