WebSVN – HelenOS – Diff – /trunk/boot/genarch/ofw.c

+{
     ofw_chosen = ofw_find_device("/chosen");
     if (ofw_chosen == -1)
         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;
     ofw_root = ofw_find_device("/");
     if (ofw_root == -1) {
         puts("\r\nError: Unable to find / device, halted.\r\n");
         halt();
+    }
-    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();
+    }
     ofw_memory = ofw_find_device("/memory");
+    }
+}
 /** Perform a call to OpenFirmware client interface.
+ *
- * @param service String identifying the service requested.
+ * @param service   String identifying the service requested.
- * @param nargs Number of input arguments.
+ * @param nargs     Number of input arguments.
- * @param nret Number of output arguments. This includes the return value.
+ * @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.
+ * @param rets      Buffer for output arguments or NULL. The buffer must
+ *          accommodate nret - 1 items.
+ *
- * @return Return value returned by the client interface.
+ * @return      Return value returned by the client interface.
  */
+unsigned long
-unsigned long ofw_call(const char *service, const int nargs, const int nret, ofw_arg_t *rets, ...)
+ofw_call(const char *service, const int nargs, const int nret, ofw_arg_t *rets,
+    ...)
+{
     va_list list;
     ofw_args_t args;
     int i;
 phandle ofw_find_device(const char *name)
+{
     return ofw_call("finddevice", 1, 1, NULL, name);
+}
+int
-int ofw_get_property(const phandle device, const char *name, void *buf, const int buflen)
+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);
+}
 int ofw_get_proplen(const phandle device, const char *name)
 unsigned int ofw_get_address_cells(const phandle device)
+{
     unsigned int ret = 1;
     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;
     return ret;
+}
 unsigned int ofw_get_size_cells(const phandle device)
+{
     unsigned int ret;
     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;
     return ret;
+}
 void *ofw_translate(const void *virt)
+{
     ofw_arg_t result[4];
     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();
+    }
     if (ofw_translate_failed(result[0]))
 void *ofw_claim_virt(const void *virt, const int len)
+{
     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();
+    }
     return (void *) retaddr;
     } else {
         phys_hi = 0;
         phys_lo = (uintptr_t) phys;
+    }
-    return ofw_call("call-method", 7, 1, NULL, "map", ofw_mmu, mode, size, virt,
+    return ofw_call("call-method", 7, 1, NULL, "map", ofw_mmu, mode, size,
-        phys_hi, phys_lo);
+        virt, phys_hi, phys_lo);
+}
 /** Save OpenFirmware physical memory map.
+ *
  * @param map Memory map structure where the map will be saved.
+ *
  * @return Zero on failure, non-zero on success.
  */
 int ofw_memmap(memmap_t *map)
+{
-    unsigned int ac = ofw_get_address_cells(ofw_memory);
+    unsigned int ac = ofw_get_address_cells(ofw_memory) /
+        (sizeof(uintptr_t) / sizeof(uint32_t));
-    unsigned int sc = ofw_get_size_cells(ofw_memory);
+    unsigned int sc = ofw_get_size_cells(ofw_memory) /
+        (sizeof(uintptr_t) / sizeof(uint32_t));
+    printf("address cells: %d, size cells: %d. ", ac, sc);
-    uint32_t buf[((ac + sc) * MEMMAP_MAX_RECORDS)];
+    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 */
         return false;
     int pos;
     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;
             map->zones[map->count].size = size;
             map->count++;
             map->total += size;
+    }
     return true;
+}
 int ofw_screen(screen_t *screen)
+{
     char device_name[BUF_SIZE];
     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;
     phandle device = ofw_find_device(device_name);
     if (device == -1)
         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)
+    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)
+    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)
+    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, "linebytes", &screen->scanline,
+        sizeof(screen->scanline)) <= 0)
         return false;
     return true;
+}

Subversion Repositories HelenOS

(root)/trunk/boot/genarch/ofw.c – Rev 2250 → 3672