Skip to content

Commit f2feeba

Browse files
committed
Merge: Fix passtrough of screen_info on zboot enabled ARM kernels
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/5631 Downstream backport of commit 732ea9d "efi: libstub: Move screen_info handling to common code", accidentally dropped passtrough of boot screen info from the first stage of the kernel (decompress code), to the kernel itself. On azure VMs, this causes the pci-hyperv driver to use MMIO reserved for framebuffer as PCI MMCONFIG window, and that doesn't work. pci-hyperv does have a special code to avoid this situation by querying the boot screen info, but since it wasn't passed through, it didn't work. JIRA: https://issues.redhat.com/browse/RHEL-60834 Tested: booted on D2ps v6 instance on azure with SRIOV-IOV enabled. Omitted-fix: ee8b8f5 ("efi/libstub: Zero initialize heap allocated struct screen_info") Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com> Approved-by: Vitaly Kuznetsov <vkuznets@redhat.com> Approved-by: Mark Langsdorf <mlangsdo@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Rado Vrbovsky <rvrbovsk@redhat.com>
2 parents e72eca6 + 8dd5698 commit f2feeba

File tree

1 file changed

+3
-0
lines changed
  • drivers/firmware/efi

1 file changed

+3
-0
lines changed

drivers/firmware/efi/efi.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -606,6 +606,9 @@ static const efi_config_table_type_t common_tables[] __initconst = {
606606
#endif
607607
#ifdef CONFIG_UNACCEPTED_MEMORY
608608
{LINUX_EFI_UNACCEPTED_MEM_TABLE_GUID, &efi.unaccepted, "Unaccepted" },
609+
#endif
610+
#ifdef CONFIG_EFI_GENERIC_STUB
611+
{LINUX_EFI_SCREEN_INFO_TABLE_GUID, &screen_info_table },
609612
#endif
610613
{},
611614
};

0 commit comments

Comments
 (0)