Unverified Commit aec1334d authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14146 Intel: backport intel uncore frequency driver update and bugfix from 6.11 

Merge Pull Request from: @jiayingbao 
 
backport update from 6.10
including version update and other fix

Test:
uncore-driver sysfs interface work as expected


aa47aecd platform/x86/intel-uncore-freq: Don't present root domain on error
2a61f706 platform/x86/intel-uncore-freq: Increase minor number support
707d4049 platform/x86: intel-uncore-freq: Fix types in sysfs callbacks
86c32975 platform/x86/intel-uncore-freq: Process read/write blocked feature status
 
 
Link:https://gitee.com/openeuler/kernel/pulls/14146

 

Reviewed-by: default avatarJason Zeng <jason.zeng@intel.com>
Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents 0cdff4f9 aa47aecd

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

+41 −41
Original line number Diff line number Diff line
@@ -23,23 +23,23 @@ static int (*uncore_read)(struct uncore_data *data, unsigned int *min, unsigned 
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)

static ssize_t show_domain_id(struct kobject *kobj, struct kobj_attribute *attr, char *buf)

{

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

	struct uncore_data *data = container_of(attr, struct uncore_data, domain_id_kobj_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)

static ssize_t show_fabric_cluster_id(struct kobject *kobj, struct kobj_attribute *attr, char *buf)

{

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

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



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

}



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

static ssize_t show_package_id(struct kobject *kobj, struct kobj_attribute *attr, char *buf)

{

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

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



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

}
@@ -97,30 +97,30 @@ static ssize_t show_perf_status_freq_khz(struct uncore_data *data, char *buf) 
}



#define store_uncore_min_max(name, min_max)				\

	static ssize_t store_##name(struct device *dev,		\

				     struct device_attribute *attr,	\

	static ssize_t store_##name(struct kobject *kobj,		\

				     struct kobj_attribute *attr,	\

				     const char *buf, size_t count)	\

	{								\

		struct uncore_data *data = container_of(attr, struct uncore_data, name##_dev_attr);\

		struct uncore_data *data = container_of(attr, struct uncore_data, name##_kobj_attr);\

									\

		return store_min_max_freq_khz(data, buf, count,	\

					      min_max);		\

	}



#define show_uncore_min_max(name, min_max)				\

	static ssize_t show_##name(struct device *dev,		\

				    struct device_attribute *attr, char *buf)\

	static ssize_t show_##name(struct kobject *kobj,		\

				    struct kobj_attribute *attr, char *buf)\

	{                                                               \

		struct uncore_data *data = container_of(attr, struct uncore_data, name##_dev_attr);\

		struct uncore_data *data = container_of(attr, struct uncore_data, name##_kobj_attr);\

									\

		return show_min_max_freq_khz(data, buf, min_max);	\

	}



#define show_uncore_perf_status(name)					\

	static ssize_t show_##name(struct device *dev,		\

				   struct device_attribute *attr, char *buf)\

	static ssize_t show_##name(struct kobject *kobj,		\

				   struct kobj_attribute *attr, char *buf)\

	{                                                               \

		struct uncore_data *data = container_of(attr, struct uncore_data, name##_dev_attr);\

		struct uncore_data *data = container_of(attr, struct uncore_data, name##_kobj_attr);\

									\

		return show_perf_status_freq_khz(data, buf); \

	}
@@ -134,11 +134,11 @@ show_uncore_min_max(max_freq_khz, 1); 
show_uncore_perf_status(current_freq_khz);



#define show_uncore_data(member_name)					\

	static ssize_t show_##member_name(struct device *dev,	\

					   struct device_attribute *attr, char *buf)\

	static ssize_t show_##member_name(struct kobject *kobj, \

					   struct kobj_attribute *attr, char *buf)\

	{                                                               \

		struct uncore_data *data = container_of(attr, struct uncore_data,\

							  member_name##_dev_attr);\

							  member_name##_kobj_attr);\

									\

		return scnprintf(buf, PAGE_SIZE, "%u\n",		\

				 data->member_name);			\
@@ -149,29 +149,29 @@ show_uncore_data(initial_max_freq_khz); 


#define init_attribute_rw(_name)					\

	do {								\

		sysfs_attr_init(&data->_name##_dev_attr.attr);	\

		data->_name##_dev_attr.show = show_##_name;		\

		data->_name##_dev_attr.store = store_##_name;		\

		data->_name##_dev_attr.attr.name = #_name;		\

		data->_name##_dev_attr.attr.mode = 0644;		\

		sysfs_attr_init(&data->_name##_kobj_attr.attr);	\

		data->_name##_kobj_attr.show = show_##_name;		\

		data->_name##_kobj_attr.store = store_##_name;		\

		data->_name##_kobj_attr.attr.name = #_name;		\

		data->_name##_kobj_attr.attr.mode = 0644;		\

	} while (0)



#define init_attribute_ro(_name)					\

	do {								\

		sysfs_attr_init(&data->_name##_dev_attr.attr);	\

		data->_name##_dev_attr.show = show_##_name;		\

		data->_name##_dev_attr.store = NULL;			\

		data->_name##_dev_attr.attr.name = #_name;		\

		data->_name##_dev_attr.attr.mode = 0444;		\

		sysfs_attr_init(&data->_name##_kobj_attr.attr);	\

		data->_name##_kobj_attr.show = show_##_name;		\

		data->_name##_kobj_attr.store = NULL;			\

		data->_name##_kobj_attr.attr.name = #_name;		\

		data->_name##_kobj_attr.attr.mode = 0444;		\

	} while (0)



#define init_attribute_root_ro(_name)					\

	do {								\

		sysfs_attr_init(&data->_name##_dev_attr.attr);	\

		data->_name##_dev_attr.show = show_##_name;		\

		data->_name##_dev_attr.store = NULL;			\

		data->_name##_dev_attr.attr.name = #_name;		\

		data->_name##_dev_attr.attr.mode = 0400;		\

		sysfs_attr_init(&data->_name##_kobj_attr.attr);	\

		data->_name##_kobj_attr.show = show_##_name;		\

		data->_name##_kobj_attr.store = NULL;			\

		data->_name##_kobj_attr.attr.name = #_name;		\

		data->_name##_kobj_attr.attr.mode = 0400;		\

	} while (0)



static int create_attr_group(struct uncore_data *data, char *name)
@@ -186,21 +186,21 @@ static int create_attr_group(struct uncore_data *data, char *name) 


	if (data->domain_id != UNCORE_DOMAIN_ID_INVALID) {

		init_attribute_root_ro(domain_id);

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

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

		init_attribute_root_ro(fabric_cluster_id);

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

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

		init_attribute_root_ro(package_id);

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

		data->uncore_attrs[index++] = &data->package_id_kobj_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;

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

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

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

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

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



	ret = uncore_read_freq(data, &freq);

	if (!ret)

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

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



	data->uncore_attrs[index] = NULL;

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

+16 −16
Original line number Diff line number Diff line
@@ -26,14 +26,14 @@ 
 * @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

 * @mix_freq_khz_dev_attr: Storage for device attribute min_freq_khz

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

 * @max_freq_khz_kobj_attr: Storage for kobject attribute max_freq_khz

 * @mix_freq_khz_kobj_attr: Storage for kobject attribute min_freq_khz

 * @initial_max_freq_khz_kobj_attr: Storage for kobject attribute initial_max_freq_khz

 * @initial_min_freq_khz_kobj_attr: Storage for kobject attribute initial_min_freq_khz

 * @current_freq_khz_kobj_attr: Storage for kobject attribute current_freq_khz

 * @domain_id_kobj_attr: Storage for kobject attribute domain_id

 * @fabric_cluster_id_kobj_attr: Storage for kobject attribute fabric_cluster_id

 * @package_id_kobj_attr: Storage for kobject attribute package_id

 * @uncore_attrs:	Attribute storage for group creation

 *

 * This structure is used to encapsulate all data related to uncore sysfs
@@ -53,14 +53,14 @@ struct uncore_data { 
	char name[32];



	struct attribute_group uncore_attr_group;

	struct device_attribute max_freq_khz_dev_attr;

	struct device_attribute min_freq_khz_dev_attr;

	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 device_attribute domain_id_dev_attr;

	struct device_attribute fabric_cluster_id_dev_attr;

	struct device_attribute package_id_dev_attr;

	struct kobj_attribute max_freq_khz_kobj_attr;

	struct kobj_attribute min_freq_khz_kobj_attr;

	struct kobj_attribute initial_max_freq_khz_kobj_attr;

	struct kobj_attribute initial_min_freq_khz_kobj_attr;

	struct kobj_attribute current_freq_khz_kobj_attr;

	struct kobj_attribute domain_id_kobj_attr;

	struct kobj_attribute fabric_cluster_id_kobj_attr;

	struct kobj_attribute package_id_kobj_attr;

	struct attribute *uncore_attrs[9];

};

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

+24 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include "intel-uncore-frequency-common.h"



#define	UNCORE_MAJOR_VERSION		0

#define	UNCORE_MINOR_VERSION		1

#define	UNCORE_MINOR_VERSION		2

#define UNCORE_HEADER_INDEX		0

#define UNCORE_FABRIC_CLUSTER_OFFSET	8
@@ -66,6 +66,7 @@ struct tpmi_uncore_struct { 
	int min_ratio;

	struct tpmi_uncore_power_domain_info *pd_info;

	struct tpmi_uncore_cluster_info root_cluster;

	bool write_blocked;

};



#define UNCORE_GENMASK_MIN_RATIO	GENMASK_ULL(21, 15)
@@ -157,6 +158,9 @@ static int uncore_write_control_freq(struct uncore_data *data, unsigned int inpu 
	cluster_info = container_of(data, struct tpmi_uncore_cluster_info, uncore_data);

	uncore_root = cluster_info->uncore_root;



	if (uncore_root->write_blocked)

		return -EPERM;



	/* Update each cluster in a package */

	if (cluster_info->root_domain) {

		struct tpmi_uncore_struct *uncore_root = cluster_info->uncore_root;
@@ -233,11 +237,22 @@ static void remove_cluster_entries(struct tpmi_uncore_struct *tpmi_uncore) 


static int uncore_probe(struct auxiliary_device *auxdev, const struct auxiliary_device_id *id)

{

	bool read_blocked = 0, write_blocked = 0;

	struct intel_tpmi_plat_info *plat_info;

	struct tpmi_uncore_struct *tpmi_uncore;

	bool uncore_sysfs_added = false;

	int ret, i, pkg = 0;

	int num_resources;



	ret = tpmi_get_feature_status(auxdev, TPMI_ID_UNCORE, &read_blocked, &write_blocked);

	if (ret)

		dev_info(&auxdev->dev, "Can't read feature status: ignoring blocked status\n");



	if (read_blocked) {

		dev_info(&auxdev->dev, "Firmware has blocked reads, exiting\n");

		return -ENODEV;

	}



	/* Get number of power domains, which is equal to number of resources */

	num_resources = tpmi_get_resource_count(auxdev);

	if (!num_resources)
@@ -266,6 +281,7 @@ static int uncore_probe(struct auxiliary_device *auxdev, const struct auxiliary_ 
	}



	tpmi_uncore->power_domain_count = num_resources;

	tpmi_uncore->write_blocked = write_blocked;



	/* Get the package ID from the TPMI core */

	plat_info = tpmi_get_platform_data(auxdev);
@@ -314,7 +330,7 @@ static int uncore_probe(struct auxiliary_device *auxdev, const struct auxiliary_ 
			goto remove_clusters;

		}



		if (TPMI_MINOR_VERSION(pd_info->ufs_header_ver) != UNCORE_MINOR_VERSION)

		if (TPMI_MINOR_VERSION(pd_info->ufs_header_ver) > UNCORE_MINOR_VERSION)

			dev_info(&auxdev->dev, "Uncore: Ignore: Unsupported minor version:%lx\n",

				 TPMI_MINOR_VERSION(pd_info->ufs_header_ver));
@@ -369,9 +385,15 @@ static int uncore_probe(struct auxiliary_device *auxdev, const struct auxiliary_ 
			}

			/* Point to next cluster offset */

			cluster_offset >>= UNCORE_MAX_CLUSTER_PER_DOMAIN;

			uncore_sysfs_added = true;

		}

	}



	if (!uncore_sysfs_added) {

		ret = -ENODEV;

		goto remove_clusters;

	}



	auxiliary_set_drvdata(auxdev, tpmi_uncore);



	tpmi_uncore->root_cluster.root_domain = true;