Changes to interface with new irq hooking mechanism, plus

[palacios.git] / palacios / src / geekos / vmm_stubs.c

diff --git a/palacios/src/geekos/vmm_stubs.c b/palacios/src/geekos/vmm_stubs.c
index c83e6d5..0dbe081 100644 (file)
--- a/palacios/src/geekos/vmm_stubs.c
+++ b/palacios/src/geekos/vmm_stubs.c
@@ -75,10 +75,51 @@ void VMM_Free(void * addr) {
   Free(addr);
 }
 
+//
+//
+// This is the interrupt state that the VMM's interrupt handlers need to see
+//
+struct vmm_intr_state {
+  uint_t irq;
+  uint_t error;
+
+  uint_t should_ack;  // Should the vmm ack this interrupt, or will
+                      // the host OS do it?
+
+  // This is the value given when the interrupt is hooked.
+  // This will never be NULL
+  void *opaque;
+};
+
+// This is the function the interface code should call to deliver
+// the interrupt to the vmm for handling
+extern void deliver_interrupt_to_vmm(struct vmm_intr_state *state);
 
 
 struct guest_info * irq_map[256];
 
+void *my_opaque[256];
+
+
+static void translate_intr_handler(struct Interrupt_State *state)
+{
+
+
+  struct vmm_intr_state mystate;
+
+  mystate.irq=state->intNum-32;
+  mystate.error=state->errorCode;
+  mystate.should_ack=0;
+  mystate.opaque=my_opaque[mystate.irq];
+
+  PrintBoth("translate_intr_handler: opaque=0x%x\n",mystate.opaque);
+
+  deliver_interrupt_to_vmm(&mystate);
+
+  End_IRQ(state);
+
+}
+
 static void pic_intr_handler(struct Interrupt_State * state) {
   Begin_IRQ(state);
   struct guest_info * info =   irq_map[state->intNum - 32];
@@ -95,7 +136,10 @@ static void pic_intr_handler(struct Interrupt_State * state) {
   // End_IRQ(state);
 }
 
-
+//
+//
+// I really don't know what the heck this is doing... PAD
+//
 int hook_irq_stub(struct guest_info * info, int irq) {
   if (irq_map[irq]) {
     return -1;
@@ -104,7 +148,11 @@ int hook_irq_stub(struct guest_info * info, int irq) {
   SerialPrint("Hooking IRQ: %d (vm=0x%x)\n", irq, info);
   irq_map[irq] = info;
   volatile void *foo = pic_intr_handler;
-  foo=0;
+
+  /* This is disabled for the time being */
+  foo = 0;
+
+
   Disable_IRQ(irq);
   Install_IRQ(irq, pic_intr_handler);
   Enable_IRQ(irq);
@@ -112,6 +160,23 @@ int hook_irq_stub(struct guest_info * info, int irq) {
 }
 
 
+int geekos_hook_interrupt_new(uint_t irq, void * opaque)
+{
+  if (my_opaque[irq]) { 
+    PrintBoth("Attempt to hook interrupt that is already hooked\n");
+    return -1;
+  } else {
+    PrintBoth("Hooked interrupt 0x%x with opaque 0x%x\n",irq,opaque);
+    my_opaque[irq]=opaque;
+  }
+
+  Disable_IRQ(irq);
+  Install_IRQ(irq,translate_intr_handler);
+  Enable_IRQ(irq);
+  return 0;
+}
+
+
 int ack_irq(int irq) {
   End_IRQ_num(irq);
   return 0;
@@ -133,70 +198,3 @@ unsigned int get_cpu_khz() {
   return cpu_khz_freq;
 }
 
-
-
-
-#if 0
-
-
-/* ------ Calibrate the TSC ------- 
- * Return processor ticks per second / CALIBRATE_FRAC.
- *
- * Ported From Xen
- */
-#define PIT_MODE 0x43
-#define PIT_CH2 0x42
-#define CLOCK_TICK_RATE 1193180 /* system crystal frequency (Hz) */
-#define CALIBRATE_FRAC  20      /* calibrate over 50ms */
-#define CALIBRATE_LATCH ((CLOCK_TICK_RATE+(CALIBRATE_FRAC/2))/CALIBRATE_FRAC)
-
-
-unsigned long long get_cpu_khz() {
-    ullong_t start, end;
-    unsigned long count;
-    unsigned long long tmp;
-    unsigned long print_tmp; 
-
-    /* Set the Gate high, disable speaker */
-    VM_Out_Byte((VM_In_Byte(0x61) & ~0x02) | 0x01, 0x61);
-
-    /*
-     * Now let's take care of CTC channel 2
-     *
-     * Set the Gate high, program CTC channel 2 for mode 0, (interrupt on
-     * terminal count mode), binary count, load 5 * LATCH count, (LSB and MSB)
-     * to begin countdown.
-     */
-    VM_Out_Byte(0xb0, PIT_MODE);           /* binary, mode 0, LSB/MSB, Ch 2 */
-    VM_Out_Byte(CALIBRATE_LATCH & 0xff, PIT_CH2); /* LSB of count */
-    VM_Out_Byte(CALIBRATE_LATCH >> 8, PIT_CH2);   /* MSB of count */
-
-    rdtscll(start);
-    for ( count = 0; (VM_In_Byte(0x61) & 0x20) == 0; count++ )
-        continue;
-    rdtscll(end);
-
-    /* Error if the CTC doesn't behave itself. */
-    if ( count == 0 ) {
-     PrintBoth("CPU Frequency Calibration Error\n");
-      return 0;
-    }
-
-    tmp = ((end - start) * (ullong_t)CALIBRATE_FRAC);
-
-    do_div(tmp, 1000);
-
-    tmp &= 0xffffffff;
-    print_tmp = (unsigned long)tmp;
-
-   PrintBoth("Detected %lu.%lu MHz CPU\n", print_tmp / 1000, print_tmp % 1000);
-    return tmp;
-}
-
-#undef PIT_CH2
-#undef PIT_MODE
-#undef CLOCK_TICK_RATE
-#undef CALIBRATE_FRAC  
-#undef CALIBRATE_LATCH 
-
-#endif