Changeset b50b5af2 in mainline for boot/genarch/ofw.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/genarch/ofw.c (modified) (8 diffs)

boot/genarch/ofw.c

@@ -33 +33 @@
 #include <types.h>
 
+#define RED(i)    (((i) >> 5) & ((1 << 3) - 1))
+#define GREEN(i)  (((i) >> 3) & ((1 << 2) - 1))
+#define BLUE(i)   ((i) & ((1 << 3) - 1))
+#define CLIP(i)   ((i) <= 255 ? (i) : 255)
+
 uintptr_t ofw_cif;
 
@@ -85 +90 @@
 /** 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
@@ -221 +227 @@
 }
 
-void *ofw_claim_virt(const void *virt, const int len)
+void *ofw_claim_virt(const void *virt, const unsigned int len)
 {
         ofw_arg_t retaddr;
@@ -234 +240 @@
 }
 
-void *ofw_claim_phys(const void *phys, const int len)
-{
-        ofw_arg_t retaddr[2];
-        int shift;
-
+static void *ofw_claim_phys_internal(const void *phys, const unsigned int len, const unsigned int alignment)
+{
+        /*
+         * Note that the return value check will help
+         * us to discover conflicts between OpenFirmware
+         * allocations and our use of physical memory.
+         * It is better to detect collisions here
+         * than to cope with weird errors later.
+         *
+         * So this is really not to make the loader
+         * more generic; it is here for debugging
+         * purposes.
+         */
+        
         if (sizeof(unative_t) == 8) {
-                shift = 32;
+                ofw_arg_t retaddr[2];
+                int shift = 32;
+                
                 if (ofw_call("call-method", 6, 3, retaddr, "claim",
-                    ofw_memory_prop, 0, len, ((uintptr_t) phys) >> shift,
+                    ofw_memory_prop, alignment, len, ((uintptr_t) phys) >> shift,
                     ((uintptr_t) phys) & ((uint32_t) -1)) != 0) {
-                        /*
-                         * Note that this will help us to discover
-                         * conflicts between OpenFirmware allocations
-                         * and our use of physical memory.
-                         * It is better to detect collisions here
-                         * than to cope with weird errors later.
-                         *
-                         * So this is really not to make the loader
-                         * more generic; it is here for debugging
-                         * purposes.
-                         */
                         puts("Error: memory method claim() failed, halting.\n");
                         halt();
                 }
+                
+                return (void *) ((retaddr[0] << shift) | retaddr[1]);
         } else {
-                shift = 0;
-                /*
-                 * FIXME: the number of arguments is probably different...
-                 */
-                puts("Error: 32-bit ofw_claim_phys not implemented.\n");
-                halt();
-        }
-
-        return (void *) ((retaddr[0] << shift) | retaddr[1]);
-}
-
-int ofw_map(const void *phys, const void *virt, const int size, const int mode)
+                ofw_arg_t retaddr[1];
+                
+                if (ofw_call("call-method", 5, 2, retaddr, "claim",
+                    ofw_memory_prop, alignment, len, (uintptr_t) phys) != 0) {
+                        puts("Error: memory method claim() failed, halting.\n");
+                        halt();
+                }
+                
+                return (void *) retaddr[0];
+        }
+}
+
+void *ofw_claim_phys(const void *phys, const unsigned int len)
+{
+        return ofw_claim_phys_internal(phys, len, 0);
+}
+
+void *ofw_claim_phys_any(const unsigned int len, const unsigned int alignment)
+{
+        return ofw_claim_phys_internal(NULL, len, alignment);
+}
+
+int ofw_map(const void *phys, const void *virt, const unsigned int size, const int mode)
 {
         uintptr_t phys_hi, phys_lo;
@@ -314 +333 @@
 
                 /*
-                 * 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.
+                 * 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 +
@@ -335 +354 @@
 }
 
-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)
-                return false;
-        
-        phandle device = ofw_find_device(device_name);
-        if (device == -1)
-                return false;
-        
-        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)
-                return false;
-        
-        return true;
-}
-
-#define RED(i)    (((i) >> 5) & ((1 << 3) - 1))
-#define GREEN(i)  (((i) >> 3) & ((1 << 2) - 1))
-#define BLUE(i)   ((i) & ((1 << 3) - 1))
-#define CLIP(i)   ((i) <= 255 ? (i) : 255)
-
-
 /**
  * Sets up the palette for the 8-bit color depth configuration so that the
@@ -392 +367 @@
         char device_name[BUF_SIZE];
         
-        /* resolve alias */
+        /* Resolve alias */
         if (ofw_get_property(ofw_aliases, "screen", device_name,
             sizeof(device_name)) <= 0)
                 return false;
         
-        /* for depth greater than 8 it makes no sense to set up the palette */
+        /* For depth greater than 8 it makes no sense to set up the palette */
         uint32_t depth;
         phandle device = ofw_find_device(device_name);
@@ -407 +382 @@
                 return false;
         
-        /* required in order to be able to make a method call */
+        /* Required in order to be able to make a method call */
         ihandle screen = ofw_open(device_name);
         if (screen == -1)
                 return false;
         
-        /* setup the palette so that the (inverted) 3:2:3 scheme is usable */
+        /* Setup the palette so that the (inverted) 3:2:3 scheme is usable */
         unsigned int i;
         for (i = 0; i < 256; i++)