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;
Subject: [PATCH 1/1]: turbostat: Fix Pkg Power on Zen
From:   Kurt Garloff <kurt@garloff.de>
To:     Len Brown <len.brown@intel.com>,
        LKML <linux-kernel@vger.kernel.org>
References: <1f1fb01e-0616-34ea-ede6-dc7dd679c3d4@garloff.de>
 <c7074c16-5d64-e829-10f6-ef91f5f6222b@garloff.de>
Message-ID: <cc9628ac-d612-6c7d-6bc1-ac13da980659@garloff.de>
Date:   Mon, 1 Feb 2021 10:06:39 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.7.0
MIME-Version: 1.0
In-Reply-To: <c7074c16-5d64-e829-10f6-ef91f5f6222b@garloff.de>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Content-Language: en-US
Precedence: bulk

commit 5d399d05df42ffcaa2b3836b580631c4024487a0
Author: Kurt Garloff <kurt@garloff.de>
Date:   Mon Feb 1 09:01:47 2021 +0000

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

diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index 389ea5209a83..cb830e73d899 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;
 
     switch (offset) {
+    case MSR_PKG_ENERGY_STAT:
     case MSR_PKG_ENERGY_STATUS:
         idx = IDX_PKG_ENERGY;
         break;

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