Merge tag 'stable-shared-branch-for-driver-tree' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into driver-core-next
Ard writes: Stable shared branch between EFI and driver tree Stable shared branch to ease the integration of Hans's series to support device firmware loaded from EFI boot service memory regions. [PATCH v12 00/10] efi/firmware/platform-x86: Add EFI embedded fw support https://lore.kernel.org/linux-efi/20200115163554.101315-1-hdegoede@redhat.com/ * tag 'stable-shared-branch-for-driver-tree' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi: efi: Add embedded peripheral firmware support efi: Export boot-services code and data as debugfs-blobs
This commit is contained in:
@@ -243,6 +243,7 @@ int __init efi_memblock_x86_reserve_range(void)
|
||||
efi.memmap.desc_version);
|
||||
|
||||
memblock_reserve(pmap, efi.memmap.nr_map * efi.memmap.desc_size);
|
||||
set_bit(EFI_PRESERVE_BS_REGIONS, &efi.flags);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -943,6 +944,7 @@ static void __init __efi_enter_virtual_mode(void)
|
||||
goto err;
|
||||
}
|
||||
|
||||
efi_check_for_embedded_firmwares();
|
||||
efi_free_boot_services();
|
||||
|
||||
/*
|
||||
|
@@ -410,6 +410,10 @@ void __init efi_free_boot_services(void)
|
||||
int num_entries = 0;
|
||||
void *new, *new_md;
|
||||
|
||||
/* Keep all regions for /sys/kernel/debug/efi */
|
||||
if (efi_enabled(EFI_DBG))
|
||||
return;
|
||||
|
||||
for_each_efi_memory_desc(md) {
|
||||
unsigned long long start = md->phys_addr;
|
||||
unsigned long long size = md->num_pages << EFI_PAGE_SHIFT;
|
||||
|
Reference in New Issue
Block a user