Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753294AbcD1Ki6 (ORCPT ); Thu, 28 Apr 2016 06:38:58 -0400 Received: from terminus.zytor.com ([198.137.202.10]:47826 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752555AbcD1Ki4 (ORCPT ); Thu, 28 Apr 2016 06:38:56 -0400 Date: Thu, 28 Apr 2016 03:38:00 -0700 From: tip-bot for Ard Biesheuvel Message-ID: Cc: tglx@linutronix.de, bp@alien8.de, mark.rutland@arm.com, peterz@infradead.org, dh.herrmann@gmail.com, pjones@redhat.com, ard.biesheuvel@linaro.org, will.deacon@arm.com, mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, matt@codeblueprint.co.uk Reply-To: bp@alien8.de, tglx@linutronix.de, peterz@infradead.org, mark.rutland@arm.com, pjones@redhat.com, dh.herrmann@gmail.com, linux-kernel@vger.kernel.org, hpa@zytor.com, matt@codeblueprint.co.uk, ard.biesheuvel@linaro.org, will.deacon@arm.com, mingo@kernel.org In-Reply-To: <1461614832-17633-21-git-send-email-matt@codeblueprint.co.uk> References: <1461614832-17633-21-git-send-email-matt@codeblueprint.co.uk> To: linux-tip-commits@vger.kernel.org Subject: [tip:efi/core] arm64/efi/libstub: Make screen_info accessible to the UEFI stub Git-Commit-ID: 57fdb89aeb7b0e3aab19847ab7399e5d76f11e6f 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 Content-Length: 2810 Lines: 72 Commit-ID: 57fdb89aeb7b0e3aab19847ab7399e5d76f11e6f Gitweb: http://git.kernel.org/tip/57fdb89aeb7b0e3aab19847ab7399e5d76f11e6f Author: Ard Biesheuvel AuthorDate: Mon, 25 Apr 2016 21:06:52 +0100 Committer: Ingo Molnar CommitDate: Thu, 28 Apr 2016 11:33:59 +0200 arm64/efi/libstub: Make screen_info accessible to the UEFI stub Unlike on 32-bit ARM, where we need to pass the stub's version of struct screen_info to the kernel proper via a configuration table, on 64-bit ARM it simply involves making the core kernel's copy of struct screen_info visible to the stub by exposing an __efistub_ alias for it. Signed-off-by: Ard Biesheuvel Signed-off-by: Matt Fleming Acked-by: Will Deacon Cc: Borislav Petkov Cc: David Herrmann Cc: Mark Rutland Cc: Peter Jones Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/1461614832-17633-21-git-send-email-matt@codeblueprint.co.uk Signed-off-by: Ingo Molnar --- arch/arm64/include/asm/efi.h | 3 +++ arch/arm64/kernel/efi.c | 3 +++ arch/arm64/kernel/image.h | 1 + 3 files changed, 7 insertions(+) diff --git a/arch/arm64/include/asm/efi.h b/arch/arm64/include/asm/efi.h index af40baa..fa09886 100644 --- a/arch/arm64/include/asm/efi.h +++ b/arch/arm64/include/asm/efi.h @@ -56,6 +56,9 @@ int efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md); #define __efi_call_early(f, ...) f(__VA_ARGS__) #define efi_is_64bit() (true) +#define alloc_screen_info(x...) &screen_info +#define free_screen_info(x...) + #define EFI_ALLOC_ALIGN SZ_64K /* diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c index 33a6da1..78f5248 100644 --- a/arch/arm64/kernel/efi.c +++ b/arch/arm64/kernel/efi.c @@ -56,6 +56,9 @@ static __init pteval_t create_mapping_protection(efi_memory_desc_t *md) return pgprot_val(PAGE_KERNEL_EXEC); } +/* we will fill this structure from the stub, so don't put it in .bss */ +struct screen_info screen_info __section(.data); + int __init efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md) { pteval_t prot_val = create_mapping_protection(md); diff --git a/arch/arm64/kernel/image.h b/arch/arm64/kernel/image.h index 5e360ce..1428849a 100644 --- a/arch/arm64/kernel/image.h +++ b/arch/arm64/kernel/image.h @@ -112,6 +112,7 @@ __efistub___memset = KALLSYMS_HIDE(__pi_memset); __efistub__text = KALLSYMS_HIDE(_text); __efistub__end = KALLSYMS_HIDE(_end); __efistub__edata = KALLSYMS_HIDE(_edata); +__efistub_screen_info = KALLSYMS_HIDE(screen_info); #endif