X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fnvram.c;h=cda167e549f416939d40164b4dfb6e520cd38ee2;hb=64cc3bfb45f88a1880331093e87035a38c8f2bdb;hp=943cbf3979625d6cf39304f4e8fd702a244e2ad6;hpb=dea7fd2306231d09471958e2b00499d701723e17;p=palacios.git diff --git a/palacios/src/devices/nvram.c b/palacios/src/devices/nvram.c index 943cbf3..cda167e 100644 --- a/palacios/src/devices/nvram.c +++ b/palacios/src/devices/nvram.c @@ -29,7 +29,8 @@ #include #include -#ifndef CONFIG_DEBUG_NVRAM + +#ifndef V3_CONFIG_DEBUG_NVRAM #undef PrintDebug #define PrintDebug(fmt, args...) #endif @@ -107,11 +108,13 @@ struct nvram_internal { struct vm_device * ide; struct v3_vm_info * vm; + + struct v3_timer *timer; v3_lock_t nvram_lock; - uint32_t us; //microseconds - for clock update - zeroed every second - uint32_t pus; //microseconds - for periodic interrupt - cleared every period + uint64_t us; //microseconds - for clock update - zeroed every second + uint64_t pus; //microseconds - for periodic interrupt - cleared every period }; @@ -124,7 +127,7 @@ struct rtc_stata { struct rtc_statb { uint8_t sum : 1; // 1=summer (daylight savings) uint8_t h24 : 1; // 1=24h clock - uint8_t dm : 1; // 1=date/time is in bcd, 0=binary + uint8_t dm : 1; // 0=date/time is in bcd, 1=binary uint8_t rec : 1; // 1=rectangular signal uint8_t ui : 1; // 1=update interrupt uint8_t ai : 1; // 1=alarm interrupt @@ -275,7 +278,7 @@ static uint8_t days_in_month(uint8_t month, uint8_t bcd) { } -static void update_time(struct nvram_internal * data, uint32_t period_us) { +static void update_time(struct nvram_internal * data, uint64_t period_us) { struct rtc_stata * stata = (struct rtc_stata *)&((data->mem_state[NVRAM_REG_STAT_A])); struct rtc_statb * statb = (struct rtc_statb *)&((data->mem_state[NVRAM_REG_STAT_B])); struct rtc_statc * statc = (struct rtc_statc *)&((data->mem_state[NVRAM_REG_STAT_C])); @@ -294,15 +297,12 @@ static void update_time(struct nvram_internal * data, uint32_t period_us) { uint8_t * houra = (uint8_t *)&(data->mem_state[NVRAM_REG_HOUR_ALARM]); uint8_t hour24; - uint8_t bcd = (statb->dm == 1); + uint8_t bcd = (statb->dm == 0); uint8_t carry = 0; uint8_t nextday = 0; uint32_t periodic_period; - //PrintDebug("nvram: sizeof(struct rtc_stata)=%d\n", sizeof(struct rtc_stata)); - - - //PrintDebug("nvram: update_time\n",statb->pi); + PrintDebug("nvram: update_time by %llu microseocnds\n",period_us); // We will set these flags on exit statc->irq = 0; @@ -320,7 +320,7 @@ static void update_time(struct nvram_internal * data, uint32_t period_us) { carry = add_to(sec, &carry, bcd); if (carry) { - PrintDebug("nvram: somehow managed to get a carry in second update\n"); + PrintError("nvram: somehow managed to get a carry in second update\n"); } if ( (bcd && (*sec == 0x60)) || @@ -331,7 +331,7 @@ static void update_time(struct nvram_internal * data, uint32_t period_us) { carry = 1; carry = add_to(min, &carry, bcd); if (carry) { - PrintDebug("nvram: somehow managed to get a carry in minute update\n"); + PrintError("nvram: somehow managed to get a carry in minute update\n"); } if ( (bcd && (*min == 0x60)) || @@ -352,7 +352,7 @@ static void update_time(struct nvram_internal * data, uint32_t period_us) { carry = 1; carry = add_to(&hour24, &carry, bcd); if (carry) { - PrintDebug("nvram: somehow managed to get a carry in hour update\n"); + PrintError("nvram: somehow managed to get a carry in hour update\n"); } if ( (bcd && (hour24 == 0x24)) || @@ -453,7 +453,7 @@ static void update_time(struct nvram_internal * data, uint32_t period_us) { 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("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) { @@ -463,68 +463,65 @@ static void update_time(struct nvram_internal * data, uint32_t period_us) { } -static int handle_timer_event(struct v3_vm_info * vm, - struct v3_timer_event * evt, - void * priv_data) { +static void nvram_update_timer(struct guest_info *vm, + ullong_t cpu_cycles, + ullong_t cpu_freq, + void *priv_data) +{ + struct nvram_internal *nvram_state = (struct nvram_internal *)priv_data; + uint64_t period_us; + + // cpu freq in khz + period_us = (1000*cpu_cycles/cpu_freq); - struct nvram_internal * data = priv_data; + update_time(nvram_state,period_us); - if (data) { - addr_t irq_state = v3_lock_irqsave(data->nvram_lock); - update_time(data, evt->period_us); - v3_unlock_irqrestore(data->nvram_lock, irq_state); - } - - return 0; } - 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; + // at most 640K of conventional memory if (bytes > 640 * 1024) { - set_memory(nvram, NVRAM_REG_BASE_MEMORY_HIGH, 0x02); - set_memory(nvram, NVRAM_REG_BASE_MEMORY_LOW, 0x80); - - // nvram->mem_state[NVRAM_REG_BASE_MEMORY_HIGH] = 0x02; - // nvram->mem_state[NVRAM_REG_BASE_MEMORY_LOW] = 0x80; + memk=640; } else { - uint16_t memk = bytes * 1024; - set_memory(nvram, NVRAM_REG_BASE_MEMORY_HIGH, (memk >> 8) & 0x00ff); - set_memory(nvram, NVRAM_REG_BASE_MEMORY_LOW, memk & 0x00ff); - - return; + memk = bytes/1024; } - if (bytes > (16 * 1024 * 1024)) { - // Set extended memory to 15 MB - set_memory(nvram, NVRAM_REG_EXT_MEMORY_HIGH, 0x3C); - set_memory(nvram, NVRAM_REG_EXT_MEMORY_LOW, 0x00); - set_memory(nvram, NVRAM_REG_EXT_MEMORY_2ND_HIGH, 0x3C); - set_memory(nvram, NVRAM_REG_EXT_MEMORY_2ND_LOW, 0x00); + 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 { - uint16_t memk = bytes * 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); - - return; + memk = (bytes - 1024 * 1024 ) / 1024; } - { - // Set the extended memory beyond 16 MB in 64k chunks - uint16_t 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_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); } + 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); + return; } @@ -660,8 +657,8 @@ static int init_nvram_state(struct v3_vm_info * vm, struct nvram_internal * nvra set_memory(nvram, NVRAM_REG_STAT_A, 0x26); // RTC status B - // 00000100 = not setting, no interrupts, blocked rect signal, bcd mode, 24 hour, normal time - set_memory(nvram, NVRAM_REG_STAT_B, 0x06); + // 00000010 = not setting, no interrupts, blocked rect signal, bcd mode (bit 3 = 0), 24 hour, normal time + set_memory(nvram, NVRAM_REG_STAT_B, 0x02); // RTC status C @@ -720,7 +717,7 @@ static int nvram_write_reg_port(struct guest_info * core, uint16_t port, struct nvram_internal * data = priv_data; memcpy(&(data->thereg), src, 1); - PrintDebug("Writing To NVRAM reg: 0x%x\n", data->thereg); + PrintDebug("nvram: Writing To NVRAM reg: 0x%x\n", data->thereg); return 1; } @@ -733,19 +730,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("Register %d (0x%x) Not set\n", data->thereg, data->thereg); - - v3_unlock_irqrestore(data->nvram_lock, irq_state); + PrintError("nvram: Register %d (0x%x) Not set - POSSIBLE BUG IN MACHINE INIT - CONTINUING\n", data->thereg, data->thereg); - /* allow guest to query checksummed bytes; warn but read zero rather than fail in this case */ - if ((data->thereg >= CHECKSUM_REGION_FIRST_BYTE) && (data->thereg <= CHECKSUM_REGION_LAST_BYTE)) { - return 1; - } else { - return -1; - } - } + } - PrintDebug("nvram_read_data_port(0x%x) = 0x%x\n", data->thereg, *(uint8_t *)dst); + PrintDebug("nvram: nvram_read_data_port(0x%x) = 0x%x\n", data->thereg, *(uint8_t *)dst); // hack if (data->thereg == NVRAM_REG_STAT_A) { @@ -769,7 +758,7 @@ static int nvram_write_data_port(struct guest_info * core, uint16_t port, v3_unlock_irqrestore(data->nvram_lock, irq_state); - PrintDebug("nvram_write_data_port(0x%x) = 0x%x\n", + PrintDebug("nvram: nvram_write_data_port(0x%x) = 0x%x\n", data->thereg, data->mem_state[data->thereg]); return 1; @@ -779,8 +768,13 @@ static int nvram_write_data_port(struct guest_info * core, uint16_t port, static int nvram_free(struct nvram_internal * nvram_state) { - + // unregister host events + struct guest_info *info = &(nvram_state->vm->cores[0]); + + if (nvram_state->timer) { + v3_remove_timer(info,nvram_state->timer); + } V3_Free(nvram_state); return 0; @@ -788,6 +782,9 @@ static int nvram_free(struct nvram_internal * nvram_state) { +static struct v3_timer_ops timer_ops = { + .update_timer = nvram_update_timer, +}; static struct v3_device_ops dev_ops = { @@ -805,7 +802,7 @@ static int nvram_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { int ret = 0; if (!ide) { - PrintError("Could not find IDE device\n"); + PrintError("nvram: Could not find IDE device\n"); return -1; } @@ -820,7 +817,7 @@ 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("Could not attach device %s\n", dev_id); + PrintError("nvram: Could not attach device %s\n", dev_id); V3_Free(nvram_state); return -1; } @@ -832,12 +829,17 @@ static int nvram_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { ret |= v3_dev_hook_io(dev, NVRAM_DATA_PORT, &nvram_read_data_port, &nvram_write_data_port); if (ret != 0) { - PrintError("Error hooking NVRAM IO ports\n"); + PrintError("nvram: Error hooking NVRAM IO ports\n"); v3_remove_device(dev); return -1; } - v3_hook_host_event(vm, HOST_TIMER_EVT, V3_HOST_EVENT_HANDLER(handle_timer_event), nvram_state); + nvram_state->timer = v3_add_timer(&(vm->cores[0]),&timer_ops,nvram_state); + + if (nvram_state->timer == NULL ) { + v3_remove_device(dev); + return -1; + } return 0; }