Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
To:     Len Brown <len.brown@intel.com>,
        LKML <linux-kernel@vger.kernel.org>
From:   Kurt Garloff <kurt@garloff.de>
Subject: turbostat: Fix Pkg Power on Zen
Message-ID: <1f1fb01e-0616-34ea-ede6-dc7dd679c3d4@garloff.de>
Date:   Sat, 26 Dec 2020 13:13:49 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.4.3
MIME-Version: 1.0
Content-Type: multipart/mixed;
 boundary="------------7B794C5CA64C1455EB0E089D"
Content-Language: en-US
Precedence: bulk

This is a multi-part message in MIME format.
--------------7B794C5CA64C1455EB0E089D
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

Hi Len,

find attached fix to avoid exiting with -13 on Zen. Patch is against turb=
ostat as included in Linux-5.10.2.
Please merge.

PS: This is probably material for -stable, as it used to work before on Z=
en (Zen2 aka Ryzen 3000 in my case).

--=20
Kurt Garloff <kurt@garloff.de>
Cologne, Germany


--------------7B794C5CA64C1455EB0E089D
Content-Type: text/x-patch; charset=UTF-8;
 name="turbostat-zen-pkgpower-510.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
 filename="turbostat-zen-pkgpower-510.diff"

commit b82f8e4cfcfd5d503226ed99b30a68aca25b7e18
Author: Kurt Garloff <kurt@garloff.de>
Date:   Sat Dec 26 13:00:15 2020 +0100

    turbostat: Fix Pkg Power tracking on Zen
   =20
    AMD Zen processors use a different MSR (MSR_PKG_ENERGY_STAT) than int=
el
    (MSR_PKG_ENERGY_STATUS) to track package power; however we want to re=
cord
    it at the same offset in our package_data.
    offset_to_idx() however only recognized the intel MSR, erroring
    out with -13 on Zen.
   =20
    With this fix, it will support the Zen MSR.
    Tested successfully on Ryzen 3000.
   =20
    Signed-off-by: Kurt Garloff <kurt@garloff.de>

diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turb=
ostat/turbostat.c
index f3a1746f7f45..eb845421f492 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -325,6 +325,7 @@ int offset_to_idx(int offset)
 	int idx;
=20
 	switch (offset) {
+	case MSR_PKG_ENERGY_STAT:
 	case MSR_PKG_ENERGY_STATUS:
 		idx =3D IDX_PKG_ENERGY;
 		break;

--------------7B794C5CA64C1455EB0E089D--