Skip to content

Commit 07a9dcc

Browse files
committed
Merge: platform/x86/intel: power-domains: Use topology_logical_package_id() for package ID
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1457 JIRA: https://issues.redhat.com/browse/RHEL-115105 commit aa28991 Author: David Arcari <darcari@redhat.com> Date: Fri Aug 29 07:38:59 2025 -0400 platform/x86/intel: power-domains: Use topology_logical_package_id() for package ID Currently, tpmi_get_logical_id() calls topology_physical_package_id() to set the pkg_id of the info structure. Since some VM hosts assign non contiguous package IDs, topology_physical_package_id() can return a larger value than topology_max_packages(). This will result in an invalid reference into tpmi_power_domain_mask[] as that is allocatead based on topology_max_packages() as the maximum package ID. Fixes: 17ca278 ("platform/x86/intel: TPMI domain id and CPU mapping") Signed-off-by: David Arcari <darcari@redhat.com> Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Link: https://lore.kernel.org/r/20250829113859.1772827-1-darcari@redhat.com Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> Signed-off-by: Steve Best <sbest@redhat.com> Approved-by: David Arcari <darcari@redhat.com> Approved-by: Desnes Nunes <desnesn@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Approved-by: Tony Camuso <tcamuso@redhat.com> Merged-by: Scott Weaver <scweaver@redhat.com>
2 parents d407b77 + 1fb1064 commit 07a9dcc

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/platform/x86/intel/tpmi_power_domains.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ static int tpmi_get_logical_id(unsigned int cpu, struct tpmi_cpu_info *info)
167167

168168
info->punit_thread_id = FIELD_GET(LP_ID_MASK, data);
169169
info->punit_core_id = FIELD_GET(MODULE_ID_MASK, data);
170-
info->pkg_id = topology_physical_package_id(cpu);
170+
info->pkg_id = topology_logical_package_id(cpu);
171171
info->linux_cpu = cpu;
172172

173173
return 0;

0 commit comments

Comments
 (0)