From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754747AbdHZIFJ (ORCPT ); Sat, 26 Aug 2017 04:05:09 -0400 Received: from terminus.zytor.com ([65.50.211.136]:42469 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752153AbdHZIEt (ORCPT ); Sat, 26 Aug 2017 04:04:49 -0400 Date: Sat, 26 Aug 2017 00:59:40 -0700 From: tip-bot for Jan Beulich Message-ID: Cc: JBeulich@suse.com, hpa@zytor.com, tglx@linutronix.de, peterz@infradead.org, jbeulich@suse.com, ard.biesheuvel@linaro.org, mingo@kernel.org, linux-kernel@vger.kernel.org, matt@codeblueprint.co.uk, torvalds@linux-foundation.org Reply-To: JBeulich@suse.com, hpa@zytor.com, peterz@infradead.org, tglx@linutronix.de, jbeulich@suse.com, ard.biesheuvel@linaro.org, mingo@kernel.org, linux-kernel@vger.kernel.org, matt@codeblueprint.co.uk, torvalds@linux-foundation.org In-Reply-To: <20170825155019.6740-6-ard.biesheuvel@linaro.org> References: <20170825155019.6740-6-ard.biesheuvel@linaro.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:efi/core] efi/bgrt: Use efi_mem_type() Git-Commit-ID: 6de47a5e371f75f80544986e6c9636211a2ae8af 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: 6de47a5e371f75f80544986e6c9636211a2ae8af Gitweb: http://git.kernel.org/tip/6de47a5e371f75f80544986e6c9636211a2ae8af Author: Jan Beulich AuthorDate: Fri, 25 Aug 2017 16:50:19 +0100 Committer: Ingo Molnar CommitDate: Sat, 26 Aug 2017 09:20:33 +0200 efi/bgrt: Use efi_mem_type() Avoid effectively open-coding the function. Signed-off-by: Jan Beulich Signed-off-by: Ard Biesheuvel Cc: Jan Beulich Cc: Linus Torvalds Cc: Matt Fleming Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/20170825155019.6740-6-ard.biesheuvel@linaro.org Signed-off-by: Ingo Molnar --- drivers/firmware/efi/efi-bgrt.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/drivers/firmware/efi/efi-bgrt.c b/drivers/firmware/efi/efi-bgrt.c index b58233e..50793fd 100644 --- a/drivers/firmware/efi/efi-bgrt.c +++ b/drivers/firmware/efi/efi-bgrt.c @@ -27,26 +27,6 @@ struct bmp_header { u32 size; } __packed; -static bool efi_bgrt_addr_valid(u64 addr) -{ - efi_memory_desc_t *md; - - for_each_efi_memory_desc(md) { - u64 size; - u64 end; - - if (md->type != EFI_BOOT_SERVICES_DATA) - continue; - - size = md->num_pages << EFI_PAGE_SHIFT; - end = md->phys_addr + size; - if (addr >= md->phys_addr && addr < end) - return true; - } - - return false; -} - void __init efi_bgrt_init(struct acpi_table_header *table) { void *image; @@ -85,7 +65,7 @@ void __init efi_bgrt_init(struct acpi_table_header *table) goto out; } - if (!efi_bgrt_addr_valid(bgrt->image_address)) { + if (efi_mem_type(bgrt->image_address) != EFI_BOOT_SERVICES_DATA) { pr_notice("Ignoring BGRT: invalid image address\n"); goto out; }