Re: [PATCH] efi: avoid error message when booting under Xen

From: JÃrgen GroÃ
Date: Thu Jul 09 2020 - 05:17:49 EST


On 28.06.20 10:50, JÃrgen Groà wrote:
Ping?

On 10.06.20 16:10, Juergen Gross wrote:
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_PARAVIRT
isn't set.

Fixes: 38ac0287b7f4 ("fbdev/efifb: Honour UEFI memory map attributes when mapping the FB")
Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
---
 drivers/video/fbdev/efifb.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c
index 65491ae74808..f5eccd1373e9 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_BOOT) && !efi_enabled(EFI_PARAVIRT) &&
ÂÂÂÂÂÂÂÂÂ !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))) {



In case I see no reaction from the maintainer for another week I'll take
this patch through the Xen tree.


Juergen