From: roy.franz@linaro.org (Roy Franz)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 05/17] Add minimum address parameter to efi_low_alloc()
Date: Tue, 6 Aug 2013 20:45:01 -0700 [thread overview]
Message-ID: <1375847113-24884-6-git-send-email-roy.franz@linaro.org> (raw)
In-Reply-To: <1375847113-24884-1-git-send-email-roy.franz@linaro.org>
This allows allocations to be made low in memory while
avoiding allocations at the base of memory.
Signed-off-by: Roy Franz <roy.franz@linaro.org>
---
arch/x86/boot/compressed/eboot.c | 11 ++++++-----
drivers/firmware/efi/efi-stub-helper.c | 5 ++++-
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index 2a4430a..f44ef2f 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -458,7 +458,7 @@ struct boot_params *make_boot_params(void *handle, efi_system_table_t *_table)
}
status = efi_low_alloc(sys_table, 0x4000, 1,
- (unsigned long *)&boot_params);
+ (unsigned long *)&boot_params, 0);
if (status != EFI_SUCCESS) {
efi_printk(sys_table, "Failed to alloc lowmem for boot params\n");
return NULL;
@@ -505,7 +505,7 @@ struct boot_params *make_boot_params(void *handle, efi_system_table_t *_table)
options_size++; /* NUL termination */
status = efi_low_alloc(sys_table, options_size, 1,
- &cmdline);
+ &cmdline, 0);
if (status != EFI_SUCCESS) {
efi_printk(sys_table, "Failed to alloc mem for cmdline\n");
goto fail;
@@ -563,7 +563,8 @@ static efi_status_t exit_boot(struct boot_params *boot_params,
again:
size += sizeof(*mem_map) * 2;
_size = size;
- status = efi_low_alloc(sys_table, size, 1, (unsigned long *)&mem_map);
+ status = efi_low_alloc(sys_table, size, 1,
+ (unsigned long *)&mem_map, 0);
if (status != EFI_SUCCESS)
return status;
@@ -697,7 +698,7 @@ static efi_status_t relocate_kernel(struct setup_header *hdr)
nr_pages, &start);
if (status != EFI_SUCCESS) {
status = efi_low_alloc(sys_table, hdr->init_size,
- hdr->kernel_alignment, &start);
+ hdr->kernel_alignment, &start, 0);
if (status != EFI_SUCCESS)
efi_printk(sys_table, "Failed to alloc mem for kernel\n");
}
@@ -745,7 +746,7 @@ struct boot_params *efi_main(void *handle, efi_system_table_t *_table,
gdt->size = 0x800;
status = efi_low_alloc(sys_table, gdt->size, 8,
- (unsigned long *)&gdt->address);
+ (unsigned long *)&gdt->address, 0);
if (status != EFI_SUCCESS) {
efi_printk(sys_table, "Failed to alloc mem for gdt\n");
goto fail;
diff --git a/drivers/firmware/efi/efi-stub-helper.c b/drivers/firmware/efi/efi-stub-helper.c
index 8e6a7f9..63e3556 100644
--- a/drivers/firmware/efi/efi-stub-helper.c
+++ b/drivers/firmware/efi/efi-stub-helper.c
@@ -167,7 +167,7 @@ fail:
*/
static efi_status_t efi_low_alloc(efi_system_table_t *sys_table_arg,
unsigned long size, unsigned long align,
- unsigned long *addr)
+ unsigned long *addr, unsigned long min)
{
unsigned long map_size, desc_size;
efi_memory_desc_t *map;
@@ -204,6 +204,9 @@ static efi_status_t efi_low_alloc(efi_system_table_t *sys_table_arg,
if (start == 0x0)
start += 8;
+ if (start < min)
+ start = min;
+
start = round_up(start, align);
if ((start + size) > end)
continue;
--
1.7.10.4
next prev parent reply other threads:[~2013-08-07 3:45 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-07 3:44 [PATCH V2 00/17] EFI stub for ARM Roy Franz
2013-08-07 3:44 ` [PATCH 01/17] EFI stub documentation updates Roy Franz
2013-08-07 3:44 ` [PATCH 02/17] Move common EFI stub code from x86 arch code to common location Roy Franz
2013-08-07 3:44 ` [PATCH 03/17] Add system pointer argument to shared EFI stub related functions so they no longer use global system table pointer as they did when part of eboot.c Roy Franz
2013-08-07 13:08 ` Matt Fleming
2013-08-07 17:10 ` Roy Franz
2013-08-07 21:55 ` Matt Fleming
2013-08-07 3:45 ` [PATCH 04/17] Rename memory allocation/free functions Roy Franz
2013-08-07 13:09 ` Matt Fleming
2013-08-07 17:12 ` Roy Franz
2013-08-07 3:45 ` Roy Franz [this message]
2013-08-07 3:45 ` [PATCH 06/17] rename __get_map() to efi_get_memory_map(), add parameter to optionally return mmap key. The mmap key is required to exit EFI boot services, and allows efi_get_memory_map() to be used for getting final memory map Roy Franz
2013-08-07 3:45 ` [PATCH 07/17] Enforce minimum alignment of 1 page on allocations. The efi_high_alloc() and efi_low_alloc() functions use the EFI_ALLOCATE_ADDRESS option to the EFI function allocate_pages(), which requires a minimum of page alignment, and rejects all other requests Roy Franz
2013-08-07 3:45 ` [PATCH 08/17] Allow efi_free() to be called with size of 0, and do nothing in that case Roy Franz
2013-08-07 3:45 ` [PATCH 09/17] Generalize handle_ramdisks() and rename to handle_cmdline_files() Roy Franz
2013-08-07 3:45 ` [PATCH 10/17] Renames in handle_cmdline_files() to complete generalization Roy Franz
2013-08-07 13:09 ` Matt Fleming
2013-08-07 3:45 ` [PATCH 11/17] Move EFI_READ_CHUNK_SIZE define to shared location Roy Franz
2013-08-07 3:45 ` [PATCH 12/17] Add proper definitions for some EFI function pointers Roy Franz
2013-08-07 13:09 ` Matt Fleming
2013-08-07 17:20 ` Roy Franz
2013-08-09 14:10 ` Mark Salter
2013-08-09 14:13 ` Roy Franz
2013-08-07 3:45 ` [PATCH 13/17] Fix types in EFI calls to match EFI function definitions Roy Franz
2013-08-07 3:45 ` [PATCH 14/17] resolve warnings found on ARM compile Roy Franz
2013-08-07 3:45 ` [PATCH 15/17] Add strstr to compressed string.c for ARM Roy Franz
2013-08-07 3:45 ` [PATCH 16/17] Add EFI stub " Roy Franz
2013-08-07 18:05 ` Dave Martin
2013-08-07 18:33 ` Leif Lindholm
2013-08-08 21:57 ` Roy Franz
2013-08-09 0:53 ` Roy Franz
2013-08-13 14:21 ` Dave P Martin
2013-08-07 3:45 ` [PATCH 17/17] Add config EFI_STUB for ARM to Kconfig Roy Franz
2013-08-07 7:44 ` [PATCH V2 00/17] EFI stub for ARM Matt Fleming
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1375847113-24884-6-git-send-email-roy.franz@linaro.org \
--to=roy.franz@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).