[v2,04/14] efi: add grub_efi_get_ram_base() function for arm*

Message ID 20170803100432.29913-5-leif.lindholm@linaro.org
State New
Headers show
Series
  • efi: improved correctness, arm unification, and cleanup
Related show

Commit Message

Leif Lindholm Aug. 3, 2017, 10:04 a.m.
Since ARM platforms do not have a common memory map, add a helper
function that finds the lowest address region with the EFI_MEMORY_WB
attribute set in the UEFI memory map.

Required for the arm/arm64 linux loader to restrict the initrd
location to where it will be accessible by the kernel at runtime.

Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

---
 grub-core/kern/efi/mm.c | 36 ++++++++++++++++++++++++++++++++++++
 include/grub/efi/efi.h  |  3 +++
 2 files changed, 39 insertions(+)

-- 
2.11.0


_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

Comments

Vladimir 'phcoder' Serbinenko Aug. 3, 2017, 3:30 p.m. | #1
Any reason to use plain error numbers without grub_error?

Le Thu, Aug 3, 2017 à 12:09 PM, Leif Lindholm <leif.lindholm@linaro.org> a
écrit :

> Since ARM platforms do not have a common memory map, add a helper

> function that finds the lowest address region with the EFI_MEMORY_WB

> attribute set in the UEFI memory map.

>

> Required for the arm/arm64 linux loader to restrict the initrd

> location to where it will be accessible by the kernel at runtime.

>

> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

> ---

>  grub-core/kern/efi/mm.c | 36 ++++++++++++++++++++++++++++++++++++

>  include/grub/efi/efi.h  |  3 +++

>  2 files changed, 39 insertions(+)

>

> diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c

> index 31ca703ec..8413c19e5 100644

> --- a/grub-core/kern/efi/mm.c

> +++ b/grub-core/kern/efi/mm.c

> @@ -569,3 +569,39 @@ grub_efi_mm_init (void)

>    grub_efi_free_pages ((grub_addr_t) memory_map,

>                        2 * BYTES_TO_PAGES (MEMORY_MAP_SIZE));

>  }

> +

> +#if defined (__aarch64__)

> +grub_err_t

> +grub_efi_get_ram_base(grub_addr_t *base_addr)

> +{

> +  grub_efi_memory_descriptor_t *memory_map;

> +  grub_efi_memory_descriptor_t *desc;

> +  grub_efi_uintn_t mmap_size;

> +  grub_efi_uintn_t desc_size;

> +  int ret;

> +

> +  mmap_size = grub_efi_find_mmap_size();

> +

> +  memory_map = grub_malloc (mmap_size);

> +  if (! memory_map)

> +    return GRUB_ERR_OUT_OF_MEMORY;

> +  ret = grub_efi_get_memory_map (&mmap_size, memory_map, NULL,

> +                                &desc_size, NULL);

> +

> +  if (ret < 1)

> +    return GRUB_ERR_BUG;

> +

> +  for (desc = memory_map, *base_addr = GRUB_UINT_MAX;

> +       (grub_addr_t) desc < ((grub_addr_t) memory_map + mmap_size);

> +       desc = NEXT_MEMORY_DESCRIPTOR (desc, desc_size))

> +    {

> +      if (desc->attribute & GRUB_EFI_MEMORY_WB)

> +       if (desc->physical_start < *base_addr)

> +         *base_addr = desc->physical_start;

> +    }

> +

> +  grub_free(memory_map);

> +

> +  return GRUB_ERR_NONE;

> +}

> +#endif

> diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h

> index 3984de083..80ab56795 100644

> --- a/include/grub/efi/efi.h

> +++ b/include/grub/efi/efi.h

> @@ -85,6 +85,9 @@ extern void (*EXPORT_VAR(grub_efi_net_config))

> (grub_efi_handle_t hnd,

>  #if defined(__arm__) || defined(__aarch64__)

>  void *EXPORT_FUNC(grub_efi_get_firmware_fdt)(void);

>  #endif

> +#if defined(__aarch64__)

> +grub_err_t EXPORT_FUNC(grub_efi_get_ram_base)(grub_addr_t *);

> +#endif

>

>  grub_addr_t grub_efi_modules_addr (void);

>

> --

> 2.11.0

>

>

> _______________________________________________

> Grub-devel mailing list

> Grub-devel@gnu.org

> https://lists.gnu.org/mailman/listinfo/grub-devel

>
_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
Leif Lindholm Aug. 8, 2017, 4:04 p.m. | #2
On Thu, Aug 03, 2017 at 03:30:40PM +0000, Vladimir 'phcoder' Serbinenko wrote:
> Any reason to use plain error numbers without grub_error?


Well, no.

In the way I'm using it, it will cascade down to a
grub_error (GRUB_ERR_OUT_OF_MEMORY, N_("out of memory"));
on failure.

Do we need a specific one for "unable to determine memory start address"?
Or is there an existing error string we could reuse?

/
    Leif

> Le Thu, Aug 3, 2017 à 12:09 PM, Leif Lindholm <leif.lindholm@linaro.org> a

> écrit :

> 

> > Since ARM platforms do not have a common memory map, add a helper

> > function that finds the lowest address region with the EFI_MEMORY_WB

> > attribute set in the UEFI memory map.

> >

> > Required for the arm/arm64 linux loader to restrict the initrd

> > location to where it will be accessible by the kernel at runtime.

> >

> > Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

> > ---

> >  grub-core/kern/efi/mm.c | 36 ++++++++++++++++++++++++++++++++++++

> >  include/grub/efi/efi.h  |  3 +++

> >  2 files changed, 39 insertions(+)

> >

> > diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c

> > index 31ca703ec..8413c19e5 100644

> > --- a/grub-core/kern/efi/mm.c

> > +++ b/grub-core/kern/efi/mm.c

> > @@ -569,3 +569,39 @@ grub_efi_mm_init (void)

> >    grub_efi_free_pages ((grub_addr_t) memory_map,

> >                        2 * BYTES_TO_PAGES (MEMORY_MAP_SIZE));

> >  }

> > +

> > +#if defined (__aarch64__)

> > +grub_err_t

> > +grub_efi_get_ram_base(grub_addr_t *base_addr)

> > +{

> > +  grub_efi_memory_descriptor_t *memory_map;

> > +  grub_efi_memory_descriptor_t *desc;

> > +  grub_efi_uintn_t mmap_size;

> > +  grub_efi_uintn_t desc_size;

> > +  int ret;

> > +

> > +  mmap_size = grub_efi_find_mmap_size();

> > +

> > +  memory_map = grub_malloc (mmap_size);

> > +  if (! memory_map)

> > +    return GRUB_ERR_OUT_OF_MEMORY;

> > +  ret = grub_efi_get_memory_map (&mmap_size, memory_map, NULL,

> > +                                &desc_size, NULL);

> > +

> > +  if (ret < 1)

> > +    return GRUB_ERR_BUG;

> > +

> > +  for (desc = memory_map, *base_addr = GRUB_UINT_MAX;

> > +       (grub_addr_t) desc < ((grub_addr_t) memory_map + mmap_size);

> > +       desc = NEXT_MEMORY_DESCRIPTOR (desc, desc_size))

> > +    {

> > +      if (desc->attribute & GRUB_EFI_MEMORY_WB)

> > +       if (desc->physical_start < *base_addr)

> > +         *base_addr = desc->physical_start;

> > +    }

> > +

> > +  grub_free(memory_map);

> > +

> > +  return GRUB_ERR_NONE;

> > +}

> > +#endif

> > diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h

> > index 3984de083..80ab56795 100644

> > --- a/include/grub/efi/efi.h

> > +++ b/include/grub/efi/efi.h

> > @@ -85,6 +85,9 @@ extern void (*EXPORT_VAR(grub_efi_net_config))

> > (grub_efi_handle_t hnd,

> >  #if defined(__arm__) || defined(__aarch64__)

> >  void *EXPORT_FUNC(grub_efi_get_firmware_fdt)(void);

> >  #endif

> > +#if defined(__aarch64__)

> > +grub_err_t EXPORT_FUNC(grub_efi_get_ram_base)(grub_addr_t *);

> > +#endif

> >

> >  grub_addr_t grub_efi_modules_addr (void);

> >

> > --

> > 2.11.0

> >

> >

> > _______________________________________________

> > Grub-devel mailing list

> > Grub-devel@gnu.org

> > https://lists.gnu.org/mailman/listinfo/grub-devel

> >


> _______________________________________________

> Grub-devel mailing list

> Grub-devel@gnu.org

> https://lists.gnu.org/mailman/listinfo/grub-devel



_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel

Patch

diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
index 31ca703ec..8413c19e5 100644
--- a/grub-core/kern/efi/mm.c
+++ b/grub-core/kern/efi/mm.c
@@ -569,3 +569,39 @@  grub_efi_mm_init (void)
   grub_efi_free_pages ((grub_addr_t) memory_map,
 		       2 * BYTES_TO_PAGES (MEMORY_MAP_SIZE));
 }
+
+#if defined (__aarch64__)
+grub_err_t
+grub_efi_get_ram_base(grub_addr_t *base_addr)
+{
+  grub_efi_memory_descriptor_t *memory_map;
+  grub_efi_memory_descriptor_t *desc;
+  grub_efi_uintn_t mmap_size;
+  grub_efi_uintn_t desc_size;
+  int ret;
+
+  mmap_size = grub_efi_find_mmap_size();
+
+  memory_map = grub_malloc (mmap_size);
+  if (! memory_map)
+    return GRUB_ERR_OUT_OF_MEMORY;
+  ret = grub_efi_get_memory_map (&mmap_size, memory_map, NULL,
+				 &desc_size, NULL);
+
+  if (ret < 1)
+    return GRUB_ERR_BUG;
+
+  for (desc = memory_map, *base_addr = GRUB_UINT_MAX;
+       (grub_addr_t) desc < ((grub_addr_t) memory_map + mmap_size);
+       desc = NEXT_MEMORY_DESCRIPTOR (desc, desc_size))
+    {
+      if (desc->attribute & GRUB_EFI_MEMORY_WB)
+	if (desc->physical_start < *base_addr)
+	  *base_addr = desc->physical_start;
+    }
+
+  grub_free(memory_map);
+
+  return GRUB_ERR_NONE;
+}
+#endif
diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
index 3984de083..80ab56795 100644
--- a/include/grub/efi/efi.h
+++ b/include/grub/efi/efi.h
@@ -85,6 +85,9 @@  extern void (*EXPORT_VAR(grub_efi_net_config)) (grub_efi_handle_t hnd,
 #if defined(__arm__) || defined(__aarch64__)
 void *EXPORT_FUNC(grub_efi_get_firmware_fdt)(void);
 #endif
+#if defined(__aarch64__)
+grub_err_t EXPORT_FUNC(grub_efi_get_ram_base)(grub_addr_t *);
+#endif
 
 grub_addr_t grub_efi_modules_addr (void);