diff mbox series

[RESEND,v6,4/9] cpupower: Add the function to get the sysfs value from specific table

Message ID 20220216073558.751071-5-ray.huang@amd.com
State Superseded
Headers show
Series cpupower: Add AMD P-State Support | expand

Commit Message

Huang Rui Feb. 16, 2022, 7:35 a.m. UTC 
Expose the helper into cpufreq header, then cpufreq driver can use this
function to get the sysfs value if it has any specific sysfs interfaces.

Signed-off-by: Huang Rui <ray.huang@amd.com>
---
 tools/power/cpupower/lib/cpufreq.c | 21 +++++++++++++++------
 tools/power/cpupower/lib/cpufreq.h | 12 ++++++++++++
 2 files changed, 27 insertions(+), 6 deletions(-)

Comments

Shuah Khan Feb. 18, 2022, 11:46 p.m. UTC | #1 
On 2/16/22 12:35 AM, Huang Rui wrote:
> Expose the helper into cpufreq header, then cpufreq driver can use this
> function to get the sysfs value if it has any specific sysfs interfaces.
> 
> Signed-off-by: Huang Rui <ray.huang@amd.com>
> ---
>   tools/power/cpupower/lib/cpufreq.c | 21 +++++++++++++++------
>   tools/power/cpupower/lib/cpufreq.h | 12 ++++++++++++
>   2 files changed, 27 insertions(+), 6 deletions(-)
> 
> diff --git a/tools/power/cpupower/lib/cpufreq.c b/tools/power/cpupower/lib/cpufreq.c
> index c3b56db8b921..c011bca27041 100644
> --- a/tools/power/cpupower/lib/cpufreq.c
> +++ b/tools/power/cpupower/lib/cpufreq.c
> @@ -83,20 +83,21 @@ static const char *cpufreq_value_files[MAX_CPUFREQ_VALUE_READ_FILES] = {
>   	[STATS_NUM_TRANSITIONS] = "stats/total_trans"
>   };
>   
> -
> -static unsigned long sysfs_cpufreq_get_one_value(unsigned int cpu,
> -						 enum cpufreq_value which)
> +unsigned long cpufreq_get_sysfs_value_from_table(unsigned int cpu,
> +						 const char **table,
> +						 unsigned index,

unsigned int

> +						 unsigned size)

unsigned int

>   {
>   	unsigned long value;
>   	unsigned int len;
>   	char linebuf[MAX_LINE_LEN];
>   	char *endp;
>   
> -	if (which >= MAX_CPUFREQ_VALUE_READ_FILES)
> +	if (!table || index >= size || !table[index])
>   		return 0;
>   
> -	len = sysfs_cpufreq_read_file(cpu, cpufreq_value_files[which],
> -				linebuf, sizeof(linebuf));
> +	len = sysfs_cpufreq_read_file(cpu, table[index], linebuf,
> +				      sizeof(linebuf));
>   
>   	if (len == 0)
>   		return 0;
> @@ -109,6 +110,14 @@ static unsigned long sysfs_cpufreq_get_one_value(unsigned int cpu,
>   	return value;
>   }
>   
> +static unsigned long sysfs_cpufreq_get_one_value(unsigned int cpu,
> +						 enum cpufreq_value which)
> +{
> +	return cpufreq_get_sysfs_value_from_table(cpu, cpufreq_value_files,
> +						  which,
> +						  MAX_CPUFREQ_VALUE_READ_FILES);
> +}
> +
>   /* read access to files which contain one string */
>   
>   enum cpufreq_string {
> diff --git a/tools/power/cpupower/lib/cpufreq.h b/tools/power/cpupower/lib/cpufreq.h
> index 95f4fd9e2656..107668c0c454 100644
> --- a/tools/power/cpupower/lib/cpufreq.h
> +++ b/tools/power/cpupower/lib/cpufreq.h
> @@ -203,6 +203,18 @@ int cpufreq_modify_policy_governor(unsigned int cpu, char *governor);
>   int cpufreq_set_frequency(unsigned int cpu,
>   				unsigned long target_frequency);
>   
> +/*
> + * get the sysfs value from specific table
> + *
> + * Read the value with the sysfs file name from specific table. Does
> + * only work if the cpufreq driver has the specific sysfs interfaces.
> + */
> +
> +unsigned long cpufreq_get_sysfs_value_from_table(unsigned int cpu,
> +						 const char **table,
> +						 unsigned index,

unsigned int?

> +						 unsigned size);

unsigned int?

> +
>   #ifdef __cplusplus
>   }
>   #endif
> 

thanks,
-- Shuah
Huang Rui Feb. 20, 2022, 2:22 p.m. UTC | #2 
On Sat, Feb 19, 2022 at 07:46:46AM +0800, Shuah Khan wrote:
> On 2/16/22 12:35 AM, Huang Rui wrote:
> > Expose the helper into cpufreq header, then cpufreq driver can use this
> > function to get the sysfs value if it has any specific sysfs interfaces.
> > 
> > Signed-off-by: Huang Rui <ray.huang@amd.com>
> > ---
> >   tools/power/cpupower/lib/cpufreq.c | 21 +++++++++++++++------
> >   tools/power/cpupower/lib/cpufreq.h | 12 ++++++++++++
> >   2 files changed, 27 insertions(+), 6 deletions(-)
> > 
> > diff --git a/tools/power/cpupower/lib/cpufreq.c b/tools/power/cpupower/lib/cpufreq.c
> > index c3b56db8b921..c011bca27041 100644
> > --- a/tools/power/cpupower/lib/cpufreq.c
> > +++ b/tools/power/cpupower/lib/cpufreq.c
> > @@ -83,20 +83,21 @@ static const char *cpufreq_value_files[MAX_CPUFREQ_VALUE_READ_FILES] = {
> >   	[STATS_NUM_TRANSITIONS] = "stats/total_trans"
> >   };
> >   
> > -
> > -static unsigned long sysfs_cpufreq_get_one_value(unsigned int cpu,
> > -						 enum cpufreq_value which)
> > +unsigned long cpufreq_get_sysfs_value_from_table(unsigned int cpu,
> > +						 const char **table,
> > +						 unsigned index,
> 
> unsigned int
> 
> > +						 unsigned size)
> 
> unsigned int
> 
> >   {
> >   	unsigned long value;
> >   	unsigned int len;
> >   	char linebuf[MAX_LINE_LEN];
> >   	char *endp;
> >   
> > -	if (which >= MAX_CPUFREQ_VALUE_READ_FILES)
> > +	if (!table || index >= size || !table[index])
> >   		return 0;
> >   
> > -	len = sysfs_cpufreq_read_file(cpu, cpufreq_value_files[which],
> > -				linebuf, sizeof(linebuf));
> > +	len = sysfs_cpufreq_read_file(cpu, table[index], linebuf,
> > +				      sizeof(linebuf));
> >   
> >   	if (len == 0)
> >   		return 0;
> > @@ -109,6 +110,14 @@ static unsigned long sysfs_cpufreq_get_one_value(unsigned int cpu,
> >   	return value;
> >   }
> >   
> > +static unsigned long sysfs_cpufreq_get_one_value(unsigned int cpu,
> > +						 enum cpufreq_value which)
> > +{
> > +	return cpufreq_get_sysfs_value_from_table(cpu, cpufreq_value_files,
> > +						  which,
> > +						  MAX_CPUFREQ_VALUE_READ_FILES);
> > +}
> > +
> >   /* read access to files which contain one string */
> >   
> >   enum cpufreq_string {
> > diff --git a/tools/power/cpupower/lib/cpufreq.h b/tools/power/cpupower/lib/cpufreq.h
> > index 95f4fd9e2656..107668c0c454 100644
> > --- a/tools/power/cpupower/lib/cpufreq.h
> > +++ b/tools/power/cpupower/lib/cpufreq.h
> > @@ -203,6 +203,18 @@ int cpufreq_modify_policy_governor(unsigned int cpu, char *governor);
> >   int cpufreq_set_frequency(unsigned int cpu,
> >   				unsigned long target_frequency);
> >   
> > +/*
> > + * get the sysfs value from specific table
> > + *
> > + * Read the value with the sysfs file name from specific table. Does
> > + * only work if the cpufreq driver has the specific sysfs interfaces.
> > + */
> > +
> > +unsigned long cpufreq_get_sysfs_value_from_table(unsigned int cpu,
> > +						 const char **table,
> > +						 unsigned index,
> 
> unsigned int?
> 
> > +						 unsigned size);
> 
> unsigned int?
> 

OK, the complier prefer 'unsigned int' to bare use of 'unsigned'. Thanks, I
will updated it in V7.

Thanks,
Ray
diff mbox series

Patch

diff --git a/tools/power/cpupower/lib/cpufreq.c b/tools/power/cpupower/lib/cpufreq.c
index c3b56db8b921..c011bca27041 100644
--- a/tools/power/cpupower/lib/cpufreq.c
+++ b/tools/power/cpupower/lib/cpufreq.c
@@ -83,20 +83,21 @@  static const char *cpufreq_value_files[MAX_CPUFREQ_VALUE_READ_FILES] = {
 	[STATS_NUM_TRANSITIONS] = "stats/total_trans"
 };
 
-
-static unsigned long sysfs_cpufreq_get_one_value(unsigned int cpu,
-						 enum cpufreq_value which)
+unsigned long cpufreq_get_sysfs_value_from_table(unsigned int cpu,
+						 const char **table,
+						 unsigned index,
+						 unsigned size)
 {
 	unsigned long value;
 	unsigned int len;
 	char linebuf[MAX_LINE_LEN];
 	char *endp;
 
-	if (which >= MAX_CPUFREQ_VALUE_READ_FILES)
+	if (!table || index >= size || !table[index])
 		return 0;
 
-	len = sysfs_cpufreq_read_file(cpu, cpufreq_value_files[which],
-				linebuf, sizeof(linebuf));
+	len = sysfs_cpufreq_read_file(cpu, table[index], linebuf,
+				      sizeof(linebuf));
 
 	if (len == 0)
 		return 0;
@@ -109,6 +110,14 @@  static unsigned long sysfs_cpufreq_get_one_value(unsigned int cpu,
 	return value;
 }
 
+static unsigned long sysfs_cpufreq_get_one_value(unsigned int cpu,
+						 enum cpufreq_value which)
+{
+	return cpufreq_get_sysfs_value_from_table(cpu, cpufreq_value_files,
+						  which,
+						  MAX_CPUFREQ_VALUE_READ_FILES);
+}
+
 /* read access to files which contain one string */
 
 enum cpufreq_string {
diff --git a/tools/power/cpupower/lib/cpufreq.h b/tools/power/cpupower/lib/cpufreq.h
index 95f4fd9e2656..107668c0c454 100644
--- a/tools/power/cpupower/lib/cpufreq.h
+++ b/tools/power/cpupower/lib/cpufreq.h
@@ -203,6 +203,18 @@  int cpufreq_modify_policy_governor(unsigned int cpu, char *governor);
 int cpufreq_set_frequency(unsigned int cpu,
 				unsigned long target_frequency);
 
+/*
+ * get the sysfs value from specific table
+ *
+ * Read the value with the sysfs file name from specific table. Does
+ * only work if the cpufreq driver has the specific sysfs interfaces.
+ */
+
+unsigned long cpufreq_get_sysfs_value_from_table(unsigned int cpu,
+						 const char **table,
+						 unsigned index,
+						 unsigned size);
+
 #ifdef __cplusplus
 }
 #endif