Han Gao via B4 Relay <[email protected]> writes: Hello Han Gao,
> From: Han Gao <[email protected]> > > With SYSFB_SIMPLEFB, sysfb registers a simple-framebuffer device that > claims the framebuffer memory when it is added. On DT systems, the PCI > host bridge may probe later and then fails to claim its memory window. > On QEMU RISC-V virt with EDK2, a bochs-display and pci-host-generic > built as a module: > > [ 0.703813] pci-host-generic 30000000.pci: resource collision: [mem > 0x40000000-0x7fffffff] conflicts with BOOTFB [mem 0x40000000-0x403e7fff] > > In that case, register an efi-framebuffer device instead. It claims no > memory before it probes, and commit 64c8a0cd0a53 ("efi/arm: Defer probe > of PCIe backed efifb on DT systems") makes it wait for the host bridge. > I think this is a workaround and it just works because sysfb does not add a resource (using the platform_device_add_resources() helper) when adding the platform data for the device. > Tested on a HiFive Unmatched with EDK2 and a PCIe graphics card, and on > QEMU. > > Fixes: 8633ef82f101 ("drivers/firmware: consolidate EFI framebuffer setup for > all arches") > Cc: [email protected] > Signed-off-by: Han Gao <[email protected]> > --- > In QEMU, efifb takes over with SYSFB_SIMPLEFB and efidrm without it. > With pci-host-generic built in, simpledrm is still used. > --- > drivers/firmware/efi/sysfb_efi.c | 16 ++++++++++++++++ > drivers/firmware/sysfb.c | 8 +++++++- > include/linux/sysfb.h | 6 ++++++ > 3 files changed, 29 insertions(+), 1 deletion(-) > > diff --git a/drivers/firmware/efi/sysfb_efi.c > b/drivers/firmware/efi/sysfb_efi.c > index 2338de73c62c..5c2cb87178ff 100644 > --- a/drivers/firmware/efi/sysfb_efi.c > +++ b/drivers/firmware/efi/sysfb_efi.c > @@ -421,6 +421,22 @@ __init void sysfb_apply_efi_quirks(struct screen_info > *si) > dmi_check_system(efifb_dmi_swap_width_height); > } > > +/* Returns true if the EFI framebuffer is in a DT PCI host bridge window */ > +__init bool sysfb_efifb_behind_dt_pci(const struct screen_info *si) > +{ > + struct device_node *np; > + > + if (si->orig_video_isVGA != VIDEO_TYPE_EFI || !IS_ENABLED(CONFIG_PCI)) > + return false; > + > + np = find_pci_overlap_node(); > + if (!np) > + return false; > + > + of_node_put(np); > + return true; > +} > + I don't think this that much. I feel that is adding DT + PCI logic that is platform specific. Instead, maybe what can be done instead is make the sysfb logic consistent between "efi-framebuffer" and "simple-framebuffer" platform data setup. That is, not add a IORESOURCE_MEM to prevent platform_device_add() to add it to the global memory resource list. Instead, the framebuffer address + size could be passed to the simpledrm driver through the simplefb_platform_data. The simpledrm driver then could claim the memory at probe time, which is what efidrm does as well. -- Best regards, Javier Martinez Canillas Core Platforms Red Hat
