struct v3_timer * timer;
+ struct v3_vm_info * vm;
+
struct channel ch_0;
struct channel ch_1;
struct channel ch_2;
* 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;
#include <palacios/vm_guest.h>
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;
// 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(dev, &(state->ch_0), oscillations) == 1) {
+ 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\n");
+ // 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);
}
static int pit_read_channel(struct guest_info * core, ushort_t port, void * dst, uint_t length, void * priv_data) {
- struct vm_device * dev = (struct vm_device *)priv_data;
- struct pit * state = (struct pit *)dev->private_data;
+ struct pit * state = (struct pit *)priv_data;
char * val = (char *)dst;
if (length != 1) {
static int pit_write_channel(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) {
- struct vm_device * dev = (struct vm_device *)priv_data;
- struct pit * state = (struct pit *)dev->private_data;
+ struct pit * state = (struct pit *)priv_data;
char val = *(char *)src;
if (length != 1) {
static int pit_write_command(struct guest_info * core, ushort_t port, void * src, uint_t length, void * priv_data) {
- struct vm_device * dev = (struct vm_device *)priv_data;
- struct pit * state = (struct pit *)dev->private_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");
-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) {
v3_remove_timer(info, state->timer);
}
+
+ V3_Free(state);
+ return 0;
+}
+
+#ifdef CONFIG_KEYED_STREAMS
+static int pit_checkpoint(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;
+ }
- v3_unhook_io_port(dev->vm, CHANNEL0_PORT);
- v3_unhook_io_port(dev->vm, CHANNEL1_PORT);
- v3_unhook_io_port(dev->vm, CHANNEL2_PORT);
- v3_unhook_io_port(dev->vm, COMMAND_PORT);
- v3_unhook_io_port(dev->vm, SPEAKER_PORT);
+ 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);
- V3_Free(state);
return 0;
+
+
}
+static int pit_restore(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,
- .reset = NULL,
- .start = NULL,
- .stop = NULL,
+ 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 CONFIG_KEYED_STREAMS
+ .checkpoint = pit_checkpoint,
+ .restore = pit_restore,
+#endif
};
#include <palacios/vm_guest.h>
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]);
- 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;
}
- v3_hook_io_port(vm, CHANNEL0_PORT, &pit_read_channel, &pit_write_channel, dev);
- v3_hook_io_port(vm, CHANNEL1_PORT, &pit_read_channel, &pit_write_channel, dev);
- v3_hook_io_port(vm, CHANNEL2_PORT, &pit_read_channel, &pit_write_channel, dev);
- v3_hook_io_port(vm, COMMAND_PORT, NULL, &pit_write_command, dev);
- v3_hook_io_port(vm, SPEAKER_PORT, &pit_read_channel, &pit_write_channel, dev);
+ 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);
- pit_state->timer = v3_add_timer(info, &timer_ops, dev);
+ 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;
}
pit_state->pit_reload = reload_val;
-
init_channel(&(pit_state->ch_0));
init_channel(&(pit_state->ch_1));
init_channel(&(pit_state->ch_2));
