From patchwork Thu May 8 14:37:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kachhap X-Patchwork-Id: 4136871 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 67FECBFF02 for ; Thu, 8 May 2014 14:41:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4456920270 for ; Thu, 8 May 2014 14:40:59 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2DC1C20265 for ; Thu, 8 May 2014 14:40:58 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WiPT7-0001Ir-Q7; Thu, 08 May 2014 14:38:41 +0000 Received: from mail-pa0-x22a.google.com ([2607:f8b0:400e:c03::22a]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WiPSm-00010N-TT for linux-arm-kernel@lists.infradead.org; Thu, 08 May 2014 14:38:22 +0000 Received: by mail-pa0-f42.google.com with SMTP id rd3so2967365pab.1 for ; Thu, 08 May 2014 07:37:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=KVyXtW0QxOxp4vQxnAGQYJNWba7gHDI0Cy5Vbr3yywI=; b=HT8l7h+MCYemlfx3ocD1RkTecl4Oq9jpkcLw/WZvzIQA9uJH4oZa6Gmp0b7VEjtJ5R lzIzdPWhmrupr+WDl+RZ13mX8hawSRUmvEmTZ1URjwwL0gDwrRYrGeA2UdbidSDFpEMz 0QH7sPnV6qerh0zt5ZILhq8nNBrPWaweAQek2CPB5TWReE3tgBIpJguHRSfFjbdXwR2v Bqmq+Rv0KLG67NBhc773yvR+HuEwrKLpkjEwih5V7GPs9ZgnA/S0hz38ht3lidwbh1tz EAaH71OHl6eU1uQ8btmkbMWlwZ85DMotFmG55VgHxXacIc/vdt+r8nqFiA7v8lLGFKvP tLYw== X-Received: by 10.67.15.42 with SMTP id fl10mr8674541pad.30.1399559875541; Thu, 08 May 2014 07:37:55 -0700 (PDT) Received: from localhost.localdomain ([14.140.216.146]) by mx.google.com with ESMTPSA id vf9sm2357141pbc.94.2014.05.08.07.37.52 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 08 May 2014 07:37:54 -0700 (PDT) From: Amit Daniel Kachhap To: linux-pm@lists.linux-foundation.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org Subject: [RFC PATCH 2/5] thermal: cpu_cooling: Add notifications support for the clients Date: Thu, 8 May 2014 20:07:57 +0530 Message-Id: <1399559880-20562-3-git-send-email-amit.daniel@samsung.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1399559880-20562-1-git-send-email-amit.daniel@samsung.com> References: <1399559880-20562-1-git-send-email-amit.daniel@samsung.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140508_073821_057009_07F254C7 X-CRM114-Status: GOOD ( 22.81 ) X-Spam-Score: 0.0 (/) Cc: eduardo.valentin@ti.com, rui.zhang@intel.com, rjw@rjwysocki.net, lenb@kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch adds notification support for those clients of cpu_cooling APIs which may want to do something interesting after receiving these cpu_cooling events. The notifier structure passed is of both Set/Get type. The notfications events can be of type, 1. CPU_COOLING_SET_STATE_PRE 2. CPU_COOLING_SET_STATE_POST 3. CPU_COOLING_GET_CUR_STATE 4. CPU_COOLING_GET_MAX_STATE The advantages of these notfications is to differentiate between different P states in the cpufreq table and the cooling states. The clients of these events may group few P states into 1 cooling states. Also some more cooling states can be enabled when the maximum of P state is reached. Post notifications can be used for those cases. Signed-off-by: Amit Daniel Kachhap --- drivers/thermal/cpu_cooling.c | 99 +++++++++++++++++++++++++++++++++++++++- include/linux/cpu_cooling.h | 55 +++++++++++++++++++++++ 2 files changed, 151 insertions(+), 3 deletions(-) diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c index 21f44d4..e2aeb36 100644 --- a/drivers/thermal/cpu_cooling.c +++ b/drivers/thermal/cpu_cooling.c @@ -50,6 +50,7 @@ struct cpufreq_cooling_device { unsigned int cpufreq_state; unsigned int cpufreq_val; struct cpumask allowed_cpus; + struct cpufreq_cooling_status request_status; struct list_head node; }; static DEFINE_IDR(cpufreq_idr); @@ -59,6 +60,8 @@ static DEFINE_MUTEX(cooling_cpufreq_lock); #define NOTIFY_INVALID NULL static struct cpufreq_cooling_device *notify_device; +/* Notfier list to validates/updates the cpufreq cooling states */ +static BLOCKING_NOTIFIER_HEAD(cpufreq_cooling_state_notifier_list); /* A list to hold all the cpufreq cooling devices registered */ static LIST_HEAD(cpufreq_cooling_list); @@ -266,6 +269,21 @@ static unsigned int get_cpu_frequency(unsigned int cpu, unsigned long level) return freq; } +static int +cpufreq_cooling_notify_states(struct cpufreq_cooling_status *request, + enum cpu_cooling_state_ops op) +{ + /* Invoke the notifiers which have registered for this state change */ + if (op == CPU_COOLING_SET_STATE_PRE || + op == CPU_COOLING_SET_STATE_POST || + op == CPU_COOLING_GET_MAX_STATE || + op == CPU_COOLING_GET_CUR_STATE) { + blocking_notifier_call_chain( + &cpufreq_cooling_state_notifier_list, op, request); + } + return 0; +} + /** * cpufreq_apply_cooling - function to apply frequency clipping. * @cpufreq_device: cpufreq_cooling_device pointer containing frequency @@ -285,9 +303,18 @@ static int cpufreq_apply_cooling(struct cpufreq_cooling_device *cpufreq_device, struct cpumask *mask = &cpufreq_device->allowed_cpus; unsigned int cpu = cpumask_any(mask); + cpufreq_device->request_status.cur_state = + cpufreq_device->cpufreq_state; + cpufreq_device->request_status.new_state = cooling_state; + + cpufreq_cooling_notify_states(&cpufreq_device->request_status, + CPU_COOLING_SET_STATE_PRE); + + cooling_state = cpufreq_device->request_status.new_state; /* Check if the old cooling action is same as new cooling action */ - if (cpufreq_device->cpufreq_state == cooling_state) + if (cpufreq_device->cpufreq_state == + cpufreq_device->request_status.new_state) return 0; clip_freq = get_cpu_frequency(cpu, cooling_state); @@ -304,7 +331,8 @@ static int cpufreq_apply_cooling(struct cpufreq_cooling_device *cpufreq_device, } notify_device = NOTIFY_INVALID; - + cpufreq_cooling_notify_states(&cpufreq_device->request_status, + CPU_COOLING_SET_STATE_POST); return 0; } @@ -383,6 +411,11 @@ static int cpufreq_get_max_state(struct thermal_cooling_device *cdev, if (count > 0) *state = count; + cpufreq_device->request_status.max_state = count; + cpufreq_cooling_notify_states(&cpufreq_device->request_status, + CPU_COOLING_GET_MAX_STATE); + *state = cpufreq_device->request_status.max_state; + return ret; } @@ -410,8 +443,12 @@ static int cpufreq_get_cur_state(struct thermal_cooling_device *cdev, /* Cooling device pointer not found */ return -EINVAL; } + cpufreq_device->request_status.cur_state = + cpufreq_device->cpufreq_state; + cpufreq_cooling_notify_states(&cpufreq_device->request_status, + CPU_COOLING_GET_CUR_STATE); - *state = cpufreq_device->cpufreq_state; + *state = cpufreq_device->request_status.cur_state; return 0; } @@ -520,6 +557,7 @@ __cpufreq_cooling_register(struct device_node *np, } cpufreq_dev->cool_dev = cool_dev; cpufreq_dev->cpufreq_state = 0; + cpufreq_dev->request_status.devdata = devdata; mutex_lock(&cooling_cpufreq_lock); /* Register the notifier for first cpufreq cooling device */ @@ -614,3 +652,58 @@ void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev) kfree(cpufreq_dev); } EXPORT_SYMBOL_GPL(cpufreq_cooling_unregister); + +/** + * cpufreq_cooling_register_notifier - register a driver with cpufreq cooling. + * @nb: notifier function to register. + * @list: CPU_COOLING_STATE_NOTIFIER type. + * + * Add a driver to receive cpufreq cooling notifications like current state, + * max state and set state. The drivers after reading the events can perform + * some mapping between the P states and cooling states like grouping some P + * states into 1 cooling state. + * + * Return: 0 (success) + */ +int cpufreq_cooling_register_notifier(struct notifier_block *nb, + unsigned int list) +{ + int ret = 0; + switch (list) { + case CPU_COOLING_STATE_NOTIFIER: + ret = blocking_notifier_chain_register( + &cpufreq_cooling_state_notifier_list, nb); + break; + default: + ret = -EINVAL; + } + return ret; +} +EXPORT_SYMBOL_GPL(cpufreq_cooling_register_notifier); + +/** + * cpufreq_cooling_unregister_notifier - unregisters a driver with cpufreq + * cooling. + * @nb: notifier function to unregister. + * @list: CPU_COOLING_STATE_NOTIFIER type. + * + * Removes a driver to receive further cpufreq cooling notifications. + * + * Return: 0 (success) + */ +int cpufreq_cooling_unregister_notifier(struct notifier_block *nb, + unsigned int list) +{ + int ret = 0; + switch (list) { + case CPU_COOLING_STATE_NOTIFIER: + ret = blocking_notifier_chain_unregister( + &cpufreq_cooling_state_notifier_list, nb); + break; + default: + ret = -EINVAL; + } + + return ret; +} +EXPORT_SYMBOL_GPL(cpufreq_cooling_unregister_notifier); diff --git a/include/linux/cpu_cooling.h b/include/linux/cpu_cooling.h index aaef7d8..f786935 100644 --- a/include/linux/cpu_cooling.h +++ b/include/linux/cpu_cooling.h @@ -28,6 +28,22 @@ #include #include +#define CPU_COOLING_STATE_NOTIFIER (0) + +enum cpu_cooling_state_ops { + CPU_COOLING_SET_STATE_PRE, + CPU_COOLING_SET_STATE_POST, + CPU_COOLING_GET_CUR_STATE, + CPU_COOLING_GET_MAX_STATE, +}; + +struct cpufreq_cooling_status { + unsigned long cur_state; + unsigned long new_state; + unsigned long max_state; + void *devdata; +}; + #ifdef CONFIG_CPU_THERMAL /** * cpufreq_cooling_register - function to create cpufreq cooling device. @@ -62,6 +78,34 @@ of_cpufreq_cooling_register(struct device_node *np, void cpufreq_cooling_unregister(struct thermal_cooling_device *cdev); unsigned long cpufreq_cooling_get_level(unsigned int cpu, unsigned int freq); + +/** + * cpufreq_cooling_register_notifier - register a driver with cpufreq cooling. + * @nb: notifier function to register. + * @list: CPU_COOLING_STATE_NOTIFIER type. + * + * Add a driver to receive cpufreq cooling notifications like current state, + * max state and set state. The drivers after reading the events can perform + * some mapping between the P states and cooling states like grouping some P + * states into 1 cooling state. + * + * Return: 0 (success) + */ +int cpufreq_cooling_register_notifier(struct notifier_block *nb, + unsigned int list); + +/** + * cpufreq_cooling_unregister_notifier - unregisters a driver with cpufreq + * cooling. + * @nb: notifier function to unregister. + * @list: CPU_COOLING_STATE_NOTIFIER type. + * + * Removes a driver to receive further cpufreq cooling notifications. + * + * Return: 0 (success) + */ +int cpufreq_cooling_unregister_notifier(struct notifier_block *nb, + unsigned int list); #else /* !CONFIG_CPU_THERMAL */ static inline struct thermal_cooling_device * cpufreq_cooling_register(const struct cpumask *clip_cpus, void *devdata) @@ -84,6 +128,17 @@ unsigned long cpufreq_cooling_get_level(unsigned int cpu, unsigned int freq) { return THERMAL_CSTATE_INVALID; } +static inline int +cpufreq_cooling_register_notifier(struct notifier_block *nb, unsigned int list) +{ + return 0; +} +static inline int +cpufreq_cooling_unregister_notifier(struct notifier_block *nb, + unsigned int list) +{ + return 0; +} #endif /* CONFIG_CPU_THERMAL */ #endif /* __CPU_COOLING_H__ */