From: Isaku Yamahata Date: Tue, 22 Jun 2010 08:57:51 +0000 (+0900) Subject: seabios: pciinit: make bar offset calculation pci bridge aware. X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=5d0de15ad76a07042daa368b4731d9cb87b07b24;p=seabios.git seabios: pciinit: make bar offset calculation pci bridge aware. This patch makes pci bar offset calculation pci bridge aware. The offset of pci bridge rom is different from normal device. Signed-off-by: Isaku Yamahata --- diff --git a/src/pciinit.c b/src/pciinit.c index 9109739..23b79bc 100644 --- a/src/pciinit.c +++ b/src/pciinit.c @@ -27,7 +27,11 @@ static u32 pci_bar(u16 bdf, int region_num) if (region_num != PCI_ROM_SLOT) { return PCI_BASE_ADDRESS_0 + region_num * 4; } - return PCI_ROM_ADDRESS; + +#define PCI_HEADER_TYPE_MULTI_FUNCTION 0x80 + u8 type = pci_config_readb(bdf, PCI_HEADER_TYPE); + type &= ~PCI_HEADER_TYPE_MULTI_FUNCTION; + return type == PCI_HEADER_TYPE_BRIDGE ? PCI_ROM_ADDRESS1 : PCI_ROM_ADDRESS; } static void pci_set_io_region_addr(u16 bdf, int region_num, u32 addr)