[linux-nvidia-6.17]: Replace CPPC Autonomous Series with Version That Has Been Accepted Upstream#346
Conversation
|
Attaching test script used to verify this PR. Results from Spark: Results from GH: |
|
The commits look good, but technically they're still So, if we follow the "Canonical stable kernel team" style, we should revert the old ones and re-apply the new ones, still as Personally I think I like the rebase+drop approach more, because. moving forward with kernel versions, old patches may have conflicts, so we may end up spending time fixing the conflicts to essentially revert the patch later and re-apply a new one. |
|
The last commit needs the Sauce. Its not upstream yet? |
Correct. Sumit only sent it yesterday, and it has not received feedback. I sent this PR early, and plan to adjust these commits as things develop upstream. |
|
I think we'd also want to include this other patch that Sumit also just posted (https://lore.kernel.org/all/20260318095005.2437960-1-sumitg@nvidia.com/), which was a follow-up to |
jamieNguyenNVIDIA
force-pushed
the
jamien/replace-cppc
branch
from
4a6f158 to
4e03dbd
Compare
Thanks. It looks like the linux-next patches have made it into mainline so I've updated these references accordingly. I'll ask Canonical about doing the rebase+drop approach for this series. |
Thanks. I've backported this patch in the latest version. |
clsotog
left a comment
clsotog
left a comment
There was a problem hiding this comment.
The last changes looks ok.
Acked-by: Carol L Soto <csoto@nvidia.com>
nvidia-bfigg
force-pushed
the
24.04_linux-nvidia-6.17-next
branch
from
9364d8b to
8dab82a
Compare
jamieNguyenNVIDIA
force-pushed
the
jamien/replace-cppc
branch
from
4e03dbd to
9ee2ff5
Compare
nvidia-bfigg
force-pushed
the
24.04_linux-nvidia-6.17-next
branch
from
8dab82a to
891b8e9
Compare
jamieNguyenNVIDIA
force-pushed
the
jamien/replace-cppc
branch
2 times, most recently
from
865bb6e to
a000c64
Compare
jamieNguyenNVIDIA
force-pushed
the
jamien/replace-cppc
branch
from
a000c64 to
be84090
Compare
…ter support" This reverts commit b0527bd. It is to be replaced the following upstream series: https://lore.kernel.org/lkml/48b52f98-119e-4693-806b-78d47f7a43bb@nvidia.com/ Signed-off-by: Jamie Nguyen <jamien@nvidia.com>
…ling auto_select" This reverts commit f106662. It is to be replaced the following upstream series: https://lore.kernel.org/lkml/48b52f98-119e-4693-806b-78d47f7a43bb@nvidia.com/ Signed-off-by: Jamie Nguyen <jamien@nvidia.com>
…perf_limited" This reverts commit c5a62d1. It is to be replaced the following upstream series: https://lore.kernel.org/lkml/48b52f98-119e-4693-806b-78d47f7a43bb@nvidia.com/ Signed-off-by: Jamie Nguyen <jamien@nvidia.com>
…erf_limited register" This reverts commit 5a35a52. It is to be replaced the following upstream series: https://lore.kernel.org/lkml/48b52f98-119e-4693-806b-78d47f7a43bb@nvidia.com/ Signed-off-by: Jamie Nguyen <jamien@nvidia.com>
…in/max_perf" This reverts commit e0f2e26. It is to be replaced the following upstream series: https://lore.kernel.org/lkml/48b52f98-119e-4693-806b-78d47f7a43bb@nvidia.com/ Signed-off-by: Jamie Nguyen <jamien@nvidia.com>
…d epp" This reverts commit a3b460e. It is to be replaced the following upstream series: https://lore.kernel.org/lkml/48b52f98-119e-4693-806b-78d47f7a43bb@nvidia.com/ Signed-off-by: Jamie Nguyen <jamien@nvidia.com>
…rformance controls" This reverts commit 10ff86b. It is to be replaced the following upstream series: https://lore.kernel.org/lkml/48b52f98-119e-4693-806b-78d47f7a43bb@nvidia.com/ Signed-off-by: Jamie Nguyen <jamien@nvidia.com>
…how/store" This reverts commit 6a55754. It is to be replaced the following upstream series: https://lore.kernel.org/lkml/48b52f98-119e-4693-806b-78d47f7a43bb@nvidia.com/ Signed-off-by: Jamie Nguyen <jamien@nvidia.com>
Add generic helper functions for u64 sysfs attributes that follow the common pattern of calling CPPC get/set APIs: - cppc_cpufreq_sysfs_show_u64(): reads value and handles -EOPNOTSUPP - cppc_cpufreq_sysfs_store_u64(): parses input and calls set function Add CPPC_CPUFREQ_ATTR_RW_U64() macro to generate show/store functions using these helpers, reducing boilerplate for simple attributes. Convert auto_act_window and energy_performance_preference_val to use the new macro. No functional changes. Signed-off-by: Sumit Gupta <sumitg@nvidia.com> Reviewed-by: Lifeng Zheng <zhenglifeng1@huawei.com> [ rjw: Retained empty code line after a conditional ] Link: https://patch.msgid.link/20260120145623.2959636-2-sumitg@nvidia.com Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> (cherry picked from commit 4a1cf5e) Signed-off-by: Jamie Nguyen <jamien@nvidia.com>
- Remove redundant energy_perf field from 'struct cppc_perf_caps' as the same is available in 'struct cppc_perf_ctrls' which is used. - Move the 'auto_sel' field from 'struct cppc_perf_caps' to 'struct cppc_perf_ctrls' as it represents a control register. Signed-off-by: Sumit Gupta <sumitg@nvidia.com> Reviewed-by: Pierre Gondois <pierre.gondois@arm.com> Reviewed-by: Lifeng Zheng <zhenglifeng1@huawei.com> Link: https://patch.msgid.link/20260120145623.2959636-3-sumitg@nvidia.com Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> (cherry picked from commit 7cb6f10) Signed-off-by: Jamie Nguyen <jamien@nvidia.com>
Update EPP (Energy Performance Preference) constants for more clarity: - Add CPPC_EPP_PERFORMANCE_PREF (0x00) for performance preference. - Rename CPPC_ENERGY_PERF_MAX to CPPC_EPP_ENERGY_EFFICIENCY_PREF (0xFF) for energy efficiency. Signed-off-by: Sumit Gupta <sumitg@nvidia.com> Reviewed-by: Lifeng Zheng <zhenglifeng1@huawei.com> [ rjw: Changelog edits ] Link: https://patch.msgid.link/20260120145623.2959636-4-sumitg@nvidia.com Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> (cherry picked from commit 83e2908) Signed-off-by: Jamie Nguyen <jamien@nvidia.com>
jamieNguyenNVIDIA
force-pushed
the
jamien/replace-cppc
branch
from
be84090 to
8376d26
Compare
✅ Patchscan: No Missing FixesAll cherry-picked commits have been checked — no missing upstream fixes found. |
|
Differences between this and the 7.0 PR:
However, on 6.17, those prerequisites would have required more prerequisites: To avoid the cascading prerequisites, I went with the backport instead. |
|
@jamieNguyenNVIDIA I know this is still in draft mode, but went ahead and reviewed. The reverts and first 3 picks look fine and I verified the SAUCE patch matches LKML. 3c977b0 ACPI: CPPC: Check cpc_read() return values consistently All of these dropped some of the commit message (Link and final SOB) during pick/backport. |
Add cppc_get_perf() function to read values of performance control registers including desired_perf, min_perf, max_perf, energy_perf, and auto_sel. This provides a read interface to complement the existing cppc_set_perf() write interface for performance control registers. Note that auto_sel is read by cppc_get_perf() but not written by cppc_set_perf() to avoid unintended mode changes during performance updates. It can be updated with existing dedicated cppc_set_auto_sel() API. Use cppc_get_perf() in cppc_cpufreq_get_cpu_data() to initialize perf_ctrls with current hardware register values during cpufreq policy initialization. Signed-off-by: Sumit Gupta <sumitg@nvidia.com> Reviewed-by: Pierre Gondois <pierre.gondois@arm.com> Reviewed-by: Lifeng Zheng <zhenglifeng1@huawei.com> Link: https://patch.msgid.link/20260206142658.72583-2-sumitg@nvidia.com Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> (cherry picked from commit 658fa7b) Signed-off-by: Jamie Nguyen <jamien@nvidia.com>
Add a warning during CPPC processor probe if the Desired Performance register is not supported when it should be. As per 8.4.6.1.2.3 section of ACPI 6.6 specification, "The Desired Performance Register is optional only when OSPM indicates support for CPPC2 in the platform-wide _OSC capabilities and the Autonomous Selection Enable field is encoded as an Integer with a value of 1." In other words: - In CPPC v1, DESIRED_PERF is mandatory - In CPPC v2, it becomes optional only when AUTO_SEL_ENABLE is supported This helps detect firmware configuration issues early during boot. Link: https://lore.kernel.org/lkml/9fa21599-004a-4af8-acc2-190fd0404e35@nvidia.com/ Suggested-by: Pierre Gondois <pierre.gondois@arm.com> Signed-off-by: Sumit Gupta <sumitg@nvidia.com> Reviewed-by: Pierre Gondois <pierre.gondois@arm.com> Reviewed-by: Lifeng Zheng <zhenglifeng1@huawei.com> Link: https://patch.msgid.link/20260206142658.72583-3-sumitg@nvidia.com Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> (cherry picked from commit b3e45fb) Signed-off-by: Jamie Nguyen <jamien@nvidia.com>
Extend cppc_set_epp_perf() to write both auto_sel and energy_perf registers when they are in FFH or SystemMemory address space. This keeps the behavior consistent with PCC case where both registers are already updated together, but was missing for FFH/SystemMemory. Signed-off-by: Sumit Gupta <sumitg@nvidia.com> Reviewed-by: Pierre Gondois <pierre.gondois@arm.com> Reviewed-by: Lifeng Zheng <zhenglifeng1@huawei.com> Link: https://patch.msgid.link/20260206142658.72583-4-sumitg@nvidia.com Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> (cherry picked from commit 38428a6) Signed-off-by: Jamie Nguyen <jamien@nvidia.com>
Update the cached perf_ctrls values when writing via sysfs to keep them in sync with hardware registers: - store_auto_select(): update perf_ctrls.auto_sel - store_energy_performance_preference_val(): update perf_ctrls.energy_perf This ensures consistent cached values after sysfs writes, which complements the cppc_get_perf() initialization during policy setup. Signed-off-by: Sumit Gupta <sumitg@nvidia.com> Reviewed-by: Pierre Gondois <pierre.gondois@arm.com> Reviewed-by: Lifeng Zheng <zhenglifeng1@huawei.com> Link: https://patch.msgid.link/20260206142658.72583-5-sumitg@nvidia.com Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> (cherry picked from commit 24ad4c6) Signed-off-by: Jamie Nguyen <jamien@nvidia.com>
Update MIN_PERF and MAX_PERF registers from policy->min and policy->max in the .target() and .fast_switch() callbacks. This allows controlling performance bounds via standard scaling_min_freq and scaling_max_freq sysfs interfaces. Similar to intel_cpufreq which updates HWP min/max limits in .target(), cppc_cpufreq now programs MIN_PERF/MAX_PERF along with DESIRED_PERF. Since MIN_PERF/MAX_PERF can be updated even when auto_sel is disabled, they are updated unconditionally. Also program MIN_PERF/MAX_PERF in store_auto_select() when enabling autonomous selection so the platform uses correct bounds immediately. Suggested-by: Rafael J. Wysocki <rafael@kernel.org> Signed-off-by: Sumit Gupta <sumitg@nvidia.com> Link: https://patch.msgid.link/20260206142658.72583-6-sumitg@nvidia.com Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> (cherry picked from commit ea3db45) Signed-off-by: Jamie Nguyen <jamien@nvidia.com>
Add sysfs interface to read/write the Performance Limited register.
The Performance Limited register indicates to the OS that an
unpredictable event (like thermal throttling) has limited processor
performance. It contains two sticky bits set by the platform:
- Bit 0 (Desired_Excursion): Set when delivered performance is
constrained below desired performance. Not used when Autonomous
Selection is enabled.
- Bit 1 (Minimum_Excursion): Set when delivered performance is
constrained below minimum performance.
These bits remain set until OSPM explicitly clears them. The write
operation accepts a bitmask of bits to clear:
- Write 0x1 to clear bit 0
- Write 0x2 to clear bit 1
- Write 0x3 to clear both bits
This enables users to detect if platform throttling impacted a workload.
Users clear the register before execution, run the workload, then check
afterward - if set, hardware throttling occurred during that time window.
The interface is exposed as:
/sys/devices/system/cpu/cpuX/cpufreq/perf_limited
Signed-off-by: Sumit Gupta <sumitg@nvidia.com>
Reviewed-by: Pierre Gondois <pierre.gondois@arm.com>
Reviewed-by: Lifeng Zheng <zhenglifeng1@huawei.com>
Link: https://patch.msgid.link/20260206142658.72583-7-sumitg@nvidia.com
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(backported from commit 13c45a2)
[jamien: resolved context conflict in cppc_acpi.c]
Signed-off-by: Jamie Nguyen <jamien@nvidia.com>
Add ABI documentation for the Performance Limited Register sysfs interface in the cppc_cpufreq driver. Signed-off-by: Sumit Gupta <sumitg@nvidia.com> Reviewed-by: Randy Dunlap <rdunlap@infradead.org> Reviewed-by: Pierre Gondois <pierre.gondois@arm.com> Reviewed-by: Lifeng Zheng <zhenglifeng1@huawei.com> Link: https://patch.msgid.link/20260206142658.72583-8-sumitg@nvidia.com Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> (cherry picked from commit 856250b) Signed-off-by: Jamie Nguyen <jamien@nvidia.com>
Callers of cpc_read() ignore its return value, which can lead to using uninitialized or stale values when the read fails. Fix this by consistently checking cpc_read() return values in cppc_get_perf_caps(), cppc_get_perf_ctrs(), and cppc_get_perf(). Link: https://lore.kernel.org/lkml/48bdf87e-39f1-402f-a7dc-1a0e1e7a819d@nvidia.com/ Suggested-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Sumit Gupta <sumitg@nvidia.com> Link: https://patch.msgid.link/20260318095005.2437960-1-sumitg@nvidia.com Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> (backported from commit 0cc2497) [jamien: adapted for tree without reference_perf handling in cppc_get_perf_caps(), and with additional ref_perf read in cppc_get_perf_ctrs()] Signed-off-by: Jamie Nguyen <jamien@nvidia.com>
Add kernel boot parameter 'cppc_cpufreq.auto_sel_mode' to enable CPPC autonomous performance selection on all CPUs at system startup without requiring runtime sysfs manipulation. When autonomous mode is enabled, the hardware automatically adjusts CPU performance based on workload demands using Energy Performance Preference (EPP) hints. When auto_sel_mode=1: - Configure all CPUs for autonomous operation on first init - Set EPP to performance preference (0x0) - Use HW min/max when set; otherwise program from policy limits (caps) - Clamp desired_perf to bounds before enabling autonomous mode - Hardware controls frequency instead of the OS governor The boot parameter is applied only during first policy initialization. On hotplug, skip applying it so that the user's runtime sysfs configuration is preserved. Reviewed-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Sumit Gupta <sumitg@nvidia.com> (backported from https://lore.kernel.org/lkml/20260317151053.2361475-1-sumitg@nvidia.com/) Signed-off-by: Jamie Nguyen <jamien@nvidia.com>
jamieNguyenNVIDIA
force-pushed
the
jamien/replace-cppc
branch
from
8376d26 to
250c194
Compare
Thanks. I believe these are all fixed in the latest push. |
Confirmed. No further issues from me.
|
4 participants
Replace 8 NVIDIA SAUCE patches for ACPI CPPC / cppc_cpufreq with their upstream equivalents. This brings the CPPC autonomous selection and performance control support in line with the accepted upstream implementation, reducing our out-of-tree maintenance burden.
The branch reverts the existing SAUCE patches in dependency order, then applies 12 upstream cherry-picks/backports (3 prerequisite upstream commits, 7 from the accepted upstream series, 1 backport of cpc_read() return value checking adapted for this tree's register layout, and 1 SAUCE auto_sel_mode boot parameter).
LP: https://bugs.launchpad.net/bugs/2131705