* Patch by Thomas Frieden, 13 Nov 2002:

  Add code for AmigaOne board
  (preliminary merge to U-Boot, still WIP)

* Patch by Jon Diekema, 12 Nov 2002:
  - Adding URL for IEEE OUI lookup
  - Making the autoboot #defines dependent on CONFIG_AUTOBOOT_KEYED
    being defined.
  - In the CONFIG_EXTRA_ENV_SETTINGS #define, the root-on-initrd and
    root-on-nfs macros are designed to switch how the default boot
    method gets defined.

2 files changed, 36 insertions, 13 deletions

diff --git a/drivers/pci.c b/drivers/pci.c
index 52584ce62b..dc58abfe48 100644
--- a/drivers/pci.c
+++ b/drivers/pci.c
@@ -421,8 +421,11 @@ void pci_cfgfunc_do_nothing(struct pci_controller *hose,
  *
  */
 
+/* HJF: Changed this to return int. I think this is required
+ * to get the correct result when scanning bridges
+ */
+extern int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev);
 extern void pciauto_config_init(struct pci_controller *hose);
-extern void pciauto_config_device(struct pci_controller *hose, pci_dev_t dev);
 
 int pci_hose_scan_bus(struct pci_controller *hose, int bus)
 {
@@ -451,8 +454,7 @@ int pci_hose_scan_bus(struct pci_controller *hose, int bus)
 
 		pci_hose_read_config_word(hose, dev, PCI_VENDOR_ID, &vendor);
 
-		if (vendor != 0xffff && vendor != 0x0000)
-		{
+		if (vendor != 0xffff && vendor != 0x0000) {
 
 			if (!PCI_FUNC(dev))
 				found_multi = header_type & 0x80;
@@ -465,12 +467,15 @@ int pci_hose_scan_bus(struct pci_controller *hose, int bus)
 
 			cfg = pci_find_config(hose, class, vendor, device,
 					      PCI_BUS(dev), PCI_DEV(dev), PCI_FUNC(dev));
-			if (cfg)
+			if (cfg) {
 				cfg->config_device(hose, dev, cfg);
 #ifdef CONFIG_PCI_PNP
-			else
-				pciauto_config_device(hose, dev);
+			} else {
+				int n = pciauto_config_device(hose, dev);
+
+				sub_bus = max(sub_bus, n);
 #endif
+			}
 			if (hose->fixup_irq)
 				hose->fixup_irq(hose, dev);
 
diff --git a/drivers/pci_auto.c b/drivers/pci_auto.c
index f665ee6fec..295f7c848d 100644
--- a/drivers/pci_auto.c
+++ b/drivers/pci_auto.c
@@ -277,11 +277,15 @@ void pciauto_config_init(struct pci_controller *hose)
 	}
 }
 
-void pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
+/* HJF: Changed this to return int. I think this is required
+ * to get the correct result when scanning bridges
+ */
+int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
 {
-	unsigned int sub_bus;
+	unsigned int sub_bus = PCI_BUS(dev);
 	unsigned short class;
 	unsigned char prg_iface;
+	int n;
 
 	pci_hose_read_config_word(hose, dev, PCI_CLASS_DEVICE, &class);
 
@@ -290,13 +294,25 @@ void pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
 	case PCI_CLASS_BRIDGE_PCI:
 		pciauto_setup_device(hose, dev, 2, hose->pci_mem, hose->pci_io);
 
-		DEBUGF("PCI Autoconfig: Found P2P bridge, device %d\n", PCI_DEV(dev));
+		DEBUGF("PCI Autoconfig: Found P2P bridge, device %d\n",
+			PCI_DEV(dev));
+
+		/* HJF: Make sure two bridges on the same bus
+		 * won't get the same bus number
+		 */
+		pciauto_prescan_setup_bridge(hose, dev,
+				max(sub_bus, hose->current_busno));
 
-		pciauto_prescan_setup_bridge(hose, dev, PCI_BUS(dev));
+		n = pci_hose_scan_bus(hose, hose->current_busno+1 /*PCI_BUS(dev)+1*/);
+		sub_bus = max(sub_bus, n);
+		sub_bus = max(sub_bus, hose->current_busno);
 
-		sub_bus = pci_hose_scan_bus(hose, PCI_BUS(dev)+1);
+		DEBUGF("PCI Autoconfig: Got %d from pci_hose_scan_bus\n",
+			sub_bus);
 
-		pciauto_postscan_setup_bridge(hose, dev, sub_bus);
+		pciauto_postscan_setup_bridge(hose, dev,
+				max(sub_bus, hose->current_busno));
+		hose->current_busno++;
 		break;
 
 	case PCI_CLASS_STORAGE_IDE:
@@ -304,7 +320,7 @@ void pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
 		if (!(prg_iface & PCIAUTO_IDE_MODE_MASK))
 			{
 				DEBUGF("PCI Autoconfig: Skipping legacy mode IDE controller\n");
-				return;
+				return sub_bus;
 			}
 
 		pciauto_setup_device(hose, dev, 6, hose->pci_mem, hose->pci_io);
@@ -314,6 +330,8 @@ void pciauto_config_device(struct pci_controller *hose, pci_dev_t dev)
 		pciauto_setup_device(hose, dev, 6, hose->pci_mem, hose->pci_io);
 		break;
 	}
+
+	return sub_bus;
 }
 
 #endif /* CONFIG_PCI */