[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-3a6b6c6fb23667fa383053bd5259aabc96468571@git.kernel.org>
Date: Wed, 1 Feb 2017 01:45:42 -0800
From: tip-bot for Sai Praneeth <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: ard.biesheuvel@...aro.org, sai.praneeth.prakhya@...el.com,
matt@...eblueprint.co.uk, ricardo.neri@...el.com,
linux-kernel@...r.kernel.org, peterz@...radead.org,
mingo@...nel.org, hpa@...or.com, fenghua.yu@...el.com,
jlee@...e.com, bp@...en8.de, ravi.v.shankar@...el.com,
torvalds@...ux-foundation.org, tglx@...utronix.de
Subject: [tip:efi/core] efi: Make EFI_MEMORY_ATTRIBUTES_TABLE initialization
common across all architectures
Commit-ID: 3a6b6c6fb23667fa383053bd5259aabc96468571
Gitweb: http://git.kernel.org/tip/3a6b6c6fb23667fa383053bd5259aabc96468571
Author: Sai Praneeth <sai.praneeth.prakhya@...el.com>
AuthorDate: Tue, 31 Jan 2017 13:21:35 +0000
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Wed, 1 Feb 2017 08:45:43 +0100
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 <sai.praneeth.prakhya@...el.com>
Signed-off-by: Matt Fleming <matt@...eblueprint.co.uk>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@...aro.org>
Reviewed-by: Lee, Chun-Yi <jlee@...e.com>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Fenghua Yu <fenghua.yu@...el.com>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Ravi Shankar <ravi.v.shankar@...el.com>
Cc: Ricardo Neri <ricardo.neri@...el.com>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: linux-efi@...r.kernel.org
Link: http://lkml.kernel.org/r/1485868902-20401-4-git-send-email-ard.biesheuvel@linaro.org
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
drivers/firmware/efi/arm-init.c | 1 -
drivers/firmware/efi/efi.c | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
index f853ad2..1027d7b 100644
--- a/drivers/firmware/efi/arm-init.c
+++ b/drivers/firmware/efi/arm-init.c
@@ -250,7 +250,6 @@ void __init efi_init(void)
}
reserve_regions();
- efi_memattr_init();
efi_esrt_init();
efi_memmap_unmap();
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
index 9291480..e7d4040 100644
--- a/drivers/firmware/efi/efi.c
+++ b/drivers/firmware/efi/efi.c
@@ -529,6 +529,8 @@ int __init efi_config_parse_tables(void *config_tables, int count, int sz,
}
}
+ efi_memattr_init();
+
/* Parse the EFI Properties table if it exists */
if (efi.properties_table != EFI_INVALID_TABLE_ADDR) {
efi_properties_table_t *tbl;
Powered by blists - more mailing lists