Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp10748220ybl; Fri, 27 Dec 2019 01:21:02 -0800 (PST) X-Google-Smtp-Source: APXvYqw68TkZairCHnRKTYKdXGdDHhLe+7nMAVz09spE40MltpIUx3kHwoj1N3ZUUFJoKYljqD/j X-Received: by 2002:a9d:369:: with SMTP id 96mr48808917otv.228.1577438462588; Fri, 27 Dec 2019 01:21:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577438462; cv=none; d=google.com; s=arc-20160816; b=niVkoR+lw1H8/yhMm6ntVptN6Sd3MaLQq/OR2FmrM7I3aguZLRt5p+qhQF844TW2eQ YF1mBe3z24+Mp/RW6B1OBgSCICL1sI4AO+uPfMmw9J9QEfV/d38awu3qSWRarZpd4MU7 +/N6aGoxq6mO14UZdg+QNGCOSY0hw6GU0UtH5pnbn3kL4vNausj7d6rHT8PZRiSt3zBg Lq/BDoOSHH4Yju/rqa018vD/flQIS38h2/o422H2dVga3hFr50H9WBINMNPONwhgNPNE 5A7BUuBfH531Hj/FIFeyoaWLdhZYaxxdamuYzsxB4Eaz77tKqu4YVSolAmJ0JOIkUgXd OUYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=73sl4TkNCjwPYIdiMSmDjQ/ozD+ikJONcj4eqMOUkx0=; b=u1SFoTn0sNxMwWDo/oGGuITkyMQJCwtXEZcchKjtD7ReelPyqaSrof/BKB1OskVe6B dO27RZSgW2QTs1LZco4SQwDc12QbP43kxVzAzgZRDwaK+L8EkA3jNgsujtv92/Pr9cn1 YyjugCs7yr+6zL0kA00WEklfKmfMB+jo+JCy/54p4PDDPS2QBxB52sI0/8toxXLoG7uD 7J7Eozf/6U2Hw3x6b5Y5usWca7HuHU+U/+3aLqAhEw8kZZrgHdvgdudWNVXTmqOxrm5J Wk5wCSduXzb3R+iHtfRe4v7/894RX5h0LW7neNHg8kijPH2KB4pep4pGMyXkf28jcvE7 IBbQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i15si16220011otl.247.2019.12.27.01.20.51; Fri, 27 Dec 2019 01:21:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726379AbfL0JUB (ORCPT + 99 others); Fri, 27 Dec 2019 04:20:01 -0500 Received: from mga04.intel.com ([192.55.52.120]:6016 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725904AbfL0JUA (ORCPT ); Fri, 27 Dec 2019 04:20:00 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Dec 2019 01:20:00 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,362,1571727600"; d="scan'208";a="367987606" Received: from tchen40-mobl.gar.corp.intel.com (HELO M5530.gar.corp.intel.com) ([10.255.129.32]) by orsmga004.jf.intel.com with ESMTP; 27 Dec 2019 01:19:50 -0800 From: Harry Pan To: LKML Cc: gs0622@gmail.com, Harry Pan , Namhyung Kim , "H. Peter Anvin" , Peter Zijlstra , Borislav Petkov , x86@kernel.org, Thomas Gleixner , Ingo Molnar , Jiri Olsa , Mark Rutland , Alexander Shishkin , Arnaldo Carvalho de Melo Subject: [PATCH] perf/x86/intel/rapl: Add Comet Lake support Date: Fri, 27 Dec 2019 17:19:46 +0800 Message-Id: <20191227171944.1.Id6f3ab98474d7d1dba5b95390b24e0a67368d364@changeid> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Comet Lake supports the same RAPL counters like Kaby Lake and Skylake. After this, on CML machine the energy counters appear in perf list. Signed-off-by: Harry Pan --- arch/x86/events/intel/rapl.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c index 5053a403e4ae..09913121e726 100644 --- a/arch/x86/events/intel/rapl.c +++ b/arch/x86/events/intel/rapl.c @@ -741,6 +741,8 @@ static const struct x86_cpu_id rapl_model_match[] __initconst = { X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT_PLUS, model_hsw), X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE_L, model_skl), X86_RAPL_MODEL_MATCH(INTEL_FAM6_ICELAKE, model_skl), + X86_RAPL_MODEL_MATCH(INTEL_FAM6_COMETLAKE_L, model_skl), + X86_RAPL_MODEL_MATCH(INTEL_FAM6_COMETLAKE, model_skl), {}, }; -- 2.24.1