From patchwork Sun Mar 29 22:03:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 212460 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,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 2466BC2D0EB for ; Sun, 29 Mar 2020 22:05:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EDA8E2074A for ; Sun, 29 Mar 2020 22:05:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="JdHU3Yx4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728823AbgC2WFl (ORCPT ); Sun, 29 Mar 2020 18:05:41 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:51653 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729208AbgC2WFk (ORCPT ); Sun, 29 Mar 2020 18:05:40 -0400 Received: by mail-wm1-f68.google.com with SMTP id c187so17807283wme.1 for ; Sun, 29 Mar 2020 15:05:39 -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; bh=l9DHmEiKz6yupqFx9WrHI0MsNMx9mQaRHcz2cqVdZLE=; b=JdHU3Yx4CotTcRuN+C3coH9IrxLwc1AwW8NiUAnWcmXk5TtrHAGjqQBn0silebw7J4 l4XGe0eMFs6Ui8GRvWBNUzK78urjhmai4UQb5Q90tDnbsBecUdLbd8X/WzhJ9rcVg3WT APZELnnGVyOYgnnyTYUlLXPgMr9EgpodhFeWe7BdvrFMz9LSGkQb+hXBrOnbFQRxBkQN RejdWpQJlcbotPcQFz4Ok7AZMiuNr3GDHz8A5JnAf/mYY9yeuyjX9RKQSgVWrU/+/ocf n+EJ603uDEC/JleiXvZL0Nny0W16xAFn8s9G/1ZcS3jdv3eLNJ5RbYyxEbLTqN/7fCgN flzA== 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; bh=l9DHmEiKz6yupqFx9WrHI0MsNMx9mQaRHcz2cqVdZLE=; b=tBH61LhZ5QA6J3GCtxhaxDTjRQ+Ow74lbM0ntKZDsSSe4r7rnU2v1gKbEx1bgfO1JI fKc9pCOPNblmmB1oxHP++TXunAlJVzRcCUqHcwLFcXWzXTZkCGTpCs6qIrHC6bJ82jWZ 9ueRWSodnhXM2NRlox7SGoRfNM6dknavJgRJ8IzDUKmJM88ZW/bR5ZkwBTJAN9h7Emxs kGVzTdfIBore44RCG4iaXk3909SYqk3ByHDZ6zhI05A5FGU2bLmH0jIqhB3t7WYngTRq 5GU7hZUAzsWkO/wUii/pUNtJC0R2MPAUBR9/GwTmeMqzZylIU/NvwU6rC0OAQ5wylCpb xumQ== X-Gm-Message-State: ANhLgQ2IhPY+sg+KuhwZ7RiheIHVYrQe8iXziGfWTKBAqg8ama+R57rR bFqt1a31dRMQcYqI5Tav0m/wNw== X-Google-Smtp-Source: ADFU+vs9p9+pplq0E9rosSzTu+qVht5suK/2lWGberAjg4WP9toV2lrY6CJKiOWPz50Xv1bXJ2K65A== X-Received: by 2002:a05:600c:21da:: with SMTP id x26mr9651227wmj.47.1585519538542; Sun, 29 Mar 2020 15:05:38 -0700 (PDT) Received: from localhost.localdomain ([2a01:e34:ed2f:f020:78b1:4459:6959:42d0]) by smtp.gmail.com with ESMTPSA id j188sm20026740wmj.36.2020.03.29.15.05.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Mar 2020 15:05:37 -0700 (PDT) From: Daniel Lezcano To: rafael@kernel.org, robh@kernel.org Cc: daniel.lezcano@linaro.org, "Rafael J. Wysocki" , linux-pm@vger.kernel.org (open list:POWER MANAGEMENT CORE), linux-kernel@vger.kernel.org (open list) Subject: [PATCH V2 1/4] powercap/drivers/idle_inject: Specify idle state max latency Date: Mon, 30 Mar 2020 00:03:17 +0200 Message-Id: <20200329220324.8785-1-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Currently the idle injection framework uses the play_idle() function which puts the current CPU in an idle state. The idle state is the deepest one, as specified by the latency constraint when calling the subsequent play_idle_precise() function with the INT_MAX. The idle_injection is used by the cpuidle_cooling device which computes the idle / run duration to mitigate the temperature by injecting idle cycles. The cooling device has no control on the depth of the idle state. Allow finer control of the idle injection mechanism by allowing to specify the latency for the idle state. Thus the cooling device has the ability to have a guarantee on the exit latency of the idle states it is injecting. Signed-off-by: Daniel Lezcano --- - V2: - Remove the get_latency helper --- drivers/powercap/idle_inject.c | 16 +++++++++++++++- include/linux/idle_inject.h | 4 ++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/drivers/powercap/idle_inject.c b/drivers/powercap/idle_inject.c index cd1270614cc6..49f42c475620 100644 --- a/drivers/powercap/idle_inject.c +++ b/drivers/powercap/idle_inject.c @@ -61,12 +61,14 @@ struct idle_inject_thread { * @timer: idle injection period timer * @idle_duration_us: duration of CPU idle time to inject * @run_duration_us: duration of CPU run time to allow + * @latency_us: max allowed latency * @cpumask: mask of CPUs affected by idle injection */ struct idle_inject_device { struct hrtimer timer; unsigned int idle_duration_us; unsigned int run_duration_us; + unsigned int latency_us; unsigned long int cpumask[0]; }; @@ -138,7 +140,8 @@ static void idle_inject_fn(unsigned int cpu) */ iit->should_run = 0; - play_idle(READ_ONCE(ii_dev->idle_duration_us)); + play_idle_precise(READ_ONCE(ii_dev->idle_duration_us) * NSEC_PER_USEC, + READ_ONCE(ii_dev->latency_us) * NSEC_PER_USEC); } /** @@ -169,6 +172,16 @@ void idle_inject_get_duration(struct idle_inject_device *ii_dev, *idle_duration_us = READ_ONCE(ii_dev->idle_duration_us); } +/** + * idle_inject_set_latency - set the maximum latency allowed + * @latency_us: set the latency requirement for the idle state + */ +void idle_inject_set_latency(struct idle_inject_device *ii_dev, + unsigned int latency_us) +{ + WRITE_ONCE(ii_dev->latency_us, latency_us); +} + /** * idle_inject_start - start idle injections * @ii_dev: idle injection control device structure @@ -297,6 +310,7 @@ struct idle_inject_device *idle_inject_register(struct cpumask *cpumask) cpumask_copy(to_cpumask(ii_dev->cpumask), cpumask); hrtimer_init(&ii_dev->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); ii_dev->timer.function = idle_inject_timer_fn; + ii_dev->latency_us = UINT_MAX; for_each_cpu(cpu, to_cpumask(ii_dev->cpumask)) { diff --git a/include/linux/idle_inject.h b/include/linux/idle_inject.h index a445cd1a36c5..91a8612b8bf9 100644 --- a/include/linux/idle_inject.h +++ b/include/linux/idle_inject.h @@ -26,4 +26,8 @@ void idle_inject_set_duration(struct idle_inject_device *ii_dev, void idle_inject_get_duration(struct idle_inject_device *ii_dev, unsigned int *run_duration_us, unsigned int *idle_duration_us); + +void idle_inject_set_latency(struct idle_inject_device *ii_dev, + unsigned int latency_ns); + #endif /* __IDLE_INJECT_H__ */ From patchwork Sun Mar 29 22:03:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 212459 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,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 AD331C43331 for ; Sun, 29 Mar 2020 22:07:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 79C7F20748 for ; Sun, 29 Mar 2020 22:07:16 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="djA9o7R4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729224AbgC2WHP (ORCPT ); Sun, 29 Mar 2020 18:07:15 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:38735 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729221AbgC2WHP (ORCPT ); Sun, 29 Mar 2020 18:07:15 -0400 Received: by mail-wm1-f66.google.com with SMTP id f6so12792360wmj.3 for ; Sun, 29 Mar 2020 15:07:14 -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=D5NWO+IUoIhwqTXjsgin0kU4/g2KEq9vhU/rf+OCJRE=; b=djA9o7R4SFARI6kpWiE6Tv1ZcX+9ah7u0FCxo204Tz1xKvYapnAqSNW7+e1rExw9hA cScGbDtfFFd3E+IaXNQ9xz5DlVgMaMolj6VfhBXVzgwBe6XPRUIWJJzvMl7qd57PeEsP 9xREH0V1CnfkghpyvbQKn6eQLSoDWx3CHXiwSv8zU+DmkqCw3eUsJ1bW/lOphz8JHdYp Ff/ApIyeJsHWXWyUyjAupovAi9KcaJJjspk/Iu+J3ei9E6yz+ErHMtqGsEXxYT85qDLI cupuzz9bOUZiFlkSFUUl3nQHtEfS9OIUPSq09hhjtH5yXP9rOMl+XqXZvc00Yc4JA5mT YZrg== 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=D5NWO+IUoIhwqTXjsgin0kU4/g2KEq9vhU/rf+OCJRE=; b=OiIqvYhkEC+ffYo+2QQ2gH6UD72sPFy6mDDpSX4MTcizDvoReJlsLCNl51wgSsXrX4 97cjJJrzVDCZuC58GIXVc6JCtUNDZ3kks7g0XERfo+gvmcKjl0BGglc+nP5ewqWBB6aN sEAh0JMlEV2YcwapuUnaIPCK2dWv2ne+zJ0oqK4bIjajdLard1+ETi/SIKEiOBO3qILI ITsiiMaPXZET2zH88trksSQKfzQUtpV79r3wZGWuDDP86sWy46LUJ2C9wv6iOV2+j+l0 nnIneugJvLhuKJIymOkd04leLTY6ajycvWoxwtjexOd+EdYB6io9V8APLVG5B/jY4jNh xNYQ== X-Gm-Message-State: ANhLgQ37nv+rWmW9pUxT5GYhbCZaQkwysXYjbFPrBfW+TXQoGN2T7Jkz +1Uf/yhL6MTk8hvIAajgaUk5/Q== X-Google-Smtp-Source: ADFU+vvzXFUCDyZcT3pEMMwt/ox+/SASrPq0wEB9fcW9K9j0slV/aodRKm5px9/UJgj9zV5CarULSA== X-Received: by 2002:a1c:2007:: with SMTP id g7mr10098519wmg.70.1585519633758; Sun, 29 Mar 2020 15:07:13 -0700 (PDT) Received: from localhost.localdomain ([2a01:e34:ed2f:f020:78b1:4459:6959:42d0]) by smtp.gmail.com with ESMTPSA id j188sm20026740wmj.36.2020.03.29.15.07.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Mar 2020 15:07:13 -0700 (PDT) From: Daniel Lezcano To: rafael@kernel.org, robh@kernel.org Cc: daniel.lezcano@linaro.org, Amit Daniel Kachhap , Viresh Kumar , Javi Merino , Zhang Rui , Amit Kucheria , linux-pm@vger.kernel.org (open list:THERMAL/CPU_COOLING), linux-kernel@vger.kernel.org (open list) Subject: [PATCH 3/4] thermal/drivers/cpuidle_cooling: Change the registration function Date: Mon, 30 Mar 2020 00:03:19 +0200 Message-Id: <20200329220324.8785-3-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200329220324.8785-1-daniel.lezcano@linaro.org> References: <20200329220324.8785-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 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__ */