Commit 73638cdd authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman

Drivers: hv: vmbus: Move the check for hypercall page setup

As part of the effort to separate out architecture specific code, move the
check for detecting if the hypercall page is setup.
Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d058fa7e
...@@ -235,3 +235,18 @@ void hyperv_report_panic(struct pt_regs *regs) ...@@ -235,3 +235,18 @@ void hyperv_report_panic(struct pt_regs *regs)
wrmsrl(HV_X64_MSR_CRASH_CTL, HV_CRASH_CTL_CRASH_NOTIFY); wrmsrl(HV_X64_MSR_CRASH_CTL, HV_CRASH_CTL_CRASH_NOTIFY);
} }
EXPORT_SYMBOL_GPL(hyperv_report_panic); EXPORT_SYMBOL_GPL(hyperv_report_panic);
bool hv_is_hypercall_page_setup(void)
{
union hv_x64_msr_hypercall_contents hypercall_msr;
/* Check if the hypercall page is setup */
hypercall_msr.as_uint64 = 0;
rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
if (!hypercall_msr.enable)
return false;
return true;
}
EXPORT_SYMBOL_GPL(hv_is_hypercall_page_setup);
...@@ -115,5 +115,6 @@ void hv_remove_crash_handler(void); ...@@ -115,5 +115,6 @@ void hv_remove_crash_handler(void);
#if IS_ENABLED(CONFIG_HYPERV) #if IS_ENABLED(CONFIG_HYPERV)
void hyperv_init(void); void hyperv_init(void);
void hyperv_report_panic(struct pt_regs *regs); void hyperv_report_panic(struct pt_regs *regs);
bool hv_is_hypercall_page_setup(void);
#endif #endif
#endif #endif
...@@ -49,7 +49,6 @@ struct hv_context hv_context = { ...@@ -49,7 +49,6 @@ struct hv_context hv_context = {
*/ */
int hv_init(void) int hv_init(void)
{ {
union hv_x64_msr_hypercall_contents hypercall_msr;
memset(hv_context.synic_event_page, 0, sizeof(void *) * NR_CPUS); memset(hv_context.synic_event_page, 0, sizeof(void *) * NR_CPUS);
memset(hv_context.synic_message_page, 0, memset(hv_context.synic_message_page, 0,
...@@ -65,11 +64,7 @@ int hv_init(void) ...@@ -65,11 +64,7 @@ int hv_init(void)
memset(hv_context.clk_evt, 0, memset(hv_context.clk_evt, 0,
sizeof(void *) * NR_CPUS); sizeof(void *) * NR_CPUS);
/* See if the hypercall page is already set */ if (!hv_is_hypercall_page_setup())
hypercall_msr.as_uint64 = 0;
rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
if (!hypercall_msr.enable)
return -ENOTSUPP; return -ENOTSUPP;
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment