Skip to content

Commit 80275ca

Browse files
zhang-ruiPeter Zijlstra
authored andcommitted
perf/x86/rapl: Use standard Energy Unit for SPR Dram RAPL domain
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: bcfd218 ("perf/x86/rapl: Add support for Intel SPR platform") Signed-off-by: Zhang Rui <rui.zhang@intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Kan Liang <kan.liang@linux.intel.com> Tested-by: Wang Wendy <wendy.wang@intel.com> Link: https://lkml.kernel.org/r/20220924054738.12076-3-rui.zhang@intel.com
1 parent 4b18cb3 commit 80275ca

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

arch/x86/events/rapl.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -619,12 +619,8 @@ static int rapl_check_hw_unit(struct rapl_model *rm)
619619
case RAPL_UNIT_QUIRK_INTEL_HSW:
620620
rapl_hw_unit[PERF_RAPL_RAM] = 16;
621621
break;
622-
/*
623-
* SPR shares the same DRAM domain energy unit as HSW, plus it
624-
* also has a fixed energy unit for Psys domain.
625-
*/
622+
/* SPR uses a fixed energy unit for Psys domain. */
626623
case RAPL_UNIT_QUIRK_INTEL_SPR:
627-
rapl_hw_unit[PERF_RAPL_RAM] = 16;
628624
rapl_hw_unit[PERF_RAPL_PSYS] = 0;
629625
break;
630626
default:

0 commit comments

Comments
 (0)