Since some people disapprove of white space cleanups mixed in regular commits

[coreboot.git] / src / mainboard / tyan / s2885 / get_bus_conf.c

diff --git a/src/mainboard/tyan/s2885/get_bus_conf.c b/src/mainboard/tyan/s2885/get_bus_conf.c
index 5e8e0bd347ea64e89635709005d8bb2715d7bd58..a511afa3955ac2624ebacff3319fa849c07ae6f2 100644 (file)
--- a/src/mainboard/tyan/s2885/get_bus_conf.c
+++ b/src/mainboard/tyan/s2885/get_bus_conf.c
@@ -4,9 +4,11 @@
 #include <string.h>
 #include <stdint.h>
 #if CONFIG_LOGICAL_CPUS==1
-#include <cpu/amd/dualcore.h>
+#include <cpu/amd/multicore.h>
 #endif
 
+#include <cpu/amd/amdk8_sysconf.h>
+#include <stdlib.h>
 
 // Global variables for MB layouts and these will be shared by irqtable mptable and acpi_tables
 //busnum is default
@@ -22,8 +24,7 @@ unsigned apicid_8111 ;
 unsigned apicid_8131_1;
 unsigned apicid_8131_2;
 
-unsigned sblk;
-unsigned pci1234[] = 
+unsigned pci1234x[] =
 {        //Here you only need to set value in pci1234 for HT-IO that could be installed or not
         //You may need to preset pci1234 for HTIO board, please refer to src/northbridge/amd/amdk8/get_sblk_pci1234.c for detail
         0x0000ff0,
@@ -35,9 +36,7 @@ unsigned pci1234[] =
 //        0x0000ff0,
 //        0x0000ff0
 };
-unsigned hc_possible_num;
-unsigned sbdn;
-unsigned hcdn[] = 
+unsigned hcdnx[] =
 { //HT Chain device num, actually it is unit id base of every ht device in chain, assume every chain only have 4 ht device at most
        0x20202020,
        0x20202020,
@@ -51,7 +50,7 @@ unsigned hcdn[] =
 unsigned sbdn3;
 unsigned sbdn5;
 
-extern void get_sblk_pci1234(void);
+
 
 static unsigned get_bus_conf_done = 0;
 
@@ -61,68 +60,74 @@ void get_bus_conf(void)
        unsigned apicid_base;
 
         device_t dev;
+        int i;
+
+        if(get_bus_conf_done==1) return; //do it only once
+
+        get_bus_conf_done = 1;
 
-       if(get_bus_conf_done==1) return; //do it only once
+        sysconf.hc_possible_num = ARRAY_SIZE(pci1234x);
+        for(i=0;i<sysconf.hc_possible_num; i++) {
+                sysconf.pci1234[i] = pci1234x[i];
+                sysconf.hcdn[i] = hcdnx[i];
+        }
 
-       get_bus_conf_done = 1;
+        get_sblk_pci1234();
 
-       hc_possible_num = sizeof(pci1234)/sizeof(pci1234[0]);   
-       
-       get_sblk_pci1234();
-       
-       sbdn = (hcdn[0] >> 8) & 0xff;
-       sbdn3 = hcdn[0] & 0xff;
-       sbdn5 = hcdn[1] & 0xff;
+       sysconf.sbdn = (sysconf.hcdn[0] >> 8) & 0xff;
+       sbdn3 = sysconf.hcdn[0] & 0xff;
+       sbdn5 = sysconf.hcdn[1] & 0xff;
 
-       bus_8131_0 = (pci1234[0] >> 16) & 0xff;
+       bus_8131_0 = (sysconf.pci1234[0] >> 16) & 0xff;
        bus_8111_0 = bus_8131_0;
 
                 /* 8111 */
-        dev = dev_find_slot(bus_8111_0, PCI_DEVFN(sbdn,0));
+        dev = dev_find_slot(bus_8111_0, PCI_DEVFN(sysconf.sbdn,0));
         if (dev) {
                 bus_8111_1 = pci_read_config8(dev, PCI_SECONDARY_BUS);
-#if HT_CHAIN_END_UNITID_BASE >= HT_CHAIN_UNITID_BASE
+#if CONFIG_HT_CHAIN_END_UNITID_BASE >= CONFIG_HT_CHAIN_UNITID_BASE
                 bus_isa    = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
                 bus_isa++;
-//             printk_debug("bus_isa=%d\n",bus_isa);
+//             printk(BIOS_DEBUG, "bus_isa=%d\n",bus_isa);
 #endif
         }
        else {
-                printk_debug("ERROR - could not find PCI %02x:03.0, using defaults\n", bus_8111_0);
+                printk(BIOS_DEBUG, "ERROR - could not find PCI %02x:03.0, using defaults\n", bus_8111_0);
         }
 
         /* 8131-1 */
         dev = dev_find_slot(bus_8131_0, PCI_DEVFN(sbdn3,0));
         if (dev) {
                 bus_8131_1 = pci_read_config8(dev, PCI_SECONDARY_BUS);
-#if HT_CHAIN_END_UNITID_BASE < HT_CHAIN_UNITID_BASE
-                bus_isa    = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
-                bus_isa++;
-//              printk_debug("bus_isa=%d\n",bus_isa);
-#endif
         }
         else {
-                printk_debug("ERROR - could not find PCI %02x:01.0, using defaults\n", bus_8131_0);
+                printk(BIOS_DEBUG, "ERROR - could not find PCI %02x:01.0, using defaults\n", bus_8131_0);
         }
 
         /* 8132-2 */
         dev = dev_find_slot(bus_8131_0, PCI_DEVFN(sbdn3+1,0));
         if (dev) {
                 bus_8131_2 = pci_read_config8(dev, PCI_SECONDARY_BUS);
+#if CONFIG_HT_CHAIN_END_UNITID_BASE < CONFIG_HT_CHAIN_UNITID_BASE
+                bus_isa    = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
+                bus_isa++;
+//              printk(BIOS_DEBUG, "bus_isa=%d\n",bus_isa);
+#endif
+
         }
         else {
-                printk_debug("ERROR - could not find PCI %02x:02.0, using defaults\n", bus_8131_0);
+                printk(BIOS_DEBUG, "ERROR - could not find PCI %02x:02.0, using defaults\n", bus_8131_0);
         }
 
         /* HT chain 1 */
        // it is on node0, so it must be there
-       bus_8151_0 = (pci1234[1] >> 16) & 0xff;
+       bus_8151_0 = (sysconf.pci1234[1] >> 16) & 0xff;
         /* 8151 */
        dev = dev_find_slot(bus_8151_0, PCI_DEVFN(sbdn5+1, 0));
 
         if (dev) {
                bus_8151_1 = pci_read_config8(dev, PCI_SECONDARY_BUS);
-//              printk_debug("bus_8151_1=%d\n",bus_8151_1);
+//              printk(BIOS_DEBUG, "bus_8151_1=%d\n",bus_8151_1);
                 bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
                        bus_isa++;
                }
@@ -130,8 +135,8 @@ void get_bus_conf(void)
 /*I/O APICs:   APIC ID Version State           Address*/
 #if CONFIG_LOGICAL_CPUS==1
        apicid_base = get_apicid_base(3);
-#else 
-       apicid_base = CONFIG_MAX_PHYSICAL_CPUS; 
+#else
+       apicid_base = CONFIG_MAX_PHYSICAL_CPUS;
 #endif
        apicid_8111 = apicid_base+0;
        apicid_8131_1 = apicid_base+1;