From patchwork Fri May 8 06:23:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 48157 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5D8F42121F for ; Fri, 8 May 2015 06:25:29 +0000 (UTC) Received: by wiun10 with SMTP id n10sf4264148wiu.1 for ; Thu, 07 May 2015 23:25:28 -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=fZdOqnRzZPPnm1Udhx/0jseqFztelwJ2eIQWnOc5eMk=; b=RYWHe0b4ZKA+mzijhLG1r/KSQC/t2cnn58d6pRmOJNFymW5MkWodpcX1B5QGCgjkXZ KcBr/hmaVDjR6AXr8nrBWjVZBX8MEUu7VMiDh4hYah6zEZ2Z0Nux6lfeWZEqsbb4JIEO NOXQFFqyfQhRYE49WQkLqTC4/4um0DbMdZjLvGNyLki7TZQ6SEkJKtuT9Ek9jQB80LwK BNbZvbL9QodcO2iF7Z2YTgEX4llTkrYkzjfmDYu3AlxfxCUXsnxLxqPB+GiRqqug9L3/ HdWAYUVNzLrZuo2etuWslys38KCkj3/NGx0XGsWmQzLh6WwNLW0u8tqm3Dz5uv0nUBDl Eaxg== X-Gm-Message-State: ALoCoQl1ytVdNjdeJYyY6zN3xAUBNMfySGZbd39e9rfRhg0jnah3SJ4Rzr8UjFsr0q0eTWYNioqZ X-Received: by 10.112.26.5 with SMTP id h5mr1246508lbg.4.1431066328662; Thu, 07 May 2015 23:25:28 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.2.70 with SMTP id 6ls276871las.14.gmail; Thu, 07 May 2015 23:25:28 -0700 (PDT) X-Received: by 10.112.139.1 with SMTP id qu1mr1722664lbb.8.1431066328512; Thu, 07 May 2015 23:25:28 -0700 (PDT) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id pc6si2660243lbc.178.2015.05.07.23.25.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 May 2015 23:25:28 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by layy10 with SMTP id y10so46037608lay.0 for ; Thu, 07 May 2015 23:25:28 -0700 (PDT) X-Received: by 10.153.6.36 with SMTP id cr4mr1748661lad.56.1431066328202; Thu, 07 May 2015 23:25:28 -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 hn6csp269434lbb; Thu, 7 May 2015 23:25:27 -0700 (PDT) X-Received: by 10.68.223.165 with SMTP id qv5mr4002405pbc.82.1431066326467; Thu, 07 May 2015 23:25:26 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t17si5783046pdi.227.2015.05.07.23.25.25; Thu, 07 May 2015 23:25:26 -0700 (PDT) Received-SPF: none (google.com: linux-pm-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751512AbbEHGZZ (ORCPT + 11 others); Fri, 8 May 2015 02:25:25 -0400 Received: from mail-pd0-f181.google.com ([209.85.192.181]:34254 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750994AbbEHGZY (ORCPT ); Fri, 8 May 2015 02:25:24 -0400 Received: by pdbqa5 with SMTP id qa5so66468320pdb.1 for ; Thu, 07 May 2015 23:25:24 -0700 (PDT) X-Received: by 10.67.6.231 with SMTP id cx7mr3905676pad.79.1431066303857; Thu, 07 May 2015 23:25:03 -0700 (PDT) Received: from localhost ([122.172.243.237]) by mx.google.com with ESMTPSA id dp4sm1665546pbb.82.2015.05.07.23.25.02 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 07 May 2015 23:25:03 -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 V3 13/14] cpufreq: Restart governor as soon as possible Date: Fri, 8 May 2015 11:53:56 +0530 Message-Id: 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.47 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 6f08b70de21f..6bbc7b112e7a 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1395,8 +1395,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); @@ -1416,26 +1416,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, @@ -1443,33 +1450,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()) {