From patchwork Mon Jun 8 12:55:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 49616 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D475521419 for ; Mon, 8 Jun 2015 12:56:44 +0000 (UTC) Received: by laboh3 with SMTP id oh3sf35545572lab.0 for ; Mon, 08 Jun 2015 05:56:43 -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=8lkjDdlFl6MJdv6i8wp/tFnrUjpAW/DSr4nFo50Atro=; b=FWLYbigCyJ94QR0OVTTGiyxGSFHcbwPZwzwXGg16c6JjbiF4zCfe6HZ13W6FsKP+IW tONGgGsE8Z3kELeZaS1KMWXLtNmpZHuDbQFwGT6s/b4+325WNrXoOgzikkLHSdPIej3w loYsOuLQePSngLHhrmGmDpEbKDiBPUXs3PBqwbNRY3cW+cTavem+X/TfIarBB9ildCqo bnnrgIG3/8DEPbe5mp5q1lRAOy6mzP9jObsd3sNhAxFVeEE07lGhlEw1J27tlqKja3e6 wIS64Fo7PW89UOc1DA0aPOiOwJhf1kMb3TqGfWEhagxojQxKWdfE56b1m0lcJ5518eox wOwg== X-Gm-Message-State: ALoCoQlkOsQsN5AVfDtxXDrPvTMpk2aXQBsKeKdD19FnVchPGtpryJgz4PaK5EOeE9cxtL0jDD77 X-Received: by 10.112.14.101 with SMTP id o5mr17006605lbc.3.1433768203865; Mon, 08 Jun 2015 05:56:43 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.170.138 with SMTP id am10ls562730lac.67.gmail; Mon, 08 Jun 2015 05:56:43 -0700 (PDT) X-Received: by 10.152.2.38 with SMTP id 6mr16897155lar.80.1433768203722; Mon, 08 Jun 2015 05:56:43 -0700 (PDT) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id is4si2645987lac.103.2015.06.08.05.56.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Jun 2015 05:56:43 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by labpy14 with SMTP id py14so96408230lab.0 for ; Mon, 08 Jun 2015 05:56:43 -0700 (PDT) X-Received: by 10.112.234.200 with SMTP id ug8mr16291527lbc.117.1433768203614; Mon, 08 Jun 2015 05:56:43 -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 hn6csp1845168lbb; Mon, 8 Jun 2015 05:56:42 -0700 (PDT) X-Received: by 10.66.141.48 with SMTP id rl16mr28658055pab.147.1433768199863; Mon, 08 Jun 2015 05:56:39 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id df1si4029496pad.84.2015.06.08.05.56.39; Mon, 08 Jun 2015 05:56:39 -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 S1753064AbbFHM4g (ORCPT + 11 others); Mon, 8 Jun 2015 08:56:36 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:34878 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753148AbbFHM4L (ORCPT ); Mon, 8 Jun 2015 08:56:11 -0400 Received: by pacyx8 with SMTP id yx8so59942654pac.2 for ; Mon, 08 Jun 2015 05:56:10 -0700 (PDT) X-Received: by 10.68.167.131 with SMTP id zo3mr29057893pbb.123.1433768170335; Mon, 08 Jun 2015 05:56:10 -0700 (PDT) Received: from localhost ([122.167.219.251]) by mx.google.com with ESMTPSA id os7sm2587491pdb.51.2015.06.08.05.56.08 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 08 Jun 2015 05:56:09 -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 V7 5/6] cpufreq: Restart governor as soon as possible Date: Mon, 8 Jun 2015 18:25:31 +0530 Message-Id: <5802c619494ba09e5c7621722e5a0778519c6a98.1433767914.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.52 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 | 59 +++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 33 deletions(-) diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index d3bd85263643..5f1c3366fb8e 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1431,8 +1431,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); @@ -1452,23 +1452,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 */ - update_policy_cpu(policy, cpumask_any_but(policy->cpus, cpu)); - else if (cpufreq_driver->stop_cpu) + 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, @@ -1476,33 +1486,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()) {