From patchwork Wed Apr 17 22:42:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Len Brown X-Patchwork-Id: 2456891 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 5E03EDF23A for ; Wed, 17 Apr 2013 22:43:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966967Ab3DQWmz (ORCPT ); Wed, 17 Apr 2013 18:42:55 -0400 Received: from mail-vb0-f51.google.com ([209.85.212.51]:33851 "EHLO mail-vb0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966963Ab3DQWmi (ORCPT ); Wed, 17 Apr 2013 18:42:38 -0400 Received: by mail-vb0-f51.google.com with SMTP id x19so1669842vbf.38 for ; Wed, 17 Apr 2013 15:42:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:in-reply-to:references:reply-to:organization; bh=/tYDlUvlaaAsIPMR9SbudEoYguNkncC9wE/3gsmQb0Q=; b=MlPMRyCi30dwSvYRJNhZhwJ9O9HGMpAK28VimFXLnjajRFY0EBqBn29fINN0bxvPpa eRsUETy0pwTIEgqA6qAXLxEYAsBBRMU8Eddm7UXX1lHGtnxftOJTQXak/7Lloj12O/Ry 7+PIUwsZ9wT49dW6ticyROhgV4sC4uPlxJElOsrDlaPgPBnc121rWB9bCrzorYh8DgrJ wAK5oGju/0SqWE/jBhRywVNSh2KIgryyKB5QX9GqsCFUzcK3HQDHIm8OyOmgngSfyNbY hQpyZWg1vjytYsJS2ieyiY4BsdRwdw8NT3RZImZPoUFXm4aj03zBOcB1//wVSdgUH/yu 9KpA== X-Received: by 10.58.85.134 with SMTP id h6mr6505500vez.18.1366238557739; Wed, 17 Apr 2013 15:42:37 -0700 (PDT) Received: from x980.localdomain6 (pool-100-0-21-206.bstnma.fios.verizon.net. [100.0.21.206]) by mx.google.com with ESMTPS id tp10sm7454788vec.1.2013.04.17.15.42.36 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 17 Apr 2013 15:42:37 -0700 (PDT) From: Len Brown To: linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Len Brown Subject: [PATCH 2/2] tools/power turbostat: additional Haswell CPU-id Date: Wed, 17 Apr 2013 18:42:17 -0400 Message-Id: <149c2319c6316d979de90ce2c8665e9c02d5927b.1366238380.git.len.brown@intel.com> X-Mailer: git-send-email 1.8.2.1.422.gdcd8c09 In-Reply-To: <1366238537-14443-1-git-send-email-lenb@kernel.org> References: <1366238537-14443-1-git-send-email-lenb@kernel.org> In-Reply-To: <0b15841b0bbbde75134a777c543dc51fe6187108.1366238380.git.len.brown@intel.com> References: <0b15841b0bbbde75134a777c543dc51fe6187108.1366238380.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 From: Len Brown There is an additional HSW CPU-id, 0x46, which has C-states exactly like CPU-id 0x45. Signed-off-by: Len Brown --- tools/power/x86/turbostat/turbostat.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index 6f3214e..321e066 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -1421,6 +1421,7 @@ int has_nehalem_turbo_ratio_limit(unsigned int family, unsigned int model) case 0x3C: /* HSW */ case 0x3F: /* HSW */ case 0x45: /* HSW */ + case 0x46: /* HSW */ return 1; case 0x2E: /* Nehalem-EX Xeon - Beckton */ case 0x2F: /* Westmere-EX Xeon - Eagleton */ @@ -1515,6 +1516,7 @@ void rapl_probe(unsigned int family, unsigned int model) case 0x3C: /* HSW */ case 0x3F: /* HSW */ case 0x45: /* HSW */ + case 0x46: /* HSW */ do_rapl = RAPL_PKG | RAPL_CORES | RAPL_GFX; break; case 0x2D: @@ -1754,6 +1756,7 @@ int is_snb(unsigned int family, unsigned int model) case 0x3C: /* HSW */ case 0x3F: /* HSW */ case 0x45: /* HSW */ + case 0x46: /* HSW */ return 1; } return 0; @@ -2276,7 +2279,7 @@ int main(int argc, char **argv) cmdline(argc, argv); if (verbose) - fprintf(stderr, "turbostat v3.2 February 11, 2013" + fprintf(stderr, "turbostat v3.3 March 15, 2013" " - Len Brown \n"); turbostat_init();