Commit 1ce8d8f7 authored by Tero Kristo's avatar Tero Kristo Committed by Jia, Yingbao
Browse files

platform/x86/intel-uncore-freq: Rename the sysfs helper macro names 

mainline inclusion
from mainline-v6.11
commit b2cc9f908af19dd851dd4642325daf0e86614885
category: bugfix
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/IB6QCW
CVE: NA
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=b2cc9f908af19dd851dd4642325daf0e86614885



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

Intel-SIG: commit b2cc9f908af1 platform/x86/intel-uncore-freq: Rename the sysfs helper macro names.
Backport Intel-uncore-freq driver support for 6.6 from 6.11.

The macros to create sysfs entries are going to be used for other
attributes in addition to current min/max frequencies only, so rename
these to be more generic.

No functional change intended.

Signed-off-by: default avatarTero Kristo <tero.kristo@linux.intel.com>
Acked-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Link: https://lore.kernel.org/r/20240617060708.892981-7-tero.kristo@linux.intel.com


Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
[ Yingbao Jia: amend commit log ]
Signed-off-by: default avatarYingbao Jia <yingbao.jia@intel.com>
parent 1462854b

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

+11 −14
Original line number Diff line number Diff line
@@ -43,8 +43,7 @@ static ssize_t show_package_id(struct kobject *kobj, struct kobj_attribute *attr 
	return sprintf(buf, "%u\n", data->package_id);

}



static ssize_t show_min_max_freq_khz(struct uncore_data *data,

				      char *buf, enum uncore_index index)

static ssize_t show_attr(struct uncore_data *data, char *buf, enum uncore_index index)

{

	unsigned int value;

	int ret;
@@ -58,8 +57,7 @@ static ssize_t show_min_max_freq_khz(struct uncore_data *data, 
	return sprintf(buf, "%u\n", value);

}



static ssize_t store_min_max_freq_khz(struct uncore_data *data,

				      const char *buf, ssize_t count,

static ssize_t store_attr(struct uncore_data *data, const char *buf, ssize_t count,

			  enum uncore_index index)

{

	unsigned int input;
@@ -92,24 +90,23 @@ static ssize_t show_perf_status_freq_khz(struct uncore_data *data, char *buf) 
	return sprintf(buf, "%u\n", freq);

}



#define store_uncore_min_max(name, min_max)				\

#define store_uncore_attr(name, index)					\

	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##_kobj_attr);\

									\

		return store_min_max_freq_khz(data, buf, count,	\

					      min_max);		\

		return store_attr(data, buf, count, index);		\

	}



#define show_uncore_min_max(name, min_max)				\

#define show_uncore_attr(name, index)					\

	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##_kobj_attr);\

									\

		return show_min_max_freq_khz(data, buf, min_max);	\

		return show_attr(data, buf, index);			\

	}



#define show_uncore_perf_status(name)					\
@@ -121,11 +118,11 @@ static ssize_t show_perf_status_freq_khz(struct uncore_data *data, char *buf) 
		return show_perf_status_freq_khz(data, buf); \

	}



store_uncore_min_max(min_freq_khz, UNCORE_INDEX_MIN_FREQ);

store_uncore_min_max(max_freq_khz, UNCORE_INDEX_MAX_FREQ);

store_uncore_attr(min_freq_khz, UNCORE_INDEX_MIN_FREQ);

store_uncore_attr(max_freq_khz, UNCORE_INDEX_MAX_FREQ);



show_uncore_min_max(min_freq_khz, UNCORE_INDEX_MIN_FREQ);

show_uncore_min_max(max_freq_khz, UNCORE_INDEX_MAX_FREQ);

show_uncore_attr(min_freq_khz, UNCORE_INDEX_MIN_FREQ);

show_uncore_attr(max_freq_khz, UNCORE_INDEX_MAX_FREQ);



show_uncore_perf_status(current_freq_khz);