From patchwork Thu Jan 17 16:22:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dirk.brandewie@gmail.com X-Patchwork-Id: 1997081 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 8747BDFABD for ; Thu, 17 Jan 2013 16:22:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757178Ab3AQQWd (ORCPT ); Thu, 17 Jan 2013 11:22:33 -0500 Received: from mail-da0-f50.google.com ([209.85.210.50]:57818 "EHLO mail-da0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757163Ab3AQQWc (ORCPT ); Thu, 17 Jan 2013 11:22:32 -0500 Received: by mail-da0-f50.google.com with SMTP id h15so1184571dan.9 for ; Thu, 17 Jan 2013 08:22:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=rJLbfNSpLw1H8ukr1Bzsa+Wdh2dC/47uBM4GZSvYzO8=; b=QH0Tsb7FHm37qCPG/Hmlia8iRtaTN1RQ0+W6YVAM3/U82i+SZyupiahiMcHpgzO5Bq jBw+RhHkkuMVlUx9H3DCatkdBGWSv5zDGrbfpPoeBjLKmWdR2bmxGqav+WherNIp0sbB fbXVWSjO8CzUUq/l9kIEc32vfzFLkmMx+1I3vASnxyThgjSmygc9d58B3jrlPt9tba0a AfRY7YhtgYve2d0jmJOnyJF8ow7Y/hPrUDh5lzKddKuajosa4KzZ5r53cIRpHHwGcki1 7KWbjAnuN9c6wSop8FLKjpvZqStthlnxHAoB9ThnJJWue1OCuecW92ztM9Rztefrj45H 98cQ== X-Received: by 10.66.83.6 with SMTP id m6mr14970520pay.52.1358439751690; Thu, 17 Jan 2013 08:22:31 -0800 (PST) Received: from echolake.localdomain (static-50-43-39-32.bvtn.or.frontiernet.net. [50.43.39.32]) by mx.google.com with ESMTPS id uk9sm1308853pbc.63.2013.01.17.08.22.29 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 17 Jan 2013 08:22:30 -0800 (PST) From: dirk.brandewie@gmail.com To: linux-pm@vger.kernel.org, cpufreq@vger.kernel.org Cc: rjw@sisk.pl, Dirk Brandewie Subject: [PATCH] cpufreq: handle cpufreq being disabled for all exported function. Date: Thu, 17 Jan 2013 08:22:21 -0800 Message-Id: <1358439741-16100-1-git-send-email-dirk.j.brandewie@intel.com> X-Mailer: git-send-email 1.7.7.6 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org From: Dirk Brandewie When disable_cpufreq() is called some exported functions are still being used that do not have a check for cpufreq being disabled. Add a disabled check into cpufreq_cpu_get() to return NULL if cpufreq is disabled this covers most of the exported functions. For the exported functions that do not call cpufreq_cpu_get() add an explicit check. Signed-off-by: Dirk Brandewie --- Updated sign-off drivers/cpufreq/cpufreq.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 1f93dbd..b7663f7 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -180,6 +180,9 @@ err_out: struct cpufreq_policy *cpufreq_cpu_get(unsigned int cpu) { + if (cpufreq_disabled()) + return NULL; + return __cpufreq_cpu_get(cpu, false); } EXPORT_SYMBOL_GPL(cpufreq_cpu_get); @@ -198,6 +201,9 @@ static void __cpufreq_cpu_put(struct cpufreq_policy *data, bool sysfs) void cpufreq_cpu_put(struct cpufreq_policy *data) { + if (cpufreq_disabled()) + return; + __cpufreq_cpu_put(data, false); } EXPORT_SYMBOL_GPL(cpufreq_cpu_put); @@ -264,6 +270,9 @@ void cpufreq_notify_transition(struct cpufreq_freqs *freqs, unsigned int state) BUG_ON(irqs_disabled()); + if (cpufreq_disabled()) + return; + freqs->flags = cpufreq_driver->flags; pr_debug("notification %u of frequency transition to %u kHz\n", state, freqs->new); @@ -1408,6 +1417,9 @@ int cpufreq_register_notifier(struct notifier_block *nb, unsigned int list) { int ret; + if (cpufreq_disabled()) + return -EINVAL; + WARN_ON(!init_cpufreq_transition_notifier_list_called); switch (list) { @@ -1442,6 +1454,9 @@ int cpufreq_unregister_notifier(struct notifier_block *nb, unsigned int list) { int ret; + if (cpufreq_disabled()) + return -EINVAL; + switch (list) { case CPUFREQ_TRANSITION_NOTIFIER: ret = srcu_notifier_chain_unregister( @@ -1522,6 +1537,9 @@ int __cpufreq_driver_getavg(struct cpufreq_policy *policy, unsigned int cpu) { int ret = 0; + if (cpufreq_disabled()) + return ret; + if (!(cpu_online(cpu) && cpufreq_driver->getavg)) return 0;