* [PATCH v2 1/5] platform/x86/amd/hsmp: Move per-socket sysfs attributes to common code
2026-11-16 15:51 [PATCH v2 0/5] platform/x86/amd/hsmp: Unify per-socket sysfs metrics Erwan Velu
@ 2026-11-16 15:51 ` Erwan Velu
2026-11-16 15:51 ` [PATCH v2 2/5] platform/x86/amd/hsmp: Add amd_hsmp class with per-socket devices Erwan Velu
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Erwan Velu @ 2026-11-16 15:51 UTC (permalink / raw)
To: Naveen Krishna Chatradhi, Ilpo Järvinen, Hans de Goede
Cc: Carlos Bilbao, Muralidhara M K, Suma Hegde, Muthusamy Ramalingam,
platform-driver-x86, linux-kernel, Erwan Velu
From: Erwan Velu <e.velu@criteo.com>
The per-socket telemetry attributes (c0_residency_input, ddr_max_bw,
pwr_current_active_freq_limit, ...) are implemented in acpi.c, so only
the ACPI driver can expose them, although they are plain HSMP messages
the platform driver can send as well.
Move them to a new sysfs.c in hsmp_common and export the attribute
groups as hsmp_sock_groups, so they can be shared by both drivers. The
ACPI driver keeps exposing them on its socket devices via dev_groups.
No functional change.
Assisted-by: claude-opus-5-5
Acked-by: Carlos Bilbao <carlos.bilbao@kernel.org>
Signed-off-by: Erwan Velu <e.velu@criteo.com>
---
drivers/platform/x86/amd/hsmp/Makefile | 2 +-
drivers/platform/x86/amd/hsmp/acpi.c | 331 +----------------------
drivers/platform/x86/amd/hsmp/hsmp.h | 1 +
drivers/platform/x86/amd/hsmp/sysfs.c | 348 +++++++++++++++++++++++++
4 files changed, 351 insertions(+), 331 deletions(-)
create mode 100644 drivers/platform/x86/amd/hsmp/sysfs.c
diff --git a/drivers/platform/x86/amd/hsmp/Makefile b/drivers/platform/x86/amd/hsmp/Makefile
index ce8342e71f50..21fc1d185550 100644
--- a/drivers/platform/x86/amd/hsmp/Makefile
+++ b/drivers/platform/x86/amd/hsmp/Makefile
@@ -5,7 +5,7 @@
#
obj-$(CONFIG_AMD_HSMP) += hsmp_common.o
-hsmp_common-y := hsmp.o
+hsmp_common-y := hsmp.o sysfs.o
hsmp_common-$(CONFIG_HWMON) += hwmon.o
obj-$(CONFIG_AMD_HSMP_PLAT) += amd_hsmp.o
amd_hsmp-y := plat.o
diff --git a/drivers/platform/x86/amd/hsmp/acpi.c b/drivers/platform/x86/amd/hsmp/acpi.c
index 167c76c13ad0..a1e13aff9c86 100644
--- a/drivers/platform/x86/amd/hsmp/acpi.c
+++ b/drivers/platform/x86/amd/hsmp/acpi.c
@@ -12,9 +12,6 @@
#include <asm/amd/hsmp.h>
#include <linux/acpi.h>
-#include <linux/array_size.h>
-#include <linux/bits.h>
-#include <linux/bitfield.h>
#include <linux/cleanup.h>
#include <linux/device.h>
#include <linux/dev_printk.h>
@@ -27,7 +24,6 @@
#include <linux/rwsem.h>
#include <linux/slab.h>
#include <linux/string.h>
-#include <linux/sysfs.h>
#include <linux/topology.h>
#include <linux/uuid.h>
@@ -55,11 +51,6 @@ static struct hsmp_plat_device *hsmp_pdev;
*/
static struct kref hsmp_acpi_sock_kref;
-struct hsmp_sys_attr {
- struct device_attribute dattr;
- u32 msg_id;
-};
-
static int amd_hsmp_acpi_rdwr(struct hsmp_socket *sock, u32 offset,
u32 *value, bool write)
{
@@ -270,262 +261,6 @@ static int hsmp_parse_acpi_table(struct device *dev, u16 sock_ind)
return 0;
}
-static ssize_t hsmp_metric_tbl_acpi_read(struct file *filp, struct kobject *kobj,
- const struct bin_attribute *bin_attr, char *buf,
- loff_t off, size_t count)
-{
- struct device *dev = container_of(kobj, struct device, kobj);
- struct hsmp_socket *sock = dev_get_drvdata(dev);
-
- /*
- * metrics_bin is a sysfs binary attribute and is capped at PAGE_SIZE.
- * It can therefore only carry the protocol version 6 metric table
- * (struct hsmp_metric_table). The larger tables defined from protocol
- * version 7 onwards do not fit; userspace on those systems must read
- * the snapshot through HSMP_IOCTL_GET_TELEMETRY_DATA on /dev/hsmp.
- * Surface the unsupported case here as -EOPNOTSUPP rather than
- * silently truncating the snapshot.
- */
- if (hsmp_pdev->proto_ver != HSMP_PROTO_VER6)
- return -EOPNOTSUPP;
-
- return hsmp_metric_tbl_read(sock, buf, count);
-}
-
-static umode_t hsmp_is_sock_attr_visible(struct kobject *kobj,
- const struct bin_attribute *battr, int id)
-{
- /*
- * Keep metrics_bin visible on protocol version 7 and later as well,
- * so that userspace which expects the file to exist gets a clear
- * -EOPNOTSUPP from the read handler instead of -ENOENT, and is
- * pointed at HSMP_IOCTL_GET_TELEMETRY_DATA as the supported path.
- * Hide metrics_bin on client platforms.
- */
- if (!is_client_platform() && hsmp_pdev->proto_ver >= HSMP_PROTO_VER6)
- return battr->attr.mode;
-
- return 0;
-}
-
-/* Defined below by HSMP_DEV_ATTR() */
-static struct hsmp_sys_attr hattr_smu_fw_version;
-static struct hsmp_sys_attr hattr_protocol_version;
-
-static umode_t hsmp_is_sock_dev_attr_visible(struct kobject *kobj,
- struct attribute *attr, int id)
-{
- /* Hide every attribute except smu_fw_version and protocol_version on client platforms */
- if (is_client_platform() && attr != &hattr_smu_fw_version.dattr.attr &&
- attr != &hattr_protocol_version.dattr.attr)
- return 0;
-
- return attr->mode;
-}
-
-#define to_hsmp_sys_attr(_attr) container_of(_attr, struct hsmp_sys_attr, dattr)
-
-static ssize_t hsmp_msg_resp32_show(struct device *dev, struct device_attribute *attr,
- char *buf)
-{
- struct hsmp_sys_attr *hattr = to_hsmp_sys_attr(attr);
- struct hsmp_socket *sock = dev_get_drvdata(dev);
- u32 data;
- int ret;
-
- ret = hsmp_msg_get_nargs(sock->sock_ind, hattr->msg_id, &data, 1);
- if (ret)
- return ret;
-
- return sysfs_emit(buf, "%u\n", data);
-}
-
-#define DDR_MAX_BW_MASK GENMASK(31, 20)
-#define DDR_UTIL_BW_MASK GENMASK(19, 8)
-#define DDR_UTIL_BW_PERC_MASK GENMASK(7, 0)
-#define FW_VER_MAJOR_MASK GENMASK(23, 16)
-#define FW_VER_MINOR_MASK GENMASK(15, 8)
-#define FW_VER_DEBUG_MASK GENMASK(7, 0)
-#define FMAX_MASK GENMASK(31, 16)
-#define FMIN_MASK GENMASK(15, 0)
-#define FREQ_LIMIT_MASK GENMASK(31, 16)
-#define FREQ_SRC_IND_MASK GENMASK(15, 0)
-
-static ssize_t hsmp_ddr_max_bw_show(struct device *dev, struct device_attribute *attr,
- char *buf)
-{
- struct hsmp_sys_attr *hattr = to_hsmp_sys_attr(attr);
- struct hsmp_socket *sock = dev_get_drvdata(dev);
- u32 data;
- int ret;
-
- ret = hsmp_msg_get_nargs(sock->sock_ind, hattr->msg_id, &data, 1);
- if (ret)
- return ret;
-
- return sysfs_emit(buf, "%lu\n", FIELD_GET(DDR_MAX_BW_MASK, data));
-}
-
-static ssize_t hsmp_ddr_util_bw_show(struct device *dev, struct device_attribute *attr,
- char *buf)
-{
- struct hsmp_sys_attr *hattr = to_hsmp_sys_attr(attr);
- struct hsmp_socket *sock = dev_get_drvdata(dev);
- u32 data;
- int ret;
-
- ret = hsmp_msg_get_nargs(sock->sock_ind, hattr->msg_id, &data, 1);
- if (ret)
- return ret;
-
- return sysfs_emit(buf, "%lu\n", FIELD_GET(DDR_UTIL_BW_MASK, data));
-}
-
-static ssize_t hsmp_ddr_util_bw_perc_show(struct device *dev, struct device_attribute *attr,
- char *buf)
-{
- struct hsmp_sys_attr *hattr = to_hsmp_sys_attr(attr);
- struct hsmp_socket *sock = dev_get_drvdata(dev);
- u32 data;
- int ret;
-
- ret = hsmp_msg_get_nargs(sock->sock_ind, hattr->msg_id, &data, 1);
- if (ret)
- return ret;
-
- return sysfs_emit(buf, "%lu\n", FIELD_GET(DDR_UTIL_BW_PERC_MASK, data));
-}
-
-static ssize_t hsmp_msg_fw_ver_show(struct device *dev, struct device_attribute *attr,
- char *buf)
-{
- struct hsmp_sys_attr *hattr = to_hsmp_sys_attr(attr);
- struct hsmp_socket *sock = dev_get_drvdata(dev);
- u32 data;
- int ret;
-
- ret = hsmp_msg_get_nargs(sock->sock_ind, hattr->msg_id, &data, 1);
- if (ret)
- return ret;
-
- return sysfs_emit(buf, "%lu.%lu.%lu\n",
- FIELD_GET(FW_VER_MAJOR_MASK, data),
- FIELD_GET(FW_VER_MINOR_MASK, data),
- FIELD_GET(FW_VER_DEBUG_MASK, data));
-}
-
-static ssize_t hsmp_fclk_show(struct device *dev, struct device_attribute *attr,
- char *buf)
-{
- struct hsmp_sys_attr *hattr = to_hsmp_sys_attr(attr);
- struct hsmp_socket *sock = dev_get_drvdata(dev);
- u32 data[2];
- int ret;
-
- ret = hsmp_msg_get_nargs(sock->sock_ind, hattr->msg_id, data, 2);
- if (ret)
- return ret;
-
- return sysfs_emit(buf, "%u\n", data[0]);
-}
-
-static ssize_t hsmp_mclk_show(struct device *dev, struct device_attribute *attr,
- char *buf)
-{
- struct hsmp_sys_attr *hattr = to_hsmp_sys_attr(attr);
- struct hsmp_socket *sock = dev_get_drvdata(dev);
- u32 data[2];
- int ret;
-
- ret = hsmp_msg_get_nargs(sock->sock_ind, hattr->msg_id, data, 2);
- if (ret)
- return ret;
-
- return sysfs_emit(buf, "%u\n", data[1]);
-}
-
-static ssize_t hsmp_clk_fmax_show(struct device *dev, struct device_attribute *attr,
- char *buf)
-{
- struct hsmp_sys_attr *hattr = to_hsmp_sys_attr(attr);
- struct hsmp_socket *sock = dev_get_drvdata(dev);
- u32 data;
- int ret;
-
- ret = hsmp_msg_get_nargs(sock->sock_ind, hattr->msg_id, &data, 1);
- if (ret)
- return ret;
-
- return sysfs_emit(buf, "%lu\n", FIELD_GET(FMAX_MASK, data));
-}
-
-static ssize_t hsmp_clk_fmin_show(struct device *dev, struct device_attribute *attr,
- char *buf)
-{
- struct hsmp_sys_attr *hattr = to_hsmp_sys_attr(attr);
- struct hsmp_socket *sock = dev_get_drvdata(dev);
- u32 data;
- int ret;
-
- ret = hsmp_msg_get_nargs(sock->sock_ind, hattr->msg_id, &data, 1);
- if (ret)
- return ret;
-
- return sysfs_emit(buf, "%lu\n", FIELD_GET(FMIN_MASK, data));
-}
-
-static ssize_t hsmp_freq_limit_show(struct device *dev, struct device_attribute *attr,
- char *buf)
-{
- struct hsmp_sys_attr *hattr = to_hsmp_sys_attr(attr);
- struct hsmp_socket *sock = dev_get_drvdata(dev);
- u32 data;
- int ret;
-
- ret = hsmp_msg_get_nargs(sock->sock_ind, hattr->msg_id, &data, 1);
- if (ret)
- return ret;
-
- return sysfs_emit(buf, "%lu\n", FIELD_GET(FREQ_LIMIT_MASK, data));
-}
-
-static const char * const freqlimit_srcnames[] = {
- "cHTC-Active",
- "PROCHOT",
- "TDC limit",
- "PPT Limit",
- "OPN Max",
- "Reliability Limit",
- "APML Agent",
- "HSMP Agent",
-};
-
-static ssize_t hsmp_freq_limit_source_show(struct device *dev, struct device_attribute *attr,
- char *buf)
-{
- struct hsmp_sys_attr *hattr = to_hsmp_sys_attr(attr);
- struct hsmp_socket *sock = dev_get_drvdata(dev);
- unsigned int index;
- int len = 0;
- u16 src_ind;
- u32 data;
- int ret;
-
- ret = hsmp_msg_get_nargs(sock->sock_ind, hattr->msg_id, &data, 1);
- if (ret)
- return ret;
-
- src_ind = FIELD_GET(FREQ_SRC_IND_MASK, data);
- for (index = 0; index < ARRAY_SIZE(freqlimit_srcnames); index++) {
- if (!src_ind)
- break;
- if (src_ind & 1)
- len += sysfs_emit_at(buf, len, "%s\n", freqlimit_srcnames[index]);
- src_ind >>= 1;
- }
- return len;
-}
-
/*
* Bring up one ACPI HSMP socket: parse its ACPI table, run the mailbox
* handshake and register its sysfs/hwmon interfaces.
@@ -593,70 +328,6 @@ static int init_acpi(struct device *dev)
return 0;
}
-static const struct bin_attribute hsmp_metric_tbl_attr = {
- .attr = { .name = HSMP_METRICS_TABLE_NAME, .mode = 0444},
- .read = hsmp_metric_tbl_acpi_read,
- .size = sizeof(struct hsmp_metric_table),
-};
-
-static const struct bin_attribute *hsmp_attr_list[] = {
- &hsmp_metric_tbl_attr,
- NULL
-};
-
-#define HSMP_DEV_ATTR(_name, _msg_id, _show, _mode) \
-static struct hsmp_sys_attr hattr_##_name = { \
- .dattr = __ATTR(_name, _mode, _show, NULL), \
- .msg_id = _msg_id, \
-}
-
-HSMP_DEV_ATTR(c0_residency_input, HSMP_GET_C0_PERCENT, hsmp_msg_resp32_show, 0444);
-HSMP_DEV_ATTR(prochot_status, HSMP_GET_PROC_HOT, hsmp_msg_resp32_show, 0444);
-HSMP_DEV_ATTR(smu_fw_version, HSMP_GET_SMU_VER, hsmp_msg_fw_ver_show, 0444);
-HSMP_DEV_ATTR(protocol_version, HSMP_GET_PROTO_VER, hsmp_msg_resp32_show, 0444);
-HSMP_DEV_ATTR(cclk_freq_limit_input, HSMP_GET_CCLK_THROTTLE_LIMIT, hsmp_msg_resp32_show, 0444);
-HSMP_DEV_ATTR(ddr_max_bw, HSMP_GET_DDR_BANDWIDTH, hsmp_ddr_max_bw_show, 0444);
-HSMP_DEV_ATTR(ddr_utilised_bw_input, HSMP_GET_DDR_BANDWIDTH, hsmp_ddr_util_bw_show, 0444);
-HSMP_DEV_ATTR(ddr_utilised_bw_perc_input, HSMP_GET_DDR_BANDWIDTH, hsmp_ddr_util_bw_perc_show, 0444);
-HSMP_DEV_ATTR(fclk_input, HSMP_GET_FCLK_MCLK, hsmp_fclk_show, 0444);
-HSMP_DEV_ATTR(mclk_input, HSMP_GET_FCLK_MCLK, hsmp_mclk_show, 0444);
-HSMP_DEV_ATTR(clk_fmax, HSMP_GET_SOCKET_FMAX_FMIN, hsmp_clk_fmax_show, 0444);
-HSMP_DEV_ATTR(clk_fmin, HSMP_GET_SOCKET_FMAX_FMIN, hsmp_clk_fmin_show, 0444);
-HSMP_DEV_ATTR(pwr_current_active_freq_limit, HSMP_GET_SOCKET_FREQ_LIMIT,
- hsmp_freq_limit_show, 0444);
-HSMP_DEV_ATTR(pwr_current_active_freq_limit_source, HSMP_GET_SOCKET_FREQ_LIMIT,
- hsmp_freq_limit_source_show, 0444);
-
-static struct attribute *hsmp_dev_attr_list[] = {
- &hattr_c0_residency_input.dattr.attr,
- &hattr_prochot_status.dattr.attr,
- &hattr_smu_fw_version.dattr.attr,
- &hattr_protocol_version.dattr.attr,
- &hattr_cclk_freq_limit_input.dattr.attr,
- &hattr_ddr_max_bw.dattr.attr,
- &hattr_ddr_utilised_bw_input.dattr.attr,
- &hattr_ddr_utilised_bw_perc_input.dattr.attr,
- &hattr_fclk_input.dattr.attr,
- &hattr_mclk_input.dattr.attr,
- &hattr_clk_fmax.dattr.attr,
- &hattr_clk_fmin.dattr.attr,
- &hattr_pwr_current_active_freq_limit.dattr.attr,
- &hattr_pwr_current_active_freq_limit_source.dattr.attr,
- NULL
-};
-
-static const struct attribute_group hsmp_attr_grp = {
- .bin_attrs = hsmp_attr_list,
- .attrs = hsmp_dev_attr_list,
- .is_bin_visible = hsmp_is_sock_attr_visible,
- .is_visible = hsmp_is_sock_dev_attr_visible,
-};
-
-static const struct attribute_group *hsmp_groups[] = {
- &hsmp_attr_grp,
- NULL
-};
-
static const struct acpi_device_id amd_hsmp_acpi_ids[] = {
{ACPI_HSMP_DEVICE_HID, 0},
{}
@@ -814,7 +485,7 @@ static struct platform_driver amd_hsmp_driver = {
.driver = {
.name = DRIVER_NAME,
.acpi_match_table = amd_hsmp_acpi_ids,
- .dev_groups = hsmp_groups,
+ .dev_groups = hsmp_sock_groups,
},
};
diff --git a/drivers/platform/x86/amd/hsmp/hsmp.h b/drivers/platform/x86/amd/hsmp/hsmp.h
index 3302c1517369..7a0e3af67691 100644
--- a/drivers/platform/x86/amd/hsmp/hsmp.h
+++ b/drivers/platform/x86/amd/hsmp/hsmp.h
@@ -104,6 +104,7 @@ int hsmp_create_sensor(struct device *dev, u16 sock_ind);
static inline int hsmp_create_sensor(struct device *dev, u16 sock_ind) { return 0; }
#endif
int hsmp_msg_get_nargs(u16 sock_ind, u32 msg_id, u32 *data, u8 num_args);
+extern const struct attribute_group *hsmp_sock_groups[];
/*
* Gates the HSMP data plane: hsmp_send_message() takes it for read; probe and
diff --git a/drivers/platform/x86/amd/hsmp/sysfs.c b/drivers/platform/x86/amd/hsmp/sysfs.c
new file mode 100644
index 000000000000..06c0a5a02ca2
--- /dev/null
+++ b/drivers/platform/x86/amd/hsmp/sysfs.c
@@ -0,0 +1,348 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * AMD HSMP sysfs support
+ * Copyright (c) 2024, AMD.
+ * All Rights Reserved.
+ *
+ * This file provides the per-socket sysfs attributes of the HSMP interface.
+ */
+
+#include <asm/amd/hsmp.h>
+
+#include <linux/array_size.h>
+#include <linux/bitfield.h>
+#include <linux/bits.h>
+#include <linux/device.h>
+#include <linux/sysfs.h>
+
+#include "hsmp.h"
+
+struct hsmp_sys_attr {
+ struct device_attribute dattr;
+ u32 msg_id;
+};
+
+static ssize_t hsmp_metric_tbl_acpi_read(struct file *filp, struct kobject *kobj,
+ const struct bin_attribute *bin_attr, char *buf,
+ loff_t off, size_t count)
+{
+ struct device *dev = container_of(kobj, struct device, kobj);
+ struct hsmp_socket *sock = dev_get_drvdata(dev);
+
+ /*
+ * metrics_bin is a sysfs binary attribute and is capped at PAGE_SIZE.
+ * It can therefore only carry the protocol version 6 metric table
+ * (struct hsmp_metric_table). The larger tables defined from protocol
+ * version 7 onwards do not fit; userspace on those systems must read
+ * the snapshot through HSMP_IOCTL_GET_TELEMETRY_DATA on /dev/hsmp.
+ * Surface the unsupported case here as -EOPNOTSUPP rather than
+ * silently truncating the snapshot.
+ */
+ if (get_hsmp_pdev()->proto_ver != HSMP_PROTO_VER6)
+ return -EOPNOTSUPP;
+
+ return hsmp_metric_tbl_read(sock, buf, count);
+}
+
+static umode_t hsmp_is_sock_attr_visible(struct kobject *kobj,
+ const struct bin_attribute *battr, int id)
+{
+ /*
+ * Keep metrics_bin visible on protocol version 7 and later as well,
+ * so that userspace which expects the file to exist gets a clear
+ * -EOPNOTSUPP from the read handler instead of -ENOENT, and is
+ * pointed at HSMP_IOCTL_GET_TELEMETRY_DATA as the supported path.
+ * Hide metrics_bin on client platforms.
+ */
+ if (!is_client_platform() && get_hsmp_pdev()->proto_ver >= HSMP_PROTO_VER6)
+ return battr->attr.mode;
+
+ return 0;
+}
+
+/* Defined below by HSMP_DEV_ATTR() */
+static struct hsmp_sys_attr hattr_smu_fw_version;
+static struct hsmp_sys_attr hattr_protocol_version;
+
+static umode_t hsmp_is_sock_dev_attr_visible(struct kobject *kobj,
+ struct attribute *attr, int id)
+{
+ /* Hide every attribute except smu_fw_version and protocol_version on client platforms */
+ if (is_client_platform() && attr != &hattr_smu_fw_version.dattr.attr &&
+ attr != &hattr_protocol_version.dattr.attr)
+ return 0;
+
+ return attr->mode;
+}
+
+#define to_hsmp_sys_attr(_attr) container_of(_attr, struct hsmp_sys_attr, dattr)
+
+static ssize_t hsmp_msg_resp32_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ struct hsmp_sys_attr *hattr = to_hsmp_sys_attr(attr);
+ struct hsmp_socket *sock = dev_get_drvdata(dev);
+ u32 data;
+ int ret;
+
+ ret = hsmp_msg_get_nargs(sock->sock_ind, hattr->msg_id, &data, 1);
+ if (ret)
+ return ret;
+
+ return sysfs_emit(buf, "%u\n", data);
+}
+
+#define DDR_MAX_BW_MASK GENMASK(31, 20)
+#define DDR_UTIL_BW_MASK GENMASK(19, 8)
+#define DDR_UTIL_BW_PERC_MASK GENMASK(7, 0)
+#define FW_VER_MAJOR_MASK GENMASK(23, 16)
+#define FW_VER_MINOR_MASK GENMASK(15, 8)
+#define FW_VER_DEBUG_MASK GENMASK(7, 0)
+#define FMAX_MASK GENMASK(31, 16)
+#define FMIN_MASK GENMASK(15, 0)
+#define FREQ_LIMIT_MASK GENMASK(31, 16)
+#define FREQ_SRC_IND_MASK GENMASK(15, 0)
+
+static ssize_t hsmp_ddr_max_bw_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ struct hsmp_sys_attr *hattr = to_hsmp_sys_attr(attr);
+ struct hsmp_socket *sock = dev_get_drvdata(dev);
+ u32 data;
+ int ret;
+
+ ret = hsmp_msg_get_nargs(sock->sock_ind, hattr->msg_id, &data, 1);
+ if (ret)
+ return ret;
+
+ return sysfs_emit(buf, "%lu\n", FIELD_GET(DDR_MAX_BW_MASK, data));
+}
+
+static ssize_t hsmp_ddr_util_bw_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ struct hsmp_sys_attr *hattr = to_hsmp_sys_attr(attr);
+ struct hsmp_socket *sock = dev_get_drvdata(dev);
+ u32 data;
+ int ret;
+
+ ret = hsmp_msg_get_nargs(sock->sock_ind, hattr->msg_id, &data, 1);
+ if (ret)
+ return ret;
+
+ return sysfs_emit(buf, "%lu\n", FIELD_GET(DDR_UTIL_BW_MASK, data));
+}
+
+static ssize_t hsmp_ddr_util_bw_perc_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ struct hsmp_sys_attr *hattr = to_hsmp_sys_attr(attr);
+ struct hsmp_socket *sock = dev_get_drvdata(dev);
+ u32 data;
+ int ret;
+
+ ret = hsmp_msg_get_nargs(sock->sock_ind, hattr->msg_id, &data, 1);
+ if (ret)
+ return ret;
+
+ return sysfs_emit(buf, "%lu\n", FIELD_GET(DDR_UTIL_BW_PERC_MASK, data));
+}
+
+static ssize_t hsmp_msg_fw_ver_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ struct hsmp_sys_attr *hattr = to_hsmp_sys_attr(attr);
+ struct hsmp_socket *sock = dev_get_drvdata(dev);
+ u32 data;
+ int ret;
+
+ ret = hsmp_msg_get_nargs(sock->sock_ind, hattr->msg_id, &data, 1);
+ if (ret)
+ return ret;
+
+ return sysfs_emit(buf, "%lu.%lu.%lu\n",
+ FIELD_GET(FW_VER_MAJOR_MASK, data),
+ FIELD_GET(FW_VER_MINOR_MASK, data),
+ FIELD_GET(FW_VER_DEBUG_MASK, data));
+}
+
+static ssize_t hsmp_fclk_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ struct hsmp_sys_attr *hattr = to_hsmp_sys_attr(attr);
+ struct hsmp_socket *sock = dev_get_drvdata(dev);
+ u32 data[2];
+ int ret;
+
+ ret = hsmp_msg_get_nargs(sock->sock_ind, hattr->msg_id, data, 2);
+ if (ret)
+ return ret;
+
+ return sysfs_emit(buf, "%u\n", data[0]);
+}
+
+static ssize_t hsmp_mclk_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ struct hsmp_sys_attr *hattr = to_hsmp_sys_attr(attr);
+ struct hsmp_socket *sock = dev_get_drvdata(dev);
+ u32 data[2];
+ int ret;
+
+ ret = hsmp_msg_get_nargs(sock->sock_ind, hattr->msg_id, data, 2);
+ if (ret)
+ return ret;
+
+ return sysfs_emit(buf, "%u\n", data[1]);
+}
+
+static ssize_t hsmp_clk_fmax_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ struct hsmp_sys_attr *hattr = to_hsmp_sys_attr(attr);
+ struct hsmp_socket *sock = dev_get_drvdata(dev);
+ u32 data;
+ int ret;
+
+ ret = hsmp_msg_get_nargs(sock->sock_ind, hattr->msg_id, &data, 1);
+ if (ret)
+ return ret;
+
+ return sysfs_emit(buf, "%lu\n", FIELD_GET(FMAX_MASK, data));
+}
+
+static ssize_t hsmp_clk_fmin_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ struct hsmp_sys_attr *hattr = to_hsmp_sys_attr(attr);
+ struct hsmp_socket *sock = dev_get_drvdata(dev);
+ u32 data;
+ int ret;
+
+ ret = hsmp_msg_get_nargs(sock->sock_ind, hattr->msg_id, &data, 1);
+ if (ret)
+ return ret;
+
+ return sysfs_emit(buf, "%lu\n", FIELD_GET(FMIN_MASK, data));
+}
+
+static ssize_t hsmp_freq_limit_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ struct hsmp_sys_attr *hattr = to_hsmp_sys_attr(attr);
+ struct hsmp_socket *sock = dev_get_drvdata(dev);
+ u32 data;
+ int ret;
+
+ ret = hsmp_msg_get_nargs(sock->sock_ind, hattr->msg_id, &data, 1);
+ if (ret)
+ return ret;
+
+ return sysfs_emit(buf, "%lu\n", FIELD_GET(FREQ_LIMIT_MASK, data));
+}
+
+static const char * const freqlimit_srcnames[] = {
+ "cHTC-Active",
+ "PROCHOT",
+ "TDC limit",
+ "PPT Limit",
+ "OPN Max",
+ "Reliability Limit",
+ "APML Agent",
+ "HSMP Agent",
+};
+
+static ssize_t hsmp_freq_limit_source_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ struct hsmp_sys_attr *hattr = to_hsmp_sys_attr(attr);
+ struct hsmp_socket *sock = dev_get_drvdata(dev);
+ unsigned int index;
+ int len = 0;
+ u16 src_ind;
+ u32 data;
+ int ret;
+
+ ret = hsmp_msg_get_nargs(sock->sock_ind, hattr->msg_id, &data, 1);
+ if (ret)
+ return ret;
+
+ src_ind = FIELD_GET(FREQ_SRC_IND_MASK, data);
+ for (index = 0; index < ARRAY_SIZE(freqlimit_srcnames); index++) {
+ if (!src_ind)
+ break;
+ if (src_ind & 1)
+ len += sysfs_emit_at(buf, len, "%s\n", freqlimit_srcnames[index]);
+ src_ind >>= 1;
+ }
+ return len;
+}
+
+static const struct bin_attribute hsmp_metric_tbl_attr = {
+ .attr = { .name = HSMP_METRICS_TABLE_NAME, .mode = 0444},
+ .read = hsmp_metric_tbl_acpi_read,
+ .size = sizeof(struct hsmp_metric_table),
+};
+
+static const struct bin_attribute *hsmp_attr_list[] = {
+ &hsmp_metric_tbl_attr,
+ NULL
+};
+
+#define HSMP_DEV_ATTR(_name, _msg_id, _show, _mode) \
+static struct hsmp_sys_attr hattr_##_name = { \
+ .dattr = __ATTR(_name, _mode, _show, NULL), \
+ .msg_id = _msg_id, \
+}
+
+HSMP_DEV_ATTR(c0_residency_input, HSMP_GET_C0_PERCENT, hsmp_msg_resp32_show, 0444);
+HSMP_DEV_ATTR(prochot_status, HSMP_GET_PROC_HOT, hsmp_msg_resp32_show, 0444);
+HSMP_DEV_ATTR(smu_fw_version, HSMP_GET_SMU_VER, hsmp_msg_fw_ver_show, 0444);
+HSMP_DEV_ATTR(protocol_version, HSMP_GET_PROTO_VER, hsmp_msg_resp32_show, 0444);
+HSMP_DEV_ATTR(cclk_freq_limit_input, HSMP_GET_CCLK_THROTTLE_LIMIT, hsmp_msg_resp32_show, 0444);
+HSMP_DEV_ATTR(ddr_max_bw, HSMP_GET_DDR_BANDWIDTH, hsmp_ddr_max_bw_show, 0444);
+HSMP_DEV_ATTR(ddr_utilised_bw_input, HSMP_GET_DDR_BANDWIDTH, hsmp_ddr_util_bw_show, 0444);
+HSMP_DEV_ATTR(ddr_utilised_bw_perc_input, HSMP_GET_DDR_BANDWIDTH, hsmp_ddr_util_bw_perc_show, 0444);
+HSMP_DEV_ATTR(fclk_input, HSMP_GET_FCLK_MCLK, hsmp_fclk_show, 0444);
+HSMP_DEV_ATTR(mclk_input, HSMP_GET_FCLK_MCLK, hsmp_mclk_show, 0444);
+HSMP_DEV_ATTR(clk_fmax, HSMP_GET_SOCKET_FMAX_FMIN, hsmp_clk_fmax_show, 0444);
+HSMP_DEV_ATTR(clk_fmin, HSMP_GET_SOCKET_FMAX_FMIN, hsmp_clk_fmin_show, 0444);
+HSMP_DEV_ATTR(pwr_current_active_freq_limit, HSMP_GET_SOCKET_FREQ_LIMIT,
+ hsmp_freq_limit_show, 0444);
+HSMP_DEV_ATTR(pwr_current_active_freq_limit_source, HSMP_GET_SOCKET_FREQ_LIMIT,
+ hsmp_freq_limit_source_show, 0444);
+
+static struct attribute *hsmp_dev_attr_list[] = {
+ &hattr_c0_residency_input.dattr.attr,
+ &hattr_prochot_status.dattr.attr,
+ &hattr_smu_fw_version.dattr.attr,
+ &hattr_protocol_version.dattr.attr,
+ &hattr_cclk_freq_limit_input.dattr.attr,
+ &hattr_ddr_max_bw.dattr.attr,
+ &hattr_ddr_utilised_bw_input.dattr.attr,
+ &hattr_ddr_utilised_bw_perc_input.dattr.attr,
+ &hattr_fclk_input.dattr.attr,
+ &hattr_mclk_input.dattr.attr,
+ &hattr_clk_fmax.dattr.attr,
+ &hattr_clk_fmin.dattr.attr,
+ &hattr_pwr_current_active_freq_limit.dattr.attr,
+ &hattr_pwr_current_active_freq_limit_source.dattr.attr,
+ NULL
+};
+
+static const struct attribute_group hsmp_attr_grp = {
+ .bin_attrs = hsmp_attr_list,
+ .attrs = hsmp_dev_attr_list,
+ .is_bin_visible = hsmp_is_sock_attr_visible,
+ .is_visible = hsmp_is_sock_dev_attr_visible,
+};
+
+/*
+ * Per-socket attribute groups. Every show/read handler expects the drvdata of
+ * the device carrying the group to be the struct hsmp_socket it reports on.
+ */
+const struct attribute_group *hsmp_sock_groups[] = {
+ &hsmp_attr_grp,
+ NULL
+};
+EXPORT_SYMBOL_NS_GPL(hsmp_sock_groups, "AMD_HSMP");
base-commit: aebb7274476403040d582c61478df8f4a7bf9cd3
--
2.53.0
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v2 3/5] platform/x86/amd/hsmp: Expose socket attributes from the platform driver
2026-11-16 15:51 [PATCH v2 0/5] platform/x86/amd/hsmp: Unify per-socket sysfs metrics Erwan Velu
2026-11-16 15:51 ` [PATCH v2 1/5] platform/x86/amd/hsmp: Move per-socket sysfs attributes to common code Erwan Velu
2026-11-16 15:51 ` [PATCH v2 2/5] platform/x86/amd/hsmp: Add amd_hsmp class with per-socket devices Erwan Velu
@ 2026-11-16 15:51 ` Erwan Velu
2026-11-16 15:51 ` [PATCH v2 4/5] platform/x86/amd/hsmp: Add pwr_current_active_freq_limit_source_raw Erwan Velu
2026-11-16 15:51 ` [PATCH v2 5/5] Documentation/ABI: Add sysfs-class-amd_hsmp Erwan Velu
4 siblings, 0 replies; 6+ messages in thread
From: Erwan Velu @ 2026-11-16 15:51 UTC (permalink / raw)
To: Naveen Krishna Chatradhi, Ilpo Järvinen, Hans de Goede
Cc: Carlos Bilbao, Muralidhara M K, Suma Hegde, Muthusamy Ramalingam,
platform-driver-x86, linux-kernel, Erwan Velu
From: Erwan Velu <e.velu@criteo.com>
The platform driver creates bare socketN attribute groups on the
amd_hsmp platform device, which only hold metrics_bin. On systems
without the HSMP ACPI object, attributes such as
pwr_current_active_freq_limit are therefore missing, although the
driver can send the same HSMP messages as the ACPI one.
Register the amd_hsmp class socketN devices from the platform driver,
as children of the amd_hsmp platform device, and drop the socketN
attribute groups they replace. The socket devices carry
hsmp_sock_groups, metrics_bin included, so all the per-socket
attributes are now available under /sys/class/amd_hsmp/socketN/.
As class devices, they are placed by the driver core in an amd_hsmp
glue directory below their parent, i.e. in
/sys/devices/platform/amd_hsmp/amd_hsmp/socketN/. To keep the existing
/sys/devices/platform/amd_hsmp/socketN/metrics_bin path working, add a
socketN symlink from the platform device to each socket device.
As the socket devices and their symlinks are now the only way
metrics_bin is exposed, failing to create one fails the probe. They are
torn down by a devres action added after hsmp_pltdrv_release(), so they
are gone before the socket array they reference is released.
Systems running HSMP protocol version 7 or later with the platform
driver (Family 1Ah model 0x00-0x0F without the HSMP ACPI object) now
see metrics_bin, as with the ACPI driver: reads return -EOPNOTSUPP and
point userspace to HSMP_IOCTL_GET_TELEMETRY_DATA, as the version 7
table does not fit in a sysfs binary attribute. It used to be hidden
there.
On a single socket Zen4 (Family 19h) server probed by the platform
driver, this gives:
$ ls -l /sys/devices/platform/amd_hsmp/
drwxr-xr-x amd_hsmp
...
lrwxrwxrwx socket0 -> amd_hsmp/socket0
$ ls -l /sys/class/amd_hsmp/
socket0 -> ../../devices/platform/amd_hsmp/amd_hsmp/socket0
$ cat /sys/class/amd_hsmp/socket0/pwr_current_active_freq_limit
3100
This system runs HSMP protocol version 5, so metrics_bin is not
visible, as before this change.
Assisted-by: claude-opus-5-5
Signed-off-by: Erwan Velu <e.velu@criteo.com>
---
Documentation/arch/x86/amd_hsmp.rst | 8 +-
drivers/platform/x86/amd/hsmp/plat.c | 155 +++++++++++----------------
2 files changed, 67 insertions(+), 96 deletions(-)
diff --git a/Documentation/arch/x86/amd_hsmp.rst b/Documentation/arch/x86/amd_hsmp.rst
index f145ea12af99..c4459a9dddc6 100644
--- a/Documentation/arch/x86/amd_hsmp.rst
+++ b/Documentation/arch/x86/amd_hsmp.rst
@@ -75,14 +75,18 @@ e.g. /sys/devices/platform/AMDI0097:00/amd_hsmp/socket0/. For backward
compatibility, the files are also available directly under
/sys/devices/platform/AMDI0097:0X/.
+With the plat driver, the socket devices are children of the amd_hsmp
+platform device, i.e. /sys/devices/platform/amd_hsmp/amd_hsmp/socket%d/.
+For backward compatibility, /sys/devices/platform/amd_hsmp/socket%d is a
+symlink to it.
+
1. Metrics table binary sysfs
AMD MI300A MCM provides GET_METRICS_TABLE message to retrieve
most of the system management information from SMU in one go.
The metrics table is made available as hexadecimal sysfs binary file
-under per socket sysfs directory created at
-/sys/devices/platform/amd_hsmp/socket%d/metrics_bin
+/sys/class/amd_hsmp/socket%d/metrics_bin
Note: lseek() is not supported as entire metrics table is read.
diff --git a/drivers/platform/x86/amd/hsmp/plat.c b/drivers/platform/x86/amd/hsmp/plat.c
index c3dc7c9f45ac..edcfe82aab2a 100644
--- a/drivers/platform/x86/amd/hsmp/plat.c
+++ b/drivers/platform/x86/amd/hsmp/plat.c
@@ -12,7 +12,6 @@
#include <asm/amd/hsmp.h>
#include <linux/acpi.h>
-#include <linux/build_bug.h>
#include <linux/cleanup.h>
#include <linux/device.h>
#include <linux/dev_printk.h>
@@ -48,98 +47,6 @@ static int amd_hsmp_pci_rdwr(struct hsmp_socket *sock, u32 offset,
return amd_smn_hsmp_rdwr(sock->sock_ind, sock->mbinfo.base_addr + offset, value, write);
}
-static ssize_t hsmp_metric_tbl_plat_read(struct file *filp, struct kobject *kobj,
- const struct bin_attribute *bin_attr, char *buf,
- loff_t off, size_t count)
-{
- struct hsmp_socket *sock;
- u16 sock_ind;
-
- sock_ind = (uintptr_t)bin_attr->private;
- if (sock_ind >= hsmp_pdev->num_sockets)
- return -EINVAL;
-
- sock = &hsmp_pdev->sock[sock_ind];
-
- return hsmp_metric_tbl_read(sock, buf, count);
-}
-
-static umode_t hsmp_is_sock_attr_visible(struct kobject *kobj,
- const struct bin_attribute *battr, int id)
-{
- u16 sock_ind;
-
- sock_ind = (uintptr_t)battr->private;
-
- if (id == 0 && sock_ind >= hsmp_pdev->num_sockets)
- return SYSFS_GROUP_INVISIBLE;
-
- if (hsmp_pdev->proto_ver == HSMP_PROTO_VER6)
- return battr->attr.mode;
-
- return 0;
-}
-
-/*
- * AMD supports maximum of 8 sockets in a system.
- * Static array of 8 + 1(for NULL) elements is created below
- * to create sysfs groups for sockets.
- * is_bin_visible function is used to show / hide the necessary groups.
- *
- * Validate the maximum number against MAX_AMD_NUM_NODES. If this changes,
- * then the attributes and groups below must be adjusted.
- */
-static_assert(MAX_AMD_NUM_NODES == 8);
-
-#define HSMP_BIN_ATTR(index, _list) \
-static const struct bin_attribute attr##index = { \
- .attr = { .name = HSMP_METRICS_TABLE_NAME, .mode = 0444}, \
- .private = (void *)index, \
- .read = hsmp_metric_tbl_plat_read, \
- .size = sizeof(struct hsmp_metric_table), \
-}; \
-static const struct bin_attribute _list[] = { \
- &attr##index, \
- NULL \
-}
-
-HSMP_BIN_ATTR(0, *sock0_attr_list);
-HSMP_BIN_ATTR(1, *sock1_attr_list);
-HSMP_BIN_ATTR(2, *sock2_attr_list);
-HSMP_BIN_ATTR(3, *sock3_attr_list);
-HSMP_BIN_ATTR(4, *sock4_attr_list);
-HSMP_BIN_ATTR(5, *sock5_attr_list);
-HSMP_BIN_ATTR(6, *sock6_attr_list);
-HSMP_BIN_ATTR(7, *sock7_attr_list);
-
-#define HSMP_BIN_ATTR_GRP(index, _list, _name) \
-static const struct attribute_group sock##index##_attr_grp = { \
- .bin_attrs = _list, \
- .is_bin_visible = hsmp_is_sock_attr_visible, \
- .name = #_name, \
-}
-
-HSMP_BIN_ATTR_GRP(0, sock0_attr_list, socket0);
-HSMP_BIN_ATTR_GRP(1, sock1_attr_list, socket1);
-HSMP_BIN_ATTR_GRP(2, sock2_attr_list, socket2);
-HSMP_BIN_ATTR_GRP(3, sock3_attr_list, socket3);
-HSMP_BIN_ATTR_GRP(4, sock4_attr_list, socket4);
-HSMP_BIN_ATTR_GRP(5, sock5_attr_list, socket5);
-HSMP_BIN_ATTR_GRP(6, sock6_attr_list, socket6);
-HSMP_BIN_ATTR_GRP(7, sock7_attr_list, socket7);
-
-static const struct attribute_group *hsmp_groups[] = {
- &sock0_attr_grp,
- &sock1_attr_grp,
- &sock2_attr_grp,
- &sock3_attr_grp,
- &sock4_attr_grp,
- &sock5_attr_grp,
- &sock6_attr_grp,
- &sock7_attr_grp,
- NULL
-};
-
static inline bool is_f1a_m0h(void)
{
if (boot_cpu_data.x86 == 0x1A && boot_cpu_data.x86_model <= 0x0F)
@@ -222,9 +129,49 @@ static void hsmp_pltdrv_release(void *data)
hsmp_pdev->sock = NULL;
}
+/*
+ * The amd_hsmp class devices live in an amd_hsmp glue directory below the
+ * platform device, i.e. /sys/devices/platform/amd_hsmp/amd_hsmp/socket%u.
+ * /sys/devices/platform/amd_hsmp/socket%u used to be a plain attribute group
+ * holding metrics_bin, so keep that path working with a symlink to the socket
+ * device.
+ */
+static int hsmp_pltdrv_sock_dev_register(struct device *dev, struct hsmp_socket *sock)
+{
+ int ret;
+
+ ret = hsmp_sock_dev_register(dev, sock);
+ if (ret)
+ return ret;
+
+ ret = sysfs_create_link(&dev->kobj, &sock->sysfs_dev->kobj,
+ dev_name(sock->sysfs_dev));
+ if (ret)
+ hsmp_sock_dev_unregister(sock);
+
+ return ret;
+}
+
+static void hsmp_pltdrv_sock_devs_release(void *data)
+{
+ struct device *dev = data;
+ struct hsmp_socket *sock;
+ u16 i;
+
+ for (i = 0; i < hsmp_pdev->num_sockets; i++) {
+ sock = &hsmp_pdev->sock[i];
+ if (!sock->sysfs_dev)
+ continue;
+
+ sysfs_remove_link(&dev->kobj, dev_name(sock->sysfs_dev));
+ hsmp_sock_dev_unregister(sock);
+ }
+}
+
static int hsmp_pltdrv_probe(struct platform_device *pdev)
{
int ret;
+ u16 i;
hsmp_pdev->sock = devm_kzalloc_objs(&pdev->dev, *hsmp_pdev->sock,
hsmp_pdev->num_sockets);
@@ -252,6 +199,27 @@ static int hsmp_pltdrv_probe(struct platform_device *pdev)
return ret;
}
+ /*
+ * Added after hsmp_pltdrv_release() so that devres removes the socket
+ * devices before the socket array they reference is released.
+ */
+ ret = devm_add_action_or_reset(&pdev->dev, hsmp_pltdrv_sock_devs_release, &pdev->dev);
+ if (ret)
+ return ret;
+
+ /*
+ * The socket devices and their symlinks are the only way this driver
+ * exposes metrics_bin, so failing to create one fails the probe.
+ */
+ for (i = 0; i < hsmp_pdev->num_sockets; i++) {
+ ret = hsmp_pltdrv_sock_dev_register(&pdev->dev, &hsmp_pdev->sock[i]);
+ if (ret) {
+ dev_err(&pdev->dev, "Failed to register HSMP socket%u device: %d\n",
+ i, ret);
+ return ret;
+ }
+ }
+
ret = hsmp_misc_register(&pdev->dev);
if (ret) {
dev_err(&pdev->dev, "Failed to register misc device\n");
@@ -272,7 +240,6 @@ static struct platform_driver amd_hsmp_driver = {
.remove = hsmp_pltdrv_remove,
.driver = {
.name = DRIVER_NAME,
- .dev_groups = hsmp_groups,
},
};
--
2.53.0
^ permalink raw reply [flat|nested] 6+ messages in thread