Changeset 5e4f22b in mainline for kernel/arch

Timestamp:

2012-07-03T22:41:46Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1f2dd20, 33fc3ae, 725d038, cc51c27

Parents:

bb4c9fca

Message:

When sending an IPI, wait for its successful delivery.

File:

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

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

@@ -259 +259 @@
 }
 
+#define DELIVS_PENDING_SILENT_RETRIES   4       
+
+static void l_apic_wait_for_delivery(void)
+{
+        icr_t icr;
+        unsigned retries = 0;
+
+        do {
+                if (retries++ > DELIVS_PENDING_SILENT_RETRIES) {
+                        retries = 0;
+#ifdef CONFIG_DEBUG
+                        printf("IPI is pending.\n");
+#endif
+                        delay(20);
+                }
+                icr.lo = l_apic[ICRlo];
+        } while (icr.delivs == DELIVS_PENDING);
+        
+}
+
 /** Send all CPUs excluding CPU IPI vector.
  *
@@ -279 +299 @@
         
         l_apic[ICRlo] = icr.lo;
-        
-        icr.lo = l_apic[ICRlo];
-        if (icr.delivs == DELIVS_PENDING) {
-#ifdef CONFIG_DEBUG
-                printf("IPI is pending.\n");
-#endif
-        }
+
+        l_apic_wait_for_delivery();
         
         return apic_poll_errors();
@@ -327 +342 @@
                 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;