From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752147AbdBAJqx (ORCPT ); Wed, 1 Feb 2017 04:46:53 -0500 Received: from terminus.zytor.com ([65.50.211.136]:53404 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751420AbdBAJqv (ORCPT ); Wed, 1 Feb 2017 04:46:51 -0500 Date: Wed, 1 Feb 2017 01:45:42 -0800 From: tip-bot for Sai Praneeth Message-ID: Cc: ard.biesheuvel@linaro.org, sai.praneeth.prakhya@intel.com, matt@codeblueprint.co.uk, ricardo.neri@intel.com, linux-kernel@vger.kernel.org, peterz@infradead.org, mingo@kernel.org, hpa@zytor.com, fenghua.yu@intel.com, jlee@suse.com, bp@alien8.de, ravi.v.shankar@intel.com, torvalds@linux-foundation.org, tglx@linutronix.de Reply-To: fenghua.yu@intel.com, jlee@suse.com, tglx@linutronix.de, ravi.v.shankar@intel.com, torvalds@linux-foundation.org, bp@alien8.de, matt@codeblueprint.co.uk, sai.praneeth.prakhya@intel.com, ard.biesheuvel@linaro.org, ricardo.neri@intel.com, linux-kernel@vger.kernel.org, peterz@infradead.org, mingo@kernel.org, hpa@zytor.com In-Reply-To: <1485868902-20401-4-git-send-email-ard.biesheuvel@linaro.org> References: <1485868902-20401-4-git-send-email-ard.biesheuvel@linaro.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:efi/core] efi: Make EFI_MEMORY_ATTRIBUTES_TABLE initialization common across all architectures Git-Commit-ID: 3a6b6c6fb23667fa383053bd5259aabc96468571 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 3a6b6c6fb23667fa383053bd5259aabc96468571 Gitweb: http://git.kernel.org/tip/3a6b6c6fb23667fa383053bd5259aabc96468571 Author: Sai Praneeth AuthorDate: Tue, 31 Jan 2017 13:21:35 +0000 Committer: Ingo Molnar 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 Signed-off-by: Matt Fleming Signed-off-by: Ard Biesheuvel Reviewed-by: Lee, Chun-Yi Cc: Borislav Petkov Cc: Fenghua Yu Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Ravi Shankar Cc: Ricardo Neri Cc: Thomas Gleixner Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/1485868902-20401-4-git-send-email-ard.biesheuvel@linaro.org Signed-off-by: Ingo Molnar --- 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;