From 95e11ab3f578fb21bfdd7c1910b03982157c4e7d Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Wed, 12 Jan 2022 17:22:58 +0100 Subject: [PATCH] Update to 2.4.8 (#2038523) --- alderlake-jasperlake-upstream.patch | 93 ----------------------------- sources | 2 +- thermald.spec | 12 ++-- 3 files changed, 7 insertions(+), 100 deletions(-) delete mode 100644 alderlake-jasperlake-upstream.patch diff --git a/alderlake-jasperlake-upstream.patch b/alderlake-jasperlake-upstream.patch deleted file mode 100644 index 41f8223..0000000 --- a/alderlake-jasperlake-upstream.patch +++ /dev/null @@ -1,93 +0,0 @@ -From d28613aea8179c068cfab853f5aa2a0c2b7adebf Mon Sep 17 00:00:00 2001 -From: Srinivas Pandruvada -Date: Thu, 19 Aug 2021 21:29:12 -0700 -Subject: [PATCH 1/3] Added Jasper Lake CPU model - -Support Jasper Lake. ---- - src/thd_engine.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/thd_engine.cpp b/src/thd_engine.cpp -index e23f483..59c7659 100644 ---- a/src/thd_engine.cpp -+++ b/src/thd_engine.cpp -@@ -697,6 +697,7 @@ static supported_ids_t id_table[] = { - { 6, 0xa5 }, // Cometlake - { 6, 0xa6 }, // Cometlake_L - { 6, 0xa7 }, // Rocketlake -+ { 6, 0x9c }, // Jasper Lake - { 0, 0 } // Last Invalid entry - }; - --- -2.31.1 - - -From ffb226c62d3bc052f47970be9802254e48799bf4 Mon Sep 17 00:00:00 2001 -From: Srinivas Pandruvada -Date: Mon, 14 Jun 2021 10:12:38 -0700 -Subject: [PATCH 2/3] Add AlderLake cpu model - -Added AlderLake CPU models. ---- - src/thd_engine.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/thd_engine.cpp b/src/thd_engine.cpp -index 59c7659..0202de5 100644 ---- a/src/thd_engine.cpp -+++ b/src/thd_engine.cpp -@@ -698,6 +698,8 @@ static supported_ids_t id_table[] = { - { 6, 0xa6 }, // Cometlake_L - { 6, 0xa7 }, // Rocketlake - { 6, 0x9c }, // Jasper Lake -+ { 6, 0x97 }, // Alderlake -+ { 6, 0x9a }, // Alderlake - { 0, 0 } // Last Invalid entry - }; - --- -2.31.1 - - -From d0c9e7fb5aea85b84841eba927feb8767765fda2 Mon Sep 17 00:00:00 2001 -From: Srinivas Pandruvada -Date: Tue, 22 Jun 2021 08:44:44 -0700 -Subject: [PATCH 3/3] Update sysfs paths for Alader Lake - -Update sysfs path for INT3400 device. ---- - src/thd_engine_adaptive.cpp | 2 ++ - src/thd_int3400.cpp | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/src/thd_engine_adaptive.cpp b/src/thd_engine_adaptive.cpp -index 20df937..247ca6c 100644 ---- a/src/thd_engine_adaptive.cpp -+++ b/src/thd_engine_adaptive.cpp -@@ -1583,6 +1583,8 @@ int cthd_engine_adaptive::thd_engine_start(bool ignore_cpuid_check) { - int3400_base_path = "/sys/bus/platform/devices/INT3400:00/"; - } else if (sysfs.exists("/sys/bus/platform/devices/INTC1040:00")) { - int3400_base_path = "/sys/bus/platform/devices/INTC1040:00/"; -+ } else if (sysfs.exists("/sys/bus/platform/devices/INTC1041:00")) { -+ int3400_base_path = "/sys/bus/platform/devices/INTC1041:00/"; - } else { - return THD_ERROR; - } -diff --git a/src/thd_int3400.cpp b/src/thd_int3400.cpp -index 4fabaee..a89f002 100644 ---- a/src/thd_int3400.cpp -+++ b/src/thd_int3400.cpp -@@ -36,6 +36,8 @@ cthd_INT3400::cthd_INT3400(std::string _uuid) : uuid(_uuid), base_path("") { - base_path = "/sys/bus/acpi/devices/INT3400:00/physical_node/uuids/"; - } else if (cdev_sysfs.exists("/sys/bus/acpi/devices/INTC1040:00/physical_node/uuids")) { - base_path = "/sys/bus/acpi/devices/INTC1040:00/physical_node/uuids/"; -+ } else if (cdev_sysfs.exists("/sys/bus/acpi/devices/INTC1041:00/physical_node/uuids")) { -+ base_path = "/sys/bus/acpi/devices/INTC1041:00/physical_node/uuids/"; - } - thd_log_info("INT3400 Base path is %s\n", base_path.c_str()); - } --- -2.31.1 - diff --git a/sources b/sources index 0b8ed02..816a6d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (thermald-2.4.6.tar.gz) = e337b00ec7f4fa565927f047dbb17dc05b8513850f2488dd6cfc838e5123938fbfe7c39464fffb77c100073edfca9ea51708680eaa2cba537470326df9508d3a +SHA512 (thermald-2.4.8.tar.gz) = 6e81eb25c274f1ef6e8dcb975cfab23dab9e6d29dcd38d10085d47bbf7161f3d3b0f5159d8935ff8d2c0eba99c88fac2feb9e8cef906b6afacba08a57026300d diff --git a/thermald.spec b/thermald.spec index bc117f2..914937c 100644 --- a/thermald.spec +++ b/thermald.spec @@ -7,13 +7,11 @@ Name: thermald -Version: 2.4.6 -Release: 3%{?dist} +Version: 2.4.8 +Release: 1%{?dist} Summary: Thermal Management daemon -# thd_cdev_modem.{cpp,h} is currently GPLv2 only -# https://github.com/intel/thermal_daemon/issues/306 -License: GPLv2 +License: GPLv2+ URL: https://github.com/intel/%{pkgname} Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz @@ -39,7 +37,6 @@ Requires(pre): shadow-utils %{?systemd_requires} -Patch0001: alderlake-jasperlake-upstream.patch %description %{name} monitors and controls platform temperature. @@ -249,6 +246,9 @@ exit 0 %changelog +* Wed Jan 12 2022 Benjamin Berg - 2.4.8-1 +- Update to 2.4.8 (#2038523) + * Wed Nov 24 2021 Benjamin Berg - 2.4.6-3 - Pull AlderLake and JasperLake support from upstream