RE: [PATCH v6 03/11] cpufreq: intel_pstate: use common macro definition for Energy Preference Performance(EPP)

From: Yuan, Perry
Date: Thu Dec 08 2022 - 09:41:07 EST

Next message: Tomi Valkeinen: "Re: [PATCH v5 0/8] i2c-atr and FPDLink"
Previous message: Amadeusz Sławiński: "[PATCH v2] ACPICA: Fix operand resolution"
Next in thread: Limonciello, Mario: "RE: [PATCH v6 03/11] cpufreq: intel_pstate: use common macro definition for Energy Preference Performance(EPP)"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

[Public]

Hi Mario.

> -----Original Message-----
> From: Limonciello, Mario <Mario.Limonciello@xxxxxxx>
> Sent: Tuesday, December 6, 2022 12:45 AM
> To: Yuan, Perry <Perry.Yuan@xxxxxxx>; Huang, Ray <Ray.Huang@xxxxxxx>
> Cc: rafael.j.wysocki@xxxxxxxxx; viresh.kumar@xxxxxxxxxx; Sharma, Deepak
> <Deepak.Sharma@xxxxxxx>; Fontenot, Nathan
> <Nathan.Fontenot@xxxxxxx>; Deucher, Alexander
> <Alexander.Deucher@xxxxxxx>; Huang, Shimmer
> <Shimmer.Huang@xxxxxxx>; Du, Xiaojian <Xiaojian.Du@xxxxxxx>; Meng,
> Li (Jassmine) <Li.Meng@xxxxxxx>; Karny, Wyes <Wyes.Karny@xxxxxxx>;
> linux-pm@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx
> Subject: RE: [PATCH v6 03/11] cpufreq: intel_pstate: use common macro
> definition for Energy Preference Performance(EPP)
>
> [Public]
>
>
>
> > -----Original Message-----
> > From: Yuan, Perry <Perry.Yuan@xxxxxxx>
> > Sent: Monday, December 5, 2022 08:41
> > To: Huang, Ray <Ray.Huang@xxxxxxx>
> > Cc: rafael.j.wysocki@xxxxxxxxx; Limonciello, Mario
> > <Mario.Limonciello@xxxxxxx>; viresh.kumar@xxxxxxxxxx; Sharma, Deepak
> > <Deepak.Sharma@xxxxxxx>; Fontenot, Nathan
> <Nathan.Fontenot@xxxxxxx>;
> > Deucher, Alexander <Alexander.Deucher@xxxxxxx>; Huang, Shimmer
> > <Shimmer.Huang@xxxxxxx>; Du, Xiaojian <Xiaojian.Du@xxxxxxx>;
> Meng, Li
> > (Jassmine) <Li.Meng@xxxxxxx>; Karny, Wyes <Wyes.Karny@xxxxxxx>;
> > linux-pm@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx
> > Subject: RE: [PATCH v6 03/11] cpufreq: intel_pstate: use common macro
> > definition for Energy Preference Performance(EPP)
> >
> > [AMD Official Use Only - General]
> >
> > Hi Ray.
> >
> > > -----Original Message-----
> > > From: Huang, Ray <Ray.Huang@xxxxxxx>
> > > Sent: Monday, December 5, 2022 7:49 PM
> > > To: Yuan, Perry <Perry.Yuan@xxxxxxx>
> > > Cc: rafael.j.wysocki@xxxxxxxxx; Limonciello, Mario
> > > <Mario.Limonciello@xxxxxxx>; viresh.kumar@xxxxxxxxxx; Sharma,
> Deepak
> > > <Deepak.Sharma@xxxxxxx>; Fontenot, Nathan
> <Nathan.Fontenot@xxxxxxx>;
> > > Deucher, Alexander <Alexander.Deucher@xxxxxxx>; Huang, Shimmer
> > > <Shimmer.Huang@xxxxxxx>; Du, Xiaojian <Xiaojian.Du@xxxxxxx>;
> > Meng,
> > > Li (Jassmine) <Li.Meng@xxxxxxx>; Karny, Wyes
> > <Wyes.Karny@xxxxxxx>;
> > > linux-pm@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx
> > > Subject: Re: [PATCH v6 03/11] cpufreq: intel_pstate: use common
> > > macro definition for Energy Preference Performance(EPP)
> > >
> > > On Fri, Dec 02, 2022 at 03:47:11PM +0800, Yuan, Perry 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@xxxxxxx>
> > > > ---
> > > > arch/x86/include/asm/msr-index.h | 4 ---
> > > > drivers/cpufreq/intel_pstate.c | 37 +--------------------
> > > > include/linux/cpufreq_common.h | 56
> > > ++++++++++++++++++++++++++++++++
> > >
> > > I don't find any specific reason why you have to use another common
> > > cpufreq_common header instead of include/linux/cpufreq.h.
> > >
> > > Thanks,
> > > Ray
> >
> > That is fine for me to use the cpufreq.h to store the common vars.
> > I will move the declaration to that header file.
> >
> > Thanks for the review.
> >
> > Perry.
> >
> > >
> > > > 3 files changed, 57 insertions(+), 40 deletions(-) create mode
> > > > 100644 include/linux/cpufreq_common.h
> > > >
> > > > diff --git a/arch/x86/include/asm/msr-index.h
> > > > b/arch/x86/include/asm/msr-index.h
> > > > index 4a2af82553e4..3983378cff5b 100644
> > > > --- a/arch/x86/include/asm/msr-index.h
> > > > +++ b/arch/x86/include/asm/msr-index.h
> > > > @@ -472,10 +472,6 @@
> > > > #define HWP_MAX_PERF(x) ((x & 0xff) << 8)
> > > > #define HWP_DESIRED_PERF(x) ((x & 0xff) << 16)
> > > > #define HWP_ENERGY_PERF_PREFERENCE(x) (((unsigned long long)
> > > x & 0xff) << 24)
> > > > -#define HWP_EPP_PERFORMANCE 0x00
> > > > -#define HWP_EPP_BALANCE_PERFORMANCE 0x80
> > > > -#define HWP_EPP_BALANCE_POWERSAVE 0xC0
> > > > -#define HWP_EPP_POWERSAVE 0xFF
> > > > #define HWP_ACTIVITY_WINDOW(x) ((unsigned long
> > > long)(x & 0xff3) << 32)
> > > > #define HWP_PACKAGE_CONTROL(x) ((unsigned long
> > > long)(x & 0x1) << 42)
> > > >
> > > > diff --git a/drivers/cpufreq/intel_pstate.c
> > > > b/drivers/cpufreq/intel_pstate.c index ad9be31753b6..65036ca21719
> > > > 100644
> > > > --- a/drivers/cpufreq/intel_pstate.c
> > > > +++ b/drivers/cpufreq/intel_pstate.c
> > > > @@ -25,6 +25,7 @@
> > > > #include <linux/acpi.h>
> > > > #include <linux/vmalloc.h>
> > > > #include <linux/pm_qos.h>
> > > > +#include <linux/cpufreq_common.h>
> > > > #include <trace/events/power.h>
> > > >
> > > > #include <asm/cpu.h>
> > > > @@ -628,42 +629,6 @@ static int intel_pstate_set_epb(int cpu, s16 pref)
> > > > return 0;
> > > > }
> > > >
> > > > -/*
> > > > - * EPP/EPB display strings corresponding to EPP index in the
> > > > - * energy_perf_strings[]
> > > > - * index String
> > > > - *-------------------------------------
> > > > - * 0 default
> > > > - * 1 performance
> > > > - * 2 balance_performance
> > > > - * 3 balance_power
> > > > - * 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[] = {
> > > > - [EPP_INDEX_DEFAULT] = "default",
> > > > - [EPP_INDEX_PERFORMANCE] = "performance",
> > > > - [EPP_INDEX_BALANCE_PERFORMANCE] = "balance_performance",
> > > > - [EPP_INDEX_BALANCE_POWERSAVE] = "balance_power",
> > > > - [EPP_INDEX_POWERSAVE] = "power",
> > > > - NULL
> > > > -};
> > > > -static unsigned int epp_values[] = {
> > > > - [EPP_INDEX_DEFAULT] = 0, /* Unused index */
> > > > - [EPP_INDEX_PERFORMANCE] = HWP_EPP_PERFORMANCE,
> > > > - [EPP_INDEX_BALANCE_PERFORMANCE] =
> > > HWP_EPP_BALANCE_PERFORMANCE,
> > > > - [EPP_INDEX_BALANCE_POWERSAVE] =
> > > HWP_EPP_BALANCE_POWERSAVE,
> > > > - [EPP_INDEX_POWERSAVE] = HWP_EPP_POWERSAVE,
> > > > -};
> > > > -
> > > > static int intel_pstate_get_energy_pref_index(struct cpudata
> > > > *cpu_data, int *raw_epp) {
> > > > s16 epp;
> > > > diff --git a/include/linux/cpufreq_common.h
> > > > b/include/linux/cpufreq_common.h new file mode 100644 index
> > > > 000000000000..2d14b0b0f55c
> > > > --- /dev/null
> > > > +++ b/include/linux/cpufreq_common.h
> > > > @@ -0,0 +1,56 @@
> > > > +/* SPDX-License-Identifier: GPL-2.0-only */
> > > > +/*
> > > > + * linux/include/linux/cpufreq_common.h
> > > > + *
> > > > + * Copyright (C) 2022 Advanced Micro Devices, Inc.
> > > > + *
> > > > + * Author: Perry Yuan <Perry.Yuan@xxxxxxx> */
> > > > +
> > > > +#ifndef _LINUX_CPUFREQ_COMMON_H
> > > > +#define _LINUX_CPUFREQ_COMMON_H
> > > > +
> > > > +#include <asm/msr.h>
> > > > +/*
> > > > + * EPP/EPB display strings corresponding to EPP index in the
> > > > + * energy_perf_strings[]
> > > > + * index String
> > > > + *-------------------------------------
> > > > + * 0 default
> > > > + * 1 performance
> > > > + * 2 balance_performance
> > > > + * 3 balance_power
> > > > + * 4 power
> > > > + */
> > > > +
> > > > +#define HWP_EPP_PERFORMANCE 0x00
> > > > +#define HWP_EPP_BALANCE_PERFORMANCE 0x80
> > > > +#define HWP_EPP_BALANCE_POWERSAVE 0xC0
> > > > +#define HWP_EPP_POWERSAVE 0xFF
> > > > +
> > > > +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[] = {
> > > > + [EPP_INDEX_DEFAULT] = "default",
> > > > + [EPP_INDEX_PERFORMANCE] = "performance",
> > > > + [EPP_INDEX_BALANCE_PERFORMANCE] = "balance_performance",
> > > > + [EPP_INDEX_BALANCE_POWERSAVE] = "balance_power",
> > > > + [EPP_INDEX_POWERSAVE] = "power",
> > > > + NULL
> > > > +};
> > > > +
> > > > +static unsigned int epp_values[] = {
> > > > + [EPP_INDEX_DEFAULT] = 0, /* Unused index */
> > > > + [EPP_INDEX_PERFORMANCE] = HWP_EPP_PERFORMANCE,
> > > > + [EPP_INDEX_BALANCE_PERFORMANCE] =
> > > HWP_EPP_BALANCE_PERFORMANCE,
> > > > + [EPP_INDEX_BALANCE_POWERSAVE] =
> > > HWP_EPP_BALANCE_POWERSAVE,
> > > > + [EPP_INDEX_POWERSAVE] = HWP_EPP_POWERSAVE, };
> > > > +
>
> I don't believe you should be making these static in the header file.

If I do not make these arrays as static type, it will be reporting lots of build errors.

ld: drivers/scsi/lpfc/lpfc_sli.o:(.data+0xa0): multiple definition of `epp_values'; drivers/scsi/lpfc/lpfc_mem.o:(.data+0x0): first defined here
ld: drivers/scsi/lpfc/lpfc_sli.o:(.rodata+0x120): multiple definition of `energy_perf_strings'; drivers/scsi/lpfc/lpfc_mem.o:(.rodata+0x0): first defined here
ld: drivers/scsi/lpfc/lpfc_ct.o:(.data+0x150): multiple definition of `epp_values'; drivers/scsi/lpfc/lpfc_mem.o:(.data+0x0): first defined here
ld: drivers/scsi/lpfc/lpfc_ct.o:(.rodata+0x60): multiple definition of `energy_perf_strings'; drivers/scsi/lpfc/lpfc_mem.o:(.rodata+0x0): first defined here
ld: drivers/scsi/lpfc/lpfc_els.o:(.data+0x0): multiple definition of `epp_values'; drivers/scsi/lpfc/lpfc_mem.o:(.data+0x0): first defined here
....

I will check how to get this fixed if we really need set it as static in V8.

Perry.

>
> > > > +#endif /* _LINUX_CPUFREQ_COMMON_H */
> > > > \ No newline at end of file
> > > > --
> > > > 2.34.1
> > > >

Next message: Tomi Valkeinen: "Re: [PATCH v5 0/8] i2c-atr and FPDLink"
Previous message: Amadeusz Sławiński: "[PATCH v2] ACPICA: Fix operand resolution"
Next in thread: Limonciello, Mario: "RE: [PATCH v6 03/11] cpufreq: intel_pstate: use common macro definition for Energy Preference Performance(EPP)"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]