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

platform/x86: intel-uncore-freq: Conditionally create attribute for read frequency 

mainline inclusion
from mainline-v6.6-rc7
commit 4d73c677
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=4d73c6772ab771cbbe7e46a73e7c78ba490350fa



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

When the current uncore frequency can't be read, don't create attribute
"current_freq_khz" as any read will fail later. Some user space
applications like turbostat fail to continue with the failure. So, check
error during attribute creation.

Intel-SIG: commit 4d73c677 platform/x86: intel-uncore-freq: Conditionally create attribute for read frequency.
Backport Intel-uncore-freq driver support on TPMI.

Fixes: 414eef27 ("platform/x86/intel/uncore-freq: Display uncore current frequency")
Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Reviewed-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20231004181915.1887913-1-srinivas.pandruvada@linux.intel.com


Reviewed-by: default avatarHans de Goede <hdegoede@redhat.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 0f05960b

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

+6 −2
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ show_uncore_data(initial_max_freq_khz); 


static int create_attr_group(struct uncore_data *data, char *name)

{

	int ret, index = 0;

	int ret, freq, index = 0;



	init_attribute_rw(max_freq_khz);

	init_attribute_rw(min_freq_khz);
@@ -197,7 +197,11 @@ static int create_attr_group(struct uncore_data *data, char *name) 
	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;



	ret = uncore_read_freq(data, &freq);

	if (!ret)

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



	data->uncore_attrs[index] = NULL;



	data->uncore_attr_group.name = name;