aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Gross <jgross@suse.com>2020-07-10 16:16:51 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-08-26 10:41:04 +0200
commit7cc9812be1c705d710281b26e46ca2f047dbb91a (patch)
tree1b8f4ef37cd5c0ea9f78ffdaf84eab59387bbe88
parentd3ca317cf62a6f41eaa78475eaaca1a647b462c9 (diff)
downloadlinux-yocto-7cc9812be1c705d710281b26e46ca2f047dbb91a.tar.gz
linux-yocto-7cc9812be1c705d710281b26e46ca2f047dbb91a.tar.bz2
linux-yocto-7cc9812be1c705d710281b26e46ca2f047dbb91a.zip
efi: avoid error message when booting under Xen
[ Upstream commit 6163a985e50cb19d5bdf73f98e45b8af91a77658 ] efifb_probe() will issue an error message in case the kernel is booted as Xen dom0 from UEFI as EFI_MEMMAP won't be set in this case. Avoid that message by calling efi_mem_desc_lookup() only if EFI_MEMMAP is set. Fixes: 38ac0287b7f4 ("fbdev/efifb: Honour UEFI memory map attributes when mapping the FB") Signed-off-by: Juergen Gross <jgross@suse.com> Acked-by: Ard Biesheuvel <ardb@kernel.org> Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> Signed-off-by: Juergen Gross <jgross@suse.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/video/fbdev/efifb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c
index 51d97ec4f58f..e0cbf5b3d217 100644
--- a/drivers/video/fbdev/efifb.c
+++ b/drivers/video/fbdev/efifb.c
@@ -453,7 +453,7 @@ static int efifb_probe(struct platform_device *dev)
info->apertures->ranges[0].base = efifb_fix.smem_start;
info->apertures->ranges[0].size = size_remap;
- if (efi_enabled(EFI_BOOT) &&
+ if (efi_enabled(EFI_MEMMAP) &&
!efi_mem_desc_lookup(efifb_fix.smem_start, &md)) {
if ((efifb_fix.smem_start + efifb_fix.smem_len) >
(md.phys_addr + (md.num_pages << EFI_PAGE_SHIFT))) {