From patchwork Mon May 18 05:13:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 48681 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 441BB21411 for ; Mon, 18 May 2015 05:16:42 +0000 (UTC) Received: by wgyu3 with SMTP id u3sf26409441wgy.3 for ; Sun, 17 May 2015 22:16:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:in-reply-to:references :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=TbDRLKC1usu2m/qn3Zloekvr+azi7IADbIj0pQbZKnM=; b=T8OtLFa4KCUgV2VJVfePdr6kHLHtlvST5msqdipZ6vH6qibTjFZ7tpo/6KZAl0WctN d9gWqKojRawNKg2ClkKGjfBE0Lvrn61Oz3GoBhbAQKBdbl1mZmnuPq/1S41EiNCxWscj FmBIhOGKqouOiuLx5Kyju3q7D2R3juVmjntLCLfQInTqtUdvjcY3rMQff448PFkQMTk1 R/1Ij9SXPBoKt/q2F/4hJzoBV/HEPEuDqmt270cBAqZGxNaue3dNqt/Tp454fqoj0T1k wYXl90vex53QY9rgFJh2vVvtBo7jUZT1iv8PcszmFnKMury7lM8ASBzNcNqfqyXmW7hn 5xMg== X-Gm-Message-State: ALoCoQngSfgmAoO4RwUy5XPPI/bj/IDZKCXARNZ/hBa6A70VT/85joOFnfgj23Z6j5MO63wuhoDb X-Received: by 10.112.118.162 with SMTP id kn2mr16629313lbb.22.1431926201083; Sun, 17 May 2015 22:16:41 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.196 with SMTP id u4ls718596lau.6.gmail; Sun, 17 May 2015 22:16:40 -0700 (PDT) X-Received: by 10.112.204.6 with SMTP id ku6mr8392481lbc.73.1431926200932; Sun, 17 May 2015 22:16:40 -0700 (PDT) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com. [209.85.215.50]) by mx.google.com with ESMTPS id zz9si5942765lbb.157.2015.05.17.22.16.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 May 2015 22:16:40 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by lagv1 with SMTP id v1so202131428lag.3 for ; Sun, 17 May 2015 22:16:40 -0700 (PDT) X-Received: by 10.153.6.36 with SMTP id cr4mr16315091lad.56.1431926200811; Sun, 17 May 2015 22:16:40 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.108.230 with SMTP id hn6csp3712407lbb; Sun, 17 May 2015 22:16:39 -0700 (PDT) X-Received: by 10.66.191.226 with SMTP id hb2mr41178155pac.72.1431926198721; Sun, 17 May 2015 22:16:38 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id iu9si2678127pbc.77.2015.05.17.22.16.36; Sun, 17 May 2015 22:16:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751142AbbERFOp (ORCPT + 11 others); Mon, 18 May 2015 01:14:45 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:35491 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751183AbbERFOo (ORCPT ); Mon, 18 May 2015 01:14:44 -0400 Received: by pacwv17 with SMTP id wv17so136037512pac.2 for ; Sun, 17 May 2015 22:14:44 -0700 (PDT) X-Received: by 10.68.221.6 with SMTP id qa6mr41163792pbc.62.1431926084278; Sun, 17 May 2015 22:14:44 -0700 (PDT) Received: from localhost ([122.167.226.34]) by mx.google.com with ESMTPSA id c10sm2099686pbu.81.2015.05.17.22.14.42 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 17 May 2015 22:14:43 -0700 (PDT) From: Viresh Kumar To: Rafael Wysocki Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org, sboyd@codeaurora.org, prarit@redhat.com, skannan@codeaurora.org, Srivatsa Bhat , Viresh Kumar Subject: [PATCH V5 14/14] cpufreq: Restart governor as soon as possible Date: Mon, 18 May 2015 10:43:37 +0530 Message-Id: <13d7278bf92d9c7b4c9a27264d1dd5cc2e350b05.1431924457.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.4.0 In-Reply-To: References: In-Reply-To: References: Sender: linux-pm-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: viresh.kumar@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , On cpu hot-unplug, we don't need to wait for POST_DEAD notification to restart the governor if the policy has atleast one online cpu left. We can restart the governor right from the DOWN_PREPARE notification instead. [ Something similar attempted by Saravana earlier ] Signed-off-by: Viresh Kumar --- drivers/cpufreq/cpufreq.c | 58 ++++++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 34 deletions(-) diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index b030432cbfad..8d64b5e74ab2 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1398,8 +1398,8 @@ static int cpufreq_add_dev(struct device *dev, struct subsys_interface *sif) static int __cpufreq_remove_dev_prepare(struct device *dev, struct subsys_interface *sif) { - unsigned int cpu = dev->id, cpus; - int ret; + unsigned int cpu = dev->id; + int ret = 0; struct cpufreq_policy *policy; pr_debug("%s: unregistering CPU %u\n", __func__, cpu); @@ -1419,26 +1419,33 @@ static int __cpufreq_remove_dev_prepare(struct device *dev, } down_write(&policy->rwsem); - cpus = cpumask_weight(policy->cpus); + cpumask_clear_cpu(cpu, policy->cpus); - if (has_target() && cpus == 1) - strncpy(policy->last_governor, policy->governor->name, - CPUFREQ_NAME_LEN); + if (policy_is_inactive(policy)) { + if (has_target()) + strncpy(policy->last_governor, policy->governor->name, + CPUFREQ_NAME_LEN); + } else if (cpu == policy->cpu) { + /* Nominate new CPU */ + policy->cpu = cpumask_any(policy->cpus); + } up_write(&policy->rwsem); - if (cpu != policy->cpu) - return 0; + /* Start governor again for active policy */ + if (!policy_is_inactive(policy)) { + if (has_target()) { + ret = __cpufreq_governor(policy, CPUFREQ_GOV_START); + if (!ret) + ret = __cpufreq_governor(policy, CPUFREQ_GOV_LIMITS); - if (cpus > 1) { - /* Nominate new CPU */ - down_write(&policy->rwsem); - policy->cpu = cpumask_any_but(policy->cpus, cpu); - up_write(&policy->rwsem); + if (ret) + pr_err("%s: Failed to start governor\n", __func__); + } } else if (cpufreq_driver->stop_cpu) { cpufreq_driver->stop_cpu(policy); } - return 0; + return ret; } static int __cpufreq_remove_dev_finish(struct device *dev, @@ -1446,33 +1453,16 @@ static int __cpufreq_remove_dev_finish(struct device *dev, { unsigned int cpu = dev->id; int ret; - struct cpufreq_policy *policy = cpufreq_cpu_get_raw(cpu); + struct cpufreq_policy *policy = per_cpu(cpufreq_cpu_data, cpu); if (!policy) { pr_debug("%s: No cpu_data found\n", __func__); return -EINVAL; } - down_write(&policy->rwsem); - cpumask_clear_cpu(cpu, policy->cpus); - up_write(&policy->rwsem); - - /* Not the last cpu of policy, start governor again ? */ - if (!policy_is_inactive(policy)) { - if (!has_target()) - return 0; - - ret = __cpufreq_governor(policy, CPUFREQ_GOV_START); - if (!ret) - ret = __cpufreq_governor(policy, CPUFREQ_GOV_LIMITS); - - if (ret) { - pr_err("%s: Failed to start governor\n", __func__); - return ret; - } - + /* Only proceed for inactive policies */ + if (!policy_is_inactive(policy)) return 0; - } /* If cpu is last user of policy, free policy */ if (has_target()) {