X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Finclude%2Fgeekos%2Fsvm.h;h=8b606b4b7096477a82fb67f322345a69758a677c;hb=a31286a91d6a84a60b34ee088517ee5d0d2176b0;hp=e985ba0ba42c68a9557096a7f25303efe11fc652;hpb=4d691866d964c028d2b2ca96c2d16489d45dd2b5;p=palacios.git

diff --git a/palacios/include/geekos/svm.h b/palacios/include/geekos/svm.h
index e985ba0..8b606b4 100644
--- a/palacios/include/geekos/svm.h
+++ b/palacios/include/geekos/svm.h
@@ -1,18 +1,74 @@
 #ifndef __SVM_H
 #define __SVM_H
 
-#include <geekos/screen.h>
-#include <geekos/serial.h>
+#include <geekos/vmm_util.h>
+#include <geekos/vmm.h>
+#include <geekos/vmcb.h>
 
+#define CPUID_FEATURE_IDS 0x80000001
+#define CPUID_FEATURE_IDS_ecx_svm_avail 0x00000004
 
-#define CPUID_ECX_FEATURE_IDS 0x80000001
-#define CPUID_SVM_AVAIL 0x00000004
+#define CPUID_SVM_REV_AND_FEATURE_IDS 0x8000000a
+#define CPUID_SVM_REV_AND_FEATURE_IDS_edx_svml 0x00000004
+#define CPUID_SVM_REV_AND_FEATURE_IDS_edx_np  0x00000001
 
 
+#define EFER_MSR                 0xc0000080
+#define EFER_MSR_svm_enable      0x00001000
 
-void Init_SVM();
+/************/
+/* SVM MSRs */
+/************/
+/* AMD Arch Vol 3, sec. 15.28, pg 420 */
+/************/
 
+// SVM VM_CR MSR 
+#define SVM_VM_CR_MSR             0xc0010114
+#define SVM_VM_CR_MSR_dpd         0x00000001
+#define SVM_VM_CR_MSR_r_init      0x00000002
+#define SVM_VM_CR_MSR_dis_a20m    0x00000004
+#define SVM_VM_CR_MSR_lock        0x00000008
+#define SVM_VM_CR_MSR_svmdis      0x00000010
 
+#define SVM_IGNNE_MSR             0xc0010115
+
+// SMM Signal Control Register 
+#define SVM_SMM_CTL_MSR           0xc0010116
+#define SVM_SMM_CTL_MSR_dismiss   0x00000001
+#define SVM_SMM_CTL_MSR_enter     0x00000002
+#define SVM_SMM_CTL_MSR_smi_cycle 0x00000004
+#define SVM_SMM_CTL_MSR_exit      0x00000008
+#define SVM_SMM_CTL_MSR_rsm_cycle 0x00000010
+
+#define SVM_VM_HSAVE_PA_MSR      0xc0010117
+
+#define SVM_KEY_MSR              0xc0010118
+
+/******/
+
+
+
+
+#define SVM_HANDLER_SUCCESS   0x0
+#define SVM_HANDLER_ERROR     0x1
+#define SVM_HANDLER_HALT      0x2
+
+
+
+
+void Init_SVM(struct vmm_ctrl_ops * vmm_ops);
+int is_svm_capable();
+
+
+vmcb_t * Allocate_VMCB();
+void Init_VMCB(vmcb_t * vmcb, struct guest_info vm_info);
+void Init_VMCB_pe(vmcb_t * vmcb, struct guest_info vm_info);
+
+int init_svm_guest(struct guest_info *info);
+int start_svm_guest(struct guest_info * info);
+
+
+inline addr_t get_rip_linear(struct guest_info * info, addr_t rip, addr_t cs_base);