X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fnvram.c;h=f15795f22cb90ff663b4217ec1d169c691aa8fbe;hb=32cee4124eb5ac84b2c8990d056fd50f987203a5;hp=565c183d1ea2eb5f35c66d61bab01d4176ed9372;hpb=123a1ba27ea09c8fa77a1b36ce625b43d7c48b14;p=palacios.git diff --git a/palacios/src/devices/nvram.c b/palacios/src/devices/nvram.c index 565c183..f15795f 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 @@ -94,59 +95,73 @@ typedef enum {NVRAM_READY, NVRAM_REG_POSTED} nvram_state_t; #define NVRAM_REG_BOOTSEQ_NEW_FIRST 0x3D #define NVRAM_REG_BOOTSEQ_NEW_SECOND 0x38 +#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; - uchar_t thereg; - uchar_t mem_state[NVRAM_REG_MAX]; - uchar_t reg_map[NVRAM_REG_MAX / 8]; + uint8_t thereg; + uint8_t mem_state[NVRAM_REG_MAX]; + uint8_t reg_map[NVRAM_REG_MAX / 8]; struct vm_device * ide; + struct v3_vm_info * vm; + + struct v3_timer *timer; + v3_lock_t nvram_lock; - uint_t us; //microseconds - for clock update - zeroed every second - uint_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 }; struct rtc_stata { - uint_t rate: 4; // clock rate = 65536Hz / 2 rate (0110=1024 Hz) - uint_t basis: 3; // time base, 010 = 32,768 Hz - uint_t uip: 1; // 1=update in progress + uint8_t rate : 4; // clock rate = 65536Hz / 2 rate (0110=1024 Hz) + uint8_t basis : 3; // time base, 010 = 32,768 Hz + uint8_t uip : 1; // 1=update in progress } __attribute__((__packed__)) __attribute__((__aligned__ (1))) ; struct rtc_statb { - uint_t sum: 1; // 1=summer (daylight savings) - uint_t h24: 1; // 1=24h clock - uint_t dm: 1; // 1=date/time is in bcd, 0=binary - uint_t rec: 1; // 1=rectangular signal - uint_t ui: 1; // 1=update interrupt - uint_t ai: 1; // 1=alarm interrupt - uint_t pi: 1; // 1=periodic interrupt - uint_t set: 1; // 1=blocked update + uint8_t sum : 1; // 1=summer (daylight savings) + uint8_t h24 : 1; // 1=24h clock + 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 pi : 1; // 1=periodic interrupt + uint8_t set : 1; // 1=blocked update } __attribute__((__packed__)) __attribute__((__aligned__ (1))) ; struct rtc_statc { - uint_t res: 4; // reserved - uint_t uf: 1; // 1=source of interrupt is update - uint_t af: 1; // 1=source of interrupt is alarm interrupt - uint_t pf: 1; // 1=source of interrupt is periodic interrupt - uint_t irq: 1; // 1=interrupt requested + uint8_t res : 4; // reserved + uint8_t uf : 1; // 1=source of interrupt is update + uint8_t af : 1; // 1=source of interrupt is alarm interrupt + uint8_t pf : 1; // 1=source of interrupt is periodic interrupt + uint8_t irq : 1; // 1=interrupt requested } __attribute__((__packed__)) __attribute__((__aligned__ (1))) ; struct rtc_statd { - uint_t res: 7; // reserved - uint_t val: 1; // 1=cmos ram data is OK + uint8_t res : 7; // reserved + uint8_t val : 1; // 1=cmos ram data is OK } __attribute__((__packed__)) __attribute__((__aligned__ (1))) ; struct bcd_num { - uchar_t bot : 4; - uchar_t top : 4; -}; + uint8_t bot : 4; + uint8_t top : 4; +} __attribute__((packed));; @@ -182,13 +197,13 @@ static int get_memory(struct nvram_internal * nvram, uint8_t reg, uint8_t * val) } -static uchar_t add_to(uchar_t * left, uchar_t * right, uchar_t bcd) { - uchar_t temp; +static uint8_t add_to(uint8_t * left, uint8_t * right, uint8_t bcd) { + uint8_t temp; if (bcd) { struct bcd_num * bl = (struct bcd_num *)left; struct bcd_num * br = (struct bcd_num *)right; - uchar_t carry = 0; + uint8_t carry = 0; bl->bot += br->bot; carry = bl->bot / 0xa; @@ -212,7 +227,7 @@ static uchar_t add_to(uchar_t * left, uchar_t * right, uchar_t bcd) { } -static uchar_t days_in_month(uchar_t month, uchar_t bcd) { +static uint8_t days_in_month(uint8_t month, uint8_t bcd) { // This completely ignores Julian / Gregorian stuff right now if (bcd) { @@ -270,34 +285,31 @@ static uchar_t days_in_month(uchar_t month, uchar_t bcd) { } -static void update_time( struct vm_device * dev, uint_t period_us) { - struct nvram_internal * data = (struct nvram_internal *) (dev->private_data); - 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])); +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])); //struct rtc_statd *statd = (struct rtc_statd *) &((data->mem_state[NVRAM_REG_STAT_D])); - uchar_t * sec = (uchar_t *) &(data->mem_state[NVRAM_REG_SEC]); - uchar_t * min = (uchar_t *) &(data->mem_state[NVRAM_REG_MIN]); - uchar_t * hour = (uchar_t *) &(data->mem_state[NVRAM_REG_HOUR]); - uchar_t * weekday = (uchar_t *) &(data->mem_state[NVRAM_REG_WEEK_DAY]); - uchar_t * monthday = (uchar_t *) &(data->mem_state[NVRAM_REG_MONTH_DAY]); - uchar_t * month = (uchar_t *) &(data->mem_state[NVRAM_REG_MONTH]); - uchar_t * year = (uchar_t *) &(data->mem_state[NVRAM_REG_YEAR]); - uchar_t * cent = (uchar_t *) &(data->mem_state[NVRAM_REG_IBM_CENTURY_BYTE]); - uchar_t * seca = (uchar_t *) &(data->mem_state[NVRAM_REG_SEC_ALARM]); - uchar_t * mina = (uchar_t *) &(data->mem_state[NVRAM_REG_MIN_ALARM]); - uchar_t * houra = (uchar_t *) &(data->mem_state[NVRAM_REG_HOUR_ALARM]); - uchar_t hour24; - - uchar_t bcd = (statb->dm == 1); - uchar_t carry = 0; - uchar_t nextday = 0; - uint_t periodic_period; - - //PrintDebug("nvram: sizeof(struct rtc_stata)=%d\n", sizeof(struct rtc_stata)); - - - //PrintDebug("nvram: update_time\n",statb->pi); + uint8_t * sec = (uint8_t *)&(data->mem_state[NVRAM_REG_SEC]); + uint8_t * min = (uint8_t *)&(data->mem_state[NVRAM_REG_MIN]); + uint8_t * hour = (uint8_t *)&(data->mem_state[NVRAM_REG_HOUR]); + uint8_t * weekday = (uint8_t *)&(data->mem_state[NVRAM_REG_WEEK_DAY]); + uint8_t * monthday = (uint8_t *)&(data->mem_state[NVRAM_REG_MONTH_DAY]); + uint8_t * month = (uint8_t *)&(data->mem_state[NVRAM_REG_MONTH]); + uint8_t * year = (uint8_t *)&(data->mem_state[NVRAM_REG_YEAR]); + uint8_t * cent = (uint8_t *)&(data->mem_state[NVRAM_REG_IBM_CENTURY_BYTE]); + uint8_t * cent_ps2 = (uint8_t *)&(data->mem_state[NVRAM_REG_IBM_PS2_CENTURY_BYTE]); + uint8_t * seca = (uint8_t *)&(data->mem_state[NVRAM_REG_SEC_ALARM]); + uint8_t * mina = (uint8_t *)&(data->mem_state[NVRAM_REG_MIN_ALARM]); + uint8_t * houra = (uint8_t *)&(data->mem_state[NVRAM_REG_HOUR_ALARM]); + uint8_t hour24; + + uint8_t bcd = (statb->dm == 0); + uint8_t carry = 0; + uint8_t nextday = 0; + uint32_t periodic_period; + + PrintDebug(VM_NONE, VCORE_NONE, "nvram: update_time by %llu microseocnds\n",period_us); // We will set these flags on exit statc->irq = 0; @@ -315,7 +327,7 @@ static void update_time( struct vm_device * dev, uint_t period_us) { carry = add_to(sec, &carry, bcd); if (carry) { - PrintDebug("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)) || @@ -326,7 +338,7 @@ static void update_time( struct vm_device * dev, uint_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(VM_NONE, VCORE_NONE, "nvram: somehow managed to get a carry in minute update\n"); } if ( (bcd && (*min == 0x60)) || @@ -339,7 +351,7 @@ static void update_time( struct vm_device * dev, uint_t period_us) { if (hour24 & 0x80) { hour24 &= 0x8f; - uchar_t temp = ((bcd) ? 0x12 : 12); + uint8_t temp = ((bcd) ? 0x12 : 12); add_to(&hour24, &temp, bcd); } } @@ -347,7 +359,7 @@ static void update_time( struct vm_device * dev, uint_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(VM_NONE, VCORE_NONE, "nvram: somehow managed to get a carry in hour update\n"); } if ( (bcd && (hour24 == 0x24)) || @@ -413,6 +425,7 @@ static void update_time( struct vm_device * dev, uint_t period_us) { *year = 0; carry = 1; add_to(cent, &carry, bcd); + *cent_ps2 = *cent; } } } @@ -426,7 +439,7 @@ static void update_time( struct vm_device * dev, uint_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"); } } } @@ -436,90 +449,106 @@ static void update_time( struct vm_device * dev, uint_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"); - v3_raise_irq(dev->vm, NVRAM_RTC_IRQ); + PrintDebug(VM_NONE, VCORE_NONE, "nvram: injecting interrupt\n"); + v3_raise_irq(data->vm, NVRAM_RTC_IRQ); } } -static int handle_timer_event(struct guest_info * info, - 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; - struct vm_device * dev = (struct vm_device *)priv_data; + + // cpu freq in khz + period_us = (1000*cpu_cycles/cpu_freq); - if (dev) { - struct nvram_internal * data = (struct nvram_internal *) (dev->private_data); - - addr_t irq_state = v3_lock_irqsave(data->nvram_lock); - update_time(dev, evt->period_us); - v3_unlock_irqrestore(data->nvram_lock, irq_state); - } - - return 0; -} + update_time(nvram_state,period_us); +} 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 + // 4. High Mem: 4G-... in 64K - if (bytes > 640 * 1024) { - set_memory(nvram, NVRAM_REG_BASE_MEMORY_HIGH, 0x02); - set_memory(nvram, NVRAM_REG_BASE_MEMORY_LOW, 0x80); + // at most 640K of conventional memory + { + uint16_t memk = 0; + + if (bytes > (640 * 1024)) { + memk = 640; + } else { + memk = bytes / 1024; + } - // nvram->mem_state[NVRAM_REG_BASE_MEMORY_HIGH] = 0x02; - // nvram->mem_state[NVRAM_REG_BASE_MEMORY_LOW] = 0x80; - } 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; } - 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); - } else { - uint16_t memk = bytes * 1024; + // set extended memory - first 1 MB is lost to 640K chunk + // 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); - - return; } + // Set the extended memory beyond 16 MB in 64k chunks + // this is min(0, bytes - 16MB) { - // Set the extended memory beyond 16 MB in 64k chunks - uint16_t mem_chunks = (bytes - (1024 * 1024 * 16)) / (1024 * 64); + 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 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; } @@ -542,7 +571,7 @@ static void init_harddrives(struct nvram_internal * nvram) { // It looks like the BIOS only tracks the disks on the first channel at 0x12? for (i = 0; i < 2; i++) { - if (v3_ide_get_geometry(nvram->ide, 0, i, &cyls, &heads, §s) == 0) { + if (v3_ide_get_geometry(nvram->ide->private_data, 0, i, &cyls, &heads, §s) == 0) { int info_reg = info_base_reg + (i * 9); @@ -583,7 +612,7 @@ static void init_harddrives(struct nvram_internal * nvram) { int drive_num = i % 2; uint32_t tmp[3]; - if (v3_ide_get_geometry(nvram->ide, chan_num, drive_num, &tmp[0], &tmp[1], &tmp[2]) == 0) { + if (v3_ide_get_geometry(nvram->ide->private_data, chan_num, drive_num, &tmp[0], &tmp[1], &tmp[2]) == 0) { trans |= TRANSLATE_LBA << (i * 2); } } @@ -592,43 +621,72 @@ static void init_harddrives(struct nvram_internal * nvram) { } } -static int init_nvram_state(struct vm_device * dev) { - struct guest_info * info = dev->vm; - struct nvram_internal * nvram = (struct nvram_internal *)dev->private_data; - +static uint16_t compute_checksum(struct nvram_internal * nvram) { + uint16_t checksum = 0; + uint8_t reg = 0; + uint8_t val = 0; + + /* add all fields between the RTC and the checksum fields */ + for (reg = CHECKSUM_REGION_FIRST_BYTE; reg < CHECKSUM_REGION_LAST_BYTE; reg++) { + /* unset fields are considered zero so get_memory can be ignored */ + get_memory(nvram, reg, &val); + checksum += val; + } + + return checksum; +} + +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); 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 @@ -641,8 +699,8 @@ static int init_nvram_state(struct vm_device * dev) { 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 @@ -666,14 +724,26 @@ static int init_nvram_state(struct vm_device * dev) { set_memory(nvram, NVRAM_REG_MONTH_DAY, 0x1); set_memory(nvram, NVRAM_REG_WEEK_DAY, 0x1); set_memory(nvram, NVRAM_REG_YEAR, 0x08); + set_memory(nvram, NVRAM_REG_IBM_CENTURY_BYTE, 0x20); + set_memory(nvram, NVRAM_REG_IBM_PS2_CENTURY_BYTE, 0x20); set_memory(nvram, NVRAM_REG_DIAGNOSTIC_STATUS, 0x00); nvram->us = 0; nvram->pus = 0; - set_memory_size(nvram, info->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); + set_memory(nvram, NVRAM_REG_CSUM_HIGH, (checksum >> 8) & 0xff); + set_memory(nvram, NVRAM_REG_CSUM_LOW, checksum & 0xff); + + nvram->dev_state = NVRAM_READY; nvram->thereg = 0; @@ -684,60 +754,35 @@ static int init_nvram_state(struct vm_device * dev) { -static int nvram_reset_device(struct vm_device * dev) { - - return 0; -} - - - - - -static int nvram_start_device(struct vm_device * dev) { - PrintDebug("nvram: start device\n"); - return 0; -} - - -static int nvram_stop_device(struct vm_device * dev) { - PrintDebug("nvram: stop device\n"); - return 0; -} - +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; -static int nvram_write_reg_port(ushort_t port, - void * src, - uint_t length, - struct vm_device * dev) { + memcpy(®,src,1); - struct nvram_internal * data = (struct nvram_internal *)dev->private_data; + data->thereg = reg & 0x7f; //discard NMI bit if it's there - memcpy(&(data->thereg), src, 1); - PrintDebug("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; } -static int nvram_read_data_port(ushort_t port, - void * dst, - uint_t length, - struct vm_device * dev) { +static int nvram_read_data_port(struct guest_info * core, uint16_t port, + void * dst, uint_t length, void * priv_data) { - struct nvram_internal * data = (struct nvram_internal *)dev->private_data; + struct nvram_internal * data = priv_data; 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); + PrintError(core->vm_info, core, "nvram: Register %d (0x%x) Not set - POSSIBLE BUG IN MACHINE INIT - CONTINUING\n", data->thereg, data->thereg); - v3_unlock_irqrestore(data->nvram_lock, irq_state); + } - return -1; - } - - PrintDebug("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) { @@ -750,12 +795,10 @@ static int nvram_read_data_port(ushort_t port, } -static int nvram_write_data_port(ushort_t port, - void * src, - uint_t length, - struct vm_device * dev) { +static int nvram_write_data_port(struct guest_info * core, uint16_t port, + void * src, uint_t length, void * priv_data) { - struct nvram_internal * data = (struct nvram_internal *)dev->private_data; + struct nvram_internal * data = priv_data; addr_t irq_state = v3_lock_irqsave(data->nvram_lock); @@ -763,7 +806,7 @@ static int nvram_write_data_port(ushort_t port, v3_unlock_irqrestore(data->nvram_lock, irq_state); - PrintDebug("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; @@ -772,60 +815,110 @@ static int nvram_write_data_port(ushort_t port, -static int nvram_free(struct vm_device * dev) { - v3_dev_unhook_io(dev, NVRAM_REG_PORT); - v3_dev_unhook_io(dev, NVRAM_DATA_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_lock_deinit(&(nvram_state->nvram_lock)); + + V3_Free(nvram_state); return 0; } +static struct v3_timer_ops timer_ops = { + .update_timer = nvram_update_timer, +}; static struct v3_device_ops dev_ops = { - .free = nvram_free, - .reset = nvram_reset_device, - .start = nvram_start_device, - .stop = nvram_stop_device, + .free = (int (*)(void *))nvram_free, }; +/* + + + 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 guest_info * vm, v3_cfg_tree_t * cfg) { +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 * name = v3_cfg_val(cfg, "name"); + char * dev_id = v3_cfg_val(cfg, "ID"); + char * bootseq = v3_cfg_val(cfg,"bootseq"); + + int ret = 0; if (!ide) { - PrintError("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; - struct vm_device * dev = v3_allocate_device(name, &dev_ops, nvram_state); - + struct vm_device * dev = v3_add_device(vm, dev_id, &dev_ops, nvram_state); - if (v3_attach_device(vm, dev) == -1) { - PrintError("Could not attach device %s\n", name); + if (dev == NULL) { + PrintError(vm, VCORE_NONE, "nvram: Could not attach device %s\n", dev_id); + V3_Free(nvram_state); return -1; } - init_nvram_state(dev); + init_nvram_state(vm, nvram_state, bootseq); // hook ports - v3_dev_hook_io(dev, NVRAM_REG_PORT, NULL, &nvram_write_reg_port); - v3_dev_hook_io(dev, NVRAM_DATA_PORT, &nvram_read_data_port, &nvram_write_data_port); + 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); - v3_hook_host_event(vm, HOST_TIMER_EVT, V3_HOST_EVENT_HANDLER(handle_timer_event), dev); + if (ret != 0) { + PrintError(vm, VCORE_NONE, "nvram: Error hooking NVRAM IO ports\n"); + v3_remove_device(dev); + return -1; + } + + 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; }