platform/x86/intel-uncore-freq: Present unique domain ID per package

In partitioned systems, the domain ID is unique in the partition and a
package can have multiple partitions.

Some user-space tools, such as turbostat, assume the domain ID is unique
per package. These tools map CPU power domains, which are unique to a
package. However, this approach does not work in partitioned systems.

There is no architectural definition of "partition" to present to user
space.

To support these tools, set the domain_id to be unique per package. For
compute die IDs, uniqueness can be achieved using the platform info
cdie_mask, mirroring the behavior observed in non-partitioned systems.

For IO dies, which lack a direct CPU relationship, any unique logical
ID can be assigned. Here domain IDs for IO dies are configured after all
compute domain IDs. During the probe, keep the index of the next IO
domain ID after the last IO domain ID of the current partition. Since
CPU packages are symmetric, partition information is same for all
packages.

The Intel Speed Select driver has already implemented a similar change
to make the domain ID unique, with compute dies listed first, followed
by I/O dies.

Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Link: https://lore.kernel.org/r/20250903191154.1081159-1-srinivas.pandruvada@linux.intel.com
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>

diff --git a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-tpmi.c b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-tpmi.c
index cb4905bad89b60d7c2cbf61a49b0b0f7e4af5c7f..8007ad7c88da2672d39abc055c6e4cc48506bc51 100644 (file)
--- a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-tpmi.c
+++ b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-tpmi.c
@@ -369,6 +369,77 @@ static void uncore_set_agent_type(struct tpmi_uncore_cluster_info *cluster_info)
        cluster_info->uncore_data.agent_type_mask = FIELD_GET(UNCORE_AGENT_TYPES, status);
 }
 
+#define MAX_PARTITIONS 2
+
+/* IO domain ID start index for a partition */
+static u8 io_die_start[MAX_PARTITIONS];
+
+/* Next IO domain ID index after the current partition IO die IDs */
+static u8 io_die_index_next;
+
+/* Lock to protect io_die_start, io_die_index_next */
+static DEFINE_MUTEX(domain_lock);
+
+static void set_domain_id(int id,  int num_resources,
+                         struct oobmsm_plat_info *plat_info,
+                         struct tpmi_uncore_cluster_info *cluster_info)
+{
+       u8 part_io_index, cdie_range, pkg_io_index, max_dies;
+
+       if (plat_info->partition >= MAX_PARTITIONS) {
+               cluster_info->uncore_data.domain_id = id;
+               return;
+       }
+
+       if (cluster_info->uncore_data.agent_type_mask & AGENT_TYPE_CORE) {
+               cluster_info->uncore_data.domain_id = cluster_info->cdie_id;
+               return;
+       }
+
+       /* Unlikely but cdie_mask may have holes, so take range */
+       cdie_range = fls(plat_info->cdie_mask) - ffs(plat_info->cdie_mask) + 1;
+       max_dies = topology_max_dies_per_package();
+
+       /*
+        * If the CPU doesn't enumerate dies, then use current cdie range
+        * as the max.
+        */
+       if (cdie_range > max_dies)
+               max_dies = cdie_range;
+
+       guard(mutex)(&domain_lock);
+
+       if (!io_die_index_next)
+               io_die_index_next = max_dies;
+
+       if (!io_die_start[plat_info->partition]) {
+               io_die_start[plat_info->partition] = io_die_index_next;
+               /*
+                * number of IO dies = num_resources - cdie_range. Hence
+                * next partition io_die_index_next is set after IO dies
+                * in the current partition.
+                */
+               io_die_index_next += (num_resources - cdie_range);
+       }
+
+       /*
+        * Index from IO die start within the partition:
+        * This is the first valid domain after the cdies.
+        * For example the current resource index 5 and cdies end at
+        * index 3 (cdie_cnt = 4). Then the IO only index 5 - 4 = 1.
+        */
+       part_io_index = id - cdie_range;
+
+       /*
+        * Add to the IO die start index for this partition in this package
+        * to make unique in the package.
+        */
+       pkg_io_index = io_die_start[plat_info->partition] + part_io_index;
+
+       /* Assign this to domain ID */
+       cluster_info->uncore_data.domain_id = pkg_io_index;
+}
+
 /* Callback for sysfs read for TPMI uncore values. Called under mutex locks. */
 static int uncore_read(struct uncore_data *data, unsigned int *value, enum uncore_index index)
 {
@@ -605,11 +676,12 @@ static int uncore_probe(struct auxiliary_device *auxdev, const struct auxiliary_
                        cluster_info->uncore_data.package_id = pkg;
                        /* There are no dies like Cascade Lake */
                        cluster_info->uncore_data.die_id = 0;
-                       cluster_info->uncore_data.domain_id = i;
                        cluster_info->uncore_data.cluster_id = j;
 
                        set_cdie_id(i, cluster_info, plat_info);
 
+                       set_domain_id(i, num_resources, plat_info, cluster_info);
+
                        cluster_info->uncore_root = tpmi_uncore;
 
                        if (TPMI_MINOR_VERSION(pd_info->ufs_header_ver) >= UNCORE_ELC_SUPPORTED_VERSION)