From patchwork Fri Aug 16 02:24:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 267539 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 385392C0237 for ; Fri, 16 Aug 2013 12:26:10 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753599Ab3HPC0B (ORCPT ); Thu, 15 Aug 2013 22:26:01 -0400 Received: from mail-pb0-f43.google.com ([209.85.160.43]:50275 "EHLO mail-pb0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753921Ab3HPCZ6 (ORCPT ); Thu, 15 Aug 2013 22:25:58 -0400 Received: by mail-pb0-f43.google.com with SMTP id md4so1467687pbc.2 for ; Thu, 15 Aug 2013 19:25:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=fg8KA7o/qPQzvOxetAtwbUN56rk/3HlnVJUwuiu+U3g=; b=kO1NBiWLsKCS/DOkWn2IYvicEjQjoGAUvIyWy+di96MeWJiOqPPh8kXzJZZ+QiG4WK rNvVLEpKZYJ5bLKZEr8qKAUV3L4hWPbZ2sHgBz0XOFb4YlH/yEvyTtEpbEzhi6Vqk0X4 V1Zwz2VshDMW515mEmKGtsjcQhUtWtfG8SxH2Vlr+8gGdirQpt1JkCY/QKc60pVZ/oX5 t5u/XzEnDCQfN8hMeKUi4K6rVSrqXQ9nno3V/DPfSOgY3oWmon4eS7NwOh1J8nYJ6lcd bHYgybuEicwKLnrFJlNnsQT3+IOlJPcYpSUyY4jhqzh3U2n2/mOSa3sF+rtbvkH/QrWI RgIQ== X-Gm-Message-State: ALoCoQnYjtXKGDnScLikiMbB4gySM9NGxmCKeaMOe0s1feZ/d9+ne2OgdLZYOXDk9oLNVZPLRJpO X-Received: by 10.68.219.33 with SMTP id pl1mr11594198pbc.147.1376619958264; Thu, 15 Aug 2013 19:25:58 -0700 (PDT) Received: from localhost ([122.172.193.46]) by mx.google.com with ESMTPSA id om2sm2685749pbc.30.2013.08.15.19.25.49 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 15 Aug 2013 19:25:57 -0700 (PDT) From: Viresh Kumar To: rjw@sisk.pl Cc: linaro-kernel@lists.linaro.org, patches@linaro.org, cpufreq@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Viresh Kumar , Andrew Lunn , "David S. Miller" , Dmitry Eremin-Solenikov , Eric Miao , Hans-Christian Egtvedt , Jesper Nilsson , John Crispin , Kukjin Kim , Linus Walleij , linux-cris-kernel@axis.com, Mikael Starvik , Russell King , Santosh Shilimkar , Sekhar Nori , Shawn Guo , sparclinux@vger.kernel.org, spear-devel@list.st.com, Stephen Warren , Steven Miao , Tony Luck Subject: [PATCH 01/34] cpufreq: move freq change notifications to cpufreq core Date: Fri, 16 Aug 2013 07:54:58 +0530 Message-Id: <8d083bb5c2d167aa0b52f48c3f17a1320b3e0249.1376619363.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 1.7.12.rc2.18.g61b472e In-Reply-To: References: In-Reply-To: References: Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org Most of the drivers do following in their ->target_index() routines: struct cpufreq_freqs freqs; freqs.old = old freq... freqs.new = new freq... cpufreq_notify_transition(policy, &freqs, CPUFREQ_PRECHANGE); /* Change rate here */ cpufreq_notify_transition(policy, &freqs, CPUFREQ_POSTCHANGE); This is replicated over all cpufreq drivers today and there doesn't exists a good enough reason why this shouldn't be moved to cpufreq core instead. There are few special cases though, like exynos5440, which doesn't do everything on the call to ->target_index() routine and call some kind of bottom halves for doing this work, work/tasklet/etc.. They may continue doing notification from their own code and so this patch introduces another flag: CPUFREQ_NO_NOTIFICATION, which will be set by such drivers. Cc: Andrew Lunn Cc: David S. Miller Cc: Dmitry Eremin-Solenikov Cc: Eric Miao Cc: Hans-Christian Egtvedt Cc: Jesper Nilsson Cc: John Crispin Cc: Kukjin Kim Cc: Linus Walleij Cc: linux-cris-kernel@axis.com Cc: Mikael Starvik Cc: Russell King Cc: Santosh Shilimkar Cc: Sekhar Nori Cc: Shawn Guo Cc: sparclinux@vger.kernel.org Cc: spear-devel@list.st.com Cc: Stephen Warren Cc: Steven Miao Cc: Tony Luck Signed-off-by: Viresh Kumar --- drivers/cpufreq/cpufreq.c | 34 ++++++++++++++++++++++++++++++++++ include/linux/cpufreq.h | 6 ++++++ 2 files changed, 40 insertions(+) diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index a7a1d3e..2782949 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1673,6 +1673,9 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy, retval = cpufreq_driver->target(policy, target_freq, relation); else if (cpufreq_driver->target_index) { struct cpufreq_frequency_table *freq_table; + struct cpufreq_freqs freqs; + unsigned long flags; + bool notify; int index; freq_table = cpufreq_frequency_get_table(policy->cpu); @@ -1691,7 +1694,38 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy, if (freq_table[index].frequency == policy->cur) return 0; + read_lock_irqsave(&cpufreq_driver_lock, flags); + notify = !(cpufreq_driver->flags | CPUFREQ_NO_NOTIFICATION); + read_unlock_irqrestore(&cpufreq_driver_lock, flags); + + if (notify) { + freqs.old = policy->cur; + freqs.new = freq_table[index].frequency; + + pr_debug("%s: cpu: %d, oldfreq: %u, new freq: %u\n", + __func__, policy->cpu, freqs.old, + freqs.new); + + cpufreq_notify_transition(policy, &freqs, + CPUFREQ_PRECHANGE); + } + retval = cpufreq_driver->target_index(policy, index); + if (retval) + pr_err("%s: Failed to change cpu frequency: %d\n", + __func__, retval); + + if (notify) { + /* + * Notify with old freq in case we failed to change + * frequency + */ + if (retval) + freqs.new = freqs.old; + + cpufreq_notify_transition(policy, &freqs, + CPUFREQ_POSTCHANGE); + } } return retval; diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index ff9c8df..62ce478 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -221,6 +221,12 @@ struct cpufreq_driver { * frequency transitions */ #define CPUFREQ_PM_NO_WARN 0x04 /* don't warn on suspend/resume speed * mismatches */ +/* + * Driver will call cpufreq_notify_transition() in its target_index() routine + * and so cpufreq core must not call it. Only useful for drivers that implement + * target_index(), unused otherwise. + */ +#define CPUFREQ_NO_NOTIFICATION 0x08 int cpufreq_register_driver(struct cpufreq_driver *driver_data); int cpufreq_unregister_driver(struct cpufreq_driver *driver_data);