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);