From patchwork Wed Jan 4 22:21:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 39137 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1411wrt; Wed, 4 Jan 2023 14:30:59 -0800 (PST) X-Google-Smtp-Source: AMrXdXtv7uMgo5bydMBISoefrOOXy9fnMwUq8KlMgjSqPmD0HkstXHxLP/JPAhKbPXIwjJORkVHE X-Received: by 2002:a17:906:6b0f:b0:78d:f454:ba3d with SMTP id q15-20020a1709066b0f00b0078df454ba3dmr37971217ejr.60.1672871458931; Wed, 04 Jan 2023 14:30:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672871458; cv=none; d=google.com; s=arc-20160816; b=AOcCKArmeuImVRrgumBHXk8H3u2c7q6XW/U4YDAb/sci2XvQWTWaesfVPIoifm8aDr xX8oI7Wlst3ebPlrVIoU2VgbwGNX6tp6Xn5KBurjdHeButD5WP+LvAq/cWig3d2xSDn4 bYzsjOX7pL0ioeFNkqwTYLAbLuT+yo+GfjIH89jpT5NCBnNeLn32u+c88AwcFCnKApoi TOZXAspyXtLSN/S8uqVrJcQnX/pf5TOKXovKz6TAKJPahHRny4kiB3vUTpumPmO50AxF /rwrp085WJi9qOeb5n8QYfN7CwRdEnp+qQQDfsszi3JCY1It3OycfxJujutcUywsKj7b yo/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=UeOPhxv6r4ltchbFMkyyxfuBY/9HRlfWD8mzq3+qrmM=; b=pP+mbNvn2LuMQJ+z6xOvqPsxO9QGUFZGIyXQEx/PsNTdGR9UPitxN9bsGoV93nJnmX 7D6ZJbi1rRj6MWz9IxMN7WTlHBpNhbnW6t65+kC8fBUbqmEf1uI/fPOeRHUggxEqZfFb 5GgrRQw/4p5rk8ZO7Q9ABfmp0Gblc3ayEJ2Dskm8pGhuL1opGFoYEYMj9Mw6wMiHlW91 0apj7fNi5PBYKBN7a2vLygGa/8lk0V1j7shPM/JuR1yLNAWc12JHMPzJBgyAj9nCSGbH WwQPa6fgzd7dGqv9NRPrnn9N+xm+B7CFeK8Y/NkxgIIKbwXLlEgeIGpg9WvoVvBF6Fx3 GE9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xlvJuc8v; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bb5-20020a1709070a0500b007878c9d73a2si32346577ejc.426.2023.01.04.14.30.35; Wed, 04 Jan 2023 14:30:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xlvJuc8v; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-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 S240380AbjADWVh (ORCPT + 99 others); Wed, 4 Jan 2023 17:21:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240543AbjADWVf (ORCPT ); Wed, 4 Jan 2023 17:21:35 -0500 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ABF0EE35 for ; Wed, 4 Jan 2023 14:21:33 -0800 (PST) Received: by mail-wm1-x336.google.com with SMTP id i17-20020a05600c355100b003d99434b1cfso17481783wmq.1 for ; Wed, 04 Jan 2023 14:21:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UeOPhxv6r4ltchbFMkyyxfuBY/9HRlfWD8mzq3+qrmM=; b=xlvJuc8vbZ6ggxCixW6VCBOenlBgSWk0rjzeNC+foVfvF7ZGkOZVHfYMasWsnGeOrz h6TQYgFIcO6wCAGbUF51T42mn3pHVLiXIoOUB5nbjeSEmRbqNXeoKKnKrZRGlL40+BKF iO2qCw1GaFPBrfFgA6eqmQgHc44yyD2i45lC0WpTM7nKDvxUG9IntncSERY3NV1ySruA pGQ5sEoZihfCP6jL/gsOQP91CHufp/qU5iO2KBatZgVsWZ/8/BAMUPpKsDyhhxzV2ngI b6q7/z1No+0NrOo/kab+7BFOEzP9ULqD7rUm7kVs26oBfbNOi9gSVGd340y/ZU4WgE6Y VyyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UeOPhxv6r4ltchbFMkyyxfuBY/9HRlfWD8mzq3+qrmM=; b=QlCeSyh9nztTc19jDlnXUc5bezAACZVqWv9/wGr35LeH2196M9s/PaIcw9UodPPnxz ib4e84Wj9dihbaIVrSBmzuot8AMkhTGanstUgLsyu3/W0xOgltPHEwzj+/MeVqBzUA1/ 7ORI2J2nyh8IN6fHQI+HwS+C0GCMpDYy7LMvJmlsnG/EczCFc7Nla4vHhZ9hYq1DKrGI ReviAVLQJrVwmvenLfig/tzqUJSvI50qbdXhmnBOKjCuW8FlLI1DfbqqC5JiGAB6X5LA uzqW5SHgOPYxLqGVAg8FbVv5x6OfMNLuZm2RYD0zMo1BY0U3OZ0Uf2s5Uv5tBi11GISd QyVA== X-Gm-Message-State: AFqh2kqTd3lhSD5xRhhxOki6avl0Ht7FaXw56k6yO2co+7sK0iEt4JVT yiLOuLdV+EpWI4pIP0J3mqnlhA== X-Received: by 2002:a05:600c:17c6:b0:3d2:20ec:24be with SMTP id y6-20020a05600c17c600b003d220ec24bemr36143911wmo.38.1672870892087; Wed, 04 Jan 2023 14:21:32 -0800 (PST) Received: from mai.. (146725694.box.freepro.com. [130.180.211.218]) by smtp.gmail.com with ESMTPSA id l7-20020adfc787000000b002238ea5750csm42430278wrg.72.2023.01.04.14.21.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Jan 2023 14:21:31 -0800 (PST) From: Daniel Lezcano X-Google-Original-From: Daniel Lezcano To: daniel.lezcano@linaro.org, rafael@kernel.org, srinivas.pandruvada@linux.intel.com Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, rui.zhang@intel.com, christophe.jaillet@wanadoo.fr, Amit Kucheria Subject: [PATCH v3 1/3] thermal/acpi: Add ACPI trip point routines Date: Wed, 4 Jan 2023 23:21:25 +0100 Message-Id: <20230104222127.2364396-2-daniel.lezcano@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230104222127.2364396-1-daniel.lezcano@kernel.org> References: <20230104222127.2364396-1-daniel.lezcano@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754132863231927355?= X-GMAIL-MSGID: =?utf-8?q?1754132863231927355?= From: Daniel Lezcano The ACPI specification describes the trip points, the device tree bindings as well. The OF code uses the generic trip point structures. The ACPI has their own trip points structure and uses the get_trip_* ops to retrieve them. We can do the same as the OF code and create a set of ACPI functions to retrieve a trip point description. Having a common code for ACPI will help to cleanup the remaining Intel drivers and get rid of the get_trip_* functions. These changes add the ACPI thermal calls to retrieve the basic information we need to be reused in the thermal ACPI and Intel drivers. The different ACPI functions have the generic trip point structure passed as parameter where it is filled. This structure aims to be the one used by all the thermal drivers and the thermal framework. After this series, a couple of Intel drivers and the ACPI thermal driver will still have their own trip points definition but a new series on top of this one will finish the conversion to the generic trip point handling. This series depends on the generic trip point added to the thermal framework and available in the thermal/linux-next branch. https://lkml.org/lkml/2022/10/3/456 It has been tested on a Intel i7-8650U - x280 with the INT3400, the PCH, ACPITZ, and x86_pkg_temp. No regression observed so far. Signed-off-by: Daniel Lezcano --- V3: - Removed too simple wrappers - Changed the API to return an error and check the validity of the value - Removed the comments describing the objects - Added kerneldoc - Made the Kconfig option silent - Set the hysteresis value to zero by default V2: - Fixed the missing thermal_acpi.c in the patch Signed-off-by: Daniel Lezcano --- drivers/thermal/Kconfig | 4 + drivers/thermal/Makefile | 1 + drivers/thermal/thermal_acpi.c | 211 +++++++++++++++++++++++++++++++++ include/linux/thermal.h | 8 ++ 4 files changed, 224 insertions(+) create mode 100644 drivers/thermal/thermal_acpi.c diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index e052dae614eb..eaeb2b2ee6e9 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -76,6 +76,10 @@ config THERMAL_OF Say 'Y' here if you need to build thermal infrastructure based on device tree. +config THERMAL_ACPI + depends on ACPI + bool + config THERMAL_WRITABLE_TRIPS bool "Enable writable trip points" help diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile index 2506c6c8ca83..60f0dfa9aae2 100644 --- a/drivers/thermal/Makefile +++ b/drivers/thermal/Makefile @@ -13,6 +13,7 @@ thermal_sys-$(CONFIG_THERMAL_NETLINK) += thermal_netlink.o # interface to/from other layers providing sensors thermal_sys-$(CONFIG_THERMAL_HWMON) += thermal_hwmon.o thermal_sys-$(CONFIG_THERMAL_OF) += thermal_of.o +thermal_sys-$(CONFIG_THERMAL_ACPI) += thermal_acpi.o # governors thermal_sys-$(CONFIG_THERMAL_GOV_FAIR_SHARE) += gov_fair_share.o diff --git a/drivers/thermal/thermal_acpi.c b/drivers/thermal/thermal_acpi.c new file mode 100644 index 000000000000..db0463ed05ec --- /dev/null +++ b/drivers/thermal/thermal_acpi.c @@ -0,0 +1,211 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2022 Linaro Limited + * + * Author: Daniel Lezcano + * + * ACPI thermal configuration + */ +#include +#include +#include +#include +#include + +#include "thermal_core.h" + +/* + * An hysteresis value below zero is invalid and we can consider a + * value greater than 20°K/°C is invalid too. + */ +#define HYSTERESIS_MIN_DECIK 0 +#define HYSTERESIS_MAX_DECIK 200 + +/* + * Minimum temperature for full military grade is 218°K (-55°C) and + * max temperature is 448°K (175°C). We can consider those values as + * the boundaries for the [trips] temperature returned by the + * firmware. Any values out of these boundaries can be considered + * bogus and we can assume the firmware has no data to provide. + */ +#define TEMPERATURE_MIN_DECIK 2180 +#define TEMPERATURE_MAX_DECIK 4480 + +static int thermal_acpi_get_temperature_object(struct acpi_device *adev, + char *object, int *temperature) +{ + unsigned long long temp; + acpi_status status; + + status = acpi_evaluate_integer(adev->handle, object, NULL, &temp); + if (ACPI_FAILURE(status)) { + acpi_handle_debug(adev->handle, "No temperature object '%s'\n", object); + return -ENODEV; + } + + if (temp < TEMPERATURE_MIN_DECIK || temp >= TEMPERATURE_MAX_DECIK) { + acpi_handle_info(adev->handle, "Invalid temperature '%llu deci°K' for object '%s'\n", + temp, object); + return -ENODATA; + } + + *temperature = deci_kelvin_to_millicelsius(temp); + + return 0; +} + +/** + * thermal_acpi_trip_gtsh() - Get the global hysteresis value + * @adev: the acpi device to get the description from + * + * Get the global hysteresis value for the trip points. If any call + * fail, we shall return a zero hysteresis value. + * + * Return: An integer between %HYSTERESIS_MIN_DECIK and %HYSTERESIS_MAX_DECIK + */ +int thermal_acpi_trip_gtsh(struct acpi_device *adev) +{ + unsigned long long hyst; + acpi_status status; + + status = acpi_evaluate_integer(adev->handle, "GTSH", NULL, &hyst); + if (ACPI_FAILURE(status)) + return 0; + + if (hyst < HYSTERESIS_MIN_DECIK || hyst >= HYSTERESIS_MAX_DECIK) { + acpi_handle_info(adev->handle, "Invalid hysteresis '%llu deci°K' for object 'GTSH'\n", + hyst); + return 0; + } + + return (int)hyst; +} +EXPORT_SYMBOL_GPL(thermal_acpi_trip_gtsh); + +/** + * thermal_acpi_trip_act() - Get the specified active trip point + * @adev: the acpi device to get the description from + * @trip: a &struct thermal_trip to be filled if the function succeed + * @id: an integer speciyfing the active trip point id + * + * The function calls the ACPI framework to get the "_ACTx" and the + * 'GTSH' objects which describe the active trip points. The @id + * builds the "_ACTx" string with the numbered active trip point + * name. Then it fills the @trip structure with the information + * retrieved from those objects. + * + * Return: + * * 0 - Success + * * -ENODEV - Failed to retrieve the ACPI object + * * -ENODATA - The ACPI object value appears to be inconsistent + */ +int thermal_acpi_trip_act(struct acpi_device *adev, + struct thermal_trip *trip, int id) +{ + char name[5]; + int ret; + + sprintf(name, "_AC%d", id); + + ret = thermal_acpi_get_temperature_object(adev, name, &trip->temperature); + if (ret) + return ret; + + trip->hysteresis = 0; + trip->type = THERMAL_TRIP_ACTIVE; + + return 0; +} +EXPORT_SYMBOL_GPL(thermal_acpi_trip_act); + +/** + * thermal_acpi_trip_psv() - Get the passive trip point + * @adev: the acpi device to get the description from + * @trip: a &struct thermal_trip to be filled if the function succeed + * + * The function calls the ACPI framework to get the "_PSV" object + * which describe the passive trip point. Then it fills the @trip + * structure with the information retrieved from those objects. + * + * Return: + * * 0 - Success + * * -ENODEV - Failed to retrieve the ACPI object + * * -ENODATA - The ACPI object value appears to be inconsistent + */ +int thermal_acpi_trip_psv(struct acpi_device *adev, struct thermal_trip *trip) +{ + int ret; + + ret = thermal_acpi_get_temperature_object(adev, "_PSV", &trip->temperature); + if (ret) + return ret; + + trip->hysteresis = 0; + trip->type = THERMAL_TRIP_PASSIVE; + + return 0; +} +EXPORT_SYMBOL_GPL(thermal_acpi_trip_psv); + +/** + * thermal_acpi_trip_hot() - Get the near critical trip point + * @adev: the acpi device to get the description from + * @trip: a &struct thermal_trip to be filled if the function succeed + * + * The function calls the ACPI framework to get the "_HOT" and the + * 'GTSH' objects which describe the hot trip point. Then it fills the + * @trip structure with the information retrieved from those objects. + * + * Return: + * * 0 - Success + * * -ENODEV - Failed to retrieve the ACPI object + * * -ENODATA - The ACPI object appears to be inconsistent + */ +int thermal_acpi_trip_hot(struct acpi_device *adev, struct thermal_trip *trip) +{ + int ret; + + ret = thermal_acpi_get_temperature_object(adev, "_HOT", &trip->temperature); + if (ret) + return ret; + + trip->hysteresis = 0; + trip->type = THERMAL_TRIP_HOT; + + return 0; +} +EXPORT_SYMBOL_GPL(thermal_acpi_trip_hot); + +/** + * thermal_acpi_trip_crit() - Get the critical trip point + * @adev: the acpi device to get the description from + * @trip: a &struct thermal_trip to be filled if the function succeed + * + * The function calls the ACPI framework to get the "_CRT" object + * which describe the critical trip point. Then it fills the @trip + * structure with the information retrieved from this object. + * + * Return: + * * 0 - Success + * * -ENODEV - Failed to retrieve the ACPI object + * * -ENODATA - The ACPI object value appears to be inconsistent + */ +int thermal_acpi_trip_crit(struct acpi_device *adev, struct thermal_trip *trip) +{ + int ret; + + ret = thermal_acpi_get_temperature_object(adev, "_CRT", &trip->temperature); + if (ret) + return ret; + + /* + * The hysteresis value has no sense here because critical + * trip point has no u-turn + */ + trip->hysteresis = 0; + trip->type = THERMAL_TRIP_CRITICAL; + + return 0; +} +EXPORT_SYMBOL_GPL(thermal_acpi_trip_crit); + diff --git a/include/linux/thermal.h b/include/linux/thermal.h index 30353e4b1424..ba2d5d4c23e2 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -334,6 +334,14 @@ static inline void devm_thermal_of_zone_unregister(struct device *dev, } #endif +#ifdef CONFIG_THERMAL_ACPI +int thermal_acpi_trip_gtsh(struct acpi_device *adev); +int thermal_acpi_trip_crit(struct acpi_device *adev, struct thermal_trip *trip); +int thermal_acpi_trip_hot(struct acpi_device *adev, struct thermal_trip *trip); +int thermal_acpi_trip_psv(struct acpi_device *adev, struct thermal_trip *trip); +int thermal_acpi_trip_act(struct acpi_device *adev, struct thermal_trip *trip, int id); +#endif + int __thermal_zone_get_trip(struct thermal_zone_device *tz, int trip_id, struct thermal_trip *trip); int thermal_zone_get_trip(struct thermal_zone_device *tz, int trip_id, From patchwork Wed Jan 4 22:21:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 39138 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1514wrt; Wed, 4 Jan 2023 14:31:21 -0800 (PST) X-Google-Smtp-Source: AMrXdXuJAGraFc+kJZ0+UNdrenqZ+QTUD7WZlEKtK7xSXjzowtkLU9NVzDAIIc4mEVHQnwmhtby4 X-Received: by 2002:a17:906:8e96:b0:7c1:808e:7660 with SMTP id ru22-20020a1709068e9600b007c1808e7660mr46729712ejc.43.1672871480832; Wed, 04 Jan 2023 14:31:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672871480; cv=none; d=google.com; s=arc-20160816; b=u4jQToCqy1PQBMOUr2VroI++ZlPCcfq84APrJDsrD2XUmsFcQe1rxy2rPsqCMK1qj/ Dtc0pynOH6/f0Gno8yYjOJlYj9O5zAMSSXDKm0t1uUinRmRAUr3XgHmKQTqTNesZ8UcU GCiRjoXQPjfUjKYbYfwSJG08xEleDrab4VMvjyPVPJdc/fojetbCpKEnGPcOLxssuq3R J0+/ijJKAU3cIEaSkih8gyo7yC0P6a6PdgAn9XxvMKqXZmMzrYRgp8bT9AtyfPyeRwxg b1tDfZVrVRDL6y/J06iLJiJjyGzHNvfPt0gWpnZB5PuLK9j7M+ldbxtMNSCk1suUXGL/ 4PjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=WisTl2/jQnyj0HaOzjGAaCKi4fhfXEEwsPLq/X09SZo=; b=ookDwaL5OXRvQMhV8nZBRJMqZwD+OwUicvanEXrQ8i9U71jCI+e6YFAbiQTm4QxxVw +Q/DHtz3dNMZ3N03FFl37TS+u5O4CQc7vq1w8HhPWGSnu3J2RHW00fzx6gsipHAWNTw9 X/ynYOLPqjSwem8Q6vQIEtw0RW//FTF7J5rsEQuyZBVfPdXUxKwvU8xeJdKPGfdQIr/h wr2ygSaq8c3lp/GYZIY1H7G9+KtTD5WQhlWvrAgCmk3FbEuf7LKTXMyr1JVPBspJtVOf MQuPcgF/bz+UVQj/EDoOQbT+n2N35cH8TJ5BdN/JoH1jWTUMbOXkGEaiYHnl+XzKjLAc IsvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cD6944PC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hv15-20020a17090760cf00b007ae1e635ea3si33261557ejc.754.2023.01.04.14.30.49; Wed, 04 Jan 2023 14:31:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cD6944PC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-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 S240572AbjADWVw (ORCPT + 99 others); Wed, 4 Jan 2023 17:21:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240558AbjADWVi (ORCPT ); Wed, 4 Jan 2023 17:21:38 -0500 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55E5BE35 for ; Wed, 4 Jan 2023 14:21:36 -0800 (PST) Received: by mail-wm1-x332.google.com with SMTP id ja17so26724770wmb.3 for ; Wed, 04 Jan 2023 14:21:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WisTl2/jQnyj0HaOzjGAaCKi4fhfXEEwsPLq/X09SZo=; b=cD6944PCnLq8drhYHKHUrq0ielkWQVciHL7pDRpNACUVoSKeM0StZq+ckd9jN91ltQ g5QU4dUa51ZYh7Ntg06S0zKAAFspwByXMEZUSExZIr9ryaWHxB2kjQiLC7RiB/rza0+C wAIlQLkRWlSV9ubmJbsK0bAIl09aVJaU3w9zYWFRSImRvdaPb+/CdHjDkgCxehuLI3Ir u8ImyOrVidXATce8i03ZYt3nJ4pk8WfzGVxMT3CRydbLvBjJgk6NqS8UXOQUkR37p5+E NF14uybfr8sGVoQ45dWMCF4MBeJ09NVR2k6tftAEXdOmWRzMLThvriOIjUFmVo9+noKR QMOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WisTl2/jQnyj0HaOzjGAaCKi4fhfXEEwsPLq/X09SZo=; b=u61beVJfG684cDLkDJ6uZm46Cr0isxugG/bt7ugksJZpQABPIGvhvk0DgM0v++bV9b gwByd5dhU4ZkKiWar6TEZJ7t2GajcnLOIoO/Jyg/BPS3D81PmHE3cUPrNv4PGtVT4jL/ n86KtHeOj8lGaeucKRUTaH2xafiHWywnQtV2dhlhrzJOqm+InOZBIRwxwbjcthP0Pzbu iOrAGEvEQNGAO5oDVr7t0GrARt4V59FJwVVpq8phJHZtOr0EpNiBYe9Cl2nY9lZCbgcO vAQ5cb58csqKGxihaOpfbdcAUQ/bXub0fAODoLuSWRFMsyuFgmALKppV0nDFA9F7e7GW 7PWw== X-Gm-Message-State: AFqh2kpXgXX0BUmrwJd60rpWGc96b41Bxkirl4giA9rDklyqcONdwDj9 z9k7IwywUGe+zAH5GNmYcrmJN0SPN2LfbpY6 X-Received: by 2002:a05:600c:5113:b0:3d3:5c21:dd99 with SMTP id o19-20020a05600c511300b003d35c21dd99mr34219998wms.18.1672870894769; Wed, 04 Jan 2023 14:21:34 -0800 (PST) Received: from mai.. (146725694.box.freepro.com. [130.180.211.218]) by smtp.gmail.com with ESMTPSA id l7-20020adfc787000000b002238ea5750csm42430278wrg.72.2023.01.04.14.21.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Jan 2023 14:21:34 -0800 (PST) From: Daniel Lezcano X-Google-Original-From: Daniel Lezcano To: daniel.lezcano@linaro.org, rafael@kernel.org, srinivas.pandruvada@linux.intel.com Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, rui.zhang@intel.com, christophe.jaillet@wanadoo.fr, Amit Kucheria , Len Brown , Randy Dunlap , Ricardo Neri Subject: [PATCH v3 2/3] thermal/drivers/intel: Use generic trip points for intel_pch Date: Wed, 4 Jan 2023 23:21:26 +0100 Message-Id: <20230104222127.2364396-3-daniel.lezcano@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230104222127.2364396-1-daniel.lezcano@kernel.org> References: <20230104222127.2364396-1-daniel.lezcano@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754132885821683307?= X-GMAIL-MSGID: =?utf-8?q?1754132885821683307?= From: Daniel Lezcano The thermal framework gives the possibility to register the trip points with the thermal zone. When that is done, no get_trip_* ops are needed and they can be removed. Convert the ops content logic into generic trip points and register them with the thermal zone. In order to consolidate the code, use the ACPI thermal framework API to fill the generic trip point from the ACPI tables. It has been tested on a Intel i7-8650U - x280 with the INT3400, the PCH, ACPITZ, and x86_pkg_temp. No regression observed so far. Signed-off-by: Daniel Lezcano --- V3: - The driver Kconfig option selects CONFIG_THERMAL_ACPI --- drivers/thermal/intel/Kconfig | 1 + drivers/thermal/intel/intel_pch_thermal.c | 88 +++++------------------ 2 files changed, 20 insertions(+), 69 deletions(-) diff --git a/drivers/thermal/intel/Kconfig b/drivers/thermal/intel/Kconfig index f0c845679250..738b88b290f4 100644 --- a/drivers/thermal/intel/Kconfig +++ b/drivers/thermal/intel/Kconfig @@ -75,6 +75,7 @@ config INTEL_BXT_PMIC_THERMAL config INTEL_PCH_THERMAL tristate "Intel PCH Thermal Reporting Driver" depends on X86 && PCI + select THERMAL_ACPI help Enable this to support thermal reporting on certain intel PCHs. Thermal reporting device will provide temperature reading, diff --git a/drivers/thermal/intel/intel_pch_thermal.c b/drivers/thermal/intel/intel_pch_thermal.c index dabf11a687a1..530fe9b38381 100644 --- a/drivers/thermal/intel/intel_pch_thermal.c +++ b/drivers/thermal/intel/intel_pch_thermal.c @@ -65,6 +65,8 @@ #define WPT_TEMP_OFFSET (PCH_TEMP_OFFSET * MILLIDEGREE_PER_DEGREE) #define GET_PCH_TEMP(x) (((x) / 2) + PCH_TEMP_OFFSET) +#define PCH_MAX_TRIPS 3 /* critical, hot, passive */ + /* Amount of time for each cooling delay, 100ms by default for now */ static unsigned int delay_timeout = 100; module_param(delay_timeout, int, 0644); @@ -82,12 +84,7 @@ struct pch_thermal_device { const struct pch_dev_ops *ops; struct pci_dev *pdev; struct thermal_zone_device *tzd; - int crt_trip_id; - unsigned long crt_temp; - int hot_trip_id; - unsigned long hot_temp; - int psv_trip_id; - unsigned long psv_temp; + struct thermal_trip trips[PCH_MAX_TRIPS]; bool bios_enabled; }; @@ -102,33 +99,22 @@ static void pch_wpt_add_acpi_psv_trip(struct pch_thermal_device *ptd, int *nr_trips) { struct acpi_device *adev; - - ptd->psv_trip_id = -1; + int ret; adev = ACPI_COMPANION(&ptd->pdev->dev); - if (adev) { - unsigned long long r; - acpi_status status; - - status = acpi_evaluate_integer(adev->handle, "_PSV", NULL, - &r); - if (ACPI_SUCCESS(status)) { - unsigned long trip_temp; - - trip_temp = deci_kelvin_to_millicelsius(r); - if (trip_temp) { - ptd->psv_temp = trip_temp; - ptd->psv_trip_id = *nr_trips; - ++(*nr_trips); - } - } - } + if (!adev) + return; + + ret = thermal_acpi_trip_psv(adev, &ptd->trips[*nr_trips]); + if (ret) + return; + + ++(*nr_trips); } #else static void pch_wpt_add_acpi_psv_trip(struct pch_thermal_device *ptd, int *nr_trips) { - ptd->psv_trip_id = -1; } #endif @@ -163,21 +149,19 @@ static int pch_wpt_init(struct pch_thermal_device *ptd, int *nr_trips) } read_trips: - ptd->crt_trip_id = -1; trip_temp = readw(ptd->hw_base + WPT_CTT); trip_temp &= 0x1FF; if (trip_temp) { - ptd->crt_temp = GET_WPT_TEMP(trip_temp); - ptd->crt_trip_id = 0; + ptd->trips[*nr_trips].temperature = GET_WPT_TEMP(trip_temp); + ptd->trips[*nr_trips].type = THERMAL_TRIP_CRITICAL; ++(*nr_trips); } - ptd->hot_trip_id = -1; trip_temp = readw(ptd->hw_base + WPT_PHL); trip_temp &= 0x1FF; if (trip_temp) { - ptd->hot_temp = GET_WPT_TEMP(trip_temp); - ptd->hot_trip_id = *nr_trips; + ptd->trips[*nr_trips].temperature = GET_WPT_TEMP(trip_temp); + ptd->trips[*nr_trips].type = THERMAL_TRIP_HOT; ++(*nr_trips); } @@ -298,39 +282,6 @@ static int pch_thermal_get_temp(struct thermal_zone_device *tzd, int *temp) return ptd->ops->get_temp(ptd, temp); } -static int pch_get_trip_type(struct thermal_zone_device *tzd, int trip, - enum thermal_trip_type *type) -{ - struct pch_thermal_device *ptd = tzd->devdata; - - if (ptd->crt_trip_id == trip) - *type = THERMAL_TRIP_CRITICAL; - else if (ptd->hot_trip_id == trip) - *type = THERMAL_TRIP_HOT; - else if (ptd->psv_trip_id == trip) - *type = THERMAL_TRIP_PASSIVE; - else - return -EINVAL; - - return 0; -} - -static int pch_get_trip_temp(struct thermal_zone_device *tzd, int trip, int *temp) -{ - struct pch_thermal_device *ptd = tzd->devdata; - - if (ptd->crt_trip_id == trip) - *temp = ptd->crt_temp; - else if (ptd->hot_trip_id == trip) - *temp = ptd->hot_temp; - else if (ptd->psv_trip_id == trip) - *temp = ptd->psv_temp; - else - return -EINVAL; - - return 0; -} - static void pch_critical(struct thermal_zone_device *tzd) { dev_dbg(&tzd->device, "%s: critical temperature reached\n", tzd->type); @@ -338,8 +289,6 @@ static void pch_critical(struct thermal_zone_device *tzd) static struct thermal_zone_device_ops tzd_ops = { .get_temp = pch_thermal_get_temp, - .get_trip_type = pch_get_trip_type, - .get_trip_temp = pch_get_trip_temp, .critical = pch_critical, }; @@ -423,8 +372,9 @@ static int intel_pch_thermal_probe(struct pci_dev *pdev, if (err) goto error_cleanup; - ptd->tzd = thermal_zone_device_register(bi->name, nr_trips, 0, ptd, - &tzd_ops, NULL, 0, 0); + ptd->tzd = thermal_zone_device_register_with_trips(bi->name, ptd->trips, + nr_trips, 0, ptd, + &tzd_ops, NULL, 0, 0); if (IS_ERR(ptd->tzd)) { dev_err(&pdev->dev, "Failed to register thermal zone %s\n", bi->name); From patchwork Wed Jan 4 22:21:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 39139 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2169wrt; Wed, 4 Jan 2023 14:33:33 -0800 (PST) X-Google-Smtp-Source: AMrXdXsd/rJvnGas4uou14E71NPQ2AT8aRWgNr3lhc/y/jr5dXRnQ+BGojwBbBr+N+rdb9Jk4SrT X-Received: by 2002:a05:6402:1caa:b0:475:b14a:f83a with SMTP id cz10-20020a0564021caa00b00475b14af83amr39179599edb.15.1672871613126; Wed, 04 Jan 2023 14:33:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672871613; cv=none; d=google.com; s=arc-20160816; b=DHUFgXo2VRCeO3ASRpo/pdFp8sJ/qRGwEm8275VN7/YSEA9THtUn6SXhnxITAvQYeo byq5MfZ31UYJCl0ZQi8VfNcHoyWaS0YQ6WfBv4AB4m/h0+wASI2Qgx93FLvhKqTol9Hc i7ey7Oij7wGSx7U9m0Qs6fWmABK0JZh+CF42VP7DOVVLvfEDhE2Ou+P/YkUUJiusvR2i VqqFrw76ogbMzr28Yk1yk7q45YhOatz7Uq/b3iMEqnJ106JJEJXFYcWB43jffAXLq5y6 jucH9i3+etJ/gFUwir1qk8MTiI6ghl8dT2lkBu7bmq11cU486fuTRD3EGdWQKVRsqmY5 hjww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=sRpdkBF8vlGiGm4/xH4GyWurcWx8IXmtNRmJ/fowJgo=; b=z6vgFJqL/sNL/7m6sUZS0ovSiJw7B5PG7AWsVXtOppROrwNacZ2G0ugSP45tNDqoOg m5oB/cmKojCZbxxpsP7scGN9Z0lLVYktLRlUqrOG+XaZcWwCPLXAtkg7xx92NmM/jUWh 4RJpGClHuUNAz5HQXGXHT0TqrTpLniLxzJkpN6NX8N5J8El+atu312XXQyq0TPTTcZph cihqmbYPpZXjbuxh0l+oomMD8/G4et3ZJr7OsiU0Z+JXtSsnLaag9Njf3LFzBq9Ddlf2 fffpy179jPyxrN0W2iwHkFn+6C9Qws7L1q/BQLKyFQP+e0Fbz+fhJvWYRgTE4aX2N1ug cKMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=U1TlV6bP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sd40-20020a1709076e2800b00841e8b0d992si32623273ejc.77.2023.01.04.14.33.10; Wed, 04 Jan 2023 14:33:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=U1TlV6bP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-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 S240556AbjADWVz (ORCPT + 99 others); Wed, 4 Jan 2023 17:21:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240575AbjADWVw (ORCPT ); Wed, 4 Jan 2023 17:21:52 -0500 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E3263FA0C for ; Wed, 4 Jan 2023 14:21:39 -0800 (PST) Received: by mail-wr1-x435.google.com with SMTP id h16so34421614wrz.12 for ; Wed, 04 Jan 2023 14:21:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sRpdkBF8vlGiGm4/xH4GyWurcWx8IXmtNRmJ/fowJgo=; b=U1TlV6bPwS2xr8bte26ZQ/I/hC7qBxWB48u9HAuWnIMZ6kOb4GWr8zRhd0TM3ixAd0 9TCHr0a/AWUOKr0+LgpJoiqnJdvJhiF7v59qH8NcrTRGrUP62/0vNPiZgrb3c2PAewIV S8dG01KDfyOsKY4B1bjJOqiJ15S137i4aD8UxRLZNMinK8HOPmXMUaO16ASzeqS/tBDo SXiJASblRvnZZgj2C0HmqZPlCPIPb2uU0H37BmtgG+oqycWmkgMO2WpN7VlbwMxf2i2F H9mX9Ex2CeHFcLIpQYYKU/akSRqRmUIKAdw8q6tCiyro/Elas6i7UelRdxBj2tl2E38L zJ9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sRpdkBF8vlGiGm4/xH4GyWurcWx8IXmtNRmJ/fowJgo=; b=rUSA7Ka4Q5CeXQ3EGnd93Kc4foNnSKKi6r3aLpbaj4vYVui1JOLDUON/kBTlHh/1LI R6/yC6HyuD/iINoHKPFrnrNBIH1LU+iLlYrcz0yoNAKVef6wqfsRgn68ganSzlpT8Qwg QQQUvfkVLU/sy4DGovdxeLMEXdrYd6o8jKVH4lv9CJEpHW7fID05fCNKpwlKvJYa/qRD nNCNL1BoW508Ka2JXudi4iWiKtklrPn4IDcdi/yo+S2jn/q4HSirUudMgAGlb91bqZFH I9cE8flykS/azFwrqtRniDsSH5mCDUPvEgfyC39C1urqaEoaHGTfoBQM1C9AYM2jONi8 V4CA== X-Gm-Message-State: AFqh2kqr2qKDUQrEI6icQRfRLJN1qlTZXROsZKTJW8fIXKa/lPx4ZJK1 0YExVRwqFNqbWhaGaC8IyqRk3g== X-Received: by 2002:adf:d084:0:b0:278:29ac:f894 with SMTP id y4-20020adfd084000000b0027829acf894mr22530677wrh.64.1672870897920; Wed, 04 Jan 2023 14:21:37 -0800 (PST) Received: from mai.. (146725694.box.freepro.com. [130.180.211.218]) by smtp.gmail.com with ESMTPSA id l7-20020adfc787000000b002238ea5750csm42430278wrg.72.2023.01.04.14.21.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Jan 2023 14:21:37 -0800 (PST) From: Daniel Lezcano X-Google-Original-From: Daniel Lezcano To: daniel.lezcano@linaro.org, rafael@kernel.org, srinivas.pandruvada@linux.intel.com Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, rui.zhang@intel.com, christophe.jaillet@wanadoo.fr, Amit Kucheria Subject: [PATCH v3 3/3] thermal/drivers/intel: Use generic trip points int340x Date: Wed, 4 Jan 2023 23:21:27 +0100 Message-Id: <20230104222127.2364396-4-daniel.lezcano@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230104222127.2364396-1-daniel.lezcano@kernel.org> References: <20230104222127.2364396-1-daniel.lezcano@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754133024836278415?= X-GMAIL-MSGID: =?utf-8?q?1754133024836278415?= From: Daniel Lezcano The thermal framework gives the possibility to register the trip points with the thermal zone. When that is done, no get_trip_* ops are needed and they can be removed. Convert the ops content logic into generic trip points and register them with the thermal zone. In order to consolidate the code, use the ACPI thermal framework API to fill the generic trip point from the ACPI tables. It has been tested on a Intel i7-8650U - x280 with the INT3400, the PCH, ACPITZ, and x86_pkg_temp. No regression observed so far. Signed-off-by: Daniel Lezcano --- V3: - The driver Kconfig option selects CONFIG_THERMAL_ACPI - Change the initialization to use GTSH for the hysteresis on all the trip points Signed-off-by: Daniel Lezcano --- drivers/thermal/intel/int340x_thermal/Kconfig | 1 + .../int340x_thermal/int340x_thermal_zone.c | 177 ++++-------------- .../int340x_thermal/int340x_thermal_zone.h | 10 +- 3 files changed, 43 insertions(+), 145 deletions(-) diff --git a/drivers/thermal/intel/int340x_thermal/Kconfig b/drivers/thermal/intel/int340x_thermal/Kconfig index 5d046de96a5d..b7072d37101d 100644 --- a/drivers/thermal/intel/int340x_thermal/Kconfig +++ b/drivers/thermal/intel/int340x_thermal/Kconfig @@ -9,6 +9,7 @@ config INT340X_THERMAL select THERMAL_GOV_USER_SPACE select ACPI_THERMAL_REL select ACPI_FAN + select THERMAL_ACPI select INTEL_SOC_DTS_IOSF_CORE select PROC_THERMAL_MMIO_RAPL if POWERCAP help diff --git a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c index 228f44260b27..626b33253153 100644 --- a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c +++ b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c @@ -37,65 +37,6 @@ static int int340x_thermal_get_zone_temp(struct thermal_zone_device *zone, return 0; } -static int int340x_thermal_get_trip_temp(struct thermal_zone_device *zone, - int trip, int *temp) -{ - struct int34x_thermal_zone *d = zone->devdata; - int i; - - if (trip < d->aux_trip_nr) - *temp = d->aux_trips[trip]; - else if (trip == d->crt_trip_id) - *temp = d->crt_temp; - else if (trip == d->psv_trip_id) - *temp = d->psv_temp; - else if (trip == d->hot_trip_id) - *temp = d->hot_temp; - else { - for (i = 0; i < INT340X_THERMAL_MAX_ACT_TRIP_COUNT; i++) { - if (d->act_trips[i].valid && - d->act_trips[i].id == trip) { - *temp = d->act_trips[i].temp; - break; - } - } - if (i == INT340X_THERMAL_MAX_ACT_TRIP_COUNT) - return -EINVAL; - } - - return 0; -} - -static int int340x_thermal_get_trip_type(struct thermal_zone_device *zone, - int trip, - enum thermal_trip_type *type) -{ - struct int34x_thermal_zone *d = zone->devdata; - int i; - - if (trip < d->aux_trip_nr) - *type = THERMAL_TRIP_PASSIVE; - else if (trip == d->crt_trip_id) - *type = THERMAL_TRIP_CRITICAL; - else if (trip == d->hot_trip_id) - *type = THERMAL_TRIP_HOT; - else if (trip == d->psv_trip_id) - *type = THERMAL_TRIP_PASSIVE; - else { - for (i = 0; i < INT340X_THERMAL_MAX_ACT_TRIP_COUNT; i++) { - if (d->act_trips[i].valid && - d->act_trips[i].id == trip) { - *type = THERMAL_TRIP_ACTIVE; - break; - } - } - if (i == INT340X_THERMAL_MAX_ACT_TRIP_COUNT) - return -EINVAL; - } - - return 0; -} - static int int340x_thermal_set_trip_temp(struct thermal_zone_device *zone, int trip, int temp) { @@ -109,25 +50,6 @@ static int int340x_thermal_set_trip_temp(struct thermal_zone_device *zone, if (ACPI_FAILURE(status)) return -EIO; - d->aux_trips[trip] = temp; - - return 0; -} - - -static int int340x_thermal_get_trip_hyst(struct thermal_zone_device *zone, - int trip, int *temp) -{ - struct int34x_thermal_zone *d = zone->devdata; - acpi_status status; - unsigned long long hyst; - - status = acpi_evaluate_integer(d->adev->handle, "GTSH", NULL, &hyst); - if (ACPI_FAILURE(status)) - *temp = 0; - else - *temp = hyst * 100; - return 0; } @@ -138,58 +60,36 @@ static void int340x_thermal_critical(struct thermal_zone_device *zone) static struct thermal_zone_device_ops int340x_thermal_zone_ops = { .get_temp = int340x_thermal_get_zone_temp, - .get_trip_temp = int340x_thermal_get_trip_temp, - .get_trip_type = int340x_thermal_get_trip_type, .set_trip_temp = int340x_thermal_set_trip_temp, - .get_trip_hyst = int340x_thermal_get_trip_hyst, .critical = int340x_thermal_critical, }; -static int int340x_thermal_get_trip_config(acpi_handle handle, char *name, - int *temp) -{ - unsigned long long r; - acpi_status status; - - status = acpi_evaluate_integer(handle, name, NULL, &r); - if (ACPI_FAILURE(status)) - return -EIO; - - *temp = deci_kelvin_to_millicelsius(r); - - return 0; -} - int int340x_thermal_read_trips(struct int34x_thermal_zone *int34x_zone) { - int trip_cnt = int34x_zone->aux_trip_nr; - int i; + int trip_cnt; + int i, ret; + + trip_cnt = int34x_zone->aux_trip_nr; - int34x_zone->crt_trip_id = -1; - if (!int340x_thermal_get_trip_config(int34x_zone->adev->handle, "_CRT", - &int34x_zone->crt_temp)) - int34x_zone->crt_trip_id = trip_cnt++; + ret = thermal_acpi_trip_crit(int34x_zone->adev, &int34x_zone->trips[trip_cnt]); + if (!ret) + trip_cnt++; - int34x_zone->hot_trip_id = -1; - if (!int340x_thermal_get_trip_config(int34x_zone->adev->handle, "_HOT", - &int34x_zone->hot_temp)) - int34x_zone->hot_trip_id = trip_cnt++; + ret = thermal_acpi_trip_hot(int34x_zone->adev, &int34x_zone->trips[trip_cnt]); + if (!ret) + trip_cnt++; - int34x_zone->psv_trip_id = -1; - if (!int340x_thermal_get_trip_config(int34x_zone->adev->handle, "_PSV", - &int34x_zone->psv_temp)) - int34x_zone->psv_trip_id = trip_cnt++; + ret = thermal_acpi_trip_psv(int34x_zone->adev, &int34x_zone->trips[trip_cnt]); + if (!ret) + trip_cnt++; for (i = 0; i < INT340X_THERMAL_MAX_ACT_TRIP_COUNT; i++) { - char name[5] = { '_', 'A', 'C', '0' + i, '\0' }; - if (int340x_thermal_get_trip_config(int34x_zone->adev->handle, - name, - &int34x_zone->act_trips[i].temp)) + ret = thermal_acpi_trip_act(int34x_zone->adev, &int34x_zone->trips[trip_cnt], i); + if (ret) break; - int34x_zone->act_trips[i].id = trip_cnt++; - int34x_zone->act_trips[i].valid = true; + trip_cnt++; } return trip_cnt; @@ -208,7 +108,7 @@ struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev, acpi_status status; unsigned long long trip_cnt; int trip_mask = 0; - int ret; + int i, ret; int34x_thermal_zone = kzalloc(sizeof(*int34x_thermal_zone), GFP_KERNEL); @@ -228,32 +128,35 @@ struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev, int34x_thermal_zone->ops->get_temp = get_temp; status = acpi_evaluate_integer(adev->handle, "PATC", NULL, &trip_cnt); - if (ACPI_FAILURE(status)) - trip_cnt = 0; - else { - int i; - - int34x_thermal_zone->aux_trips = - kcalloc(trip_cnt, - sizeof(*int34x_thermal_zone->aux_trips), - GFP_KERNEL); - if (!int34x_thermal_zone->aux_trips) { - ret = -ENOMEM; - goto err_trip_alloc; - } - trip_mask = BIT(trip_cnt) - 1; + if (!ACPI_FAILURE(status)) { int34x_thermal_zone->aux_trip_nr = trip_cnt; - for (i = 0; i < trip_cnt; ++i) - int34x_thermal_zone->aux_trips[i] = THERMAL_TEMP_INVALID; + trip_mask = BIT(trip_cnt) - 1; + } + + int34x_thermal_zone->trips = kzalloc(sizeof(*int34x_thermal_zone->trips) * + (INT340X_THERMAL_MAX_TRIP_COUNT + trip_cnt), + GFP_KERNEL); + if (!int34x_thermal_zone->trips) { + ret = -ENOMEM; + goto err_trips_alloc; } trip_cnt = int340x_thermal_read_trips(int34x_thermal_zone); + for (i = 0; i < trip_cnt; ++i) + int34x_thermal_zone->trips[i].hysteresis = thermal_acpi_trip_gtsh(adev); + + for (i = 0; i < int34x_thermal_zone->aux_trip_nr; i++) { + int34x_thermal_zone->trips[i].type = THERMAL_TRIP_PASSIVE; + int34x_thermal_zone->trips[i].temperature = THERMAL_TEMP_INVALID; + } + int34x_thermal_zone->lpat_table = acpi_lpat_get_conversion_table( adev->handle); - int34x_thermal_zone->zone = thermal_zone_device_register( + int34x_thermal_zone->zone = thermal_zone_device_register_with_trips( acpi_device_bid(adev), + int34x_thermal_zone->trips, trip_cnt, trip_mask, int34x_thermal_zone, int34x_thermal_zone->ops, @@ -272,9 +175,9 @@ struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev, err_enable: thermal_zone_device_unregister(int34x_thermal_zone->zone); err_thermal_zone: + kfree(int34x_thermal_zone->trips); acpi_lpat_free_conversion_table(int34x_thermal_zone->lpat_table); - kfree(int34x_thermal_zone->aux_trips); -err_trip_alloc: +err_trips_alloc: kfree(int34x_thermal_zone->ops); err_ops_alloc: kfree(int34x_thermal_zone); @@ -287,7 +190,7 @@ void int340x_thermal_zone_remove(struct int34x_thermal_zone { thermal_zone_device_unregister(int34x_thermal_zone->zone); acpi_lpat_free_conversion_table(int34x_thermal_zone->lpat_table); - kfree(int34x_thermal_zone->aux_trips); + kfree(int34x_thermal_zone->trips); kfree(int34x_thermal_zone->ops); kfree(int34x_thermal_zone); } diff --git a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h index e28ab1ba5e06..0c2c8de92014 100644 --- a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h +++ b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h @@ -10,6 +10,7 @@ #include #define INT340X_THERMAL_MAX_ACT_TRIP_COUNT 10 +#define INT340X_THERMAL_MAX_TRIP_COUNT INT340X_THERMAL_MAX_ACT_TRIP_COUNT + 3 struct active_trip { int temp; @@ -19,15 +20,8 @@ struct active_trip { struct int34x_thermal_zone { struct acpi_device *adev; - struct active_trip act_trips[INT340X_THERMAL_MAX_ACT_TRIP_COUNT]; - unsigned long *aux_trips; + struct thermal_trip *trips; int aux_trip_nr; - int psv_temp; - int psv_trip_id; - int crt_temp; - int crt_trip_id; - int hot_temp; - int hot_trip_id; struct thermal_zone_device *zone; struct thermal_zone_device_ops *ops; void *priv_data;