From: Huang Rui <ray.huang@amd.com>
To: Borislav Petkov <bp@suse.de>, Jean Delvare <jdelvare@suse.de>,
        "Guenter Roeck" <linux@roeck-us.net>,
        Andy Lutomirski <luto@amacapital.net>,
        "Andreas Herrmann" <herrmann.der.user@gmail.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@kernel.org>,
        "Rafael J. Wysocki" <rjw@rjwysocki.net>, Len Brown <lenb@kernel.org>,
        John Stultz <john.stultz@linaro.org>,
        =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Weisbecker?= <fweisbec@gmail.com>
CC: <lm-sensors@lm-sensors.org>, <linux-kernel@vger.kernel.org>,
        <x86@kernel.org>, Andreas Herrmann <herrmann.der.user@googlemail.com>,
        Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>,
        Borislav Petkov <bp@alien8.de>, Fengguang Wu <fengguang.wu@intel.com>,
        Aaron Lu <aaron.lu@intel.com>, Tony Li <tony.li@amd.com>,
        Huang Rui <ray.huang@amd.com>
Subject: [PATCH 08/15] hwmon, fam15h_power: add max compute unit accumulated power
Date: Thu, 27 Aug 2015 16:07:39 +0800
Message-ID: <1440662866-28716-9-git-send-email-ray.huang@amd.com>
In-Reply-To: <1440662866-28716-1-git-send-email-ray.huang@amd.com>
References: <1440662866-28716-1-git-send-email-ray.huang@amd.com>
MIME-Version: 1.0
Content-Type: text/plain
SpamDiagnosticOutput: 1:23
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Aug 2015 08:10:03.8358
 (UTC)
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.221];Helo=[atltwp01.amd.com]
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0719
X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0528;2:PmikhxAca5YO7NSLIg24AyWCSdFanJof4TQjxVWS+m33njIqBCjzIzCwSiQZZQaf3mYuhnsx1beP2+Kbos9+IQ0EJXbf+iN5UaERQPWebVVyh9XsFaR7/nZtWsYKEi42Ju5fMgBMG3/9A9/xgizTnwvqdHDyWsI85GxlKywsj/I=;3:JEkcuL3r2z9aN4Fird2sYbAARHervc3SE0ktRUUg7gUC1wXySWX+x2eDDRMWQGINtPV1ZVRam3Dql8KJurGAaXVFhh9sHLTGqpUvK+RbMVt+kwnDIAWvDeQefSqKUwFvCucYlAWrbE513fs3wNO6ArPUi0WU26ZNnmWTlTo0bDJJ9X+CA5jAlfbEnao06/vghJ2k4cAQ3J8tdCMFkkTxc5yJQU06eFX50h9ssa6vplvAuIAlofOG5aggem5hyt4+;25:ocrVfmjIDU5kU3P/9DHIT08hwqFNR72jPDP4XOlSzjYeef1HrgO1d4sEzLWLjxDwUMMgv0vkDd6UU3eMSCivi50v/te9lpVzaNlYuNFQfV5FllFzO/FJCBoxX79wNdHBDFbbcdxLl/7Mi2sFm/cU1MF9ED2paY4w9gEEuVSKyf5czaIeKdmQJo2GGsa8OdOkBzL9AHgvqeEUaqMz7codsmKG7i5vl+QRDjUY58OM4CohMu9LnTHa1+JBliWNk+ZO;23:UUarlbv0W3E5oydBgJ8jY3QmOcyBe9/KJFwVrydkGOc0fyJUhpsO23c5WvFJn21iU0PVtgIuY6DRj9DlWt0usNtjZ6NTL3PcKPYXTP7g0Qq3qo/BdQ+LYWCe/hAUK/+diVFD3MfI3gFbd4Bp40i5bBqqQ71PlCiqY6xE23cjeGe1fc/AVRLPcwCOLa2VlH5g
X-OriginatorOrg: amd.com
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2755
Lines: 92

This patch adds a member in fam15h_power_data which specifies the
maximum accumulated power in a compute unit.

Signed-off-by: Huang Rui <ray.huang@amd.com>
---
 drivers/hwmon/fam15h_power.c | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c
index d6efcf6..fdfa18e 100644
--- a/drivers/hwmon/fam15h_power.c
+++ b/drivers/hwmon/fam15h_power.c
@@ -26,6 +26,7 @@
 #include <linux/pci.h>
 #include <linux/bitops.h>
 #include <asm/processor.h>
+#include <asm/msr.h>
 
 MODULE_DESCRIPTION("AMD Family 15h CPU processor power monitor");
 MODULE_AUTHOR("Andreas Herrmann <herrmann.der.user@googlemail.com>");
@@ -43,12 +44,16 @@ MODULE_LICENSE("GPL");
 
 #define FAM15H_MIN_POWER_GROUPS		2
 
+#define MSR_F15H_CU_MAX_PWR_ACCUMULATOR	0xc001007b
+
 struct fam15h_power_data {
 	struct pci_dev *pdev;
 	unsigned int tdp_to_watts;
 	unsigned int base_tdp;
 	unsigned int processor_pwr_watts;
 	unsigned int cpu_pwr_sample_ratio;
+	/* maximum accumulated power of a compute unit */
+	u64 max_cu_acc_power;
 };
 
 static ssize_t show_power(struct device *dev,
@@ -199,8 +204,8 @@ static int fam15h_power_resume(struct pci_dev *pdev)
 #define fam15h_power_resume NULL
 #endif
 
-static void fam15h_power_init_data(struct pci_dev *f4,
-					     struct fam15h_power_data *data)
+static int fam15h_power_init_data(struct pci_dev *f4,
+				  struct fam15h_power_data *data)
 {
 	u32 val, eax, ebx, ecx, edx;
 	u64 tmp;
@@ -228,7 +233,7 @@ static void fam15h_power_init_data(struct pci_dev *f4,
 
 	/* CPUID Fn8000_0007:EDX[12] indicates to support accumulated power */
 	if (!(edx & BIT(12)))
-		return;
+		return 0;
 
 	/*
 	 * detemine the ratio of the compute unit power accumulator
@@ -236,6 +241,15 @@ static void fam15h_power_init_data(struct pci_dev *f4,
 	 * Fn8000_0007:ECX
 	 */
 	data->cpu_pwr_sample_ratio = ecx;
+
+	if (rdmsrl_safe(MSR_F15H_CU_MAX_PWR_ACCUMULATOR, &tmp)) {
+		pr_err("Failed to read max compute unit power accumulator MSR\n");
+		return -ENODEV;
+	}
+
+	data->max_cu_acc_power = tmp;
+
+	return 0;
 }
 
 static int fam15h_power_probe(struct pci_dev *pdev,
@@ -262,7 +276,9 @@ static int fam15h_power_probe(struct pci_dev *pdev,
 	if (fam15h_power_init_attrs(pdev))
 		return -ENOMEM;
 
-	fam15h_power_init_data(pdev, data);
+	if (fam15h_power_init_data(pdev, data))
+		return -ENODEV;
+
 	data->pdev = pdev;
 
 	hwmon_dev = devm_hwmon_device_register_with_groups(dev, "fam15h_power",
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/