From patchwork Thu Apr 13 00:08:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 9678503 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A237460383 for ; Thu, 13 Apr 2017 00:10:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 94DE828631 for ; Thu, 13 Apr 2017 00:10:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 89C882863B; Thu, 13 Apr 2017 00:10:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1E0DF28631 for ; Thu, 13 Apr 2017 00:10:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755859AbdDMAJd (ORCPT ); Wed, 12 Apr 2017 20:09:33 -0400 Received: from mail-qk0-f193.google.com ([209.85.220.193]:34194 "EHLO mail-qk0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755797AbdDMAJa (ORCPT ); Wed, 12 Apr 2017 20:09:30 -0400 Received: by mail-qk0-f193.google.com with SMTP id p68so6265317qke.1; Wed, 12 Apr 2017 17:09:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references:reply-to:organization; bh=c0lEgZnB1wDPjZ93cNfkUmLZAZt3mE4IKKoPXlGC8m4=; b=U0Vj7HVFMT+HwDEn8WtQmG9yGLOVTzpv2QKUDLh7+oMDeyB8eHJgZp5L2lVl7sxp0P NU8wmFY+BU3kLO2Ehl31F2L9NXhXnfAa6tcSS3G3xl1ltIIE2+n7j9yuKlqeQZ6BXdTL ToWSU2c7w/pyK4f9wYE1aWcYeVpslID+DMan0WXvwsjTpCUcHu2BYXH4XKmuA3Vry8Xm ZeYQFDhsTRRpdTiPc/D9S3p2rFDZneXS61isWhgdxNLz6+yJaODrZdPVjsWeTK4c/iUw hW6T9bzb+svMJiou4ioqrQw5maze3t+c27xeSak9ywDWJTIiG96/2ftKhxxigFtA3282 S+cQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:in-reply-to:references:reply-to:organization; bh=c0lEgZnB1wDPjZ93cNfkUmLZAZt3mE4IKKoPXlGC8m4=; b=iXabr25T29BL99uqYL6REo64maheP6y1IkSaKobexqTYMbdbp0jDrfrwluIYF9QmzH +MsmIPOnlb8d2yeDPJmyaj51tTWim1orkIUHb3Br+lS6hL9TRt199wHjToPjY6Q1lO50 sW4IwIEph1zfqhLO6rzR0s/m1VNF+hYMDGy4KUBK8r2G1TVSkxuTLlUjBdxbNZDPscit R4JXeTa6VBIRVAJXJqEiN7+MNDgr2fmpdzkM9ipfg+XzVgO79B2tYKFxBZHDdTR6DFn5 vlwjPP9jJxonH7uuaD7ffdJD2bZjn4kTquCnSxE0qTcAu74IBaxpMyk6rqHgyF+DKHXR dtiQ== X-Gm-Message-State: AN3rC/5w/Ou1EiSYn3ptM3jPLkPaBKFcOS7TdevJ6jna2gYaqsLFQPZy tD8JHO1imKAWXw== X-Received: by 10.55.16.99 with SMTP id a96mr339514qkh.70.1492042169211; Wed, 12 Apr 2017 17:09:29 -0700 (PDT) Received: from z87.localdomain (pool-173-48-65-169.bstnma.fios.verizon.net. [173.48.65.169]) by smtp.gmail.com with ESMTPSA id g15sm14621086qte.58.2017.04.12.17.09.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 12 Apr 2017 17:09:28 -0700 (PDT) From: Len Brown To: rjw@rjwysocki.net, linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Len Brown Subject: [PATCH 2/7] tools/power turbostat: show missing Core and GFX power on SKL and KBL Date: Wed, 12 Apr 2017 20:08:48 -0400 Message-Id: <818249216d7dc9340a7d2332f6d07b462e818ee5.1492041840.git.len.brown@intel.com> X-Mailer: git-send-email 2.11.0.161.g6610af872 In-Reply-To: <20170413000853.21648-1-lenb@kernel.org> References: <20170413000853.21648-1-lenb@kernel.org> In-Reply-To: <22048c5485503749754b3b5daf9d99ef89fcacdc.1492041840.git.len.brown@intel.com> References: <22048c5485503749754b3b5daf9d99ef89fcacdc.1492041840.git.len.brown@intel.com> Reply-To: Len Brown Organization: Intel Open Source Technology Center Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Len Brown While the current SDM is silent on the matter, the Core and GFX RAPL power meters on SKL and KBL appear to work -- so show them. Reported-by: Yaroslav Isakov Signed-off-by: Len Brown --- tools/power/x86/turbostat/turbostat.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index d7fb6bcb2744..94d7e54b1ec0 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -3355,17 +3355,19 @@ void rapl_probe(unsigned int family, unsigned int model) case INTEL_FAM6_SKYLAKE_DESKTOP: /* SKL */ case INTEL_FAM6_KABYLAKE_MOBILE: /* KBL */ case INTEL_FAM6_KABYLAKE_DESKTOP: /* KBL */ - do_rapl = RAPL_PKG | RAPL_DRAM | RAPL_DRAM_PERF_STATUS | RAPL_PKG_PERF_STATUS | RAPL_PKG_POWER_INFO; + do_rapl = RAPL_PKG | RAPL_CORES | RAPL_CORE_POLICY | RAPL_DRAM | RAPL_DRAM_PERF_STATUS | RAPL_PKG_PERF_STATUS | RAPL_GFX | RAPL_PKG_POWER_INFO; BIC_PRESENT(BIC_PKG__); BIC_PRESENT(BIC_RAM__); if (rapl_joules) { BIC_PRESENT(BIC_Pkg_J); BIC_PRESENT(BIC_Cor_J); BIC_PRESENT(BIC_RAM_J); + BIC_PRESENT(BIC_GFX_J); } else { BIC_PRESENT(BIC_PkgWatt); BIC_PRESENT(BIC_CorWatt); BIC_PRESENT(BIC_RAMWatt); + BIC_PRESENT(BIC_GFXWatt); } break; case INTEL_FAM6_HASWELL_X: /* HSX */