Commit 0a67361d authored by Ard Biesheuvel's avatar Ard Biesheuvel
Browse files

efi/x86: Remove runtime table address from kexec EFI setup data 



Since commit 33b85447 ("efi/x86: Drop two near identical versions
of efi_runtime_init()"), we no longer map the EFI runtime services table
before calling SetVirtualAddressMap(), which means we don't need the 1:1
mapped physical address of this table, and so there is no point in passing
the address via EFI setup data on kexec boot.

Note that the kexec tools will still look for this address in sysfs, so
we still need to provide it.

Tested-by: Tony Luck <tony.luck@intel.com> # arch/ia64
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent 06c0bd93

arch/x86/include/asm/efi.h

+0 −1
Original line number Diff line number Diff line
@@ -178,7 +178,6 @@ extern void __init efi_uv1_memmap_phys_epilog(pgd_t *save_pgd); 


struct efi_setup_data {

	u64 fw_vendor;

	u64 runtime;

	u64 tables;

	u64 smbios;

	u64 reserved[8];

arch/x86/kernel/kexec-bzimage64.c

+0 −1
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ prepare_add_efi_setup_data(struct boot_params *params, 
	struct efi_setup_data *esd = (void *)sd + sizeof(struct setup_data);



	esd->fw_vendor = efi.fw_vendor;

	esd->runtime = efi.runtime;

	esd->tables = efi.config_table;

	esd->smbios = efi.smbios;

arch/x86/platform/efi/efi.c

+1 −3
Original line number Diff line number Diff line
@@ -376,6 +376,7 @@ static int __init efi_systab_init(u64 phys) 
			 systab64->con_out		> U32_MAX ||

			 systab64->stderr_handle	> U32_MAX ||

			 systab64->stderr		> U32_MAX ||

			 systab64->runtime		> U32_MAX ||

			 systab64->boottime		> U32_MAX;



		if (efi_setup) {
@@ -388,17 +389,14 @@ static int __init efi_systab_init(u64 phys) 
			}



			efi_systab.fw_vendor	= (unsigned long)data->fw_vendor;

			efi_systab.runtime	= (void *)(unsigned long)data->runtime;

			efi_systab.tables	= (unsigned long)data->tables;



			over4g |= data->fw_vendor	> U32_MAX ||

				  data->runtime		> U32_MAX ||

				  data->tables		> U32_MAX;



			early_memunmap(data, sizeof(*data));

		} else {

			over4g |= systab64->fw_vendor	> U32_MAX ||

				  systab64->runtime	> U32_MAX ||

				  systab64->tables	> U32_MAX;

		}

	} else {

CRA Git | Maintained and supported by SUSTech CRA and CCSE