Re: [3/3,v3] tools/power turbostat: Enable accumulate RAPL display

From: youling 257 <youling257@gmail.com>
To: Chen Yu <yu.c.chen@intel.com>
Cc: Doug Smythies <dsmythies@telus.net>,
	bas@basnieuwenhuizen.nl, Bingsong Si <owen.si@ucloud.cn>,
	erwanaliasr1@gmail.com, lenb@kernel.org, rjw@rjwysocki.net,
	linux-kernel@vger.kernel.org, Len Brown <len.brown@intel.com>,
	Zhang Rui <rui.zhang@intel.com>
Subject: Re: [3/3,v3] tools/power turbostat: Enable accumulate RAPL display
Date: Sat, 13 Mar 2021 21:49:08 +0800	[thread overview]
Message-ID: <CAOzgRdYZM53OC-7DwnmKr3WBOAkKmqstvvs36cMVTOQUZ8qrUg@mail.gmail.com> (raw)
In-Reply-To: <20210312134114.GA21436@chenyu-desktop>

test this patch, turbostat can work.

2021-03-12 21:41 GMT+08:00, Chen Yu <yu.c.chen@intel.com>:
> Hi Youling, Bas, and Bingsong,
> On Wed, Mar 10, 2021 at 04:03:31PM -0800, Doug Smythies wrote:
>> Hi Yu,
>>
>> I am just resending your e-mail, adjusting the "To:" list to
>> include the 3 others that have submitted similar patches.
>>
>> ... Doug
>>
> Could you please help check if the following combined patch works?
>
> Thanks,
> Chenyu
>
>
> From 00e0622b1b693a5c7dc343aeb3aa51614a9e125e Mon Sep 17 00:00:00 2001
> From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
> Date: Fri, 12 Mar 2021 21:27:40 +0800
> Subject: [PATCH] tools/power/turbostat: Fix turbostat for AMD Zen CPUs
>
> It was reported that on Zen+ system turbostat started exiting,
> which was tracked down to the MSR_PKG_ENERGY_STAT read failing because
> offset_to_idx wasn't returning a non-negative index.
>
> This patch combined the modification from Bingsong Si and
> Bas Nieuwenhuizen and addd the MSR to the index system as alternative for
> MSR_PKG_ENERGY_STATUS.
>
> Fixes: 9972d5d84d76 ("tools/power turbostat: Enable accumulate RAPL
> display")
> Reported-by: youling257 <youling257@gmail.com>
> Co-developed-by: Bingsong Si <owen.si@ucloud.cn>
> Signed-off-by: Chen Yu <yu.c.chen@intel.com>
> ---
>  tools/power/x86/turbostat/turbostat.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/tools/power/x86/turbostat/turbostat.c
> b/tools/power/x86/turbostat/turbostat.c
> index a7c4f0772e53..a7c965734fdf 100644
> --- a/tools/power/x86/turbostat/turbostat.c
> +++ b/tools/power/x86/turbostat/turbostat.c
> @@ -297,7 +297,10 @@ int idx_to_offset(int idx)
>
>  	switch (idx) {
>  	case IDX_PKG_ENERGY:
> -		offset = MSR_PKG_ENERGY_STATUS;
> +		if (do_rapl & RAPL_AMD_F17H)
> +			offset = MSR_PKG_ENERGY_STAT;
> +		else
> +			offset = MSR_PKG_ENERGY_STATUS;
>  		break;
>  	case IDX_DRAM_ENERGY:
>  		offset = MSR_DRAM_ENERGY_STATUS;
> @@ -326,6 +329,7 @@ int offset_to_idx(int offset)
>
>  	switch (offset) {
>  	case MSR_PKG_ENERGY_STATUS:
> +	case MSR_PKG_ENERGY_STAT:
>  		idx = IDX_PKG_ENERGY;
>  		break;
>  	case MSR_DRAM_ENERGY_STATUS:
> @@ -353,7 +357,7 @@ int idx_valid(int idx)
>  {
>  	switch (idx) {
>  	case IDX_PKG_ENERGY:
> -		return do_rapl & RAPL_PKG;
> +		return do_rapl & (RAPL_PKG | RAPL_AMD_F17H);
>  	case IDX_DRAM_ENERGY:
>  		return do_rapl & RAPL_DRAM;
>  	case IDX_PP0_ENERGY:
> --
> 2.25.1
>
>