From: Kai-Heng Feng <kai.heng.feng@canonical.com>
To: rui.zhang@intel.com, daniel.lezcano@linaro.org, amitk@kernel.org
Cc: andrzej.p@collabora.com, mjg59@google.com,
srinivas.pandruvada@linux.intel.com,
Kai-Heng Feng <kai.heng.feng@canonical.com>,
Andy Shevchenko <andy.shevchenko@gmail.com>,
Sumeet Pawnikar <sumeet.r.pawnikar@intel.com>,
Akinobu Mita <akinobu.mita@gmail.com>,
Chuhong Yuan <hslester96@gmail.com>,
Gayatri Kammela <gayatri.kammela@intel.com>,
linux-pm@vger.kernel.org (open list:THERMAL),
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 3/3] thermal: intel: intel_pch_thermal: Indicate userspace usage
Date: Mon, 30 Nov 2020 13:36:40 +0800 [thread overview]
Message-ID: <20201130053640.54608-3-kai.heng.feng@canonical.com> (raw)
In-Reply-To: <20201130053640.54608-1-kai.heng.feng@canonical.com>
The device isn't present under ACPI ThermalZone, and there's a dedicated
userspace daemon for this thermal device.
Let thermal core know it shouldn't handle trips to avoid surprising
thermal shutdown.
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
drivers/thermal/intel/intel_pch_thermal.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/thermal/intel/intel_pch_thermal.c b/drivers/thermal/intel/intel_pch_thermal.c
index 3b813ebb6ca1..e55e6318d733 100644
--- a/drivers/thermal/intel/intel_pch_thermal.c
+++ b/drivers/thermal/intel/intel_pch_thermal.c
@@ -270,6 +270,10 @@ static struct thermal_zone_device_ops tzd_ops = {
.get_trip_temp = pch_get_trip_temp,
};
+static struct thermal_zone_params tzd_params = {
+ .userspace = true,
+};
+
enum board_ids {
board_hsw,
board_wpt,
@@ -346,21 +350,16 @@ static int intel_pch_thermal_probe(struct pci_dev *pdev,
goto error_cleanup;
ptd->tzd = thermal_zone_device_register(bi->name, nr_trips, 0, ptd,
- &tzd_ops, NULL, 0, 0);
+ &tzd_ops, &tzd_params, 0, 0);
if (IS_ERR(ptd->tzd)) {
dev_err(&pdev->dev, "Failed to register thermal zone %s\n",
bi->name);
err = PTR_ERR(ptd->tzd);
goto error_cleanup;
}
- err = thermal_zone_device_enable(ptd->tzd);
- if (err)
- goto err_unregister;
return 0;
-err_unregister:
- thermal_zone_device_unregister(ptd->tzd);
error_cleanup:
iounmap(ptd->hw_base);
error_release:
--
2.29.2
next prev parent reply other threads:[~2020-11-30 5:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-30 5:36 [PATCH 1/3] thermal: core: Add indication for userspace usage Kai-Heng Feng
2020-11-30 5:36 ` [PATCH 2/3] thermal: int340x: Indicate " Kai-Heng Feng
2020-11-30 5:36 ` Kai-Heng Feng [this message]
2020-12-14 18:21 ` [PATCH 1/3] thermal: core: Add indication for " Matthew Garrett
2020-12-15 12:49 ` Kai-Heng Feng
-- strict thread matches above, loose matches on Subject: below --
2020-11-28 17:54 Kai-Heng Feng
2020-11-28 17:54 ` [PATCH 3/3] thermal: intel: intel_pch_thermal: Indicate " Kai-Heng Feng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201130053640.54608-3-kai.heng.feng@canonical.com \
--to=kai.heng.feng@canonical.com \
--cc=akinobu.mita@gmail.com \
--cc=amitk@kernel.org \
--cc=andrzej.p@collabora.com \
--cc=andy.shevchenko@gmail.com \
--cc=daniel.lezcano@linaro.org \
--cc=gayatri.kammela@intel.com \
--cc=hslester96@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mjg59@google.com \
--cc=rui.zhang@intel.com \
--cc=srinivas.pandruvada@linux.intel.com \
--cc=sumeet.r.pawnikar@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).