Messages in this thread | | | Date | Mon, 19 Dec 2022 20:53:11 -0600 | Subject | Re: [PATCH v8 03/13] cpufreq: intel_pstate: use common macro definition for Energy Preference Performance(EPP) | From | Mario Limonciello <> |
| |
On 12/19/22 00:40, Perry Yuan wrote: > make the energy preference performance strings and profiles using one > common header for intel_pstate driver, then the amd_pstate epp driver can > use the common header as well. This will simpify the intel_pstate and > amd_pstate driver. > > Signed-off-by: Perry Yuan <perry.yuan@amd.com> > --- > drivers/cpufreq/intel_pstate.c | 13 +++---------- > include/linux/cpufreq.h | 11 +++++++++++ > 2 files changed, 14 insertions(+), 10 deletions(-) > > diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c > index ad9be31753b6..93a60fdac0fc 100644 > --- a/drivers/cpufreq/intel_pstate.c > +++ b/drivers/cpufreq/intel_pstate.c > @@ -640,15 +640,7 @@ static int intel_pstate_set_epb(int cpu, s16 pref) > * 4 power > */ > > -enum energy_perf_value_index { > - EPP_INDEX_DEFAULT = 0, > - EPP_INDEX_PERFORMANCE, > - EPP_INDEX_BALANCE_PERFORMANCE, > - EPP_INDEX_BALANCE_POWERSAVE, > - EPP_INDEX_POWERSAVE, > -}; > - > -static const char * const energy_perf_strings[] = { > +const char * const energy_perf_strings[] = { > [EPP_INDEX_DEFAULT] = "default", > [EPP_INDEX_PERFORMANCE] = "performance", > [EPP_INDEX_BALANCE_PERFORMANCE] = "balance_performance", > @@ -656,7 +648,8 @@ static const char * const energy_perf_strings[] = { > [EPP_INDEX_POWERSAVE] = "power", > NULL > }; > -static unsigned int epp_values[] = { > + > +unsigned int epp_values[] = { > [EPP_INDEX_DEFAULT] = 0, /* Unused index */ > [EPP_INDEX_PERFORMANCE] = HWP_EPP_PERFORMANCE, > [EPP_INDEX_BALANCE_PERFORMANCE] = HWP_EPP_BALANCE_PERFORMANCE,
I think this is going to make CONFIG_AMD_PSTATE depend on CONFIG_INTEL_PSTATE. What you'll want to do is put these symbols in a "common" C file used by both. How about in the cppc lib stuff?
Please make sure that you test compile/link of v9 both with CONFIG_AMD_PSTATE/CONFIG_INTEL_PSTATE set and either or set.
> diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h > index d5595d57f4e5..e63309d497fe 100644 > --- a/include/linux/cpufreq.h > +++ b/include/linux/cpufreq.h > @@ -20,6 +20,7 @@ > #include <linux/pm_qos.h> > #include <linux/spinlock.h> > #include <linux/sysfs.h> > +#include <asm/msr.h> > > /********************************************************************* > * CPUFREQ INTERFACE * > @@ -185,6 +186,16 @@ struct cpufreq_freqs { > u8 flags; /* flags of cpufreq_driver, see below. */ > }; > > +enum energy_perf_value_index { > + EPP_INDEX_DEFAULT = 0, > + EPP_INDEX_PERFORMANCE, > + EPP_INDEX_BALANCE_PERFORMANCE, > + EPP_INDEX_BALANCE_POWERSAVE, > + EPP_INDEX_POWERSAVE, > +}; > +extern const char * const energy_perf_strings[]; > +extern unsigned int epp_values[]; > + > /* Only for ACPI */ > #define CPUFREQ_SHARED_TYPE_NONE (0) /* None */ > #define CPUFREQ_SHARED_TYPE_HW (1) /* HW does needed coordination */
| |