| Message ID | 20211029130241.1984459-18-ray.huang@amd.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | cpufreq: introduce a new AMD CPU frequency control mechanism | expand |
On 10/29/2021 08:02, Huang Rui wrote: > Introduce the marco definitions and access helper function for You've got a spelling error here. > amd-pstate sysfs interfaces such as each performance goals and frequency > levels in amd helper file. They will be used to read the sysfs attribute > from amd-pstate cpufreq driver for cpupower utilities. > > Signed-off-by: Huang Rui <ray.huang@amd.com> > --- > tools/power/cpupower/utils/helpers/amd.c | 37 ++++++++++++++++++++++++ > 1 file changed, 37 insertions(+) > > diff --git a/tools/power/cpupower/utils/helpers/amd.c b/tools/power/cpupower/utils/helpers/amd.c > index 97f2c857048e..f233a6ab75ac 100644 > --- a/tools/power/cpupower/utils/helpers/amd.c > +++ b/tools/power/cpupower/utils/helpers/amd.c > @@ -8,7 +8,9 @@ > #include <pci/pci.h> > > #include "helpers/helpers.h" > +#include "cpufreq.h" > > +/* ACPI P-States Helper Functions for AMD Processors ***************/ > #define MSR_AMD_PSTATE_STATUS 0xc0010063 > #define MSR_AMD_PSTATE 0xc0010064 > #define MSR_AMD_PSTATE_LIMIT 0xc0010061 > @@ -146,4 +148,39 @@ int amd_pci_get_num_boost_states(int *active, int *states) > pci_cleanup(pci_acc); > return 0; > } > + > +/* ACPI P-States Helper Functions for AMD Processors ***************/ > + > +/* AMD P-States Helper Functions ***************/ > +enum amd_pstate_value { > + AMD_PSTATE_HIGHEST_PERF, > + AMD_PSTATE_NOMINAL_PERF, > + AMD_PSTATE_LOWEST_NONLINEAR_PERF, > + AMD_PSTATE_LOWEST_PERF, > + AMD_PSTATE_MAX_FREQ, > + AMD_PSTATE_NOMINAL_FREQ, > + AMD_PSTATE_LOWEST_NONLINEAR_FREQ, > + MAX_AMD_PSTATE_VALUE_READ_FILES > +}; > + > +static const char *amd_pstate_value_files[MAX_AMD_PSTATE_VALUE_READ_FILES] = { > + [AMD_PSTATE_HIGHEST_PERF] = "amd_pstate_highest_perf", > + [AMD_PSTATE_NOMINAL_PERF] = "amd_pstate_nominal_perf", > + [AMD_PSTATE_LOWEST_NONLINEAR_PERF] = "amd_pstate_lowest_nonlinear_perf", > + [AMD_PSTATE_LOWEST_PERF] = "amd_pstate_lowest_perf", > + [AMD_PSTATE_MAX_FREQ] = "amd_pstate_max_freq", > + [AMD_PSTATE_NOMINAL_FREQ] = "amd_pstate_nominal_freq", > + [AMD_PSTATE_LOWEST_NONLINEAR_FREQ] = "amd_pstate_lowest_nonlinear_freq", > +}; > + > +static unsigned long amd_pstate_get_data(unsigned int cpu, > + enum amd_pstate_value value) > +{ > + return cpufreq_get_sysfs_value_from_table(cpu, > + amd_pstate_value_files, > + value, > + MAX_AMD_PSTATE_VALUE_READ_FILES); > +} > + > +/* AMD P-States Helper Functions ***************/ > #endif /* defined(__i386__) || defined(__x86_64__) */ >
On Fri, Oct 29, 2021 at 10:10:13PM +0800, Limonciello, Mario wrote: > On 10/29/2021 08:02, Huang Rui wrote: > > Introduce the marco definitions and access helper function for > > You've got a spelling error here. Thanks, it's should be "macro". Ray > > > amd-pstate sysfs interfaces such as each performance goals and frequency > > levels in amd helper file. They will be used to read the sysfs attribute > > from amd-pstate cpufreq driver for cpupower utilities. > > > > Signed-off-by: Huang Rui <ray.huang@amd.com> > > --- > > tools/power/cpupower/utils/helpers/amd.c | 37 ++++++++++++++++++++++++ > > 1 file changed, 37 insertions(+) > > > > diff --git a/tools/power/cpupower/utils/helpers/amd.c b/tools/power/cpupower/utils/helpers/amd.c > > index 97f2c857048e..f233a6ab75ac 100644 > > --- a/tools/power/cpupower/utils/helpers/amd.c > > +++ b/tools/power/cpupower/utils/helpers/amd.c > > @@ -8,7 +8,9 @@ > > #include <pci/pci.h> > > > > #include "helpers/helpers.h" > > +#include "cpufreq.h" > > > > +/* ACPI P-States Helper Functions for AMD Processors ***************/ > #define MSR_AMD_PSTATE_STATUS 0xc0010063 > > #define MSR_AMD_PSTATE 0xc0010064 > > #define MSR_AMD_PSTATE_LIMIT 0xc0010061 > > @@ -146,4 +148,39 @@ int amd_pci_get_num_boost_states(int *active, int *states) > > pci_cleanup(pci_acc); > > return 0; > > } > > + > > +/* ACPI P-States Helper Functions for AMD Processors ***************/ > > + > > +/* AMD P-States Helper Functions ***************/ > > +enum amd_pstate_value { > > + AMD_PSTATE_HIGHEST_PERF, > > + AMD_PSTATE_NOMINAL_PERF, > > + AMD_PSTATE_LOWEST_NONLINEAR_PERF, > > + AMD_PSTATE_LOWEST_PERF, > > + AMD_PSTATE_MAX_FREQ, > > + AMD_PSTATE_NOMINAL_FREQ, > > + AMD_PSTATE_LOWEST_NONLINEAR_FREQ, > > + MAX_AMD_PSTATE_VALUE_READ_FILES > > +}; > > + > > +static const char *amd_pstate_value_files[MAX_AMD_PSTATE_VALUE_READ_FILES] = { > > + [AMD_PSTATE_HIGHEST_PERF] = "amd_pstate_highest_perf", > > + [AMD_PSTATE_NOMINAL_PERF] = "amd_pstate_nominal_perf", > > + [AMD_PSTATE_LOWEST_NONLINEAR_PERF] = "amd_pstate_lowest_nonlinear_perf", > > + [AMD_PSTATE_LOWEST_PERF] = "amd_pstate_lowest_perf", > > + [AMD_PSTATE_MAX_FREQ] = "amd_pstate_max_freq", > > + [AMD_PSTATE_NOMINAL_FREQ] = "amd_pstate_nominal_freq", > > + [AMD_PSTATE_LOWEST_NONLINEAR_FREQ] = "amd_pstate_lowest_nonlinear_freq", > > +}; > > + > > +static unsigned long amd_pstate_get_data(unsigned int cpu, > > + enum amd_pstate_value value) > > +{ > > + return cpufreq_get_sysfs_value_from_table(cpu, > > + amd_pstate_value_files, > > + value, > > + MAX_AMD_PSTATE_VALUE_READ_FILES); > > +} > > + > > +/* AMD P-States Helper Functions ***************/ > > #endif /* defined(__i386__) || defined(__x86_64__) */ > > >
diff --git a/tools/power/cpupower/utils/helpers/amd.c b/tools/power/cpupower/utils/helpers/amd.c index 97f2c857048e..f233a6ab75ac 100644 --- a/tools/power/cpupower/utils/helpers/amd.c +++ b/tools/power/cpupower/utils/helpers/amd.c @@ -8,7 +8,9 @@ #include <pci/pci.h> #include "helpers/helpers.h" +#include "cpufreq.h" +/* ACPI P-States Helper Functions for AMD Processors ***************/ #define MSR_AMD_PSTATE_STATUS 0xc0010063 #define MSR_AMD_PSTATE 0xc0010064 #define MSR_AMD_PSTATE_LIMIT 0xc0010061 @@ -146,4 +148,39 @@ int amd_pci_get_num_boost_states(int *active, int *states) pci_cleanup(pci_acc); return 0; } + +/* ACPI P-States Helper Functions for AMD Processors ***************/ + +/* AMD P-States Helper Functions ***************/ +enum amd_pstate_value { + AMD_PSTATE_HIGHEST_PERF, + AMD_PSTATE_NOMINAL_PERF, + AMD_PSTATE_LOWEST_NONLINEAR_PERF, + AMD_PSTATE_LOWEST_PERF, + AMD_PSTATE_MAX_FREQ, + AMD_PSTATE_NOMINAL_FREQ, + AMD_PSTATE_LOWEST_NONLINEAR_FREQ, + MAX_AMD_PSTATE_VALUE_READ_FILES +}; + +static const char *amd_pstate_value_files[MAX_AMD_PSTATE_VALUE_READ_FILES] = { + [AMD_PSTATE_HIGHEST_PERF] = "amd_pstate_highest_perf", + [AMD_PSTATE_NOMINAL_PERF] = "amd_pstate_nominal_perf", + [AMD_PSTATE_LOWEST_NONLINEAR_PERF] = "amd_pstate_lowest_nonlinear_perf", + [AMD_PSTATE_LOWEST_PERF] = "amd_pstate_lowest_perf", + [AMD_PSTATE_MAX_FREQ] = "amd_pstate_max_freq", + [AMD_PSTATE_NOMINAL_FREQ] = "amd_pstate_nominal_freq", + [AMD_PSTATE_LOWEST_NONLINEAR_FREQ] = "amd_pstate_lowest_nonlinear_freq", +}; + +static unsigned long amd_pstate_get_data(unsigned int cpu, + enum amd_pstate_value value) +{ + return cpufreq_get_sysfs_value_from_table(cpu, + amd_pstate_value_files, + value, + MAX_AMD_PSTATE_VALUE_READ_FILES); +} + +/* AMD P-States Helper Functions ***************/ #endif /* defined(__i386__) || defined(__x86_64__) */
Introduce the marco definitions and access helper function for amd-pstate sysfs interfaces such as each performance goals and frequency levels in amd helper file. They will be used to read the sysfs attribute from amd-pstate cpufreq driver for cpupower utilities. Signed-off-by: Huang Rui <ray.huang@amd.com> --- tools/power/cpupower/utils/helpers/amd.c | 37 ++++++++++++++++++++++++ 1 file changed, 37 insertions(+)