[PATCH 4/6] x86/platform/amd: Move the <asm/amd_hsmp.h> header to <asm/amd/hsmp.h>

[Ingo Molnar]

Collect AMD specific platform header files in <asm/amd/*.h>.

Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: Borislav Petkov <bp@xxxxxxxxx>
Cc: Mario Limonciello <superm1@xxxxxxxxxx>
Cc: Naveen Krishna Chatradhi <naveenkrishna.chatradhi@xxxxxxx>
Cc: Carlos Bilbao <carlos.bilbao@xxxxxxxxxx>
---
 Documentation/userspace-api/ioctl/ioctl-number.rst | 2 +-
 MAINTAINERS                                        | 4 ++--
 arch/x86/include/asm/{amd_hsmp.h => amd/hsmp.h}    | 2 +-
 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, 7 insertions(+), 7 deletions(-)

diff --git a/Documentation/userspace-api/ioctl/ioctl-number.rst b/Documentation/userspace-api/ioctl/ioctl-number.rst
index 7a1409ecc238..1142234335ab 100644
--- a/Documentation/userspace-api/ioctl/ioctl-number.rst
+++ b/Documentation/userspace-api/ioctl/ioctl-number.rst
@@ -395,7 +395,7 @@ Code  Seq#    Include File                                           Comments
                                                                      <mailto:thomas@xxxxxxxxxxxxxxxx>
 0xF6  all                                                            LTTng Linux Trace Toolkit Next Generation
                                                                      <mailto:mathieu.desnoyers@xxxxxxxxxxxx>
-0xF8  all    arch/x86/include/uapi/asm/amd_hsmp.h                    AMD HSMP EPYC system management interface driver
+0xF8  all    arch/x86/include/uapi/asm/amd/hsmp.h                    AMD HSMP EPYC system management interface driver
                                                                      <mailto:nchatrad@xxxxxxx>
 0xFD  all    linux/dm-ioctl.h
 0xFE  all    linux/isst_if.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 96b827049501..ce2942d0fef4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1097,8 +1097,8 @@ R:	Carlos Bilbao <carlos.bilbao@xxxxxxxxxx>
 L:	platform-driver-x86@xxxxxxxxxxxxxxx
 S:	Maintained
 F:	Documentation/arch/x86/amd_hsmp.rst
-F:	arch/x86/include/asm/amd_hsmp.h
-F:	arch/x86/include/uapi/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/
 
 AMD IOMMU (AMD-VI)
diff --git a/arch/x86/include/asm/amd_hsmp.h b/arch/x86/include/asm/amd/hsmp.h
similarity index 91%
rename from arch/x86/include/asm/amd_hsmp.h
rename to arch/x86/include/asm/amd/hsmp.h
index 03c2ce3edaf5..f3253d27bf49 100644
--- a/arch/x86/include/asm/amd_hsmp.h
+++ b/arch/x86/include/asm/amd/hsmp.h
@@ -3,7 +3,7 @@
 #ifndef _ASM_X86_AMD_HSMP_H_
 #define _ASM_X86_AMD_HSMP_H_
 
-#include <uapi/asm/amd_hsmp.h>
+#include <uapi/asm/amd/hsmp.h>
 
 #if IS_ENABLED(CONFIG_AMD_HSMP)
 int hsmp_send_message(struct hsmp_message *msg);
diff --git a/drivers/platform/x86/amd/hsmp/acpi.c b/drivers/platform/x86/amd/hsmp/acpi.c
index c1eccb3c80c5..3c7acb90c3ab 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 a3ac09a90de4..e262e8a97b45 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 b9782a078dbd..0eb73fcb9806 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>
-- 
2.45.2