From: Wei Liu Date: Fri, 17 Aug 2018 15:12:36 +0000 (+0100) Subject: x86/amd: skip OSVW function calls if !CONFIG_HVM X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~3425 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c94ea358a3dcdce993aa0bdae040a3e3f1730816;p=xen.git x86/amd: skip OSVW function calls if !CONFIG_HVM The two functions are not needed when HVM is not supported in hypervisor. Note that using hvm_enabled won't work because early_microcode_init gets to cpu_request_microcode before hvm_enabled is set in presmp init call stage. Signed-off-by: Wei Liu Acked-by: Jan Beulich --- diff --git a/xen/arch/x86/microcode_amd.c b/xen/arch/x86/microcode_amd.c index 53f9f548cd..fba44ccba9 100644 --- a/xen/arch/x86/microcode_amd.c +++ b/xen/arch/x86/microcode_amd.c @@ -550,7 +550,9 @@ static int cpu_request_microcode(unsigned int cpu, const void *buf, xfree(mc_old); out: +#if CONFIG_HVM svm_host_osvw_init(); +#endif /* * In some cases we may return an error even if processor's microcode has @@ -609,6 +611,7 @@ err1: static int start_update(void) { +#if CONFIG_HVM /* * We assume here that svm_host_osvw_init() will be called on each cpu (from * cpu_request_microcode()). @@ -619,6 +622,7 @@ static int start_update(void) * supporting OSVW so we will not deal with this possibility. */ svm_host_osvw_reset(); +#endif return 0; }