From: Suma Hegde <suma.hegde@amd.com>
To: <platform-driver-x86@vger.kernel.org>
Cc: <ilpo.jarvinen@linux.intel.com>, <hdegoede@redhat.com>,
Suma Hegde <suma.hegde@amd.com>,
Naveen Krishna Chatradhi <nchatrad@amd.com>
Subject: [PATCH v5 08/11] platform/x86/amd/hsmp: Non-ACPI support for AMD F1A_M00~0Fh
Date: Sat, 6 Jan 2024 02:25:29 +0000 [thread overview]
Message-ID: <20240106022532.1746932-8-suma.hegde@amd.com> (raw)
In-Reply-To: <20240106022532.1746932-1-suma.hegde@amd.com>
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>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
---
Changes since v4:
None
Changes since v3:
1. Correct the spelling mistake of "transitional" word
2. Move sema_init() statement
Changes since v2:
1. Change "non ACPI" to "non-ACPI"
2. Add "Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.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 723a92439438..05255102e0a0 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
@@ -736,6 +737,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 init_platform_device(struct device *dev)
{
struct hsmp_socket *sock;
@@ -749,7 +759,16 @@ static int init_platform_device(struct device *dev)
sock->sock_ind = i;
sock->dev = dev;
sock->mbinfo.base_addr = SMN_HSMP_BASE;
- sock->mbinfo.msg_id_off = SMN_HSMP_MSG_ID;
+
+ /*
+ * This is a transitional change from non-ACPI to ACPI, only
+ * family 0x1A, model 0x00 platform is supported for both ACPI and non-ACPI.
+ */
+ if (is_f1a_m0h())
+ sock->mbinfo.msg_id_off = SMN_HSMP_MSG_ID_F1A_M0H;
+ else
+ sock->mbinfo.msg_id_off = SMN_HSMP_MSG_ID;
+
sock->mbinfo.msg_resp_off = SMN_HSMP_MSG_RESP;
sock->mbinfo.msg_arg_off = SMN_HSMP_MSG_DATA;
sema_init(&sock->hsmp_sem, 1);
--
2.25.1
next prev parent reply other threads:[~2024-01-06 2:26 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-06 2:25 [PATCH v5 01/11] platform/x86/amd/hsmp: Move hsmp_test to probe Suma Hegde
2024-01-06 2:25 ` [PATCH v5 02/11] platform/x86/amd/hsmp: Cache pci_dev in struct hsmp_socket Suma Hegde
2024-01-06 2:25 ` [PATCH v5 03/11] platform/x86/amd/hsmp: Create static func to handle platdev Suma Hegde
2024-01-06 2:25 ` [PATCH v5 04/11] platform/x86/amd/hsmp: Define a struct to hold mailbox regs Suma Hegde
2024-01-06 2:25 ` [PATCH v5 05/11] platform/x86/amd/hsmp: Move dev from platdev to hsmp_socket Suma Hegde
2024-01-06 2:25 ` [PATCH v5 06/11] platform/x86/amd/hsmp: Restructure sysfs group creation Suma Hegde
2024-01-24 12:34 ` Ilpo Järvinen
2024-01-06 2:25 ` [PATCH v5 07/11] platform/x86/amd/hsmp: Add support for ACPI based probing Suma Hegde
2024-01-24 13:02 ` Ilpo Järvinen
2024-01-06 2:25 ` Suma Hegde [this message]
2024-01-06 2:25 ` [PATCH v5 09/11] platform/x86/amd/hsmp: Check num_sockets against MAX_AMD_SOCKETS Suma Hegde
2024-01-06 2:25 ` [PATCH v5 10/11] platform/x86/amd/hsmp: Change devm_kzalloc() to devm_kcalloc() Suma Hegde
2024-01-24 12:29 ` Ilpo Järvinen
2024-01-25 12:33 ` Ilpo Järvinen
2024-01-29 12:44 ` Ilpo Järvinen
2024-01-29 13:24 ` Hegde, Suma
2024-01-31 10:32 ` Ilpo Järvinen
2024-02-06 6:38 ` Hegde, Suma
2024-02-06 9:04 ` Ilpo Järvinen
2024-02-06 9:46 ` Hegde, Suma
2024-01-06 2:25 ` [PATCH v5 11/11] platform/x86/amd/hsmp: Remove extra parenthesis and add a space Suma Hegde
2024-01-24 12:25 ` Ilpo Järvinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240106022532.1746932-8-suma.hegde@amd.com \
--to=suma.hegde@amd.com \
--cc=hdegoede@redhat.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=nchatrad@amd.com \
--cc=platform-driver-x86@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox