[PATCH v2 2/2] hyperv: Move arch/x86/hyperv/hv_proc.c to drivers/hv

[Michael Kelley]

From: Nuno Das Neves <nunodasneves at linux.microsoft.com> Sent: Wednesday, January 22, 2025 5:48 PM
> 
> These helpers are not specific to x86_64 and will be needed by common code.
> Remove some unnecessary #includes.
> 
> Signed-off-by: Nuno Das Neves <nunodasneves at linux.microsoft.com>
> ---
>  arch/x86/hyperv/Makefile                  | 2 +-
>  arch/x86/include/asm/mshyperv.h           | 4 ----
>  drivers/hv/Makefile                       | 2 +-
>  {arch/x86/hyperv => drivers/hv}/hv_proc.c | 4 ----
>  include/asm-generic/mshyperv.h            | 4 ++++
>  5 files changed, 6 insertions(+), 10 deletions(-)
>  rename {arch/x86/hyperv => drivers/hv}/hv_proc.c (98%)
> 
> diff --git a/arch/x86/hyperv/Makefile b/arch/x86/hyperv/Makefile
> index 3a1548054b48..d55f494f471d 100644
> --- a/arch/x86/hyperv/Makefile
> +++ b/arch/x86/hyperv/Makefile
> @@ -1,6 +1,6 @@
>  # SPDX-License-Identifier: GPL-2.0-only
>  obj-y			:= hv_init.o mmu.o nested.o irqdomain.o ivm.o
> -obj-$(CONFIG_X86_64)	+= hv_apic.o hv_proc.o
> +obj-$(CONFIG_X86_64)	+= hv_apic.o
>  obj-$(CONFIG_HYPERV_VTL_MODE)	+= hv_vtl.o
> 
>  ifdef CONFIG_X86_64
> diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h
> index 8d3ada3e8d0d..7dfca93ef048 100644
> --- a/arch/x86/include/asm/mshyperv.h
> +++ b/arch/x86/include/asm/mshyperv.h
> @@ -56,10 +56,6 @@ u64 hv_tdx_hypercall(u64 control, u64 param1, u64 param2);
>  #define HV_AP_INIT_GPAT_DEFAULT		0x0007040600070406ULL
>  #define HV_AP_SEGMENT_LIMIT		0xffffffff
> 
> -int hv_call_deposit_pages(int node, u64 partition_id, u32 num_pages);
> -int hv_call_add_logical_proc(int node, u32 lp_index, u32 acpi_id);
> -int hv_call_create_vp(int node, u64 partition_id, u32 vp_index, u32 flags);
> -
>  /*
>   * If the hypercall involves no input or output parameters, the hypervisor
>   * ignores the corresponding GPA pointer.
> diff --git a/drivers/hv/Makefile b/drivers/hv/Makefile
> index b992c0ed182b..9afcabb3fbd2 100644
> --- a/drivers/hv/Makefile
> +++ b/drivers/hv/Makefile
> @@ -13,4 +13,4 @@ hv_vmbus-$(CONFIG_HYPERV_TESTING)	+= hv_debugfs.o
>  hv_utils-y := hv_util.o hv_kvp.o hv_snapshot.o hv_utils_transport.o
> 
>  # Code that must be built-in
> -obj-$(subst m,y,$(CONFIG_HYPERV)) += hv_common.o
> +obj-$(subst m,y,$(CONFIG_HYPERV)) += hv_common.o hv_proc.o
> diff --git a/arch/x86/hyperv/hv_proc.c b/drivers/hv/hv_proc.c
> similarity index 98%
> rename from arch/x86/hyperv/hv_proc.c
> rename to drivers/hv/hv_proc.c
> index ac4c834d4435..3e410489f480 100644
> --- a/arch/x86/hyperv/hv_proc.c
> +++ b/drivers/hv/hv_proc.c
> @@ -6,11 +6,7 @@
>  #include <linux/slab.h>
>  #include <linux/cpuhotplug.h>
>  #include <linux/minmax.h>
> -#include <asm/hypervisor.h>
>  #include <asm/mshyperv.h>
> -#include <asm/apic.h>
> -
> -#include <asm/trace/hyperv.h>
> 
>  /*
>   * See struct hv_deposit_memory. The first u64 is partition ID, the rest
> diff --git a/include/asm-generic/mshyperv.h b/include/asm-generic/mshyperv.h
> index 98100466e0b2..faf5d27a76b1 100644
> --- a/include/asm-generic/mshyperv.h
> +++ b/include/asm-generic/mshyperv.h
> @@ -217,6 +217,10 @@ void *hv_alloc_hyperv_page(void);
>  void *hv_alloc_hyperv_zeroed_page(void);
>  void hv_free_hyperv_page(void *addr);
> 
> +int hv_call_deposit_pages(int node, u64 partition_id, u32 num_pages);
> +int hv_call_add_logical_proc(int node, u32 lp_index, u32 acpi_id);
> +int hv_call_create_vp(int node, u64 partition_id, u32 vp_index, u32 flags);
> +
>  /**
>   * hv_cpu_number_to_vp_number() - Map CPU to VP.
>   * @cpu_number: CPU number in Linux terms
> --
> 2.34.1

Reviewed-by: Michael Kelley <mhklinux at outlook.com>