Changeset 49eb681 in mainline

Timestamp:

2010-06-28T23:58:20Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

9a21f9d

Parents:

e3038b4

Message:

code cleanup (no change in functionality)

Location:

kernel

Files:

• arch/ia32/include/smp/mps.h (modified) (6 diffs)
• arch/ia32/src/ia32.c (modified) (1 diff)
• genarch/include/acpi/acpi.h (modified) (1 diff)
• genarch/include/acpi/madt.h (modified) (6 diffs)
• generic/include/smp/ipi.h (modified) (1 diff)
• generic/src/main/kinit.c (modified) (2 diffs)
• generic/src/mm/tlb.c (modified) (2 diffs)

kernel/arch/ia32/include/smp/mps.h

@@ -27 +27 @@
  */
 
-/** @addtogroup ia32    
+/** @addtogroup ia32
  * @{
  */
@@ -41 +41 @@
 #include <arch/smp/smp.h>
 
-#define CT_EXT_ENTRY_TYPE               0
-#define CT_EXT_ENTRY_LEN                1
+#define CT_EXT_ENTRY_TYPE  0
+#define CT_EXT_ENTRY_LEN   1
 
 struct mps_fs {
@@ -70 +70 @@
         uint16_t ext_table_length;
         uint8_t ext_table_checksum;
-        uint8_t xxx;
+        uint8_t reserved;
         uint8_t base_table[0];
 } __attribute__ ((packed));
@@ -81 +81 @@
         uint8_t cpu_signature[4];
         uint32_t feature_flags;
-        uint32_t xxx[2];
+        uint32_t reserved[2];
 } __attribute__ ((packed));
 
@@ -102 +102 @@
         uint8_t intr_type;
         uint8_t poel;
-        uint8_t xxx;
+        uint8_t reserved;
         uint8_t src_bus_id;
         uint8_t src_bus_irq;
@@ -113 +113 @@
         uint8_t intr_type;
         uint8_t poel;
-        uint8_t xxx;
+        uint8_t reserved;
         uint8_t src_bus_id;
         uint8_t src_bus_irq;

kernel/arch/ia32/src/ia32.c

@@ -139 +139 @@
 {
 #ifdef CONFIG_SMP
-        if (config.cpu_active > 1) {
+        if (config.cpu_active > 1) {
                 l_apic_init();
                 l_apic_debug();

kernel/genarch/include/acpi/acpi.h

@@ -27 +27 @@
  */
 
-/** @addtogroup genarch 
+/** @addtogroup genarch
  * @{
  */

kernel/genarch/include/acpi/madt.h

@@ -27 +27 @@
  */
 
-/** @addtogroup genarch 
+/** @addtogroup genarch
  * @{
  */
@@ -40 +40 @@
 #include <arch/smp/smp.h>
 
-#define MADT_L_APIC                     0
-#define MADT_IO_APIC                    1
-#define MADT_INTR_SRC_OVRD              2
-#define MADT_NMI_SRC                    3
-#define MADT_L_APIC_NMI                 4
-#define MADT_L_APIC_ADDR_OVRD           5
-#define MADT_IO_SAPIC                   6
-#define MADT_L_SAPIC                    7
-#define MADT_PLATFORM_INTR_SRC          8
-#define MADT_RESERVED_SKIP_BEGIN        9
-#define MADT_RESERVED_SKIP_END          127
-#define MADT_RESERVED_OEM_BEGIN         128
+#define MADT_L_APIC               0
+#define MADT_IO_APIC              1
+#define MADT_INTR_SRC_OVRD        2
+#define MADT_NMI_SRC              3
+#define MADT_L_APIC_NMI           4
+#define MADT_L_APIC_ADDR_OVRD     5
+#define MADT_IO_SAPIC             6
+#define MADT_L_SAPIC              7
+#define MADT_PLATFORM_INTR_SRC    8
+#define MADT_RESERVED_SKIP_BEGIN  9
+#define MADT_RESERVED_SKIP_END    127
+#define MADT_RESERVED_OEM_BEGIN   128
 
 struct madt_apic_header {
@@ -57 +57 @@
         uint8_t length;
 } __attribute__ ((packed));
-
 
 /* Multiple APIC Description Table */
@@ -71 +70 @@
         uint8_t acpi_id;
         uint8_t apic_id;
-        uint32_t flags; 
+        uint32_t flags;
 } __attribute__ ((packed));
 
@@ -78 +77 @@
         uint8_t io_apic_id;
         uint8_t reserved;
-        uint32_t io_apic_address;       
+        uint32_t io_apic_address;
         uint32_t global_intr_base;
 } __attribute__ ((packed));
@@ -114 +113 @@
         uint8_t reserved;
         uint32_t global_intr_base;
-        uint64_t io_apic_address;               
+        uint64_t io_apic_address;
 } __attribute__ ((packed));
 

kernel/generic/include/smp/ipi.h

@@ -43 +43 @@
 #else
 
-        #define ipi_broadcast(ipi)
+#define ipi_broadcast(ipi)
 
 #endif /* CONFIG_SMP */

kernel/generic/src/main/kinit.c

@@ -107 +107 @@
         if (config.cpu_count > 1) {
                 waitq_initialize(&ap_completion_wq);
+                
                 /*
                  * Create the kmp thread and wait for its completion.
@@ -124 +125 @@
                 thread_join(thread);
                 thread_detach(thread);
-        }
-        
-        if (config.cpu_count > 1) {
+                
+                /*
+                 * For each CPU, create its load balancing thread.
+                 */
                 size_t i;
                 
-                /*
-                 * For each CPU, create its load balancing thread.
-                 */
                 for (i = 0; i < config.cpu_count; i++) {
                         thread = thread_create(kcpulb, NULL, TASK, THREAD_FLAG_WIRED, "kcpulb", true);

kernel/generic/src/mm/tlb.c

@@ -94 +94 @@
                 
                 cpu_t *cpu = &cpus[i];
+                
                 irq_spinlock_lock(&cpu->lock, false);
                 if (cpu->tlb_messages_count == TLB_MESSAGE_QUEUE_LEN) {
@@ -121 +122 @@
         
 busy_wait:
-        for (i = 0; i < config.cpu_count; i++)
+        for (i = 0; i < config.cpu_count; i++) {
                 if (cpus[i].tlb_active)
                         goto busy_wait;
+        }
         
         return ipl;