Skip to content

Commit

Permalink
efi/bgrt: Use efi_mem_type()
Browse files Browse the repository at this point in the history
Avoid effectively open-coding the function.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Jan Beulich <JBeulich@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/20170825155019.6740-6-ard.biesheuvel@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
  • Loading branch information
Jan Beulich authored and Ingo Molnar committed Aug 26, 2017
1 parent 23f0571 commit 6de47a5
Showing 1 changed file with 1 addition and 21 deletions.
22 changes: 1 addition & 21 deletions drivers/firmware/efi/efi-bgrt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 6de47a5

Please sign in to comment.