From patchwork Thu Aug 9 12:45:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: durgadoss.r@intel.com X-Patchwork-Id: 1300361 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 8DEE5DFF7B for ; Thu, 9 Aug 2012 12:46:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932510Ab2HIMqY (ORCPT ); Thu, 9 Aug 2012 08:46:24 -0400 Received: from mga02.intel.com ([134.134.136.20]:14321 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932467Ab2HIMqX (ORCPT ); Thu, 9 Aug 2012 08:46:23 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 09 Aug 2012 05:46:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.77,739,1336374000"; d="scan'208";a="177969414" Received: from dr3-desktop.iind.intel.com ([10.223.107.36]) by orsmga001.jf.intel.com with ESMTP; 09 Aug 2012 05:46:20 -0700 From: Durgadoss R To: lenb@kernel.org, rui.zhang@intel.com, rjw@sisk.pl, linux-acpi@vger.kernel.org, linux-pm@vger.kernel.org Cc: eduardo.valentin@ti.com, amit.kachhap@linaro.org, wni@nvidia.com, Durgadoss R Subject: [PATCH 04/13] Thermal: Add platform level information to thermal.h Date: Thu, 9 Aug 2012 18:15:56 +0530 Message-Id: <1344516365-7230-5-git-send-email-durgadoss.r@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1344516365-7230-1-git-send-email-durgadoss.r@intel.com> References: <1344516365-7230-1-git-send-email-durgadoss.r@intel.com> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org This patch creates a structure to hold a thermal zone's platform level info, and also defines an extern function to retrieve zone parameters from thermal_sys.c. Signed-off-by: Durgadoss R --- drivers/thermal/thermal_sys.c | 3 +++ include/linux/thermal.h | 43 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c index 998c16e..f043cd6 100644 --- a/drivers/thermal/thermal_sys.c +++ b/drivers/thermal/thermal_sys.c @@ -49,6 +49,9 @@ static LIST_HEAD(thermal_tz_list); static LIST_HEAD(thermal_cdev_list); static DEFINE_MUTEX(thermal_list_lock); +int (*get_platform_thermal_params)(struct thermal_zone_device *); +EXPORT_SYMBOL(get_platform_thermal_params); + static int get_idr(struct idr *idr, struct mutex *lock, int *id) { int err; diff --git a/include/linux/thermal.h b/include/linux/thermal.h index 757a007..f9ce1e2 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -33,6 +33,8 @@ #define THERMAL_MAX_TRIPS 12 #define THERMAL_NAME_LENGTH 20 +#define MAX_COOLING_DEVS THERMAL_MAX_TRIPS + /* Initial state of a cooling device during binding */ #define THERMAL_NO_TARGET -1UL @@ -49,6 +51,11 @@ #define THERMAL_GENL_VERSION 0x01 #define THERMAL_GENL_MCAST_GROUP_NAME "thermal_mc_group" +/* Thermal policies */ +#define THERMAL_USER_SPACE 0 +#define THERMAL_FAIR_SHARE 1 +#define THERMAL_STEP_WISE 2 + struct thermal_zone_device; struct thermal_cooling_device; @@ -165,6 +172,7 @@ struct thermal_zone_device { struct mutex lock; /* protect thermal_instances list */ struct list_head node; struct delayed_work poll_queue; + struct thermal_zone_params *tzp; }; /* @@ -187,6 +195,31 @@ struct thermal_instance { struct list_head cdev_node; /* node in cdev->thermal_instances */ }; +/* Platform level parameters associated with a thermal zone */ +struct thermal_zone_params { + char *thermal_zone_name; + int throttle_policy; + + /* Number of cooling devices associated with this thermal zone */ + int num_cdevs; + char *cdevs_name[MAX_COOLING_DEVS]; + + /* + * This is a measure of 'how effectively these devices can + * cool 'this' thermal zone. The shall be determined by platform + * characterization. This is on a 'percentage' scale. + * See Documentation/thermal/sysfs-api.txt for more information. + */ + int weights[MAX_COOLING_DEVS]; + + /* + * This is a bit mask that gives the binding relation between this + * thermal zone and cdev, for a particular trip point. + * See Documentation/thermal/sysfs-api.txt for more information. + */ + int trip_mask[MAX_COOLING_DEVS]; +}; + struct thermal_genl_event { u32 orig; enum events event; @@ -213,6 +246,16 @@ struct thermal_cooling_device *get_cdev_by_name(const char *); struct thermal_instance *get_thermal_instance(struct thermal_zone_device *, struct thermal_cooling_device *, int); +/* + * The platform layer shall define a 'function' that provides the + * parameters for all thermal zones in the platform. This pointer + * should point to that 'function'. + * + * In thermal_zone_device_register() we update the parameters + * for the particular thermal zone. + */ +extern int (*get_platform_thermal_params)(struct thermal_zone_device *); + #ifdef CONFIG_NET extern int thermal_generate_netlink_event(u32 orig, enum events event); #else