X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2F8254.c;h=fcde0a1f9d921d57fd7da709cb4bb0507bf1a788;hb=ee05d4a828862fb4e79616585c15be0aee11ea50;hp=028357fda9c2573c0d736185d3b6f225b920a9fd;hpb=e2964f7234daa3429275c039769a313f0870c212;p=palacios.git diff --git a/palacios/src/devices/8254.c b/palacios/src/devices/8254.c index 028357f..fcde0a1 100644 --- a/palacios/src/devices/8254.c +++ b/palacios/src/devices/8254.c @@ -27,7 +27,7 @@ #include -#ifndef CONFIG_DEBUG_PIT +#ifndef V3_CONFIG_DEBUG_PIT #undef PrintDebug #define PrintDebug(fmt, args...) #endif @@ -54,8 +54,8 @@ */ typedef enum {NOT_RUNNING, PENDING, RUNNING} channel_run_state_t; typedef enum {NOT_WAITING, WAITING_LOBYTE, WAITING_HIBYTE} channel_access_state_t; -typedef enum {LATCH_COUNT, LOBYTE_ONLY, HIBYTE_ONLY, LOBYTE_HIBYTE} channel_access_mode_t; -typedef enum {IRQ_ON_TERM_CNT, ONE_SHOT, RATE_GEN, SQR_WAVE, SW_STROBE, HW_STROBE} channel_op_mode_t; +typedef enum {LATCH_COUNT = 0, LOBYTE_ONLY = 1, HIBYTE_ONLY = 2, LOBYTE_HIBYTE = 3} channel_access_mode_t; +typedef enum {IRQ_ON_TERM_CNT = 0, ONE_SHOT = 1, RATE_GEN = 2, SQR_WAVE = 3, SW_STROBE = 4, HW_STROBE = 5} channel_op_mode_t; struct channel { @@ -89,6 +89,8 @@ struct pit { struct v3_timer * timer; + struct v3_vm_info * vm; + struct channel ch_0; struct channel ch_1; struct channel ch_2; @@ -131,7 +133,8 @@ static int handle_crystal_tics(struct pit * pit, struct channel * ch, uint_t osc uint_t channel_cycles = 0; uint_t output_changed = 0; - // PrintDebug("8254 PIT: %d crystal tics\n", oscillations); + // PrintDebug("8254 PIT (channel %d): %d crystal tics\n", + // ch - pit->ch0, oscillations); if (ch->run_state == PENDING) { oscillations--; ch->counter = ch->reload_value; @@ -156,11 +159,13 @@ static int handle_crystal_tics(struct pit * pit, struct channel * ch, uint_t osc if (ch->counter > oscillations) { ch->counter -= oscillations; + //PrintDebug("8254 PIT: Counter at %u after %u oscillations.\n", + // (unsigned int)ch->counter, oscillations); return output_changed; } else { ushort_t reload_val = ch->reload_value; - if (ch->op_mode == SW_STROBE) { + if ((ch->op_mode == SW_STROBE) || (ch->op_mode == IRQ_ON_TERM_CNT)) { reload_val = 0xffff; } @@ -182,23 +187,33 @@ static int handle_crystal_tics(struct pit * pit, struct channel * ch, uint_t osc oscillations = oscillations % reload_val; ch->counter = reload_val - oscillations; + // PrintDebug("8254 PIT: Counter reset to %u.\n", + // (unsigned int)ch->counter); + } - // PrintDebug("8254 PIT: Channel Cycles: %d\n", channel_cycles); + //PrintDebug("8254 PIT: Channel %ld (mode = %u) Cycles: %d\n", + //(ch - &pit->ch_0), ch->op_mode, channel_cycles); - - switch (ch->op_mode) { case IRQ_ON_TERM_CNT: - if ((channel_cycles > 0) && (ch->output_pin == 0)) { - ch->output_pin = 1; - output_changed = 1; + if (channel_cycles > 0) { + if (ch->output_pin == 0) { + ch->output_pin = 1; + output_changed = 1; + } else { + // PrintDebug("8254: Output not changed in TERM_CNT mode.\n"); + } } break; case ONE_SHOT: - if ((channel_cycles > 0) && (ch->output_pin == 0)) { - ch->output_pin = 1; - output_changed = 1; + if (channel_cycles > 0) { + if ((ch->output_pin == 0)) { + ch->output_pin = 1; + output_changed = 1; + } else { + // PrintDebug("8254: Output not changed in ONE_SHOT mode.\n"); + } } break; case RATE_GEN: @@ -214,6 +229,7 @@ static int handle_crystal_tics(struct pit * pit, struct channel * ch, uint_t osc output_changed = 1; } + break; case SW_STROBE: @@ -297,19 +313,20 @@ static void pit_update_timer(struct guest_info * info, ullong_t cpu_cycles, ullo // update counter with remainder (mod reload) state->pit_counter = state->pit_reload - cpu_cycles; - //PrintDebug("8254 PIT: Handling %d crystal tics\n", oscillations); - 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(state, &(state->ch_1), oscillations); - handle_crystal_tics(state, &(state->ch_2), oscillations); - } - + if (oscillations) { + // PrintDebug("8254 PIT: Handling %d crystal tics\n", oscillations); + if (handle_crystal_tics(state, &(state->ch_0), oscillations) == 1) { + // raise interrupt + PrintDebug("8254 PIT: Injecting Timer interrupt to guest (run_state = %d)\n", + state->ch_0.run_state); + v3_raise_irq(info->vm_info, 0); + } + //handle_crystal_tics(state, &(state->ch_1), oscillations); + handle_crystal_tics(state, &(state->ch_2), oscillations); + } + } return; } @@ -425,11 +442,21 @@ static int handle_speaker_write(uint8_t *speaker, struct channel * ch, char val) } static int handle_channel_cmd(struct channel * ch, struct pit_cmd_word cmd) { - ch->op_mode = cmd.op_mode; - ch->access_mode = cmd.access_mode; + if (cmd.op_mode != ch->op_mode) { + PrintDebug("8254 PIT: Changing channel from op mode %d to op mode %d.\n", + ch->op_mode, cmd.op_mode); + } + if (cmd.access_mode != 0) { + ch->op_mode = cmd.op_mode; + } + if (cmd.access_mode != ch->access_mode) { + PrintDebug("8254 PIT: Changing channel from access mode %d to access mode %d.\n", + ch->access_mode, cmd.access_mode); + } + ch->access_mode = cmd.access_mode; switch (cmd.access_mode) { case LATCH_COUNT: @@ -581,6 +608,11 @@ static int pit_write_command(struct guest_info * core, ushort_t port, void * src return -1; } + if (cmd->op_mode == 0) { + V3_Print("SETTING PIT MODE TO 0!!!!!\n"); + v3_print_guest_state(core); + } + switch (cmd->channel) { case 0: if (handle_channel_cmd(&(state->ch_0), *cmd) == -1) { @@ -642,9 +674,9 @@ static void init_channel(struct channel * ch) { -static int pit_free(struct vm_device * dev) { - struct pit * state = (struct pit *)dev->private_data; - struct guest_info * info = &(dev->vm->cores[0]); +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) { @@ -655,11 +687,66 @@ static int pit_free(struct vm_device * dev) { return 0; } +#ifdef V3_CONFIG_KEYED_STREAMS +static int pit_checkpoint(struct vm_device *dev, v3_keyed_stream_t stream) +{ + struct pit *p = (struct pit *) (dev->private_data); -static struct v3_device_ops dev_ops = { - .free = pit_free, + v3_keyed_stream_key_t ks; + ks = v3_keyed_stream_open_key(stream,dev->name); + if (!ks) { + return -1; + } + + STD_SAVE(stream,ks,p->pit_counter); + STD_SAVE(stream,ks,p->pit_reload); + STD_SAVE(stream,ks,p->ch_0); + STD_SAVE(stream,ks,p->ch_1); + STD_SAVE(stream,ks,p->ch_2); + STD_SAVE(stream,ks,p->speaker); + + v3_keyed_stream_close_key(stream,ks); + + return 0; + + +} + +static int pit_restore(struct vm_device *dev, v3_keyed_stream_t stream) +{ + struct pit *p = (struct pit *) (dev->private_data); + + v3_keyed_stream_key_t ks; + + ks = v3_keyed_stream_open_key(stream,dev->name); + + if (!ks) { + return -1; + } + + STD_LOAD(stream,ks,p->pit_counter); + STD_LOAD(stream,ks,p->pit_reload); + STD_LOAD(stream,ks,p->ch_0); + STD_LOAD(stream,ks,p->ch_1); + STD_LOAD(stream,ks,p->ch_2); + STD_LOAD(stream,ks,p->speaker); + + v3_keyed_stream_close_key(stream,ks); + + return 0; + + +} +#endif + +static struct v3_device_ops dev_ops = { + .free = (int (*)(void *))pit_free, +#ifdef V3_CONFIG_KEYED_STREAMS + .checkpoint = pit_checkpoint, + .restore = pit_restore, +#endif }; #include @@ -674,16 +761,18 @@ static int pit_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { // just hardcode the core context struct guest_info * info = &(vm->cores[0]); - uint_t cpu_khz = V3_CPU_KHZ(); + uint_t cpu_khz = info->time_state.guest_cpu_freq; 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; @@ -697,11 +786,11 @@ static int pit_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { if (ret != 0) { PrintError("8254 PIT: Failed to hook IO ports\n"); - v3_detach_device(dev); + v3_remove_device(dev); return -1; } -#ifdef CONFIG_DEBUG_PIT +#ifdef V3_CONFIG_DEBUG_PIT PrintDebug("8254 PIT: OSC_HZ=%d, reload_val=", OSC_HZ); //PrintTrace(reload_val); PrintDebug("\n"); @@ -712,7 +801,7 @@ static int pit_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { pit_state->timer = v3_add_timer(info, &timer_ops, pit_state); if (pit_state->timer == NULL) { - v3_detach_device(dev); + v3_remove_device(dev); return -1; } @@ -727,7 +816,7 @@ static int pit_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) { init_channel(&(pit_state->ch_1)); init_channel(&(pit_state->ch_2)); -#ifdef CONFIG_DEBUG_PIT +#ifdef V3_CONFIG_DEBUG_PIT PrintDebug("8254 PIT: CPU MHZ=%d -- pit count=", cpu_khz / 1000); //PrintTraceLL(pit_state->pit_counter); PrintDebug("\n");