Changes in kernel/arch/ia32/src/smp/apic.c [5e4f22b:49e6c6b4] in mainline

File:

• kernel/arch/ia32/src/smp/apic.c (modified) (5 diffs)

kernel/arch/ia32/src/smp/apic.c

@@ -259 +259 @@
 }
 
-#define DELIVS_PENDING_SILENT_RETRIES   4       
-
-static void l_apic_wait_for_delivery(void)
+static void ipi_wait_for_idle(void)
 {
         icr_t icr;
-        unsigned retries = 0;
-
+        
+        /* Wait for the destination cpu to accept the previous ipi. */
         do {
-                if (retries++ > DELIVS_PENDING_SILENT_RETRIES) {
-                        retries = 0;
+                icr.lo = l_apic[ICRlo];
+        } while (icr.delivs != DELIVS_IDLE);
+}
+
+/** Send one CPU an IPI vector.
+ *
+ * @param apicid Physical APIC ID of the destination CPU.
+ * @param vector Interrupt vector to be sent.
+ *
+ * @return 0 on failure, 1 on success.
+ */
+int l_apic_send_custom_ipi(uint8_t apicid, uint8_t vector)
+{
+        icr_t icr;
+
+        /* Wait for a destination cpu to accept our previous ipi. */
+        ipi_wait_for_idle();
+        
+        icr.lo = l_apic[ICRlo];
+        icr.hi = l_apic[ICRhi];
+        
+        icr.delmod = DELMOD_FIXED;
+        icr.destmod = DESTMOD_PHYS;
+        icr.level = LEVEL_ASSERT;
+        icr.shorthand = SHORTHAND_NONE;
+        icr.trigger_mode = TRIGMOD_LEVEL;
+        icr.vector = vector;
+        icr.dest = apicid;
+
+        /* Send the IPI by writing to l_apic[ICRlo]. */
+        l_apic[ICRhi] = icr.hi;
+        l_apic[ICRlo] = icr.lo;
+        
 #ifdef CONFIG_DEBUG
-                        printf("IPI is pending.\n");
+        icr.lo = l_apic[ICRlo];
+        if (icr.delivs == DELIVS_PENDING) {
+                printf("IPI is pending.\n");
+        }
 #endif
-                        delay(20);
-                }
-                icr.lo = l_apic[ICRlo];
-        } while (icr.delivs == DELIVS_PENDING);
-        
+        
+        return apic_poll_errors();
 }
 
@@ -289 +318 @@
 {
         icr_t icr;
+
+        /* Wait for a destination cpu to accept our previous ipi. */
+        ipi_wait_for_idle();
         
         icr.lo = l_apic[ICRlo];
@@ -299 +331 @@
         
         l_apic[ICRlo] = icr.lo;
-
-        l_apic_wait_for_delivery();
+        
+        icr.lo = l_apic[ICRlo];
+        if (icr.delivs == DELIVS_PENDING) {
+#ifdef CONFIG_DEBUG
+                printf("IPI is pending.\n");
+#endif
+        }
         
         return apic_poll_errors();
@@ -342 +379 @@
                 return 0;
         
-        l_apic_wait_for_delivery();
-
         icr.lo = l_apic[ICRlo];
+        if (icr.delivs == DELIVS_PENDING) {
+#ifdef CONFIG_DEBUG
+                printf("IPI is pending.\n");
+#endif
+        }
+        
         icr.delmod = DELMOD_INIT;
         icr.destmod = DESTMOD_PHYS;
@@ -477 +518 @@
         dfr.model = MODEL_FLAT;
         l_apic[DFR] = dfr.value;
+        
+        if (CPU->arch.id != l_apic_id()) {
+#ifdef CONFIG_DEBUG
+                printf("lapic error: LAPIC ID (%" PRIu8 ") and hw ID assigned by BSP"
+                        " (%u) differ. Correcting to LAPIC ID.\n", l_apic_id(), 
+                        CPU->arch.id);
+#endif
+                CPU->arch.id = l_apic_id();
+        }
+        
 }