aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/kvm/svm.c
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2007-06-22 12:29:50 +0300
committerAvi Kivity <avi@qumranet.com>2007-07-16 12:05:49 +0300
commit6031a61c2ef4cf22b69ef5494aefa54b84a27d2f (patch)
tree2e0ccd861da726e76785a0a68a46da06951f1eb0 /drivers/kvm/svm.c
parent796fd1b23e463e98b3e2fc86ed571db06dc945bb (diff)
downloadkernel_samsung_aries-6031a61c2ef4cf22b69ef5494aefa54b84a27d2f.zip
kernel_samsung_aries-6031a61c2ef4cf22b69ef5494aefa54b84a27d2f.tar.gz
kernel_samsung_aries-6031a61c2ef4cf22b69ef5494aefa54b84a27d2f.tar.bz2
KVM: SVM: Reliably detect if SVM was disabled by BIOS
This patch adds an implementation to the svm is_disabled function to detect reliably if the BIOS disabled the SVM feature in the CPU. This fixes the issues with kernel panics when loading the kvm-amd module on machines where SVM is available but disabled. Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers/kvm/svm.c')
-rw-r--r--drivers/kvm/svm.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/kvm/svm.c b/drivers/kvm/svm.c
index 62ec38c..a0d4428 100644
--- a/drivers/kvm/svm.c
+++ b/drivers/kvm/svm.c
@@ -1735,6 +1735,12 @@ static void svm_inject_page_fault(struct kvm_vcpu *vcpu,
static int is_disabled(void)
{
+ u64 vm_cr;
+
+ rdmsrl(MSR_VM_CR, vm_cr);
+ if (vm_cr & (1 << SVM_VM_CR_SVM_DISABLE))
+ return 1;
+
return 0;
}