V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Revert "pci: Add CONFIG_PCI_SKIP_HOST_BRIDGE config option" 

This reverts commit 55774b512f
which broke many PowerPC boards.
This commit is contained in:
Wolfgang Denk 2008-05-12 01:11:21 +02:00
parent 5ddd67efa5
commit 65dcfa7920
1 changed files with 3 additions and 10 deletions
drivers/pci
pci.c

13
drivers/pci/pci.c
View File

@ -425,9 +425,6 @@ int pci_hose_scan_bus(struct pci_controller *hose, int bus)
dev < PCI_BDF(bus,PCI_MAX_PCI_DEVICES-1,PCI_MAX_PCI_FUNCTIONS-1); dev < PCI_BDF(bus,PCI_MAX_PCI_DEVICES-1,PCI_MAX_PCI_FUNCTIONS-1);
dev += PCI_BDF(0,0,1)) dev += PCI_BDF(0,0,1))
{ {
/* Bus 0 is not necessarily PCI bridge. */
#if defined(CONFIG_PCI_SKIP_HOST_BRIDGE)
/* Skip our host bridge */ /* Skip our host bridge */
if ( dev == PCI_BDF(hose->first_busno,0,0) ) { if ( dev == PCI_BDF(hose->first_busno,0,0) ) {
#if defined(CONFIG_PCI_CONFIG_HOST_BRIDGE) /* don't skip host bridge */ #if defined(CONFIG_PCI_CONFIG_HOST_BRIDGE) /* don't skip host bridge */
@ -437,11 +434,10 @@ int pci_hose_scan_bus(struct pci_controller *hose, int bus)
if (getenv("pciconfighost") == NULL) { if (getenv("pciconfighost") == NULL) {
continue; /* Skip our host bridge */ continue; /* Skip our host bridge */
} }
#else /* CONFIG_PCI_CONFIG_HOST_BRIDGE */ #else
continue; /* Skip our host bridge */ continue; /* Skip our host bridge */
#endif /* CONFIG_PCI_CONFIG_HOST_BRIDGE */ #endif
} }
#endif /* CONFIG_PCI_SKIP_HOST_BRIDGE */
if (PCI_FUNC(dev) && !found_multi) if (PCI_FUNC(dev) && !found_multi)
continue; continue;
@ -477,11 +473,8 @@ int pci_hose_scan_bus(struct pci_controller *hose, int bus)
hose->fixup_irq(hose, dev); hose->fixup_irq(hose, dev);
#ifdef CONFIG_PCI_SCAN_SHOW #ifdef CONFIG_PCI_SCAN_SHOW
#if defined(CONFIG_PCI_SKIP_HOST_BRIDGE)
/* Skip our host bridge */ /* Skip our host bridge */
if ( dev != PCI_BDF(hose->first_busno,0,0) ) if ( dev != PCI_BDF(hose->first_busno,0,0) ) {
#endif
{
unsigned char int_line; unsigned char int_line;
pci_hose_read_config_byte(hose, dev, PCI_INTERRUPT_LINE, pci_hose_read_config_byte(hose, dev, PCI_INTERRUPT_LINE,