From patchwork Tue Apr 14 22:08:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 212301 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3029DC2BB1D for ; Tue, 14 Apr 2020 22:09:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 039AA2076C for ; Tue, 14 Apr 2020 22:09:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ky7JzqAx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2634175AbgDNWJW (ORCPT ); Tue, 14 Apr 2020 18:09:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S2634156AbgDNWJA (ORCPT ); Tue, 14 Apr 2020 18:09:00 -0400 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 473A8C061A0E for ; Tue, 14 Apr 2020 15:08:59 -0700 (PDT) Received: by mail-wm1-x342.google.com with SMTP id r26so16256939wmh.0 for ; Tue, 14 Apr 2020 15:08:59 -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=qKrrTjxTq2DaanA7D/Z8LJo2RnyGixxTxyQQd7KYF+Q=; b=ky7JzqAxzFlbteL2lCqTiA9yIwc4OTrN2IlfXatl0EhhaNCXRJ1pi3XvSI574/6YEn RTamWp5/5yBVaX7svzhbu5Zx7cXwS1dnLCXm9K7Xeo4BQfsn1EfIoariDlXJBjMrPB1h rnd37cJalZwh6YAu9Q49d/os1N0xyZHVFYkLbV/7MnOHvB6/Kue45GqjsqXt2q3tLolA D36BIEm5pe0iuRlfFJtwj4KBPKaPG+c6e7IRBKWzE+1MZupDhxrdqoDfQjQY0tq2Wd8d rechd02gUcKi1rwLKHSU4YXhY5uc1MuFczrqR4WjjFj3r1q0ueRqogs0/yGKBt7A2CSJ JjOg== 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=qKrrTjxTq2DaanA7D/Z8LJo2RnyGixxTxyQQd7KYF+Q=; b=mt2vZTOqyqyXIxGkN5YUndGFOHjTiW8SrkbaNUfZ1elKcF4yk6RGD0Ux9Ixr5mdyit ZUDaheGvxdJRLArUsi1AefPLNuKNAtoyuv4fONhOSDWSCQIxJvStQzRqyP1ggKGqhmE/ ErscP1Oa9ru6X4sE5YeAzYL5CPvgUwdyliDaNaC8i3QQzJ99zuLHNrylDHl3K6igDu2d IPTj/ShjTyJ15L1iEMauoWa1Gk0QY4ooe20Z5FUxj31MQh18OGjPdRnneQ+W+RLllVjh wOzTz2mf5+Or0VKv264ppPdsDgZVLhFsJ6seVfUHATVI82lewfYh4Gw4+sG3B/bxC19z kEtA== X-Gm-Message-State: AGi0PuZUUdBJ/C7HV7jgKqbIgl9zXe0pBxafVkK+yxgCh68kTtvMDW4a pfqLw1SJxUxFAdTo9XaTiJmoag== X-Google-Smtp-Source: APiQypIso6cYieAXB2y+b/ecomS6KQqRcgPqo3sIwyiW+hi0Scm6IA26i/fLhftACEB1zP/x9ZMwzg== X-Received: by 2002:a1c:3885:: with SMTP id f127mr1882179wma.134.1586902137384; Tue, 14 Apr 2020 15:08:57 -0700 (PDT) Received: from localhost.localdomain (lns-bzn-59-82-252-135-148.adsl.proxad.net. [82.252.135.148]) by smtp.gmail.com with ESMTPSA id a7sm4099973wrs.61.2020.04.14.15.08.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Apr 2020 15:08:56 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, rui.zhang@intel.com Cc: amit.kucheria@verdurent.com, Rob Herring , Mark Rutland , linux-pm@vger.kernel.org (open list:THERMAL), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3 2/4] dt-bindings: thermal: Add the idle cooling device Date: Wed, 15 Apr 2020 00:08:31 +0200 Message-Id: <20200414220837.9284-2-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200414220837.9284-1-daniel.lezcano@linaro.org> References: <20200414220837.9284-1-daniel.lezcano@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Some devices are not able to cool down by reducing their voltage / frequency because it could be not available or the system does not allow voltage scaling. In this configuration, it is not possible to use this strategy and the idle injection cooling device can be used instead. One idle cooling device is now present for the CPU as implemented by the combination of the idle injection framework belonging to the power capping framework and the thermal cooling device. The missing part is the DT binding providing a way to describe how the cooling device will work on the system. A first iteration was done by making the cooling device to point to the idle state. Unfortunately it does not make sense because it would need to duplicate the idle state description for each CPU in order to have a different phandle and make the thermal internal framework happy. It was proposed to add an cooling-cells to <3>, unfortunately the thermal framework is expecting a value of <2> as stated by the documentation and it is not possible from the cooling device generic code to loop this third value to the back end cooling device. Another proposal was to add a child 'thermal-idle' node as the SCMI does. This approach allows to have a self-contained configuration for the idle cooling device without colliding with the cpufreq cooling device which is based on the CPU node. In addition, it allows to have the cpufreq cooling device and the idle cooling device to co-exist together as shown in the example. Signed-off-by: Daniel Lezcano --- - V3: - Removed extra line with tab inside - V2: - Fixed comment type - Added dual license - Fixed description s/begins to/should/ - Changed name s/duration/duration-us/ - Changed name s/latency/exit-latency-us/ - Removed types for latency / duration - Fixed s/idle-thermal/thermal-idle/ --- .../bindings/thermal/thermal-idle.yaml | 145 ++++++++++++++++++ 1 file changed, 145 insertions(+) create mode 100644 Documentation/devicetree/bindings/thermal/thermal-idle.yaml diff --git a/Documentation/devicetree/bindings/thermal/thermal-idle.yaml b/Documentation/devicetree/bindings/thermal/thermal-idle.yaml new file mode 100644 index 000000000000..7a922f540934 --- /dev/null +++ b/Documentation/devicetree/bindings/thermal/thermal-idle.yaml @@ -0,0 +1,145 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +# Copyright 2020 Linaro Ltd. +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/thermal/thermal-idle.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Thermal idle cooling device binding + +maintainers: + - Daniel Lezcano + +description: | + The thermal idle cooling device allows the system to passively + mitigate the temperature on the device by injecting idle cycles, + forcing it to cool down. + + This binding describes the thermal idle node. + +properties: + $nodename: + const: thermal-idle + description: | + A thermal-idle node describes the idle cooling device properties to + cool down efficiently the attached thermal zone. + + '#cooling-cells': + const: 2 + description: | + Must be 2, in order to specify minimum and maximum cooling state used in + the cooling-maps reference. The first cell is the minimum cooling state + and the second cell is the maximum cooling state requested. + + duration-us: + description: | + The idle duration in microsecond the device should cool down. + + exit-latency-us: + description: | + The exit latency constraint in microsecond for the injected + idle state for the device. It is the latency constraint to + apply when selecting an idle state from among all the present + ones. + +required: + - '#cooling-cells' + +examples: + - | + #include + + // Example: Combining idle cooling device on big CPUs with cpufreq cooling device + cpus { + #address-cells = <2>; + #size-cells = <0>; + + /* ... */ + + cpu_b0: cpu@100 { + device_type = "cpu"; + compatible = "arm,cortex-a72"; + reg = <0x0 0x100>; + enable-method = "psci"; + capacity-dmips-mhz = <1024>; + dynamic-power-coefficient = <436>; + #cooling-cells = <2>; /* min followed by max */ + cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>; + thermal-idle { + #cooling-cells = <2>; + duration-us = <10000>; + exit-latency-us = <500>; + }; + }; + + cpu_b1: cpu@101 { + device_type = "cpu"; + compatible = "arm,cortex-a72"; + reg = <0x0 0x101>; + enable-method = "psci"; + capacity-dmips-mhz = <1024>; + dynamic-power-coefficient = <436>; + #cooling-cells = <2>; /* min followed by max */ + cpu-idle-states = <&CPU_SLEEP &CLUSTER_SLEEP>; + thermal-idle { + #cooling-cells = <2>; + duration-us = <10000>; + exit-latency-us = <500>; + }; + }; + + /* ... */ + + }; + + /* ... */ + + thermal_zones { + cpu_thermal: cpu { + polling-delay-passive = <100>; + polling-delay = <1000>; + + /* ... */ + + trips { + cpu_alert0: cpu_alert0 { + temperature = <65000>; + hysteresis = <2000>; + type = "passive"; + }; + + cpu_alert1: cpu_alert1 { + temperature = <70000>; + hysteresis = <2000>; + type = "passive"; + }; + + cpu_alert2: cpu_alert2 { + temperature = <75000>; + hysteresis = <2000>; + type = "passive"; + }; + + cpu_crit: cpu_crit { + temperature = <95000>; + hysteresis = <2000>; + type = "critical"; + }; + }; + + cooling-maps { + map0 { + trip = <&cpu_alert1>; + cooling-device = <&{/cpus/cpu@100/thermal-idle} 0 15 >, + <&{/cpus/cpu@101/thermal-idle} 0 15>; + }; + + map1 { + trip = <&cpu_alert2>; + cooling-device = + <&cpu_b0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu_b1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; + }; + }; From patchwork Tue Apr 14 22:08:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 212302 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2F9DC2BB1D for ; Tue, 14 Apr 2020 22:09:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C53BA2076A for ; Tue, 14 Apr 2020 22:09:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="CeM/zs/U" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2634166AbgDNWJD (ORCPT ); Tue, 14 Apr 2020 18:09:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S2634157AbgDNWJB (ORCPT ); Tue, 14 Apr 2020 18:09:01 -0400 Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CEA5EC061A10 for ; Tue, 14 Apr 2020 15:09:00 -0700 (PDT) Received: by mail-wm1-x344.google.com with SMTP id y24so16207435wma.4 for ; Tue, 14 Apr 2020 15:09:00 -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=2gAWHTXX9bF3sN9XblA+dduErzaItlbFPxUTg2AHv9w=; b=CeM/zs/UclThxyDL0iHjwTNNx8BhkPJ20N26rghrVb6K5+LCtGWb5MyTEpcd5rEu3E CjsI8KSkwYIQWPrq/HOTk+DGqsK5StvgJrn2YXO0W4wFG/IwyjNRpcFoGbVYhy5HR7KR +KauMyN+PYYV+jpDuZq3+A8+/LKf23wuLKoFrPZAv5IgX443ZelPT7+u+VFIV3lkhsOb s+PA2lmTX4OWgel7/vfshUk87fC4AzigbjZ2H+ZaLrm/foXHuGamGG7c+5MfhQXCnfg9 9u5W0WXehBW+qkoic9fY3NhJ5lnFDi0uT/7j5BbbjkK1sfcd1I0Ds4vkJAN5ci+ZTNTv +Dtw== 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=2gAWHTXX9bF3sN9XblA+dduErzaItlbFPxUTg2AHv9w=; b=kMXCdDtUjdWwEO0Y0Eqh4o+x0I/mxgl7O1vNIj9CUteCbztl2gu0pk0lUycb3Jx86T H2QN/PEZWK6iXQxnFNdZrCukSyBHLlaHAsMgfksPC0gQuEObRFQobu3dig8axg3zbNuS 5V4yHtCDRKFg250H1ixhC+TdoBLt7ogznkhTzDCaKIjESeoy6y94xOCojf4SQJbxAJzL wqvLsmtYF7Cw/q8cnIozgrbQLryULKrkKAb+bkbseUGtZsSoEi+aJ3jspmvzK3L7HtT4 2qjHj7LrrNufGUBXL9LQ/OgN2gNNJNBDM2zhV26cTy97TjjgkUPQP/YqVcjFuPjmKKbn mJMA== X-Gm-Message-State: AGi0PuYZ13Rdd3SIMuuRS/Ncm+rKEYdunI+8fVRg4uuTIaqmDROljmM7 8dpdYiT6jBvTw8+I/TLWA1EHLA== X-Google-Smtp-Source: APiQypKE+PiQzpQOD6XHn4FFGCkS3xwrkZsF4sltqgVV63EDuVSL7DA5q/T28tGOrQyTlevnqXAkhQ== X-Received: by 2002:a1c:998b:: with SMTP id b133mr1885789wme.65.1586902139388; Tue, 14 Apr 2020 15:08:59 -0700 (PDT) Received: from localhost.localdomain (lns-bzn-59-82-252-135-148.adsl.proxad.net. [82.252.135.148]) by smtp.gmail.com with ESMTPSA id a7sm4099973wrs.61.2020.04.14.15.08.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Apr 2020 15:08:58 -0700 (PDT) From: Daniel Lezcano To: daniel.lezcano@linaro.org, rui.zhang@intel.com Cc: amit.kucheria@verdurent.com, Viresh Kumar , Amit Daniel Kachhap , Javi Merino , linux-pm@vger.kernel.org (open list:THERMAL/CPU_COOLING), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v3 3/4] thermal/drivers/cpuidle_cooling: Change the registration function Date: Wed, 15 Apr 2020 00:08:32 +0200 Message-Id: <20200414220837.9284-3-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200414220837.9284-1-daniel.lezcano@linaro.org> References: <20200414220837.9284-1-daniel.lezcano@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Today, there is no user for the cpuidle cooling device. The targetted platform is ARM and ARM64. The cpuidle and the cpufreq cooling device are based on the device tree. As the cpuidle cooling device can have its own configuration depending on the platform and the available idle states. The DT node description will give the optional properties to set the cooling device up. Do no longer rely on the CPU node which is prone to error and will lead to a confusion in the DT because the cpufreq cooling device is also using it. Let initialize the cpuidle cooling device with the DT binding. This was tested on: - hikey960 - hikey6220 - rock960 - db845c Acked-by: Viresh Kumar Signed-off-by: Daniel Lezcano --- drivers/thermal/cpuidle_cooling.c | 58 +++++++++++++++++++++++++------ include/linux/cpu_cooling.h | 7 ---- 2 files changed, 47 insertions(+), 18 deletions(-) diff --git a/drivers/thermal/cpuidle_cooling.c b/drivers/thermal/cpuidle_cooling.c index 0bb843246f59..b2c81c427f05 100644 --- a/drivers/thermal/cpuidle_cooling.c +++ b/drivers/thermal/cpuidle_cooling.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include @@ -154,22 +155,25 @@ static struct thermal_cooling_device_ops cpuidle_cooling_ops = { }; /** - * cpuidle_of_cooling_register - Idle cooling device initialization function + * __cpuidle_cooling_register: register the cooling device * @drv: a cpuidle driver structure pointer - * @np: a node pointer to a device tree cooling device node + * @np: a device node structure pointer used for the thermal binding * - * This function is in charge of creating a cooling device per cpuidle - * driver and register it to thermal framework. + * This function is in charge of allocating the cpuidle cooling device + * structure, the idle injection, initialize them and register the + * cooling device to the thermal framework. * - * Return: zero on success, or negative value corresponding to the - * error detected in the underlying subsystems. + * Return: zero on success, a negative value returned by one of the + * underlying subsystem in case of error */ -int cpuidle_of_cooling_register(struct device_node *np, - struct cpuidle_driver *drv) +static int __cpuidle_cooling_register(struct device_node *np, + struct cpuidle_driver *drv) { struct idle_inject_device *ii_dev; struct cpuidle_cooling_device *idle_cdev; struct thermal_cooling_device *cdev; + unsigned int idle_duration_us = TICK_USEC; + unsigned int latency_us = UINT_MAX; char dev_name[THERMAL_NAME_LENGTH]; int id, ret; @@ -191,7 +195,11 @@ int cpuidle_of_cooling_register(struct device_node *np, goto out_id; } - idle_inject_set_duration(ii_dev, TICK_USEC, TICK_USEC); + of_property_read_u32(np, "duration", &idle_duration_us); + of_property_read_u32(np, "latency", &latency_us); + + idle_inject_set_duration(ii_dev, TICK_USEC, idle_duration_us); + idle_inject_set_latency(ii_dev, latency_us); idle_cdev->ii_dev = ii_dev; @@ -204,6 +212,9 @@ int cpuidle_of_cooling_register(struct device_node *np, goto out_unregister; } + pr_info("%s: Idle injection set with idle duration=%u, latency=%u\n", + dev_name, idle_duration_us, latency_us); + return 0; out_unregister: @@ -221,12 +232,37 @@ int cpuidle_of_cooling_register(struct device_node *np, * @drv: a cpuidle driver structure pointer * * This function is in charge of creating a cooling device per cpuidle - * driver and register it to thermal framework. + * driver and register it to the thermal framework. * * Return: zero on success, or negative value corresponding to the * error detected in the underlying subsystems. */ int cpuidle_cooling_register(struct cpuidle_driver *drv) { - return cpuidle_of_cooling_register(NULL, drv); + struct device_node *cooling_node; + struct device_node *cpu_node; + int cpu, ret; + + for_each_cpu(cpu, drv->cpumask) { + + cpu_node = of_cpu_device_node_get(cpu); + + cooling_node = of_get_child_by_name(cpu_node, "idle-thermal"); + + of_node_put(cpu_node); + + if (!cooling_node) + continue; + + ret = __cpuidle_cooling_register(cooling_node, drv); + + of_node_put(cooling_node); + + if (ret) + return ret; + + cooling_node = NULL; + } + + return 0; } diff --git a/include/linux/cpu_cooling.h b/include/linux/cpu_cooling.h index 65501d8f9778..4d7b4a303327 100644 --- a/include/linux/cpu_cooling.h +++ b/include/linux/cpu_cooling.h @@ -64,18 +64,11 @@ struct cpuidle_driver; #ifdef CONFIG_CPU_IDLE_THERMAL int cpuidle_cooling_register(struct cpuidle_driver *drv); -int cpuidle_of_cooling_register(struct device_node *np, - struct cpuidle_driver *drv); #else /* CONFIG_CPU_IDLE_THERMAL */ static inline int cpuidle_cooling_register(struct cpuidle_driver *drv) { return 0; } -static inline int cpuidle_of_cooling_register(struct device_node *np, - struct cpuidle_driver *drv) -{ - return 0; -} #endif /* CONFIG_CPU_IDLE_THERMAL */ #endif /* __CPU_COOLING_H__ */