On Sat, 20 Jul 2024, Suma Hegde wrote:
> This is in preparation to splitting ACPI and platform device drivers.
> Create and move hsmp specific code into its own directory,
> no logical changes.
>
> Signed-off-by: Suma Hegde <suma.hegde@xxxxxxx>
> Reviewed-by: Naveen Krishna Chatradhi <naveenkrishna.chatradhi@xxxxxxx>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxxxxxx>
--
i.
> ---
> Changes since v2:
> None
> Changes since v1:
> None
>
> MAINTAINERS | 2 +-
> drivers/platform/x86/amd/Kconfig | 14 +-------------
> drivers/platform/x86/amd/Makefile | 3 +--
> drivers/platform/x86/amd/hsmp/Kconfig | 17 +++++++++++++++++
> drivers/platform/x86/amd/hsmp/Makefile | 8 ++++++++
> drivers/platform/x86/amd/{ => hsmp}/hsmp.c | 0
> 6 files changed, 28 insertions(+), 16 deletions(-)
> create mode 100644 drivers/platform/x86/amd/hsmp/Kconfig
> create mode 100644 drivers/platform/x86/amd/hsmp/Makefile
> rename drivers/platform/x86/amd/{ => hsmp}/hsmp.c (100%)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index d6c90161c7bf..a7d79d1f7ec1 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -1037,7 +1037,7 @@ 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: drivers/platform/x86/amd/hsmp.c
> +F: drivers/platform/x86/amd/hsmp/
>
> AMD IOMMU (AMD-VI)
> M: Joerg Roedel <joro@xxxxxxxxxx>
> diff --git a/drivers/platform/x86/amd/Kconfig b/drivers/platform/x86/amd/Kconfig
> index f88682d36447..2c671cc17d63 100644
> --- a/drivers/platform/x86/amd/Kconfig
> +++ b/drivers/platform/x86/amd/Kconfig
> @@ -3,22 +3,10 @@
> # AMD x86 Platform Specific Drivers
> #
>
> +source "drivers/platform/x86/amd/hsmp/Kconfig"
> source "drivers/platform/x86/amd/pmf/Kconfig"
> source "drivers/platform/x86/amd/pmc/Kconfig"
>
> -config AMD_HSMP
> - tristate "AMD HSMP Driver"
> - depends on AMD_NB && X86_64 && ACPI
> - help
> - The driver provides a way for user space tools to monitor and manage
> - system management functionality on EPYC server CPUs from AMD.
> -
> - Host System Management Port (HSMP) interface is a mailbox interface
> - between the x86 core and the System Management Unit (SMU) firmware.
> -
> - If you choose to compile this driver as a module the module will be
> - called amd_hsmp.
> -
> config AMD_WBRF
> bool "AMD Wifi RF Band mitigations (WBRF)"
> depends on ACPI
> diff --git a/drivers/platform/x86/amd/Makefile b/drivers/platform/x86/amd/Makefile
> index dcec0a46f8af..96ec24c8701b 100644
> --- a/drivers/platform/x86/amd/Makefile
> +++ b/drivers/platform/x86/amd/Makefile
> @@ -5,7 +5,6 @@
> #
>
> obj-$(CONFIG_AMD_PMC) += pmc/
> -amd_hsmp-y := hsmp.o
> -obj-$(CONFIG_AMD_HSMP) += amd_hsmp.o
> +obj-y += hsmp/
> obj-$(CONFIG_AMD_PMF) += pmf/
> obj-$(CONFIG_AMD_WBRF) += wbrf.o
> diff --git a/drivers/platform/x86/amd/hsmp/Kconfig b/drivers/platform/x86/amd/hsmp/Kconfig
> new file mode 100644
> index 000000000000..b55d4ed9bceb
> --- /dev/null
> +++ b/drivers/platform/x86/amd/hsmp/Kconfig
> @@ -0,0 +1,17 @@
> +# SPDX-License-Identifier: GPL-2.0-only
> +#
> +# AMD HSMP Driver
> +#
> +
> +config AMD_HSMP
> + tristate "AMD HSMP Driver"
> + depends on AMD_NB && X86_64 && ACPI
> + help
> + The driver provides a way for user space tools to monitor and manage
> + system management functionality on EPYC server CPUs from AMD.
> +
> + Host System Management Port (HSMP) interface is a mailbox interface
> + between the x86 core and the System Management Unit (SMU) firmware.
> +
> + If you choose to compile this driver as a module the module will be
> + called amd_hsmp.
> diff --git a/drivers/platform/x86/amd/hsmp/Makefile b/drivers/platform/x86/amd/hsmp/Makefile
> new file mode 100644
> index 000000000000..fda64906a5e8
> --- /dev/null
> +++ b/drivers/platform/x86/amd/hsmp/Makefile
> @@ -0,0 +1,8 @@
> +# SPDX-License-Identifier: GPL-2.0
> +#
> +# Makefile for drivers/platform/x86/amd/hsmp
> +# AMD HSMP Driver
> +#
> +
> +obj-$(CONFIG_AMD_HSMP) += amd_hsmp.o
> +amd_hsmp-objs := hsmp.o
> diff --git a/drivers/platform/x86/amd/hsmp.c b/drivers/platform/x86/amd/hsmp/hsmp.c
> similarity index 100%
> rename from drivers/platform/x86/amd/hsmp.c
> rename to drivers/platform/x86/amd/hsmp/hsmp.c
>
