From patchwork Thu Jun 2 00:12:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Hansen X-Patchwork-Id: 9148863 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 859B2600BC for ; Thu, 2 Jun 2016 00:16:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7801D271E0 for ; Thu, 2 Jun 2016 00:16:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6CEBD271FD; Thu, 2 Jun 2016 00:16:01 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 14C5B271E0 for ; Thu, 2 Jun 2016 00:16:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751307AbcFBAPq (ORCPT ); Wed, 1 Jun 2016 20:15:46 -0400 Received: from mga01.intel.com ([192.55.52.88]:62708 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751833AbcFBAMJ (ORCPT ); Wed, 1 Jun 2016 20:12:09 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP; 01 Jun 2016 17:12:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,403,1459839600"; d="scan'208";a="967069441" Received: from viggo.jf.intel.com (HELO localhost.localdomain) ([10.54.39.121]) by orsmga001.jf.intel.com with ESMTP; 01 Jun 2016 17:12:08 -0700 Subject: [PATCH 08/20] x86, rapl: reorder cpu detection table To: linux-kernel@vger.kernel.org Cc: x86@kernel.org, Dave Hansen , dave.hansen@linux.intel.com, rjw@rjwysocki.net, linux-pm@vger.kernel.org From: Dave Hansen Date: Wed, 01 Jun 2016 17:12:08 -0700 References: <20160602001157.D8BE59D7@viggo.jf.intel.com> In-Reply-To: <20160602001157.D8BE59D7@viggo.jf.intel.com> Message-Id: <20160602001208.7008C7A4@viggo.jf.intel.com> 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: Dave Hansen Let's make an effort to group these things by microarchitecture name. It makes it easier to see if something got missed. Signed-off-by: Dave Hansen Cc: "Rafael J. Wysocki" Cc: linux-pm@vger.kernel.org --- b/drivers/powercap/intel_rapl.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff -puN drivers/powercap/intel_rapl.c~x86-intel-familites-powercap-rapl-reorder drivers/powercap/intel_rapl.c --- a/drivers/powercap/intel_rapl.c~x86-intel-familites-powercap-rapl-reorder 2016-06-01 15:45:05.931023874 -0700 +++ b/drivers/powercap/intel_rapl.c 2016-06-01 15:45:05.936024102 -0700 @@ -1099,25 +1099,31 @@ static const struct rapl_defaults rapl_d static const struct x86_cpu_id rapl_ids[] __initconst = { RAPL_CPU(INTEL_FAM6_MODEL_SANDYBRIDGE, rapl_defaults_core), RAPL_CPU(INTEL_FAM6_MODEL_SANDYBRIDGE_X, rapl_defaults_core), - RAPL_CPU(INTEL_FAM6_MODEL_ATOM_SILVERMONT1, rapl_defaults_byt), + RAPL_CPU(INTEL_FAM6_MODEL_IVYBRIDGE, rapl_defaults_core), + RAPL_CPU(INTEL_FAM6_MODEL_HASWELL_CORE, rapl_defaults_core), - RAPL_CPU(INTEL_FAM6_MODEL_BROADWELL_CORE_M, rapl_defaults_core), - RAPL_CPU(INTEL_FAM6_MODEL_HASWELL_X, rapl_defaults_hsw_server), - RAPL_CPU(INTEL_FAM6_MODEL_BROADWELL_X, rapl_defaults_hsw_server), RAPL_CPU(INTEL_FAM6_MODEL_HASWELL_ULT, rapl_defaults_core), RAPL_CPU(INTEL_FAM6_MODEL_HASWELL_GT3E, rapl_defaults_core), + RAPL_CPU(INTEL_FAM6_MODEL_HASWELL_X, rapl_defaults_hsw_server), + + RAPL_CPU(INTEL_FAM6_MODEL_BROADWELL_CORE_M, rapl_defaults_core), RAPL_CPU(INTEL_FAM6_MODEL_BROADWELL_GT3E, rapl_defaults_core), + RAPL_CPU(INTEL_FAM6_MODEL_BROADWELL_XEON_D, rapl_defaults_core), + RAPL_CPU(INTEL_FAM6_MODEL_BROADWELL_X, rapl_defaults_hsw_server), + + RAPL_CPU(INTEL_FAM6_MODEL_SKYLAKE_DESKTOP, rapl_defaults_core), RAPL_CPU(INTEL_FAM6_MODEL_SKYLAKE_MOBILE, rapl_defaults_core), + RAPL_CPU(INTEL_FAM6_MODEL_KABYLAKE_MOBILE, rapl_defaults_core), + RAPL_CPU(INTEL_FAM6_MODEL_KABYLAKE_DESKTOP, rapl_defaults_core), + + RAPL_CPU(INTEL_FAM6_MODEL_ATOM_SILVERMONT1, rapl_defaults_byt), RAPL_CPU(INTEL_FAM6_MODEL_ATOM_AIRMONT, rapl_defaults_cht), RAPL_CPU(INTEL_FAM6_MODEL_ATOM_MERRIFIELD1, rapl_defaults_tng), - RAPL_CPU(INTEL_FAM6_MODEL_BROADWELL_XEON_D, rapl_defaults_core), RAPL_CPU(INTEL_FAM6_MODEL_ATOM_MERRIFIELD2, rapl_defaults_ann), RAPL_CPU(INTEL_FAM6_MODEL_ATOM_GOLDMONT, rapl_defaults_core), - RAPL_CPU(INTEL_FAM6_MODEL_SKYLAKE_DESKTOP, rapl_defaults_core), + RAPL_CPU(INTEL_FAM6_MODEL_XEON_PHI_KNL, rapl_defaults_hsw_server), - RAPL_CPU(INTEL_FAM6_MODEL_KABYLAKE_MOBILE, rapl_defaults_core), - RAPL_CPU(INTEL_FAM6_MODEL_KABYLAKE_DESKTOP, rapl_defaults_core), {} }; MODULE_DEVICE_TABLE(x86cpu, rapl_ids);