From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752887AbdHUJVh (ORCPT ); Mon, 21 Aug 2017 05:21:37 -0400 Received: from terminus.zytor.com ([65.50.211.136]:58065 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752731AbdHUJVf (ORCPT ); Mon, 21 Aug 2017 05:21:35 -0400 Date: Mon, 21 Aug 2017 02:17:06 -0700 From: tip-bot for Ard Biesheuvel Message-ID: Cc: peterz@infradead.org, ard.biesheuvel@linaro.org, linux-kernel@vger.kernel.org, mingo@kernel.org, matt@codeblueprint.co.uk, tglx@linutronix.de, hpa@zytor.com, torvalds@linux-foundation.org Reply-To: tglx@linutronix.de, mingo@kernel.org, linux-kernel@vger.kernel.org, matt@codeblueprint.co.uk, torvalds@linux-foundation.org, hpa@zytor.com, peterz@infradead.org, ard.biesheuvel@linaro.org In-Reply-To: <20170818194947.19347-6-ard.biesheuvel@linaro.org> References: <20170818194947.19347-6-ard.biesheuvel@linaro.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:efi/core] efi/arm/arm64: Add missing assignment of efi.config_table Git-Commit-ID: 9a9de5c044be14c3337ef45174ac8baa568a0f93 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: 9a9de5c044be14c3337ef45174ac8baa568a0f93 Gitweb: http://git.kernel.org/tip/9a9de5c044be14c3337ef45174ac8baa568a0f93 Author: Ard Biesheuvel AuthorDate: Fri, 18 Aug 2017 20:49:38 +0100 Committer: Ingo Molnar CommitDate: Mon, 21 Aug 2017 09:43:49 +0200 efi/arm/arm64: Add missing assignment of efi.config_table The ARM EFI init code never assigns the config_table member of the efi struct, which means the sysfs device node is missing, and other in-kernel users will not work correctly. So add the missing assignment. Note that, for now, the runtime and fw_vendor members are still omitted. This is deliberate: exposing physical addresses via sysfs nodes encourages behavior that we would like to avoid on ARM (given how it is more finicky about using correct memory attributes when mapping memory in userland that may be mapped by the kernel already as well). Signed-off-by: Ard Biesheuvel Cc: Linus Torvalds Cc: Matt Fleming Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/20170818194947.19347-6-ard.biesheuvel@linaro.org Signed-off-by: Ingo Molnar --- drivers/firmware/efi/arm-init.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c index 0aa4ce7..80d1a88 100644 --- a/drivers/firmware/efi/arm-init.c +++ b/drivers/firmware/efi/arm-init.c @@ -145,6 +145,9 @@ static int __init uefi_init(void) sizeof(efi_config_table_t), arch_tables); + if (!retval) + efi.config_table = (unsigned long)efi.systab->tables; + early_memunmap(config_tables, table_size); out: early_memunmap(efi.systab, sizeof(efi_system_table_t));