vbox的更動 12598 路徑 trunk/src/VBox/Devices/PC

時間撮記:

2008-9-19 上午11:50:47 (16 年 以前)

作者:

vboxsync

訊息:

some interrupt routing code

檔案:

• trunk/src/VBox/Devices/PC/DevAPIC.cpp (修改) (18 筆差異)

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

@@ -79 +79 @@
 
 /**  @def FIRST_LAPIC
- * Return address of first LAPIC state. If this macro is use - it's probably
- * something wrong or fishy with the code using it, unless explained. */ 
+ * Return address of first LAPIC state. */ 
 #define FIRST_LAPIC(pThis) ((APICState*)(pThis)->CTX_SUFF(pLapics))
+
+#define FOR_EACH_LAPIC(dev, code)                         \
+    do {                                                  \
+        uint32_t i;                                       \
+        APICState* apic = FIRST_LAPIC(dev);               \
+        for (i=0; i < dev->cCpus; i++)                    \
+        {                                                 \
+            code;                                         \
+            apic++;                                       \
+        }                                                 \
+    } while (0) 
+
+# define set_bit(pvBitmap, iBit)    ASMBitSet(pvBitmap, iBit)
+# define reset_bit(pvBitmap, iBit)  ASMBitClear(pvBitmap, iBit)
+# define fls_bit(value)             (ASMBitLastSetU32(value) - 1)
+# define ffs_bit(value)             (ASMBitFirstSetU32(value) - 1)
 
 #endif /* VBOX */
@@ -227 +242 @@
 typedef struct
 {
+    /** @todo: APIC timer must be per-APIC */
     /** The device instance - R3 Ptr. */
     PPDMDEVINSR3    pDevInsR3;
@@ -257 +273 @@
     uint32_t        ulTPRPatchAttempts;
     
-    /** Number of LAPICs on the system (same as CPU count). */
+    /** Number of CPUs on the system (same as LAPIC count). */
     uint32_t        cCpus;
 
@@ -289 +305 @@
 
 #ifdef VBOX
-static uint32_t apic_get_delivery_bitmask(APICState *s, uint8_t dest, uint8_t dest_mode);
+static uint32_t apic_get_delivery_bitmask(APICDeviceInfo* dev, APICState *s, uint8_t dest, uint8_t dest_mode);
 __BEGIN_DECLS
 PDMBOTHCBDECL(int)  apicMMIORead(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb);
@@ -327 +343 @@
     switch (delivery_mode) {
         case APIC_DM_LOWPRI:
+#ifndef VBOX
+            /* XXX: search for focus processor, arbitration */
+            {
+                int i, d;
+                d = -1;
+                for(i = 0; i < MAX_APIC_WORDS; i++) {
+                    if (deliver_bitmask[i]) {
+                        d = i * 32 + ffs_bit(deliver_bitmask[i]);
+                        break;
+                    }
+                }
+                if (d >= 0) {
+                    apic_iter = local_apics[d];
+                    if (apic_iter) {
+                        apic_set_irq(apic_iter, vector_num, trigger_mode);
+                    }
+                }
+            }
+#else
+            {
+                int d = -1;
+                if (deliver_bitmask)
+                    d = ffs_bit(deliver_bitmask);
+                if (d >= 0) 
+                {
+                    APICState* apic = FIRST_LAPIC(dev) + d;
+                    apic_set_irq(dev, apic, vector_num, trigger_mode);
+                }
+            }
+#endif
+            return;
         case APIC_DM_FIXED:
             /* XXX: arbitration */
@@ -504 +551 @@
     LogFlow(("apicBusDeliverCallback: s=%p pDevIns=%p u8Dest=%#x u8DestMode=%#x u8DeliveryMode=%#x iVector=%#x u8Polarity=%#x u8TriggerMode=%#x\n",
              s, pDevIns, u8Dest, u8DestMode, u8DeliveryMode, iVector, u8Polarity, u8TriggerMode));
-    apic_bus_deliver(dev, s, apic_get_delivery_bitmask(s, u8Dest, u8DestMode),
+    apic_bus_deliver(dev, s, apic_get_delivery_bitmask(dev, s, u8Dest, u8DestMode),
                      u8DeliveryMode, iVector, u8Polarity, u8TriggerMode);
 }
-
-# define set_bit(pvBitmap, iBit)    ASMBitSet(pvBitmap, iBit)
-# define reset_bit(pvBitmap, iBit)  ASMBitClear(pvBitmap, iBit)
-# define fls_bit(value)             (ASMBitLastSetU32(value) - 1)
 
 #endif /* VBOX */
@@ -654 +697 @@
 static uint32_t apic_get_delivery_bitmask(uint8_t dest, uint8_t dest_mode)
 #else /* VBOX */
-static uint32_t apic_get_delivery_bitmask(APICState *s, uint8_t dest, uint8_t dest_mode)
+static uint32_t apic_get_delivery_bitmask(APICDeviceInfo *dev, APICState *s, uint8_t dest, uint8_t dest_mode)
 #endif /* VBOX */
 {
+#if 0
     uint32_t mask = 0;
 #ifndef VBOX
@@ -682 +726 @@
 
     return mask;
-}
-
+#else
+    uint32_t mask = 0;
+
+    if (dest_mode == 0) 
+    {
+        if (dest == 0xff) 
+            mask = 0xff;
+        else 
+            mask = 1 << dest;
+    } 
+    else 
+    {
+        APICState *apic = FIRST_LAPIC(dev);
+        uint32_t i;
+        
+        /* XXX: cluster mode */
+        for(i = 0; i < dev->cCpus; i++) 
+        {
+            if (apic->dest_mode == 0xf) 
+            {
+                if (dest & apic->log_dest)
+                    mask |= (1 << apic->id);
+            } 
+            else if (apic->dest_mode == 0x0) 
+            {
+                if ((dest & 0xf0) == (apic->log_dest & 0xf0) 
+                    &&
+                    (dest & apic->log_dest & 0x0f)) 
+                {
+                    mask |= (1 << i);
+                }
+            }
+        }
+        apic++;
+    }
+
+    return mask;
+#endif
+}
 
 static void apic_init_ipi(APICState *s)
@@ -709 +790 @@
 }
 
+
+/* send a SIPI message to the CPU to start it */
+static void apic_startup(APICDeviceInfo* dev, APICState *s, int vector_num)
+{
+#ifndef VBOX
+    CPUState *env = s->cpu_env;
+    if (!env->halted)
+        return;
+    env->eip = 0;
+    cpu_x86_load_seg_cache(env, R_CS, vector_num << 8, vector_num << 12,
+                           0xffff, 0);
+    env->halted = 0;
+#else
+    /** @todo: init CPUs */
+    LogRel(("[SMP] apic_startup: %d on CPUs %d\n", vector_num, s->id));
+#endif
+}
 static void apic_deliver(APICDeviceInfo* dev, APICState *s, 
                          uint8_t dest, uint8_t dest_mode,
@@ -721 +819 @@
 
     LogFlow(("apic_deliver dest=%x dest_mode=%x delivery_mode=%x vector_num=%x polarity=%x trigger_mode=%x\n", dest, dest_mode, delivery_mode, vector_num, polarity, trigger_mode));
+    
+    switch (dest_shorthand) {
+        case 0:
+#ifndef VBOX
+            deliver_bitmask = apic_get_delivery_bitmask(dest, dest_mode);
+#else /* VBOX */
+            deliver_bitmask = apic_get_delivery_bitmask(dev, s, dest, dest_mode);
+#endif /* !VBOX */
+            break;
+        case 1:
+            deliver_bitmask = (1 << s->id);
+            break;
+        case 2:
+            deliver_bitmask = 0xffffffff;
+            break;
+        case 3:
+            deliver_bitmask = 0xffffffff & ~(1 << s->id);
+            break;
+    }
+    
     switch (delivery_mode) {
         case APIC_DM_LOWPRI:
@@ -732 +850 @@
                 if (level == 0 && trig_mode == 1) {
 #ifdef VBOX
-                    if (deliver_bitmask & (1 << s->id)) {
-                        s->arb_id = s->id;
-                    }
+                    FOR_EACH_LAPIC(dev, 
+                                   if (deliver_bitmask & (1 << apic->id)) 
+                                   {
+                                       apic->arb_id = apic->id;
+                                   });
 #else /* !VBOX */
                     for (apic_iter = first_local_apic; apic_iter != NULL;
@@ -757 +877 @@
                 }
             }
+#else
+            FOR_EACH_LAPIC(dev, apic_startup(dev, apic, vector_num));
 #endif /* !VBOX */
             return;
-    }
-
-    switch (dest_shorthand) {
-        case 0:
-#ifndef VBOX
-            deliver_bitmask = apic_get_delivery_bitmask(dest, dest_mode);
-#else /* VBOX */
-            deliver_bitmask = apic_get_delivery_bitmask(s, dest, dest_mode);
-#endif /* !VBOX */
-            break;
-        case 1:
-            deliver_bitmask = (1 << s->id);
-            break;
-        case 2:
-            deliver_bitmask = 0xffffffff;
-            break;
-        case 3:
-            deliver_bitmask = 0xffffffff & ~(1 << s->id);
-            break;
     }
 
@@ -801 +904 @@
     int intno;
 
-    /* if the APIC is installed or enabled, we let the 8259 handle the
+    /* if the APIC is not installed or enabled, we let the 8259 handle the
        IRQs */
     if (!s) {
@@ -965 +1068 @@
         val = apic_get_ppr(s);
         break;
-#ifdef VBOX
     case 0x0b:
         Log(("apic_mem_readl %x %x -> write only returning 0\n", addr, index));
         val = 0;
         break;
-#endif
-
     case 0x0d:
         val = s->log_dest << 24;
@@ -1567 +1667 @@
 #endif
 
+    /** @todo: add LAPIC range validity checks (multiple LAPICs can theoretically have 
+               different physical addresses, see #3092) */
+
     STAM_COUNTER_INC(&CTXSUFF(dev->StatMMIORead));
     switch (cb)
@@ -1613 +1716 @@
     APICDeviceInfo *dev = PDMINS_2_DATA(pDevIns, APICDeviceInfo *);
     APICState *s = getLAPIC(dev);
+
+    /** @todo: add LAPIC range validity checks (multiple LAPICs can theoretically have 
+               different physical addresses, see #3092) */
 
     STAM_COUNTER_INC(&CTXSUFF(dev->StatMMIOWrite));
@@ -1774 +1880 @@
     pThis->pDevInsR0 = PDMDEVINS_2_R0PTR(pDevIns);
     pThis->pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
+    pThis->cCpus     = cCpus;
 
     PVM pVM = PDMDevHlpGetVM(pDevIns);
-    
     /* 
      * We are not freeing this memory, as it's automatically released when guest exits.
@@ -1785 +1891 @@
     pThis->pLapicsR0 = MMHyperR3ToR0(pVM, pThis->pLapicsR3);
     pThis->pLapicsRC = MMHyperR3ToRC(pVM, pThis->pLapicsR3);
-
+    
     for (i = 0; i < cCpus; i++)
     {