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.


HVM configuration logic (create mptables, acpi tables, etc, based on ROS config)
[palacios.git] / palacios / src / devices / nvram.c
index 912b5f5..f15795f 100644 (file)
@@ -98,6 +98,13 @@ typedef enum {NVRAM_READY, NVRAM_REG_POSTED} nvram_state_t;
 #define CHECKSUM_REGION_FIRST_BYTE        0x10
 #define CHECKSUM_REGION_LAST_BYTE         0x2d
 
+// Following fields are used by SEABIOS
+#define NVRAM_REG_HIGHMEM_LOW             0x5b
+#define NVRAM_REG_HIGHMEM_MID             0x5c
+#define NVRAM_REG_HIGHMEM_HIGH            0x5d
+#define NVRAM_REG_SMPCPUS                 0x5f
+
+#define DEFAULT_BOOTSEQ                   "cd,hd"
 
 struct nvram_internal {
     nvram_state_t dev_state;
@@ -484,43 +491,63 @@ static void set_memory_size(struct nvram_internal * nvram, addr_t bytes) {
     // 1. Conventional Mem: 0-640k in K
     // 2. Extended Mem: 0-16MB in K
     // 3. Big Mem: 0-4G in 64K
-    uint16_t memk;
-    uint16_t mem_chunks;
+    // 4. High Mem: 4G-... in 64K
 
     // at most 640K of conventional memory
-    if (bytes > 640 * 1024) {
-       memk=640;
-    } else {
-       memk = bytes/1024;
+    {
+       uint16_t memk = 0;
+
+       if (bytes > (640 * 1024)) {
+           memk = 640;
+       } else {
+           memk = bytes / 1024;
+       }
+
+       set_memory(nvram, NVRAM_REG_BASE_MEMORY_HIGH, (memk >> 8) & 0x00ff);
+       set_memory(nvram, NVRAM_REG_BASE_MEMORY_LOW, memk & 0x00ff);
     }
 
-    set_memory(nvram, NVRAM_REG_BASE_MEMORY_HIGH, (memk >> 8) & 0x00ff);
-    set_memory(nvram, NVRAM_REG_BASE_MEMORY_LOW, memk & 0x00ff);
-    
     // set extended memory - first 1 MB is lost to 640K chunk
-    // extended memory is min(0MB, bytes-1MB)
-    if (bytes < 1024*1024) { 
-       // no extended memory
-       memk = 0;
-    } else {
-       memk = (bytes - 1024 * 1024 ) / 1024;
+    // extended memory is min(0MB, bytes - 1MB)
+    {
+       uint16_t memk = 0;
+
+       if (bytes >= (1024 * 1024)) {
+           memk = (bytes - (1024 * 1024)) / 1024;
+       }
+       
+       set_memory(nvram, NVRAM_REG_EXT_MEMORY_HIGH, (memk >> 8) & 0x00ff);
+       set_memory(nvram, NVRAM_REG_EXT_MEMORY_LOW, memk & 0x00ff);
+       set_memory(nvram, NVRAM_REG_EXT_MEMORY_2ND_HIGH, (memk >> 8) & 0x00ff);
+       set_memory(nvram, NVRAM_REG_EXT_MEMORY_2ND_LOW, memk & 0x00ff);
     }
 
-    set_memory(nvram, NVRAM_REG_EXT_MEMORY_HIGH, (memk >> 8) & 0x00ff);
-    set_memory(nvram, NVRAM_REG_EXT_MEMORY_LOW, memk & 0x00ff);
-    set_memory(nvram, NVRAM_REG_EXT_MEMORY_2ND_HIGH, (memk >> 8) & 0x00ff);
-    set_memory(nvram, NVRAM_REG_EXT_MEMORY_2ND_LOW, memk & 0x00ff);
-    
     // Set the extended memory beyond 16 MB in 64k chunks
-    // this is min(0, bytes-16MB)
-    if (bytes<(1024*1024*16)) { 
-       mem_chunks=0;
-    } else {
-       mem_chunks = (bytes - (1024 * 1024 * 16)) / (1024 * 64);
+    // this is min(0, bytes - 16MB)
+    {
+       uint16_t mem_chunks = 0;
+
+       if (bytes >= (1024 * 1024 * 16)) {
+           mem_chunks = (bytes - (1024 * 1024 * 16)) / (1024 * 64);
+       }
+       
+       set_memory(nvram, NVRAM_REG_AMI_BIG_MEMORY_HIGH, (mem_chunks >> 8) & 0x00ff);
+       set_memory(nvram, NVRAM_REG_AMI_BIG_MEMORY_LOW, mem_chunks & 0x00ff);
     }
 
-    set_memory(nvram, NVRAM_REG_AMI_BIG_MEMORY_HIGH, (mem_chunks >> 8) & 0x00ff);
-    set_memory(nvram, NVRAM_REG_AMI_BIG_MEMORY_LOW, mem_chunks & 0x00ff);
+    // Set high (>4GB) memory size
+    {
+
+       uint32_t high_mem_chunks = 0;
+
+       if (bytes >= (1024LL * 1024LL * 1024LL * 4LL)) {
+           high_mem_chunks = (bytes - (1024LL * 1024LL * 1024LL * 4LL))  / (1024 * 64);
+       }
+
+       set_memory(nvram, NVRAM_REG_HIGHMEM_LOW, high_mem_chunks & 0xff);
+       set_memory(nvram, NVRAM_REG_HIGHMEM_MID, (high_mem_chunks >> 8) & 0xff);
+       set_memory(nvram, NVRAM_REG_HIGHMEM_HIGH, (high_mem_chunks >> 16) & 0xff);
+    }
 
     return;
 }
@@ -609,8 +636,15 @@ static uint16_t compute_checksum(struct nvram_internal * nvram) {
     return checksum;
 }
 
-static int init_nvram_state(struct v3_vm_info * vm, struct nvram_internal * nvram) {
+static int init_nvram_state(struct v3_vm_info * vm, struct nvram_internal * nvram, char *bootseq) {
     uint16_t checksum = 0;
+    uint64_t mem_size=vm->mem_size;
+    uint32_t num_cores=vm->num_cores;
+
+#ifdef V3_CONFIG_HVM
+    mem_size = v3_get_hvm_ros_memsize(vm);
+    num_cores = v3_get_hvm_ros_cores(vm);
+#endif
 
     memset(nvram->mem_state, 0, NVRAM_REG_MAX);
     memset(nvram->reg_map, 0, NVRAM_REG_MAX / 8);
@@ -618,33 +652,41 @@ static int init_nvram_state(struct v3_vm_info * vm, struct nvram_internal * nvra
     v3_lock_init(&(nvram->nvram_lock));
 
     //
-    // 2 1.44 MB floppy drives
+    // There are no floppy drives
     //
-#if 1
-    set_memory(nvram, NVRAM_REG_FLOPPY_TYPE, 0x44);
-#else
     set_memory(nvram, NVRAM_REG_FLOPPY_TYPE, 0x00);
-#endif
 
     //
-    // For old boot sequence style, do floppy first
+    // For old boot sequence style, do non-floppy devices first
     //
-    set_memory(nvram, NVRAM_REG_BOOTSEQ_OLD, 0x10);
-
-#if 0
-    // For new boot sequence style, do floppy, cd, then hd
-    set_memory(nvram, NVRAM_REG_BOOTSEQ_NEW_FIRST, 0x31);
-    set_memory(nvram, NVRAM_REG_BOOTSEQ_NEW_SECOND, 0x20);
-#endif
+    set_memory(nvram, NVRAM_REG_BOOTSEQ_OLD, 0x00);
+
+    if (!strcasecmp(bootseq,"cd")) { 
+       // CD only
+       set_memory(nvram, NVRAM_REG_BOOTSEQ_NEW_FIRST, 0x03);
+       set_memory(nvram, NVRAM_REG_BOOTSEQ_NEW_SECOND, 0x00);
+    } else if (!strcasecmp(bootseq,"cd,hd")) { 
+       // CD, then HD
+       set_memory(nvram, NVRAM_REG_BOOTSEQ_NEW_FIRST, 0x23);
+       set_memory(nvram, NVRAM_REG_BOOTSEQ_NEW_SECOND, 0x00);
+    } else if (!strcasecmp(bootseq,"hd")) {
+       // HD only
+       set_memory(nvram, NVRAM_REG_BOOTSEQ_NEW_FIRST, 0x02);
+       set_memory(nvram, NVRAM_REG_BOOTSEQ_NEW_SECOND, 0x00);
+    } else if (!strcasecmp(bootseq,"hd,cd")) { 
+       // HD, then CD
+       set_memory(nvram, NVRAM_REG_BOOTSEQ_NEW_FIRST, 0x32);
+       set_memory(nvram, NVRAM_REG_BOOTSEQ_NEW_SECOND, 0x00);
+    } else {
+       PrintError(vm,VCORE_NONE,"nvram: unknown boot sequence '%s', setting 'cd,hd'\n",bootseq);
+       // CD, then HD
+       set_memory(nvram, NVRAM_REG_BOOTSEQ_NEW_FIRST, 0x23);
+       set_memory(nvram, NVRAM_REG_BOOTSEQ_NEW_SECOND, 0x00);
+    }
 
-    // For new boot sequence style, do cd, hd, floppy
-    set_memory(nvram, NVRAM_REG_BOOTSEQ_NEW_FIRST, 0x23);
-    set_memory(nvram, NVRAM_REG_BOOTSEQ_NEW_SECOND, 0x10);
-  
-  
-    // Set equipment byte to note 2 floppies, vga display, keyboard,math,floppy
-    set_memory(nvram, NVRAM_REG_EQUIPMENT_BYTE, 0x4f);
-    // set_memory(nvram, NVRAM_REG_EQUIPMENT_BYTE, 0xf);
+    // Set equipment byte to note no floppies, vga display, keyboard, math
+    set_memory(nvram, NVRAM_REG_EQUIPMENT_BYTE, 0x2e);
   
 
     // Set the shutdown status gently
@@ -690,8 +732,11 @@ static int init_nvram_state(struct v3_vm_info * vm, struct nvram_internal * nvra
     nvram->us = 0;
     nvram->pus = 0;
 
-    set_memory_size(nvram, vm->mem_size);
+
+    set_memory_size(nvram, mem_size);
     init_harddrives(nvram);
+
+    set_memory(nvram, NVRAM_REG_SMPCPUS, num_cores - 1);
     
     /* compute checksum (must follow all assignments here) */
     checksum = compute_checksum(nvram);
@@ -779,6 +824,8 @@ static int nvram_free(struct nvram_internal * nvram_state) {
        v3_remove_timer(info,nvram_state->timer);
     }
 
+    v3_lock_deinit(&(nvram_state->nvram_lock));
+
     V3_Free(nvram_state);
     return 0;
 }
@@ -795,13 +842,32 @@ static struct v3_device_ops dev_ops = {
 };
 
 
+/*
 
+  <device class="NVRAM" id="nvram">
+     <storage>STORAGE</storage>
+     <bootseq>BOOTSEQ</bootseq>
+  </device>
 
+  STORAGE = the id of the storage controller that will be used to populate
+            the legacy storage device info (e.g., cd, hd the bios knows about)
+
+  BOOTSEQ = the boot sequence desired - note lack of spaces:
+            
+            cd         - first cd only
+            hd         - first hd only
+            cd,hd      - first cd, then first hd
+            hd,cd      - first hd, then first cd
+     
+            The default is cd,hd
+*/
 
 static int nvram_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
     struct nvram_internal * nvram_state = NULL;
     struct vm_device * ide = v3_find_dev(vm, v3_cfg_val(cfg, "storage"));
     char * dev_id = v3_cfg_val(cfg, "ID");
+    char * bootseq = v3_cfg_val(cfg,"bootseq");
+
     int ret = 0;
 
     if (!ide) {
@@ -809,6 +875,11 @@ static int nvram_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
        return -1;
     }
 
+    if (!bootseq) { 
+       bootseq=DEFAULT_BOOTSEQ;
+       PrintDebug(vm, VCORE_NONE, "nvram: using default boot sequence %s\n",bootseq);
+    }
+
     PrintDebug(vm, VCORE_NONE, "nvram: init_device\n");
     nvram_state = (struct nvram_internal *)V3_Malloc(sizeof(struct nvram_internal) + 1000);
 
@@ -830,7 +901,7 @@ static int nvram_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
        return -1;
     }
 
-    init_nvram_state(vm, nvram_state);
+    init_nvram_state(vm, nvram_state, bootseq);
 
     // hook ports
     ret |= v3_dev_hook_io(dev, NVRAM_REG_PORT, NULL, &nvram_write_reg_port);