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

Commit 4b04e73a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull EFI fixes from Ingo Molnar:
 "Two fixes: a large-system fix and an earlyprintk fix with certain
  resolutions"

* 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/earlyprintk/efi: Fix infinite loop on some screen widths
  x86/efi: Allocate e820 buffer before calling efi_exit_boot_service
parents 0844895a 79c2206d

arch/x86/boot/compressed/eboot.c

+41 −24
Original line number Diff line number Diff line 


/* -----------------------------------------------------------------------

 *

 *   Copyright 2011 Intel Corporation; author Matt Fleming
@@ -634,37 +635,54 @@ static efi_status_t alloc_e820ext(u32 nr_desc, struct setup_data **e820ext, 
	return status;

}



static efi_status_t allocate_e820(struct boot_params *params,

				  struct setup_data **e820ext,

				  u32 *e820ext_size)

{

	unsigned long map_size, desc_size, buff_size;

	struct efi_boot_memmap boot_map;

	efi_memory_desc_t *map;

	efi_status_t status;

	__u32 nr_desc;



	boot_map.map		= ↦

	boot_map.map_size	= &map_size;

	boot_map.desc_size	= &desc_size;

	boot_map.desc_ver	= NULL;

	boot_map.key_ptr	= NULL;

	boot_map.buff_size	= &buff_size;



	status = efi_get_memory_map(sys_table, &boot_map);

	if (status != EFI_SUCCESS)

		return status;



	nr_desc = buff_size / desc_size;



	if (nr_desc > ARRAY_SIZE(params->e820_table)) {

		u32 nr_e820ext = nr_desc - ARRAY_SIZE(params->e820_table);



		status = alloc_e820ext(nr_e820ext, e820ext, e820ext_size);

		if (status != EFI_SUCCESS)

			return status;

	}



	return EFI_SUCCESS;

}



struct exit_boot_struct {

	struct boot_params	*boot_params;

	struct efi_info		*efi;

	struct setup_data	*e820ext;

	__u32			e820ext_size;

};



static efi_status_t exit_boot_func(efi_system_table_t *sys_table_arg,

				   struct efi_boot_memmap *map,

				   void *priv)

{

	static bool first = true;

	const char *signature;

	__u32 nr_desc;

	efi_status_t status;

	struct exit_boot_struct *p = priv;



	if (first) {

		nr_desc = *map->buff_size / *map->desc_size;

		if (nr_desc > ARRAY_SIZE(p->boot_params->e820_table)) {

			u32 nr_e820ext = nr_desc -

					ARRAY_SIZE(p->boot_params->e820_table);



			status = alloc_e820ext(nr_e820ext, &p->e820ext,

					       &p->e820ext_size);

			if (status != EFI_SUCCESS)

				return status;

		}

		first = false;

	}



	signature = efi_is_64bit() ? EFI64_LOADER_SIGNATURE

				   : EFI32_LOADER_SIGNATURE;

	memcpy(&p->efi->efi_loader_signature, signature, sizeof(__u32));
@@ -687,8 +705,8 @@ static efi_status_t exit_boot(struct boot_params *boot_params, void *handle) 
{

	unsigned long map_sz, key, desc_size, buff_size;

	efi_memory_desc_t *mem_map;

	struct setup_data *e820ext;

	__u32 e820ext_size;

	struct setup_data *e820ext = NULL;

	__u32 e820ext_size = 0;

	efi_status_t status;

	__u32 desc_version;

	struct efi_boot_memmap map;
@@ -702,8 +720,10 @@ static efi_status_t exit_boot(struct boot_params *boot_params, void *handle) 
	map.buff_size		= &buff_size;

	priv.boot_params	= boot_params;

	priv.efi		= &boot_params->efi_info;

	priv.e820ext		= NULL;

	priv.e820ext_size	= 0;



	status = allocate_e820(boot_params, &e820ext, &e820ext_size);

	if (status != EFI_SUCCESS)

		return status;



	/* Might as well exit boot services now */

	status = efi_exit_boot_services(sys_table, handle, &map, &priv,
@@ -711,9 +731,6 @@ static efi_status_t exit_boot(struct boot_params *boot_params, void *handle) 
	if (status != EFI_SUCCESS)

		return status;



	e820ext			= priv.e820ext;

	e820ext_size		= priv.e820ext_size;



	/* Historic? */

	boot_params->alt_mem_k	= 32 * 1024;

arch/x86/platform/efi/early_printk.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ early_efi_write(struct console *con, const char *str, unsigned int num) 
			num--;

		}



		if (efi_x >= si->lfb_width) {

		if (efi_x + font->width > si->lfb_width) {

			efi_x = 0;

			efi_y += font->height;

		}