Drop dead K8_SCAN_PCI_BUS code. It's a bad idea to scan the PCI busses before

RAM is initialized, and no one does it.  Trivial.

Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4830 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

17 files changed, 0 insertions, 161 deletions

diff --git a/src/mainboard/amd/serengeti_cheetah/cache_as_ram_auto.c b/src/mainboard/amd/serengeti_cheetah/cache_as_ram_auto.c
index b39ae1ed34..a3e2b164a5 100644
--- a/src/mainboard/amd/serengeti_cheetah/cache_as_ram_auto.c
+++ b/src/mainboard/amd/serengeti_cheetah/cache_as_ram_auto.c
@@ -10,10 +10,8 @@
 #define QRANK_DIMM_SUPPORT 1
 
 //used by incoherent_ht
-//#define K8_SCAN_PCI_BUS 1
 //#define K8_ALLOCATE_IO_RANGE 1
 
-
 //used by init_cpus and fidvid
 #define K8_SET_FIDVID 0
 //if we want to wait for core1 done before DQS training, set it to 0
diff --git a/src/mainboard/broadcom/blast/cache_as_ram_auto.c b/src/mainboard/broadcom/blast/cache_as_ram_auto.c
index 5ac6f4be9f..3b94d3fd32 100644
--- a/src/mainboard/broadcom/blast/cache_as_ram_auto.c
+++ b/src/mainboard/broadcom/blast/cache_as_ram_auto.c
@@ -1,9 +1,6 @@
 #define ASSEMBLY 1
 #define __ROMCC__
 
-
-//#define K8_SCAN_PCI_BUS 1
-
 #define QRANK_DIMM_SUPPORT 1
 
 #if CONFIG_LOGICAL_CPUS==1
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/cache_as_ram_auto.c b/src/mainboard/gigabyte/ga_2761gxdk/cache_as_ram_auto.c
index e81dc4c210..056cd08331 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/cache_as_ram_auto.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/cache_as_ram_auto.c
@@ -27,8 +27,6 @@
 #define RAMINIT_SYSINFO 1
 
 #define K8_ALLOCATE_IO_RANGE 1
-//#define K8_SCAN_PCI_BUS 1
-
 
 #define QRANK_DIMM_SUPPORT 1
 
diff --git a/src/mainboard/gigabyte/m57sli/cache_as_ram_auto.c b/src/mainboard/gigabyte/m57sli/cache_as_ram_auto.c
index 812878892a..26e5ee985e 100644
--- a/src/mainboard/gigabyte/m57sli/cache_as_ram_auto.c
+++ b/src/mainboard/gigabyte/m57sli/cache_as_ram_auto.c
@@ -25,8 +25,6 @@
 #define RAMINIT_SYSINFO 1
 
 #define K8_ALLOCATE_IO_RANGE 1
-//#define K8_SCAN_PCI_BUS 1
-
 
 #define QRANK_DIMM_SUPPORT 1
 
diff --git a/src/mainboard/hp/dl145_g3/cache_as_ram_auto.c b/src/mainboard/hp/dl145_g3/cache_as_ram_auto.c
index f786d9fdec..0f54f46af2 100644
--- a/src/mainboard/hp/dl145_g3/cache_as_ram_auto.c
+++ b/src/mainboard/hp/dl145_g3/cache_as_ram_auto.c
@@ -31,7 +31,6 @@
 #define RAMINIT_SYSINFO 1
 
 #define K8_ALLOCATE_IO_RANGE 1
-//#define K8_SCAN_PCI_BUS 1
 
 #define QRANK_DIMM_SUPPORT 1
 
diff --git a/src/mainboard/iwill/dk8_htx/cache_as_ram_auto.c b/src/mainboard/iwill/dk8_htx/cache_as_ram_auto.c
index f4213c1ec3..76e56f80a4 100644
--- a/src/mainboard/iwill/dk8_htx/cache_as_ram_auto.c
+++ b/src/mainboard/iwill/dk8_htx/cache_as_ram_auto.c
@@ -10,10 +10,8 @@
 #define QRANK_DIMM_SUPPORT 1
 
 //used by incoherent_ht
-//#define K8_SCAN_PCI_BUS 1
 //#define K8_ALLOCATE_IO_RANGE 1
 
-
 //used by init_cpus and fidvid
 #define K8_SET_FIDVID 0
 //if we want to wait for core1 done before DQS training, set it to 0
diff --git a/src/mainboard/iwill/dk8s2/cache_as_ram_auto.c b/src/mainboard/iwill/dk8s2/cache_as_ram_auto.c
index e702d0e5fa..78b1de980d 100644
--- a/src/mainboard/iwill/dk8s2/cache_as_ram_auto.c
+++ b/src/mainboard/iwill/dk8s2/cache_as_ram_auto.c
@@ -10,10 +10,8 @@
 #define QRANK_DIMM_SUPPORT 1
 
 //used by incoherent_ht
-//#define K8_SCAN_PCI_BUS 1
 //#define K8_ALLOCATE_IO_RANGE 1
 
-
 //used by init_cpus and fidvid
 #define K8_SET_FIDVID 0
 //if we want to wait for core1 done before DQS training, set it to 0
diff --git a/src/mainboard/iwill/dk8x/cache_as_ram_auto.c b/src/mainboard/iwill/dk8x/cache_as_ram_auto.c
index e702d0e5fa..78b1de980d 100644
--- a/src/mainboard/iwill/dk8x/cache_as_ram_auto.c
+++ b/src/mainboard/iwill/dk8x/cache_as_ram_auto.c
@@ -10,10 +10,8 @@
 #define QRANK_DIMM_SUPPORT 1
 
 //used by incoherent_ht
-//#define K8_SCAN_PCI_BUS 1
 //#define K8_ALLOCATE_IO_RANGE 1
 
-
 //used by init_cpus and fidvid
 #define K8_SET_FIDVID 0
 //if we want to wait for core1 done before DQS training, set it to 0
diff --git a/src/mainboard/msi/ms7260/cache_as_ram_auto.c b/src/mainboard/msi/ms7260/cache_as_ram_auto.c
index 6458a65bde..ed84a426b2 100644
--- a/src/mainboard/msi/ms7260/cache_as_ram_auto.c
+++ b/src/mainboard/msi/ms7260/cache_as_ram_auto.c
@@ -31,7 +31,6 @@
 
 #define RAMINIT_SYSINFO 1
 #define K8_ALLOCATE_IO_RANGE 1
-// #define K8_SCAN_PCI_BUS 1		/* ? */
 #define QRANK_DIMM_SUPPORT 1
 #if CONFIG_LOGICAL_CPUS == 1
 #define SET_NB_CFG_54 1
diff --git a/src/mainboard/msi/ms9185/cache_as_ram_auto.c b/src/mainboard/msi/ms9185/cache_as_ram_auto.c
index b95d55a91a..95704b9791 100644
--- a/src/mainboard/msi/ms9185/cache_as_ram_auto.c
+++ b/src/mainboard/msi/ms9185/cache_as_ram_auto.c
@@ -35,10 +35,8 @@
 #define QRANK_DIMM_SUPPORT 1
 
 //used by incoherent_ht
-//#define K8_SCAN_PCI_BUS 1
 //#define K8_ALLOCATE_IO_RANGE 1
 
-
 //used by init_cpus and fidvid
 #define K8_SET_FIDVID 1
 //if we want to wait for core1 done before DQS training, set it to 0
diff --git a/src/mainboard/nvidia/l1_2pvv/cache_as_ram_auto.c b/src/mainboard/nvidia/l1_2pvv/cache_as_ram_auto.c
index 9962aefec6..04fa546f6a 100644
--- a/src/mainboard/nvidia/l1_2pvv/cache_as_ram_auto.c
+++ b/src/mainboard/nvidia/l1_2pvv/cache_as_ram_auto.c
@@ -25,8 +25,6 @@
 #define RAMINIT_SYSINFO 1
 
 #define K8_ALLOCATE_IO_RANGE 1
-//#define K8_SCAN_PCI_BUS 1
-
 
 #define QRANK_DIMM_SUPPORT 1
 
diff --git a/src/mainboard/sunw/ultra40/cache_as_ram_auto.c b/src/mainboard/sunw/ultra40/cache_as_ram_auto.c
index 18af542809..468e049750 100644
--- a/src/mainboard/sunw/ultra40/cache_as_ram_auto.c
+++ b/src/mainboard/sunw/ultra40/cache_as_ram_auto.c
@@ -3,8 +3,6 @@
 
 
 #define K8_ALLOCATE_IO_RANGE 1
-//#define K8_SCAN_PCI_BUS 1
-
 
 #define QRANK_DIMM_SUPPORT 1
 
diff --git a/src/mainboard/supermicro/h8dme/cache_as_ram_auto.c b/src/mainboard/supermicro/h8dme/cache_as_ram_auto.c
index 18435a61f2..151b2d0a4a 100644
--- a/src/mainboard/supermicro/h8dme/cache_as_ram_auto.c
+++ b/src/mainboard/supermicro/h8dme/cache_as_ram_auto.c
@@ -22,7 +22,6 @@
 #define RAMINIT_SYSINFO 1
 
 #define K8_ALLOCATE_IO_RANGE 1
-// #define K8_SCAN_PCI_BUS 1
 
 #define QRANK_DIMM_SUPPORT 1
 
diff --git a/src/mainboard/supermicro/h8dmr/cache_as_ram_auto.c b/src/mainboard/supermicro/h8dmr/cache_as_ram_auto.c
index 3a9b0ca375..672f551fa1 100644
--- a/src/mainboard/supermicro/h8dmr/cache_as_ram_auto.c
+++ b/src/mainboard/supermicro/h8dmr/cache_as_ram_auto.c
@@ -25,8 +25,6 @@
 #define RAMINIT_SYSINFO 1
 
 #define K8_ALLOCATE_IO_RANGE 1
-//#define K8_SCAN_PCI_BUS 1
-
 
 #define QRANK_DIMM_SUPPORT 1
 
diff --git a/src/mainboard/tyan/s2895/cache_as_ram_auto.c b/src/mainboard/tyan/s2895/cache_as_ram_auto.c
index 0e144eb29c..77bd04d330 100644
--- a/src/mainboard/tyan/s2895/cache_as_ram_auto.c
+++ b/src/mainboard/tyan/s2895/cache_as_ram_auto.c
@@ -2,7 +2,6 @@
 #define __ROMCC__
 
 #define K8_ALLOCATE_IO_RANGE 1
-//#define K8_SCAN_PCI_BUS 1
 
 #define QRANK_DIMM_SUPPORT 1
 
diff --git a/src/mainboard/tyan/s2912/cache_as_ram_auto.c b/src/mainboard/tyan/s2912/cache_as_ram_auto.c
index c27e74b2c1..8fb6473499 100644
--- a/src/mainboard/tyan/s2912/cache_as_ram_auto.c
+++ b/src/mainboard/tyan/s2912/cache_as_ram_auto.c
@@ -25,8 +25,6 @@
 #define RAMINIT_SYSINFO 1
 
 #define K8_ALLOCATE_IO_RANGE 1
-//#define K8_SCAN_PCI_BUS 1
-
 
 #define QRANK_DIMM_SUPPORT 1
 
diff --git a/src/northbridge/amd/amdk8/incoherent_ht.c b/src/northbridge/amd/amdk8/incoherent_ht.c
index 62d1a57357..4dc302b49d 100644
--- a/src/northbridge/amd/amdk8/incoherent_ht.c
+++ b/src/northbridge/amd/amdk8/incoherent_ht.c
@@ -15,10 +15,6 @@
 	#define RAMINIT_SYSINFO 0
 #endif
 
-#ifndef K8_SCAN_PCI_BUS
-	#define K8_SCAN_PCI_BUS 0
-#endif
-
 #ifndef K8_ALLOCATE_IO_RANGE
 	#define K8_ALLOCATE_IO_RANGE 0
 #endif
@@ -299,122 +295,6 @@ static int ht_optimize_link(
 	return needs_reset;
 }
 
-#if (CONFIG_USE_DCACHE_RAM == 1) && (K8_SCAN_PCI_BUS == 1)
-
-#if RAMINIT_SYSINFO == 1
-static void ht_setup_chainx(device_t udev, uint8_t upos, uint8_t bus, unsigned offset_unitid, struct sys_info *sysinfo);
-static int scan_pci_bus( unsigned bus , struct sys_info *sysinfo)
-#else
-static int ht_setup_chainx(device_t udev, uint8_t upos, uint8_t bus, unsigned offset_unitid);
-static int scan_pci_bus( unsigned bus)
-#endif
-{
-	/*
-		here we already can access PCI_DEV(bus, 0, 0) to PCI_DEV(bus, 0x1f, 0x7)
-		So We can scan these devices to find out if they are bridge
-		If it is pci bridge, We need to set busn in bridge, and go on
-		For ht bridge, We need to set the busn in bridge and ht_setup_chainx, and the scan_pci_bus
-	*/
-	unsigned int devfn;
-	unsigned new_bus;
-	unsigned max_bus;
-
-	new_bus = (bus & 0xff); // mask out the reset_needed
-
-	if(new_bus<0x40) {
-		max_bus = 0x3f;
-	} else if (new_bus<0x80) {
-		max_bus = 0x7f;
-	} else if (new_bus<0xc0) {
-		max_bus = 0xbf;
-	} else {
-		max_bus = 0xff;
-	}
-
-	new_bus = bus;
-
-	for (devfn = 0; devfn <= 0xff; devfn++) {
-		uint8_t hdr_type;
-		uint16_t class;
-		uint32_t buses;
-		device_t dev;
-		uint16_t cr;
-		dev = PCI_DEV((bus & 0xff), ((devfn>>3) & 0x1f), (devfn & 0x7));
-		hdr_type = pci_read_config8(dev, PCI_HEADER_TYPE);
-		class = pci_read_config16(dev, PCI_CLASS_DEVICE);
-
-		switch(hdr_type & 0x7f) {  /* header type */
-			case PCI_HEADER_TYPE_BRIDGE:
-				if (class  != PCI_CLASS_BRIDGE_PCI) goto bad;
-				/* set the bus range dev */
-
-				/* Clear all status bits and turn off memory, I/O and master enables. */
-				cr = pci_read_config16(dev, PCI_COMMAND);
-				pci_write_config16(dev, PCI_COMMAND, 0x0000);
-				pci_write_config16(dev, PCI_STATUS, 0xffff);
-
-				buses = pci_read_config32(dev, PCI_PRIMARY_BUS);
-
-				buses &= 0xff000000;
-				new_bus++;
-				buses |= (((unsigned int) (bus & 0xff) << 0) |
-					((unsigned int) (new_bus & 0xff) << 8) |
-					((unsigned int) max_bus << 16));
-				pci_write_config32(dev, PCI_PRIMARY_BUS, buses);
-
-				/* here we need to figure out if dev is a ht bridge
-					if it is ht bridge, we need to call ht_setup_chainx at first
-					Not verified --- yhlu
-				*/
-				uint8_t upos;
-				upos = ht_lookup_host_capability(dev); // one func one ht sub
-				if (upos) { // sub ht chain
-					uint8_t busn;
-					busn = (new_bus & 0xff);
-					/* Make certain the HT bus is not enumerated */
-					ht_collapse_previous_enumeration(busn, 0);
-					/* scan the ht chain */
-					#if RAMINIT_SYSINFO == 1
-					ht_setup_chainx(dev,upos,busn, 0, sysinfo); // don't need offset unitid
-					#else
-					new_bus |= (ht_setup_chainx(dev, upos, busn, 0)<<16); // store reset_needed to upword
-					#endif
-				}
-
-				#if RAMINIT_SYSINFO == 1
-				new_bus = scan_pci_bus(new_bus, sysinfo);
-				#else
-				new_bus = scan_pci_bus(new_bus);
-				#endif
-				/* set real max bus num in that */
-
-				buses = (buses & 0xff00ffff) |
-					((unsigned int) (new_bus & 0xff) << 16);
-				pci_write_config32(dev, PCI_PRIMARY_BUS, buses);
-
-				pci_write_config16(dev, PCI_COMMAND, cr);
-
-				break;
-			default:
-			bad:
-				;
-		}
-
-		/* if this is not a multi function device,
-		 * or the device is not present don't waste
-		 * time probing another function.
-		 * Skip to next device.
-		 */
-		if ( ((devfn & 0x07) == 0x00) && ((hdr_type & 0x80) != 0x80))
-		{
-			devfn += 0x07;
-		}
-	}
-
-	return new_bus;
-}
-#endif
-
 #if RAMINIT_SYSINFO == 1
 static void ht_setup_chainx(device_t udev, uint8_t upos, uint8_t bus, unsigned offset_unitid, struct sys_info *sysinfo)
 #else
@@ -777,9 +657,6 @@ static int ht_setup_chains(uint8_t ht_c_num)
 		unsigned regpos;
 		uint32_t dword;
 		uint8_t busn;
-		#if (CONFIG_USE_DCACHE_RAM == 1) && (K8_SCAN_PCI_BUS == 1)
-		unsigned bus;
-		#endif
 		unsigned offset_unitid = 0;
 
 		reg = pci_read_config32(PCI_DEV(0,0x18,1), 0xe0 + i * 4);
@@ -814,15 +691,6 @@ static int ht_setup_chains(uint8_t ht_c_num)
 		reset_needed |= ht_setup_chainx(udev,upos,busn, offset_unitid); //all not
 #endif
 
-		#if (CONFIG_USE_DCACHE_RAM == 1) && (K8_SCAN_PCI_BUS == 1)
-		/* You can use use this in romcc, because there is function call in romcc, recursive will kill you */
-		bus = busn; // we need 32 bit
-#if RAMINIT_SYSINFO == 1
-		scan_pci_bus(bus, sysinfo);
-#else
-		reset_needed |= (scan_pci_bus(bus)>>16); // take out reset_needed that stored in upword
-#endif
-		#endif
 	}
 
 #if RAMINIT_SYSINFO == 0