Commit cc5a080c authored by Matthew Garrett's avatar Matthew Garrett Committed by Matt Fleming
Browse files

efi: Pass boot services variable info to runtime code 



EFI variables can be flagged as being accessible only within boot services.
This makes it awkward for us to figure out how much space they use at
runtime. In theory we could figure this out by simply comparing the results
from QueryVariableInfo() to the space used by all of our variables, but
that fails if the platform doesn't garbage collect on every boot. Thankfully,
calling QueryVariableInfo() while still inside boot services gives a more
reliable answer. This patch passes that information from the EFI boot stub
up to the efi platform code.

Signed-off-by: default avatarMatthew Garrett <matthew.garrett@nebula.com>
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
parent 0635eb8a

arch/x86/boot/compressed/eboot.c

+47 −0
Original line number Diff line number Diff line
@@ -251,6 +251,51 @@ static void find_bits(unsigned long mask, u8 *pos, u8 *size) 
	*size = len;

}



static efi_status_t setup_efi_vars(struct boot_params *params)

{

	struct setup_data *data;

	struct efi_var_bootdata *efidata;

	u64 store_size, remaining_size, var_size;

	efi_status_t status;



	if (!sys_table->runtime->query_variable_info)

		return EFI_UNSUPPORTED;



	data = (struct setup_data *)(unsigned long)params->hdr.setup_data;



	while (data && data->next)

		data = (struct setup_data *)(unsigned long)data->next;



	status = efi_call_phys4(sys_table->runtime->query_variable_info,

				EFI_VARIABLE_NON_VOLATILE |

				EFI_VARIABLE_BOOTSERVICE_ACCESS |

				EFI_VARIABLE_RUNTIME_ACCESS, &store_size,

				&remaining_size, &var_size);



	if (status != EFI_SUCCESS)

		return status;



	status = efi_call_phys3(sys_table->boottime->allocate_pool,

				EFI_LOADER_DATA, sizeof(*efidata), &efidata);



	if (status != EFI_SUCCESS)

		return status;



	efidata->data.type = SETUP_EFI_VARS;

	efidata->data.len = sizeof(struct efi_var_bootdata) -

		sizeof(struct setup_data);

	efidata->data.next = 0;

	efidata->store_size = store_size;

	efidata->remaining_size = remaining_size;

	efidata->max_var_size = var_size;



	if (data)

		data->next = (unsigned long)efidata;

	else

		params->hdr.setup_data = (unsigned long)efidata;



}



static efi_status_t setup_efi_pci(struct boot_params *params)

{

	efi_pci_io_protocol *pci;
@@ -1157,6 +1202,8 @@ struct boot_params *efi_main(void *handle, efi_system_table_t *_table, 


	setup_graphics(boot_params);



	setup_efi_vars(boot_params);



	setup_efi_pci(boot_params);



	status = efi_call_phys3(sys_table->boottime->allocate_pool,

arch/x86/include/asm/efi.h

+7 −0
Original line number Diff line number Diff line
@@ -102,6 +102,13 @@ extern void efi_call_phys_epilog(void); 
extern void efi_unmap_memmap(void);

extern void efi_memory_uc(u64 addr, unsigned long size);



struct efi_var_bootdata {

	struct setup_data data;

	u64 store_size;

	u64 remaining_size;

	u64 max_var_size;

};



#ifdef CONFIG_EFI



static inline bool efi_is_native(void)

arch/x86/include/uapi/asm/bootparam.h

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#define SETUP_E820_EXT			1

#define SETUP_DTB			2

#define SETUP_PCI			3

#define SETUP_EFI_VARS			4



/* ram_size flags */

#define RAMDISK_IMAGE_START_MASK	0x07FF

arch/x86/platform/efi/efi.c

+21 −0
Original line number Diff line number Diff line
@@ -69,6 +69,10 @@ struct efi_memory_map memmap; 
static struct efi efi_phys __initdata;

static efi_system_table_t efi_systab __initdata;



static u64 efi_var_store_size;

static u64 efi_var_remaining_size;

static u64 efi_var_max_var_size;



unsigned long x86_efi_facility;



/*
@@ -682,6 +686,9 @@ void __init efi_init(void) 
	char vendor[100] = "unknown";

	int i = 0;

	void *tmp;

	struct setup_data *data;

	struct efi_var_bootdata *efi_var_data;

	u64 pa_data;



#ifdef CONFIG_X86_32

	if (boot_params.efi_info.efi_systab_hi ||
@@ -699,6 +706,20 @@ void __init efi_init(void) 
	if (efi_systab_init(efi_phys.systab))

		return;



	pa_data = boot_params.hdr.setup_data;

	while (pa_data) {

		data = early_ioremap(pa_data, sizeof(*efi_var_data));

		if (data->type == SETUP_EFI_VARS) {

			efi_var_data = (struct efi_var_bootdata *)data;



			efi_var_store_size = efi_var_data->store_size;

			efi_var_remaining_size = efi_var_data->remaining_size;

			efi_var_max_var_size = efi_var_data->max_var_size;

		}

		pa_data = data->next;

		early_iounmap(data, sizeof(*efi_var_data));

	}



	set_bit(EFI_SYSTEM_TABLES, &x86_efi_facility);



	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE