From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936373AbcJRVHI (ORCPT ); Tue, 18 Oct 2016 17:07:08 -0400 Received: from mga02.intel.com ([134.134.136.20]:55234 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758216AbcJRVHD (ORCPT ); Tue, 18 Oct 2016 17:07:03 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,511,1473145200"; d="scan'208";a="21399281" From: Piotr Luc To: Len Brown , x86@kernel.org, Borislav Petkov Cc: linux-kernel@vger.kernel.org, "Rafael J . Wysocki" , Dave Hansen Subject: [PATCH v2 2/2] tools/power turbostat: enable turbostat to support Knights Mill (KNM) Date: Tue, 18 Oct 2016 23:06:52 +0200 Message-Id: <20161018210652.29365-3-piotr.luc@intel.com> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161018210652.29365-1-piotr.luc@intel.com> References: <20161018210652.29365-1-piotr.luc@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add Knights Mill (KNM) to the list of CPUIDs supported by turbostat. Change-Id: I616e3232e985fba4080a65e982604bd03d6dfb9f Signed-off-by: Piotr Luc Reviewed-by: Dave Hansen Cc: Borislav Petkov Cc: Len Brown --- v2: Remove trailing comments. tools/power/x86/turbostat/turbostat.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index a7e738d..1731e53 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -2213,6 +2213,7 @@ int probe_nhm_msrs(unsigned int family, unsigned int model) pkg_cstate_limits = amt_pkg_cstate_limits; break; case INTEL_FAM6_XEON_PHI_KNL: + case INTEL_FAM6_XEON_PHI_KNM: pkg_cstate_limits = phi_pkg_cstate_limits; break; case INTEL_FAM6_ATOM_GOLDMONT: @@ -2238,6 +2239,7 @@ int has_nhm_turbo_ratio_limit(unsigned int family, unsigned int model) case INTEL_FAM6_NEHALEM_EX: case INTEL_FAM6_WESTMERE_EX: case INTEL_FAM6_XEON_PHI_KNL: + case INTEL_FAM6_XEON_PHI_KNM: return 0; default: return 1; @@ -2285,6 +2287,7 @@ int has_knl_turbo_ratio_limit(unsigned int family, unsigned int model) switch (model) { case INTEL_FAM6_XEON_PHI_KNL: + case INTEL_FAM6_XEON_PHI_KNM: return 1; default: return 0; @@ -2315,6 +2318,7 @@ int has_config_tdp(unsigned int family, unsigned int model) case INTEL_FAM6_SKYLAKE_X: case INTEL_FAM6_XEON_PHI_KNL: + case INTEL_FAM6_XEON_PHI_KNM: return 1; default: return 0; @@ -2616,6 +2620,7 @@ rapl_dram_energy_units_probe(int model, double rapl_energy_units) case INTEL_FAM6_BROADWELL_X: case INTEL_FAM6_BROADWELL_XEON_D: case INTEL_FAM6_XEON_PHI_KNL: + case INTEL_FAM6_XEON_PHI_KNM: return (rapl_dram_energy_units = 15.3 / 1000000); default: return (rapl_energy_units); @@ -2664,6 +2669,7 @@ void rapl_probe(unsigned int family, unsigned int model) case INTEL_FAM6_BROADWELL_XEON_D: case INTEL_FAM6_SKYLAKE_X: case INTEL_FAM6_XEON_PHI_KNL: + case INTEL_FAM6_XEON_PHI_KNM: do_rapl = RAPL_PKG | RAPL_DRAM | RAPL_DRAM_POWER_INFO | RAPL_DRAM_PERF_STATUS | RAPL_PKG_PERF_STATUS | RAPL_PKG_POWER_INFO; break; case INTEL_FAM6_SANDYBRIDGE_X: @@ -3024,6 +3030,7 @@ int is_knl(unsigned int family, unsigned int model) return 0; switch (model) { case INTEL_FAM6_XEON_PHI_KNL: + case INTEL_FAM6_XEON_PHI_KNM: return 1; } return 0; -- 2.10.1