dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-30 06:51:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

efi_loader: Move efi_allocate_pool implementation to efi_memory.c

Browse Source 
We currently handle efi_allocate_pool() in our boot time service
file. In the following patch, pool allocation will receive additional
internal semantics that we should preserve inside efi_memory.c instead.

As foundation for those changes, split the function into an externally
facing efi_allocate_pool_ext() for use by payloads and an internal helper
efi_allocate_pool() in efi_memory.c that handles the actual allocation.

While at it, change the magic 0xfff / 12 constants to the more obvious
EFI_PAGE_MASK/SHIFT defines.

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Reviewed-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Stefan Brüns
2016-10-09 22:17:18 +02:00
committed by Alexander Graf
parent 991d62fa73
commit ead1274b7f
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/efi_loader.h
View File

@@ -119,6 +119,9 @@ efi_status_t efi_allocate_pages(int type, int memory_type, unsigned long pages,
uint64_t *memory); uint64_t *memory);
/* EFI memory free function. Not implemented today */ /* EFI memory free function. Not implemented today */
efi_status_t efi_free_pages(uint64_t memory, unsigned long pages); efi_status_t efi_free_pages(uint64_t memory, unsigned long pages);
/* EFI memory allocator for small allocations */
efi_status_t efi_allocate_pool(int pool_type, unsigned long size,
void **buffer);
/* Returns the EFI memory map */ /* Returns the EFI memory map */
efi_status_t efi_get_memory_map(unsigned long *memory_map_size, efi_status_t efi_get_memory_map(unsigned long *memory_map_size,
struct efi_mem_desc *memory_map, struct efi_mem_desc *memory_map,

9
lib/efi_loader/efi_boottime.c
View File

@@ -130,15 +130,14 @@ efi_status_t EFIAPI efi_get_memory_map_ext(unsigned long *memory_map_size,
return EFI_EXIT(r); return EFI_EXIT(r);
} }
static efi_status_t EFIAPI efi_allocate_pool(int pool_type, unsigned long size, static efi_status_t EFIAPI efi_allocate_pool_ext(int pool_type,
unsigned long size,
void **buffer) void **buffer)
{ {
efi_status_t r; efi_status_t r;
efi_physical_addr_t t;
EFI_ENTRY("%d, %ld, %p", pool_type, size, buffer); EFI_ENTRY("%d, %ld, %p", pool_type, size, buffer);
r = efi_allocate_pages(0, pool_type, (size + 0xfff) >> 12, &t); r = efi_allocate_pool(pool_type, size, buffer);
*buffer = (void *)(uintptr_t)t;
return EFI_EXIT(r); return EFI_EXIT(r);
} }
@@ -736,7 +735,7 @@ static const struct efi_boot_services efi_boot_services = {
.allocate_pages = efi_allocate_pages_ext, .allocate_pages = efi_allocate_pages_ext,
.free_pages = efi_free_pages_ext, .free_pages = efi_free_pages_ext,
.get_memory_map = efi_get_memory_map_ext, .get_memory_map = efi_get_memory_map_ext,
.allocate_pool = efi_allocate_pool, .allocate_pool = efi_allocate_pool_ext,
.free_pool = efi_free_pool, .free_pool = efi_free_pool,
.create_event = efi_create_event, .create_event = efi_create_event,
.set_timer = efi_set_timer, .set_timer = efi_set_timer,

14
lib/efi_loader/efi_memory.c
View File

@@ -327,6 +327,20 @@ efi_status_t efi_free_pages(uint64_t memory, unsigned long pages)
return EFI_SUCCESS; return EFI_SUCCESS;
} }
efi_status_t efi_allocate_pool(int pool_type, unsigned long size,
void **buffer)
{
efi_status_t r;
efi_physical_addr_t t;
u64 num_pages = (size + EFI_PAGE_MASK) >> EFI_PAGE_SHIFT;
r = efi_allocate_pages(0, pool_type, num_pages, &t);
if (r == EFI_SUCCESS)
*buffer = (void *)(uintptr_t)t;
return r;
}
efi_status_t efi_get_memory_map(unsigned long *memory_map_size, efi_status_t efi_get_memory_map(unsigned long *memory_map_size,
struct efi_mem_desc *memory_map, struct efi_mem_desc *memory_map,
unsigned long *map_key, unsigned long *map_key,