From patchwork Fri Jan 20 23:15:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 46696 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp476420wrn; Fri, 20 Jan 2023 15:18:38 -0800 (PST) X-Google-Smtp-Source: AMrXdXv/cd0ie8fmKUbVZqKf9alauNoPboD/RKdWnHuye6FVqq6UxnOuGT/1wFZP8Y0q72BuhTUB X-Received: by 2002:a05:6a21:1088:b0:b8:7735:bed0 with SMTP id nl8-20020a056a21108800b000b87735bed0mr13718319pzb.56.1674256718539; Fri, 20 Jan 2023 15:18:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674256718; cv=none; d=google.com; s=arc-20160816; b=EGnS/wybcuRBGOxwWGEmkvGtYkPHV6F7zWkILcD80p5Y9vNncHqVafvoOal40TgJ+b 6CR4IJaa9M4OnOwOvKz5SN4o490KP6i2l/esXlv0NGYdF9ro7KiDgSIJWeQJ4KI0KISL t/BQYQKxzrR11d87aZzkg28MvU9zoP4lD/O46OqteHsiltuDRJsJOSv2UphpY5nt1e7j 51264D9LOYvHMSUSDmAsoo2m/+w0DlMgo3yIKAThOm+VHAKnIrJIAxClN6CT77Th6miD UAIP9Rqa5zYlLzXI1kMAUUu2TgcFsL8JlUzKACJ8W4wZR8E1Umbq7JEPvWBVyWug80+s h4xQ== 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=SmpmbTelOLm3GxZGJKc3RpPo4g2mgSJUW4mMTFcNbb8=; b=Ovv5t5o9H1PGVBJop5KsF+Ts7TS0CwjXMiEbT8ZmDWBfeC/vgrDXJkBIwg9eXRsEBM 3SYCsMf9bQLofcu66HYiEQ9BGrIz5bv7KBOsxRV5/3Z6qV/q7h3DPWX2ezIFR8EjQzcH BCa6PNCZAFrwxx43m4BN8MsEOixY0zKAoNQ5IQtn09hN3phbEsFFhCB3aJsdXjJBNQ+L B8Lri41iqedxuXZxlycnmapgmgOy7MsJ9ZjsVQH19mYs5n4Z8v6T8meUb68flJs/n1a5 3rGRbHNT/PkAmZMqP7JqTspCavo4PgUWtqlL30zvmvFCYfh7OX/Y6PjOm4dAYOKTdAmT OqbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="U/z4QGUZ"; 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 r20-20020a6560d4000000b0045c88c3b799si39425963pgv.709.2023.01.20.15.18.25; Fri, 20 Jan 2023 15:18:38 -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="U/z4QGUZ"; 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 S229680AbjATXPy (ORCPT + 99 others); Fri, 20 Jan 2023 18:15:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229831AbjATXPt (ORCPT ); Fri, 20 Jan 2023 18:15:49 -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 CA6E572B8 for ; Fri, 20 Jan 2023 15:15:47 -0800 (PST) Received: by mail-wr1-x435.google.com with SMTP id r9so6104315wrw.4 for ; Fri, 20 Jan 2023 15:15:47 -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=SmpmbTelOLm3GxZGJKc3RpPo4g2mgSJUW4mMTFcNbb8=; b=U/z4QGUZDtiQ8kXnYfkagTBBcN0fw9eIOLR+nRuM9WEZrw5v7ha6npdco/9bTop06c UydrAmz3Ikow3YGkW//kOV9sFv1BQpZc2GDvdgPLcG+Ha9qUIvJ+aG6SIFlm20suGpAi WB2dhUP8/HBRqkOre6bhZR2tNEjFQhHwqVP9zVzAPinhBIXs8rmnwms7rDJPJiMn4cK7 7elFOo0Ko6fp1gqKyYhbuyVWBrSqnIQg5OgnKYAZ4S30L7d2/xI3vsFJhYZbxaG0riUs cuu1aOg9YMrB6e1iA3asce1pPxfRrWg2qK4VoNlpnlqw6yYIxGdeAHjVwzr10gQVuYFf FtTg== 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=SmpmbTelOLm3GxZGJKc3RpPo4g2mgSJUW4mMTFcNbb8=; b=PD4tS2ONVC+uK+vdNcUeHdTbx3UNU/fQlZqocvsTmmmnTSIwWJMWNf4ooh4iU53uMh hg6E8S1T6dBHqeO6BLJw2b/VuJjqy7Dzq68cxngNDWqlNW1H7Wl4w6f57hP2YZZYgnZp 2ltf5m4kX+8MqhP3fK278M83SwJqSYStC9dY+XUdccGpTU4m7LnhmSwwLt1GFF+q/X10 87yEPzPfZuXM+rW+OjYkAoa5lU7oh6po82DYdVr361hnOjKZ6vTVJYCPEjx+8lYK+PH7 4l46L5XRUeQ9r2xM0HbAoVrFw+nyZdFjy1FOeohRx4oElKVgnur3AGK4ohpUgeS7e9+X QzgA== X-Gm-Message-State: AFqh2koy0Jz29pwnTPQqsB2JnBUwJSQ65djk8kp/o+D7AE79BnR8/nEe ORx/YWRhbe2Rr+PXZNotEFw0jw== X-Received: by 2002:a5d:6389:0:b0:2bf:95dc:436b with SMTP id p9-20020a5d6389000000b002bf95dc436bmr1549148wru.59.1674256546148; Fri, 20 Jan 2023 15:15:46 -0800 (PST) Received: from mai.. (146725694.box.freepro.com. [130.180.211.218]) by smtp.gmail.com with ESMTPSA id t17-20020a05600001d100b00241d21d4652sm36436828wrx.21.2023.01.20.15.15.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 15:15:45 -0800 (PST) From: Daniel Lezcano To: daniel.lezcano@linaro.org, rafael@kernel.org Cc: srinivas.pandruvada@linux.intel.com, 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 v6 1/3] thermal/acpi: Add ACPI trip point routines Date: Sat, 21 Jan 2023 00:15:28 +0100 Message-Id: <20230120231530.2368330-2-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230120231530.2368330-1-daniel.lezcano@linaro.org> References: <20230120231530.2368330-1-daniel.lezcano@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: * 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?1755585413032417727?= X-GMAIL-MSGID: =?utf-8?q?1755585413032417727?= 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 Reviewed-by: Zhang Rui Tested-by: srinivas pandruvada Signed-off-by: Rafael J. Wysocki Signed-off-by: Rafael J. Wysocki Signed-off-by: Daniel Lezcano --- V6: - Changed the functions name and prototype to return the temperature instead of passing a pointer - Removed the GTSH function as it does not belong to the ACPI standard - Changed hysteresis -> hyst, temperature -> temp - Changed message level info -> debug - Changed error messages - Return -ENODATA error only - Fixed description functions V5: - Fixed GTSH unit conversion, deciK -> milli C 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 | 185 +++++++++++++++++++++++++++++++++ include/linux/thermal.h | 7 ++ 4 files changed, 197 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..c72fca44bc86 --- /dev/null +++ b/drivers/thermal/thermal_acpi.c @@ -0,0 +1,185 @@ +// 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 HYST_MIN_DECIK 0 +#define HYST_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 may be considered + * bogus and we can assume the firmware has no data to provide. + */ +#define TEMP_MIN_DECIK 2180 +#define TEMP_MAX_DECIK 4480 + +static int thermal_acpi_get_temp(struct acpi_device *adev, char *object_name) +{ + unsigned long long temp; + acpi_status status; + + status = acpi_evaluate_integer(adev->handle, object_name, NULL, &temp); + if (ACPI_FAILURE(status)) { + acpi_handle_debug(adev->handle, "Failed to get temperature object '%s'\n", object_name); + return -ENODATA; + } + + if (temp < TEMP_MIN_DECIK || temp >= TEMP_MAX_DECIK) { + acpi_handle_debug(adev->handle, "Invalid value '%llu' returned by '%s'\n", temp, object_name); + return -ENODATA; + } + + return (int)temp; +} + +/** + * thermal_acpi_active_trip_temp() - Get the specified active trip point + * @adev: Thermal zone ACPI device object to get the description from + * @trip: Trip point structure to be populated on success + * @id: Active cooling level (0 - 9) + * + * Evaluate the _ACx object for the thermal zone represented by @adev + * to obtain the temperature of the active cooling trip point + * corresponding to the active cooling level given by @id and + * initialize @trip as an active trip point using that temperature + * value. + * + * Return: + * * 0 - Success + * * -ENODATA - Failed to get the ACPI object, or the value appears to be inconsistent + */ +int thermal_acpi_active_trip_temp(struct acpi_device *adev, + struct thermal_trip *trip, int id) +{ + char name[] = "_AC0"; + int temp; + + if (id < 0 || id > 9) + return -EINVAL; + + name[3] += id; + + temp = thermal_acpi_get_temp(adev, name); + if (temp < 0) + return temp; + + trip->temperature = deci_kelvin_to_millicelsius(temp); + trip->hysteresis = 0; + trip->type = THERMAL_TRIP_ACTIVE; + + return 0; +} +EXPORT_SYMBOL_GPL(thermal_acpi_active_trip_temp); + +/** + * thermal_acpi_passive_trip_temp() - Get the passive trip point + * @adev: Thermal zone ACPI device object to get the description from + * @trip: Trip point structure to be populated on success + * + * Evaluate the _PSV object for the thermal zone represented by @adev + * to obtain the temperature of the passive cooling trip point and + * initialize @trip as a passive trip point using that temperature + * value. + * + * Return: + * * 0 - Success + * * -ENODATA - Failed to get the ACPI object, or the value appears to be inconsistent + */ +int thermal_acpi_passive_trip_temp(struct acpi_device *adev, struct thermal_trip *trip) +{ + int temp; + + temp = thermal_acpi_get_temp(adev, "_PSV"); + if (temp < 0) + return temp; + + trip->temperature = deci_kelvin_to_millicelsius(temp); + trip->hysteresis = 0; + trip->type = THERMAL_TRIP_PASSIVE; + + return 0; +} +EXPORT_SYMBOL_GPL(thermal_acpi_passive_trip_temp); + +/** + * thermal_acpi_hot_trip_temp() - 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 + * + * Evaluate the _HOT object for the thermal zone represented by @adev + * to obtain the temperature of the trip point at which the system is + * expected to be put into the S4 sleep state and initialize @trip as + * a hot trip point using that temperature value. + * + * Return: + * * 0 - Success + * * -ENODATA - Failed to get the ACPI object, or the value appears to be inconsistent + */ +int thermal_acpi_hot_trip_temp(struct acpi_device *adev, struct thermal_trip *trip) +{ + int temp; + + temp = thermal_acpi_get_temp(adev, "_HOT"); + if (temp < 0) + return temp; + + trip->temperature = deci_kelvin_to_millicelsius(temp); + trip->hysteresis = 0; + trip->type = THERMAL_TRIP_HOT; + + return 0; +} +EXPORT_SYMBOL_GPL(thermal_acpi_hot_trip_temp); + +/** + * thermal_acpi_critical_trip_temp() - 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 + * + * Evaluate the _CRT object for the thermal zone represented by @adev + * to obtain the temperature of the critical cooling trip point and + * initialize @trip as a critical trip point using that temperature + * value. + * + * Return: + * * 0 - Success + * * -ENODATA - Failed to get the ACPI object, or the value appears to be inconsistent + */ +int thermal_acpi_critical_trip_temp(struct acpi_device *adev, struct thermal_trip *trip) +{ + int temp; + + temp = thermal_acpi_get_temp(adev, "_CRT"); + if (temp < 0) + return temp; + + /* + * The hysteresis value has no sense here because critical + * trip point has no u-turn + */ + trip->temperature = deci_kelvin_to_millicelsius(temp); + trip->hysteresis = 0; + trip->type = THERMAL_TRIP_CRITICAL; + + return 0; +} +EXPORT_SYMBOL_GPL(thermal_acpi_critical_trip_temp); + diff --git a/include/linux/thermal.h b/include/linux/thermal.h index 30353e4b1424..2aee1f0d5fac 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -334,6 +334,13 @@ static inline void devm_thermal_of_zone_unregister(struct device *dev, } #endif +#ifdef CONFIG_THERMAL_ACPI +int thermal_acpi_critical_trip_temp(struct acpi_device *adev, struct thermal_trip *trip); +int thermal_acpi_hot_trip_temp(struct acpi_device *adev, struct thermal_trip *trip); +int thermal_acpi_passive_trip_temp(struct acpi_device *adev, struct thermal_trip *trip); +int thermal_acpi_active_trip_temp(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 Fri Jan 20 23:15:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 46698 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp476690wrn; Fri, 20 Jan 2023 15:19:25 -0800 (PST) X-Google-Smtp-Source: AMrXdXsbB+sS/rzSWYsZowFcewKLtroT8YNzTVIuxfcZyAZpzefQ6Un2bJ2Il+WWWi8HKybBzxXT X-Received: by 2002:a17:90a:7a84:b0:214:132a:2bea with SMTP id q4-20020a17090a7a8400b00214132a2beamr17485803pjf.4.1674256765269; Fri, 20 Jan 2023 15:19:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674256765; cv=none; d=google.com; s=arc-20160816; b=bnwjEiQN6Pg/K71A4sAwljJ20PAHt0JHyReSvN4fM/V2Kl5Fb8Fnxsa6DkWp9xPffb hMURMRksrBcMzAcyJS7I3osZaP1UbddDa9Go+laRSaiHUYZ1UaBTqGwNiFWedKNiBSih 8O6Xq9O005kTJJr4AmxKnvCfhqk0veyGo1ss1uHMA/A5xwUp0VPxpjSJHGt5p+oS+oSk mSrQSeE7soFoF+lNgrYE3LP4wnuTTfcnfsChBEQ9SwW7cNumh+OcKXa+XG7uljY+vUvE 24SrgJzFjGgmp9J570zWeTg62tYU+5pxWlsR58goYOTYyttYuLOd2lIPByF+S+ek8TJp pLqg== 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=+GqNUBNPb4FrqrObowiEfJdLlDOURdpHlsNV8vYm+w0=; b=wPLmdmPYSFuNc5JKfXxpkJVElDswdl331eqGsz9I4h7HJH3iFhsBx3v8k60n7Mrz68 WxnsfvY6a912gZIO7GSXdzHC/ox8bL2UYwo/B+JnCDRGbuuH1ACDhLdlfGQ1iDDpwMnl KzjL9FcyaP1dETrLLsUUfwBA8CtRQBqVOStgHh+ytu6e0J+US074QWIYPU9r05JGea7d M+v6FXYizxEVHZ7cTAu0Keh2SQYYQMoMunbiJPrmqCGVTzaYMTdm6CGLknW2LhThIXnG qtkJolY55lj/3eyyxSl1hwrrU9ELL14HRCg+QvrQtYnypOyx4wuBCZgV2fi8hJnTzm4W d9lQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=V+dqd01O; 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 k9-20020a635609000000b0046ae2a8ea9csi43336805pgb.733.2023.01.20.15.19.12; Fri, 20 Jan 2023 15:19:25 -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=V+dqd01O; 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 S230154AbjATXP6 (ORCPT + 99 others); Fri, 20 Jan 2023 18:15:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229975AbjATXPu (ORCPT ); Fri, 20 Jan 2023 18:15:50 -0500 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B65D47430 for ; Fri, 20 Jan 2023 15:15:49 -0800 (PST) Received: by mail-wr1-x42c.google.com with SMTP id h12so2100179wrv.10 for ; Fri, 20 Jan 2023 15:15:49 -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=+GqNUBNPb4FrqrObowiEfJdLlDOURdpHlsNV8vYm+w0=; b=V+dqd01OtC9x9HcxN1eVQup28u1BdorVv9yEq5mIhZebGtanPITQZo87sKVgl8WxGF qtAKzftadJC6ZqrGiA4fKTg8XElnrlZ5kH9Qnc2u7dyZ0O9oHnpCHodx/k3t/VY17uzZ lmdrI8CMrzWbe+oIfRBA/at+MJDZaMsDswa0Gf9k8SADxotas8KISB1cRT2zTCyXSkR6 641K/RsuzCiUDZCZ474ILOp/YFl6yftrmEs//G+wh29VNgkdMwSiMs2x+pHuVmxayMgx uIsrNPZOydME0ZEQnZUDYLrIhv9EsIIaOSAe5XhFCV57KbZ6Vb9lzK4Po9nZndELHa+k 2IqA== 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=+GqNUBNPb4FrqrObowiEfJdLlDOURdpHlsNV8vYm+w0=; b=ck6qGS9z2uobvavIC9JnHLgAOYPZkPmdy86HVobQtNBV0pZBRNVhaHQVso+BMwRqKy 13nndZs6G8Gb8zwFbkkb3XHJLGmQnAt5naftEI96JF5Wn/xqLj9qqYmbVlLEmZJ2ULcL mpY9k4luJQlx+ZHXxmGRXZ7FIPk4U4BN7eiyBo4hcqg/5OUyL3kSHTRvJIZQhED3EwBz RgqZyB250m7I876kXRfjBKysk5r8wGltjBq9+XVypdqR8XcX6OSKn3cANTsBifQSXLyb LbRL+LJNhFQi2IWhS6qfgMUGQcgb1sckG27WRFJpEtFQJiy4Yusy+ChsmuJOfKbgP4BT eJvg== X-Gm-Message-State: AFqh2krI8kzm5WteMkRDzXi24lH3MW0fbhMdqVDTdOCPKWhzP13rQmrF /b/w6Pwcp299MEXZ/yBYBBrfipC7rRVwtHob X-Received: by 2002:a5d:4103:0:b0:2be:5408:5d6d with SMTP id l3-20020a5d4103000000b002be54085d6dmr4037839wrp.21.1674256548930; Fri, 20 Jan 2023 15:15:48 -0800 (PST) Received: from mai.. (146725694.box.freepro.com. [130.180.211.218]) by smtp.gmail.com with ESMTPSA id t17-20020a05600001d100b00241d21d4652sm36436828wrx.21.2023.01.20.15.15.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 15:15:48 -0800 (PST) From: Daniel Lezcano To: daniel.lezcano@linaro.org, rafael@kernel.org Cc: srinivas.pandruvada@linux.intel.com, 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 , Ricardo Neri , Randy Dunlap Subject: [PATCH v6 2/3] thermal/drivers/intel: Use generic trip points for intel_pch Date: Sat, 21 Jan 2023 00:15:29 +0100 Message-Id: <20230120231530.2368330-3-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230120231530.2368330-1-daniel.lezcano@linaro.org> References: <20230120231530.2368330-1-daniel.lezcano@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: * 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?1755585461592382784?= X-GMAIL-MSGID: =?utf-8?q?1755585461592382784?= 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 Reviewed-by: Zhang Rui Tested-by: srinivas pandruvada --- V6: - Propagate the function name change from thermal ACPI V4: - Changed select THERMAL_ACPI if ACPI in order to prevent dependency inconsistency V3: - The driver Kconfig option selects CONFIG_THERMAL_ACPI Signed-off-by: Daniel Lezcano --- 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..7d68c076c23d 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 if 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..5f1568270fc7 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_passive_trip_temp(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 Fri Jan 20 23:15:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 46697 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp476472wrn; Fri, 20 Jan 2023 15:18:47 -0800 (PST) X-Google-Smtp-Source: AMrXdXspAXTT2I5zbfLwQdhi1fQPyDQe6ExOrWzK4r6jaqUXK2R4Suv+WYXL3taXrkgDkKqh+J8z X-Received: by 2002:a05:6a20:7d8e:b0:b8:5e0f:a6a7 with SMTP id v14-20020a056a207d8e00b000b85e0fa6a7mr22551887pzj.34.1674256727647; Fri, 20 Jan 2023 15:18:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674256727; cv=none; d=google.com; s=arc-20160816; b=HQw6PEUB+hoESUoFJ0Jo3SsvkYzSzfMKBvylasOaMRlhqCxZ86Jh1RQddcQOPsrJNy xO1fBl7sXHzY2/iemIjmBmC44fl+FJ43YPHheums1YQO3FnG+SDhLn+viEQd7MvBTJZr 8S8CXy05VApfQREB+ZXRLVczuldynOVluUwj/Qo7W7Y2AcQhVMugeCIY4hNDXrxvthxg uFKC7EEuVTPMrA9IzInKFoCEMkaVB+ZO1AjzU6QQs895R1SJDVGbWgrfv8GgbQJOFDTs mAoCX3qb2n3SpvoX6KIpliyvTMlrqbUdDz4EkXfYaY4bxM0ZX5c1aflxG5b9Qgdkt1Oj 4wDA== 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=MfXu0aEKsZLPUd+pHK859PYllaHR7EY7wWkz0R5COZw=; b=R/f471fx6L9Gv5cdmJJtDtz39nylkpUFVFUbkiJKLHkNE1cnSm/rjPJdZ7OCB54uFm tbf6GibHf0NwD6KSDsm9XCfUNv0OR50a848B7TYUqL9B35iKQyW+1j5aQKpvNEb73qgC OmK+8lrqX7TGDYDWEA3Uc+llMtwSO7/oelqxB4EU4UiteWgd5siohBmJHaHECNlwy3lT Lzhe62icC5tlM5guhfVzEZcP+8c7h/wCG35kf598NtxhGnedjfpfNOwgJd0piKqwaFfP 1Ccy5JNgv96rh0mlubjxuR7ckPX6G+rGijLXo/vJf5uuJ+qch1Vd5N/Med3J51ymDwah sjlQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Tl731lC4; 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 t190-20020a6381c7000000b004cff4e7799dsi11025243pgd.813.2023.01.20.15.18.35; Fri, 20 Jan 2023 15:18:47 -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=Tl731lC4; 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 S230226AbjATXQB (ORCPT + 99 others); Fri, 20 Jan 2023 18:16:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229710AbjATXPz (ORCPT ); Fri, 20 Jan 2023 18:15:55 -0500 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B106E47430 for ; Fri, 20 Jan 2023 15:15:53 -0800 (PST) Received: by mail-wm1-x331.google.com with SMTP id fl11-20020a05600c0b8b00b003daf72fc844so6877401wmb.0 for ; Fri, 20 Jan 2023 15:15:53 -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=MfXu0aEKsZLPUd+pHK859PYllaHR7EY7wWkz0R5COZw=; b=Tl731lC4eJNEQzgrxEEY88dg1tPBIxMUGDqde7ZvFY99qHF0zK5OmGGcnjmFGkAVTQ TRd0zwhXaUN6x4yrz8wqy+4WbB3xT2To99C6yMN6EM6RPUn/Qo/QZ/awyavUJJyja/ZZ atNltk3M2B/mLXWt5qF/4h7pvp91BZihBzV8h+OOV+cpDILGrfLvbpob09N8FzUhTnzm e/o763z6uk+lBA+242ZTpZDKK2/2t/JafESCP0CDEsKS2//+VZy39pUISLyae+KVeNB5 m680m02XgIk0ccLJblEZPATneLgdPLSo3z+3Iwif6QOnP+tNE97I6iyA+jxgXS2fJUZm Y1+Q== 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=MfXu0aEKsZLPUd+pHK859PYllaHR7EY7wWkz0R5COZw=; b=mma+HkBE7EAbEP15md6Ez90dZ3CiH8gRs+4SrkA4kVH7/YoqBmNhnxiyAqiaX0Ikno qw1dWEFV+Yp+MGISs9B8vjUZ9ttLeQGSn2ZV8H8EWX3jhiLIaMKfZINuzGZvWLOlXY+n jGnqecnL/exWS182QzSFyFvK6io90dE+q+Sy8y9Kjn7QJGRGN617VGRKKAmn1Y5JR4UZ BpNWY4sw9MJ3xfV2VsZ5brb0O/vIf9xpF/xLeQjbL7uk5vRQXrxtot180O93XaiUDySp nAxww3AYiCslRsJt6CLevjf6IYas6d2SgS3w1J/T2c7KZGSc8pgCTRIitUPz7UIXABPD gdhQ== X-Gm-Message-State: AFqh2kqF3i6MKz/0/6nCjFIoA6h/rr/cp84/F9St50eqPysE0UqpzSE1 C7bVekcwDIxulDJsS9nNLt9bKw== X-Received: by 2002:a1c:ed1a:0:b0:3da:c07:c5fe with SMTP id l26-20020a1ced1a000000b003da0c07c5femr12264817wmh.5.1674256552166; Fri, 20 Jan 2023 15:15:52 -0800 (PST) Received: from mai.. (146725694.box.freepro.com. [130.180.211.218]) by smtp.gmail.com with ESMTPSA id t17-20020a05600001d100b00241d21d4652sm36436828wrx.21.2023.01.20.15.15.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Jan 2023 15:15:51 -0800 (PST) From: Daniel Lezcano To: daniel.lezcano@linaro.org, rafael@kernel.org Cc: srinivas.pandruvada@linux.intel.com, 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 v6 3/3] thermal/drivers/intel: Use generic trip points int340x Date: Sat, 21 Jan 2023 00:15:30 +0100 Message-Id: <20230120231530.2368330-4-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230120231530.2368330-1-daniel.lezcano@linaro.org> References: <20230120231530.2368330-1-daniel.lezcano@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Level: * 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?1755585422589551674?= X-GMAIL-MSGID: =?utf-8?q?1755585422589551674?= 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 Reviewed-by: Zhang Rui Tested-by: srinivas pandruvada --- V6: - Changed thermal ACPI function names according the changes done in the first patch - Put back the GTSH function here as it is specific to int340x 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 | 168 +++++------------- .../int340x_thermal/int340x_thermal_zone.h | 10 +- 3 files changed, 46 insertions(+), 133 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..c0cd1d4283d6 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,20 +50,15 @@ 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) +static int int340x_thermal_get_global_hyst(struct acpi_device *adev, 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); + status = acpi_evaluate_integer(adev->handle, "GTSH", NULL, &hyst); if (ACPI_FAILURE(status)) *temp = 0; else @@ -131,6 +67,7 @@ static int int340x_thermal_get_trip_hyst(struct thermal_zone_device *zone, return 0; } + static void int340x_thermal_critical(struct thermal_zone_device *zone) { dev_dbg(&zone->device, "%s: critical temperature reached\n", zone->type); @@ -138,58 +75,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; - 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++; + trip_cnt = int34x_zone->aux_trip_nr; - 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_critical_trip_temp(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_hot_trip_temp(int34x_zone->adev, &int34x_zone->trips[trip_cnt]); + if (!ret) + trip_cnt++; + + ret = thermal_acpi_passive_trip_temp(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_active_trip_temp(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 +123,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 +143,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) + int340x_thermal_get_global_hyst(adev, &int34x_thermal_zone->trips[i].hysteresis); + + 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 +190,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 +205,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;