From: "tip-bot2 for Ingo Molnar" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
"Borislav Petkov (AMD)" <bp@alien8.de>,
Carlos Bilbao <carlos.bilbao@kernel.org>,
"H. Peter Anvin" <hpa@zytor.com>,
Linus Torvalds <torvalds@linux-foundation.org>,
Mario Limonciello <superm1@kernel.org>,
Naveen Krishna Chatradhi <naveenkrishna.chatradhi@amd.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/merge] x86/platform/amd: Move the <asm/amd_hsmp.h> header to <asm/amd/hsmp.h>
Date: Mon, 14 Apr 2025 08:15:11 -0000 [thread overview]
Message-ID: <174461851159.31282.10980738237644163882.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250413084144.3746608-5-mingo@kernel.org>
The following commit has been merged into the x86/merge branch of tip:
Commit-ID: d96c78684166bc0e7997d12d845882cb5824eed3
Gitweb: https://git.kernel.org/tip/d96c78684166bc0e7997d12d845882cb5824eed3
Author: Ingo Molnar <mingo@kernel.org>
AuthorDate: Sun, 13 Apr 2025 10:41:42 +02:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Mon, 14 Apr 2025 09:34:17 +02:00
x86/platform/amd: Move the <asm/amd_hsmp.h> header to <asm/amd/hsmp.h>
Collect AMD specific platform header files in <asm/amd/*.h>.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Borislav Petkov (AMD) <bp@alien8.de>
Cc: Carlos Bilbao <carlos.bilbao@kernel.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mario Limonciello <superm1@kernel.org>
Cc: Naveen Krishna Chatradhi <naveenkrishna.chatradhi@amd.com>
Link: https://lore.kernel.org/r/20250413084144.3746608-5-mingo@kernel.org
---
MAINTAINERS | 2 +-
arch/x86/include/asm/amd/hsmp.h | 16 ++++++++++++++++
arch/x86/include/asm/amd_hsmp.h | 16 ----------------
drivers/platform/x86/amd/hsmp/acpi.c | 2 +-
drivers/platform/x86/amd/hsmp/hsmp.c | 2 +-
drivers/platform/x86/amd/hsmp/plat.c | 2 +-
6 files changed, 20 insertions(+), 20 deletions(-)
create mode 100644 arch/x86/include/asm/amd/hsmp.h
delete mode 100644 arch/x86/include/asm/amd_hsmp.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 61b9cc0..d4ea6d7 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1097,7 +1097,7 @@ R: Carlos Bilbao <carlos.bilbao@kernel.org>
L: platform-driver-x86@vger.kernel.org
S: Maintained
F: Documentation/arch/x86/amd_hsmp.rst
-F: arch/x86/include/asm/amd_hsmp.h
+F: arch/x86/include/asm/amd/hsmp.h
F: arch/x86/include/uapi/asm/amd_hsmp.h
F: drivers/platform/x86/amd/hsmp/
diff --git a/arch/x86/include/asm/amd/hsmp.h b/arch/x86/include/asm/amd/hsmp.h
new file mode 100644
index 0000000..03c2ce3
--- /dev/null
+++ b/arch/x86/include/asm/amd/hsmp.h
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+
+#ifndef _ASM_X86_AMD_HSMP_H_
+#define _ASM_X86_AMD_HSMP_H_
+
+#include <uapi/asm/amd_hsmp.h>
+
+#if IS_ENABLED(CONFIG_AMD_HSMP)
+int hsmp_send_message(struct hsmp_message *msg);
+#else
+static inline int hsmp_send_message(struct hsmp_message *msg)
+{
+ return -ENODEV;
+}
+#endif
+#endif /*_ASM_X86_AMD_HSMP_H_*/
diff --git a/arch/x86/include/asm/amd_hsmp.h b/arch/x86/include/asm/amd_hsmp.h
deleted file mode 100644
index 03c2ce3..0000000
--- a/arch/x86/include/asm/amd_hsmp.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-
-#ifndef _ASM_X86_AMD_HSMP_H_
-#define _ASM_X86_AMD_HSMP_H_
-
-#include <uapi/asm/amd_hsmp.h>
-
-#if IS_ENABLED(CONFIG_AMD_HSMP)
-int hsmp_send_message(struct hsmp_message *msg);
-#else
-static inline int hsmp_send_message(struct hsmp_message *msg)
-{
- return -ENODEV;
-}
-#endif
-#endif /*_ASM_X86_AMD_HSMP_H_*/
diff --git a/drivers/platform/x86/amd/hsmp/acpi.c b/drivers/platform/x86/amd/hsmp/acpi.c
index c1eccb3..3c7acb9 100644
--- a/drivers/platform/x86/amd/hsmp/acpi.c
+++ b/drivers/platform/x86/amd/hsmp/acpi.c
@@ -9,7 +9,7 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-#include <asm/amd_hsmp.h>
+#include <asm/amd/hsmp.h>
#include <linux/acpi.h>
#include <linux/device.h>
diff --git a/drivers/platform/x86/amd/hsmp/hsmp.c b/drivers/platform/x86/amd/hsmp/hsmp.c
index a3ac09a..e262e8a 100644
--- a/drivers/platform/x86/amd/hsmp/hsmp.c
+++ b/drivers/platform/x86/amd/hsmp/hsmp.c
@@ -7,7 +7,7 @@
* This file provides a device implementation for HSMP interface
*/
-#include <asm/amd_hsmp.h>
+#include <asm/amd/hsmp.h>
#include <linux/acpi.h>
#include <linux/delay.h>
diff --git a/drivers/platform/x86/amd/hsmp/plat.c b/drivers/platform/x86/amd/hsmp/plat.c
index b9782a0..0eb73fc 100644
--- a/drivers/platform/x86/amd/hsmp/plat.c
+++ b/drivers/platform/x86/amd/hsmp/plat.c
@@ -9,7 +9,7 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-#include <asm/amd_hsmp.h>
+#include <asm/amd/hsmp.h>
#include <linux/build_bug.h>
#include <linux/device.h>
next prev parent reply other threads:[~2025-04-14 8:15 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-13 8:41 [PATCH 0/6] x86/platform: Move AMD specific headers to <asm/amd/*.h> Ingo Molnar
2025-04-13 8:41 ` [PATCH 1/6] x86/platform/amd: Move the <asm/amd-ibs.h> header to <asm/amd/ibs.h> Ingo Molnar
2025-04-14 8:15 ` [tip: x86/merge] " tip-bot2 for Ingo Molnar
2025-04-13 8:41 ` [PATCH 2/6] x86/platform/amd: Add standard header guards " Ingo Molnar
2025-04-14 8:15 ` [tip: x86/merge] " tip-bot2 for Ingo Molnar
2025-04-13 8:41 ` [PATCH 3/6] x86/platform/amd: Move the <asm/amd_nb.h> header to <asm/amd/nb.h> Ingo Molnar
2025-04-14 8:15 ` [tip: x86/merge] " tip-bot2 for Ingo Molnar
2025-04-13 8:41 ` [PATCH 4/6] x86/platform/amd: Move the <asm/amd_hsmp.h> header to <asm/amd/hsmp.h> Ingo Molnar
2025-04-14 8:15 ` tip-bot2 for Ingo Molnar [this message]
2025-04-13 8:41 ` [PATCH 5/6] x86/platform/amd: Clean up the <asm/amd/hsmp.h> header guards a bit Ingo Molnar
2025-04-14 8:15 ` [tip: x86/merge] " tip-bot2 for Ingo Molnar
2025-04-13 8:41 ` [PATCH 6/6] x86/platform/amd: Move the <asm/amd_node.h> header to <asm/amd/node.h> Ingo Molnar
2025-04-14 8:15 ` [tip: x86/merge] " tip-bot2 for Ingo Molnar
2025-04-13 9:20 ` [PATCH 0/6] x86/platform: Move AMD specific headers to <asm/amd/*.h> Borislav Petkov
2025-04-13 18:35 ` Ingo Molnar
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=174461851159.31282.10980738237644163882.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@alien8.de \
--cc=carlos.bilbao@kernel.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=naveenkrishna.chatradhi@amd.com \
--cc=superm1@kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=x86@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
all inboxes | Powered by JetHome®