Skip to content

Commit 4d73c67

Browse files
spandruvadajwrdegoede
authored andcommitted
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: 414eef2 ("platform/x86/intel/uncore-freq: Display uncore current frequency") Signed-off-by: Srinivas Pandruvada <[email protected]> Reviewed-by: Ilpo Järvinen <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Hans de Goede <[email protected]> Signed-off-by: Hans de Goede <[email protected]>
1 parent a4fdebb commit 4d73c67

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ show_uncore_data(initial_max_freq_khz);
176176

177177
static int create_attr_group(struct uncore_data *data, char *name)
178178
{
179-
int ret, index = 0;
179+
int ret, freq, index = 0;
180180

181181
init_attribute_rw(max_freq_khz);
182182
init_attribute_rw(min_freq_khz);
@@ -197,7 +197,11 @@ static int create_attr_group(struct uncore_data *data, char *name)
197197
data->uncore_attrs[index++] = &data->min_freq_khz_dev_attr.attr;
198198
data->uncore_attrs[index++] = &data->initial_min_freq_khz_dev_attr.attr;
199199
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+
201205
data->uncore_attrs[index] = NULL;
202206

203207
data->uncore_attr_group.name = name;

0 commit comments

Comments
 (0)