powerpc/ps3: Add ps3_mm_set_repository_highmem

Add the new routine ps3_mm_set_repository_highmem() that saves highmem info to
the LV1 hypervisor registry so that the info will be available to second stage
OS's loaded by petitboot/kexec. FreeBSD and some Linux derivatives use
this feature.

Also, move the existing ps3_mm_get_repository_highmem() routine up in
the source file.

This implementation of ps3_mm_set_repository_highmem() assumes the repository
will have a single highmem region entry (at index 0).

Signed-off-by: Geoff Levand <geoff@infradead.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/platforms/ps3/mm.c b/arch/powerpc/platforms/ps3/mm.c
index 0c9f643d9e2ac0e048121bd7e1f0557a2edcff00..04c1b938d7624d989a5a7b69b7fbc9e436ac2502 100644 (file)
--- a/arch/powerpc/platforms/ps3/mm.c
+++ b/arch/powerpc/platforms/ps3/mm.c
@@ -223,6 +223,44 @@ void ps3_mm_vas_destroy(void)
        }
 }
 
+static int ps3_mm_get_repository_highmem(struct mem_region *r)
+{
+       int result;
+
+       /* Assume a single highmem region. */
+
+       result = ps3_repository_read_highmem_info(0, &r->base, &r->size);
+
+       if (result)
+               goto zero_region;
+
+       if (!r->base || !r->size) {
+               result = -1;
+               goto zero_region;
+       }
+
+       r->offset = r->base - map.rm.size;
+
+       DBG("%s:%d: Found high region in repository: %llxh %llxh\n",
+           __func__, __LINE__, r->base, r->size);
+
+       return 0;
+
+zero_region:
+       DBG("%s:%d: No high region in repository.\n", __func__, __LINE__);
+
+       r->size = r->base = r->offset = 0;
+       return result;
+}
+
+static int ps3_mm_set_repository_highmem(const struct mem_region *r)
+{
+       /* Assume a single highmem region. */
+
+       return r ? ps3_repository_write_highmem_info(0, r->base, r->size) :
+               ps3_repository_write_highmem_info(0, 0, 0);
+}
+
 /**
  * ps3_mm_region_create - create a memory region in the vas
  * @r: pointer to a struct mem_region to accept initialized values
@@ -293,36 +331,6 @@ static void ps3_mm_region_destroy(struct mem_region *r)
        }
 }
 
-static int ps3_mm_get_repository_highmem(struct mem_region *r)
-{
-       int result;
-
-       /* Assume a single highmem region. */
-
-       result = ps3_repository_read_highmem_info(0, &r->base, &r->size);
-
-       if (result)
-               goto zero_region;
-
-       if (!r->base || !r->size) {
-               result = -1;
-               goto zero_region;
-       }
-
-       r->offset = r->base - map.rm.size;
-
-       DBG("%s:%d: Found high region in repository: %llxh %llxh\n",
-           __func__, __LINE__, r->base, r->size);
-
-       return 0;
-
-zero_region:
-       DBG("%s:%d: No high region in repository.\n", __func__, __LINE__);
-
-       r->size = r->base = r->offset = 0;
-       return result;
-}
-
 /*============================================================================*/
 /* dma routines                                                               */
 /*============================================================================*/