Palacios Public Git Repository

To checkout Palacios execute

  git clone http://v3vee.org/palacios/palacios.web/palacios.git
This will give you the master branch. You probably want the devel branch or one of the release branches. To switch to the devel branch, simply execute
  cd palacios
  git checkout --track -b devel origin/devel
The other branches are similar.


Debug stuff for testing boot on physical machines
[palacios.git] / palacios / src / geekos / vm.c
index 160be77..591a6ed 100644 (file)
@@ -5,6 +5,7 @@
 #include <geekos/vm.h>
 #include <geekos/screen.h>
 
+#include <devices/generic.h>
 #include <devices/nvram.h>
 #include <devices/timer.h>
 #include <devices/simple_pic.h>
@@ -152,6 +153,17 @@ void BuzzVM()
 
 
 
+int passthrough_mem_read(addr_t guest_addr, void * dst, uint_t length, void * priv_data) {
+  memcpy(dst, (void*)guest_addr, length);
+  return length;
+}
+
+int passthrough_mem_write(addr_t guest_addr, void * src, uint_t length, void * priv_data) {
+  memcpy((void*)guest_addr, src, length);
+  return length;
+}
+
+
 
 /* We need a configuration mechanism, so we can wrap this completely inside the VMM code, 
  * with no pollution into the HOST OS
@@ -191,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));
@@ -280,8 +293,9 @@ int RunVMM(struct Boot_Info * bootInfo) {
       
       //     
       add_shadow_region_passthrough(&vm_info, 0x0, 0xa0000, (addr_t)Allocate_VMM_Pages(160));
-      add_shadow_region_passthrough(&vm_info, 0xa0000, 0xc0000, 0xa0000); 
       
+      add_shadow_region_passthrough(&vm_info, 0xa0000, 0xc0000, 0xa0000); 
+      //hook_guest_mem(&vm_info, 0xa0000, 0xc0000, passthrough_mem_read, passthrough_mem_write, NULL);
 
 
       // TEMP
@@ -301,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));
 
@@ -314,38 +331,95 @@ int RunVMM(struct Boot_Info * bootInfo) {
       hook_io_port(&(vm_info.io_map), 0x403, &IO_Read, &IO_Write_to_Serial, NULL);
 
       {
+       
        struct vm_device * nvram = create_nvram();
        //struct vm_device * timer = create_timer();
        struct vm_device * pic = create_pic();
-       //struct vm_device * keyboard = create_keyboard();
-       struct vm_device * pit = create_pit();
+       struct vm_device * keyboard = create_keyboard();
+       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,4,  // THIS NUMBER IS CRITICAL
+                                                   NULL,0,NULL,0);
+       
+#endif
 
        attach_device(&(vm_info), nvram);
        //attach_device(&(vm_info), timer);
        attach_device(&(vm_info), pic);
        attach_device(&(vm_info), pit);
-       //attach_device(&(vm_info), keyboard);
+       attach_device(&(vm_info), keyboard);
+
+
+#if GENERIC
+       // Important that this be attached last!
+       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 0
       // give floppy controller to vm
       hook_irq(&vm_info, 6);
 
-      // primary ide
+
+      //primary ide
       hook_irq(&vm_info, 14);
 
       // secondary ide
       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");