From patchwork Tue Jul 17 10:54:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 142127 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp3503033ljj; Tue, 17 Jul 2018 03:58:43 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfJTXBZuos6SB0LVqD5i/MAqJHSI3HmMnzD/uFvjBNSLb8VXZbNqIHIh+CLkEgtRvHz0N8+ X-Received: by 2002:a62:1489:: with SMTP id 131-v6mr154206pfu.159.1531825122958; Tue, 17 Jul 2018 03:58:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531825122; cv=none; d=google.com; s=arc-20160816; b=BBIW0fUoVpBXpSFhYQojaFYxDxQQtMnOtgDUDn5tq75txAkmSjLBu6wjniakXTe9fq RiuPy1E3EnhY431jul2IJAxxZKU9rxWGQ+Qb3QfxGLSOjwmKqRlpylk8k5AOmLzPOeTL 2iAK60Y+Vgk4qWlXZJjSN92iJQPmkl3e3QT/hdBiFmqNJWFukLpxE4aGQa5P3HgJiHxK nhDaWkAp+vEyBQY8A1328ih1DOF8osIlHaTjCi1Y+NwpOlNHkiZ1mKa4IFqKhb5VHKyK pW/EPuUyeHIgnAC+gqhy0h44fXO8Mf1C4YYwKbYjHXv6mM4fpFEv7d4wGnj/UCKzZ3Re 4vWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=y4rtkJd0kMW7LZyFUKzdA6ryx8QRXaRJLzwHOZDW0uc=; b=ytdjv5qM8J7fwhYZsbeQ9fyfgd+fXoC/WWfFlB7pDwjbXNXKReNI/p2kmFmda14/PK Jojd+2tqP55dvWsu5TcsiXKiG2H/SvPbZbbMDRwd8HeaYoR7C6Z+QZbOBu+Giizc40Ro tBTGede20tRgoR7v3GxXMJhZe7Pb3LFGUYqhzz85/pLfg+psBs+atqWjwn7rgbnNYH4L /6mED6Y2c2+KXXNQkSJqRuXEEwvh4NHhzVPB/nyy6yAVzICBokDJAi3yJHaG3NQZZvLo wCSY4sNV0OrqOTfY0o9OgOiufh8WL9nSXr+sJRDlML3XMb0kf561B1EvpcMCVhcAvvWm 8QYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=D1Z7HzqT; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d2-v6si625329pln.471.2018.07.17.03.58.42; Tue, 17 Jul 2018 03:58:42 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=D1Z7HzqT; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730039AbeGQLao (ORCPT + 10 others); Tue, 17 Jul 2018 07:30:44 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:38375 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729641AbeGQLao (ORCPT ); Tue, 17 Jul 2018 07:30:44 -0400 Received: by mail-pl0-f68.google.com with SMTP id b1-v6so306090pls.5 for ; Tue, 17 Jul 2018 03:58:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=y4rtkJd0kMW7LZyFUKzdA6ryx8QRXaRJLzwHOZDW0uc=; b=D1Z7HzqTD0LvDXwwwcQDzmnIX37+JPpX4l07WjvgsJtBFAnUYMEO4u+o5oYUxLzG2w hRIRkCbnfGsUnaz1/DjRWHNv3W8J0IbxfePM82JpUB8jhDPSWvJZUHboLXDG1uJC+dGT 13NIitLuwGbBL6Een6a8cgepvCxt54vgve8m0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=y4rtkJd0kMW7LZyFUKzdA6ryx8QRXaRJLzwHOZDW0uc=; b=cHSdqrAIaIJMYSbaJo26/MYmit7swDxqn8Ja1Y8LgAOHIMFTPejTrqmOiB3r60YyxY l3VRLOWuRBrItX51mO1Vi1+93fBCaUu7arQL3UA8Jube4pwYxKJg9ri0FSszcGErTW4F nUi9GtsMGd578/JNMShvJ7qRcHdZQVdGMvwcPatkStwtL24RrO16sKNBAGN49P/oocne 2slslQTWok817JXqbuJM+/+sbOfG14TGYincQNqm9WA8K9IzYIT80POiuWQVKNFl0nf5 IJtr+Pzz3a6k3eeByaiBf/PIMfE8NchrznXyp+pw3OquKIwL1evDUOt8UoD3MXQgAatc BIXA== X-Gm-Message-State: AOUpUlHfsbR5rrpjDlBESo+foSvWR7dV3mJGKQABR/xZe6bGIE1ULtZd k2g5njiozfxNvZS29PAMyQG7nQ== X-Received: by 2002:a17:902:9883:: with SMTP id s3-v6mr1162407plp.194.1531825120337; Tue, 17 Jul 2018 03:58:40 -0700 (PDT) Received: from localhost ([122.171.235.75]) by smtp.gmail.com with ESMTPSA id y13-v6sm2128582pfi.131.2018.07.17.03.58.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Jul 2018 03:58:39 -0700 (PDT) From: Viresh Kumar To: Zhang Rui , Eduardo Valentin Cc: Viresh Kumar , linux-pm@vger.kernel.org, Vincent Guittot , Daniel Lezcano , linux-kernel@vger.kernel.org Subject: [PATCH] of: thermal: Allow multiple devices to share cooling map Date: Tue, 17 Jul 2018 16:24:16 +0530 Message-Id: X-Mailer: git-send-email 2.18.0.rc1.242.g61856ae69a2c In-Reply-To: References: Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org A cooling map entry may now contain a list of phandles and their arguments representing multiple devices which share the trip point. This patch updates the thermal OF core to parse them properly. Tested on Hikey960. Signed-off-by: Viresh Kumar --- This is a follow up patch to the DT bindings patchset: https://lkml.kernel.org/r/cover.1530766981.git.viresh.kumar@linaro.org drivers/thermal/of-thermal.c | 140 +++++++++++++++++++++++++---------- 1 file changed, 102 insertions(+), 38 deletions(-) -- 2.18.0.rc1.242.g61856ae69a2c diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c index 977a8307fbb1..79c06c4c861b 100644 --- a/drivers/thermal/of-thermal.c +++ b/drivers/thermal/of-thermal.c @@ -19,22 +19,33 @@ /*** Private data structures to represent thermal device tree data ***/ /** - * struct __thermal_bind_param - a match between trip and cooling device + * struct __thermal_cooling_bind_param - a cooling device for a trip point * @cooling_device: a pointer to identify the referred cooling device - * @trip_id: the trip point index - * @usage: the percentage (from 0 to 100) of cooling contribution * @min: minimum cooling state used at this trip point * @max: maximum cooling state used at this trip point */ -struct __thermal_bind_params { +struct __thermal_cooling_bind_param { struct device_node *cooling_device; - unsigned int trip_id; - unsigned int usage; unsigned long min; unsigned long max; }; +/** + * struct __thermal_bind_param - a match between trip and cooling device + * @tcbp: a pointer to an array of cooling devices + * @count: number of elements in array + * @trip_id: the trip point index + * @usage: the percentage (from 0 to 100) of cooling contribution + */ + +struct __thermal_bind_params { + struct __thermal_cooling_bind_param *tcbp; + unsigned int count; + unsigned int trip_id; + unsigned int usage; +}; + /** * struct __thermal_zone - internal representation of a thermal zone * @mode: current thermal zone device mode (enabled/disabled) @@ -192,25 +203,31 @@ static int of_thermal_bind(struct thermal_zone_device *thermal, struct thermal_cooling_device *cdev) { struct __thermal_zone *data = thermal->devdata; - int i; + struct __thermal_bind_params *tbp; + struct __thermal_cooling_bind_param *tcbp; + int i, j; if (!data || IS_ERR(data)) return -ENODEV; /* find where to bind */ for (i = 0; i < data->num_tbps; i++) { - struct __thermal_bind_params *tbp = data->tbps + i; + tbp = data->tbps + i; - if (tbp->cooling_device == cdev->np) { - int ret; + for (j = 0; j < tbp->count; j++) { + tcbp = tbp->tcbp + j; - ret = thermal_zone_bind_cooling_device(thermal, + if (tcbp->cooling_device == cdev->np) { + int ret; + + ret = thermal_zone_bind_cooling_device(thermal, tbp->trip_id, cdev, - tbp->max, - tbp->min, + tcbp->max, + tcbp->min, tbp->usage); - if (ret) - return ret; + if (ret) + return ret; + } } } @@ -221,22 +238,28 @@ static int of_thermal_unbind(struct thermal_zone_device *thermal, struct thermal_cooling_device *cdev) { struct __thermal_zone *data = thermal->devdata; - int i; + struct __thermal_bind_params *tbp; + struct __thermal_cooling_bind_param *tcbp; + int i, j; if (!data || IS_ERR(data)) return -ENODEV; /* find where to unbind */ for (i = 0; i < data->num_tbps; i++) { - struct __thermal_bind_params *tbp = data->tbps + i; + tbp = data->tbps + i; + + for (j = 0; j < tbp->count; j++) { + tcbp = tbp->tcbp + j; - if (tbp->cooling_device == cdev->np) { - int ret; + if (tcbp->cooling_device == cdev->np) { + int ret; - ret = thermal_zone_unbind_cooling_device(thermal, - tbp->trip_id, cdev); - if (ret) - return ret; + ret = thermal_zone_unbind_cooling_device(thermal, + tbp->trip_id, cdev); + if (ret) + return ret; + } } } @@ -652,8 +675,9 @@ static int thermal_of_populate_bind_params(struct device_node *np, int ntrips) { struct of_phandle_args cooling_spec; + struct __thermal_cooling_bind_param *__tcbp; struct device_node *trip; - int ret, i; + int ret, i, count; u32 prop; /* Default weight. Usage is optional */ @@ -680,20 +704,44 @@ static int thermal_of_populate_bind_params(struct device_node *np, goto end; } - ret = of_parse_phandle_with_args(np, "cooling-device", "#cooling-cells", - 0, &cooling_spec); - if (ret < 0) { + count = of_count_phandle_with_args(np, "cooling-device", + "#cooling-cells"); + if (!count) { pr_err("missing cooling_device property\n"); goto end; } - __tbp->cooling_device = cooling_spec.np; - if (cooling_spec.args_count >= 2) { /* at least min and max */ - __tbp->min = cooling_spec.args[0]; - __tbp->max = cooling_spec.args[1]; - } else { - pr_err("wrong reference to cooling device, missing limits\n"); + + __tcbp = kcalloc(count, sizeof(*__tcbp), GFP_KERNEL); + if (!__tcbp) + goto end; + + for (i = 0; i < count; i++) { + ret = of_parse_phandle_with_args(np, "cooling-device", + "#cooling-cells", i, &cooling_spec); + if (ret < 0) { + pr_err("missing cooling_device property\n"); + goto free_tcbp; + } + + __tcbp[i].cooling_device = cooling_spec.np; + + if (cooling_spec.args_count >= 2) { /* at least min and max */ + __tcbp[i].min = cooling_spec.args[0]; + __tcbp[i].max = cooling_spec.args[1]; + } else { + pr_err("wrong reference to cooling device, missing limits\n"); + } } + __tbp->tcbp= __tcbp; + __tbp->count = count; + + goto end; + +free_tcbp: + for (i = i - 1; i >= 0; i--) + of_node_put(__tcbp[i].cooling_device); + kfree(__tcbp); end: of_node_put(trip); @@ -900,8 +948,16 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) return tz; free_tbps: - for (i = i - 1; i >= 0; i--) - of_node_put(tz->tbps[i].cooling_device); + for (i = i - 1; i >= 0; i--) { + struct __thermal_bind_params *tbp = tz->tbps + i; + int j; + + for (j = 0; j < tbp->count; j++) + of_node_put(tbp->tcbp[j].cooling_device); + + kfree(tbp->tcbp); + } + kfree(tz->tbps); free_trips: for (i = 0; i < tz->ntrips; i++) @@ -917,10 +973,18 @@ __init *thermal_of_build_thermal_zone(struct device_node *np) static inline void of_thermal_free_zone(struct __thermal_zone *tz) { - int i; + struct __thermal_bind_params *tbp; + int i, j; + + for (i = 0; i < tz->num_tbps; i++) { + tbp = tz->tbps + i; + + for (j = 0; j < tbp->count; j++) + of_node_put(tbp->tcbp[j].cooling_device); + + kfree(tbp->tcbp); + } - for (i = 0; i < tz->num_tbps; i++) - of_node_put(tz->tbps[i].cooling_device); kfree(tz->tbps); for (i = 0; i < tz->ntrips; i++) of_node_put(tz->trips[i].np);