Commit 92fe9bb7 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/apic, x86/hyperv: Use u32 in hv_snp_boot_ap() too 



The data type for APIC IDs was standardized to 'u32' in the
following recent commit:

   db4a4086 ("x86/apic: Use u32 for wakeup_secondary_cpu[_64]()")

Which changed the function arguments type signature of the
apic->wakeup_secondary_cpu() APIC driver function.

Propagate this to hv_snp_boot_ap() as well, which also addresses a
'assignment from incompatible pointer type' build warning that triggers
under the -Werror=incompatible-pointer-types GCC warning.

Fixes: db4a4086 ("x86/apic: Use u32 for wakeup_secondary_cpu[_64]()")
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20230814085113.233274223@linutronix.de
parent 48525fd1

arch/x86/hyperv/ivm.c

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ static void snp_cleanup_vmsa(struct sev_es_save_area *vmsa) 
		free_page((unsigned long)vmsa);

}



int hv_snp_boot_ap(int cpu, unsigned long start_ip)

int hv_snp_boot_ap(u32 cpu, unsigned long start_ip)

{

	struct sev_es_save_area *vmsa = (struct sev_es_save_area *)

		__get_free_page(GFP_KERNEL | __GFP_ZERO);

arch/x86/include/asm/mshyperv.h

+2 −2
Original line number Diff line number Diff line
@@ -276,11 +276,11 @@ int hv_unmap_ioapic_interrupt(int ioapic_id, struct hv_interrupt_entry *entry); 
#ifdef CONFIG_AMD_MEM_ENCRYPT

bool hv_ghcb_negotiate_protocol(void);

void __noreturn hv_ghcb_terminate(unsigned int set, unsigned int reason);

int hv_snp_boot_ap(int cpu, unsigned long start_ip);

int hv_snp_boot_ap(u32 cpu, unsigned long start_ip);

#else

static inline bool hv_ghcb_negotiate_protocol(void) { return false; }

static inline void hv_ghcb_terminate(unsigned int set, unsigned int reason) {}

static inline int hv_snp_boot_ap(int cpu, unsigned long start_ip) { return 0; }

static inline int hv_snp_boot_ap(u32 cpu, unsigned long start_ip) { return 0; }

#endif



#if defined(CONFIG_AMD_MEM_ENCRYPT) || defined(CONFIG_INTEL_TDX_GUEST)