X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fnvram.c;h=f15795f22cb90ff663b4217ec1d169c691aa8fbe;hb=32cee4124eb5ac84b2c8990d056fd50f987203a5;hp=cda167e549f416939d40164b4dfb6e520cd38ee2;hpb=9cf92dd87164a7d263f65b09eefde2672df93f63;p=palacios.git diff --git a/palacios/src/devices/nvram.c b/palacios/src/devices/nvram.c index cda167e..f15795f 100644 --- a/palacios/src/devices/nvram.c +++ b/palacios/src/devices/nvram.c @@ -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; @@ -302,7 +309,7 @@ static void update_time(struct nvram_internal * data, uint64_t period_us) { uint8_t nextday = 0; uint32_t periodic_period; - PrintDebug("nvram: update_time by %llu microseocnds\n",period_us); + PrintDebug(VM_NONE, VCORE_NONE, "nvram: update_time by %llu microseocnds\n",period_us); // We will set these flags on exit statc->irq = 0; @@ -320,7 +327,7 @@ static void update_time(struct nvram_internal * data, uint64_t period_us) { carry = add_to(sec, &carry, bcd); if (carry) { - PrintError("nvram: somehow managed to get a carry in second update\n"); + PrintError(VM_NONE, VCORE_NONE, "nvram: somehow managed to get a carry in second update\n"); } if ( (bcd && (*sec == 0x60)) || @@ -331,7 +338,7 @@ static void update_time(struct nvram_internal * data, uint64_t period_us) { carry = 1; carry = add_to(min, &carry, bcd); if (carry) { - PrintError("nvram: somehow managed to get a carry in minute update\n"); + PrintError(VM_NONE, VCORE_NONE, "nvram: somehow managed to get a carry in minute update\n"); } if ( (bcd && (*min == 0x60)) || @@ -352,7 +359,7 @@ static void update_time(struct nvram_internal * data, uint64_t period_us) { carry = 1; carry = add_to(&hour24, &carry, bcd); if (carry) { - PrintError("nvram: somehow managed to get a carry in hour update\n"); + PrintError(VM_NONE, VCORE_NONE, "nvram: somehow managed to get a carry in hour update\n"); } if ( (bcd && (hour24 == 0x24)) || @@ -432,7 +439,7 @@ static void update_time(struct nvram_internal * data, uint64_t period_us) { if (statb->ai) { if ((*sec == *seca) && (*min == *mina) && (*hour == *houra)) { statc->af = 1; - PrintDebug("nvram: interrupt on alarm\n"); + PrintDebug(VM_NONE, VCORE_NONE, "nvram: interrupt on alarm\n"); } } } @@ -442,22 +449,22 @@ static void update_time(struct nvram_internal * data, uint64_t period_us) { if (data->pus >= periodic_period) { statc->pf = 1; data->pus -= periodic_period; - PrintDebug("nvram: interrupt on periodic\n"); + PrintDebug(VM_NONE, VCORE_NONE, "nvram: interrupt on periodic\n"); } } if (statb->ui) { statc->uf = 1; - PrintDebug("nvram: interrupt on update\n"); + PrintDebug(VM_NONE, VCORE_NONE, "nvram: interrupt on update\n"); } statc->irq = (statc->pf || statc->af || statc->uf); - PrintDebug("nvram: time is now: YMDHMS: 0x%x:0x%x:0x%x:0x%x:0x%x,0x%x bcd=%d\n", *year, *month, *monthday, *hour, *min, *sec,bcd); + PrintDebug(VM_NONE, VCORE_NONE, "nvram: time is now: YMDHMS: 0x%x:0x%x:0x%x:0x%x:0x%x,0x%x bcd=%d\n", *year, *month, *monthday, *hour, *min, *sec,bcd); // Interrupt associated VM, if needed if (statc->irq) { - PrintDebug("nvram: injecting interrupt\n"); + PrintDebug(VM_NONE, VCORE_NONE, "nvram: injecting interrupt\n"); v3_raise_irq(data->vm, NVRAM_RTC_IRQ); } } @@ -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); @@ -713,11 +758,14 @@ static int init_nvram_state(struct v3_vm_info * vm, struct nvram_internal * nvra static int nvram_write_reg_port(struct guest_info * core, uint16_t port, void * src, uint_t length, void * priv_data) { - + uint8_t reg; struct nvram_internal * data = priv_data; + + memcpy(®,src,1); + + data->thereg = reg & 0x7f; //discard NMI bit if it's there - memcpy(&(data->thereg), src, 1); - PrintDebug("nvram: Writing To NVRAM reg: 0x%x\n", data->thereg); + PrintDebug(core->vm_info, core, "nvram: Writing To NVRAM reg: 0x%x (NMI_disable=%d)\n", data->thereg,reg>>7); return 1; } @@ -730,11 +778,11 @@ static int nvram_read_data_port(struct guest_info * core, uint16_t port, addr_t irq_state = v3_lock_irqsave(data->nvram_lock); if (get_memory(data, data->thereg, (uint8_t *)dst) == -1) { - PrintError("nvram: Register %d (0x%x) Not set - POSSIBLE BUG IN MACHINE INIT - CONTINUING\n", data->thereg, data->thereg); + PrintError(core->vm_info, core, "nvram: Register %d (0x%x) Not set - POSSIBLE BUG IN MACHINE INIT - CONTINUING\n", data->thereg, data->thereg); } - PrintDebug("nvram: nvram_read_data_port(0x%x) = 0x%x\n", data->thereg, *(uint8_t *)dst); + PrintDebug(core->vm_info, core, "nvram: nvram_read_data_port(0x%x) = 0x%x\n", data->thereg, *(uint8_t *)dst); // hack if (data->thereg == NVRAM_REG_STAT_A) { @@ -758,7 +806,7 @@ static int nvram_write_data_port(struct guest_info * core, uint16_t port, v3_unlock_irqrestore(data->nvram_lock, irq_state); - PrintDebug("nvram: nvram_write_data_port(0x%x) = 0x%x\n", + PrintDebug(core->vm_info, core, "nvram: nvram_write_data_port(0x%x) = 0x%x\n", data->thereg, data->mem_state[data->thereg]); return 1; @@ -776,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; } @@ -792,24 +842,53 @@ static struct v3_device_ops dev_ops = { }; +/* + + + STORAGE + BOOTSEQ + + 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) { - PrintError("nvram: Could not find IDE device\n"); + PrintError(vm, VCORE_NONE, "nvram: Could not find IDE device\n"); return -1; } - PrintDebug("nvram: init_device\n"); + 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); - PrintDebug("nvram: internal at %p\n", (void *)nvram_state); + if (!nvram_state) { + PrintError(vm, VCORE_NONE, "Cannot allocate in init\n"); + return -1; + } + + PrintDebug(vm, VCORE_NONE, "nvram: internal at %p\n", (void *)nvram_state); nvram_state->ide = ide; nvram_state->vm = vm; @@ -817,19 +896,19 @@ static int nvram_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, nvram_state); if (dev == NULL) { - PrintError("nvram: Could not attach device %s\n", dev_id); + PrintError(vm, VCORE_NONE, "nvram: Could not attach device %s\n", dev_id); V3_Free(nvram_state); 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); ret |= v3_dev_hook_io(dev, NVRAM_DATA_PORT, &nvram_read_data_port, &nvram_write_data_port); if (ret != 0) { - PrintError("nvram: Error hooking NVRAM IO ports\n"); + PrintError(vm, VCORE_NONE, "nvram: Error hooking NVRAM IO ports\n"); v3_remove_device(dev); return -1; }