X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2F8254.c;h=7bf6a8cc94607addd914c2ce42ca3399acbdde81;hb=03be513c0df4bd0c559a0613943ef580e054bb3f;hp=ecb2fa0b0eef058bb46033e16a156aa6e325c56a;hpb=ef944e47f418cfbf344757e3fbab5e40927966fe;p=palacios.git diff --git a/palacios/src/devices/8254.c b/palacios/src/devices/8254.c index ecb2fa0..7bf6a8c 100644 --- a/palacios/src/devices/8254.c +++ b/palacios/src/devices/8254.c @@ -24,6 +24,7 @@ #include #include #include +#include #ifndef CONFIG_DEBUG_PIT @@ -86,6 +87,9 @@ struct pit { ullong_t pit_counter; ullong_t pit_reload; + struct v3_timer * timer; + + struct v3_vm_info * vm; struct channel ch_0; struct channel ch_1; @@ -125,7 +129,7 @@ struct pit_rdb_status_word { * This should call out to handle_SQR_WAVE_tics, etc... */ // Returns true if the the output signal changed state -static int handle_crystal_tics(struct vm_device * dev, struct channel * ch, uint_t oscillations) { +static int handle_crystal_tics(struct pit * pit, struct channel * ch, uint_t oscillations) { uint_t channel_cycles = 0; uint_t output_changed = 0; @@ -162,12 +166,6 @@ static int handle_crystal_tics(struct vm_device * dev, struct channel * ch, uint reload_val = 0xffff; } - // TODO: Check this.... - // Is this correct??? - if (reload_val == 0) { - reload_val = 1; - } - oscillations -= ch->counter; ch->counter = 0; channel_cycles = 1; @@ -176,6 +174,12 @@ static int handle_crystal_tics(struct vm_device * dev, struct channel * ch, uint reload_val -= reload_val % 2; } + // TODO: Check this.... + // Is this correct??? + if (reload_val == 0) { + reload_val = 1; + } + channel_cycles += oscillations / reload_val; oscillations = oscillations % reload_val; @@ -237,8 +241,7 @@ static int handle_crystal_tics(struct vm_device * dev, struct channel * ch, uint #include static void pit_update_timer(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; + struct pit * state = (struct pit *)private_data; // ullong_t tmp_ctr = state->pit_counter; ullong_t tmp_cycles; uint_t oscillations = 0; @@ -297,14 +300,14 @@ static void pit_update_timer(struct guest_info * info, ullong_t cpu_cycles, ullo state->pit_counter = state->pit_reload - cpu_cycles; //PrintDebug("8254 PIT: Handling %d crystal tics\n", oscillations); - if (handle_crystal_tics(dev, &(state->ch_0), oscillations) == 1) { + if (handle_crystal_tics(state, &(state->ch_0), oscillations) == 1) { // raise interrupt PrintDebug("8254 PIT: Injecting Timer interrupt to guest\n"); v3_raise_irq(info->vm_info, 0); } - //handle_crystal_tics(dev, &(state->ch_1), oscillations); - handle_crystal_tics(dev, &(state->ch_2), oscillations); + //handle_crystal_tics(state, &(state->ch_1), oscillations); + handle_crystal_tics(state, &(state->ch_2), oscillations); } @@ -475,8 +478,8 @@ static int handle_channel_cmd(struct channel * ch, struct pit_cmd_word cmd) { -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; +static int pit_read_channel(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * priv_data) { + struct pit * state = (struct pit *)priv_data; char * val = (char *)dst; if (length != 1) { @@ -521,8 +524,8 @@ static int pit_read_channel(struct guest_info * core, ushort_t port, void * dst, -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; +static int pit_write_channel(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) { + struct pit * state = (struct pit *)priv_data; char val = *(char *)src; if (length != 1) { @@ -569,8 +572,8 @@ static int pit_write_channel(struct guest_info * core, ushort_t port, void * src -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; +static int pit_write_command(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) { + struct pit * state = (struct pit *)priv_data; struct pit_cmd_word * cmd = (struct pit_cmd_word *)src; PrintDebug("8254 PIT: Write to PIT Command port\n"); @@ -615,7 +618,7 @@ static int pit_write_command(struct guest_info * core, ushort_t port, void * src -static struct vm_timer_ops timer_ops = { +static struct v3_timer_ops timer_ops = { .update_timer = pit_update_timer, }; @@ -641,17 +644,23 @@ static void init_channel(struct channel * ch) { -static int pit_free(struct vm_device * dev) { +static int pit_free(void * private_data) { + struct pit * state = (struct pit *)private_data; + struct guest_info * info = &(state->vm->cores[0]); + + if (state->timer) { + v3_remove_timer(info, state->timer); + } + + V3_Free(state); return 0; } static struct v3_device_ops dev_ops = { - .free = pit_free, - .reset = NULL, - .start = NULL, - .stop = NULL, + .free = (int (*)(void *))pit_free, + }; @@ -661,7 +670,8 @@ 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 * dev_id = v3_cfg_val(cfg, "ID"); - + int ret = 0; + // PIT is only usable in non-multicore environments // just hardcode the core context struct guest_info * info = &(vm->cores[0]); @@ -670,21 +680,30 @@ static int pit_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { ullong_t reload_val = (ullong_t)cpu_khz * 1000; pit_state = (struct pit *)V3_Malloc(sizeof(struct pit)); + V3_ASSERT(pit_state != NULL); pit_state->speaker = 0; + pit_state->vm = vm; - dev = v3_allocate_device(dev_id, &dev_ops, pit_state); + dev = v3_add_device(vm, dev_id, &dev_ops, pit_state); - if (v3_attach_device(vm, dev) == -1) { + if (dev == NULL) { PrintError("Could not attach device %s\n", dev_id); + V3_Free(pit_state); 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); - v3_dev_hook_io(dev, SPEAKER_PORT, &pit_read_channel, &pit_write_channel); + ret |= v3_dev_hook_io(dev, CHANNEL0_PORT, &pit_read_channel, &pit_write_channel); + ret |= v3_dev_hook_io(dev, CHANNEL1_PORT, &pit_read_channel, &pit_write_channel); + ret |= v3_dev_hook_io(dev, CHANNEL2_PORT, &pit_read_channel, &pit_write_channel); + ret |= v3_dev_hook_io(dev, COMMAND_PORT, NULL, &pit_write_command); + ret |= v3_dev_hook_io(dev, SPEAKER_PORT, &pit_read_channel, &pit_write_channel); + + if (ret != 0) { + PrintError("8254 PIT: Failed to hook IO ports\n"); + v3_remove_device(dev); + return -1; + } #ifdef CONFIG_DEBUG_PIT PrintDebug("8254 PIT: OSC_HZ=%d, reload_val=", OSC_HZ); @@ -693,7 +712,13 @@ static int pit_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { #endif - v3_add_timer(info, &timer_ops, dev); + + pit_state->timer = v3_add_timer(info, &timer_ops, pit_state); + + if (pit_state->timer == NULL) { + v3_remove_device(dev); + return -1; + } // Get cpu frequency and calculate the global pit oscilattor counter/cycle @@ -702,7 +727,6 @@ static int pit_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { pit_state->pit_reload = reload_val; - init_channel(&(pit_state->ch_0)); init_channel(&(pit_state->ch_1)); init_channel(&(pit_state->ch_2));