From: Guenter Roeck <linux@roeck-us.net>
To: linux-hwmon@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
"Clemens Ladisch" <clemens@ladisch.de>,
"Jean Delvare" <jdelvare@suse.com>,
"Brad Campbell" <lists2009@fnarfbargle.com>,
"Ondrej Čerman" <ocerman@sda1.eu>,
"Bernhard Gebetsberger" <bernhard.gebetsberger@gmx.at>,
"Holger Kiehl" <Holger.Kiehl@dwd.de>,
"Michael Larabel" <michael@phoronix.com>,
"Jonathan McDowell" <noodles@earth.li>,
"Ken Moffat" <zarniwhoop73@googlemail.com>,
"Sebastian Reichel" <sebastian.reichel@collabora.com>,
"Darren Salt" <devspam@moreofthesa.me.uk>,
"Guenter Roeck" <linux@roeck-us.net>
Subject: [PATCH v4 6/6] hwmon: (k10temp) Add debugfs support
Date: Wed, 22 Jan 2020 08:08:00 -0800 [thread overview]
Message-ID: <20200122160800.12560-7-linux@roeck-us.net> (raw)
In-Reply-To: <20200122160800.12560-1-linux@roeck-us.net>
Show thermal and SVI registers for Family 17h CPUs.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
drivers/hwmon/k10temp.c | 78 ++++++++++++++++++++++++++++++++++++++++-
1 file changed, 77 insertions(+), 1 deletion(-)
diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
index 4a470b5195ee..5e3f43594084 100644
--- a/drivers/hwmon/k10temp.c
+++ b/drivers/hwmon/k10temp.c
@@ -26,6 +26,7 @@
*/
#include <linux/bitops.h>
+#include <linux/debugfs.h>
#include <linux/err.h>
#include <linux/hwmon.h>
#include <linux/init.h>
@@ -442,6 +443,76 @@ static bool has_erratum_319(struct pci_dev *pdev)
(boot_cpu_data.x86_model == 4 && boot_cpu_data.x86_stepping <= 2);
}
+#ifdef CONFIG_DEBUG_FS
+
+static void k10temp_smn_regs_show(struct seq_file *s, struct pci_dev *pdev,
+ u32 addr, int count)
+{
+ u32 reg;
+ int i;
+
+ for (i = 0; i < count; i++) {
+ if (!(i & 3))
+ seq_printf(s, "0x%06x: ", addr + i * 4);
+ amd_smn_read(amd_pci_dev_to_node_id(pdev), addr + i * 4, ®);
+ seq_printf(s, "%08x ", reg);
+ if ((i & 3) == 3)
+ seq_puts(s, "\n");
+ }
+}
+
+static int svi_show(struct seq_file *s, void *unused)
+{
+ struct k10temp_data *data = s->private;
+
+ k10temp_smn_regs_show(s, data->pdev, F17H_M01H_SVI, 32);
+ return 0;
+}
+DEFINE_SHOW_ATTRIBUTE(svi);
+
+static int thm_show(struct seq_file *s, void *unused)
+{
+ struct k10temp_data *data = s->private;
+
+ k10temp_smn_regs_show(s, data->pdev,
+ F17H_M01H_REPORTED_TEMP_CTRL_OFFSET, 256);
+ return 0;
+}
+DEFINE_SHOW_ATTRIBUTE(thm);
+
+static void k10temp_debugfs_cleanup(void *ddir)
+{
+ debugfs_remove_recursive(ddir);
+}
+
+static void k10temp_init_debugfs(struct k10temp_data *data)
+{
+ struct dentry *debugfs;
+ char name[32];
+
+ /* Only show debugfs data for Family 17h/18h CPUs */
+ if (!data->show_tdie)
+ return;
+
+ scnprintf(name, sizeof(name), "k10temp-%s", pci_name(data->pdev));
+
+ debugfs = debugfs_create_dir(name, NULL);
+ if (debugfs) {
+ debugfs_create_file("svi", 0444, debugfs, data, &svi_fops);
+ debugfs_create_file("thm", 0444, debugfs, data, &thm_fops);
+ devm_add_action_or_reset(&data->pdev->dev,
+ k10temp_debugfs_cleanup, debugfs);
+ }
+}
+
+#else
+
+static void k10temp_init_debugfs(struct k10temp_data *data)
+{
+}
+
+#endif
+
static const struct hwmon_channel_info *k10temp_info[] = {
HWMON_CHANNEL_INFO(temp,
HWMON_T_INPUT | HWMON_T_MAX |
@@ -553,7 +624,12 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id)
hwmon_dev = devm_hwmon_device_register_with_info(dev, "k10temp", data,
&k10temp_chip_info,
NULL);
- return PTR_ERR_OR_ZERO(hwmon_dev);
+ if (IS_ERR(hwmon_dev))
+ return PTR_ERR(hwmon_dev);
+
+ k10temp_init_debugfs(data);
+
+ return 0;
}
static const struct pci_device_id k10temp_id_table[] = {
--
2.17.1
next prev parent reply other threads:[~2020-01-22 16:08 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-22 16:07 [PATCH v4 0/6] hwmon: k10temp driver improvements Guenter Roeck
2020-01-22 16:07 ` [PATCH v4 1/6] hwmon: (k10temp) Use bitops Guenter Roeck
2020-01-22 16:07 ` [PATCH v4 2/6] hmon: (k10temp) Convert to use devm_hwmon_device_register_with_info Guenter Roeck
2020-01-22 16:07 ` [PATCH v4 3/6] hwmon: (k10temp) Report temperatures per CPU die Guenter Roeck
2020-01-22 16:07 ` [PATCH v4 4/6] hwmon: (k10temp) Show core and SoC current and voltages on Ryzen CPUs Guenter Roeck
2020-01-22 16:07 ` [PATCH v4 5/6] hwmon: (k10temp) Don't show temperature limits on Ryzen (Zen) CPUs Guenter Roeck
2020-01-22 16:08 ` Guenter Roeck [this message]
2020-01-24 0:01 ` [PATCH v4 6/6] hwmon: (k10temp) Add debugfs support Ken Moffat
2020-01-24 4:47 ` Guenter Roeck
2020-01-22 19:05 ` [PATCH v4 0/6] hwmon: k10temp driver improvements Sebastian Reichel
2020-01-22 19:37 ` Guenter Roeck
2020-01-25 17:40 ` Holger Kiehl
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=20200122160800.12560-7-linux@roeck-us.net \
--to=linux@roeck-us.net \
--cc=Holger.Kiehl@dwd.de \
--cc=bernhard.gebetsberger@gmx.at \
--cc=clemens@ladisch.de \
--cc=devspam@moreofthesa.me.uk \
--cc=jdelvare@suse.com \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lists2009@fnarfbargle.com \
--cc=michael@phoronix.com \
--cc=noodles@earth.li \
--cc=ocerman@sda1.eu \
--cc=sebastian.reichel@collabora.com \
--cc=zarniwhoop73@googlemail.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;
as well as URLs for NNTP newsgroup(s).