platform/x86/intel-uncore-freq: Add attributes to show agent types

Currently, users need detailed hardware information to understand the
scope of controls within each uncore domain. Uncore frequency controls
manage subsystems such as core, cache, memory, and I/O. The UFS TPMI
provides this information, which can be used to present the scope more
clearly.

Each uncore domain consists of one or more agent types, with each agent
type controlling one or more uncore hardware subsystems. For example, a
single agent might control both the core and cache.

Introduce a new attribute called "agent_types." This attribute displays
a list of agents, separated by space character.

The string representations for agent types are as follows:
	For core agent: core
	For cache agent: cache
	For memory agent: memory
	For I/O agent: io

These agent types are read during probe time for each cluster and stored
as part of the struct uncore_data.

Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Link: https://lore.kernel.org/r/20250508230250.1186619-2-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-common.c b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c
index 4e2c6a2..9bc8496 100644 (file)
--- a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c
+++ b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c
@@ -43,6 +43,29 @@ static ssize_t show_package_id(struct kobject *kobj, struct kobj_attribute *attr
        return sprintf(buf, "%u\n", data->package_id);
 }
 
+#define MAX_UNCORE_AGENT_TYPES 4
+
+/* The order follows AGENT_TYPE_* defines */
+static const char *agent_name[MAX_UNCORE_AGENT_TYPES] = {"core", "cache", "memory", "io"};
+
+static ssize_t show_agent_types(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
+{
+       struct uncore_data *data = container_of(attr, struct uncore_data, agent_types_kobj_attr);
+       unsigned long agent_mask = data->agent_type_mask;
+       int agent, length = 0;
+
+       for_each_set_bit(agent, &agent_mask, MAX_UNCORE_AGENT_TYPES) {
+               if (length)
+                       length += sysfs_emit_at(buf, length, " ");
+
+               length += sysfs_emit_at(buf, length, agent_name[agent]);
+       }
+
+       length += sysfs_emit_at(buf, length, "\n");
+
+       return length;
+}
+
 static ssize_t show_attr(struct uncore_data *data, char *buf, enum uncore_index index)
 {
        unsigned int value;
@@ -179,6 +202,10 @@ static int create_attr_group(struct uncore_data *data, char *name)
                data->uncore_attrs[index++] = &data->fabric_cluster_id_kobj_attr.attr;
                init_attribute_root_ro(package_id);
                data->uncore_attrs[index++] = &data->package_id_kobj_attr.attr;
+               if (data->agent_type_mask) {
+                       init_attribute_ro(agent_types);
+                       data->uncore_attrs[index++] = &data->agent_types_kobj_attr.attr;
+               }
        }
 
        data->uncore_attrs[index++] = &data->max_freq_khz_kobj_attr.attr;

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 26c854c..a638d2e 100644 (file)
--- a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.h
+++ b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.h
@@ -11,6 +11,18 @@
 
 #include <linux/device.h>
 
+/*
+ * Define uncore agents, which are under uncore frequency control.
+ * Defined in the same order as specified in the TPMI UFS Specifications.
+ * It is possible that there are common uncore frequency control to more than
+ * one hardware agents. So, these defines are used as a bit mask.
+*/
+
+#define AGENT_TYPE_CORE                0x01
+#define        AGENT_TYPE_CACHE        0x02
+#define        AGENT_TYPE_MEMORY       0x04
+#define        AGENT_TYPE_IO           0x08
+
 /**
  * struct uncore_data - Encapsulate all uncore data
  * @stored_uncore_data: Last user changed MSR 620 value, which will be restored
@@ -25,6 +37,7 @@
  * @cluster_id:                cluster id in a domain
  * @instance_id:       Unique instance 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
  * @max_freq_khz_kobj_attr: Storage for kobject attribute max_freq_khz
  * @mix_freq_khz_kobj_attr: Storage for kobject attribute min_freq_khz
@@ -41,6 +54,7 @@
  * @elc_high_threshold_enable_kobj_attr:
                Storage for kobject attribute elc_high_threshold_enable
  * @elc_floor_freq_khz_kobj_attr: Storage for kobject attribute elc_floor_freq_khz
+ * @agent_types_kobj_attr: Storage for kobject attribute agent_type
  * @uncore_attrs:      Attribute storage for group creation
  *
  * This structure is used to encapsulate all data related to uncore sysfs
@@ -58,6 +72,7 @@ struct uncore_data {
        int cluster_id;
        int instance_id;
        char name[32];
+       u16  agent_type_mask;
 
        struct attribute_group uncore_attr_group;
        struct kobj_attribute max_freq_khz_kobj_attr;
@@ -72,7 +87,8 @@ struct uncore_data {
        struct kobj_attribute elc_high_threshold_percent_kobj_attr;
        struct kobj_attribute elc_high_threshold_enable_kobj_attr;
        struct kobj_attribute elc_floor_freq_khz_kobj_attr;
-       struct attribute *uncore_attrs[13];
+       struct kobj_attribute agent_types_kobj_attr;
+       struct attribute *uncore_attrs[14];
 };
 
 #define UNCORE_DOMAIN_ID_INVALID       -1

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 4aa6c22..8ebf685 100644 (file)
--- a/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-tpmi.c
+++ b/drivers/platform/x86/intel/uncore-frequency/uncore-frequency-tpmi.c
@@ -347,6 +347,25 @@ static int uncore_read_freq(struct uncore_data *data, unsigned int *freq)
        return 0;
 }
 
+/*
+ * Agent types as per the TPMI UFS Specification for UFS_STATUS
+ * Agent Type - Core   Bit: 23
+ * Agent Type - Cache  Bit: 24
+ * Agent Type - Memory Bit: 25
+ * Agent Type - IO     Bit: 26
+ */
+
+#define UNCORE_AGENT_TYPES     GENMASK_ULL(26, 23)
+
+/* Helper function to read agent type over MMIO and set the agent type mask */
+static void uncore_set_agent_type(struct tpmi_uncore_cluster_info *cluster_info)
+{
+       u64 status;
+
+       status = readq((u8 __iomem *)cluster_info->cluster_base + UNCORE_STATUS_INDEX);
+       cluster_info->uncore_data.agent_type_mask = FIELD_GET(UNCORE_AGENT_TYPES, status);
+}
+
 /* 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)
 {
@@ -552,6 +571,8 @@ static int uncore_probe(struct auxiliary_device *auxdev, const struct auxiliary_
 
                        cluster_info->cluster_base = pd_info->uncore_base + mask;
 
+                       uncore_set_agent_type(cluster_info);
+
                        cluster_info->uncore_data.package_id = pkg;
                        /* There are no dies like Cascade Lake */
                        cluster_info->uncore_data.die_id = 0;