X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fgeekos%2Fvm.c;h=6f9d4d85f4ed7080008ef9e58c69a998f6817d66;hb=88a9fe78672db5f5672dc20a92253e508bd3b7e1;hp=92d61f1e8e567fcffbc1e746793450305707adea;hpb=b527f44a71d32952d7b129a7ce5dbeb3969fb8d2;p=palacios.git

diff --git a/palacios/src/geekos/vm.c b/palacios/src/geekos/vm.c
index 92d61f1..6f9d4d8 100644
--- a/palacios/src/geekos/vm.c
+++ b/palacios/src/geekos/vm.c
@@ -203,9 +203,10 @@ int RunVMM(struct Boot_Info * bootInfo) {
     init_shadow_map(&(vm_info.mem_map));
     init_shadow_page_state(&(vm_info.shdw_pg_state));
     v3_init_time(&(vm_info.time_state));
-    vm_info.page_mode = SHADOW_PAGING;
+    vm_info.shdw_pg_mode = SHADOW_PAGING;
 
     vm_info.cpu_mode = REAL;
+    vm_info.mem_mode = PHYSICAL_MEM;
 
     //init_irq_map(&(vm_info.irq_map));
     init_vmm_io_map(&(vm_info.io_map));
@@ -314,6 +315,9 @@ int RunVMM(struct Boot_Info * bootInfo) {
       //add_shadow_region_passthrough(&vm_info, 0x100000, 0x2000000, (addr_t)Allocate_VMM_Pages(8192));
       add_shadow_region_passthrough(&vm_info, 0x100000, 0x1000000, (addr_t)Allocate_VMM_Pages(4096));
 
+      // test - give linux accesss to PCI space - PAD
+      add_shadow_region_passthrough(&vm_info, 0xc0000000,0xffffffff,0xc0000000);
+
 
       print_shadow_map(&(vm_info.mem_map));
 
@@ -332,12 +336,51 @@ int RunVMM(struct Boot_Info * bootInfo) {
 	//struct vm_device * timer = create_timer();
 	struct vm_device * pic = create_pic();
 	struct vm_device * keyboard = create_keyboard();
-	struct vm_device * pit = create_pit();
-
-	//generic_port_range_type range = {0,1024} ; // hook first 1024 ports if not already hooked
-
-	//struct vm_device * generic = create_generic(&range, 1, NULL, 0, NULL, 0);
+	struct vm_device * pit = create_pit(); 
+
+
+#define GENERIC 1
+
+#if GENERIC
+	generic_port_range_type range[] = {
+	  /*
+          {0x00, 0x07, GENERIC_PRINT_AND_PASSTHROUGH},   // DMA 1 channels 0,1,2,3 (address, counter)
+          {0xc0, 0xc7, GENERIC_PRINT_AND_PASSTHROUGH},   // DMA 2 channels 4,5,6,7 (address, counter)
+          {0x87, 0x87, GENERIC_PRINT_AND_PASSTHROUGH},   // DMA 1 channel 0 page register
+          {0x83, 0x83, GENERIC_PRINT_AND_PASSTHROUGH},   // DMA 1 channel 1 page register
+          {0x81, 0x81, GENERIC_PRINT_AND_PASSTHROUGH},   // DMA 1 channel 2 page register
+          {0x82, 0x82, GENERIC_PRINT_AND_PASSTHROUGH},   // DMA 1 channel 3 page register
+          {0x8f, 0x8f, GENERIC_PRINT_AND_PASSTHROUGH},   // DMA 2 channel 4 page register
+          {0x8b, 0x8b, GENERIC_PRINT_AND_PASSTHROUGH},   // DMA 2 channel 5 page register
+          {0x89, 0x89, GENERIC_PRINT_AND_PASSTHROUGH},   // DMA 2 channel 6 page register
+          {0x8a, 0x8a, GENERIC_PRINT_AND_PASSTHROUGH},   // DMA 2 channel 7 page register
+	  {0x08, 0x0f, GENERIC_PRINT_AND_PASSTHROUGH},   // DMA 1 misc registers (csr, req, smask,mode,clearff,reset,enable,mmask)
+          {0xd0, 0xde, GENERIC_PRINT_AND_PASSTHROUGH},   // DMA 2 misc registers
+	  */
+	  {0x3f8, 0x3f8+7, GENERIC_PRINT_AND_IGNORE},      // COM 1
+	  {0x2f8, 0x2f8+7, GENERIC_PRINT_AND_IGNORE},      // COM 2
+	  {0x3e8, 0x3e8+7, GENERIC_PRINT_AND_IGNORE},      // COM 2
+	  {0x2e8, 0x2e8+7, GENERIC_PRINT_AND_IGNORE},      // COM 2
+
+          {0x170, 0x178, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 1
+	  {0x376, 0x377, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 1
+          {0x1f0, 0x1f8, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 0
+	  {0x3f6, 0x3f7, GENERIC_PRINT_AND_PASSTHROUGH}, // IDE 0
+	  /*
+          {0x3f0, 0x3f2, GENERIC_PRINT_AND_PASSTHROUGH}, // Primary floppy controller (base,statusa/statusb,DOR)
+          {0x3f4, 0x3f5, GENERIC_PRINT_AND_PASSTHROUGH}, // Primary floppy controller (mainstat/datarate,data)
+          {0x3f7, 0x3f7, GENERIC_PRINT_AND_PASSTHROUGH}, // Primary floppy controller (DIR)
+          {0x370, 0x372, GENERIC_PRINT_AND_PASSTHROUGH}, // Secondary floppy controller (base,statusa/statusb,DOR)
+          {0x374, 0x375, GENERIC_PRINT_AND_PASSTHROUGH}, // Secondary floppy controller (mainstat/datarate,data)
+          {0x377, 0x377, GENERIC_PRINT_AND_PASSTHROUGH}, // Secondary floppy controller (DIR)
+          {0x378, 0x400, GENERIC_PRINT_AND_PASSTHROUGH}
+	  */
+        };
+
+	struct vm_device * generic = create_generic(range,8,  // THIS NUMBER IS CRITICAL
+						    NULL,0,NULL,0);
 	
+#endif
 
 	attach_device(&(vm_info), nvram);
 	//attach_device(&(vm_info), timer);
@@ -345,29 +388,38 @@ int RunVMM(struct Boot_Info * bootInfo) {
 	attach_device(&(vm_info), pit);
 	attach_device(&(vm_info), keyboard);
 
+
+#if GENERIC
 	// Important that this be attached last!
-	//attach_device(&(vm_info), generic);
+	attach_device(&(vm_info), generic);
+
+#endif
 
 	PrintDebugDevMgr(&(vm_info.dev_mgr));
       }
 
       // give keyboard interrupts to vm
+      // no longer needed since we have a keyboard device
       //hook_irq(&vm_info, 1);
       
+#if 1
       // give floppy controller to vm
-      //hook_irq(&vm_info, 6);
+      hook_irq(&vm_info, 6);
+
 
-      // primary ide
-      //hook_irq(&vm_info, 14);
+      //primary ide
+      hook_irq(&vm_info, 14);
 
       // secondary ide
-      //hook_irq(&vm_info, 15);
+      hook_irq(&vm_info, 15);
 
+#endif
 
       vm_info.rip = 0xfff0;
       vm_info.vm_regs.rsp = 0x0;
     }
 
+
     PrintBoth("Initializing Guest (eip=0x%.8x) (esp=0x%.8x)\n", (uint_t)vm_info.rip,(uint_t)vm_info.vm_regs.rsp);
     (vmm_ops).init_guest(&vm_info);
     PrintBoth("Starting Guest\n");