PCI: Turn pci_fixup_video into generic for embedded VGA
PATCH 1/1 PCI: Turn pci_fixup_video into generic for embedded VGA
pci_fixup_video turns into generic code because there are many platforms need this fixup for embedded VGA as well as x86. The Video BIOS integrates into System BIOS on a machine has embedded VGA although embedded VGA generally don't have PCI ROM. As a result, embedded VGA need the way that the sysfs rom points to the Video BIOS of System RAM (0xC0000). PCI-to-PCI Bridge Architecture specification describes the condition whether or not PCI ROM forwards VGA compatible memory address. fixup_video suits this specification. Although the Video ROM generally implements in x86 code regardless of platform, some application such as X Window System can run this code by dosemu86. Therefore, pci_fixup_video should turn into generic code.
---
arch/i386/pci/fixup.c +0 -45
@@ -343,51 +343,6 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INDECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_MCH_PC1 , pcie_rootport_aspm_quirk );/* -* Fixup to mark boot BIOS video selected by BIOS before it changes -* -* From information provided by "Jon Smirl" <[email protected]> -* -* The standard boot ROM sequence for an x86 machine uses the BIOS -* to select an initial video card for boot display. This boot video -* card will have it's BIOS copied to C0000 in system RAM. -* IORESOURCE_ROM_SHADOW is used to associate the boot video -* card with this copy. On laptops this copy has to be used since -* the main ROM may be compressed or combined with another image. -* See pci_map_rom() for use of this flag. IORESOURCE_ROM_SHADOW -* is marked here since the boot video device will be the only enabled -* video device at this point. -*/ - -static void __devinit pci_fixup_video (struct pci_dev *pdev) -{ -struct pci_dev *bridge; -struct pci_bus *bus; -u16 config; - -if ((pdev->class >>8 ) !=PCI_CLASS_DISPLAY_VGA ) -return ; - -/* Is VGA routed to us? */ - bus = pdev->bus; -while (bus) { - bridge = bus->self; -if (bridge) { -pci_read_config_word (bridge,PCI_BRIDGE_CONTROL , - &config); -if (!(config &PCI_BRIDGE_CTL_VGA )) -return ; - } - bus = bus->parent; - } -pci_read_config_word (pdev,PCI_COMMAND , &config); -if (config & (PCI_COMMAND_IO |PCI_COMMAND_MEMORY )) { - pdev->resource[PCI_ROM_RESOURCE ].flags |=IORESOURCE_ROM_SHADOW ; -printk (KERN_DEBUG "Boot video device is %s\n" ,pci_name (pdev)); - } -} -DECLARE_PCI_FIXUP_HEADER (PCI_ANY_ID ,PCI_ANY_ID , pci_fixup_video); - -/* * Some Toshiba laptops need extra code to enable their TI TSB43AB22/A. * * We pretend to bring them out of full D3 state, and restore the proper
drivers/pci/quirks.c +45 -0
51 lines not on this page · raw message
drivers/pci/rom.c +4 -1
@@ -71,7 +71,10 @@ void __iomem *pci_map_rom(struct pci_devvoid __iomem *image;int last_image; -/* IORESOURCE_ROM_SHADOW only set on x86 */ +/* +* IORESOURCE_ROM_SHADOW set if the VGA enable bit of the Bridge Control +* register is set for embedded VGA. +*/ if (res->flags &IORESOURCE_ROM_SHADOW ) {/* primary video rom always starts here */ start = (loff_t )0xC0000 ;
Ar Iau, 2006-09-28 am 13:55 +0900, ysgrifennodd
[email protected]:
Quoted 11 lines
pci_fixup_videoturns into generic code because there are many platforms need this fixup for embedded VGA as well as x86. The Video BIOS integrates into System BIOS on a machine has embedded VGA although embedded VGA generally don't have PCI ROM. As a result, embedded VGA need the way that the sysfs rom points to the Video BIOS of System RAM (0xC0000). PCI-to-PCI Bridge Architecture specification describes the condition whether or not PCI ROM forwards VGA compatible memory address.fixup_videosuits this specification. Although the Video ROM generally implements in x86 code regardless of platform, some application such as X Window System can run this code by dosemu86. Therefore,pci_fixup_videoshould turn into generic code.
Quoted 1 line
Signed-off-by Eiichiro Oiwa <[email protected]>
Quoted 13 lines · On Wednesday, September 27, 2006 9:55 pm, [email protected] wrote:
pci_fixup_videoturns into generic code because there are many platforms need this fixup for embedded VGA as well as x86. The Video BIOS integrates into System BIOS on a machine has embedded VGA although embedded VGA generally don't have PCI ROM. As a result, embedded VGA need the way that the sysfs rom points to the Video BIOS of System RAM (0xC0000). PCI-to-PCI Bridge Architecture specification describes the condition whether or not PCI ROM forwards VGA compatible memory address.fixup_videosuits this specification. Although the Video ROM generally implements in x86 code regardless of platform, some application such as X Window System can run this code by dosemu86. Therefore,pci_fixup_videoshould turn into generic code.
Quoted 2 lines
Signed-off-by Eiichiro Oiwa <[email protected]>---
Thanks a lot, Eiichiro, this patch has been needed for awhile.
Jesse
Quoted 3 lines
Thanks a lot, Eiichiro, this patch has been needed for awhile.
Jesse
Thank you for advises.
I will close a following defect.
https://bugs.freedesktop.org/show_bug.cgi?id‚21
Thanks,
Eiichiro
Quoted 13 lines · Jesse Barnes
Quoted 11 lines · On Wednesday, September 27, 2006 9:55 pm, [email protected] wrote:
pci_fixup_videoturns into generic code because there are many platforms need this fixup for embedded VGA as well as x86. The Video BIOS integrates into System BIOS on a machine has embedded VGA although embedded VGA generally don't have PCI ROM. As a result, embedded VGA need the way that the sysfs rom points to the Video BIOS of System RAM (0xC0000). PCI-to-PCI Bridge Architecture specification describes the condition whether or not PCI ROM forwards VGA compatible memory address.fixup_videosuits this specification. Although the Video ROM generally implements in x86 code regardless of platform, some application such as X Window System can run this code by dosemu86. Therefore,pci_fixup_videoshould turn into generic code.
Quoted 2 lines
...
Thanks a lot, Eiichiro, this patch has been needed for awhile.
Are there really ia64 machines where we need to use the option ROM copy at 0xC0000? If so, is this documented somewhere? I couldn't find any mention in DIG64, EFI, or internal HP architecture specs.
If we do need to use it, ia64 has a bit of a problem because on some boxes, the 0xC0000 memory supports only cacheable access, the VGA frame buffer at 0xA0000 supports only uncacheable access, and the usual ia64 ioremap mapping is a 16MB page that covers both.
Bjorn
Quoted 8 lines · Bjorn Helgaas
Are there really ia64 machines where we need to use the option ROM copy at
0xC0000? If so, is this documented somewhere? I couldn't find any mention in DIG64, EFI, or internal HP architecture specs.If we do need to use it, ia64 has a bit of a problem because on some boxes, the
0xC0000memory supports only cacheable access, the VGA frame buffer at0xA0000supports only uncacheable access, and the usual ia64 ioremap mapping is a 16MB page that covers both.
Apparently Eichiro's machine needs it, and of course there are i386 and x86_64 machines that need it to, so it makes sense that it be generic.
Jesse
Quoted 10 lines · Bjorn Helgaas
Quoted 8 lines
Are there really ia64 machines where we need to use the option ROM copy at
0xC0000? If so, is this documented somewhere? I couldn't find any mention in DIG64, EFI, or internal HP architecture specs.If we do need to use it, ia64 has a bit of a problem because on some boxes, the
0xC0000memory supports only cacheable access, the VGA frame buffer at0xA0000supports only uncacheable access, and the usual ia64 ioremap mapping is a 16MB page that covers both.
Quoted 5 lines
Apparently Eichiro's machine needs it, and of course there are i386 and
x86_64machines that need it to, so it makes sense that it be generic.Jesse
Yes, our machine need it.
Quoted 3 lines
Quoted 3 lines
Are there really ia64 machines where we need to use the option ROM copy at
0xC0000? If so, is this documented somewhere? I couldn't find any mention in DIG64, EFI, or internal HP architecture specs.
"System Abstraction Layer Specification" describes it in section 2.6.
Eiichiro