Skip to content

Commit 3a6b6c6

Browse files
Sai PraneethIngo Molnar
Sai Praneeth
authored and
Ingo Molnar
committed
efi: Make EFI_MEMORY_ATTRIBUTES_TABLE initialization common across all architectures
Since EFI_PROPERTIES_TABLE and EFI_MEMORY_ATTRIBUTES_TABLE deal with updating memory region attributes, it makes sense to call EFI_MEMORY_ATTRIBUTES_TABLE initialization function from the same place as EFI_PROPERTIES_TABLE. This also moves the EFI_MEMORY_ATTRIBUTES_TABLE initialization code to a more generic efi initialization path rather than ARM specific efi initialization. This is important because EFI_MEMORY_ATTRIBUTES_TABLE will be supported by x86 as well. Signed-off-by: Sai Praneeth Prakhya <[email protected]> Signed-off-by: Matt Fleming <[email protected]> Signed-off-by: Ard Biesheuvel <[email protected]> Reviewed-by: Lee, Chun-Yi <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Fenghua Yu <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Ravi Shankar <[email protected]> Cc: Ricardo Neri <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: [email protected] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent db4545d commit 3a6b6c6

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

drivers/firmware/efi/arm-init.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,6 @@ void __init efi_init(void)
250250
}
251251

252252
reserve_regions();
253-
efi_memattr_init();
254253
efi_esrt_init();
255254
efi_memmap_unmap();
256255

drivers/firmware/efi/efi.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -529,6 +529,8 @@ int __init efi_config_parse_tables(void *config_tables, int count, int sz,
529529
}
530530
}
531531

532+
efi_memattr_init();
533+
532534
/* Parse the EFI Properties table if it exists */
533535
if (efi.properties_table != EFI_INVALID_TABLE_ADDR) {
534536
efi_properties_table_t *tbl;

0 commit comments

Comments
 (0)