From patchwork Mon Sep 30 08:17:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Rui X-Patchwork-Id: 13815580 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) (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 822E4175D4A; Mon, 30 Sep 2024 08:19:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727684389; cv=none; b=ajTdsaXiMK5UCr+x3/rbC7s3b87MXlfSiCu6/7jEQnPLSs1MP78zmEO/CvzkX/2FtRA0NBDxyFjvgXv8SOJFrjrmb84Fk1dy5AicR2SW5Q4qcjhsbnAfS5OyJm3uRFL7y1Kdi9/nqIe+PBd27ZWLCE8XCyrvxqjnzGtlphVSM+Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727684389; c=relaxed/simple; bh=djrjqBdvWXVCFCoBhXiXbyrgzobGegM7KrS14RHA7AI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=S+/Ebql5YviYjduSETUsSYQvzsB9n5zpbyO3EDp+uP5DFfJI5ziuBqgUtLFG+/tAWIZhy2hIKV6yAW94sp0jX3aeNjd+3o8kw08CI/cIkecGl9p2P2Rz0ULswHgJjGygcajhT4SFdQLXTsf0gKZns7AV13YrFk3JkofB+r6aaLY= 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=EuPmUaFo; arc=none smtp.client-ip=198.175.65.19 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="EuPmUaFo" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1727684387; x=1759220387; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=djrjqBdvWXVCFCoBhXiXbyrgzobGegM7KrS14RHA7AI=; b=EuPmUaFoK9Jld9Td35G89oxSWtFAX9HibyIlqkrD8Ps37SvCSr8Ju4D4 fzQhEZP9b1DH3J3z2rx9GIOAJwVA3VDswf0Ky3blQjGEN7DOCWOpqL2fa O9NcIvlQX2X7RP7d0sUC3bFE0ke+sbS1BV2/Z2gyKpon2m5iAAy/Kzn3/ KsxP9aVyfpUiRNM09ckMsJsZ6kiPheGNNHjyGDripLW8lwFS9Mo857lak Az/98vhblBdqryPakKSALsa9qv4kbPdkpba2lkj5/txlAsBP2+uBKZyVD x0dfOjzYNNrcqbf+zMpN48qkgIqUU358KSAO98dpejTOnQVr+ILJNFW+C Q==; X-CSE-ConnectionGUID: E+pJvgO5RFKpMhNqdmqY0w== X-CSE-MsgGUID: XiePO0aUR/KUgrON6RMqvQ== X-IronPort-AV: E=McAfee;i="6700,10204,11210"; a="26638957" X-IronPort-AV: E=Sophos;i="6.11,165,1725346800"; d="scan'208";a="26638957" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Sep 2024 01:18:23 -0700 X-CSE-ConnectionGUID: oXsdmYS0TnOnvbYUIi0iZw== X-CSE-MsgGUID: NKR/R/eCSlSb2rB9uIfSqg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,165,1725346800"; d="scan'208";a="96549416" Received: from unknown (HELO rzhang1-mobl7.ccr.corp.intel.com) ([10.245.243.126]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Sep 2024 01:18:22 -0700 From: Zhang Rui To: rafael.j.wysocki@intel.com Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, srinivas.pandruvada@intel.com Subject: [PATCH 1/6] powercap: intel_rapl_tpmi: Fix bogus register reading Date: Mon, 30 Sep 2024 16:17:56 +0800 Message-Id: <20240930081801.28502-2-rui.zhang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240930081801.28502-1-rui.zhang@intel.com> References: <20240930081801.28502-1-rui.zhang@intel.com> Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Fix bogus reading of the TPMI_RAPL_REG_DOMAIN_INFO register. Cc: stable@vger.kernel.org Fixes: 903eb9fb85e3 ("powercap: intel_rapl_tpmi: Fix System Domain probing") Signed-off-by: Zhang Rui --- drivers/powercap/intel_rapl_tpmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/powercap/intel_rapl_tpmi.c b/drivers/powercap/intel_rapl_tpmi.c index 947544e4d229..7435df083ea4 100644 --- a/drivers/powercap/intel_rapl_tpmi.c +++ b/drivers/powercap/intel_rapl_tpmi.c @@ -181,7 +181,7 @@ static int parse_one_domain(struct tpmi_rapl_package *trp, u32 offset) pr_warn(FW_BUG "System domain must support Domain Info register\n"); return -ENODEV; } - tpmi_domain_info = readq(trp->base + offset + TPMI_RAPL_REG_DOMAIN_INFO); + tpmi_domain_info = readq(trp->base + offset + TPMI_RAPL_REG_DOMAIN_INFO * 8); if (!(tpmi_domain_info & TPMI_RAPL_DOMAIN_ROOT)) return 0; domain_type = RAPL_DOMAIN_PLATFORM; From patchwork Mon Sep 30 08:17:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Rui X-Patchwork-Id: 13815578 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) (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 4DA2F152E1C; Mon, 30 Sep 2024 08:19:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727684388; cv=none; b=PNvVJueasPb7XsPRmvch4jqoZrsg+SThp9JQNmA6ODj7Lvo+bT+GFCWKrd1TGSjYdHtkKpAZcjWJVTvgfMva72oY3O61rcPyqFZbmrfXY7jlsibKv+oUyeWKy18lu/w4iqZz/9Jd4khoz/P901cBEeY3lmxPjifS0tX9IHv1c1A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727684388; c=relaxed/simple; bh=UiBl2UAfZ5jkKQJ30HaG7GtfKxgzF3LqEHQ9vzopWMA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=l06ugBKa7ww4aee/4myJEFAgHRBT8zLhZAzEnBb1RcN1vqBr3PFsJ5FOPLjuGiTTqpllx3I+QEM+NvldFRXxx00u5rUvlgJio8unP8itE3cQRQlCxJ31NDWkoQpRuynP6yzNF4tFit7CDdA1dZgl+zBTM6muk5IQs8Y3nsidArM= 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=MMfdhUHi; arc=none smtp.client-ip=198.175.65.19 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="MMfdhUHi" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1727684387; x=1759220387; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UiBl2UAfZ5jkKQJ30HaG7GtfKxgzF3LqEHQ9vzopWMA=; b=MMfdhUHiFfB9ozCdROocbFJQdYcBaLt15UPlAd5yQEv9KMHA8X+FqTxR ozyJ5rz65itEPD2wMMvB4ejySIeKCnm7TM9iktdSJ3E/aw3OgWQFGdx2M aXCuIF0DfWHBAiqkP7gWlyVN1Q9zZ6ZoF8MsozNozDy2vh0Ep8MyEZ7MV i8b9I4GD9N7oPlXKITClhIhOic6WAJaKiJCUQEei2C6GoNtI/hB93UWKz FAGfyQkeMOts7ND2JFq2sQYYXWbjQZOcIKpXiSx4dcdFGHNoiWVogeV7h ErJ2ZrEMyFDyT9Nsyo5U/vI5j8Yh1k7ofmWvcLavouBPPV53dV3HvoU4o Q==; X-CSE-ConnectionGUID: pH3j0GcHSmaMxmMKVn0z6w== X-CSE-MsgGUID: qlFpR4PIRS6RbeketBntnw== X-IronPort-AV: E=McAfee;i="6700,10204,11210"; a="26638958" X-IronPort-AV: E=Sophos;i="6.11,165,1725346800"; d="scan'208";a="26638958" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Sep 2024 01:18:28 -0700 X-CSE-ConnectionGUID: 2i3p16WMQveSKdAuEexl2A== X-CSE-MsgGUID: xZO9lH2hQ++vts/VA9pNTw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,165,1725346800"; d="scan'208";a="96549423" Received: from unknown (HELO rzhang1-mobl7.ccr.corp.intel.com) ([10.245.243.126]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Sep 2024 01:18:24 -0700 From: Zhang Rui To: rafael.j.wysocki@intel.com Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, srinivas.pandruvada@intel.com Subject: [PATCH 2/6] thermal: proc_thermal: Fix WARNING during module unload Date: Mon, 30 Sep 2024 16:17:57 +0800 Message-Id: <20240930081801.28502-3-rui.zhang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240930081801.28502-1-rui.zhang@intel.com> References: <20240930081801.28502-1-rui.zhang@intel.com> Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 proc_thermal driver uses pcim_device_enable() to enable the pci device, which means the device will be automatically disabled on driver detach. Thus there is no need to call pci_disable_device() again. With recent PCI device resource management improvements, e.g. commit f748a07a0b64 ("PCI: Remove legacy pcim_release()"), this problem is exposed and triggers below WARNING, [ 224.010735] proc_thermal_pci 0000:00:04.0: disabling already-disabled device [ 224.010747] WARNING: CPU: 8 PID: 4442 at drivers/pci/pci.c:2250 pci_disable_device+0xe5/0x100 ... [ 224.010844] Call Trace: [ 224.010845] [ 224.010847] ? show_regs+0x6d/0x80 [ 224.010851] ? __warn+0x8c/0x140 [ 224.010854] ? pci_disable_device+0xe5/0x100 [ 224.010856] ? report_bug+0x1c9/0x1e0 [ 224.010859] ? handle_bug+0x46/0x80 [ 224.010862] ? exc_invalid_op+0x1d/0x80 [ 224.010863] ? asm_exc_invalid_op+0x1f/0x30 [ 224.010867] ? pci_disable_device+0xe5/0x100 [ 224.010869] ? pci_disable_device+0xe5/0x100 [ 224.010871] ? kfree+0x21a/0x2b0 [ 224.010873] pcim_disable_device+0x20/0x30 [ 224.010875] devm_action_release+0x16/0x20 [ 224.010878] release_nodes+0x47/0xc0 [ 224.010880] devres_release_all+0x9f/0xe0 [ 224.010883] device_unbind_cleanup+0x12/0x80 [ 224.010885] device_release_driver_internal+0x1ca/0x210 [ 224.010887] driver_detach+0x4e/0xa0 [ 224.010889] bus_remove_driver+0x6f/0xf0 [ 224.010890] driver_unregister+0x35/0x60 [ 224.010892] pci_unregister_driver+0x44/0x90 [ 224.010894] proc_thermal_pci_driver_exit+0x14/0x5f0 [processor_thermal_device_pci] ... [ 224.010921] ---[ end trace 0000000000000000 ]--- Remove the pci_disable_device() calls. Fixes: acd65d5d1cf4 ("thermal/drivers/int340x/processor_thermal: Add PCI MMIO based thermal driver") Signed-off-by: Zhang Rui Reviewed-by: Srinivas Pandruvada --- .../intel/int340x_thermal/processor_thermal_device_pci.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c index 006614921870..ba5d36d36fc4 100644 --- a/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c +++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_device_pci.c @@ -416,7 +416,6 @@ static int proc_thermal_pci_probe(struct pci_dev *pdev, const struct pci_device_ if (!pci_info->no_legacy) proc_thermal_remove(proc_priv); proc_thermal_mmio_remove(pdev, proc_priv); - pci_disable_device(pdev); return ret; } @@ -438,7 +437,6 @@ static void proc_thermal_pci_remove(struct pci_dev *pdev) proc_thermal_mmio_remove(pdev, pci_info->proc_priv); if (!pci_info->no_legacy) proc_thermal_remove(proc_priv); - pci_disable_device(pdev); } #ifdef CONFIG_PM_SLEEP From patchwork Mon Sep 30 08:17:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Rui X-Patchwork-Id: 13815581 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) (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 AD1AF178CCA; Mon, 30 Sep 2024 08:19:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727684390; cv=none; b=X+q5H3aY3ZgOq9hhOsHH3vGlqPkeLrTVR9dSsGQEWQuyMQSsJCxKs4MioIHhRyZDgRxELuTC0jrCNw29Dob2TD9rXo8ksW7AwB/rdaM73kUOWy+DOGxIQBaWxl2DbdHFGFd7+2XNyhJ27juDPZXJPBKhZy8rs9M6krT0st2cOHQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727684390; c=relaxed/simple; bh=w0jLDzy95ysPhd7nXSw/LGQtr8lMj9+9LTOOTudlOUg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mZQw4lWIisQo0clD3W7j43qrri0q8UAfHvbP2mrlr6H9BqdQFy72DmALdqo6YbMk+2I6xcka//wOgo2OuT90RitBxHSxxDs2NkK7+91rxZnI0eapglTh6GBZHoGgoIL3iEFAFW34ZSueBgauUUYzwrziSlr8iogzewYl2wZyQms= 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=NmgOj39y; arc=none smtp.client-ip=198.175.65.19 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="NmgOj39y" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1727684388; x=1759220388; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=w0jLDzy95ysPhd7nXSw/LGQtr8lMj9+9LTOOTudlOUg=; b=NmgOj39yVK+hOpZjRPY2msINphbmjC3NbXONrJ8tfEDEqRKotVuBxWxp EDZzHtdHBiWvuDjg2qmQUy/uJIjHOJOEPbGrH1kMCNjykCG280xxRYKuI 0SewYcflXYc6U5lYsKFvQw/V907QhKQQ0pw34AP3jf89f5zAUbaBzXzBq 7kUxMftAkQ//cYP3m5/a7xO8cJiQ0rEYDDvWKVxWTwyaT1PzGTNLgcW11 dHeB2KGGVql0jXctPkdXUUo4+eUTzD6hpSs2zTI+CXtqBqAMyG/UxqGGl F2IXQ/kywSvVjDqiCSoSWQT/iFzIIAO29WNIvuYKCXwPLKAKJTkV5uCwd w==; X-CSE-ConnectionGUID: 9BTQTAZ0SB2wv5ab25Q9zw== X-CSE-MsgGUID: NjPItvR+Qe+IXfHG7Xbthg== X-IronPort-AV: E=McAfee;i="6700,10204,11210"; a="26638963" X-IronPort-AV: E=Sophos;i="6.11,165,1725346800"; d="scan'208";a="26638963" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Sep 2024 01:18:34 -0700 X-CSE-ConnectionGUID: NFUJ900GRhm8m5rC8KQ0dA== X-CSE-MsgGUID: t84cBhS4RjCsPsUL6pAfTg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,165,1725346800"; d="scan'208";a="96549434" Received: from unknown (HELO rzhang1-mobl7.ccr.corp.intel.com) ([10.245.243.126]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Sep 2024 01:18:26 -0700 From: Zhang Rui To: rafael.j.wysocki@intel.com Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, srinivas.pandruvada@intel.com Subject: [PATCH 3/6] powercap: intel_rapl_tpmi: Ignore minor version change Date: Mon, 30 Sep 2024 16:17:58 +0800 Message-Id: <20240930081801.28502-4-rui.zhang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240930081801.28502-1-rui.zhang@intel.com> References: <20240930081801.28502-1-rui.zhang@intel.com> Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The hardware definition of every TPMI feature contains a major and minor version. When there is a change in the MMIO offset or change in the definition of a field, hardware will change major version. For addition of new fields without modifying existing MMIO offsets or fields, only the minor version is changed. Driver is developed to support RAPL functionality for a major and minor version. If the hardware changes major version, since offsets and definitions are changed, driver cannot continue to provide RAPL interface to users. Driver can still function with a minor version change as it will just miss the new functionality added by the hardware. The current implementation doesn't ignore any version change. If there is mismatch with the minor version, continue with an information log message. If there is mismatch with the major version, log error and exit. Signed-off-by: Zhang Rui Reviewed-by: Srinivas Pandruvada --- drivers/powercap/intel_rapl_tpmi.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/powercap/intel_rapl_tpmi.c b/drivers/powercap/intel_rapl_tpmi.c index 7435df083ea4..645fd1dc51a9 100644 --- a/drivers/powercap/intel_rapl_tpmi.c +++ b/drivers/powercap/intel_rapl_tpmi.c @@ -15,7 +15,8 @@ #include #include -#define TPMI_RAPL_VERSION 1 +#define TPMI_RAPL_MAJOR_VERSION 0 +#define TPMI_RAPL_MINOR_VERSION 1 /* 1 header + 10 registers + 5 reserved. 8 bytes for each. */ #define TPMI_RAPL_DOMAIN_SIZE 128 @@ -154,11 +155,21 @@ static int parse_one_domain(struct tpmi_rapl_package *trp, u32 offset) tpmi_domain_size = tpmi_domain_header >> 16 & 0xff; tpmi_domain_flags = tpmi_domain_header >> 32 & 0xffff; - if (tpmi_domain_version != TPMI_RAPL_VERSION) { - pr_warn(FW_BUG "Unsupported version:%d\n", tpmi_domain_version); + if (tpmi_domain_version == TPMI_VERSION_INVALID) { + pr_warn(FW_BUG "Invalid version\n"); return -ENODEV; } + if (TPMI_MAJOR_VERSION(tpmi_domain_version) != TPMI_RAPL_MAJOR_VERSION) { + pr_warn(FW_BUG "Unsupported major version:%ld\n", + TPMI_MAJOR_VERSION(tpmi_domain_version)); + return -ENODEV; + } + + if (TPMI_MINOR_VERSION(tpmi_domain_version) > TPMI_RAPL_MINOR_VERSION) + pr_info("Ignore: Unsupported minor version:%ld\n", + TPMI_MINOR_VERSION(tpmi_domain_version)); + /* Domain size: in unit of 128 Bytes */ if (tpmi_domain_size != 1) { pr_warn(FW_BUG "Invalid Domain size %d\n", tpmi_domain_size); From patchwork Mon Sep 30 08:17:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Rui X-Patchwork-Id: 13815577 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) (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 D4F4243156; Mon, 30 Sep 2024 08:19:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727684386; cv=none; b=Bj2LXQ0J2m2h2kQjqr4fs5Bvw05AYUEP3vZ26rlmFLPBzwfAg2OgNE6oOrgYsKiPbmwQaVLBMk5FAw7SNnaZsrJrwcD/nFSaesx11d9hUWp0Cu0k3PFhQQdOleG6hXadYUJBIhJ5gJcxlN96qhgyIrNwH3glX5CTZx7ijlfFiN0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727684386; c=relaxed/simple; bh=n/uVYp3+EpXIcbqYoU65jO0k6r4IqZH14tOyYeW8mqE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GmiLUWXc/zACSXG3uDUdj8fyf7fDMqW5Gsbmxf79/f3rmRhGw+oKL/cPs9FI2pj8rQuxBgFz+uIUBEU3V+lsE3I5JncXYXBlBUc7RCXcMwvS3B9KnZvJu6YfRxNxZwz5iAp4lQQ+QmoNeVshaEMkiFq8ShePybDHyvfTfpmksXc= 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=Vm2Kc8bQ; arc=none smtp.client-ip=198.175.65.19 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Vm2Kc8bQ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1727684385; x=1759220385; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=n/uVYp3+EpXIcbqYoU65jO0k6r4IqZH14tOyYeW8mqE=; b=Vm2Kc8bQO/cioyEjdrTnMJIcocpgBF1XGDztEjgxMu1kUxz4jlFjN8JK AYpe76b+kxdcIMphtVQwRvtFSF75VM7Kv6TYGcKEvOdwQCjsuUSeNTiA5 1WM0C2DwMPuXTAku/oRsSvptjN+tKmidc9MwPOtIzrFgklYBnp4rRP0EK obf7LUWficAT66sTfwUHc/EHYMyJRadjZAPvq2L+ZxJnU5/1+wpotVPUC 4WiCMGw5NzrfZ9Vj5JERP16RgJ0GG3KIuytfjNeyxs6SACKj3Yh4ytOtN 1pr8f3yjglSNLdC5aj+RFrDHU/AZCQeNlLnCZCRigI1MyYcqtLY9z7/fp w==; X-CSE-ConnectionGUID: TvSxAEycSUubJX43tHucag== X-CSE-MsgGUID: bw05r04UQ1qNI7mf3Xmgfw== X-IronPort-AV: E=McAfee;i="6700,10204,11210"; a="26638967" X-IronPort-AV: E=Sophos;i="6.11,165,1725346800"; d="scan'208";a="26638967" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Sep 2024 01:18:34 -0700 X-CSE-ConnectionGUID: AKCRM6gERZm3Wdwo1MHEAw== X-CSE-MsgGUID: 5Kn+K91kSVax32MzDH5gRg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,165,1725346800"; d="scan'208";a="96549451" Received: from unknown (HELO rzhang1-mobl7.ccr.corp.intel.com) ([10.245.243.126]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Sep 2024 01:18:28 -0700 From: Zhang Rui To: rafael.j.wysocki@intel.com Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, srinivas.pandruvada@intel.com Subject: [PATCH 4/6] powercap: intel_rapl_msr: Add PL4 support for Arrowlake-U Date: Mon, 30 Sep 2024 16:17:59 +0800 Message-Id: <20240930081801.28502-5-rui.zhang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240930081801.28502-1-rui.zhang@intel.com> References: <20240930081801.28502-1-rui.zhang@intel.com> Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Sumeet Pawnikar Add PL4 support for ArrowLake-U platform. Signed-off-by: Sumeet Pawnikar Signed-off-by: Zhang Rui Reviewed-by: Srinivas Pandruvada --- drivers/powercap/intel_rapl_msr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/powercap/intel_rapl_msr.c b/drivers/powercap/intel_rapl_msr.c index 733a36f67fbc..1f4c5389676a 100644 --- a/drivers/powercap/intel_rapl_msr.c +++ b/drivers/powercap/intel_rapl_msr.c @@ -147,6 +147,7 @@ static const struct x86_cpu_id pl4_support_ids[] = { X86_MATCH_VFM(INTEL_RAPTORLAKE_P, NULL), X86_MATCH_VFM(INTEL_METEORLAKE, NULL), X86_MATCH_VFM(INTEL_METEORLAKE_L, NULL), + X86_MATCH_VFM(INTEL_ARROWLAKE_U, NULL), {} }; From patchwork Mon Sep 30 08:18:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Rui X-Patchwork-Id: 13815582 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) (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 D639317AE1D; Mon, 30 Sep 2024 08:19:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727684390; cv=none; b=BVLYa+UtvJ35wI0d067PhmMyELXn9uCEYrLbdkeMV3ut7aLNzHDHp+k9gEk4rIpjWkS/Ggn5d04LORaHEdpieWa400I2WXbEiaxptoBMWvawcgvzrWMZKqhgF4BLoQwXAQtnw8PEZzoI0l8ty90/jYUfxWahQhVXVaNL0FRpy7o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727684390; c=relaxed/simple; bh=Pg3w5FOZSG04AWbAHQDiz4yGvhlJGQ//2Ie7F9VCl2Y=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=MDPJOe1AyZ33jhpkwixIIWIGIgtg5NJMA+kbIRqPSOuG2eOk8+fBGpf2ethLZr1w66mDmBNTe4EUecHlQu/85T72du4tRtyYLdI7q92HIx06YAkmJiHLY6DC79zHOJC8vG3bfHzjfbHIcVJL3dzSW2jVVQm+VHJP9IoN2c6ria0= 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=Lp0KZKQa; arc=none smtp.client-ip=198.175.65.19 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Lp0KZKQa" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1727684388; x=1759220388; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Pg3w5FOZSG04AWbAHQDiz4yGvhlJGQ//2Ie7F9VCl2Y=; b=Lp0KZKQaaf5bvndJljqHnQuohWBmTQy4DtxSb/e5rh3XZ9wZzx7GPkdP oL2W42NOCmc2jOOYypSk1kf96q25LTDiJL35CvGQap4ENPpMsgWvGVmj1 NRkteEm+Mwra4IhuKvyV7mQ2mCec/Cz4se+O7sT64oOATIRvGFA0fJ8V/ JC73grON18ShsMPWBvZsq4PwhtaXcvchMB+pECzEgorTOYnOzV6dEHzTa 1xGsKgQkNp0EvU+9BNaWz9FSouTPwMpKx/PE2yreLgHSWKAw6DIQ8mY7l ZUmx/z/TD/DyhkphyeBc3/4rqPnfzWQxM/DP32cfputtuQwHBZJdTCc+9 g==; X-CSE-ConnectionGUID: vrrArpIbQUaz/0KqNLx8eg== X-CSE-MsgGUID: E+I2Z7BuSYybglYXTddsxg== X-IronPort-AV: E=McAfee;i="6700,10204,11210"; a="26638973" X-IronPort-AV: E=Sophos;i="6.11,165,1725346800"; d="scan'208";a="26638973" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Sep 2024 01:18:34 -0700 X-CSE-ConnectionGUID: KSxrVQWvTJuFKLFxPDAxgQ== X-CSE-MsgGUID: cbAntR62SGe55lu/iYRlow== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,165,1725346800"; d="scan'208";a="96549472" Received: from unknown (HELO rzhang1-mobl7.ccr.corp.intel.com) ([10.245.243.126]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Sep 2024 01:18:31 -0700 From: Zhang Rui To: rafael.j.wysocki@intel.com Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, srinivas.pandruvada@intel.com Subject: [PATCH 5/6] thermal: proc_thermal: Remove MMIO RAPL cpu hotplug support Date: Mon, 30 Sep 2024 16:18:00 +0800 Message-Id: <20240930081801.28502-6-rui.zhang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240930081801.28502-1-rui.zhang@intel.com> References: <20240930081801.28502-1-rui.zhang@intel.com> Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 CPU0/package0 is always online and the MMIO RAPL driver runs on single package systems only, so there is no need to handle CPU hotplug. Always register a RAPL package device for package 0 and remove the unnecessary cpu hotplug support. Signed-off-by: Zhang Rui Reviewed-by: Srinivas Pandruvada --- .../int340x_thermal/processor_thermal_rapl.c | 66 +++++++------------ 1 file changed, 22 insertions(+), 44 deletions(-) diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_rapl.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_rapl.c index e9aa9e23aab9..769510e748c0 100644 --- a/drivers/thermal/intel/int340x_thermal/processor_thermal_rapl.c +++ b/drivers/thermal/intel/int340x_thermal/processor_thermal_rapl.c @@ -19,42 +19,6 @@ static const struct rapl_mmio_regs rapl_mmio_default = { .limits[RAPL_DOMAIN_DRAM] = BIT(POWER_LIMIT2), }; -static int rapl_mmio_cpu_online(unsigned int cpu) -{ - struct rapl_package *rp; - - /* mmio rapl supports package 0 only for now */ - if (topology_physical_package_id(cpu)) - return 0; - - rp = rapl_find_package_domain_cpuslocked(cpu, &rapl_mmio_priv, true); - if (!rp) { - rp = rapl_add_package_cpuslocked(cpu, &rapl_mmio_priv, true); - if (IS_ERR(rp)) - return PTR_ERR(rp); - } - cpumask_set_cpu(cpu, &rp->cpumask); - return 0; -} - -static int rapl_mmio_cpu_down_prep(unsigned int cpu) -{ - struct rapl_package *rp; - int lead_cpu; - - rp = rapl_find_package_domain_cpuslocked(cpu, &rapl_mmio_priv, true); - if (!rp) - return 0; - - cpumask_clear_cpu(cpu, &rp->cpumask); - lead_cpu = cpumask_first(&rp->cpumask); - if (lead_cpu >= nr_cpu_ids) - rapl_remove_package_cpuslocked(rp); - else if (rp->lead_cpu == cpu) - rp->lead_cpu = lead_cpu; - return 0; -} - static int rapl_mmio_read_raw(int cpu, struct reg_action *ra) { if (!ra->reg.mmio) @@ -82,6 +46,7 @@ static int rapl_mmio_write_raw(int cpu, struct reg_action *ra) int proc_thermal_rapl_add(struct pci_dev *pdev, struct proc_thermal_device *proc_priv) { const struct rapl_mmio_regs *rapl_regs = &rapl_mmio_default; + struct rapl_package *rp; enum rapl_domain_reg_id reg; enum rapl_domain_type domain; int ret; @@ -109,25 +74,38 @@ int proc_thermal_rapl_add(struct pci_dev *pdev, struct proc_thermal_device *proc return PTR_ERR(rapl_mmio_priv.control_type); } - ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "powercap/rapl:online", - rapl_mmio_cpu_online, rapl_mmio_cpu_down_prep); - if (ret < 0) { - powercap_unregister_control_type(rapl_mmio_priv.control_type); - rapl_mmio_priv.control_type = NULL; - return ret; + /* Register a RAPL package device for package 0 which is always online */ + rp = rapl_find_package_domain(0, &rapl_mmio_priv, false); + if (rp) { + ret = -EEXIST; + goto err; + } + + rp = rapl_add_package(0, &rapl_mmio_priv, false); + if (IS_ERR(rp)) { + ret = PTR_ERR(rp); + goto err; } - rapl_mmio_priv.pcap_rapl_online = ret; return 0; + +err: + powercap_unregister_control_type(rapl_mmio_priv.control_type); + rapl_mmio_priv.control_type = NULL; + return ret; } EXPORT_SYMBOL_GPL(proc_thermal_rapl_add); void proc_thermal_rapl_remove(void) { + struct rapl_package *rp; + if (IS_ERR_OR_NULL(rapl_mmio_priv.control_type)) return; - cpuhp_remove_state(rapl_mmio_priv.pcap_rapl_online); + rp = rapl_find_package_domain(0, &rapl_mmio_priv, false); + if (rp) + rapl_remove_package(rp); powercap_unregister_control_type(rapl_mmio_priv.control_type); } EXPORT_SYMBOL_GPL(proc_thermal_rapl_remove); From patchwork Mon Sep 30 08:18:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Rui X-Patchwork-Id: 13815583 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.19]) (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 ABECF1865FA; Mon, 30 Sep 2024 08:19:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727684397; cv=none; b=PDhPx6Pnjs2WOy0lBHcitpmAQyPPBKqI90QcyNObZDdSGITz5l49Uj6jmMKS4JUI3olN3ibeGJ8hnYM0AW9/e7jmNPCAidOFHZjn6igsGoO019BMGHVCUqSNYTZ3D0ti5tzU/QZcO6cH+HJef9H0pktp34mF5P9OQoHAE5pBKTI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727684397; c=relaxed/simple; bh=G1F3xKKqYqFRkpf4/9hLMQCgirSonqyikM+KdGa0CCk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lN9Co/UUYlxxczsQBHYKmbOzD8eEqwnkF5zTApccID0vAnIMGvxdRh4AvT9fWXokxqSLgAUw9fG6F1fRlCQL0gyREUfGgwgpPoMdq5f+bE3OnOlQGbaJStzgb1zi9et6WkuTxRmfBh5mDDBtlWkYNO3a9pRlr9GtV+V7txTAZTM= 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=Yh7CbrtV; arc=none smtp.client-ip=198.175.65.19 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="Yh7CbrtV" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1727684395; x=1759220395; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=G1F3xKKqYqFRkpf4/9hLMQCgirSonqyikM+KdGa0CCk=; b=Yh7CbrtVDvGfp1ntxOyMe+q9UMJjiak2aNC4JSbkpYJIv06Z3A5xaYrq LStZvNDC8e+INAg+2mEAoL3Vm+h0d2tB4nm+7NU28BFvA8HnI/WB0oSPl DfYg7gwTRo5p+wcnP5NQjLk1/hxBSa8EGY99laonSmD7oS7Xh/gwHWEaX DrdCbrI/bi+107WK+wMNljFH/En3TkcxwAJ1UsME+QOGy3YsppvJVQMH+ mhj6MCHjXh1PNv0vi0G3Ny1Y0VmpxXd4JU149YyQgQed2b6P0C9QteliF SF0WWZw8Smv300/BPRArnxLQQpiAiVeM1sh8L/ANbdDx7SeMUJCDwkqoq A==; X-CSE-ConnectionGUID: 3/aVEVAcSkifSfnTbipvyA== X-CSE-MsgGUID: khm7z/ppRs6udpCPfH1a0A== X-IronPort-AV: E=McAfee;i="6700,10204,11210"; a="26638976" X-IronPort-AV: E=Sophos;i="6.11,165,1725346800"; d="scan'208";a="26638976" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Sep 2024 01:18:35 -0700 X-CSE-ConnectionGUID: hxFe0sJWSy+FeogIkFDpqQ== X-CSE-MsgGUID: DlgVrjrrRmqKZS3TgwQLPg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,165,1725346800"; d="scan'208";a="96549491" Received: from unknown (HELO rzhang1-mobl7.ccr.corp.intel.com) ([10.245.243.126]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Sep 2024 01:18:33 -0700 From: Zhang Rui 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 Message-Id: <20240930081801.28502-7-rui.zhang@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240930081801.28502-1-rui.zhang@intel.com> References: <20240930081801.28502-1-rui.zhang@intel.com> Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 Reviewed-by: Srinivas Pandruvada --- .../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), };