Commit 4ec7c966 authored by Srinivas Pandruvada's avatar Srinivas Pandruvada Committed by Yingbao Jia
Browse files

platform/x86/intel-uncore-freq: Support for cluster level controls 

mainline inclusion
from mainline-v6.5-rc1
commit 9b8dea80
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I8WOEG

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9b8dea80e3cb22e1fed4f974841116e10a3dbb35



-------------------------------------

An SoC can contain multiple power domains with individual or collection
of mesh partitions. This partition is called fabric cluster.

Certain type of meshes will need to run at the same frequency, they will
be placed in the same fabric cluster. Benefit of fabric cluster is that
it offers a scalable mechanism to deal with partitioned fabrics in a SoC.

The current sysfs interface supports control at package and die level.
This interface is not enough to support more granular control at
fabric cluster level.

SoCs with the support of TPMI (Topology Aware Register and PM Capsule
Interface), can have multiple power domains. Each power domain can
contain one or more fabric clusters.

To support such granular controls, enhance uncore common to optionally
create new directories to provide controls at fabric cluster level. It
is also important to have flexibility to change granularity for future
version of SoCs. If the directory name contains scope like:
"package_*_die_*_power_domain_*_cluster_*", then this is not expandable.

The cpufreq policies also have different scopes. There the scope of the
policy (affected_cpus) specified by attributes inside each policy.
So, follow the same model for uncore frequency scaling sysfs as:
"sys/devices/system/cpu/cpufreq/policy*"

Allow client drivers to optionally support granular control for each
fabric cluster. Here, the directory name will be "uncore" suffixed with
an unique instance number. For example: uncore00, uncore01 etc.
Attributes in the directory identify package id, power domain and
fabric cluster id. This interface is expandable even if some new level
of granularity is introduced. A new sysfs attribute can identify new
level.

For compatibility with the existing sysfs and provide easy way to set
limits for each fabric cluster in the package/die, the existing control
at package/die levels are still provided. For majority of users, this is
an easy approach.

For example: On a single package/die system, with three power domains
and one fabric cluster per power domain:

$tree -L 2 /sys/devices/system/cpu/intel_uncore_frequency/
/sys/devices/system/cpu/intel_uncore_frequency/
├── package_00_die_00
│   ├── current_freq_khz
│   ├── initial_max_freq_khz
│   ├── initial_min_freq_khz
│   ├── max_freq_khz
│   └── min_freq_khz
├── uncore00
│   ├── current_freq_khz
│   ├── domain_id
│   ├── fabric_cluster_id
│   ├── initial_max_freq_khz
│   ├── initial_min_freq_khz
│   ├── max_freq_khz
│   ├── min_freq_khz
│   └── package_id
├── uncore01
│   ├── current_freq_khz
│   ├── domain_id
│   ├── fabric_cluster_id
│   ├── initial_max_freq_khz
│   ├── initial_min_freq_khz
│   ├── max_freq_khz
│   ├── min_freq_khz
│   └── package_id
└── uncore02
    ├── current_freq_khz
    ├── domain_id
    ├── fabric_cluster_id
    ├── initial_max_freq_khz
    ├── initial_min_freq_khz
    ├── max_freq_khz
    ├── min_freq_khz
    └── package_id

The attribute for cluster id is "fabric_cluster_id" instead of just
"cluster_id" is to avoid confusion with usage of term clusters in
other part of the Linux kernel.

Intel-SIG: commit 9b8dea80 platform/x86/intel-uncore-freq: Support for cluster level controls.
Backport Intel-uncore-freq driver support on TPMI.

Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Reviewed-by: default avatarZhang Rui <rui.zhang@intel.com>
Tested-by: default avatarWendy Wang <wendy.wang@intel.com>
Link: https://lore.kernel.org/r/20230418171340.681662-3-srinivas.pandruvada@linux.intel.com
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
[ Yingbao Jia: amend commit log ]
Signed-off-by: default avatarYingbao Jia <yingbao.jia@intel.com>
parent 21da0096

drivers/platform/x86/intel-uncore-frequency-common.c

+49 −2
Original line number Diff line number Diff line
@@ -16,11 +16,34 @@ static struct kobject *uncore_root_kobj; 
/* uncore instance count */

static int uncore_instance_count;



static DEFINE_IDA(intel_uncore_ida);



/* callbacks for actual HW read/write */

static int (*uncore_read)(struct uncore_data *data, unsigned int *min, unsigned int *max);

static int (*uncore_write)(struct uncore_data *data, unsigned int input, unsigned int min_max);

static int (*uncore_read_freq)(struct uncore_data *data, unsigned int *freq);



static ssize_t show_domain_id(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct uncore_data *data = container_of(attr, struct uncore_data, domain_id_dev_attr);



	return sprintf(buf, "%u\n", data->domain_id);

}



static ssize_t show_fabric_cluster_id(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct uncore_data *data = container_of(attr, struct uncore_data, fabric_cluster_id_dev_attr);



	return sprintf(buf, "%u\n", data->cluster_id);

}



static ssize_t show_package_id(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct uncore_data *data = container_of(attr, struct uncore_data, package_id_dev_attr);



	return sprintf(buf, "%u\n", data->package_id);

}



static ssize_t show_min_max_freq_khz(struct uncore_data *data,

				      char *buf, int min_max)

{
@@ -161,6 +184,15 @@ static int create_attr_group(struct uncore_data *data, char *name) 
	init_attribute_ro(initial_max_freq_khz);

	init_attribute_root_ro(current_freq_khz);



	if (data->domain_id != UNCORE_DOMAIN_ID_INVALID) {

		init_attribute_root_ro(domain_id);

		data->uncore_attrs[index++] = &data->domain_id_dev_attr.attr;

		init_attribute_root_ro(fabric_cluster_id);

		data->uncore_attrs[index++] = &data->fabric_cluster_id_dev_attr.attr;

		init_attribute_root_ro(package_id);

		data->uncore_attrs[index++] = &data->package_id_dev_attr.attr;

	}



	data->uncore_attrs[index++] = &data->max_freq_khz_dev_attr.attr;

	data->uncore_attrs[index++] = &data->min_freq_khz_dev_attr.attr;

	data->uncore_attrs[index++] = &data->initial_min_freq_khz_dev_attr.attr;
@@ -191,12 +223,24 @@ int uncore_freq_add_entry(struct uncore_data *data, int cpu) 
		goto uncore_unlock;

	}



	if (data->domain_id != UNCORE_DOMAIN_ID_INVALID) {

		ret = ida_alloc(&intel_uncore_ida, GFP_KERNEL);

		if (ret < 0)

			goto uncore_unlock;



		data->instance_id = ret;

		sprintf(data->name, "uncore%02d", ret);

	} else {

		sprintf(data->name, "package_%02d_die_%02d", data->package_id, data->die_id);

	}



	uncore_read(data, &data->initial_min_freq_khz, &data->initial_max_freq_khz);



	ret = create_attr_group(data, data->name);

	if (!ret) {

	if (ret) {

		if (data->domain_id != UNCORE_DOMAIN_ID_INVALID)

			ida_free(&intel_uncore_ida, data->instance_id);

	} else {

		data->control_cpu = cpu;

		data->valid = true;

	}
@@ -214,6 +258,9 @@ void uncore_freq_remove_die_entry(struct uncore_data *data) 
	delete_attr_group(data, data->name);

	data->control_cpu = -1;

	data->valid = false;

	if (data->domain_id != UNCORE_DOMAIN_ID_INVALID)

		ida_free(&intel_uncore_ida, data->instance_id);



	mutex_unlock(&uncore_lock);

}

EXPORT_SYMBOL_NS_GPL(uncore_freq_remove_die_entry, INTEL_UNCORE_FREQUENCY);

drivers/platform/x86/intel-uncore-frequency-common.h

+15 −1
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ 
 * @valid:		Mark the data valid/invalid

 * @package_id:	Package id for this instance

 * @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

 * @name:		Sysfs entry name for this instance

 * @uncore_attr_group:	Attribute group storage

 * @max_freq_khz_dev_attr: Storage for device attribute max_freq_khz
@@ -28,6 +31,9 @@ 
 * @initial_max_freq_khz_dev_attr: Storage for device attribute initial_max_freq_khz

 * @initial_min_freq_khz_dev_attr: Storage for device attribute initial_min_freq_khz

 * @current_freq_khz_dev_attr: Storage for device attribute current_freq_khz

 * @domain_id_dev_attr: Storage for device attribute domain_id

 * @fabric_cluster_id_dev_attr: Storage for device attribute fabric_cluster_id

 * @package_id_dev_attr: Storage for device attribute package_id

 * @uncore_attrs:	Attribute storage for group creation

 *

 * This structure is used to encapsulate all data related to uncore sysfs
@@ -41,6 +47,9 @@ struct uncore_data { 
	bool valid;

	int package_id;

	int die_id;

	int domain_id;

	int cluster_id;

	int instance_id;

	char name[32];



	struct attribute_group uncore_attr_group;
@@ -49,9 +58,14 @@ struct uncore_data { 
	struct device_attribute initial_max_freq_khz_dev_attr;

	struct device_attribute initial_min_freq_khz_dev_attr;

	struct device_attribute current_freq_khz_dev_attr;

	struct attribute *uncore_attrs[6];

	struct device_attribute domain_id_dev_attr;

	struct device_attribute fabric_cluster_id_dev_attr;

	struct device_attribute package_id_dev_attr;

	struct attribute *uncore_attrs[9];

};



#define UNCORE_DOMAIN_ID_INVALID	-1



int uncore_freq_common_init(int (*read_control_freq)(struct uncore_data *data, unsigned int *min, unsigned int *max),

			     int (*write_control_freq)(struct uncore_data *data, unsigned int input, unsigned int min_max),

			     int (*uncore_read_freq)(struct uncore_data *data, unsigned int *freq));

drivers/platform/x86/intel-uncore-frequency.c

+1 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ static int uncore_event_cpu_online(unsigned int cpu) 


	data->package_id = topology_physical_package_id(cpu);

	data->die_id = topology_die_id(cpu);

	data->domain_id = UNCORE_DOMAIN_ID_INVALID;



	return uncore_freq_add_entry(data, cpu);

}