Message ID | 20240131142335.84218-5-rui.zhang@intel.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-46595-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp1923592dyb; Wed, 31 Jan 2024 06:25:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IFE8BtVRndEZQdO9+vU56Oi328t0TWZHTA1PTQidagCqOZGvmR0tPdCFe9w/6Q7EXm328ip X-Received: by 2002:ac8:7f14:0:b0:42a:6378:822c with SMTP id f20-20020ac87f14000000b0042a6378822cmr1673540qtk.31.1706711132541; Wed, 31 Jan 2024 06:25:32 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706711132; cv=pass; d=google.com; s=arc-20160816; b=dZrjvLIV1knr8vMpf1bB623M/MXhdgNpLz0v20G+oe+B0SIh6f+3Dimxw0YaRlhlb4 Kc9in4xNyLnmRBzUiOnQvH2SkidPnoKLP48Ql0NjJW6cjdYKc0wE2bb5tRthQpzBYjsw KY7aPCr/q8/z0xw99HCnYX1CbPE7taZjXTsMwIUKCrv2vVqqYI7jGudVghjE9F9PoBmX QPpv2PWudGhfnJgTPj1MwlqrLD/MYS1zRDMK1Z6YeseqNw0Bi22SjJGMlWlWwJTt3NuK gUkvueDvPA8Kz5Oqb+z2aeBv4JI6cGjG6PesTyXcMpxzaFkTFQgC3hdzyBESIEAtRDlW 9JIQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=sWKnduQtk5fKpdyRPe3f6lqVGH6sGdBmRmD2dyRs7hs=; fh=BlDKeBpno31qHE0F+wZUBXiWpsYsZgwlmr4DVKK6b4A=; b=vvYZip8npA2vlpOFLcPDwZjaU60LcIo5iCTFXXfpSoKocGmfWuZgzkSNOtTUqIygH1 PrnmZuDeXXyDz5NMhYZlnxKmP5kIBMfWvkaxbbuAUyEcc5esdIiYeoNo3igT7q4Ez6tQ 9eqc5fIPH7/kBtzSkyyQ56Ag2ZAVG/awYWVSxXj9/U0EDvpYXUwmjyweQzpAjQKj1lei T3+lPYXZDFO64RsV0MAo6Q7v7MtYaZTfkb22ry2mtGRqO/MLyr3TatdC9EETY0ERBul/ UuwdLF3+0+IANldBRkCuKrMO72QW7wUgfztTYIfNu4IyGunhFY/HGRNC/bx5d0vhx5Pe umng==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=cvFqLAnp; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-46595-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-46595-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Forwarded-Encrypted: i=1; AJvYcCUIo9YVNh62kDTfSBTAW/bzs7TinqiDXoTr+OVEeC4MHDvedN5Jkfs6HrQqXNotJc185RXqWzNl9YKzFSCjleIAwxBxnA== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id c2-20020a05622a024200b0042bec60da8bsi763769qtx.341.2024.01.31.06.25.32 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jan 2024 06:25:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-46595-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=cvFqLAnp; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-46595-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-46595-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id DEF451C25A0B for <ouuuleilei@gmail.com>; Wed, 31 Jan 2024 14:25:13 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6838884A55; Wed, 31 Jan 2024 14:24:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="cvFqLAnp" Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1AA8E84A29; Wed, 31 Jan 2024 14:24:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.10 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706711043; cv=none; b=p7G271R7BRvV38B0Jfou10JxtDx2vISYm+LbE4nMjEu3dZl95nJ4bzlHKasxKaQO57fxvz+RghJJYR9JxOZh9aqlGGJt6nauTPiAQi9YTjtJYtUGFrKr9DorG6u5J+mWt2o0U1ZzqrXn7cFh25kWniq5AkK6EbMWoza/t4RzCnY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706711043; c=relaxed/simple; bh=P/1acTucceqt/grzvkOvrapX+WjE/maAY0kvtIA7xMU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iIAL5BOhOT6e/Q3Kqo1D6pCIRTpZZR06lG/2mOkAUBMaJs23Zenpe6nEn72IihNUicvxJVOMwpySv+U5lu3TzwsJNMdABBmweI18iz8q1Zi4DIqlyYcP/O3I4uj8gOUuyYzuTuuXFChHzK3pwi5wRkUVT3Cs7avO0qFD82YeVBs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=cvFqLAnp; arc=none smtp.client-ip=192.198.163.10 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1706711042; x=1738247042; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=P/1acTucceqt/grzvkOvrapX+WjE/maAY0kvtIA7xMU=; b=cvFqLAnp4Lci5GIF4NcpbU+t5OrEEgxSYox3S8S9KcV8ovom6CtTuc3+ 1l19x043Ep3O43NwLLJhLjwIRAVbRtS535/uggzynZW6CkneUNkCsqe0I mKFjl2zCaR9GH4ChOh31UDLC/BgQIQhOQkXWiT8t8tLqVGRJxSSNFgGYw csciAnwrVr+Qfq3KThjh5qPm/UPhkS2CCZJfcBMuI8TsF46/Cx237UMkr 3nDxE0HZwdPg8OiEjq2kGvIBk3cA51xIJ+jtzTDKq1Pc/r+lVFMIXs639 qJq/WqR3TnC5Ze0jEuikSM8VmAELZOz1reeCY1OpdFsmPlYtSJ5CqJQ3a g==; X-IronPort-AV: E=McAfee;i="6600,9927,10969"; a="10995839" X-IronPort-AV: E=Sophos;i="6.05,231,1701158400"; d="scan'208";a="10995839" Received: from orviesa005.jf.intel.com ([10.64.159.145]) by fmvoesa104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Jan 2024 06:24:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,231,1701158400"; d="scan'208";a="4068756" Received: from puhongt-mobl2.ccr.corp.intel.com (HELO rzhang1-mobl7.ccr.corp.intel.com) ([10.255.29.147]) by orviesa005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 31 Jan 2024 06:23:58 -0800 From: Zhang Rui <rui.zhang@intel.com> To: rafael.j.wysocki@intel.com, peterz@infradead.org Cc: mingo@redhat.com, kan.liang@linux.intel.com, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, x86@kernel.org Subject: [PATCH 4/5] powercap: intel_rapl: Fix BROADWELL_D Dram energy unit Date: Wed, 31 Jan 2024 22:23:34 +0800 Message-Id: <20240131142335.84218-5-rui.zhang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240131142335.84218-1-rui.zhang@intel.com> References: <20240131142335.84218-1-rui.zhang@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789616332482601726 X-GMAIL-MSGID: 1789616332482601726 |
Series |
intel_rapl & perf rapl: combine PMU support
|
|
Commit Message
Zhang, Rui
Jan. 31, 2024, 2:23 p.m. UTC
BROADWELL_D uses a fixed energy unit for Dram Domain like the other Xeon
servers, e.g. BROADWELL_X.
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
---
drivers/powercap/intel_rapl_common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c index 318174c87249..094e226b8bd3 100644 --- a/drivers/powercap/intel_rapl_common.c +++ b/drivers/powercap/intel_rapl_common.c @@ -1235,7 +1235,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = { X86_MATCH_INTEL_FAM6_MODEL(BROADWELL, &rapl_defaults_core), X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_G, &rapl_defaults_core), - X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D, &rapl_defaults_core), + X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D, &rapl_defaults_hsw_server), X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X, &rapl_defaults_hsw_server), X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE, &rapl_defaults_core),