Changeset 965dc18 in mainline for boot/genarch

Timestamp:

2008-12-05T19:59:03Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

49093a4

Parents:

0258e67

Message:

Merge sparc branch to trunk.

Location:

boot/genarch

Files:

• balloc.h (modified) (1 diff)
• ofw.c (modified) (14 diffs)
• ofw_tree.c (modified) (2 diffs)

boot/genarch/balloc.h

@@ -32 +32 @@
 #include <types.h>
 
-#define BALLOC_MAX_SIZE         (1024 * 1024)
+#define BALLOC_MAX_SIZE         (128 * 1024)
 
 typedef struct {

boot/genarch/ofw.c

@@ -49 +49 @@
                 halt();
         
-        if (ofw_get_property(ofw_chosen, "stdout", &ofw_stdout, sizeof(ofw_stdout)) <= 0)
+        if (ofw_get_property(ofw_chosen, "stdout", &ofw_stdout,
+            sizeof(ofw_stdout)) <= 0)
                 ofw_stdout = 0;
         
@@ -58 +59 @@
         }
         
-        if (ofw_get_property(ofw_chosen, "mmu", &ofw_mmu, sizeof(ofw_mmu)) <= 0) {
+        if (ofw_get_property(ofw_chosen, "mmu", &ofw_mmu,
+            sizeof(ofw_mmu)) <= 0) {
                 puts("\r\nError: Unable to get mmu property, halted.\r\n");
                 halt();
         }
-        if (ofw_get_property(ofw_chosen, "memory", &ofw_memory_prop, sizeof(ofw_memory_prop)) <= 0) {
+        if (ofw_get_property(ofw_chosen, "memory", &ofw_memory_prop,
+            sizeof(ofw_memory_prop)) <= 0) {
                 puts("\r\nError: Unable to get memory property, halted.\r\n");
                 halt();
@@ -82 +85 @@
 /** Perform a call to OpenFirmware client interface.
  *
- * @param service String identifying the service requested.
- * @param nargs Number of input arguments.
- * @param nret Number of output arguments. This includes the return value.
- * @param rets Buffer for output arguments or NULL. The buffer must accommodate nret - 1 items.
- *
- * @return Return value returned by the client interface.
+ * @param service       String identifying the service requested.
+ * @param nargs         Number of input arguments.
+ * @param nret          Number of output arguments. This includes the return
+ *                      value.
+ * @param rets          Buffer for output arguments or NULL. The buffer must
+ *                      accommodate nret - 1 items.
+ *
+ * @return              Return value returned by the client interface.
  */
-unsigned long ofw_call(const char *service, const int nargs, const int nret, ofw_arg_t *rets, ...)
+unsigned long
+ofw_call(const char *service, const int nargs, const int nret, ofw_arg_t *rets,
+    ...)
 {
         va_list list;
@@ -120 +127 @@
 }
 
-int ofw_get_property(const phandle device, const char *name, void *buf, const int buflen)
+int
+ofw_get_property(const phandle device, const char *name, void *buf,
+    const int buflen)
 {
         return ofw_call("getprop", 4, 1, NULL, device, name, buf, buflen);
@@ -145 +154 @@
         
         if (ofw_get_property(device, "#address-cells", &ret, sizeof(ret)) <= 0)
-                if (ofw_get_property(ofw_root, "#address-cells", &ret, sizeof(ret)) <= 0)
+                if (ofw_get_property(ofw_root, "#address-cells", &ret,
+                    sizeof(ret)) <= 0)
                         ret = OFW_ADDRESS_CELLS;
         
@@ -157 +167 @@
         
         if (ofw_get_property(device, "#size-cells", &ret, sizeof(ret)) <= 0)
-                if (ofw_get_property(ofw_root, "#size-cells", &ret, sizeof(ret)) <= 0)
+                if (ofw_get_property(ofw_root, "#size-cells", &ret,
+                    sizeof(ret)) <= 0)
                         ret = OFW_SIZE_CELLS;
         
@@ -193 +204 @@
         int shift;
 
-        if (ofw_call("call-method", 3, 5, result, "translate", ofw_mmu, virt) != 0) {
+        if (ofw_call("call-method", 3, 5, result, "translate", ofw_mmu,
+            virt) != 0) {
                 puts("Error: MMU method translate() failed, halting.\n");
                 halt();
@@ -213 +225 @@
         ofw_arg_t retaddr;
 
-        if (ofw_call("call-method", 5, 2, &retaddr, "claim", ofw_mmu, 0, len, virt) != 0) {
+        if (ofw_call("call-method", 5, 2, &retaddr, "claim", ofw_mmu, 0, len,
+            virt) != 0) {
                 puts("Error: MMU method claim() failed, halting.\n");
                 halt();
@@ -270 +283 @@
         }
 
-        return ofw_call("call-method", 7, 1, NULL, "map", ofw_mmu, mode, size, virt,
-            phys_hi, phys_lo);
+        return ofw_call("call-method", 7, 1, NULL, "map", ofw_mmu, mode, size,
+            virt, phys_hi, phys_lo);
 }
 
@@ -282 +295 @@
 int ofw_memmap(memmap_t *map)
 {
-        unsigned int ac = ofw_get_address_cells(ofw_memory);
-        unsigned int sc = ofw_get_size_cells(ofw_memory);
-
-        uint32_t buf[((ac + sc) * MEMMAP_MAX_RECORDS)];
+        unsigned int ac = ofw_get_address_cells(ofw_memory) /
+            (sizeof(uintptr_t) / sizeof(uint32_t));
+        unsigned int sc = ofw_get_size_cells(ofw_memory) /
+            (sizeof(uintptr_t) / sizeof(uint32_t));
+        printf("address cells: %d, size cells: %d. ", ac, sc);
+
+        uintptr_t buf[((ac + sc) * MEMMAP_MAX_RECORDS)];
         int ret = ofw_get_property(ofw_memory, "reg", buf, sizeof(buf));
         if (ret <= 0)           /* ret is the number of written bytes */
@@ -293 +309 @@
         map->total = 0;
         map->count = 0;
-        for (pos = 0; (pos < ret / sizeof(uint32_t)) &&
+        for (pos = 0; (pos < ret / sizeof(uintptr_t)) &&
             (map->count < MEMMAP_MAX_RECORDS); pos += ac + sc) {
-                void * start = (void *) ((uintptr_t) buf[pos + ac - 1]);
+                void *start = (void *) (buf[pos + ac - 1]);
                 unsigned int size = buf[pos + ac + sc - 1];
-                
+
+                /*
+                 * This is a hot fix of the issue which occurs on machines
+                 * where there are holes in the physical memory (such as
+                 * SunBlade 1500). Should we detect a hole in the physical
+                 * memory, we will ignore any memory detected behind
+                 * the hole and pretend the hole does not exist.
+                 */
+                if ((map->count > 0) && (map->zones[map->count - 1].start +
+                    map->zones[map->count - 1].size < start))
+                        break;
+
                 if (size > 0) {
                         map->zones[map->count].start = start;
@@ -309 +336 @@
 }
 
-
 int ofw_screen(screen_t *screen)
 {
@@ -315 +341 @@
         uint32_t virtaddr;
         
-        if (ofw_get_property(ofw_aliases, "screen", device_name, sizeof(device_name)) <= 0)
+        if (ofw_get_property(ofw_aliases, "screen", device_name,
+            sizeof(device_name)) <= 0)
                 return false;
         
@@ -322 +349 @@
                 return false;
         
-        if (ofw_get_property(device, "address", &virtaddr, sizeof(virtaddr)) <= 0)
+        if (ofw_get_property(device, "address", &virtaddr,
+            sizeof(virtaddr)) <= 0)
                 return false;
 
         screen->addr = (void *) ((uintptr_t) virtaddr);
 
-        if (ofw_get_property(device, "width", &screen->width, sizeof(screen->width)) <= 0)
-                return false;
-        
-        if (ofw_get_property(device, "height", &screen->height, sizeof(screen->height)) <= 0)
-                return false;
-        
-        if (ofw_get_property(device, "depth", &screen->bpp, sizeof(screen->bpp)) <= 0)
-                return false;
-        
-        if (ofw_get_property(device, "linebytes", &screen->scanline, sizeof(screen->scanline)) <= 0)
+        if (ofw_get_property(device, "width", &screen->width,
+            sizeof(screen->width)) <= 0)
+                return false;
+        
+        if (ofw_get_property(device, "height", &screen->height,
+            sizeof(screen->height)) <= 0)
+                return false;
+        
+        if (ofw_get_property(device, "depth", &screen->bpp,
+            sizeof(screen->bpp)) <= 0)
+                return false;
+        
+        if (ofw_get_property(device, "linebytes", &screen->scanline,
+            sizeof(screen->scanline)) <= 0)
                 return false;
         

boot/genarch/ofw_tree.c

@@ -121 +121 @@
                 memcpy(current_node->da_name, &path[i], len);
                 current_node->da_name[len] = '\0';
-        
         
                 /*
@@ -220 +219 @@
 {
         ofw_tree_node_t *root;
+        phandle ssm_node;
+        ofw_tree_node_t *ssm;
         
         root = ofw_tree_node_alloc();
         if (root)
                 ofw_tree_node_process(root, NULL, ofw_root);
+
+        /*
+         * The firmware client interface does not automatically include the
+         * "ssm" node in the list of children of "/". A nasty yet working
+         * solution is to explicitly stick "ssm" to the OFW tree.
+         */
+        ssm_node = ofw_find_device("/ssm@0,0");
+        if (ssm_node != -1) {
+                ssm = ofw_tree_node_alloc();
+                if (ssm) {
+                        ofw_tree_node_process(
+                                ssm, root, ofw_find_device("/ssm@0,0"));
+                        ssm->peer = root->child;
+                        root->child = ssm;
+                }
+        }
         
         return root;