2010-02-13 Vladimir Serbinenko <phcoder@gmail.com>

	Merge grub_ieee1275_map_physical into grub_map and rename to
	grub_ieee1275_map

	* include/grub/ieee1275/ieee1275.h (grub_ieee1275_map): New proto.
	* include/grub/sparc64/ieee1275/ieee1275.h (grub_ieee1275_map_physical):
	Remove.
	* kern/ieee1275/openfw.c (grub_map): Rename to ...
	(grub_ieee1275_map): ... this. All users updated. Add phys_lo when
	necessary.
	* kern/sparc64/ieee1275/ieee1275.c (grub_ieee1275_map_physical): Remove.

diff --git a/ChangeLog b/ChangeLog
index eb937f97e35cfda675b3b78963b96620bb8b6c16..bd8165647da9d026aa1c54fc29c6e6a777c3a591 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Merge grub_ieee1275_map_physical into grub_map and rename to
+       grub_ieee1275_map
+
+       * include/grub/ieee1275/ieee1275.h (grub_ieee1275_map): New proto.
+       * include/grub/sparc64/ieee1275/ieee1275.h (grub_ieee1275_map_physical):
+       Remove.
+       * kern/ieee1275/openfw.c (grub_map): Rename to ...
+       (grub_ieee1275_map): ... this. All users updated. Add phys_lo when
+       necessary.
+       * kern/sparc64/ieee1275/ieee1275.c (grub_ieee1275_map_physical): Remove.
+
 2010-02-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * disk/ieee1275/ofdisk.c (grub_ofdisk_open): Check device type before

diff --git a/include/grub/ieee1275/ieee1275.h b/include/grub/ieee1275/ieee1275.h
index a852a7b614d7b8c98e14ba8e4665afb91dcbb6a8..62e8f3812f9990d82617a074ec0c6af5d3579ed7 100644 (file)
--- a/include/grub/ieee1275/ieee1275.h
+++ b/include/grub/ieee1275/ieee1275.h
@@ -173,6 +173,10 @@ grub_err_t EXPORT_FUNC(grub_machine_mmap_iterate)
      (int NESTED_FUNC_ATTR (*hook) (grub_uint64_t, grub_uint64_t, grub_uint32_t));
 int EXPORT_FUNC(grub_claimmap) (grub_addr_t addr, grub_size_t size);
 
+int
+EXPORT_FUNC(grub_ieee1275_map) (grub_addr_t phys, grub_addr_t virt,
+                               grub_size_t size, grub_uint32_t mode);
+
 char *EXPORT_FUNC(grub_ieee1275_encode_devname) (const char *path);
 char *EXPORT_FUNC(grub_ieee1275_get_filename) (const char *path);
 

diff --git a/include/grub/sparc64/ieee1275/ieee1275.h b/include/grub/sparc64/ieee1275/ieee1275.h
index 1619510fb0ddfa710ed2e264df09cee2efc1ee8b..527c46ae7558486b4121a625c5eb46eaa86b9e86 100644 (file)
--- a/include/grub/sparc64/ieee1275/ieee1275.h
+++ b/include/grub/sparc64/ieee1275/ieee1275.h
@@ -37,10 +37,6 @@ typedef grub_uint64_t grub_ieee1275_cell_t;
 #define IEEE1275_MAP_DEFAULT   (IEEE1275_MAP_WRITE | IEEE1275_MAP_READ | \
                                 IEEE1275_MAP_EXEC | IEEE1275_MAP_CACHED)
 
-extern int EXPORT_FUNC(grub_ieee1275_map_physical) (grub_addr_t paddr,
-                                                   grub_addr_t vaddr,
-                                                   grub_size_t size,
-                                                   grub_uint32_t mode);
 extern int EXPORT_FUNC(grub_ieee1275_claim_vaddr) (grub_addr_t vaddr,
                                                   grub_size_t size);
 extern int EXPORT_FUNC(grub_ieee1275_alloc_physmem) (grub_addr_t *paddr,

diff --git a/kern/ieee1275/openfw.c b/kern/ieee1275/openfw.c
index e5f565c4c07379fc804958d28a060a4de1f05018..13fccbf9ab3e243608a771477cb2057a49700999 100644 (file)
--- a/kern/ieee1275/openfw.c
+++ b/kern/ieee1275/openfw.c
@@ -199,9 +199,9 @@ nextprop:
 }
 
 /* Call the "map" method of /chosen/mmu.  */
-static int
-grub_map (grub_addr_t phys, grub_addr_t virt, grub_uint32_t size,
-                  grub_uint8_t mode)
+int
+grub_ieee1275_map (grub_addr_t phys, grub_addr_t virt, grub_size_t size,
+                  grub_uint32_t mode)
 {
   struct map_args {
     struct grub_ieee1275_common_hdr common;
@@ -210,17 +210,30 @@ grub_map (grub_addr_t phys, grub_addr_t virt, grub_uint32_t size,
     grub_ieee1275_cell_t mode;
     grub_ieee1275_cell_t size;
     grub_ieee1275_cell_t virt;
-    grub_ieee1275_cell_t phys;
+#ifdef GRUB_MACHINE_SPARC64
+    grub_ieee1275_cell_t phys_high;
+#endif
+    grub_ieee1275_cell_t phys_low;
     grub_ieee1275_cell_t catch_result;
   } args;
 
-  INIT_IEEE1275_COMMON (&args.common, "call-method", 6, 1);
+  INIT_IEEE1275_COMMON (&args.common, "call-method",
+#ifdef GRUB_MACHINE_SPARC64
+                       7,
+#else
+                       6,
+#endif
+                       1);
   args.method = (grub_ieee1275_cell_t) "map";
   args.ihandle = grub_ieee1275_mmu;
-  args.phys = phys;
+#ifdef GRUB_MACHINE_SPARC64
+  args.phys_high = 0;
+#endif
+  args.phys_low = phys;
   args.virt = virt;
   args.size = size;
   args.mode = mode; /* Format is WIMG0PP.  */
+  args.catch_result = (grub_ieee1275_cell_t) -1;
 
   if (IEEE1275_CALL_ENTRY_FN (&args) == -1)
     return -1;
@@ -235,7 +248,7 @@ grub_claimmap (grub_addr_t addr, grub_size_t size)
     return -1;
 
   if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_REAL_MODE)
-      && grub_map (addr, addr, size, 0x00))
+      && grub_ieee1275_map (addr, addr, size, 0x00))
     {
       grub_printf ("map failed: address 0x%llx, size 0x%llx\n",
                   (long long) addr, (long long) size);

diff --git a/kern/sparc64/ieee1275/ieee1275.c b/kern/sparc64/ieee1275/ieee1275.c
index 438a171cac122a767778eec395756ee60eb33d4c..53be692c3d88940572d423ceb09e4187372fcb5b 100644 (file)
--- a/kern/sparc64/ieee1275/ieee1275.c
+++ b/kern/sparc64/ieee1275/ieee1275.c
@@ -21,39 +21,6 @@
 
 /* Sun specific ieee1275 interfaces used by GRUB.  */
 
-int
-grub_ieee1275_map_physical (grub_addr_t paddr, grub_addr_t vaddr,
-                           grub_size_t size, grub_uint32_t mode)
-{
-  struct map_physical_args
-  {
-    struct grub_ieee1275_common_hdr common;
-    grub_ieee1275_cell_t method;
-    grub_ieee1275_cell_t ihandle;
-    grub_ieee1275_cell_t mode;
-    grub_ieee1275_cell_t size;
-    grub_ieee1275_cell_t virt;
-    grub_ieee1275_cell_t phys_high;
-    grub_ieee1275_cell_t phys_low;
-    grub_ieee1275_cell_t catch_result;
-  }
-  args;
-
-  INIT_IEEE1275_COMMON (&args.common, "call-method", 7, 1);
-  args.method = (grub_ieee1275_cell_t) "map";
-  args.ihandle = grub_ieee1275_mmu;
-  args.mode = mode;
-  args.size = size;
-  args.virt = vaddr;
-  args.phys_high = 0;
-  args.phys_low = paddr;
-  args.catch_result = (grub_ieee1275_cell_t) -1;
-
-  if (IEEE1275_CALL_ENTRY_FN (&args) == -1)
-    return -1;
-  return args.catch_result;
-}
-
 int
 grub_ieee1275_claim_vaddr (grub_addr_t vaddr, grub_size_t size)
 {

diff --git a/loader/sparc64/ieee1275/linux.c b/loader/sparc64/ieee1275/linux.c
index 65f334ab391669e69cd2f81383713d33fe79ffb7..24a6849a6646719156837a4c1454350c40821e79 100644 (file)
--- a/loader/sparc64/ieee1275/linux.c
+++ b/loader/sparc64/ieee1275/linux.c
@@ -252,8 +252,8 @@ grub_linux_load64 (grub_elf_t elf)
   if (paddr == (grub_addr_t) -1)
     return grub_error (GRUB_ERR_OUT_OF_MEMORY,
                       "couldn't allocate physical memory");
-  ret = grub_ieee1275_map_physical (paddr, linux_addr - off,
-                                   linux_size + off, IEEE1275_MAP_DEFAULT);
+  ret = grub_ieee1275_map (paddr, linux_addr - off,
+                          linux_size + off, IEEE1275_MAP_DEFAULT);
   if (ret)
     return grub_error (GRUB_ERR_OUT_OF_MEMORY,
                       "couldn't map physical memory");
@@ -403,7 +403,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
                  "couldn't allocate physical memory");
       goto fail;
     }
-  ret = grub_ieee1275_map_physical (paddr, addr, size, IEEE1275_MAP_DEFAULT);
+  ret = grub_ieee1275_map (paddr, addr, size, IEEE1275_MAP_DEFAULT);
   if (ret)
     {
       grub_error (GRUB_ERR_OUT_OF_MEMORY,