Add support for Raptor Lake S CPUs

Hi koba,

 I heard you will bump new version of thermald for jammy, may I know your schedule about it? Thanks!

I've applied the patch for Jammy and uploaded a new version ready for SRU.

thermald (2.4.9-1ubuntu0.2) jammy; urgency=medium

  * Add support for Raptor Lake S CPUs. (LP: #2009676)

Date: Wed, 8 Mar 2023 11:28:31 +0000
Changed-By: Colin Ian King <email address hidden>
Maintainer: Ubuntu Developers <email address hidden>
https://launchpad.net/ubuntu/+source/thermald/2.4.9-1ubuntu0.2

==

 OK: thermald_2.4.9.orig.tar.xz
 OK: thermald_2.4.9-1ubuntu0.2.debian.tar.xz
 OK: thermald_2.4.9-1ubuntu0.2.dsc
     -> Component: main Section: misc

Upload Warnings:
Redirecting ubuntu jammy to ubuntu jammy-proposed.
This upload awaits approval by a distro manager

Announcing to <email address hidden>

Thank you for your contribution to Ubuntu.

Hello Bin, or anyone else affected,

Accepted thermald into jammy-proposed. The package will build now and be available at https://launchpad.net/ubuntu/+source/thermald/2.4.9-1ubuntu0.2 in a few hours, and then in the -proposed repository.

Please help us by testing this new package. See https://wiki.ubuntu.com/Testing/EnableProposed for documentation on how to enable and use -proposed. Your feedback will aid us getting this update out to other Ubuntu users.

If this package fixes the bug for you, please add a comment to this bug, mentioning the version of the package you tested, what testing has been performed on the package and change the tag from verification-needed-jammy to verification-done-jammy. If it does not fix the bug for you, please add a comment stating that, and change the tag to verification-failed-jammy. In either case, without details of your testing we will not be able to proceed.

Further information regarding the verification process can be found at https://wiki.ubuntu.com/QATeam/PerformingSRUVerification . Thank you in advance for helping!

N.B. The updated package will be released to -updates after the bug(s) fixed by this package have been verified and the package has been in -proposed for a minimum of 7 days.

I don't think we have kernel support for RPL in focal though?

I believe it's useful to have RPL focal support in thermald if users use newer HWE kernels. Plus the change is basically adding in some CPU id's so it's a small delta for useful potential support.

+202303090036,
ubuntu@ubuntu:~$ systemctl status thermald
● thermald.service - Thermal Daemon Service
     Loaded: loaded (/lib/systemd/system/thermald.service; enabled; vendor preset: enabled)
     Active: active (running) since Wed 2023-03-08 11:28:05 EST; 7min ago
   Main PID: 110619 (thermald)
      Tasks: 2 (limit: 38046)
     Memory: 1.0M
        CPU: 323ms
     CGroup: /system.slice/thermald.service
             └─110619 /usr/sbin/thermald --systemd --dbus-enable --adaptive

Mar 08 11:28:05 ubuntu systemd[1]: Started Thermal Daemon Service.
Mar 08 11:28:05 ubuntu thermald[110619]: 32 CPUID levels; family:model:stepping 0x6:bf:2 (6:191:2)
Mar 08 11:28:05 ubuntu thermald[110619]: 32 CPUID levels; family:model:stepping 0x6:bf:2 (6:191:2)
Mar 08 11:28:05 ubuntu thermald[110619]: sensor id 15 : No temp sysfs for reading raw temp
Mar 08 11:28:05 ubuntu thermald[110619]: sensor id 15 : No temp sysfs for reading raw temp
Mar 08 11:28:05 ubuntu thermald[110619]: sensor id 15 : No temp sysfs for reading raw temp
Mar 08 11:28:05 ubuntu thermald[110619]: Config file /etc/thermald/thermal-conf.xml does not exist
Mar 08 11:28:05 ubuntu thermald[110619]: Config file /etc/thermald/thermal-conf.xml does not exist
Mar 08 11:28:05 ubuntu thermald[110619]: Config file /etc/thermald/thermal-conf.xml does not exist
Mar 08 11:28:05 ubuntu thermald[110619]: Polling mode is enabled: 4
ubuntu@ubuntu:~$ sudo apt policy thermald
thermald:
  Installed: 2.4.9-1ubuntu0.2
  Candidate: 2.4.9-1ubuntu0.2
  Version table:
 *** 2.4.9-1ubuntu0.2 500
        500 http://archive.ubuntu.com/ubuntu jammy-proposed/main amd64 Packages
        100 /var/lib/dpkg/status
     2.4.9-1ubuntu0.1 500
        500 http://tw.archive.ubuntu.com/ubuntu jammy-updates/main amd64 Packages
     2.4.9-1 500
        500 http://tw.archive.ubuntu.com/ubuntu jammy/main amd64 Packages

~~~
@Colin, @Timo, i could help to verify this on RPL-S.

@koba, can you test the focal version too?

@Colin, KC will help to package a focal iso with jammy kernel.
If you have upload and timo put into proposed, KC will help on verifying.

+++
@Colin, but we don't have kernel support RPL-s in focal, how could I verify it?

The support plan for RPL-S is

Focal - will not support RPL-S.
Jammy - will support with the patch thermald 2.5.2 in this SRU and linux-oem 6.1+

this SRU just adds the pci-id, it does *not* bump thermald to 2.5.2

This bug was fixed in the package thermald - 2.4.9-1ubuntu0.2

---------------
thermald (2.4.9-1ubuntu0.2) jammy; urgency=medium

  * Add support for Raptor Lake S CPUs. (LP: #2009676)

 -- Colin Ian King <email address hidden> Wed, 8 Mar 2023 11:28:31 +0000

The verification of the Stable Release Update for thermald has completed successfully and the package is now being released to -updates. Subsequently, the Ubuntu Stable Release Updates Team is being unsubscribed and will not receive messages about this bug report. In the event that you encounter a regression using the package from -updates please report a new bug using ubuntu-bug and tag the bug report regression-update so we can easily find any regressions.

There is a focal upload in unapproved, adding a "in progress" task to the bug.

So the focal upload adds support for:

- raptor lake: 0xb7, 0xba
--- thermald-1.9.1.orig/src/thd_engine.cpp
+++ thermald-1.9.1/src/thd_engine.cpp
@@ -696,6 +696,8 @@ static supported_ids_t id_table[] = {
               { 6, 0x9c }, // Jasper Lake
               { 6, 0x97 }, // Alderlake
               { 6, 0x9a }, // Alderlake
+ { 6, 0xb7 }, // Raptorlake
+ { 6, 0xba }, // Raptorlake
               { 0, 0 } // Last Invalid entry
 };

- raptor lake S on top of the above: 0xbf
--- thermald-1.9.1.orig/src/thd_engine.cpp
+++ thermald-1.9.1/src/thd_engine.cpp
@@ -698,6 +698,7 @@ static supported_ids_t id_table[] = {
        { 6, 0x9a }, // Alderlake
        { 6, 0xb7 }, // Raptorlake
        { 6, 0xba }, // Raptorlake
+ { 6, 0xbf }, // Raptorlake S
        { 0, 0 } // Last Invalid entry
 };

This is contradicting comment #9, but I tend to agree with Colin in comment #5.

The question that remains is the test plan. Is it possible to test this thermald support in focal for the two CPU types that are being added here? @koba, would you be able to test focal as well, given the above?

Awaiting answer to Andreas' latest question.

An upload of thermald to focal-proposed has been rejected from the upload queue for the following reason: "Question in https://bugs.launchpad.net/oem-priority/+bug/2009676/comments/14 outstanding for over a month".