don't use them for peer pci root bus resource yet. so could cross check _CRS results
Signed-off-by: Yinghai Lu <[email protected]> --- arch/x86/pci/intel_bus.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) Index: linux-2.6/arch/x86/pci/intel_bus.c =================================================================== --- linux-2.6.orig/arch/x86/pci/intel_bus.c +++ linux-2.6/arch/x86/pci/intel_bus.c @@ -43,7 +43,7 @@ static void __devinit pci_root_bus_res(s { u16 word; u32 dword; - struct pci_root_info *info; + struct pci_root_info info; u16 io_base, io_end; u32 mmiol_base, mmiol_end; u64 mmioh_base, mmioh_end; @@ -53,30 +53,22 @@ static void __devinit pci_root_bus_res(s if (dev->cfg_size < 0x120) return; - if (pci_root_num >= PCI_ROOT_NR) { - printk(KERN_DEBUG "intel_bus.c: PCI_ROOT_NR is too small\n"); - return; - } - - info = &pci_root_info[pci_root_num]; - pci_root_num++; - pci_read_config_word(dev, IOH_LCFGBUS, &word); bus_base = (word & 0xff); bus_end = (word & 0xff00) >> 8; - sprintf(info->name, "PCI Bus #%02x", bus_base); - info->bus_min = bus_base; - info->bus_max = bus_end; + sprintf(info.name, "PCI Bus #%02x", bus_base); + info.bus_min = bus_base; + info.bus_max = bus_end; pci_read_config_word(dev, IOH_LIO, &word); io_base = (word & 0xf0) << (12 - 4); io_end = (word & 0xf000) | 0xfff; - update_res(info, io_base, io_end, IORESOURCE_IO, 0); + update_res(&info, io_base, io_end, IORESOURCE_IO, 0); pci_read_config_dword(dev, IOH_LMMIOL, &dword); mmiol_base = (dword & 0xff00) << (24 - 8); mmiol_end = (dword & 0xff000000) | 0xffffff; - update_res(info, mmiol_base, mmiol_end, IORESOURCE_MEM, 0); + update_res(&info, mmiol_base, mmiol_end, IORESOURCE_MEM, 0); pci_read_config_dword(dev, IOH_LMMIOH, &dword); mmioh_base = ((u64)(dword & 0xfc00)) << (26 - 10); @@ -85,9 +77,9 @@ static void __devinit pci_root_bus_res(s mmioh_base |= ((u64)(dword & 0x7ffff)) << 32; pci_read_config_dword(dev, IOH_LMMIOH_LIMITU, &dword); mmioh_end |= ((u64)(dword & 0x7ffff)) << 32; - update_res(info, mmioh_base, mmioh_end, IORESOURCE_MEM, 0); + update_res(&info, mmioh_base, mmioh_end, IORESOURCE_MEM, 0); - print_ioh_resources(info); + print_ioh_resources(&info); } /* intel IOH */ -- To unsubscribe from this list: send the line "unsubscribe kernel-testers" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
