]> www.infradead.org Git - users/griffoul/linux.git/commitdiff
platform/x86/intel: power-domains: Use topology_logical_package_id() for package ID
authorDavid Arcari <darcari@redhat.com>
Fri, 29 Aug 2025 11:38:59 +0000 (07:38 -0400)
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Fri, 29 Aug 2025 13:15:19 +0000 (16:15 +0300)
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: 17ca2780458c ("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>
drivers/platform/x86/intel/tpmi_power_domains.c

index 9d8247bb9cfa578d56b79029552172a3910e45cc..8641353b2e06176023b7821be3294ddb59f8c850 100644 (file)
@@ -178,7 +178,7 @@ static int tpmi_get_logical_id(unsigned int cpu, struct tpmi_cpu_info *info)
 
        info->punit_thread_id = FIELD_GET(LP_ID_MASK, data);
        info->punit_core_id = FIELD_GET(MODULE_ID_MASK, data);
-       info->pkg_id = topology_physical_package_id(cpu);
+       info->pkg_id = topology_logical_package_id(cpu);
        info->linux_cpu = cpu;
 
        return 0;