#include <palacios/vm_guest.h>
-#ifndef CONFIG_DEBUG_NVRAM
+#ifndef V3_CONFIG_DEBUG_NVRAM
#undef PrintDebug
#define PrintDebug(fmt, args...)
#endif
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
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: 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;
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)) ||
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)) ||
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)) ||
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");
}
}
}
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);
}
}
// 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;
}
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
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;
}
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\n", data->thereg, data->thereg);
-
- v3_unlock_irqrestore(data->nvram_lock, irq_state);
+ PrintError(core->vm_info, core, "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: 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) {
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;
v3_remove_timer(info,nvram_state->timer);
}
+ v3_lock_deinit(&(nvram_state->nvram_lock));
+
V3_Free(nvram_state);
return 0;
}
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");
+ 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;
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;
}
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;
}
