X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2F8254.c;h=291101e398f47ef36c23551fd9a40862840496b4;hb=3b85ebc98b3f850992ffbfa1cb6e8d6ad777515b;hp=90f860a91215754e3d23323f7f00e84278120c92;hpb=c2dcf1a09b4843add1fc28380707bc8c3ed5204b;p=palacios.git diff --git a/palacios/src/devices/8254.c b/palacios/src/devices/8254.c index 90f860a..291101e 100644 --- a/palacios/src/devices/8254.c +++ b/palacios/src/devices/8254.c @@ -17,15 +17,16 @@ * redistribute, and modify it as specified in the file "V3VEE_LICENSE". */ -#include + #include +#include #include #include #include +#include - -#ifndef DEBUG_PIT +#ifndef CONFIG_DEBUG_PIT #undef PrintDebug #define PrintDebug(fmt, args...) #endif @@ -154,6 +155,10 @@ static int handle_crystal_tics(struct vm_device * dev, struct channel * ch, uint } else { ushort_t reload_val = ch->reload_value; + if (ch->op_mode == SW_STROBE) { + reload_val = 0xffff; + } + // TODO: Check this.... // Is this correct??? if (reload_val == 0) { @@ -206,8 +211,13 @@ static int handle_crystal_tics(struct vm_device * dev, struct channel * ch, uint break; case SW_STROBE: - PrintError("Software strobe not implemented\n"); - return -1; + + if (channel_cycles > 0) { + if (ch->output_pin == 1) { + ch->output_pin = 0; + output_changed = 1; + } + } break; case HW_STROBE: PrintError("Hardware strobe not implemented\n"); @@ -221,8 +231,9 @@ static int handle_crystal_tics(struct vm_device * dev, struct channel * ch, uint } +#include -static void pit_update_time(ullong_t cpu_cycles, ullong_t cpu_freq, void * private_data) { +static void pit_update_time(struct guest_info * info, ullong_t cpu_cycles, ullong_t cpu_freq, void * private_data) { struct vm_device * dev = (struct vm_device *)private_data; struct pit * state = (struct pit *)dev->private_data; // ullong_t tmp_ctr = state->pit_counter; @@ -286,7 +297,7 @@ static void pit_update_time(ullong_t cpu_cycles, ullong_t cpu_freq, void * priva if (handle_crystal_tics(dev, &(state->ch_0), oscillations) == 1) { // raise interrupt PrintDebug("8254 PIT: Injecting Timer interrupt to guest\n"); - v3_raise_irq(dev->vm, 0); + v3_raise_irq(info->vm_info, 0); } //handle_crystal_tics(dev, &(state->ch_1), oscillations); @@ -300,6 +311,12 @@ static void pit_update_time(ullong_t cpu_cycles, ullong_t cpu_freq, void * priva } +static void pit_advance_time(struct guest_info * core, void * private_data) { + + v3_raise_irq(core->vm_info, 0); +} + + /* This should call out to handle_SQR_WAVE_write, etc... */ @@ -357,6 +374,9 @@ static int handle_channel_write(struct channel * ch, char val) { case SQR_WAVE: ch->output_pin = 1; break; + case SW_STROBE: + ch->output_pin = 1; + break; default: PrintError("Invalid OP_MODE: %d\n", ch->op_mode); return -1; @@ -434,6 +454,9 @@ static int handle_channel_cmd(struct channel * ch, struct pit_cmd_word cmd) { case SQR_WAVE: ch->output_pin = 1; break; + case SW_STROBE: + ch->output_pin = 1; + break; default: PrintError("Invalid OP_MODE: %d\n", cmd.op_mode); return -1; @@ -446,7 +469,7 @@ static int handle_channel_cmd(struct channel * ch, struct pit_cmd_word cmd) { -static int pit_read_channel(ushort_t port, void * dst, uint_t length, struct vm_device * dev) { +static int pit_read_channel(struct guest_info * core, ushort_t port, void * dst, uint_t length, struct vm_device * dev) { struct pit * state = (struct pit *)dev->private_data; char * val = (char *)dst; @@ -486,7 +509,7 @@ static int pit_read_channel(ushort_t port, void * dst, uint_t length, struct vm_ -static int pit_write_channel(ushort_t port, void * src, uint_t length, struct vm_device * dev) { +static int pit_write_channel(struct guest_info * core, ushort_t port, void * src, uint_t length, struct vm_device * dev) { struct pit * state = (struct pit *)dev->private_data; char val = *(char *)src; @@ -528,7 +551,7 @@ static int pit_write_channel(ushort_t port, void * src, uint_t length, struct vm -static int pit_write_command(ushort_t port, void * src, uint_t length, struct vm_device * dev) { +static int pit_write_command(struct guest_info * core, ushort_t port, void * src, uint_t length, struct vm_device * dev) { struct pit * state = (struct pit *)dev->private_data; struct pit_cmd_word * cmd = (struct pit_cmd_word *)src; @@ -576,6 +599,7 @@ static int pit_write_command(ushort_t port, void * src, uint_t length, struct vm static struct vm_timer_ops timer_ops = { .update_time = pit_update_time, + .advance_timer = pit_advance_time, }; @@ -598,67 +622,80 @@ static void init_channel(struct channel * ch) { } -static int pit_init(struct vm_device * dev) { - struct pit * state = (struct pit *)dev->private_data; + + +static int pit_free(struct vm_device * dev) { + + return 0; +} + + +static struct v3_device_ops dev_ops = { + .free = pit_free, + .reset = NULL, + .start = NULL, + .stop = NULL, + +}; + +#include + +static int pit_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { + struct pit * pit_state = NULL; + struct vm_device * dev = NULL; + char * name = v3_cfg_val(cfg, "name"); + + // PIT is only usable in non-multicore environments + // just hardcode the core context + struct guest_info * info = &(vm->cores[0]); + uint_t cpu_khz = V3_CPU_KHZ(); ullong_t reload_val = (ullong_t)cpu_khz * 1000; + pit_state = (struct pit *)V3_Malloc(sizeof(struct pit)); + V3_ASSERT(pit_state != NULL); + + dev = v3_allocate_device(name, &dev_ops, pit_state); + + if (v3_attach_device(vm, dev) == -1) { + PrintError("Could not attach device %s\n", name); + return -1; + } + v3_dev_hook_io(dev, CHANNEL0_PORT, &pit_read_channel, &pit_write_channel); v3_dev_hook_io(dev, CHANNEL1_PORT, &pit_read_channel, &pit_write_channel); v3_dev_hook_io(dev, CHANNEL2_PORT, &pit_read_channel, &pit_write_channel); v3_dev_hook_io(dev, COMMAND_PORT, NULL, &pit_write_command); -#ifdef DEBUG_PIT +#ifdef CONFIG_DEBUG_PIT PrintDebug("8254 PIT: OSC_HZ=%d, reload_val=", OSC_HZ); PrintTraceLL(reload_val); PrintDebug("\n"); #endif - v3_add_timer(dev->vm, &timer_ops, dev); + + v3_add_timer(info, &timer_ops, dev); // Get cpu frequency and calculate the global pit oscilattor counter/cycle do_divll(reload_val, OSC_HZ); - state->pit_counter = reload_val; - state->pit_reload = reload_val; + pit_state->pit_counter = reload_val; + pit_state->pit_reload = reload_val; - init_channel(&(state->ch_0)); - init_channel(&(state->ch_1)); - init_channel(&(state->ch_2)); + init_channel(&(pit_state->ch_0)); + init_channel(&(pit_state->ch_1)); + init_channel(&(pit_state->ch_2)); -#ifdef DEBUG_PIT +#ifdef CONFIG_DEBUG_PIT PrintDebug("8254 PIT: CPU MHZ=%d -- pit count=", cpu_khz / 1000); - PrintTraceLL(state->pit_counter); + PrintTraceLL(pit_state->pit_counter); PrintDebug("\n"); #endif return 0; } -static int pit_deinit(struct vm_device * dev) { - return 0; -} - - -static struct vm_device_ops dev_ops = { - .init = pit_init, - .deinit = pit_deinit, - .reset = NULL, - .start = NULL, - .stop = NULL, - -}; - - -struct vm_device * v3_create_pit() { - struct pit * pit_state = NULL; - pit_state = (struct pit *)V3_Malloc(sizeof(struct pit)); - V3_ASSERT(pit_state != NULL); - - struct vm_device * dev = v3_create_device("PIT", &dev_ops, pit_state); - - return dev; -} +device_register("8254_PIT", pit_init);