X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2F8254.c;h=4b30a67f079c66326c591799d4f7400ad5fb65e2;hb=c7739777acd3a3a384da670552fb4145e2161375;hp=5a78e937734cf82c0133f849f833f4197f436c91;hpb=72420d58d18ec71d4777d029daaf0c6a1c820b32;p=palacios.git

diff --git a/palacios/src/devices/8254.c b/palacios/src/devices/8254.c
index 5a78e93..4b30a67 100644
--- a/palacios/src/devices/8254.c
+++ b/palacios/src/devices/8254.c
@@ -27,7 +27,7 @@
 #include <palacios/vmm_io.h>
 
 
-#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;
@@ -160,7 +162,7 @@ static int handle_crystal_tics(struct pit * pit, struct channel * ch, uint_t osc
     } 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;
 	}
 
@@ -297,10 +299,13 @@ 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 (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);
 	}
 
@@ -425,10 +430,12 @@ 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;
 
+    ch->access_mode = cmd.access_mode;
 
+    if (ch->access_mode != 0) {
+	ch->op_mode = cmd.op_mode;
+    }
 
 
     switch (cmd.access_mode) {
@@ -642,9 +649,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 +662,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 <palacios/vm_guest.h>
@@ -674,12 +736,14 @@ 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_add_device(vm, dev_id, &dev_ops, pit_state);
 
@@ -701,7 +765,7 @@ static int pit_init(struct v3_vm_info * vm, v3_cfg_tree_t * cfg) {
 	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");
@@ -727,7 +791,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");