fixes for Tianyu's patches

Author: romank-msft

arch/x86/hyperv/hv_init.c

@@ -382,7 +382,7 @@ void __init hyperv_init(void)
 					     PAGE_SIZE,
 					     GFP_KERNEL);
 		if (hv_vp_early_input_arg) {
-			ret = set_memory_decrypted(hv_vp_early_input_arg,
+			ret = set_memory_decrypted((u64)hv_vp_early_input_arg,
 					     num_possible_cpus());
 			if (ret) {
 				kfree(hv_vp_early_input_arg);
@@ -568,7 +568,7 @@ void __init hyperv_init(void)
 	kfree(hv_vp_assist_page);
 	hv_vp_assist_page = NULL;
 free_vp_early_input_arg:
-	set_memory_encrypted(hv_vp_early_input_arg, num_possible_cpus());
+	set_memory_encrypted((u64)hv_vp_early_input_arg, num_possible_cpus());
 	kfree(hv_vp_early_input_arg);
 	hv_vp_early_input_arg = NULL;
 common_free:

arch/x86/hyperv/ivm.c

@@ -65,13 +65,6 @@ union hv_ghcb {
 /* Only used in an SNP VM with the paravisor */
 static u16 hv_ghcb_version __ro_after_init;
 
-/*
- * Use static page to set Secure AVIC backing page.
- * The operation happens before allocating input arg
- * page when start AP.
- */
-static u8 inputbuf[PAGE_SIZE] __bss_decrypted __aligned(PAGE_SIZE);
-
 /* Functions only used in an SNP VM with the paravisor go here. */
 u64 hv_ghcb_hypercall(u64 control, void *input, void *output, u32 input_size)
 {

drivers/hv/hv.c

@@ -20,7 +20,9 @@
 #include <linux/interrupt.h>
 #include <clocksource/hyperv_timer.h>
 #include <asm/mshyperv.h>
+#ifdef CONFIG_SEV_GUEST
 #include <asm/apic.h>
+#endif
 #include <linux/set_memory.h>
 #include "hyperv_vmbus.h"
 
@@ -313,8 +315,9 @@ void hv_synic_enable_regs(unsigned int cpu)
 	if (vmbus_irq != -1)
 		enable_percpu_irq(vmbus_irq, 0);
 	shared_sint.as_uint64 = hv_get_msr(HV_MSR_SINT0 + VMBUS_MESSAGE_SINT);
+#ifdef CONFIG_SEV_GUEST
 	x2apic_savic_update_vector(smp_processor_id(), vmbus_interrupt, true);
-
+#endif
 	shared_sint.vector = vmbus_interrupt;
 	shared_sint.masked = false;