X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2F8254.c;h=8e7dede87825dfa19a979058deee39f48416af20;hb=596d3c2aa2f0a5360baf1c921e4543f014809b78;hp=4b2f4c079ba7a5a5c98f6c4675d285f539198d12;hpb=123a1ba27ea09c8fa77a1b36ce625b43d7c48b14;p=palacios.git diff --git a/palacios/src/devices/8254.c b/palacios/src/devices/8254.c index 4b2f4c0..8e7dede 100644 --- a/palacios/src/devices/8254.c +++ b/palacios/src/devices/8254.c @@ -42,9 +42,11 @@ #define CHANNEL1_PORT 0x41 #define CHANNEL2_PORT 0x42 #define COMMAND_PORT 0x43 +#define SPEAKER_PORT 0x61 #define PIT_INTR_NUM 0 +#define PIT_SPEAKER_GATE 0x01 /* The order of these typedefs is important because the numerical values correspond to the * values coming from the io ports @@ -88,6 +90,7 @@ struct pit { struct channel ch_0; struct channel ch_1; struct channel ch_2; + uint8_t speaker; }; @@ -159,12 +162,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; @@ -173,6 +170,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; @@ -231,8 +234,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_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; // ullong_t tmp_ctr = state->pit_counter; @@ -296,11 +300,11 @@ 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); - //handle_crystal_tics(dev, &(state->ch_2), oscillations); + handle_crystal_tics(dev, &(state->ch_2), oscillations); } @@ -309,8 +313,6 @@ static void pit_update_time(ullong_t cpu_cycles, ullong_t cpu_freq, void * priva return; } - - /* This should call out to handle_SQR_WAVE_write, etc... */ static int handle_channel_write(struct channel * ch, char val) { @@ -406,9 +408,20 @@ static int handle_channel_read(struct channel * ch, char * val) { } +static int handle_speaker_read(uint8_t *speaker, struct channel * ch, char * val) { + *val = *speaker; + if ((*speaker & PIT_SPEAKER_GATE)) { + *val |= (ch->output_pin << 5); + } + + return 0; +} - +static int handle_speaker_write(uint8_t *speaker, struct channel * ch, char val) { + *speaker = (val & ~0x20); + return 0; +} static int handle_channel_cmd(struct channel * ch, struct pit_cmd_word cmd) { ch->op_mode = cmd.op_mode; @@ -462,7 +475,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; @@ -492,6 +505,12 @@ static int pit_read_channel(ushort_t port, void * dst, uint_t length, struct vm_ return -1; } break; + case SPEAKER_PORT: + if (handle_speaker_read(&state->speaker, &(state->ch_2), val) == -1) { + PrintError("SPEAKER read error\n"); + return -1; + } + break; default: PrintError("8254 PIT: Read from invalid port (%d)\n", port); return -1; @@ -502,7 +521,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; @@ -533,6 +552,12 @@ static int pit_write_channel(ushort_t port, void * src, uint_t length, struct vm return -1; } break; + case SPEAKER_PORT: + if (handle_speaker_write(&state->speaker, &(state->ch_2), val) == -1) { + PrintError("SPEAKER write error\n"); + return -1; + } + break; default: PrintError("8254 PIT: Write to invalid port (%d)\n", port); return -1; @@ -544,7 +569,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; @@ -591,7 +616,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, + .update_timer = pit_update_timer, }; @@ -630,22 +655,28 @@ static struct v3_device_ops dev_ops = { }; +#include -static int pit_init(struct guest_info * info, v3_cfg_tree_t * cfg) { +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"); + char * dev_id = v3_cfg_val(cfg, "ID"); + + // 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); + pit_state->speaker = 0; - dev = v3_allocate_device(name, &dev_ops, pit_state); + dev = v3_allocate_device(dev_id, &dev_ops, pit_state); - if (v3_attach_device(info, dev) == -1) { - PrintError("Could not attach device %s\n", name); + if (v3_attach_device(vm, dev) == -1) { + PrintError("Could not attach device %s\n", dev_id); return -1; } @@ -653,13 +684,15 @@ static int pit_init(struct guest_info * info, v3_cfg_tree_t * cfg) { 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); #ifdef CONFIG_DEBUG_PIT PrintDebug("8254 PIT: OSC_HZ=%d, reload_val=", OSC_HZ); - PrintTraceLL(reload_val); + //PrintTrace(reload_val); PrintDebug("\n"); #endif + v3_add_timer(info, &timer_ops, dev); // Get cpu frequency and calculate the global pit oscilattor counter/cycle @@ -676,7 +709,7 @@ static int pit_init(struct guest_info * info, v3_cfg_tree_t * cfg) { #ifdef CONFIG_DEBUG_PIT PrintDebug("8254 PIT: CPU MHZ=%d -- pit count=", cpu_khz / 1000); - PrintTraceLL(pit_state->pit_counter); + //PrintTraceLL(pit_state->pit_counter); PrintDebug("\n"); #endif