Changeset 27254 in vbox for trunk/src

Timestamp:

Mar 10, 2010 3:03:11 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

58644

Message:

HPET: correct interrupts delivery

Location:

trunk/src

Files:

• VBox/Devices/PC/DevHPET.cpp (modified) (3 diffs)
• VBox/VMM/PDMDevHlp.cpp (modified) (2 diffs)
• VBox/VMM/PDMDevMiscHlp.cpp (modified) (2 diffs)
• VBox/VMM/VMMAll/PDMAll.cpp (modified) (2 diffs)
• recompiler/VBoxREMWrapper.cpp (modified) (1 diff)
• recompiler/VBoxRecompiler.c (modified) (1 diff)

trunk/src/VBox/Devices/PC/DevHPET.cpp

@@ -355 +355 @@
      *   timer 0: IRQ0 for PIC and IRQ2 for APIC
      *   timer 1: IRQ8 for both PIC and APIC
-     * As primary usecase for HPET is APIC config, we pretend
-     * being always APIC, although for safety we shall check currect IC.
-     * @todo: implement private interface between HPET and PDM
-     *        to allow figuring that out and enabling/disabling
-     *        PIT and RTC
+     *
+     * ISA IRQ delivery logic will take care of correct delivery 
+     * to the different ICs.
      */
     if ((pTimer->u8TimerNumber <= 1) &&
         (pTimer->CTX_SUFF(pHpet)->u64Config & HPET_CFG_LEGACY))
-        return (pTimer->u8TimerNumber == 0) ? 2 : 8;
+        return (pTimer->u8TimerNumber == 0) ? 0 : 8;
     else
         return (pTimer->u64Config & HPET_TN_INT_ROUTE_MASK) >> HPET_TN_INT_ROUTE_SHIFT;
@@ -974 +972 @@
 static void irqUpdate(struct HpetTimer *pTimer)
 {
-    uint32_t irq     = getTimerIrq(pTimer);
+    uint32_t irq    = getTimerIrq(pTimer);
     HpetState* pThis = pTimer->CTX_SUFF(pHpet);
 
@@ -990 +988 @@
         if ((pTimer->u64Config & HPET_TN_INT_TYPE) == HPET_TIMER_TYPE_EDGE)
             pThis->pHpetHlpR3->pfnSetIrq(pThis->CTX_SUFF(pDevIns), irq, PDM_IRQ_LEVEL_FLIP_FLOP);
+        else
+            Assert(false);
         /* @todo: implement IRQs in level-triggered mode */
     }

trunk/src/VBox/VMM/PDMDevHlp.cpp

@@ -1306 +1306 @@
 
     PVM pVM = pDevIns->Internal.s.pVMR3;
-    PDMIsaSetIrq(pVM, iIrq, iLevel, true);    /* (The API takes the lock.) */
+    PDMIsaSetIrq(pVM, iIrq, iLevel);    /* (The API takes the lock.) */
 
     LogFlow(("pdmR3DevHlp_ISASetIrq: caller='%s'/%d: returns void\n", pDevIns->pReg->szName, pDevIns->iInstance));
@@ -3167 +3167 @@
     {
         case PDMDEVHLPTASKOP_ISA_SET_IRQ:
-            PDMIsaSetIrq(pVM, pTask->u.SetIRQ.iIrq, pTask->u.SetIRQ.iLevel, true /* ISA source */);
+            PDMIsaSetIrq(pVM, pTask->u.SetIRQ.iIrq, pTask->u.SetIRQ.iLevel);
             break;
 

trunk/src/VBox/VMM/PDMDevMiscHlp.cpp

@@ -459 +459 @@
     PDMDEV_ASSERT_DEVINS(pDevIns);
     Log4(("pdmR3PciHlp_IsaSetIrq: iIrq=%d iLevel=%d\n", iIrq, iLevel));
-    PDMIsaSetIrq(pDevIns->Internal.s.pVMR3, iIrq, iLevel,  /* ISA source */ true);
+    PDMIsaSetIrq(pDevIns->Internal.s.pVMR3, iIrq, iLevel);
 }
 
@@ -598 +598 @@
     PDMDEV_ASSERT_DEVINS(pDevIns);
     LogFlow(("pdmR3HpetHlp_SetIrq: caller='%s'/%d: iIrq=%d iLevel=%d\n", pDevIns->pReg->szName, pDevIns->iInstance, iIrq, iLevel));
-    PDMIsaSetIrq(pDevIns->Internal.s.pVMR3, iIrq, iLevel, false /* Non-ISA source */);
+    PDMIsaSetIrq(pDevIns->Internal.s.pVMR3, iIrq, iLevel);
     return 0;
 }

trunk/src/VBox/VMM/VMMAll/PDMAll.cpp

@@ -100 +100 @@
  * @param   u8Level         The new level.
  */
-VMMDECL(int) PDMIsaSetIrq(PVM pVM, uint8_t u8Irq, uint8_t u8Level, bool fIsaSource)
+VMMDECL(int) PDMIsaSetIrq(PVM pVM, uint8_t u8Irq, uint8_t u8Level)
 {
     pdmLock(pVM);
@@ -124 +124 @@
          * If changing, also update override rules in MADT and MPS.
          */
-        if (fIsaSource)
-        {
-            /* ISA IRQ0 routed to pin 2, all others ISA sources are identity mapped */
-            if (u8Irq == 0)
-                u8Irq = 2;
-        }
+        /* ISA IRQ0 routed to pin 2, all others ISA sources are identity mapped */
+        if (u8Irq == 0)
+            u8Irq = 2;
+
         pVM->pdm.s.IoApic.CTX_SUFF(pfnSetIrq)(pVM->pdm.s.IoApic.CTX_SUFF(pDevIns), u8Irq, u8Level);
         rc = VINF_SUCCESS;

trunk/src/recompiler/VBoxREMWrapper.cpp

@@ -754 +754 @@
     { REMPARMDESC_FLAGS_INT,        sizeof(PVM),                NULL },
     { REMPARMDESC_FLAGS_INT,        sizeof(uint8_t),            NULL },
-    { REMPARMDESC_FLAGS_INT,        sizeof(uint8_t),            NULL },
-    { REMPARMDESC_FLAGS_INT,        sizeof(bool),               NULL }
+    { REMPARMDESC_FLAGS_INT,        sizeof(uint8_t),            NULL }
 };
 static const REMPARMDESC g_aArgsPDMR3CritSectInit[] =

trunk/src/recompiler/VBoxRecompiler.c

@@ -4122 +4122 @@
 void cpu_set_ferr(CPUX86State *env)
 {
-    int rc = PDMIsaSetIrq(env->pVM, 13, 1, true);
+    int rc = PDMIsaSetIrq(env->pVM, 13, 1);
     LogFlow(("cpu_set_ferr: rc=%d\n", rc)); NOREF(rc);
 }