* [PATCH v2 0/7] platform/x86: Add ACPI probing support for HSMP
@ 2023-12-20 16:55 Suma Hegde
2023-12-20 16:55 ` [PATCH v2 1/7] platform/x86: Move hsmp_test to probe Suma Hegde
` (6 more replies)
0 siblings, 7 replies; 17+ messages in thread
From: Suma Hegde @ 2023-12-20 16:55 UTC (permalink / raw)
To: platform-driver-x86; +Cc: ilpo.jarvinen, hdegoede, Suma Hegde
The first 5 patches restructure the code to make it easier
to support ACPI and platform device based probing.
The 6th patch adds the ACPI support, reading the ACPI table
and decoding the data.
The 7th patch adds support for non-ACPI based probing on
family 0x1A and model 0x00-0x0F as we support both methods.
Patch 1:
In case of ACPI based probing, mailbox registers are read from
ACPI table which is possible only in the probe(). So, message
HSMP_TEST will not succeed during platform init time.
Hence, move hsmp_test() to probe.
Patch 2:
Cache pci device object of root complex in struct hsmp_socket.
This will make amd_hsmp_rdrw() work with both the methods.
Patch 3:
Move platform_device_alloc() and add() to a function to make
it easier to add a condition check for non acpi.
Patch 4:
Create struct hsmp_mbaddr_info to contain all the mailbox register
information for ACPI and non-ACPI methods.
Patch 5:
Move struct device pointer to struct hsmp_socket to isolate
multiple probes in multi socket system.
Patch 6:
Convert probe to ACPI based probing with maintinaing support for
platform device probing.
Patch 7:
Support non-ACPI based BIOS on family 0x1A model 0~Fh.
Suma Hegde (7):
platform/x86: Move hsmp_test to probe
platform/x86: Cache pci_dev in struct hsmp_socket
platform/x86: Create static func to handle platdev
platform/x86: Define a struct to hold mailbox regs
platform/x86: Move dev from platdev to hsmp_socket
platform/x86: Convert to ACPI based probing
platform/x86: Non-ACPI support for AMD F1A_M00~0Fh
drivers/platform/x86/amd/hsmp.c | 501 ++++++++++++++++++++++++++------
1 file changed, 410 insertions(+), 91 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH v2 1/7] platform/x86: Move hsmp_test to probe
2023-12-20 16:55 [PATCH v2 0/7] platform/x86: Add ACPI probing support for HSMP Suma Hegde
@ 2023-12-20 16:55 ` Suma Hegde
2023-12-20 17:04 ` Ilpo Järvinen
2023-12-20 16:55 ` [PATCH v2 2/7] platform/x86: Cache pci_dev in struct hsmp_socket Suma Hegde
` (5 subsequent siblings)
6 siblings, 1 reply; 17+ messages in thread
From: Suma Hegde @ 2023-12-20 16:55 UTC (permalink / raw)
To: platform-driver-x86
Cc: ilpo.jarvinen, hdegoede, Suma Hegde, Naveen Krishna Chatradhi
This is in advance to supporting ACPI based probe.
In case of non-ACPI driver, hsmp_test() can be
performed either in plat init() or in probe().
however, in case of ACPI probing, hsmp_test() cannot
be called in init(), as the mailbox reg offsets and
base addresses are read from ACPI table in the probe().
Hence, move hsmp_test() to probe as preparation for
ACPI support.
Also use hsmp_send_message() directly in hsmp_test()
as the semaphore is already initialized in probe.
Signed-off-by: Suma Hegde <suma.hegde@amd.com>
Signed-off-by: Naveen Krishna Chatradhi <nchatrad@amd.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Changed since v1:
1. Add "Reviewed-by: Hans de Goede <hdegoede@redhat.com>"
---
drivers/platform/x86/amd/hsmp.c | 30 +++++++++++-------------------
1 file changed, 11 insertions(+), 19 deletions(-)
diff --git a/drivers/platform/x86/amd/hsmp.c b/drivers/platform/x86/amd/hsmp.c
index b55d80e29139..3c17b488f4f8 100644
--- a/drivers/platform/x86/amd/hsmp.c
+++ b/drivers/platform/x86/amd/hsmp.c
@@ -244,12 +244,7 @@ EXPORT_SYMBOL_GPL(hsmp_send_message);
static int hsmp_test(u16 sock_ind, u32 value)
{
struct hsmp_message msg = { 0 };
- struct amd_northbridge *nb;
- int ret = -ENODEV;
-
- nb = node_to_amd_nb(sock_ind);
- if (!nb || !nb->root)
- return ret;
+ int ret;
/*
* Test the hsmp port by performing TEST command. The test message
@@ -261,7 +256,7 @@ static int hsmp_test(u16 sock_ind, u32 value)
msg.args[0] = value;
msg.sock_ind = sock_ind;
- ret = __hsmp_send_message(nb->root, &msg);
+ ret = hsmp_send_message(&msg);
if (ret)
return ret;
@@ -504,6 +499,15 @@ static int hsmp_pltdrv_probe(struct platform_device *pdev)
for (i = 0; i < plat_dev.num_sockets; i++) {
sema_init(&plat_dev.sock[i].hsmp_sem, 1);
plat_dev.sock[i].sock_ind = i;
+
+ /* Test the hsmp interface on each socket */
+ ret = hsmp_test(i, 0xDEADBEEF);
+ if (ret) {
+ pr_err("HSMP test message failed on Fam:%x model:%x\n",
+ boot_cpu_data.x86, boot_cpu_data.x86_model);
+ pr_err("Is HSMP disabled in BIOS ?\n");
+ return ret;
+ }
}
plat_dev.hsmp_device.name = HSMP_CDEV_NAME;
@@ -544,7 +548,6 @@ static struct platform_device *amd_hsmp_platdev;
static int __init hsmp_plt_init(void)
{
int ret = -ENODEV;
- int i;
if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD || boot_cpu_data.x86 < 0x19) {
pr_err("HSMP is not supported on Family:%x model:%x\n",
@@ -560,17 +563,6 @@ static int __init hsmp_plt_init(void)
if (plat_dev.num_sockets == 0)
return ret;
- /* Test the hsmp interface on each socket */
- for (i = 0; i < plat_dev.num_sockets; i++) {
- ret = hsmp_test(i, 0xDEADBEEF);
- if (ret) {
- pr_err("HSMP test message failed on Fam:%x model:%x\n",
- boot_cpu_data.x86, boot_cpu_data.x86_model);
- pr_err("Is HSMP disabled in BIOS ?\n");
- return ret;
- }
- }
-
ret = platform_driver_register(&amd_hsmp_driver);
if (ret)
return ret;
--
2.25.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v2 2/7] platform/x86: Cache pci_dev in struct hsmp_socket
2023-12-20 16:55 [PATCH v2 0/7] platform/x86: Add ACPI probing support for HSMP Suma Hegde
2023-12-20 16:55 ` [PATCH v2 1/7] platform/x86: Move hsmp_test to probe Suma Hegde
@ 2023-12-20 16:55 ` Suma Hegde
2023-12-20 17:00 ` Ilpo Järvinen
2023-12-20 16:55 ` [PATCH v2 3/7] platform/x86: Create static func to handle platdev Suma Hegde
` (4 subsequent siblings)
6 siblings, 1 reply; 17+ messages in thread
From: Suma Hegde @ 2023-12-20 16:55 UTC (permalink / raw)
To: platform-driver-x86
Cc: ilpo.jarvinen, hdegoede, Suma Hegde, Naveen Krishna Chatradhi
Cache pci_dev obj during probe as part of struct hsmp_socket
and use in amd_hsmp_rdwr(). This change will make it easier to
support both non-ACPI and ACPI devices.
Also add a check for sock_index agsint number of sockets
in the hsmp_send_message().
Signed-off-by: Suma Hegde <suma.hegde@amd.com>
Signed-off-by: Naveen Krishna Chatradhi <nchatrad@amd.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Changes since v1:
1. Remove !sock check in hsmp_send_message()
2. Add "Reviewed-by: Hans de Goede <hdegoede@redhat.com>"
---
drivers/platform/x86/amd/hsmp.c | 42 +++++++++++++++++++--------------
1 file changed, 24 insertions(+), 18 deletions(-)
diff --git a/drivers/platform/x86/amd/hsmp.c b/drivers/platform/x86/amd/hsmp.c
index 3c17b488f4f8..1a2abe4460f9 100644
--- a/drivers/platform/x86/amd/hsmp.c
+++ b/drivers/platform/x86/amd/hsmp.c
@@ -58,6 +58,7 @@ struct hsmp_socket {
void __iomem *metric_tbl_addr;
struct semaphore hsmp_sem;
char name[HSMP_ATTR_GRP_NAME_SIZE];
+ struct pci_dev *root;
u16 sock_ind;
};
@@ -71,17 +72,20 @@ struct hsmp_plat_device {
static struct hsmp_plat_device plat_dev;
-static int amd_hsmp_rdwr(struct pci_dev *root, u32 address,
+static int amd_hsmp_rdwr(struct hsmp_socket *sock, u32 address,
u32 *value, bool write)
{
int ret;
- ret = pci_write_config_dword(root, HSMP_INDEX_REG, address);
+ if (!sock->root)
+ return -ENODEV;
+
+ ret = pci_write_config_dword(sock->root, HSMP_INDEX_REG, address);
if (ret)
return ret;
- ret = (write ? pci_write_config_dword(root, HSMP_DATA_REG, *value)
- : pci_read_config_dword(root, HSMP_DATA_REG, value));
+ ret = (write ? pci_write_config_dword(sock->root, HSMP_DATA_REG, *value)
+ : pci_read_config_dword(sock->root, HSMP_DATA_REG, value));
return ret;
}
@@ -95,7 +99,7 @@ static int amd_hsmp_rdwr(struct pci_dev *root, u32 address,
* Returns 0 for success and populates the requested number of arguments.
* Returns a negative error code for failure.
*/
-static int __hsmp_send_message(struct pci_dev *root, struct hsmp_message *msg)
+static int __hsmp_send_message(struct hsmp_socket *sock, struct hsmp_message *msg)
{
unsigned long timeout, short_sleep;
u32 mbox_status;
@@ -104,7 +108,7 @@ static int __hsmp_send_message(struct pci_dev *root, struct hsmp_message *msg)
/* Clear the status register */
mbox_status = HSMP_STATUS_NOT_READY;
- ret = amd_hsmp_rdwr(root, SMN_HSMP_MSG_RESP, &mbox_status, HSMP_WR);
+ ret = amd_hsmp_rdwr(sock, SMN_HSMP_MSG_RESP, &mbox_status, HSMP_WR);
if (ret) {
pr_err("Error %d clearing mailbox status register\n", ret);
return ret;
@@ -113,7 +117,7 @@ static int __hsmp_send_message(struct pci_dev *root, struct hsmp_message *msg)
index = 0;
/* Write any message arguments */
while (index < msg->num_args) {
- ret = amd_hsmp_rdwr(root, SMN_HSMP_MSG_DATA + (index << 2),
+ ret = amd_hsmp_rdwr(sock, SMN_HSMP_MSG_DATA + (index << 2),
&msg->args[index], HSMP_WR);
if (ret) {
pr_err("Error %d writing message argument %d\n", ret, index);
@@ -123,7 +127,7 @@ static int __hsmp_send_message(struct pci_dev *root, struct hsmp_message *msg)
}
/* Write the message ID which starts the operation */
- ret = amd_hsmp_rdwr(root, SMN_HSMP_MSG_ID, &msg->msg_id, HSMP_WR);
+ ret = amd_hsmp_rdwr(sock, SMN_HSMP_MSG_ID, &msg->msg_id, HSMP_WR);
if (ret) {
pr_err("Error %d writing message ID %u\n", ret, msg->msg_id);
return ret;
@@ -140,7 +144,7 @@ static int __hsmp_send_message(struct pci_dev *root, struct hsmp_message *msg)
timeout = jiffies + msecs_to_jiffies(HSMP_MSG_TIMEOUT);
while (time_before(jiffies, timeout)) {
- ret = amd_hsmp_rdwr(root, SMN_HSMP_MSG_RESP, &mbox_status, HSMP_RD);
+ ret = amd_hsmp_rdwr(sock, SMN_HSMP_MSG_RESP, &mbox_status, HSMP_RD);
if (ret) {
pr_err("Error %d reading mailbox status\n", ret);
return ret;
@@ -175,7 +179,7 @@ static int __hsmp_send_message(struct pci_dev *root, struct hsmp_message *msg)
*/
index = 0;
while (index < msg->response_sz) {
- ret = amd_hsmp_rdwr(root, SMN_HSMP_MSG_DATA + (index << 2),
+ ret = amd_hsmp_rdwr(sock, SMN_HSMP_MSG_DATA + (index << 2),
&msg->args[index], HSMP_RD);
if (ret) {
pr_err("Error %d reading response %u for message ID:%u\n",
@@ -208,21 +212,19 @@ static int validate_message(struct hsmp_message *msg)
int hsmp_send_message(struct hsmp_message *msg)
{
- struct hsmp_socket *sock = &plat_dev.sock[msg->sock_ind];
- struct amd_northbridge *nb;
+ struct hsmp_socket *sock;
int ret;
if (!msg)
return -EINVAL;
-
- nb = node_to_amd_nb(msg->sock_ind);
- if (!nb || !nb->root)
- return -ENODEV;
-
ret = validate_message(msg);
if (ret)
return ret;
+ if (!plat_dev.sock || msg->sock_ind >= plat_dev.num_sockets)
+ return -ENODEV;
+ sock = &plat_dev.sock[msg->sock_ind];
+
/*
* The time taken by smu operation to complete is between
* 10us to 1ms. Sometime it may take more time.
@@ -233,7 +235,7 @@ int hsmp_send_message(struct hsmp_message *msg)
if (ret < 0)
return ret;
- ret = __hsmp_send_message(nb->root, msg);
+ ret = __hsmp_send_message(sock, msg);
up(&sock->hsmp_sem);
@@ -500,6 +502,10 @@ static int hsmp_pltdrv_probe(struct platform_device *pdev)
sema_init(&plat_dev.sock[i].hsmp_sem, 1);
plat_dev.sock[i].sock_ind = i;
+ if (!node_to_amd_nb(i))
+ return -ENODEV;
+ plat_dev.sock[i].root = node_to_amd_nb(i)->root;
+
/* Test the hsmp interface on each socket */
ret = hsmp_test(i, 0xDEADBEEF);
if (ret) {
--
2.25.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v2 3/7] platform/x86: Create static func to handle platdev
2023-12-20 16:55 [PATCH v2 0/7] platform/x86: Add ACPI probing support for HSMP Suma Hegde
2023-12-20 16:55 ` [PATCH v2 1/7] platform/x86: Move hsmp_test to probe Suma Hegde
2023-12-20 16:55 ` [PATCH v2 2/7] platform/x86: Cache pci_dev in struct hsmp_socket Suma Hegde
@ 2023-12-20 16:55 ` Suma Hegde
2023-12-20 17:08 ` Ilpo Järvinen
2023-12-20 16:55 ` [PATCH v2 4/7] platform/x86: Define a struct to hold mailbox regs Suma Hegde
` (3 subsequent siblings)
6 siblings, 1 reply; 17+ messages in thread
From: Suma Hegde @ 2023-12-20 16:55 UTC (permalink / raw)
To: platform-driver-x86
Cc: ilpo.jarvinen, hdegoede, Suma Hegde, Naveen Krishna Chatradhi
Create a static function and call platform device alloc and add device,
which will simplify handling acpi and plat device probing.
Signed-off-by: Suma Hegde <suma.hegde@amd.com>
Signed-off-by: Naveen Krishna Chatradhi <nchatrad@amd.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Changes since v1:
1. Replace -1 with PLATFORM_DEVID_NONE in platform_device_alloc()
2. Add "Reviewed-by: Hans de Goede <hdegoede@redhat.com>"
---
drivers/platform/x86/amd/hsmp.c | 33 ++++++++++++++++++---------------
1 file changed, 18 insertions(+), 15 deletions(-)
diff --git a/drivers/platform/x86/amd/hsmp.c b/drivers/platform/x86/amd/hsmp.c
index 1a2abe4460f9..e3354683b138 100644
--- a/drivers/platform/x86/amd/hsmp.c
+++ b/drivers/platform/x86/amd/hsmp.c
@@ -551,6 +551,21 @@ static struct platform_driver amd_hsmp_driver = {
static struct platform_device *amd_hsmp_platdev;
+static int hsmp_plat_dev_register(void)
+{
+ int ret;
+
+ amd_hsmp_platdev = platform_device_alloc(DRIVER_NAME, PLATFORM_DEVID_NONE);
+ if (!amd_hsmp_platdev)
+ return -ENOMEM;
+
+ ret = platform_device_add(amd_hsmp_platdev);
+ if (ret)
+ platform_device_put(amd_hsmp_platdev);
+
+ return ret;
+}
+
static int __init hsmp_plt_init(void)
{
int ret = -ENODEV;
@@ -573,22 +588,10 @@ static int __init hsmp_plt_init(void)
if (ret)
return ret;
- amd_hsmp_platdev = platform_device_alloc(DRIVER_NAME, PLATFORM_DEVID_NONE);
- if (!amd_hsmp_platdev) {
- ret = -ENOMEM;
- goto drv_unregister;
- }
-
- ret = platform_device_add(amd_hsmp_platdev);
- if (ret) {
- platform_device_put(amd_hsmp_platdev);
- goto drv_unregister;
- }
-
- return 0;
+ ret = hsmp_plat_dev_register();
+ if (ret)
+ platform_driver_unregister(&amd_hsmp_driver);
-drv_unregister:
- platform_driver_unregister(&amd_hsmp_driver);
return ret;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v2 4/7] platform/x86: Define a struct to hold mailbox regs
2023-12-20 16:55 [PATCH v2 0/7] platform/x86: Add ACPI probing support for HSMP Suma Hegde
` (2 preceding siblings ...)
2023-12-20 16:55 ` [PATCH v2 3/7] platform/x86: Create static func to handle platdev Suma Hegde
@ 2023-12-20 16:55 ` Suma Hegde
2023-12-20 17:12 ` Ilpo Järvinen
2023-12-20 16:55 ` [PATCH v2 5/7] platform/x86: Move dev from platdev to hsmp_socket Suma Hegde
` (2 subsequent siblings)
6 siblings, 1 reply; 17+ messages in thread
From: Suma Hegde @ 2023-12-20 16:55 UTC (permalink / raw)
To: platform-driver-x86
Cc: ilpo.jarvinen, hdegoede, Suma Hegde, Naveen Krishna Chatradhi
Define struct hsmp_mbaddr_info with register offsets and populate
them during probe, which avoids the usage of macros in core functions.
During ACPI probe, the same fields can be populated from ACPI table.
Also move plat dev init to a static function.
Signed-off-by: Suma Hegde <suma.hegde@amd.com>
Signed-off-by: Naveen Krishna Chatradhi <nchatrad@amd.com>
Changes since v1:
Move hsmp_test() to initialize_platdev()
---
drivers/platform/x86/amd/hsmp.c | 72 +++++++++++++++++++++++----------
1 file changed, 50 insertions(+), 22 deletions(-)
diff --git a/drivers/platform/x86/amd/hsmp.c b/drivers/platform/x86/amd/hsmp.c
index e3354683b138..6beca5787e55 100644
--- a/drivers/platform/x86/amd/hsmp.c
+++ b/drivers/platform/x86/amd/hsmp.c
@@ -40,9 +40,10 @@
* register into the SMN_INDEX register, and reads/writes the SMN_DATA reg.
* Below are required SMN address for HSMP Mailbox register offsets in SMU address space
*/
-#define SMN_HSMP_MSG_ID 0x3B10534
-#define SMN_HSMP_MSG_RESP 0x3B10980
-#define SMN_HSMP_MSG_DATA 0x3B109E0
+#define SMN_HSMP_BASE 0x3B00000
+#define SMN_HSMP_MSG_ID 0x0010534
+#define SMN_HSMP_MSG_RESP 0x0010980
+#define SMN_HSMP_MSG_DATA 0x00109E0
#define HSMP_INDEX_REG 0xc4
#define HSMP_DATA_REG 0xc8
@@ -53,8 +54,17 @@
#define HSMP_ATTR_GRP_NAME_SIZE 10
+struct hsmp_mbaddr_info {
+ u32 base_addr;
+ u32 msg_id_off;
+ u32 msg_resp_off;
+ u32 msg_arg_off;
+ u32 size;
+};
+
struct hsmp_socket {
struct bin_attribute hsmp_attr;
+ struct hsmp_mbaddr_info mbinfo;
void __iomem *metric_tbl_addr;
struct semaphore hsmp_sem;
char name[HSMP_ATTR_GRP_NAME_SIZE];
@@ -72,7 +82,7 @@ struct hsmp_plat_device {
static struct hsmp_plat_device plat_dev;
-static int amd_hsmp_rdwr(struct hsmp_socket *sock, u32 address,
+static int amd_hsmp_rdwr(struct hsmp_socket *sock, u32 offset,
u32 *value, bool write)
{
int ret;
@@ -80,7 +90,8 @@ static int amd_hsmp_rdwr(struct hsmp_socket *sock, u32 address,
if (!sock->root)
return -ENODEV;
- ret = pci_write_config_dword(sock->root, HSMP_INDEX_REG, address);
+ ret = pci_write_config_dword(sock->root, HSMP_INDEX_REG,
+ sock->mbinfo.base_addr + offset);
if (ret)
return ret;
@@ -101,14 +112,17 @@ static int amd_hsmp_rdwr(struct hsmp_socket *sock, u32 address,
*/
static int __hsmp_send_message(struct hsmp_socket *sock, struct hsmp_message *msg)
{
+ struct hsmp_mbaddr_info *mbinfo;
unsigned long timeout, short_sleep;
u32 mbox_status;
u32 index;
int ret;
+ mbinfo = &sock->mbinfo;
+
/* Clear the status register */
mbox_status = HSMP_STATUS_NOT_READY;
- ret = amd_hsmp_rdwr(sock, SMN_HSMP_MSG_RESP, &mbox_status, HSMP_WR);
+ ret = amd_hsmp_rdwr(sock, mbinfo->msg_resp_off, &mbox_status, HSMP_WR);
if (ret) {
pr_err("Error %d clearing mailbox status register\n", ret);
return ret;
@@ -117,7 +131,7 @@ static int __hsmp_send_message(struct hsmp_socket *sock, struct hsmp_message *ms
index = 0;
/* Write any message arguments */
while (index < msg->num_args) {
- ret = amd_hsmp_rdwr(sock, SMN_HSMP_MSG_DATA + (index << 2),
+ ret = amd_hsmp_rdwr(sock, mbinfo->msg_arg_off + (index << 2),
&msg->args[index], HSMP_WR);
if (ret) {
pr_err("Error %d writing message argument %d\n", ret, index);
@@ -127,7 +141,7 @@ static int __hsmp_send_message(struct hsmp_socket *sock, struct hsmp_message *ms
}
/* Write the message ID which starts the operation */
- ret = amd_hsmp_rdwr(sock, SMN_HSMP_MSG_ID, &msg->msg_id, HSMP_WR);
+ ret = amd_hsmp_rdwr(sock, mbinfo->msg_id_off, &msg->msg_id, HSMP_WR);
if (ret) {
pr_err("Error %d writing message ID %u\n", ret, msg->msg_id);
return ret;
@@ -144,7 +158,7 @@ static int __hsmp_send_message(struct hsmp_socket *sock, struct hsmp_message *ms
timeout = jiffies + msecs_to_jiffies(HSMP_MSG_TIMEOUT);
while (time_before(jiffies, timeout)) {
- ret = amd_hsmp_rdwr(sock, SMN_HSMP_MSG_RESP, &mbox_status, HSMP_RD);
+ ret = amd_hsmp_rdwr(sock, mbinfo->msg_resp_off, &mbox_status, HSMP_RD);
if (ret) {
pr_err("Error %d reading mailbox status\n", ret);
return ret;
@@ -179,7 +193,7 @@ static int __hsmp_send_message(struct hsmp_socket *sock, struct hsmp_message *ms
*/
index = 0;
while (index < msg->response_sz) {
- ret = amd_hsmp_rdwr(sock, SMN_HSMP_MSG_DATA + (index << 2),
+ ret = amd_hsmp_rdwr(sock, mbinfo->msg_arg_off + (index << 2),
&msg->args[index], HSMP_RD);
if (ret) {
pr_err("Error %d reading response %u for message ID:%u\n",
@@ -487,24 +501,20 @@ static int hsmp_cache_proto_ver(void)
return ret;
}
-static int hsmp_pltdrv_probe(struct platform_device *pdev)
+static int initialize_platdev(void)
{
int ret, i;
- plat_dev.sock = devm_kzalloc(&pdev->dev,
- (plat_dev.num_sockets * sizeof(struct hsmp_socket)),
- GFP_KERNEL);
- if (!plat_dev.sock)
- return -ENOMEM;
- plat_dev.dev = &pdev->dev;
-
for (i = 0; i < plat_dev.num_sockets; i++) {
- sema_init(&plat_dev.sock[i].hsmp_sem, 1);
- plat_dev.sock[i].sock_ind = i;
-
if (!node_to_amd_nb(i))
return -ENODEV;
- plat_dev.sock[i].root = node_to_amd_nb(i)->root;
+ plat_dev.sock[i].root = node_to_amd_nb(i)->root;
+ plat_dev.sock[i].sock_ind = i;
+ plat_dev.sock[i].mbinfo.base_addr = SMN_HSMP_BASE;
+ plat_dev.sock[i].mbinfo.msg_id_off = SMN_HSMP_MSG_ID;
+ plat_dev.sock[i].mbinfo.msg_resp_off = SMN_HSMP_MSG_RESP;
+ plat_dev.sock[i].mbinfo.msg_arg_off = SMN_HSMP_MSG_DATA;
+ sema_init(&plat_dev.sock[i].hsmp_sem, 1);
/* Test the hsmp interface on each socket */
ret = hsmp_test(i, 0xDEADBEEF);
@@ -516,6 +526,24 @@ static int hsmp_pltdrv_probe(struct platform_device *pdev)
}
}
+ return 0;
+}
+
+static int hsmp_pltdrv_probe(struct platform_device *pdev)
+{
+ int ret;
+
+ plat_dev.sock = devm_kzalloc(&pdev->dev,
+ (plat_dev.num_sockets * sizeof(struct hsmp_socket)),
+ GFP_KERNEL);
+ if (!plat_dev.sock)
+ return -ENOMEM;
+ plat_dev.dev = &pdev->dev;
+
+ ret = initialize_platdev();
+ if (ret)
+ return ret;
+
plat_dev.hsmp_device.name = HSMP_CDEV_NAME;
plat_dev.hsmp_device.minor = MISC_DYNAMIC_MINOR;
plat_dev.hsmp_device.fops = &hsmp_fops;
--
2.25.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v2 5/7] platform/x86: Move dev from platdev to hsmp_socket
2023-12-20 16:55 [PATCH v2 0/7] platform/x86: Add ACPI probing support for HSMP Suma Hegde
` (3 preceding siblings ...)
2023-12-20 16:55 ` [PATCH v2 4/7] platform/x86: Define a struct to hold mailbox regs Suma Hegde
@ 2023-12-20 16:55 ` Suma Hegde
2023-12-20 17:18 ` Ilpo Järvinen
2023-12-20 17:20 ` Ilpo Järvinen
2023-12-20 16:55 ` [PATCH v2 6/7] platform/x86: Convert to ACPI based probing Suma Hegde
2023-12-20 16:55 ` [PATCH v2 7/7] platform/x86: Non-ACPI support for AMD F1A_M00~0Fh Suma Hegde
6 siblings, 2 replies; 17+ messages in thread
From: Suma Hegde @ 2023-12-20 16:55 UTC (permalink / raw)
To: platform-driver-x86
Cc: ilpo.jarvinen, hdegoede, Suma Hegde, Naveen Krishna Chatradhi
On an ACPI enabled platforms the probe is called for each socket
and the struct dev is different for each socket. This change
will help in handling both ACPI and non-ACPI platforms.
Also change pr_err to dev_err API.
Signed-off-by: Suma Hegde <suma.hegde@amd.com>
Signed-off-by: Naveen Krishna Chatradhi <nchatrad@amd.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Changes since v1:
Add "Reviewed-by: Hans de Goede <hdegoede@redhat.com>"
---
drivers/platform/x86/amd/hsmp.c | 42 +++++++++++++++++----------------
1 file changed, 22 insertions(+), 20 deletions(-)
diff --git a/drivers/platform/x86/amd/hsmp.c b/drivers/platform/x86/amd/hsmp.c
index 6beca5787e55..3508399c6aa9 100644
--- a/drivers/platform/x86/amd/hsmp.c
+++ b/drivers/platform/x86/amd/hsmp.c
@@ -69,13 +69,13 @@ struct hsmp_socket {
struct semaphore hsmp_sem;
char name[HSMP_ATTR_GRP_NAME_SIZE];
struct pci_dev *root;
+ struct device *dev;
u16 sock_ind;
};
struct hsmp_plat_device {
struct miscdevice hsmp_device;
struct hsmp_socket *sock;
- struct device *dev;
u32 proto_ver;
u16 num_sockets;
};
@@ -278,8 +278,9 @@ static int hsmp_test(u16 sock_ind, u32 value)
/* Check the response value */
if (msg.args[0] != (value + 1)) {
- pr_err("Socket %d test message failed, Expected 0x%08X, received 0x%08X\n",
- sock_ind, (value + 1), msg.args[0]);
+ dev_err(plat_dev.sock[sock_ind].dev,
+ "Socket %d test message failed, Expected 0x%08X, received 0x%08X\n",
+ sock_ind, (value + 1), msg.args[0]);
return -EBADE;
}
@@ -358,12 +359,12 @@ static ssize_t hsmp_metric_tbl_read(struct file *filp, struct kobject *kobj,
/* Do not support lseek(), reads entire metric table */
if (count < bin_attr->size) {
- dev_err(plat_dev.dev, "Wrong buffer size\n");
+ dev_err(sock->dev, "Wrong buffer size\n");
return -EINVAL;
}
if (!sock) {
- dev_err(plat_dev.dev, "Failed to read attribute private data\n");
+ dev_err(sock->dev, "Failed to read attribute private data\n");
return -EINVAL;
}
@@ -399,13 +400,13 @@ static int hsmp_get_tbl_dram_base(u16 sock_ind)
*/
dram_addr = msg.args[0] | ((u64)(msg.args[1]) << 32);
if (!dram_addr) {
- dev_err(plat_dev.dev, "Invalid DRAM address for metric table\n");
+ dev_err(sock->dev, "Invalid DRAM address for metric table\n");
return -ENOMEM;
}
- sock->metric_tbl_addr = devm_ioremap(plat_dev.dev, dram_addr,
+ sock->metric_tbl_addr = devm_ioremap(sock->dev, dram_addr,
sizeof(struct hsmp_metric_table));
if (!sock->metric_tbl_addr) {
- dev_err(plat_dev.dev, "Failed to ioremap metric table addr\n");
+ dev_err(sock->dev, "Failed to ioremap metric table addr\n");
return -ENOMEM;
}
return 0;
@@ -453,14 +454,15 @@ static int hsmp_create_sysfs_interface(void)
if (WARN_ON(plat_dev.num_sockets > U8_MAX))
return -ERANGE;
- hsmp_attr_grps = devm_kzalloc(plat_dev.dev, sizeof(struct attribute_group *) *
+ hsmp_attr_grps = devm_kzalloc(plat_dev.sock[0].dev, sizeof(struct attribute_group *) *
(plat_dev.num_sockets + 1), GFP_KERNEL);
if (!hsmp_attr_grps)
return -ENOMEM;
/* Create a sysfs directory for each socket */
for (i = 0; i < plat_dev.num_sockets; i++) {
- attr_grp = devm_kzalloc(plat_dev.dev, sizeof(struct attribute_group), GFP_KERNEL);
+ attr_grp = devm_kzalloc(plat_dev.sock[i].dev, sizeof(struct attribute_group),
+ GFP_KERNEL);
if (!attr_grp)
return -ENOMEM;
@@ -468,7 +470,7 @@ static int hsmp_create_sysfs_interface(void)
attr_grp->name = plat_dev.sock[i].name;
/* Null terminated list of attributes */
- hsmp_bin_attrs = devm_kzalloc(plat_dev.dev, sizeof(struct bin_attribute *) *
+ hsmp_bin_attrs = devm_kzalloc(plat_dev.sock[i].dev, sizeof(struct bin_attribute *) *
(NUM_HSMP_ATTRS + 1), GFP_KERNEL);
if (!hsmp_bin_attrs)
return -ENOMEM;
@@ -482,7 +484,7 @@ static int hsmp_create_sysfs_interface(void)
if (ret)
return ret;
}
- return devm_device_add_groups(plat_dev.dev, hsmp_attr_grps);
+ return devm_device_add_groups(plat_dev.sock[0].dev, hsmp_attr_grps);
}
static int hsmp_cache_proto_ver(void)
@@ -501,7 +503,7 @@ static int hsmp_cache_proto_ver(void)
return ret;
}
-static int initialize_platdev(void)
+static int initialize_platdev(struct device *dev)
{
int ret, i;
@@ -510,6 +512,7 @@ static int initialize_platdev(void)
return -ENODEV;
plat_dev.sock[i].root = node_to_amd_nb(i)->root;
plat_dev.sock[i].sock_ind = i;
+ plat_dev.sock[i].dev = dev;
plat_dev.sock[i].mbinfo.base_addr = SMN_HSMP_BASE;
plat_dev.sock[i].mbinfo.msg_id_off = SMN_HSMP_MSG_ID;
plat_dev.sock[i].mbinfo.msg_resp_off = SMN_HSMP_MSG_RESP;
@@ -519,9 +522,9 @@ static int initialize_platdev(void)
/* Test the hsmp interface on each socket */
ret = hsmp_test(i, 0xDEADBEEF);
if (ret) {
- pr_err("HSMP test message failed on Fam:%x model:%x\n",
- boot_cpu_data.x86, boot_cpu_data.x86_model);
- pr_err("Is HSMP disabled in BIOS ?\n");
+ dev_err(dev, "HSMP test message failed on Fam:%x model:%x\n",
+ boot_cpu_data.x86, boot_cpu_data.x86_model);
+ dev_err(dev, "Is HSMP disabled in BIOS ?\n");
return ret;
}
}
@@ -538,9 +541,8 @@ static int hsmp_pltdrv_probe(struct platform_device *pdev)
GFP_KERNEL);
if (!plat_dev.sock)
return -ENOMEM;
- plat_dev.dev = &pdev->dev;
- ret = initialize_platdev();
+ ret = initialize_platdev(&pdev->dev);
if (ret)
return ret;
@@ -553,13 +555,13 @@ static int hsmp_pltdrv_probe(struct platform_device *pdev)
ret = hsmp_cache_proto_ver();
if (ret) {
- dev_err(plat_dev.dev, "Failed to read HSMP protocol version\n");
+ dev_err(&pdev->dev, "Failed to read HSMP protocol version\n");
return ret;
}
ret = hsmp_create_sysfs_interface();
if (ret)
- dev_err(plat_dev.dev, "Failed to create HSMP sysfs interface\n");
+ dev_err(&pdev->dev, "Failed to create HSMP sysfs interface\n");
return misc_register(&plat_dev.hsmp_device);
}
--
2.25.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v2 6/7] platform/x86: Convert to ACPI based probing
2023-12-20 16:55 [PATCH v2 0/7] platform/x86: Add ACPI probing support for HSMP Suma Hegde
` (4 preceding siblings ...)
2023-12-20 16:55 ` [PATCH v2 5/7] platform/x86: Move dev from platdev to hsmp_socket Suma Hegde
@ 2023-12-20 16:55 ` Suma Hegde
2023-12-20 17:34 ` Ilpo Järvinen
2023-12-20 16:55 ` [PATCH v2 7/7] platform/x86: Non-ACPI support for AMD F1A_M00~0Fh Suma Hegde
6 siblings, 1 reply; 17+ messages in thread
From: Suma Hegde @ 2023-12-20 16:55 UTC (permalink / raw)
To: platform-driver-x86
Cc: ilpo.jarvinen, hdegoede, Suma Hegde, Naveen Krishna Chatradhi
ACPI table provides mailbox base address and register offset
information. The base address is provided as part of CRS method
and mailbox offsets are provided through DSD table.
Sockets are differentiated by UIDs.
Signed-off-by: Suma Hegde <suma.hegde@amd.com>
Signed-off-by: Naveen Krishna Chatradhi <nchatrad@amd.com>
Changes since v1:
1. Define amd_hsmp_acpi_rdwr() for doing mailbox memory mapped io
2. Add a check to see if mailbox register offsets are set in
hsmp_read_acpi_dsd()
3. Add a check to see if sock->mbinfo.base_addr sockck->mbinfo.size are
set in hsmp_read_acpi_crs()
4. Change order of the statements in switch case ACPI_RESOURCE_TYPE_FIXED_MEMORY32
in hsmp_resource()
5. Add hsmp_test() after hsmp_parse_acpi_table() call
6. Add r.end < r.start check in hsmp_resource()
7. Add !dsd error check in hsmp_read_acpi_dsd
---
drivers/platform/x86/amd/hsmp.c | 323 +++++++++++++++++++++++++++++---
1 file changed, 296 insertions(+), 27 deletions(-)
diff --git a/drivers/platform/x86/amd/hsmp.c b/drivers/platform/x86/amd/hsmp.c
index 3508399c6aa9..726ba73e23dd 100644
--- a/drivers/platform/x86/amd/hsmp.c
+++ b/drivers/platform/x86/amd/hsmp.c
@@ -18,9 +18,11 @@
#include <linux/pci.h>
#include <linux/platform_device.h>
#include <linux/semaphore.h>
+#include <linux/acpi.h>
#define DRIVER_NAME "amd_hsmp"
-#define DRIVER_VERSION "2.0"
+#define DRIVER_VERSION "2.2"
+#define ACPI_HSMP_DEVICE_HID "AMDI0097"
/* HSMP Status / Error codes */
#define HSMP_STATUS_NOT_READY 0x00
@@ -54,6 +56,11 @@
#define HSMP_ATTR_GRP_NAME_SIZE 10
+/* These are the strings specified in ACPI table */
+#define MSG_IDOFF_STR "MsgIdOffset"
+#define MSG_ARGOFF_STR "MsgArgOffset"
+#define MSG_RESPOFF_STR "MsgRspOffset"
+
struct hsmp_mbaddr_info {
u32 base_addr;
u32 msg_id_off;
@@ -66,6 +73,7 @@ struct hsmp_socket {
struct bin_attribute hsmp_attr;
struct hsmp_mbaddr_info mbinfo;
void __iomem *metric_tbl_addr;
+ void __iomem *virt_base_addr;
struct semaphore hsmp_sem;
char name[HSMP_ATTR_GRP_NAME_SIZE];
struct pci_dev *root;
@@ -78,12 +86,14 @@ struct hsmp_plat_device {
struct hsmp_socket *sock;
u32 proto_ver;
u16 num_sockets;
+ bool is_acpi_device;
+ bool is_probed;
};
static struct hsmp_plat_device plat_dev;
-static int amd_hsmp_rdwr(struct hsmp_socket *sock, u32 offset,
- u32 *value, bool write)
+static int amd_hsmp_pci_rdwr(struct hsmp_socket *sock, u32 offset,
+ u32 *value, bool write)
{
int ret;
@@ -101,8 +111,29 @@ static int amd_hsmp_rdwr(struct hsmp_socket *sock, u32 offset,
return ret;
}
+static void amd_hsmp_acpi_rdwr(struct hsmp_socket *sock, u32 offset,
+ u32 *value, bool write)
+{
+ if (write)
+ iowrite32(*value, sock->virt_base_addr + offset);
+ else
+ *value = ioread32(sock->virt_base_addr + offset);
+}
+
+static int amd_hsmp_rdwr(struct hsmp_socket *sock, u32 offset,
+ u32 *value, bool write)
+{
+ if (plat_dev.is_acpi_device)
+ amd_hsmp_acpi_rdwr(sock, offset, value, write);
+ else
+ return amd_hsmp_pci_rdwr(sock, offset, value, write);
+
+ return 0;
+}
+
/*
- * Send a message to the HSMP port via PCI-e config space registers.
+ * Send a message to the HSMP port via PCI-e config space registers
+ * or by writing to MMIO space.
*
* The caller is expected to zero out any unused arguments.
* If a response is expected, the number of response words should be greater than 0.
@@ -450,6 +481,9 @@ static int hsmp_create_sysfs_interface(void)
int ret;
u16 i;
+ if (plat_dev.is_acpi_device)
+ return 0;
+
/* String formatting is currently limited to u8 sockets */
if (WARN_ON(plat_dev.num_sockets > U8_MAX))
return -ERANGE;
@@ -487,13 +521,188 @@ static int hsmp_create_sysfs_interface(void)
return devm_device_add_groups(plat_dev.sock[0].dev, hsmp_attr_grps);
}
-static int hsmp_cache_proto_ver(void)
+/* This is the UUID used for HSMP */
+static const guid_t acpi_hsmp_uuid = GUID_INIT(0xb74d619d, 0x5707, 0x48bd,
+ 0xa6, 0x9f, 0x4e, 0xa2,
+ 0x87, 0x1f, 0xc2, 0xf6);
+
+static inline bool is_acpi_hsmp_uuid(union acpi_object *obj)
+{
+ if (obj->type == ACPI_TYPE_BUFFER && obj->buffer.length == 16)
+ return guid_equal((guid_t *)obj->buffer.pointer, &acpi_hsmp_uuid);
+
+ return false;
+}
+
+static inline int hsmp_get_uid(struct device *dev, u16 *sock_ind)
+{
+ char *uid;
+
+ /*
+ * UID (ID00, ID01..IDXX) is used for differentiating sockets,
+ * read it and strip the "ID" part of it and convert the remaining
+ * bytes to integer.
+ */
+ uid = acpi_device_uid(ACPI_COMPANION(dev));
+
+ return kstrtou16((uid + 2), 10, sock_ind);
+}
+
+static acpi_status hsmp_resource(struct acpi_resource *res, void *data)
+{
+ struct hsmp_socket *sock = data;
+ struct resource r;
+
+ switch (res->type) {
+ case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
+ if (!acpi_dev_resource_memory(res, &r))
+ return AE_ERROR;
+ if (!r.start || r.end < r.start || !(r.flags & IORESOURCE_MEM_WRITEABLE))
+ return AE_ERROR;
+ sock->mbinfo.base_addr = r.start;
+ sock->mbinfo.size = r.end - r.start + 1;
+ break;
+ case ACPI_RESOURCE_TYPE_END_TAG:
+ break;
+ default:
+ return AE_ERROR;
+ }
+
+ return AE_OK;
+}
+
+static int hsmp_read_acpi_dsd(struct hsmp_socket *sock)
+{
+ struct acpi_buffer buf = { ACPI_ALLOCATE_BUFFER, NULL };
+ union acpi_object *guid, *mailbox_package;
+ union acpi_object *dsd;
+ acpi_status status;
+ int ret = 0;
+ int j;
+
+ status = acpi_evaluate_object_typed(ACPI_HANDLE(sock->dev), "_DSD", NULL,
+ &buf, ACPI_TYPE_PACKAGE);
+ if (ACPI_FAILURE(status)) {
+ dev_err(sock->dev, "Failed to read mailbox reg offsets from DSD table, err: %s\n",
+ acpi_format_exception(status));
+ return -EINVAL;
+ }
+
+ dsd = buf.pointer;
+
+ /* HSMP _DSD property should contain 2 objects.
+ * 1. guid which is an acpi object of type ACPI_TYPE_BUFFER
+ * 2. mailbox which is an acpi object of type ACPI_TYPE_PACKAGE
+ * This mailbox object contains 3 more acpi objects of type
+ * ACPI_TYPE_PACKAGE for holding msgid, msgresp, msgarg offsets
+ * these packages inturn contain 2 acpi objects of type
+ * ACPI_TYPE_STRING and ACPI_TYPE_INTEGER
+ */
+ if (!dsd || dsd->type != ACPI_TYPE_PACKAGE || dsd->package.count != 2) {
+ ret = -EINVAL;
+ goto free_buf;
+ }
+
+ guid = &dsd->package.elements[0];
+ mailbox_package = &dsd->package.elements[1];
+ if (!is_acpi_hsmp_uuid(guid) || mailbox_package->type != ACPI_TYPE_PACKAGE) {
+ dev_err(sock->dev, "Invalid hsmp _DSD table data\n");
+ ret = -EINVAL;
+ goto free_buf;
+ }
+
+ for (j = 0; j < mailbox_package->package.count; j++) {
+ union acpi_object *msgobj, *msgstr, *msgint;
+
+ msgobj = &mailbox_package->package.elements[j];
+ msgstr = &msgobj->package.elements[0];
+ msgint = &msgobj->package.elements[1];
+
+ /* package should have 1 string and 1 integer object */
+ if (msgobj->type != ACPI_TYPE_PACKAGE ||
+ msgstr->type != ACPI_TYPE_STRING ||
+ msgint->type != ACPI_TYPE_INTEGER) {
+ ret = -EINVAL;
+ goto free_buf;
+ }
+
+ if (!strncmp(msgstr->string.pointer, MSG_IDOFF_STR,
+ msgstr->string.length)) {
+ sock->mbinfo.msg_id_off = msgint->integer.value;
+ } else if (!strncmp(msgstr->string.pointer, MSG_RESPOFF_STR,
+ msgstr->string.length)) {
+ sock->mbinfo.msg_resp_off = msgint->integer.value;
+ } else if (!strncmp(msgstr->string.pointer, MSG_ARGOFF_STR,
+ msgstr->string.length)) {
+ sock->mbinfo.msg_arg_off = msgint->integer.value;
+ } else {
+ ret = -EINVAL;
+ goto free_buf;
+ }
+ }
+
+ if (!sock->mbinfo.msg_id_off || !sock->mbinfo.msg_resp_off ||
+ !sock->mbinfo.msg_arg_off)
+ ret = -EINVAL;
+
+free_buf:
+ ACPI_FREE(buf.pointer);
+ return ret;
+}
+
+static int hsmp_read_acpi_crs(struct hsmp_socket *sock)
+{
+ acpi_status status;
+
+ status = acpi_walk_resources(ACPI_HANDLE(sock->dev), METHOD_NAME__CRS,
+ hsmp_resource, sock);
+ if (ACPI_FAILURE(status)) {
+ dev_err(sock->dev, "Failed to look up MP1 base address from CRS method, err: %s\n",
+ acpi_format_exception(status));
+ return -EINVAL;
+ }
+ if (!sock->mbinfo.base_addr || !sock->mbinfo.size)
+ return -EINVAL;
+
+ /* The mapped region should be un cached */
+ sock->virt_base_addr = devm_ioremap_uc(sock->dev, sock->mbinfo.base_addr,
+ sock->mbinfo.size);
+ if (!sock->virt_base_addr) {
+ dev_err(sock->dev, "Failed to ioremap MP1 base address\n");
+ return -ENOMEM;
+ }
+
+ return 0;
+}
+
+/* Parse the ACPI table to read the data */
+static int hsmp_parse_acpi_table(struct device *dev, u16 sock_ind)
+{
+ struct hsmp_socket *sock = &plat_dev.sock[sock_ind];
+ int ret;
+
+ sock->sock_ind = sock_ind;
+ sock->dev = dev;
+ plat_dev.is_acpi_device = true;
+
+ sema_init(&sock->hsmp_sem, 1);
+
+ /* Read MP1 base address from CRS method */
+ ret = hsmp_read_acpi_crs(sock);
+ if (ret)
+ return ret;
+
+ /* Read mailbox offsets from DSD table */
+ return hsmp_read_acpi_dsd(sock);
+}
+
+static int hsmp_cache_proto_ver(u16 sock_ind)
{
struct hsmp_message msg = { 0 };
int ret;
msg.msg_id = HSMP_GET_PROTO_VER;
- msg.sock_ind = 0;
+ msg.sock_ind = sock_ind;
msg.response_sz = hsmp_msg_desc_table[HSMP_GET_PROTO_VER].response_sz;
ret = hsmp_send_message(&msg);
@@ -532,28 +741,62 @@ static int initialize_platdev(struct device *dev)
return 0;
}
+static const struct acpi_device_id amd_hsmp_acpi_ids[] = {
+ {ACPI_HSMP_DEVICE_HID, 0},
+ {}
+};
+MODULE_DEVICE_TABLE(acpi, amd_hsmp_acpi_ids);
+
static int hsmp_pltdrv_probe(struct platform_device *pdev)
{
+ struct acpi_device *adev;
+ u16 sock_ind = 0;
int ret;
- plat_dev.sock = devm_kzalloc(&pdev->dev,
- (plat_dev.num_sockets * sizeof(struct hsmp_socket)),
- GFP_KERNEL);
- if (!plat_dev.sock)
- return -ENOMEM;
-
- ret = initialize_platdev(&pdev->dev);
- if (ret)
- return ret;
+ /*
+ * On ACPI supported BIOS, there is an ACPI HSMP device added for
+ * each socket, so the per socket probing, but the memory allocated for
+ * sockets should be contiguous to access it as an array,
+ * Hence allocate memory for all the sockets at once instead of allocating
+ * on each probe.
+ */
+ if (!plat_dev.is_probed) {
+ plat_dev.sock = devm_kzalloc(&pdev->dev,
+ (plat_dev.num_sockets * sizeof(struct hsmp_socket)),
+ GFP_KERNEL);
+ if (!plat_dev.sock)
+ return -ENOMEM;
+ }
- plat_dev.hsmp_device.name = HSMP_CDEV_NAME;
- plat_dev.hsmp_device.minor = MISC_DYNAMIC_MINOR;
- plat_dev.hsmp_device.fops = &hsmp_fops;
- plat_dev.hsmp_device.parent = &pdev->dev;
- plat_dev.hsmp_device.nodename = HSMP_DEVNODE_NAME;
- plat_dev.hsmp_device.mode = 0644;
+ adev = ACPI_COMPANION(&pdev->dev);
+ if (adev && !acpi_match_device_ids(adev, amd_hsmp_acpi_ids)) {
+ ret = hsmp_get_uid(&pdev->dev, &sock_ind);
+ if (ret)
+ return ret;
+ if (sock_ind >= plat_dev.num_sockets)
+ return -EINVAL;
+ ret = hsmp_parse_acpi_table(&pdev->dev, sock_ind);
+ if (ret) {
+ dev_err(&pdev->dev, "Failed to parse ACPI table\n");
+ return ret;
+ }
+ /* Test the hsmp interface */
+ ret = hsmp_test(sock_ind, 0xDEADBEEF);
+ if (ret) {
+ dev_err(&pdev->dev, "HSMP test message failed on Fam:%x model:%x\n",
+ boot_cpu_data.x86, boot_cpu_data.x86_model);
+ dev_err(&pdev->dev, "Is HSMP disabled in BIOS ?\n");
+ return ret;
+ }
+ } else {
+ ret = initialize_platdev(&pdev->dev);
+ if (ret) {
+ dev_err(&pdev->dev, "Failed to init HSMP mailbox\n");
+ return ret;
+ }
+ }
- ret = hsmp_cache_proto_ver();
+ ret = hsmp_cache_proto_ver(sock_ind);
if (ret) {
dev_err(&pdev->dev, "Failed to read HSMP protocol version\n");
return ret;
@@ -563,12 +806,35 @@ static int hsmp_pltdrv_probe(struct platform_device *pdev)
if (ret)
dev_err(&pdev->dev, "Failed to create HSMP sysfs interface\n");
- return misc_register(&plat_dev.hsmp_device);
+ if (!plat_dev.is_probed) {
+ plat_dev.hsmp_device.name = HSMP_CDEV_NAME;
+ plat_dev.hsmp_device.minor = MISC_DYNAMIC_MINOR;
+ plat_dev.hsmp_device.fops = &hsmp_fops;
+ plat_dev.hsmp_device.parent = &pdev->dev;
+ plat_dev.hsmp_device.nodename = HSMP_DEVNODE_NAME;
+ plat_dev.hsmp_device.mode = 0644;
+
+ ret = misc_register(&plat_dev.hsmp_device);
+ if (ret)
+ return ret;
+
+ plat_dev.is_probed = true;
+ }
+
+ return 0;
+
}
static void hsmp_pltdrv_remove(struct platform_device *pdev)
{
- misc_deregister(&plat_dev.hsmp_device);
+ /*
+ * We register only one misc_device even on multi socket system.
+ * So, deregister should happen only once.
+ */
+ if (plat_dev.is_probed) {
+ misc_deregister(&plat_dev.hsmp_device);
+ plat_dev.is_probed = false;
+ }
}
static struct platform_driver amd_hsmp_driver = {
@@ -576,6 +842,7 @@ static struct platform_driver amd_hsmp_driver = {
.remove_new = hsmp_pltdrv_remove,
.driver = {
.name = DRIVER_NAME,
+ .acpi_match_table = amd_hsmp_acpi_ids,
},
};
@@ -618,9 +885,11 @@ static int __init hsmp_plt_init(void)
if (ret)
return ret;
- ret = hsmp_plat_dev_register();
- if (ret)
- platform_driver_unregister(&amd_hsmp_driver);
+ if (!plat_dev.is_acpi_device) {
+ ret = hsmp_plat_dev_register();
+ if (ret)
+ platform_driver_unregister(&amd_hsmp_driver);
+ }
return ret;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* [PATCH v2 7/7] platform/x86: Non-ACPI support for AMD F1A_M00~0Fh
2023-12-20 16:55 [PATCH v2 0/7] platform/x86: Add ACPI probing support for HSMP Suma Hegde
` (5 preceding siblings ...)
2023-12-20 16:55 ` [PATCH v2 6/7] platform/x86: Convert to ACPI based probing Suma Hegde
@ 2023-12-20 16:55 ` Suma Hegde
2023-12-20 17:40 ` Ilpo Järvinen
6 siblings, 1 reply; 17+ messages in thread
From: Suma Hegde @ 2023-12-20 16:55 UTC (permalink / raw)
To: platform-driver-x86
Cc: ilpo.jarvinen, hdegoede, Suma Hegde, Naveen Krishna Chatradhi
AMD EPYC family 0x1A and Model 0x0-0xF are having different
mailbox message ID offset compared to previous
platforms. In case of ACPI based BIOS, this information will be read
from ACPI table, for non ACPI BIOS, this needs to be #defined.
Signed-off-by: Suma Hegde <suma.hegde@amd.com>
Signed-off-by: Naveen Krishna Chatradhi <nchatrad@amd.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Changes since v1:
Add "Reviewed-by: Hans de Goede <hdegoede@redhat.com>"
---
drivers/platform/x86/amd/hsmp.c | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/drivers/platform/x86/amd/hsmp.c b/drivers/platform/x86/amd/hsmp.c
index 726ba73e23dd..95afea56d333 100644
--- a/drivers/platform/x86/amd/hsmp.c
+++ b/drivers/platform/x86/amd/hsmp.c
@@ -44,6 +44,7 @@
*/
#define SMN_HSMP_BASE 0x3B00000
#define SMN_HSMP_MSG_ID 0x0010534
+#define SMN_HSMP_MSG_ID_F1A_M0H 0x0010934
#define SMN_HSMP_MSG_RESP 0x0010980
#define SMN_HSMP_MSG_DATA 0x00109E0
@@ -712,6 +713,15 @@ static int hsmp_cache_proto_ver(u16 sock_ind)
return ret;
}
+static inline bool is_f1a_m0h(void)
+{
+ if (boot_cpu_data.x86 == 0x1A &&
+ (boot_cpu_data.x86_model >= 0x00 && boot_cpu_data.x86_model <= 0x0F))
+ return true;
+
+ return false;
+}
+
static int initialize_platdev(struct device *dev)
{
int ret, i;
@@ -723,7 +733,16 @@ static int initialize_platdev(struct device *dev)
plat_dev.sock[i].sock_ind = i;
plat_dev.sock[i].dev = dev;
plat_dev.sock[i].mbinfo.base_addr = SMN_HSMP_BASE;
- plat_dev.sock[i].mbinfo.msg_id_off = SMN_HSMP_MSG_ID;
+
+ /*
+ * This is a tranisitional change from non ACPI to ACPI, only
+ * family 0x1A, model 0x00 platform is supported for both ACPI and non ACPI.
+ */
+ if (is_f1a_m0h())
+ plat_dev.sock[i].mbinfo.msg_id_off = SMN_HSMP_MSG_ID_F1A_M0H;
+ else
+ plat_dev.sock[i].mbinfo.msg_id_off = SMN_HSMP_MSG_ID;
+
plat_dev.sock[i].mbinfo.msg_resp_off = SMN_HSMP_MSG_RESP;
plat_dev.sock[i].mbinfo.msg_arg_off = SMN_HSMP_MSG_DATA;
sema_init(&plat_dev.sock[i].hsmp_sem, 1);
--
2.25.1
^ permalink raw reply related [flat|nested] 17+ messages in thread
* Re: [PATCH v2 2/7] platform/x86: Cache pci_dev in struct hsmp_socket
2023-12-20 16:55 ` [PATCH v2 2/7] platform/x86: Cache pci_dev in struct hsmp_socket Suma Hegde
@ 2023-12-20 17:00 ` Ilpo Järvinen
0 siblings, 0 replies; 17+ messages in thread
From: Ilpo Järvinen @ 2023-12-20 17:00 UTC (permalink / raw)
To: Suma Hegde; +Cc: platform-driver-x86, Hans de Goede, Naveen Krishna Chatradhi
[-- Attachment #1: Type: text/plain, Size: 665 bytes --]
On Wed, 20 Dec 2023, Suma Hegde wrote:
> Cache pci_dev obj during probe as part of struct hsmp_socket
> and use in amd_hsmp_rdwr(). This change will make it easier to
> support both non-ACPI and ACPI devices.
>
> Also add a check for sock_index agsint number of sockets
> in the hsmp_send_message().
>
> Signed-off-by: Suma Hegde <suma.hegde@amd.com>
> Signed-off-by: Naveen Krishna Chatradhi <nchatrad@amd.com>
> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
>
> Changes since v1:
> 1. Remove !sock check in hsmp_send_message()
> 2. Add "Reviewed-by: Hans de Goede <hdegoede@redhat.com>"
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
--
i.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v2 1/7] platform/x86: Move hsmp_test to probe
2023-12-20 16:55 ` [PATCH v2 1/7] platform/x86: Move hsmp_test to probe Suma Hegde
@ 2023-12-20 17:04 ` Ilpo Järvinen
0 siblings, 0 replies; 17+ messages in thread
From: Ilpo Järvinen @ 2023-12-20 17:04 UTC (permalink / raw)
To: Suma Hegde; +Cc: platform-driver-x86, Hans de Goede, Naveen Krishna Chatradhi
[-- Attachment #1: Type: text/plain, Size: 3252 bytes --]
On Wed, 20 Dec 2023, Suma Hegde wrote:
> This is in advance to supporting ACPI based probe.
>
> In case of non-ACPI driver, hsmp_test() can be
> performed either in plat init() or in probe().
>
> however, in case of ACPI probing, hsmp_test() cannot
> be called in init(), as the mailbox reg offsets and
> base addresses are read from ACPI table in the probe().
>
> Hence, move hsmp_test() to probe as preparation for
> ACPI support.
>
> Also use hsmp_send_message() directly in hsmp_test()
> as the semaphore is already initialized in probe.
>
> Signed-off-by: Suma Hegde <suma.hegde@amd.com>
> Signed-off-by: Naveen Krishna Chatradhi <nchatrad@amd.com>
> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
>
> Changed since v1:
> 1. Add "Reviewed-by: Hans de Goede <hdegoede@redhat.com>"
>
> ---
> drivers/platform/x86/amd/hsmp.c | 30 +++++++++++-------------------
> 1 file changed, 11 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/platform/x86/amd/hsmp.c b/drivers/platform/x86/amd/hsmp.c
> index b55d80e29139..3c17b488f4f8 100644
> --- a/drivers/platform/x86/amd/hsmp.c
> +++ b/drivers/platform/x86/amd/hsmp.c
> @@ -244,12 +244,7 @@ EXPORT_SYMBOL_GPL(hsmp_send_message);
> static int hsmp_test(u16 sock_ind, u32 value)
> {
> struct hsmp_message msg = { 0 };
> - struct amd_northbridge *nb;
> - int ret = -ENODEV;
> -
> - nb = node_to_amd_nb(sock_ind);
> - if (!nb || !nb->root)
> - return ret;
> + int ret;
>
> /*
> * Test the hsmp port by performing TEST command. The test message
> @@ -261,7 +256,7 @@ static int hsmp_test(u16 sock_ind, u32 value)
> msg.args[0] = value;
> msg.sock_ind = sock_ind;
>
> - ret = __hsmp_send_message(nb->root, &msg);
> + ret = hsmp_send_message(&msg);
> if (ret)
> return ret;
>
> @@ -504,6 +499,15 @@ static int hsmp_pltdrv_probe(struct platform_device *pdev)
> for (i = 0; i < plat_dev.num_sockets; i++) {
> sema_init(&plat_dev.sock[i].hsmp_sem, 1);
> plat_dev.sock[i].sock_ind = i;
> +
> + /* Test the hsmp interface on each socket */
> + ret = hsmp_test(i, 0xDEADBEEF);
> + if (ret) {
> + pr_err("HSMP test message failed on Fam:%x model:%x\n",
> + boot_cpu_data.x86, boot_cpu_data.x86_model);
> + pr_err("Is HSMP disabled in BIOS ?\n");
> + return ret;
> + }
> }
>
> plat_dev.hsmp_device.name = HSMP_CDEV_NAME;
> @@ -544,7 +548,6 @@ static struct platform_device *amd_hsmp_platdev;
> static int __init hsmp_plt_init(void)
> {
> int ret = -ENODEV;
> - int i;
>
> if (boot_cpu_data.x86_vendor != X86_VENDOR_AMD || boot_cpu_data.x86 < 0x19) {
> pr_err("HSMP is not supported on Family:%x model:%x\n",
> @@ -560,17 +563,6 @@ static int __init hsmp_plt_init(void)
> if (plat_dev.num_sockets == 0)
> return ret;
>
> - /* Test the hsmp interface on each socket */
> - for (i = 0; i < plat_dev.num_sockets; i++) {
> - ret = hsmp_test(i, 0xDEADBEEF);
> - if (ret) {
> - pr_err("HSMP test message failed on Fam:%x model:%x\n",
> - boot_cpu_data.x86, boot_cpu_data.x86_model);
> - pr_err("Is HSMP disabled in BIOS ?\n");
> - return ret;
> - }
> - }
> -
> ret = platform_driver_register(&amd_hsmp_driver);
> if (ret)
> return ret;
>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
--
i.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v2 3/7] platform/x86: Create static func to handle platdev
2023-12-20 16:55 ` [PATCH v2 3/7] platform/x86: Create static func to handle platdev Suma Hegde
@ 2023-12-20 17:08 ` Ilpo Järvinen
0 siblings, 0 replies; 17+ messages in thread
From: Ilpo Järvinen @ 2023-12-20 17:08 UTC (permalink / raw)
To: Suma Hegde; +Cc: platform-driver-x86, Hans de Goede, Naveen Krishna Chatradhi
[-- Attachment #1: Type: text/plain, Size: 2056 bytes --]
On Wed, 20 Dec 2023, Suma Hegde wrote:
> Create a static function and call platform device alloc and add device,
> which will simplify handling acpi and plat device probing.
>
> Signed-off-by: Suma Hegde <suma.hegde@amd.com>
> Signed-off-by: Naveen Krishna Chatradhi <nchatrad@amd.com>
> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
>
> Changes since v1:
> 1. Replace -1 with PLATFORM_DEVID_NONE in platform_device_alloc()
> 2. Add "Reviewed-by: Hans de Goede <hdegoede@redhat.com>"
>
> ---
> drivers/platform/x86/amd/hsmp.c | 33 ++++++++++++++++++---------------
> 1 file changed, 18 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/platform/x86/amd/hsmp.c b/drivers/platform/x86/amd/hsmp.c
> index 1a2abe4460f9..e3354683b138 100644
> --- a/drivers/platform/x86/amd/hsmp.c
> +++ b/drivers/platform/x86/amd/hsmp.c
> @@ -551,6 +551,21 @@ static struct platform_driver amd_hsmp_driver = {
>
> static struct platform_device *amd_hsmp_platdev;
>
> +static int hsmp_plat_dev_register(void)
> +{
> + int ret;
> +
> + amd_hsmp_platdev = platform_device_alloc(DRIVER_NAME, PLATFORM_DEVID_NONE);
> + if (!amd_hsmp_platdev)
> + return -ENOMEM;
> +
> + ret = platform_device_add(amd_hsmp_platdev);
> + if (ret)
> + platform_device_put(amd_hsmp_platdev);
> +
> + return ret;
> +}
> +
> static int __init hsmp_plt_init(void)
> {
> int ret = -ENODEV;
> @@ -573,22 +588,10 @@ static int __init hsmp_plt_init(void)
> if (ret)
> return ret;
>
> - amd_hsmp_platdev = platform_device_alloc(DRIVER_NAME, PLATFORM_DEVID_NONE);
> - if (!amd_hsmp_platdev) {
> - ret = -ENOMEM;
> - goto drv_unregister;
> - }
> -
> - ret = platform_device_add(amd_hsmp_platdev);
> - if (ret) {
> - platform_device_put(amd_hsmp_platdev);
> - goto drv_unregister;
> - }
> -
> - return 0;
> + ret = hsmp_plat_dev_register();
> + if (ret)
> + platform_driver_unregister(&amd_hsmp_driver);
>
> -drv_unregister:
> - platform_driver_unregister(&amd_hsmp_driver);
> return ret;
> }
>
>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
--
i.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v2 4/7] platform/x86: Define a struct to hold mailbox regs
2023-12-20 16:55 ` [PATCH v2 4/7] platform/x86: Define a struct to hold mailbox regs Suma Hegde
@ 2023-12-20 17:12 ` Ilpo Järvinen
0 siblings, 0 replies; 17+ messages in thread
From: Ilpo Järvinen @ 2023-12-20 17:12 UTC (permalink / raw)
To: Suma Hegde; +Cc: platform-driver-x86, Hans de Goede, Naveen Krishna Chatradhi
[-- Attachment #1: Type: text/plain, Size: 693 bytes --]
On Wed, 20 Dec 2023, Suma Hegde wrote:
> Define struct hsmp_mbaddr_info with register offsets and populate
> them during probe, which avoids the usage of macros in core functions.
>
> During ACPI probe, the same fields can be populated from ACPI table.
>
> Also move plat dev init to a static function.
>
> Signed-off-by: Suma Hegde <suma.hegde@amd.com>
> Signed-off-by: Naveen Krishna Chatradhi <nchatrad@amd.com>
>
> Changes since v1:
> Move hsmp_test() to initialize_platdev()
>
> ---
> drivers/platform/x86/amd/hsmp.c | 72 +++++++++++++++++++++++----------
> 1 file changed, 50 insertions(+), 22 deletions(-)
>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
--
i.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v2 5/7] platform/x86: Move dev from platdev to hsmp_socket
2023-12-20 16:55 ` [PATCH v2 5/7] platform/x86: Move dev from platdev to hsmp_socket Suma Hegde
@ 2023-12-20 17:18 ` Ilpo Järvinen
2023-12-20 17:20 ` Ilpo Järvinen
1 sibling, 0 replies; 17+ messages in thread
From: Ilpo Järvinen @ 2023-12-20 17:18 UTC (permalink / raw)
To: Suma Hegde; +Cc: platform-driver-x86, Hans de Goede, Naveen Krishna Chatradhi
[-- Attachment #1: Type: text/plain, Size: 6176 bytes --]
On Wed, 20 Dec 2023, Suma Hegde wrote:
> On an ACPI enabled platforms the probe is called for each socket
> and the struct dev is different for each socket. This change
> will help in handling both ACPI and non-ACPI platforms.
>
> Also change pr_err to dev_err API.
>
> Signed-off-by: Suma Hegde <suma.hegde@amd.com>
> Signed-off-by: Naveen Krishna Chatradhi <nchatrad@amd.com>
> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
>
> Changes since v1:
> Add "Reviewed-by: Hans de Goede <hdegoede@redhat.com>"
>
> ---
Just noticed this... Please put the version history under --- line because
then you'll save us maintainers time, if you put it above that separator,
the tools will not cut it away automatically.
> drivers/platform/x86/amd/hsmp.c | 42 +++++++++++++++++----------------
> 1 file changed, 22 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/platform/x86/amd/hsmp.c b/drivers/platform/x86/amd/hsmp.c
> index 6beca5787e55..3508399c6aa9 100644
> --- a/drivers/platform/x86/amd/hsmp.c
> +++ b/drivers/platform/x86/amd/hsmp.c
> @@ -69,13 +69,13 @@ struct hsmp_socket {
> struct semaphore hsmp_sem;
> char name[HSMP_ATTR_GRP_NAME_SIZE];
> struct pci_dev *root;
> + struct device *dev;
> u16 sock_ind;
> };
>
> struct hsmp_plat_device {
> struct miscdevice hsmp_device;
> struct hsmp_socket *sock;
> - struct device *dev;
> u32 proto_ver;
> u16 num_sockets;
> };
> @@ -278,8 +278,9 @@ static int hsmp_test(u16 sock_ind, u32 value)
>
> /* Check the response value */
> if (msg.args[0] != (value + 1)) {
> - pr_err("Socket %d test message failed, Expected 0x%08X, received 0x%08X\n",
> - sock_ind, (value + 1), msg.args[0]);
> + dev_err(plat_dev.sock[sock_ind].dev,
> + "Socket %d test message failed, Expected 0x%08X, received 0x%08X\n",
> + sock_ind, (value + 1), msg.args[0]);
> return -EBADE;
> }
>
> @@ -358,12 +359,12 @@ static ssize_t hsmp_metric_tbl_read(struct file *filp, struct kobject *kobj,
>
> /* Do not support lseek(), reads entire metric table */
> if (count < bin_attr->size) {
> - dev_err(plat_dev.dev, "Wrong buffer size\n");
> + dev_err(sock->dev, "Wrong buffer size\n");
> return -EINVAL;
> }
>
> if (!sock) {
> - dev_err(plat_dev.dev, "Failed to read attribute private data\n");
> + dev_err(sock->dev, "Failed to read attribute private data\n");
> return -EINVAL;
> }
>
> @@ -399,13 +400,13 @@ static int hsmp_get_tbl_dram_base(u16 sock_ind)
> */
> dram_addr = msg.args[0] | ((u64)(msg.args[1]) << 32);
> if (!dram_addr) {
> - dev_err(plat_dev.dev, "Invalid DRAM address for metric table\n");
> + dev_err(sock->dev, "Invalid DRAM address for metric table\n");
> return -ENOMEM;
> }
> - sock->metric_tbl_addr = devm_ioremap(plat_dev.dev, dram_addr,
> + sock->metric_tbl_addr = devm_ioremap(sock->dev, dram_addr,
> sizeof(struct hsmp_metric_table));
> if (!sock->metric_tbl_addr) {
> - dev_err(plat_dev.dev, "Failed to ioremap metric table addr\n");
> + dev_err(sock->dev, "Failed to ioremap metric table addr\n");
> return -ENOMEM;
> }
> return 0;
> @@ -453,14 +454,15 @@ static int hsmp_create_sysfs_interface(void)
> if (WARN_ON(plat_dev.num_sockets > U8_MAX))
> return -ERANGE;
>
> - hsmp_attr_grps = devm_kzalloc(plat_dev.dev, sizeof(struct attribute_group *) *
> + hsmp_attr_grps = devm_kzalloc(plat_dev.sock[0].dev, sizeof(struct attribute_group *) *
> (plat_dev.num_sockets + 1), GFP_KERNEL);
> if (!hsmp_attr_grps)
> return -ENOMEM;
>
> /* Create a sysfs directory for each socket */
> for (i = 0; i < plat_dev.num_sockets; i++) {
> - attr_grp = devm_kzalloc(plat_dev.dev, sizeof(struct attribute_group), GFP_KERNEL);
> + attr_grp = devm_kzalloc(plat_dev.sock[i].dev, sizeof(struct attribute_group),
> + GFP_KERNEL);
> if (!attr_grp)
> return -ENOMEM;
>
> @@ -468,7 +470,7 @@ static int hsmp_create_sysfs_interface(void)
> attr_grp->name = plat_dev.sock[i].name;
>
> /* Null terminated list of attributes */
> - hsmp_bin_attrs = devm_kzalloc(plat_dev.dev, sizeof(struct bin_attribute *) *
> + hsmp_bin_attrs = devm_kzalloc(plat_dev.sock[i].dev, sizeof(struct bin_attribute *) *
> (NUM_HSMP_ATTRS + 1), GFP_KERNEL);
> if (!hsmp_bin_attrs)
> return -ENOMEM;
> @@ -482,7 +484,7 @@ static int hsmp_create_sysfs_interface(void)
> if (ret)
> return ret;
> }
> - return devm_device_add_groups(plat_dev.dev, hsmp_attr_grps);
> + return devm_device_add_groups(plat_dev.sock[0].dev, hsmp_attr_grps);
> }
>
> static int hsmp_cache_proto_ver(void)
> @@ -501,7 +503,7 @@ static int hsmp_cache_proto_ver(void)
> return ret;
> }
>
> -static int initialize_platdev(void)
> +static int initialize_platdev(struct device *dev)
> {
> int ret, i;
>
> @@ -510,6 +512,7 @@ static int initialize_platdev(void)
> return -ENODEV;
> plat_dev.sock[i].root = node_to_amd_nb(i)->root;
> plat_dev.sock[i].sock_ind = i;
> + plat_dev.sock[i].dev = dev;
> plat_dev.sock[i].mbinfo.base_addr = SMN_HSMP_BASE;
> plat_dev.sock[i].mbinfo.msg_id_off = SMN_HSMP_MSG_ID;
> plat_dev.sock[i].mbinfo.msg_resp_off = SMN_HSMP_MSG_RESP;
> @@ -519,9 +522,9 @@ static int initialize_platdev(void)
> /* Test the hsmp interface on each socket */
> ret = hsmp_test(i, 0xDEADBEEF);
> if (ret) {
> - pr_err("HSMP test message failed on Fam:%x model:%x\n",
> - boot_cpu_data.x86, boot_cpu_data.x86_model);
> - pr_err("Is HSMP disabled in BIOS ?\n");
> + dev_err(dev, "HSMP test message failed on Fam:%x model:%x\n",
> + boot_cpu_data.x86, boot_cpu_data.x86_model);
> + dev_err(dev, "Is HSMP disabled in BIOS ?\n");
> return ret;
> }
> }
> @@ -538,9 +541,8 @@ static int hsmp_pltdrv_probe(struct platform_device *pdev)
> GFP_KERNEL);
> if (!plat_dev.sock)
> return -ENOMEM;
> - plat_dev.dev = &pdev->dev;
>
> - ret = initialize_platdev();
> + ret = initialize_platdev(&pdev->dev);
It would feel a bit more natural to pass pdev to initialize_platdev() and
deref ->dev only inside it but this is not a correctness issue.
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
--
i.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v2 5/7] platform/x86: Move dev from platdev to hsmp_socket
2023-12-20 16:55 ` [PATCH v2 5/7] platform/x86: Move dev from platdev to hsmp_socket Suma Hegde
2023-12-20 17:18 ` Ilpo Järvinen
@ 2023-12-20 17:20 ` Ilpo Järvinen
1 sibling, 0 replies; 17+ messages in thread
From: Ilpo Järvinen @ 2023-12-20 17:20 UTC (permalink / raw)
To: Suma Hegde; +Cc: platform-driver-x86, Hans de Goede, Naveen Krishna Chatradhi
On Wed, 20 Dec 2023, Suma Hegde wrote:
> On an ACPI enabled platforms the probe is called for each socket
> and the struct dev is different for each socket. This change
> will help in handling both ACPI and non-ACPI platforms.
>
> Also change pr_err to dev_err API.
Also, add () to function (or like them, some printk wrappers might
actually be macros but it doesn't matter for the changelog) names such as
pr_err() and dev_err().
--
i.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v2 6/7] platform/x86: Convert to ACPI based probing
2023-12-20 16:55 ` [PATCH v2 6/7] platform/x86: Convert to ACPI based probing Suma Hegde
@ 2023-12-20 17:34 ` Ilpo Järvinen
2023-12-21 10:27 ` Hegde, Suma
0 siblings, 1 reply; 17+ messages in thread
From: Ilpo Järvinen @ 2023-12-20 17:34 UTC (permalink / raw)
To: Suma Hegde; +Cc: platform-driver-x86, Hans de Goede, Naveen Krishna Chatradhi
On Wed, 20 Dec 2023, Suma Hegde wrote:
> ACPI table provides mailbox base address and register offset
> information. The base address is provided as part of CRS method
> and mailbox offsets are provided through DSD table.
> Sockets are differentiated by UIDs.
>
> Signed-off-by: Suma Hegde <suma.hegde@amd.com>
> Signed-off-by: Naveen Krishna Chatradhi <nchatrad@amd.com>
>
> Changes since v1:
> 1. Define amd_hsmp_acpi_rdwr() for doing mailbox memory mapped io
> 2. Add a check to see if mailbox register offsets are set in
> hsmp_read_acpi_dsd()
> 3. Add a check to see if sock->mbinfo.base_addr sockck->mbinfo.size are
> set in hsmp_read_acpi_crs()
> 4. Change order of the statements in switch case ACPI_RESOURCE_TYPE_FIXED_MEMORY32
> in hsmp_resource()
> 5. Add hsmp_test() after hsmp_parse_acpi_table() call
> 6. Add r.end < r.start check in hsmp_resource()
> 7. Add !dsd error check in hsmp_read_acpi_dsd
>
> ---
> drivers/platform/x86/amd/hsmp.c | 323 +++++++++++++++++++++++++++++---
> 1 file changed, 296 insertions(+), 27 deletions(-)
>
> diff --git a/drivers/platform/x86/amd/hsmp.c b/drivers/platform/x86/amd/hsmp.c
> index 3508399c6aa9..726ba73e23dd 100644
> --- a/drivers/platform/x86/amd/hsmp.c
> +++ b/drivers/platform/x86/amd/hsmp.c
> @@ -18,9 +18,11 @@
> #include <linux/pci.h>
> #include <linux/platform_device.h>
> #include <linux/semaphore.h>
> +#include <linux/acpi.h>
>
> #define DRIVER_NAME "amd_hsmp"
> -#define DRIVER_VERSION "2.0"
> +#define DRIVER_VERSION "2.2"
> +#define ACPI_HSMP_DEVICE_HID "AMDI0097"
>
> /* HSMP Status / Error codes */
> #define HSMP_STATUS_NOT_READY 0x00
> @@ -54,6 +56,11 @@
>
> #define HSMP_ATTR_GRP_NAME_SIZE 10
>
> +/* These are the strings specified in ACPI table */
> +#define MSG_IDOFF_STR "MsgIdOffset"
> +#define MSG_ARGOFF_STR "MsgArgOffset"
> +#define MSG_RESPOFF_STR "MsgRspOffset"
> +
> struct hsmp_mbaddr_info {
> u32 base_addr;
> u32 msg_id_off;
> @@ -66,6 +73,7 @@ struct hsmp_socket {
> struct bin_attribute hsmp_attr;
> struct hsmp_mbaddr_info mbinfo;
> void __iomem *metric_tbl_addr;
> + void __iomem *virt_base_addr;
> struct semaphore hsmp_sem;
> char name[HSMP_ATTR_GRP_NAME_SIZE];
> struct pci_dev *root;
> @@ -78,12 +86,14 @@ struct hsmp_plat_device {
> struct hsmp_socket *sock;
> u32 proto_ver;
> u16 num_sockets;
> + bool is_acpi_device;
> + bool is_probed;
> };
>
> static struct hsmp_plat_device plat_dev;
>
> -static int amd_hsmp_rdwr(struct hsmp_socket *sock, u32 offset,
> - u32 *value, bool write)
> +static int amd_hsmp_pci_rdwr(struct hsmp_socket *sock, u32 offset,
> + u32 *value, bool write)
> {
> int ret;
>
> @@ -101,8 +111,29 @@ static int amd_hsmp_rdwr(struct hsmp_socket *sock, u32 offset,
> return ret;
> }
>
> +static void amd_hsmp_acpi_rdwr(struct hsmp_socket *sock, u32 offset,
> + u32 *value, bool write)
> +{
> + if (write)
> + iowrite32(*value, sock->virt_base_addr + offset);
> + else
> + *value = ioread32(sock->virt_base_addr + offset);
> +}
> +
> +static int amd_hsmp_rdwr(struct hsmp_socket *sock, u32 offset,
> + u32 *value, bool write)
> +{
> + if (plat_dev.is_acpi_device)
> + amd_hsmp_acpi_rdwr(sock, offset, value, write);
> + else
> + return amd_hsmp_pci_rdwr(sock, offset, value, write);
> +
> + return 0;
> +}
> +
> /*
> - * Send a message to the HSMP port via PCI-e config space registers.
> + * Send a message to the HSMP port via PCI-e config space registers
> + * or by writing to MMIO space.
> *
> * The caller is expected to zero out any unused arguments.
> * If a response is expected, the number of response words should be greater than 0.
> @@ -450,6 +481,9 @@ static int hsmp_create_sysfs_interface(void)
> int ret;
> u16 i;
>
> + if (plat_dev.is_acpi_device)
> + return 0;
> +
> /* String formatting is currently limited to u8 sockets */
> if (WARN_ON(plat_dev.num_sockets > U8_MAX))
> return -ERANGE;
> @@ -487,13 +521,188 @@ static int hsmp_create_sysfs_interface(void)
> return devm_device_add_groups(plat_dev.sock[0].dev, hsmp_attr_grps);
> }
>
> -static int hsmp_cache_proto_ver(void)
> +/* This is the UUID used for HSMP */
> +static const guid_t acpi_hsmp_uuid = GUID_INIT(0xb74d619d, 0x5707, 0x48bd,
> + 0xa6, 0x9f, 0x4e, 0xa2,
> + 0x87, 0x1f, 0xc2, 0xf6);
> +
> +static inline bool is_acpi_hsmp_uuid(union acpi_object *obj)
> +{
> + if (obj->type == ACPI_TYPE_BUFFER && obj->buffer.length == 16)
> + return guid_equal((guid_t *)obj->buffer.pointer, &acpi_hsmp_uuid);
> +
> + return false;
> +}
> +
> +static inline int hsmp_get_uid(struct device *dev, u16 *sock_ind)
> +{
> + char *uid;
> +
> + /*
> + * UID (ID00, ID01..IDXX) is used for differentiating sockets,
> + * read it and strip the "ID" part of it and convert the remaining
> + * bytes to integer.
> + */
> + uid = acpi_device_uid(ACPI_COMPANION(dev));
> +
> + return kstrtou16((uid + 2), 10, sock_ind);
> +}
> +
> +static acpi_status hsmp_resource(struct acpi_resource *res, void *data)
> +{
> + struct hsmp_socket *sock = data;
> + struct resource r;
> +
> + switch (res->type) {
> + case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
> + if (!acpi_dev_resource_memory(res, &r))
> + return AE_ERROR;
> + if (!r.start || r.end < r.start || !(r.flags & IORESOURCE_MEM_WRITEABLE))
> + return AE_ERROR;
> + sock->mbinfo.base_addr = r.start;
> + sock->mbinfo.size = r.end - r.start + 1;
resource_size(r)
> + break;
> + case ACPI_RESOURCE_TYPE_END_TAG:
> + break;
> + default:
> + return AE_ERROR;
> + }
> +
> + return AE_OK;
> +}
> +
> +static int hsmp_read_acpi_dsd(struct hsmp_socket *sock)
> +{
> + struct acpi_buffer buf = { ACPI_ALLOCATE_BUFFER, NULL };
> + union acpi_object *guid, *mailbox_package;
> + union acpi_object *dsd;
> + acpi_status status;
> + int ret = 0;
> + int j;
> +
> + status = acpi_evaluate_object_typed(ACPI_HANDLE(sock->dev), "_DSD", NULL,
> + &buf, ACPI_TYPE_PACKAGE);
> + if (ACPI_FAILURE(status)) {
> + dev_err(sock->dev, "Failed to read mailbox reg offsets from DSD table, err: %s\n",
> + acpi_format_exception(status));
> + return -EINVAL;
> + }
> +
> + dsd = buf.pointer;
> +
> + /* HSMP _DSD property should contain 2 objects.
> + * 1. guid which is an acpi object of type ACPI_TYPE_BUFFER
> + * 2. mailbox which is an acpi object of type ACPI_TYPE_PACKAGE
> + * This mailbox object contains 3 more acpi objects of type
> + * ACPI_TYPE_PACKAGE for holding msgid, msgresp, msgarg offsets
> + * these packages inturn contain 2 acpi objects of type
> + * ACPI_TYPE_STRING and ACPI_TYPE_INTEGER
> + */
> + if (!dsd || dsd->type != ACPI_TYPE_PACKAGE || dsd->package.count != 2) {
> + ret = -EINVAL;
> + goto free_buf;
> + }
> +
> + guid = &dsd->package.elements[0];
> + mailbox_package = &dsd->package.elements[1];
> + if (!is_acpi_hsmp_uuid(guid) || mailbox_package->type != ACPI_TYPE_PACKAGE) {
> + dev_err(sock->dev, "Invalid hsmp _DSD table data\n");
> + ret = -EINVAL;
> + goto free_buf;
> + }
> +
> + for (j = 0; j < mailbox_package->package.count; j++) {
> + union acpi_object *msgobj, *msgstr, *msgint;
> +
> + msgobj = &mailbox_package->package.elements[j];
> + msgstr = &msgobj->package.elements[0];
> + msgint = &msgobj->package.elements[1];
> +
> + /* package should have 1 string and 1 integer object */
> + if (msgobj->type != ACPI_TYPE_PACKAGE ||
> + msgstr->type != ACPI_TYPE_STRING ||
> + msgint->type != ACPI_TYPE_INTEGER) {
> + ret = -EINVAL;
> + goto free_buf;
> + }
> +
> + if (!strncmp(msgstr->string.pointer, MSG_IDOFF_STR,
> + msgstr->string.length)) {
> + sock->mbinfo.msg_id_off = msgint->integer.value;
> + } else if (!strncmp(msgstr->string.pointer, MSG_RESPOFF_STR,
> + msgstr->string.length)) {
> + sock->mbinfo.msg_resp_off = msgint->integer.value;
> + } else if (!strncmp(msgstr->string.pointer, MSG_ARGOFF_STR,
> + msgstr->string.length)) {
> + sock->mbinfo.msg_arg_off = msgint->integer.value;
> + } else {
> + ret = -EINVAL;
> + goto free_buf;
> + }
> + }
> +
> + if (!sock->mbinfo.msg_id_off || !sock->mbinfo.msg_resp_off ||
> + !sock->mbinfo.msg_arg_off)
> + ret = -EINVAL;
These smell like return -ENODEV or -ENOENT but I don't have an idea what
ACPI related funcs typically return.
> +free_buf:
> + ACPI_FREE(buf.pointer);
> + return ret;
> +}
> +
> +static int hsmp_read_acpi_crs(struct hsmp_socket *sock)
> +{
> + acpi_status status;
> +
> + status = acpi_walk_resources(ACPI_HANDLE(sock->dev), METHOD_NAME__CRS,
> + hsmp_resource, sock);
> + if (ACPI_FAILURE(status)) {
> + dev_err(sock->dev, "Failed to look up MP1 base address from CRS method, err: %s\n",
> + acpi_format_exception(status));
> + return -EINVAL;
> + }
> + if (!sock->mbinfo.base_addr || !sock->mbinfo.size)
> + return -EINVAL;
> +
> + /* The mapped region should be un cached */
> + sock->virt_base_addr = devm_ioremap_uc(sock->dev, sock->mbinfo.base_addr,
> + sock->mbinfo.size);
> + if (!sock->virt_base_addr) {
> + dev_err(sock->dev, "Failed to ioremap MP1 base address\n");
> + return -ENOMEM;
> + }
> +
> + return 0;
> +}
> +
> +/* Parse the ACPI table to read the data */
> +static int hsmp_parse_acpi_table(struct device *dev, u16 sock_ind)
> +{
> + struct hsmp_socket *sock = &plat_dev.sock[sock_ind];
> + int ret;
> +
> + sock->sock_ind = sock_ind;
> + sock->dev = dev;
> + plat_dev.is_acpi_device = true;
> +
> + sema_init(&sock->hsmp_sem, 1);
> +
> + /* Read MP1 base address from CRS method */
> + ret = hsmp_read_acpi_crs(sock);
> + if (ret)
> + return ret;
> +
> + /* Read mailbox offsets from DSD table */
> + return hsmp_read_acpi_dsd(sock);
> +}
> +
> +static int hsmp_cache_proto_ver(u16 sock_ind)
> {
> struct hsmp_message msg = { 0 };
> int ret;
>
> msg.msg_id = HSMP_GET_PROTO_VER;
> - msg.sock_ind = 0;
> + msg.sock_ind = sock_ind;
> msg.response_sz = hsmp_msg_desc_table[HSMP_GET_PROTO_VER].response_sz;
>
> ret = hsmp_send_message(&msg);
> @@ -532,28 +741,62 @@ static int initialize_platdev(struct device *dev)
> return 0;
> }
>
> +static const struct acpi_device_id amd_hsmp_acpi_ids[] = {
> + {ACPI_HSMP_DEVICE_HID, 0},
> + {}
> +};
> +MODULE_DEVICE_TABLE(acpi, amd_hsmp_acpi_ids);
> +
> static int hsmp_pltdrv_probe(struct platform_device *pdev)
> {
> + struct acpi_device *adev;
> + u16 sock_ind = 0;
> int ret;
>
> - plat_dev.sock = devm_kzalloc(&pdev->dev,
> - (plat_dev.num_sockets * sizeof(struct hsmp_socket)),
> - GFP_KERNEL);
> - if (!plat_dev.sock)
> - return -ENOMEM;
> -
> - ret = initialize_platdev(&pdev->dev);
> - if (ret)
> - return ret;
> + /*
> + * On ACPI supported BIOS, there is an ACPI HSMP device added for
> + * each socket, so the per socket probing, but the memory allocated for
> + * sockets should be contiguous to access it as an array,
> + * Hence allocate memory for all the sockets at once instead of allocating
> + * on each probe.
> + */
> + if (!plat_dev.is_probed) {
> + plat_dev.sock = devm_kzalloc(&pdev->dev,
> + (plat_dev.num_sockets * sizeof(struct hsmp_socket)),
> + GFP_KERNEL);
> + if (!plat_dev.sock)
> + return -ENOMEM;
> + }
>
> - plat_dev.hsmp_device.name = HSMP_CDEV_NAME;
> - plat_dev.hsmp_device.minor = MISC_DYNAMIC_MINOR;
> - plat_dev.hsmp_device.fops = &hsmp_fops;
> - plat_dev.hsmp_device.parent = &pdev->dev;
> - plat_dev.hsmp_device.nodename = HSMP_DEVNODE_NAME;
> - plat_dev.hsmp_device.mode = 0644;
> + adev = ACPI_COMPANION(&pdev->dev);
> + if (adev && !acpi_match_device_ids(adev, amd_hsmp_acpi_ids)) {
> + ret = hsmp_get_uid(&pdev->dev, &sock_ind);
> + if (ret)
> + return ret;
> + if (sock_ind >= plat_dev.num_sockets)
> + return -EINVAL;
Again, caller didn't provide invalid value here either.
> + ret = hsmp_parse_acpi_table(&pdev->dev, sock_ind);
> + if (ret) {
> + dev_err(&pdev->dev, "Failed to parse ACPI table\n");
> + return ret;
> + }
> + /* Test the hsmp interface */
> + ret = hsmp_test(sock_ind, 0xDEADBEEF);
> + if (ret) {
> + dev_err(&pdev->dev, "HSMP test message failed on Fam:%x model:%x\n",
> + boot_cpu_data.x86, boot_cpu_data.x86_model);
> + dev_err(&pdev->dev, "Is HSMP disabled in BIOS ?\n");
> + return ret;
> + }
> + } else {
> + ret = initialize_platdev(&pdev->dev);
> + if (ret) {
> + dev_err(&pdev->dev, "Failed to init HSMP mailbox\n");
> + return ret;
> + }
> + }
>
> - ret = hsmp_cache_proto_ver();
> + ret = hsmp_cache_proto_ver(sock_ind);
> if (ret) {
> dev_err(&pdev->dev, "Failed to read HSMP protocol version\n");
> return ret;
> @@ -563,12 +806,35 @@ static int hsmp_pltdrv_probe(struct platform_device *pdev)
> if (ret)
> dev_err(&pdev->dev, "Failed to create HSMP sysfs interface\n");
>
> - return misc_register(&plat_dev.hsmp_device);
> + if (!plat_dev.is_probed) {
> + plat_dev.hsmp_device.name = HSMP_CDEV_NAME;
> + plat_dev.hsmp_device.minor = MISC_DYNAMIC_MINOR;
> + plat_dev.hsmp_device.fops = &hsmp_fops;
> + plat_dev.hsmp_device.parent = &pdev->dev;
> + plat_dev.hsmp_device.nodename = HSMP_DEVNODE_NAME;
> + plat_dev.hsmp_device.mode = 0644;
> +
> + ret = misc_register(&plat_dev.hsmp_device);
> + if (ret)
> + return ret;
> +
> + plat_dev.is_probed = true;
> + }
> +
> + return 0;
> +
> }
>
> static void hsmp_pltdrv_remove(struct platform_device *pdev)
> {
> - misc_deregister(&plat_dev.hsmp_device);
> + /*
> + * We register only one misc_device even on multi socket system.
> + * So, deregister should happen only once.
> + */
> + if (plat_dev.is_probed) {
> + misc_deregister(&plat_dev.hsmp_device);
> + plat_dev.is_probed = false;
> + }
> }
>
> static struct platform_driver amd_hsmp_driver = {
> @@ -576,6 +842,7 @@ static struct platform_driver amd_hsmp_driver = {
> .remove_new = hsmp_pltdrv_remove,
> .driver = {
> .name = DRIVER_NAME,
> + .acpi_match_table = amd_hsmp_acpi_ids,
> },
> };
>
> @@ -618,9 +885,11 @@ static int __init hsmp_plt_init(void)
> if (ret)
> return ret;
>
> - ret = hsmp_plat_dev_register();
> - if (ret)
> - platform_driver_unregister(&amd_hsmp_driver);
> + if (!plat_dev.is_acpi_device) {
> + ret = hsmp_plat_dev_register();
> + if (ret)
> + platform_driver_unregister(&amd_hsmp_driver);
> + }
>
> return ret;
> }
>
--
i.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v2 7/7] platform/x86: Non-ACPI support for AMD F1A_M00~0Fh
2023-12-20 16:55 ` [PATCH v2 7/7] platform/x86: Non-ACPI support for AMD F1A_M00~0Fh Suma Hegde
@ 2023-12-20 17:40 ` Ilpo Järvinen
0 siblings, 0 replies; 17+ messages in thread
From: Ilpo Järvinen @ 2023-12-20 17:40 UTC (permalink / raw)
To: Suma Hegde; +Cc: platform-driver-x86, Hans de Goede, Naveen Krishna Chatradhi
[-- Attachment #1: Type: text/plain, Size: 2314 bytes --]
On Wed, 20 Dec 2023, Suma Hegde wrote:
> AMD EPYC family 0x1A and Model 0x0-0xF are having different
> mailbox message ID offset compared to previous
> platforms. In case of ACPI based BIOS, this information will be read
> from ACPI table, for non ACPI BIOS, this needs to be #defined.
non-ACPI
> Signed-off-by: Suma Hegde <suma.hegde@amd.com>
> Signed-off-by: Naveen Krishna Chatradhi <nchatrad@amd.com>
> Reviewed-by: Hans de Goede <hdegoede@redhat.com>
>
> Changes since v1:
> Add "Reviewed-by: Hans de Goede <hdegoede@redhat.com>"
>
> ---
> drivers/platform/x86/amd/hsmp.c | 21 ++++++++++++++++++++-
> 1 file changed, 20 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/platform/x86/amd/hsmp.c b/drivers/platform/x86/amd/hsmp.c
> index 726ba73e23dd..95afea56d333 100644
> --- a/drivers/platform/x86/amd/hsmp.c
> +++ b/drivers/platform/x86/amd/hsmp.c
> @@ -44,6 +44,7 @@
> */
> #define SMN_HSMP_BASE 0x3B00000
> #define SMN_HSMP_MSG_ID 0x0010534
> +#define SMN_HSMP_MSG_ID_F1A_M0H 0x0010934
> #define SMN_HSMP_MSG_RESP 0x0010980
> #define SMN_HSMP_MSG_DATA 0x00109E0
>
> @@ -712,6 +713,15 @@ static int hsmp_cache_proto_ver(u16 sock_ind)
> return ret;
> }
>
> +static inline bool is_f1a_m0h(void)
> +{
> + if (boot_cpu_data.x86 == 0x1A &&
> + (boot_cpu_data.x86_model >= 0x00 && boot_cpu_data.x86_model <= 0x0F))
> + return true;
> +
> + return false;
> +}
> +
> static int initialize_platdev(struct device *dev)
> {
> int ret, i;
> @@ -723,7 +733,16 @@ static int initialize_platdev(struct device *dev)
> plat_dev.sock[i].sock_ind = i;
> plat_dev.sock[i].dev = dev;
> plat_dev.sock[i].mbinfo.base_addr = SMN_HSMP_BASE;
> - plat_dev.sock[i].mbinfo.msg_id_off = SMN_HSMP_MSG_ID;
> +
> + /*
> + * This is a tranisitional change from non ACPI to ACPI, only
> + * family 0x1A, model 0x00 platform is supported for both ACPI and non ACPI.
non-ACPI x2
> + */
> + if (is_f1a_m0h())
> + plat_dev.sock[i].mbinfo.msg_id_off = SMN_HSMP_MSG_ID_F1A_M0H;
> + else
> + plat_dev.sock[i].mbinfo.msg_id_off = SMN_HSMP_MSG_ID;
You could have made all these lines shorter if you'd have added an local
variable for sock = &plat_dev.sock[i] (in the earlier patch where this was
introduced).
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
--
i.
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PATCH v2 6/7] platform/x86: Convert to ACPI based probing
2023-12-20 17:34 ` Ilpo Järvinen
@ 2023-12-21 10:27 ` Hegde, Suma
0 siblings, 0 replies; 17+ messages in thread
From: Hegde, Suma @ 2023-12-21 10:27 UTC (permalink / raw)
To: Ilpo Järvinen
Cc: platform-driver-x86, Hans de Goede, Naveen Krishna Chatradhi
Hi Ilpo,
On 12/20/2023 11:04 PM, Ilpo Järvinen wrote:
> Caution: This message originated from an External Source. Use proper caution when opening attachments, clicking links, or responding.
>
>
> On Wed, 20 Dec 2023, Suma Hegde wrote:
>
>> ACPI table provides mailbox base address and register offset
>> information. The base address is provided as part of CRS method
>> and mailbox offsets are provided through DSD table.
>> Sockets are differentiated by UIDs.
>>
>> Signed-off-by: Suma Hegde <suma.hegde@amd.com>
>> Signed-off-by: Naveen Krishna Chatradhi <nchatrad@amd.com>
>>
>> Changes since v1:
>> 1. Define amd_hsmp_acpi_rdwr() for doing mailbox memory mapped io
>> 2. Add a check to see if mailbox register offsets are set in
>> hsmp_read_acpi_dsd()
>> 3. Add a check to see if sock->mbinfo.base_addr sockck->mbinfo.size are
>> set in hsmp_read_acpi_crs()
>> 4. Change order of the statements in switch case ACPI_RESOURCE_TYPE_FIXED_MEMORY32
>> in hsmp_resource()
>> 5. Add hsmp_test() after hsmp_parse_acpi_table() call
>> 6. Add r.end < r.start check in hsmp_resource()
>> 7. Add !dsd error check in hsmp_read_acpi_dsd
>>
>> ---
>> drivers/platform/x86/amd/hsmp.c | 323 +++++++++++++++++++++++++++++---
>> 1 file changed, 296 insertions(+), 27 deletions(-)
>>
>> diff --git a/drivers/platform/x86/amd/hsmp.c b/drivers/platform/x86/amd/hsmp.c
>> index 3508399c6aa9..726ba73e23dd 100644
>> --- a/drivers/platform/x86/amd/hsmp.c
>> +++ b/drivers/platform/x86/amd/hsmp.c
>> @@ -18,9 +18,11 @@
>> #include <linux/pci.h>
>> #include <linux/platform_device.h>
>> #include <linux/semaphore.h>
>> +#include <linux/acpi.h>
>>
>> #define DRIVER_NAME "amd_hsmp"
>> -#define DRIVER_VERSION "2.0"
>> +#define DRIVER_VERSION "2.2"
>> +#define ACPI_HSMP_DEVICE_HID "AMDI0097"
>>
>> /* HSMP Status / Error codes */
>> #define HSMP_STATUS_NOT_READY 0x00
>> @@ -54,6 +56,11 @@
>>
>> #define HSMP_ATTR_GRP_NAME_SIZE 10
>>
>> +/* These are the strings specified in ACPI table */
>> +#define MSG_IDOFF_STR "MsgIdOffset"
>> +#define MSG_ARGOFF_STR "MsgArgOffset"
>> +#define MSG_RESPOFF_STR "MsgRspOffset"
>> +
>> struct hsmp_mbaddr_info {
>> u32 base_addr;
>> u32 msg_id_off;
>> @@ -66,6 +73,7 @@ struct hsmp_socket {
>> struct bin_attribute hsmp_attr;
>> struct hsmp_mbaddr_info mbinfo;
>> void __iomem *metric_tbl_addr;
>> + void __iomem *virt_base_addr;
>> struct semaphore hsmp_sem;
>> char name[HSMP_ATTR_GRP_NAME_SIZE];
>> struct pci_dev *root;
>> @@ -78,12 +86,14 @@ struct hsmp_plat_device {
>> struct hsmp_socket *sock;
>> u32 proto_ver;
>> u16 num_sockets;
>> + bool is_acpi_device;
>> + bool is_probed;
>> };
>>
>> static struct hsmp_plat_device plat_dev;
>>
>> -static int amd_hsmp_rdwr(struct hsmp_socket *sock, u32 offset,
>> - u32 *value, bool write)
>> +static int amd_hsmp_pci_rdwr(struct hsmp_socket *sock, u32 offset,
>> + u32 *value, bool write)
>> {
>> int ret;
>>
>> @@ -101,8 +111,29 @@ static int amd_hsmp_rdwr(struct hsmp_socket *sock, u32 offset,
>> return ret;
>> }
>>
>> +static void amd_hsmp_acpi_rdwr(struct hsmp_socket *sock, u32 offset,
>> + u32 *value, bool write)
>> +{
>> + if (write)
>> + iowrite32(*value, sock->virt_base_addr + offset);
>> + else
>> + *value = ioread32(sock->virt_base_addr + offset);
>> +}
>> +
>> +static int amd_hsmp_rdwr(struct hsmp_socket *sock, u32 offset,
>> + u32 *value, bool write)
>> +{
>> + if (plat_dev.is_acpi_device)
>> + amd_hsmp_acpi_rdwr(sock, offset, value, write);
>> + else
>> + return amd_hsmp_pci_rdwr(sock, offset, value, write);
>> +
>> + return 0;
>> +}
>> +
>> /*
>> - * Send a message to the HSMP port via PCI-e config space registers.
>> + * Send a message to the HSMP port via PCI-e config space registers
>> + * or by writing to MMIO space.
>> *
>> * The caller is expected to zero out any unused arguments.
>> * If a response is expected, the number of response words should be greater than 0.
>> @@ -450,6 +481,9 @@ static int hsmp_create_sysfs_interface(void)
>> int ret;
>> u16 i;
>>
>> + if (plat_dev.is_acpi_device)
>> + return 0;
>> +
>> /* String formatting is currently limited to u8 sockets */
>> if (WARN_ON(plat_dev.num_sockets > U8_MAX))
>> return -ERANGE;
>> @@ -487,13 +521,188 @@ static int hsmp_create_sysfs_interface(void)
>> return devm_device_add_groups(plat_dev.sock[0].dev, hsmp_attr_grps);
>> }
>>
>> -static int hsmp_cache_proto_ver(void)
>> +/* This is the UUID used for HSMP */
>> +static const guid_t acpi_hsmp_uuid = GUID_INIT(0xb74d619d, 0x5707, 0x48bd,
>> + 0xa6, 0x9f, 0x4e, 0xa2,
>> + 0x87, 0x1f, 0xc2, 0xf6);
>> +
>> +static inline bool is_acpi_hsmp_uuid(union acpi_object *obj)
>> +{
>> + if (obj->type == ACPI_TYPE_BUFFER && obj->buffer.length == 16)
>> + return guid_equal((guid_t *)obj->buffer.pointer, &acpi_hsmp_uuid);
>> +
>> + return false;
>> +}
>> +
>> +static inline int hsmp_get_uid(struct device *dev, u16 *sock_ind)
>> +{
>> + char *uid;
>> +
>> + /*
>> + * UID (ID00, ID01..IDXX) is used for differentiating sockets,
>> + * read it and strip the "ID" part of it and convert the remaining
>> + * bytes to integer.
>> + */
>> + uid = acpi_device_uid(ACPI_COMPANION(dev));
>> +
>> + return kstrtou16((uid + 2), 10, sock_ind);
>> +}
>> +
>> +static acpi_status hsmp_resource(struct acpi_resource *res, void *data)
>> +{
>> + struct hsmp_socket *sock = data;
>> + struct resource r;
>> +
>> + switch (res->type) {
>> + case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
>> + if (!acpi_dev_resource_memory(res, &r))
>> + return AE_ERROR;
>> + if (!r.start || r.end < r.start || !(r.flags & IORESOURCE_MEM_WRITEABLE))
>> + return AE_ERROR;
>> + sock->mbinfo.base_addr = r.start;
>> + sock->mbinfo.size = r.end - r.start + 1;
> resource_size(r)
>
>> + break;
>> + case ACPI_RESOURCE_TYPE_END_TAG:
>> + break;
>> + default:
>> + return AE_ERROR;
>> + }
>> +
>> + return AE_OK;
>> +}
>> +
>> +static int hsmp_read_acpi_dsd(struct hsmp_socket *sock)
>> +{
>> + struct acpi_buffer buf = { ACPI_ALLOCATE_BUFFER, NULL };
>> + union acpi_object *guid, *mailbox_package;
>> + union acpi_object *dsd;
>> + acpi_status status;
>> + int ret = 0;
>> + int j;
>> +
>> + status = acpi_evaluate_object_typed(ACPI_HANDLE(sock->dev), "_DSD", NULL,
>> + &buf, ACPI_TYPE_PACKAGE);
>> + if (ACPI_FAILURE(status)) {
>> + dev_err(sock->dev, "Failed to read mailbox reg offsets from DSD table, err: %s\n",
>> + acpi_format_exception(status));
>> + return -EINVAL;
>> + }
>> +
>> + dsd = buf.pointer;
>> +
>> + /* HSMP _DSD property should contain 2 objects.
>> + * 1. guid which is an acpi object of type ACPI_TYPE_BUFFER
>> + * 2. mailbox which is an acpi object of type ACPI_TYPE_PACKAGE
>> + * This mailbox object contains 3 more acpi objects of type
>> + * ACPI_TYPE_PACKAGE for holding msgid, msgresp, msgarg offsets
>> + * these packages inturn contain 2 acpi objects of type
>> + * ACPI_TYPE_STRING and ACPI_TYPE_INTEGER
>> + */
>> + if (!dsd || dsd->type != ACPI_TYPE_PACKAGE || dsd->package.count != 2) {
>> + ret = -EINVAL;
>> + goto free_buf;
>> + }
>> +
>> + guid = &dsd->package.elements[0];
>> + mailbox_package = &dsd->package.elements[1];
>> + if (!is_acpi_hsmp_uuid(guid) || mailbox_package->type != ACPI_TYPE_PACKAGE) {
>> + dev_err(sock->dev, "Invalid hsmp _DSD table data\n");
>> + ret = -EINVAL;
>> + goto free_buf;
>> + }
>> +
>> + for (j = 0; j < mailbox_package->package.count; j++) {
>> + union acpi_object *msgobj, *msgstr, *msgint;
>> +
>> + msgobj = &mailbox_package->package.elements[j];
>> + msgstr = &msgobj->package.elements[0];
>> + msgint = &msgobj->package.elements[1];
>> +
>> + /* package should have 1 string and 1 integer object */
>> + if (msgobj->type != ACPI_TYPE_PACKAGE ||
>> + msgstr->type != ACPI_TYPE_STRING ||
>> + msgint->type != ACPI_TYPE_INTEGER) {
>> + ret = -EINVAL;
>> + goto free_buf;
>> + }
>> +
>> + if (!strncmp(msgstr->string.pointer, MSG_IDOFF_STR,
>> + msgstr->string.length)) {
>> + sock->mbinfo.msg_id_off = msgint->integer.value;
>> + } else if (!strncmp(msgstr->string.pointer, MSG_RESPOFF_STR,
>> + msgstr->string.length)) {
>> + sock->mbinfo.msg_resp_off = msgint->integer.value;
>> + } else if (!strncmp(msgstr->string.pointer, MSG_ARGOFF_STR,
>> + msgstr->string.length)) {
>> + sock->mbinfo.msg_arg_off = msgint->integer.value;
>> + } else {
>> + ret = -EINVAL;
>> + goto free_buf;
>> + }
>> + }
>> +
>> + if (!sock->mbinfo.msg_id_off || !sock->mbinfo.msg_resp_off ||
>> + !sock->mbinfo.msg_arg_off)
>> + ret = -EINVAL;
> These smell like return -ENODEV or -ENOENT but I don't have an idea what
> ACPI related funcs typically return.
acpi_object is an input to this module, in that sense, we are returning
EINVAL.
I compared with few acpi drivers and accordingly changed to ENODEV and
ENOENT in some places and retained EINVAL in some places.
I will address the other comments also and send patch set 3.
>> +free_buf:
>> + ACPI_FREE(buf.pointer);
>> + return ret;
>> +}
>> +
>> +static int hsmp_read_acpi_crs(struct hsmp_socket *sock)
>> +{
>> + acpi_status status;
>> +
>> + status = acpi_walk_resources(ACPI_HANDLE(sock->dev), METHOD_NAME__CRS,
>> + hsmp_resource, sock);
>> + if (ACPI_FAILURE(status)) {
>> + dev_err(sock->dev, "Failed to look up MP1 base address from CRS method, err: %s\n",
>> + acpi_format_exception(status));
>> + return -EINVAL;
>> + }
>> + if (!sock->mbinfo.base_addr || !sock->mbinfo.size)
>> + return -EINVAL;
>> +
>> + /* The mapped region should be un cached */
>> + sock->virt_base_addr = devm_ioremap_uc(sock->dev, sock->mbinfo.base_addr,
>> + sock->mbinfo.size);
>> + if (!sock->virt_base_addr) {
>> + dev_err(sock->dev, "Failed to ioremap MP1 base address\n");
>> + return -ENOMEM;
>> + }
>> +
>> + return 0;
>> +}
>> +
>> +/* Parse the ACPI table to read the data */
>> +static int hsmp_parse_acpi_table(struct device *dev, u16 sock_ind)
>> +{
>> + struct hsmp_socket *sock = &plat_dev.sock[sock_ind];
>> + int ret;
>> +
>> + sock->sock_ind = sock_ind;
>> + sock->dev = dev;
>> + plat_dev.is_acpi_device = true;
>> +
>> + sema_init(&sock->hsmp_sem, 1);
>> +
>> + /* Read MP1 base address from CRS method */
>> + ret = hsmp_read_acpi_crs(sock);
>> + if (ret)
>> + return ret;
>> +
>> + /* Read mailbox offsets from DSD table */
>> + return hsmp_read_acpi_dsd(sock);
>> +}
>> +
>> +static int hsmp_cache_proto_ver(u16 sock_ind)
>> {
>> struct hsmp_message msg = { 0 };
>> int ret;
>>
>> msg.msg_id = HSMP_GET_PROTO_VER;
>> - msg.sock_ind = 0;
>> + msg.sock_ind = sock_ind;
>> msg.response_sz = hsmp_msg_desc_table[HSMP_GET_PROTO_VER].response_sz;
>>
>> ret = hsmp_send_message(&msg);
>> @@ -532,28 +741,62 @@ static int initialize_platdev(struct device *dev)
>> return 0;
>> }
>>
>> +static const struct acpi_device_id amd_hsmp_acpi_ids[] = {
>> + {ACPI_HSMP_DEVICE_HID, 0},
>> + {}
>> +};
>> +MODULE_DEVICE_TABLE(acpi, amd_hsmp_acpi_ids);
>> +
>> static int hsmp_pltdrv_probe(struct platform_device *pdev)
>> {
>> + struct acpi_device *adev;
>> + u16 sock_ind = 0;
>> int ret;
>>
>> - plat_dev.sock = devm_kzalloc(&pdev->dev,
>> - (plat_dev.num_sockets * sizeof(struct hsmp_socket)),
>> - GFP_KERNEL);
>> - if (!plat_dev.sock)
>> - return -ENOMEM;
>> -
>> - ret = initialize_platdev(&pdev->dev);
>> - if (ret)
>> - return ret;
>> + /*
>> + * On ACPI supported BIOS, there is an ACPI HSMP device added for
>> + * each socket, so the per socket probing, but the memory allocated for
>> + * sockets should be contiguous to access it as an array,
>> + * Hence allocate memory for all the sockets at once instead of allocating
>> + * on each probe.
>> + */
>> + if (!plat_dev.is_probed) {
>> + plat_dev.sock = devm_kzalloc(&pdev->dev,
>> + (plat_dev.num_sockets * sizeof(struct hsmp_socket)),
>> + GFP_KERNEL);
>> + if (!plat_dev.sock)
>> + return -ENOMEM;
>> + }
>>
>> - plat_dev.hsmp_device.name = HSMP_CDEV_NAME;
>> - plat_dev.hsmp_device.minor = MISC_DYNAMIC_MINOR;
>> - plat_dev.hsmp_device.fops = &hsmp_fops;
>> - plat_dev.hsmp_device.parent = &pdev->dev;
>> - plat_dev.hsmp_device.nodename = HSMP_DEVNODE_NAME;
>> - plat_dev.hsmp_device.mode = 0644;
>> + adev = ACPI_COMPANION(&pdev->dev);
>> + if (adev && !acpi_match_device_ids(adev, amd_hsmp_acpi_ids)) {
>> + ret = hsmp_get_uid(&pdev->dev, &sock_ind);
>> + if (ret)
>> + return ret;
>> + if (sock_ind >= plat_dev.num_sockets)
>> + return -EINVAL;
> Again, caller didn't provide invalid value here either.
>
>> + ret = hsmp_parse_acpi_table(&pdev->dev, sock_ind);
>> + if (ret) {
>> + dev_err(&pdev->dev, "Failed to parse ACPI table\n");
>> + return ret;
>> + }
>> + /* Test the hsmp interface */
>> + ret = hsmp_test(sock_ind, 0xDEADBEEF);
>> + if (ret) {
>> + dev_err(&pdev->dev, "HSMP test message failed on Fam:%x model:%x\n",
>> + boot_cpu_data.x86, boot_cpu_data.x86_model);
>> + dev_err(&pdev->dev, "Is HSMP disabled in BIOS ?\n");
>> + return ret;
>> + }
>> + } else {
>> + ret = initialize_platdev(&pdev->dev);
>> + if (ret) {
>> + dev_err(&pdev->dev, "Failed to init HSMP mailbox\n");
>> + return ret;
>> + }
>> + }
>>
>> - ret = hsmp_cache_proto_ver();
>> + ret = hsmp_cache_proto_ver(sock_ind);
>> if (ret) {
>> dev_err(&pdev->dev, "Failed to read HSMP protocol version\n");
>> return ret;
>> @@ -563,12 +806,35 @@ static int hsmp_pltdrv_probe(struct platform_device *pdev)
>> if (ret)
>> dev_err(&pdev->dev, "Failed to create HSMP sysfs interface\n");
>>
>> - return misc_register(&plat_dev.hsmp_device);
>> + if (!plat_dev.is_probed) {
>> + plat_dev.hsmp_device.name = HSMP_CDEV_NAME;
>> + plat_dev.hsmp_device.minor = MISC_DYNAMIC_MINOR;
>> + plat_dev.hsmp_device.fops = &hsmp_fops;
>> + plat_dev.hsmp_device.parent = &pdev->dev;
>> + plat_dev.hsmp_device.nodename = HSMP_DEVNODE_NAME;
>> + plat_dev.hsmp_device.mode = 0644;
>> +
>> + ret = misc_register(&plat_dev.hsmp_device);
>> + if (ret)
>> + return ret;
>> +
>> + plat_dev.is_probed = true;
>> + }
>> +
>> + return 0;
>> +
>> }
>>
>> static void hsmp_pltdrv_remove(struct platform_device *pdev)
>> {
>> - misc_deregister(&plat_dev.hsmp_device);
>> + /*
>> + * We register only one misc_device even on multi socket system.
>> + * So, deregister should happen only once.
>> + */
>> + if (plat_dev.is_probed) {
>> + misc_deregister(&plat_dev.hsmp_device);
>> + plat_dev.is_probed = false;
>> + }
>> }
>>
>> static struct platform_driver amd_hsmp_driver = {
>> @@ -576,6 +842,7 @@ static struct platform_driver amd_hsmp_driver = {
>> .remove_new = hsmp_pltdrv_remove,
>> .driver = {
>> .name = DRIVER_NAME,
>> + .acpi_match_table = amd_hsmp_acpi_ids,
>> },
>> };
>>
>> @@ -618,9 +885,11 @@ static int __init hsmp_plt_init(void)
>> if (ret)
>> return ret;
>>
>> - ret = hsmp_plat_dev_register();
>> - if (ret)
>> - platform_driver_unregister(&amd_hsmp_driver);
>> + if (!plat_dev.is_acpi_device) {
>> + ret = hsmp_plat_dev_register();
>> + if (ret)
>> + platform_driver_unregister(&amd_hsmp_driver);
>> + }
>>
>> return ret;
>> }
>>
> --
> i.
Thanks and Regards,
Suma
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2023-12-21 10:27 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-20 16:55 [PATCH v2 0/7] platform/x86: Add ACPI probing support for HSMP Suma Hegde
2023-12-20 16:55 ` [PATCH v2 1/7] platform/x86: Move hsmp_test to probe Suma Hegde
2023-12-20 17:04 ` Ilpo Järvinen
2023-12-20 16:55 ` [PATCH v2 2/7] platform/x86: Cache pci_dev in struct hsmp_socket Suma Hegde
2023-12-20 17:00 ` Ilpo Järvinen
2023-12-20 16:55 ` [PATCH v2 3/7] platform/x86: Create static func to handle platdev Suma Hegde
2023-12-20 17:08 ` Ilpo Järvinen
2023-12-20 16:55 ` [PATCH v2 4/7] platform/x86: Define a struct to hold mailbox regs Suma Hegde
2023-12-20 17:12 ` Ilpo Järvinen
2023-12-20 16:55 ` [PATCH v2 5/7] platform/x86: Move dev from platdev to hsmp_socket Suma Hegde
2023-12-20 17:18 ` Ilpo Järvinen
2023-12-20 17:20 ` Ilpo Järvinen
2023-12-20 16:55 ` [PATCH v2 6/7] platform/x86: Convert to ACPI based probing Suma Hegde
2023-12-20 17:34 ` Ilpo Järvinen
2023-12-21 10:27 ` Hegde, Suma
2023-12-20 16:55 ` [PATCH v2 7/7] platform/x86: Non-ACPI support for AMD F1A_M00~0Fh Suma Hegde
2023-12-20 17:40 ` Ilpo Järvinen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox