Re: [PATCH 06/22] Add helper functions used by arm/arm64
On Mon, Mar 3, 2014 at 6:08 AM, Matt Fleming wrote: > On Fri, 14 Feb, at 11:02:49AM, Roy Franz wrote: >> >> The get_dram_base() function is only used by arm/arm64, but >> there is nothing architecture specific about it, which is why I put it >> here to begin with. I don't feel strongly about this either way. > > Sorry Roy, I just realised that you probably wanted a response from me > about this last point. > > OK, leaving get_dram_base() in efi-stub-helper.c is fine. > > FYI, "NUL" isn't a typo, > >> - options_size++; /* NUL termination */ > [...] >> + options_size++; /* NULL termination */ > > http://en.wikipedia.org/wiki/Null_character > > -- > Matt Fleming, Intel Open Source Technology Center Thanks - I'll take care of this in the next revision. Roy -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 06/22] Add helper functions used by arm/arm64
On Fri, 14 Feb, at 11:02:49AM, Roy Franz wrote: > > The get_dram_base() function is only used by arm/arm64, but > there is nothing architecture specific about it, which is why I put it > here to begin with. I don't feel strongly about this either way. Sorry Roy, I just realised that you probably wanted a response from me about this last point. OK, leaving get_dram_base() in efi-stub-helper.c is fine. FYI, "NUL" isn't a typo, > - options_size++; /* NUL termination */ [...] > + options_size++; /* NULL termination */ http://en.wikipedia.org/wiki/Null_character -- Matt Fleming, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 06/22] Add helper functions used by arm/arm64
On Thu, Feb 13, 2014 at 3:26 AM, Matt Fleming wrote: > On Wed, 05 Feb, at 05:03:57PM, Leif Lindholm wrote: >> From: Roy Franz >> >> Add the get_dram_base() function and efi_call_physN() macros >> that are shared by arm/arm64. >> >> Signed-off-by: Roy Franz >> Signed-off-by: Leif Lindholm >> --- >> drivers/firmware/efi/efi-stub-helper.c | 63 >> +--- >> 1 file changed, 50 insertions(+), 13 deletions(-) > > These changes should be in drivers/firmware/efi/arm-stub.c - > efi-stub-helper.c is not a dumping ground for random > architecture-specific code. Hi Matt, I will move those functions/macros to the arm-stub.c file. I agree that the macros should go there, as they are the arm specific versions and conflict with the x86 versions defined elsewhere. These were there before the arm-stub.c file was added and didn't get moved when it was. The get_dram_base() function is only used by arm/arm64, but there is nothing architecture specific about it, which is why I put it here to begin with. I don't feel strongly about this either way. Thanks, Roy > > -- > Matt Fleming, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH 06/22] Add helper functions used by arm/arm64
On Wed, 05 Feb, at 05:03:57PM, Leif Lindholm wrote: > From: Roy Franz > > Add the get_dram_base() function and efi_call_physN() macros > that are shared by arm/arm64. > > Signed-off-by: Roy Franz > Signed-off-by: Leif Lindholm > --- > drivers/firmware/efi/efi-stub-helper.c | 63 > +--- > 1 file changed, 50 insertions(+), 13 deletions(-) These changes should be in drivers/firmware/efi/arm-stub.c - efi-stub-helper.c is not a dumping ground for random architecture-specific code. -- Matt Fleming, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH 06/22] Add helper functions used by arm/arm64
From: Roy Franz
Add the get_dram_base() function and efi_call_physN() macros
that are shared by arm/arm64.
Signed-off-by: Roy Franz
Signed-off-by: Leif Lindholm
---
drivers/firmware/efi/efi-stub-helper.c | 63 +---
1 file changed, 50 insertions(+), 13 deletions(-)
diff --git a/drivers/firmware/efi/efi-stub-helper.c
b/drivers/firmware/efi/efi-stub-helper.c
index eb5d2eb..8477a72 100644
--- a/drivers/firmware/efi/efi-stub-helper.c
+++ b/drivers/firmware/efi/efi-stub-helper.c
@@ -11,6 +11,27 @@
*/
#define EFI_READ_CHUNK_SIZE(1024 * 1024)
+/* error code which can't be mistaken for valid address */
+#define EFI_ERROR (~0UL)
+
+# if !defined(CONFIG_X86)
+/*
+ * EFI function call wrappers. These are not required for arm/arm64, but
+ * wrappers are required for X86 to convert between ABIs. These wrappers are
+ * provided to allow code sharing between X86 and other architectures. Since
+ * these wrappers directly invoke the EFI function pointer, the function
+ * pointer type must be properly defined, which is not the case for X86. One
+ * advantage of this is it allows for type checking of arguments, which is not
+ * possible with the X86 wrappers.
+ */
+#define efi_call_phys0(f) f()
+#define efi_call_phys1(f, a1) f(a1)
+#define efi_call_phys2(f, a1, a2) f(a1, a2)
+#define efi_call_phys3(f, a1, a2, a3) f(a1, a2, a3)
+#define efi_call_phys4(f, a1, a2, a3, a4) f(a1, a2, a3, a4)
+#define efi_call_phys5(f, a1, a2, a3, a4, a5) f(a1, a2, a3, a4, a5)
+#endif
+
struct file_info {
efi_file_handle_t *handle;
u64 size;
@@ -92,6 +113,32 @@ fail:
return status;
}
+
+static unsigned long __init get_dram_base(efi_system_table_t *sys_table)
+{
+ efi_status_t status;
+ unsigned long map_size;
+ unsigned long membase = EFI_ERROR;
+ struct efi_memory_map map;
+ efi_memory_desc_t *md;
+
+ status = efi_get_memory_map(sys_table, (efi_memory_desc_t **)&map.map,
+ &map_size, &map.desc_size, NULL, NULL);
+ if (status != EFI_SUCCESS)
+ return membase;
+
+ map.map_end = map.map + map_size;
+
+ for_each_efi_memory_desc(&map, md)
+ if (md->attribute & EFI_MEMORY_WB)
+ if (membase > md->phys_addr)
+ membase = md->phys_addr;
+
+ efi_call_phys1(sys_table->boottime->free_pool, map.map);
+
+ return membase;
+}
+
/*
* Allocate at the highest possible address that is not above 'max'.
*/
@@ -610,19 +657,9 @@ static char
*efi_convert_cmdline_to_ascii(efi_system_table_t *sys_table_arg,
options = &zero;
}
- options_size++; /* NUL termination */
-#ifdef CONFIG_ARM
- /*
-* For ARM, allocate at a high address to avoid reserved
-* regions at low addresses that we don't know the specfics of
-* at the time we are processing the command line.
-*/
- status = efi_high_alloc(sys_table_arg, options_size, 0,
- &cmdline_addr, 0xf000);
-#else
- status = efi_low_alloc(sys_table_arg, options_size, 0,
- &cmdline_addr);
-#endif
+ options_size++; /* NULL termination */
+
+ status = efi_low_alloc(sys_table_arg, options_bytes, 0, &cmdline_addr);
if (status != EFI_SUCCESS)
return NULL;
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
