| Message ID | 20220924054738.12076-3-rui.zhang@intel.com |
|---|---|
| State | Accepted |
| Commit | 80275ca9e525c198c7efe045c4a6cdb68a2ea763 |
| Headers | show |
| Series | driver/tool fix for SPR Dram RAPL Domain | expand |
Hi, Peter, Can you please consider this as tip material? This patch series does not get merged altogether. The intel-rapl and turbostat fixes have been merged by Rafael and Len respectively. thanks, rui On Sat, 2022-09-24 at 13:47 +0800, Zhang Rui wrote: > Intel Xeon servers used to use a fixed energy resolution (15.3uj) for > Dram RAPL domain. But on SPR, Dram RAPL domain follows the standard > energy resolution as described in MSR_RAPL_POWER_UNIT. > > Remove the SPR Dram energy unit quirk. > > Fixes: bcfd218b6679 ("perf/x86/rapl: Add support for Intel SPR > platform") > Signed-off-by: Zhang Rui <rui.zhang@intel.com> > Tested-by: Wang Wendy <wendy.wang@intel.com> > Reviewed-by: Kan Liang <kan.liang@linux.intel.com> > --- > arch/x86/events/rapl.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c > index 77e3a47af5ad..7d8db681880d 100644 > --- a/arch/x86/events/rapl.c > +++ b/arch/x86/events/rapl.c > @@ -619,12 +619,8 @@ static int rapl_check_hw_unit(struct rapl_model > *rm) > case RAPL_UNIT_QUIRK_INTEL_HSW: > rapl_hw_unit[PERF_RAPL_RAM] = 16; > break; > - /* > - * SPR shares the same DRAM domain energy unit as HSW, plus it > - * also has a fixed energy unit for Psys domain. > - */ > + /* SPR uses a fixed energy unit for Psys domain. */ > case RAPL_UNIT_QUIRK_INTEL_SPR: > - rapl_hw_unit[PERF_RAPL_RAM] = 16; > rapl_hw_unit[PERF_RAPL_PSYS] = 0; > break; > default:
diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c index 77e3a47af5ad..7d8db681880d 100644 --- a/arch/x86/events/rapl.c +++ b/arch/x86/events/rapl.c @@ -619,12 +619,8 @@ static int rapl_check_hw_unit(struct rapl_model *rm) case RAPL_UNIT_QUIRK_INTEL_HSW: rapl_hw_unit[PERF_RAPL_RAM] = 16; break; - /* - * SPR shares the same DRAM domain energy unit as HSW, plus it - * also has a fixed energy unit for Psys domain. - */ + /* SPR uses a fixed energy unit for Psys domain. */ case RAPL_UNIT_QUIRK_INTEL_SPR: - rapl_hw_unit[PERF_RAPL_RAM] = 16; rapl_hw_unit[PERF_RAPL_PSYS] = 0; break; default:
Intel Xeon servers used to use a fixed energy resolution (15.3uj) for Dram RAPL domain. But on SPR, Dram RAPL domain follows the standard energy resolution as described in MSR_RAPL_POWER_UNIT. Remove the SPR Dram energy unit quirk. Fixes: bcfd218b6679 ("perf/x86/rapl: Add support for Intel SPR platform") Signed-off-by: Zhang Rui <rui.zhang@intel.com> Tested-by: Wang Wendy <wendy.wang@intel.com> Reviewed-by: Kan Liang <kan.liang@linux.intel.com> --- arch/x86/events/rapl.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)