efi: avoid error message when booting under Xen
Subsystems (3)
PATCH v2 1/1 efi: avoid error message when booting under Xen
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.
--- drivers/video/fbdev/efifb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/video/fbdev/efifb.c +1 -1
@@ -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 ))) {
Signature · 1 line
2.26.2
Quoted 7 lines · Juergen Gross
efifb_probe()will issue an error message in case the kernel is booted as Xen dom0 from UEFI asEFI_MEMMAPwon't be set in this case. Avoid that message by callingefi_mem_desc_lookup()only ifEFI_MEMMAPis set.Fixes 38ac0287b7f4 ("fbdev/efifb: Honour UEFI memory map attributes when mapping the FB")Signed-off-by Juergen Gross <[email protected]>
Quoted 20 lines
--- drivers/video/fbdev/efifb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/video/fbdev/efifb.c +1
-2@@ -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 ))) { --2.26.2
Quoted 6 lines · Juergen Gross
efifb_probe()will issue an error message in case the kernel is booted as Xen dom0 from UEFI asEFI_MEMMAPwon't be set in this case. Avoid that message by callingefi_mem_desc_lookup()only ifEFI_MEMMAPis set.Fixes 38ac0287b7f4 ("fbdev/efifb: Honour UEFI memory map attributes when mapping the FB")Signed-off-by Juergen Gross <[email protected]>
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
Quoted 18 lines
--- drivers/video/fbdev/efifb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/video/fbdev/efifb.c +1
-1@@ -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 ))) {