Changeset 8565a42 in mainline for kernel/arch/sparc64/src/smp

Timestamp:

2018-03-02T20:34:50Z (8 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a1a81f69, d5e5fd1

Parents:

3061bc1 (diff), 34e1206 (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.

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)

git-committer:

GitHub <noreply@…> (2018-03-02 20:34:50)

Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

Location:

kernel/arch/sparc64/src/smp

Files:

• sun4u/ipi.c (modified) (7 diffs)
• sun4u/smp.c (modified) (6 diffs)
• sun4v/ipi.c (modified) (1 diff)
• sun4v/smp.c (modified) (3 diffs)

kernel/arch/sparc64/src/smp/sun4u/ipi.c

@@ -97 +97 @@
          * we explicitly disable preemption.
          */
-        
+
         preemption_disable();
-        
+
         status = asi_u64_read(ASI_INTR_DISPATCH_STATUS, 0);
         if (status & INTR_DISPATCH_STATUS_BUSY)
                 panic("Interrupt Dispatch Status busy bit set\n");
-        
+
         assert(!(pstate_read() & PSTATE_IE_BIT));
-        
+
         do {
                 set_intr_w_data(func);
@@ -111 +111 @@
                     (mid << INTR_VEC_DISPATCH_MID_SHIFT) |
                     VA_INTR_W_DISPATCH, 0);
-        
+
                 membar();
-                
+
                 do {
                         status = asi_u64_read(ASI_INTR_DISPATCH_STATUS, 0);
                 } while (status & INTR_DISPATCH_STATUS_BUSY);
-                
+
                 done = !(status & INTR_DISPATCH_STATUS_NACK);
                 if (!done) {
@@ -128 +128 @@
                 }
         } while (!done);
-        
+
         preemption_enable();
 }
@@ -147 +147 @@
 {
         unsigned int i;
-        
+
         void (* func)(void);
-        
+
         switch (ipi) {
         case IPI_TLB_SHOOTDOWN:
@@ -158 +158 @@
                 break;
         }
-        
+
         /*
          * As long as we don't support hot-plugging
@@ -165 +165 @@
          * without locking.
          */
-        
+
         for (i = 0; i < config.cpu_active; i++) {
                 if (&cpus[i] == CPU)
@@ -187 +187 @@
 {
         assert(&cpus[cpu_id] != CPU);
-        
+
         if (ipi == IPI_SMP_CALL) {
                 cross_call(cpus[cpu_id].arch.mid, smp_call_ipi_recv);

kernel/arch/sparc64/src/smp/sun4u/smp.c

@@ -62 +62 @@
         ofw_tree_node_t *node;
         unsigned int cnt = 0;
-        
+
         if (is_us() || is_us_iii()) {
                 node = ofw_tree_find_child_by_device_type(cpus_parent(), "cpu");
@@ -76 +76 @@
                 }
         }
-        
+
         config.cpu_count = max(1, cnt);
 }
@@ -89 +89 @@
         uint32_t mid;
         ofw_tree_property_t *prop;
-                
+
         /* 'upa-portid' for US, 'portid' for US-III, 'cpuid' for US-IV */
         prop = ofw_tree_getprop(node, "upa-portid");
@@ -96 +96 @@
         if ((!prop) || (!prop->value))
                 prop = ofw_tree_getprop(node, "cpuid");
-                
+
         if (!prop || prop->value == NULL)
                 return;
-                
+
         mid = *((uint32_t *) prop->value);
         if (CPU->arch.mid == mid)
@@ -105 +105 @@
 
         waking_up_mid = mid;
-                
+
         if (waitq_sleep_timeout(&ap_completion_wq, 1000000,
             SYNCH_FLAGS_NONE, NULL) == ETIMEOUT)
@@ -117 +117 @@
         ofw_tree_node_t *node;
         int i;
-        
+
         if (is_us() || is_us_iii()) {
                 node = ofw_tree_find_child_by_device_type(cpus_parent(), "cpu");

kernel/arch/sparc64/src/smp/sun4v/ipi.c

@@ -96 +96 @@
 {
         void (* func)(void);
-        
+
         switch (ipi) {
         case IPI_TLB_SHOOTDOWN:

kernel/arch/sparc64/src/smp/sun4v/smp.c

@@ -359 +359 @@
         if (__hypercall_fast1(CPU_STOP, cpuid) != EOK)
                 return false;
-        
+
         /* wait for the CPU to stop */
         uint64_t state;
@@ -365 +365 @@
         while (state == CPU_STATE_RUNNING)
                 __hypercall_fast_ret1(cpuid, 0, 0, 0, 0, CPU_STATE, &state);
-        
+
         /* make the CPU run again and execute HelenOS code */
         if (__hypercall_fast4(CPU_START, cpuid,
@@ -372 +372 @@
                 return false;
 #endif
-        
+
         if (waitq_sleep_timeout(&ap_completion_wq, 10000000,
             SYNCH_FLAGS_NONE, NULL) == ETIMEOUT)
                 printf("%s: waiting for processor (cpuid = %" PRIu64 ") timed out\n",
                     __func__, cpuid);
-        
+
         return true;
 }