platform/x86/intel-uncore-freq: Rename instance_id

The "instance" word has a specific meaning in TPMI. It is a physical
index related to compute dies and IO dies present on a single TPMI
partition (which is also a single TPMI device). It's used for mapping
MMIO blocks for direct TPMI register access.

The currently used "instance_id" uncore_data struct field is a
sequentially generated value that's used for appending to uncore
directories inside the /sys/devices/system/cpu/intel_uncore_frequency
directory. It has no relation to the physical TPMI elements.

Signed-off-by: Maciej Wieczor-Retman <maciej.wieczor-retman@intel.com>
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Link: https://patch.msgid.link/4d983157199cf0e163597df254e2dc629878b818.1775665057.git.m.wieczorretman@pm.me
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-common.c b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c
index 7070c94324e0edbf18bf093ffbaff455738b20b3..25ab511ed8d2a1a802119506cf854870b080d1ff 100644 (file)
--- a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c
+++ b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c
@@ -268,7 +268,7 @@ int uncore_freq_add_entry(struct uncore_data *data, int cpu)
                if (ret < 0)
                        goto uncore_unlock;
 
-               data->instance_id = ret;
+               data->seqnum_id = ret;
                scnprintf(data->name, sizeof(data->name), "uncore%02d", ret);
        } else {
                scnprintf(data->name, sizeof(data->name), "package_%02d_die_%02d",
@@ -281,7 +281,7 @@ int uncore_freq_add_entry(struct uncore_data *data, int cpu)
        ret = create_attr_group(data, data->name);
        if (ret) {
                if (data->domain_id != UNCORE_DOMAIN_ID_INVALID)
-                       ida_free(&intel_uncore_ida, data->instance_id);
+                       ida_free(&intel_uncore_ida, data->seqnum_id);
        } else {
                data->control_cpu = cpu;
                data->valid = true;
@@ -301,7 +301,7 @@ void uncore_freq_remove_die_entry(struct uncore_data *data)
        data->control_cpu = -1;
        data->valid = false;
        if (data->domain_id != UNCORE_DOMAIN_ID_INVALID)
-               ida_free(&intel_uncore_ida, data->instance_id);
+               ida_free(&intel_uncore_ida, data->seqnum_id);
 
        mutex_unlock(&uncore_lock);
 }

diff --git a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.h b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.h
index 0abe850ef54eaa0eabf8b4340e671691182d9e3f..0d5fd91ee0aac279704ead6e2a97d5002f6ae3aa 100644 (file)
--- a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.h
+++ b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.h
@@ -35,7 +35,7 @@
  * @die_id:            Die id for this instance
  * @domain_id:         Power domain id for this instance
  * @cluster_id:                cluster id in a domain
- * @instance_id:       Unique instance id to append to directory name
+ * @seqnum_id:         Unique sequential id to append to directory name
  * @name:              Sysfs entry name for this instance
  * @agent_type_mask:   Bit mask of all hardware agents for this domain
  * @uncore_attr_group: Attribute group storage
@@ -71,7 +71,7 @@ struct uncore_data {
        int die_id;
        int domain_id;
        int cluster_id;
-       int instance_id;
+       int seqnum_id;
        char name[32];
        u16  agent_type_mask;