On Sun, Jul 20, 2025 at 07:46:59PM -0400, Sasha Levin wrote:
From: Zhang Rui rui.zhang@intel.com
[ Upstream commit e8e28c2af16b279b6c37d533e1e73effb197cf2e ]
rapl_defaults is Interface specific.
Although current MSR and MMIO Interface share the same rapl_defaults, new Interface like TPMI need its own rapl_defaults callbacks.
Save the rapl_defaults information in the Interface private structure.
No functional change.
Signed-off-by: Zhang Rui rui.zhang@intel.com Tested-by: Wang Wendy wendy.wang@intel.com Signed-off-by: Rafael J. Wysocki rafael.j.wysocki@intel.com Stable-dep-of: 964209202ebe ("powercap: intel_rapl: Do not change CLAMPING bit if ENABLE bit cannot be changed") Signed-off-by: Sasha Levin sashal@kernel.org
drivers/powercap/intel_rapl_common.c | 46 ++++++++++++++++++++-------- include/linux/intel_rapl.h | 2 ++ 2 files changed, 35 insertions(+), 13 deletions(-)
Your patch series here missed 3 fixes for it, and they didn't backport cleanly: 081690e94118 ("powercap: intel_rapl: Fix invalid setting of Power Limit 4") a60ec4485f1c ("powercap: intel_rapl: Downgrade BIOS locked limits pr_warn() to pr_debug()") 95f6580352a7 ("powercap: intel_rapl: Fix off by one in get_rpi()")
So I'm going to drop this series from the queue now.
thanks,
greg k-h