Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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.

Fixes: 414eef27283a ("platform/x86/intel/uncore-freq: Display uncore current frequency")
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Link: https://lore.kernel.org/r/20231004181915.1887913-1-srinivas.pandruvada@linux.intel.com
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

authored by

Srinivas Pandruvada and committed by
Hans de Goede
4d73c677 a4fdebbe

+6 -2
+6 -2
drivers/platform/x86/intel/uncore-frequency/uncore-frequency-common.c
··· 176 176 177 177 static int create_attr_group(struct uncore_data *data, char *name) 178 178 { 179 - int ret, index = 0; 179 + int ret, freq, index = 0; 180 180 181 181 init_attribute_rw(max_freq_khz); 182 182 init_attribute_rw(min_freq_khz); ··· 197 197 data->uncore_attrs[index++] = &data->min_freq_khz_dev_attr.attr; 198 198 data->uncore_attrs[index++] = &data->initial_min_freq_khz_dev_attr.attr; 199 199 data->uncore_attrs[index++] = &data->initial_max_freq_khz_dev_attr.attr; 200 - data->uncore_attrs[index++] = &data->current_freq_khz_dev_attr.attr; 200 + 201 + ret = uncore_read_freq(data, &freq); 202 + if (!ret) 203 + data->uncore_attrs[index++] = &data->current_freq_khz_dev_attr.attr; 204 + 201 205 data->uncore_attrs[index] = NULL; 202 206 203 207 data->uncore_attr_group.name = name;