Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40e4530a authored by Roy Franz's avatar Roy Franz Committed by Matt Fleming
Browse files

efi: Rename memory allocation/free functions 



Rename them to be more similar, as low_free() could be used to free
memory allocated by both high_alloc() and low_alloc().
high_alloc() -> efi_high_alloc()
low_alloc()  -> efi_low_alloc()
low_free()   -> efi_free()

Signed-off-by: default avatarRoy Franz <roy.franz@linaro.org>
Acked-by: default avatarMark Salter <msalter@redhat.com>
Reviewed-by: default avatarGrant Likely <grant.likely@linaro.org>
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
parent 876dc36a

arch/x86/boot/compressed/eboot.c

+10 −9
Original line number Diff line number Diff line
@@ -457,7 +457,8 @@ struct boot_params *make_boot_params(void *handle, efi_system_table_t *_table) 
		return NULL;

	}



	status = low_alloc(sys_table, 0x4000, 1, (unsigned long *)&boot_params);

	status = efi_low_alloc(sys_table, 0x4000, 1,

			       (unsigned long *)&boot_params);

	if (status != EFI_SUCCESS) {

		efi_printk(sys_table, "Failed to alloc lowmem for boot params\n");

		return NULL;
@@ -503,7 +504,7 @@ struct boot_params *make_boot_params(void *handle, efi_system_table_t *_table) 


			options_size++;	/* NUL termination */



			status = low_alloc(sys_table, options_size, 1,

			status = efi_low_alloc(sys_table, options_size, 1,

					   &cmdline);

			if (status != EFI_SUCCESS) {

				efi_printk(sys_table, "Failed to alloc mem for cmdline\n");
@@ -537,9 +538,9 @@ struct boot_params *make_boot_params(void *handle, efi_system_table_t *_table) 
	return boot_params;

fail2:

	if (options_size)

		low_free(sys_table, options_size, hdr->cmd_line_ptr);

		efi_free(sys_table, options_size, hdr->cmd_line_ptr);

fail:

	low_free(sys_table, 0x4000, (unsigned long)boot_params);

	efi_free(sys_table, 0x4000, (unsigned long)boot_params);

	return NULL;

}
@@ -562,7 +563,7 @@ static efi_status_t exit_boot(struct boot_params *boot_params, 
again:

	size += sizeof(*mem_map) * 2;

	_size = size;

	status = low_alloc(sys_table, size, 1, (unsigned long *)&mem_map);

	status = efi_low_alloc(sys_table, size, 1, (unsigned long *)&mem_map);

	if (status != EFI_SUCCESS)

		return status;
@@ -570,7 +571,7 @@ get_map: 
	status = efi_call_phys5(sys_table->boottime->get_memory_map, &size,

				mem_map, &key, &desc_size, &desc_version);

	if (status == EFI_BUFFER_TOO_SMALL) {

		low_free(sys_table, _size, (unsigned long)mem_map);

		efi_free(sys_table, _size, (unsigned long)mem_map);

		goto again;

	}
@@ -672,7 +673,7 @@ get_map: 
	return EFI_SUCCESS;



free_mem_map:

	low_free(sys_table, _size, (unsigned long)mem_map);

	efi_free(sys_table, _size, (unsigned long)mem_map);

	return status;

}
@@ -695,7 +696,7 @@ static efi_status_t relocate_kernel(struct setup_header *hdr) 
				EFI_ALLOCATE_ADDRESS, EFI_LOADER_DATA,

				nr_pages, &start);

	if (status != EFI_SUCCESS) {

		status = low_alloc(sys_table, hdr->init_size,

		status = efi_low_alloc(sys_table, hdr->init_size,

				   hdr->kernel_alignment, &start);

		if (status != EFI_SUCCESS)

			efi_printk(sys_table, "Failed to alloc mem for kernel\n");
@@ -743,7 +744,7 @@ struct boot_params *efi_main(void *handle, efi_system_table_t *_table, 
	}



	gdt->size = 0x800;

	status = low_alloc(sys_table, gdt->size, 8,

	status = efi_low_alloc(sys_table, gdt->size, 8,

			   (unsigned long *)&gdt->address);

	if (status != EFI_SUCCESS) {

		efi_printk(sys_table, "Failed to alloc mem for gdt\n");

drivers/firmware/efi/efi-stub-helper.c

+7 −7
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ fail: 
/*

 * Allocate at the highest possible address that is not above 'max'.

 */

static efi_status_t high_alloc(efi_system_table_t *sys_table_arg,

static efi_status_t efi_high_alloc(efi_system_table_t *sys_table_arg,

			       unsigned long size, unsigned long align,

			       unsigned long *addr, unsigned long max)

{
@@ -165,7 +165,7 @@ fail: 
/*

 * Allocate at the lowest possible address.

 */

static efi_status_t low_alloc(efi_system_table_t *sys_table_arg,

static efi_status_t efi_low_alloc(efi_system_table_t *sys_table_arg,

			      unsigned long size, unsigned long align,

			      unsigned long *addr)

{
@@ -226,7 +226,7 @@ fail: 
	return status;

}



static void low_free(efi_system_table_t *sys_table_arg, unsigned long size,

static void efi_free(efi_system_table_t *sys_table_arg, unsigned long size,

		     unsigned long addr)

{

	unsigned long nr_pages;
@@ -407,7 +407,7 @@ grow: 
		 * addresses in memory, so allocate enough memory for

		 * all the initrd's.

		 */

		status = high_alloc(sys_table_arg, initrd_total, 0x1000,

		status = efi_high_alloc(sys_table_arg, initrd_total, 0x1000,

				    &initrd_addr, hdr->initrd_addr_max);

		if (status != EFI_SUCCESS) {

			efi_printk(sys_table_arg, "Failed to alloc highmem for initrds\n");
@@ -456,7 +456,7 @@ grow: 
	return status;



free_initrd_total:

	low_free(sys_table_arg, initrd_total, initrd_addr);

	efi_free(sys_table_arg, initrd_total, initrd_addr);



close_handles:

	for (k = j; k < i; k++)