mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Zhang Rui <rui.zhang@intel.com>
To: rafael.j.wysocki@intel.com
Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
	srinivas.pandruvada@intel.com
Subject: [PATCH 6/6] thermal: proc_thermal: Add MMIO RAPL PL4 support
Date: Mon, 30 Sep 2024 16:18:01 +0800	[thread overview]
Message-ID: <20240930081801.28502-7-rui.zhang@intel.com> (raw)
In-Reply-To: <20240930081801.28502-1-rui.zhang@intel.com>

Similar to MSR RAPL interface, MMIO RAPL also has PL4 support.

Add PL4 support for MMIO RAPL. As a result, the powercap sysfs for MMIO
RAPL will show a new "peak power" constraint.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
---
 .../thermal/intel/int340x_thermal/processor_thermal_rapl.c    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_rapl.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_rapl.c
index 769510e748c0..bde2cc386afd 100644
--- a/drivers/thermal/intel/int340x_thermal/processor_thermal_rapl.c
+++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_rapl.c
@@ -13,9 +13,9 @@ static struct rapl_if_priv rapl_mmio_priv;
 
 static const struct rapl_mmio_regs rapl_mmio_default = {
 	.reg_unit = 0x5938,
-	.regs[RAPL_DOMAIN_PACKAGE] = { 0x59a0, 0x593c, 0x58f0, 0, 0x5930},
+	.regs[RAPL_DOMAIN_PACKAGE] = { 0x59a0, 0x593c, 0x58f0, 0, 0x5930, 0x59b0},
 	.regs[RAPL_DOMAIN_DRAM] = { 0x58e0, 0x58e8, 0x58ec, 0, 0},
-	.limits[RAPL_DOMAIN_PACKAGE] = BIT(POWER_LIMIT2),
+	.limits[RAPL_DOMAIN_PACKAGE] = BIT(POWER_LIMIT2) | BIT(POWER_LIMIT4),
 	.limits[RAPL_DOMAIN_DRAM] = BIT(POWER_LIMIT2),
 };
 
-- 
2.34.1


  parent reply	other threads:[~2024-09-30  8:19 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-30  8:17 [PATCH 0/6] thermal/rapl: fixes, improvements and cleanups Zhang Rui
2024-09-30  8:17 ` [PATCH 1/6] powercap: intel_rapl_tpmi: Fix bogus register reading Zhang Rui
2024-09-30  8:17 ` [PATCH 2/6] thermal: proc_thermal: Fix WARNING during module unload Zhang Rui
2024-09-30  8:17 ` [PATCH 3/6] powercap: intel_rapl_tpmi: Ignore minor version change Zhang Rui
2024-09-30  8:17 ` [PATCH 4/6] powercap: intel_rapl_msr: Add PL4 support for Arrowlake-U Zhang Rui
2024-09-30  8:18 ` [PATCH 5/6] thermal: proc_thermal: Remove MMIO RAPL cpu hotplug support Zhang Rui
2024-09-30  8:18 ` Zhang Rui [this message]
2024-10-07 18:13 ` [PATCH 0/6] thermal/rapl: fixes, improvements and cleanups Rafael J. Wysocki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240930081801.28502-7-rui.zhang@intel.com \
    --to=rui.zhang@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=rafael.j.wysocki@intel.com \
    --cc=srinivas.pandruvada@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®