Changeset b50b5af2 in mainline for boot/arch/sparc64/loader/main.c

Timestamp:

2009-08-22T10:48:00Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

04803bf

Parents:

1ea99cc (diff), a71c158 (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:

Merge mainline changes.

File:

• boot/arch/sparc64/loader/main.c (modified) (17 diffs)

boot/arch/sparc64/loader/main.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2005 Martin Decky
- * Copyright (c) 2006 Jakub Jermar 
+ * Copyright (c) 2006 Jakub Jermar
  * All rights reserved.
  *
@@ -28 +28 @@
  */
 
-#include "main.h" 
+#include "main.h"
 #include <printf.h>
 #include "asm.h"
@@ -39 +39 @@
 #include <macros.h>
 #include <string.h>
-
-bootinfo_t bootinfo;
-
-component_t components[COMPONENTS];
-
-char *release = STRING(RELEASE);
+#include <memstr.h>
+
+static bootinfo_t bootinfo;
+static component_t components[COMPONENTS];
+static char *release = STRING(RELEASE);
 
 #ifdef REVISION
-        char *revision = ", revision " STRING(REVISION);
+        static char *revision = ", revision " STRING(REVISION);
 #else
-        char *revision = "";
+        static char *revision = "";
 #endif
 
 #ifdef TIMESTAMP
-        char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
+        static char *timestamp = "\nBuilt on " STRING(TIMESTAMP);
 #else
-        char *timestamp = "";
+        static char *timestamp = "";
 #endif
 
 /** UltraSPARC subarchitecture - 1 for US, 3 for US3 */
-uint8_t subarchitecture;
+static uint8_t subarchitecture;
 
 /**
@@ -65 +64 @@
  * MID_SHIFT bits to the right
  */
-uint16_t mid_mask;
+static uint16_t mid_mask;
 
 /** Print version information. */
@@ -76 +75 @@
 
 /* the lowest ID (read from the VER register) of some US3 CPU model */
-#define FIRST_US3_CPU   0x14
+#define FIRST_US3_CPU  0x14
 
 /* the greatest ID (read from the VER register) of some US3 CPU model */
-#define LAST_US3_CPU    0x19
+#define LAST_US3_CPU   0x19
 
 /* UltraSPARC IIIi processor implementation code */
-#define US_IIIi_CODE    0x15
+#define US_IIIi_CODE   0x15
 
 /**
@@ -91 +90 @@
 {
         uint64_t v;
-        asm volatile ("rdpr %%ver, %0\n" : "=r" (v));
+        asm volatile (
+                "rdpr %%ver, %0\n"
+                : "=r" (v)
+        );
         
         v = (v << 16) >> 48;
@@ -103 +105 @@
                 subarchitecture = SUBARCH_US;
                 mid_mask = (1 << 5) - 1;
-        } else {
+        } else
                 printf("\nThis CPU is not supported by HelenOS.");
-        }
 }
 
@@ -113 +114 @@
         void *balloc_base;
         unsigned int top = 0;
-        int i, j;
-
+        unsigned int i;
+        unsigned int j;
+        
         version_print();
         
         detect_subarchitecture();
         init_components(components);
-
+        
         if (!ofw_get_physmem_start(&bootinfo.physmem_start)) {
                 printf("Error: unable to get start of physical memory.\n");
                 halt();
         }
-
+        
         if (!ofw_memmap(&bootinfo.memmap)) {
                 printf("Error: unable to get memory map, halting.\n");
                 halt();
         }
-
+        
         if (bootinfo.memmap.total == 0) {
                 printf("Error: no memory detected, halting.\n");
                 halt();
         }
-
+        
         /*
          * SILO for some reason adds 0x400000 and subtracts
@@ -143 +145 @@
                 silo_ramdisk_image += bootinfo.physmem_start;
                 silo_ramdisk_image -= 0x400000;
-                /* Install 1:1 mapping for the ramdisk. */
-                if (ofw_map((void *)((uintptr_t) silo_ramdisk_image),
-                    (void *)((uintptr_t) silo_ramdisk_image),
+                
+                /* Install 1:1 mapping for the RAM disk. */
+                if (ofw_map((void *) ((uintptr_t) silo_ramdisk_image),
+                    (void *) ((uintptr_t) silo_ramdisk_image),
                     silo_ramdisk_size, -1) != 0) {
-                        printf("Failed to map ramdisk.\n");
+                        printf("Failed to map RAM disk.\n");
                         halt();
                 }
         }
         
-        printf("\nSystem info\n");
-        printf(" memory: %dM starting at %P\n",
+        printf("\nMemory statistics (total %d MB, starting at %P)\n",
             bootinfo.memmap.total >> 20, bootinfo.physmem_start);
-
-        printf("\nMemory statistics\n");
-        printf(" kernel entry point at %P\n", KERNEL_VIRTUAL_ADDRESS);
+        printf(" %P: kernel entry point\n", KERNEL_VIRTUAL_ADDRESS);
         printf(" %P: boot info structure\n", &bootinfo);
         
@@ -176 +176 @@
                                 break;
                         }
+                        
                         bootinfo.taskmap.tasks[bootinfo.taskmap.count].addr =
                             base + top;
@@ -187 +188 @@
                 top += components[i].size;
         }
-
-        j = bootinfo.taskmap.count - 1; /* do not consider ramdisk */
-
+        
+        /* Do not consider RAM disk */
+        j = bootinfo.taskmap.count - 1;
+        
         if (silo_ramdisk_image) {
-                /* Treat the ramdisk as the last bootinfo task. */
+                /* Treat the RAM disk as the last bootinfo task. */
                 if (bootinfo.taskmap.count == TASKMAP_MAX_RECORDS) {
-                        printf("Skipping ramdisk.\n");
+                        printf("Skipping RAM disk.\n");
                         goto skip_ramdisk;
                 }
+                
                 top = ALIGN_UP(top, PAGE_SIZE);
                 bootinfo.taskmap.tasks[bootinfo.taskmap.count].addr = 
@@ -202 +205 @@
                     silo_ramdisk_size;
                 bootinfo.taskmap.count++;
-                printf("\nCopying ramdisk...");
+                printf("\nCopying RAM disk...");
+                
                 /*
                  * Claim and map the whole ramdisk as it may exceed the area
@@ -210 +214 @@
                 (void) ofw_map(bootinfo.physmem_start + base + top, base + top,
                     silo_ramdisk_size, -1);
-                /*
-                 * FIXME If the source and destination overlap, it may be
-                 * desirable to copy in reverse order, depending on how the two
-                 * regions overlap.
-                 */
-                memcpy(base + top, (void *)((uintptr_t)silo_ramdisk_image),
+                memmove(base + top, (void *) ((uintptr_t) silo_ramdisk_image),
                     silo_ramdisk_size);
+                
                 printf("done.\n");
                 top += silo_ramdisk_size;
         }
 skip_ramdisk:
-
+        
         /*
          * Now we can proceed to copy the components. We do it in reverse order
@@ -227 +227 @@
          * with base.
          */
-        printf("\nCopying bootinfo tasks\n");
+        printf("\nCopying tasks...");
         for (i = COMPONENTS - 1; i > 0; i--, j--) {
-                printf(" %s...", components[i].name);
-
+                printf("%s ", components[i].name);
+                
                 /*
                  * At this point, we claim the physical memory that we are
@@ -245 +245 @@
                     bootinfo.taskmap.tasks[j].addr,
                     ALIGN_UP(components[i].size, PAGE_SIZE));
-                    
-                memcpy((void *)bootinfo.taskmap.tasks[j].addr,
+                
+                memcpy((void *) bootinfo.taskmap.tasks[j].addr,
                     components[i].start, components[i].size);
-                printf("done.\n");
-        }
-
+                
+        }
+        printf(".\n");
+        
         printf("\nCopying kernel...");
         (void) ofw_claim_phys(bootinfo.physmem_start + base,
@@ -256 +257 @@
         memcpy(base, components[0].start, components[0].size);
         printf("done.\n");
-
+        
         /*
          * Claim and map the physical memory for the boot allocator.
@@ -266 +267 @@
         (void) ofw_map(bootinfo.physmem_start + balloc_base, balloc_base,
             BALLOC_MAX_SIZE, -1);
-        balloc_init(&bootinfo.ballocs, (uintptr_t)balloc_base);
-
+        balloc_init(&bootinfo.ballocs, (uintptr_t) balloc_base,
+            (uintptr_t) balloc_base);
+        
         printf("\nCanonizing OpenFirmware device tree...");
         bootinfo.ofw_root = ofw_tree_build();
         printf("done.\n");
-
+        
 #ifdef CONFIG_AP
         printf("\nChecking for secondary processors...");
-        if (!ofw_cpu())
+        if (!ofw_cpu(mid_mask, bootinfo.physmem_start))
                 printf("Error: unable to get CPU properties\n");
         printf("done.\n");
 #endif
-
+        
         ofw_setup_palette();
-
+        
         printf("\nBooting the kernel...\n");
         jump_to_kernel((void *) KERNEL_VIRTUAL_ADDRESS,
             bootinfo.physmem_start | BSP_PROCESSOR, &bootinfo,
-            sizeof(bootinfo));
+            sizeof(bootinfo), subarchitecture);
 }