Changeset da68871a in mainline for kernel/arch/ia32/src/smp/apic.c

Timestamp:

2012-08-08T08:46:22Z (13 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

30c0826

Parents:

bc216a0 (diff), 1d01cca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged changes from mainline.

File:

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

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

@@ -259 +259 @@
 }
 
-static void ipi_wait_for_idle(void)
+/* Waits for the destination cpu to accept the previous ipi. */
+static void l_apic_wait_for_delivery(void)
 {
         icr_t icr;
         
-        /* Wait for the destination cpu to accept the previous ipi. */
         do {
                 icr.lo = l_apic[ICRlo];
@@ -281 +281 @@
 
         /* Wait for a destination cpu to accept our previous ipi. */
-        ipi_wait_for_idle();
+        l_apic_wait_for_delivery();
         
         icr.lo = l_apic[ICRlo];
@@ -298 +298 @@
         l_apic[ICRlo] = icr.lo;
         
-#ifdef CONFIG_DEBUG
-        icr.lo = l_apic[ICRlo];
-        if (icr.delivs == DELIVS_PENDING) {
-                printf("IPI is pending.\n");
-        }
-#endif
-        
         return apic_poll_errors();
 }
@@ -320 +313 @@
 
         /* Wait for a destination cpu to accept our previous ipi. */
-        ipi_wait_for_idle();
+        l_apic_wait_for_delivery();
         
         icr.lo = l_apic[ICRlo];
@@ -332 +325 @@
         l_apic[ICRlo] = icr.lo;
         
-        icr.lo = l_apic[ICRlo];
-        if (icr.delivs == DELIVS_PENDING) {
-#ifdef CONFIG_DEBUG
-                printf("IPI is pending.\n");
-#endif
-        }
-        
         return apic_poll_errors();
 }
@@ -379 +365 @@
                 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;
@@ -518 +500 @@
         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();
-        }
-        
 }