printk_foo -> printk(BIOS_FOO, ...)
[coreboot.git] / src / mainboard / tyan / s2892 / get_bus_conf.c
index 6086aa5ff58116985a322609c836737fe3b50fd1..1a91b058229b315f8608a78350aba96d644cf791 100644 (file)
@@ -7,6 +7,8 @@
 #include <cpu/amd/dualcore.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
@@ -24,8 +26,7 @@
         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,
@@ -37,9 +38,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,
@@ -61,75 +60,45 @@ void get_bus_conf(void)
 {
 
        unsigned apicid_base;
+       unsigned sbdn;
 
         device_t dev;
+        int i;
 
-       if(get_bus_conf_done==1) return; //do it only once
+        if(get_bus_conf_done==1) return; //do it only once
 
-       get_bus_conf_done = 1;
+        get_bus_conf_done = 1;
 
-       hc_possible_num = sizeof(pci1234)/sizeof(pci1234[0]);   
-       
-       get_sblk_pci1234();
-       
-       sbdn = (hcdn[0] & 0xff); // first byte of first chain
+        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];
+        }
 
-       sbdn3 = (hcdn[1] & 0xff); // first byte of second chain
+        get_sblk_pci1234();
 
-//     bus_ck804_0 = node_link_to_bus(0, sblk);
-       bus_ck804_0 = (pci1234[0] >> 16) & 0xff;
+       sysconf.sbdn = (sysconf.hcdn[0] & 0xff); // first byte of first chain
+       sbdn = sysconf.sbdn;
+
+       sbdn3 = (sysconf.hcdn[1] & 0xff); // first byte of second chain
+
+       bus_ck804_0 = (sysconf.pci1234[0] >> 16) & 0xff;
 
 
                 /* CK804 */
                 dev = dev_find_slot(bus_ck804_0, PCI_DEVFN(sbdn + 0x09,0));
                 if (dev) {
                         bus_ck804_1 = pci_read_config8(dev, PCI_SECONDARY_BUS);
-#if 0
-                        bus_ck804_2 = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
-                        bus_ck804_2++;
-#else
                         bus_ck804_4 = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
                         bus_ck804_4++;
-#endif
                 }
                 else {
-                        printk_debug("ERROR - could not find PCI 1:%02x.0, using defaults\n", sbdn + 0x09);
+                        printk(BIOS_DEBUG, "ERROR - could not find PCI 1:%02x.0, using defaults\n", sbdn + 0x09);
 
                         bus_ck804_1 = 2;
-#if 0
-                        bus_ck804_2 = 3;
-#else
                         bus_ck804_4 = 3;
-#endif
-
-                }
-#if 0
-                dev = dev_find_slot(bus_ck804_0, PCI_DEVFN(sbdn + 0x0b,0));
-                if (dev) {
-                        bus_ck804_2 = pci_read_config8(dev, PCI_SECONDARY_BUS);
-                        bus_ck804_3 = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
-                        bus_ck804_3++;
-                }
-                else {
-                        printk_debug("ERROR - could not find PCI 1:%02x.0, using defaults\n", sbdn + 0x0b);
-
-                        bus_ck804_3 = bus_ck804_2+1;
-                }
-
-                dev = dev_find_slot(bus_ck804_0, PCI_DEVFN(sbdn + 0x0c,0));
-                if (dev) {
-                        bus_ck804_3 = pci_read_config8(dev, PCI_SECONDARY_BUS);
-                        bus_ck804_4 = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
-                        bus_ck804_4++;
-                }
-                else {
-                        printk_debug("ERROR - could not find PCI 1:%02x.0, using defaults\n", sbdn + 0x0c);
-
-                        bus_ck804_4 = bus_ck804_3+1;
                 }
 
-#endif
-
                 dev = dev_find_slot(bus_ck804_0, PCI_DEVFN(sbdn + 0x0d,0));
                 if (dev) {
                         bus_ck804_4 = pci_read_config8(dev, PCI_SECONDARY_BUS);
@@ -137,7 +106,7 @@ void get_bus_conf(void)
                         bus_ck804_5++;
                 }
                 else {
-                        printk_debug("ERROR - could not find PCI 1:%02x.0, using defaults\n",sbdn + 0x0d);
+                        printk(BIOS_DEBUG, "ERROR - could not find PCI 1:%02x.0, using defaults\n",sbdn + 0x0d);
 
                         bus_ck804_5 = bus_ck804_4+1;
                 }
@@ -145,16 +114,14 @@ void get_bus_conf(void)
                 dev = dev_find_slot(bus_ck804_0, PCI_DEVFN(sbdn+ 0x0e,0));
                 if (dev) {
                         bus_ck804_5 = pci_read_config8(dev, PCI_SECONDARY_BUS);
-                        bus_8131_0 = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
-                        bus_8131_0++;
-                        bus_isa = bus_8131_0; // incase only one installed
+                        bus_isa = pci_read_config8(dev, PCI_SUBORDINATE_BUS);
+                        bus_isa++;
                 }
                 else {
-                        printk_debug("ERROR - could not find PCI 1:%02x.0, using defaults\n", sbdn+ 0x0e);
-
+                        printk(BIOS_DEBUG, "ERROR - could not find PCI 1:%02x.0, using defaults\n", sbdn+ 0x0e);
                 }
 
-               bus_8131_0 = (pci1234[1] >> 16) & 0xff;
+               bus_8131_0 = (sysconf.pci1234[1] >> 16) & 0xff;
                 /* 8131-1 */
                 dev = dev_find_slot(bus_8131_0, PCI_DEVFN(sbdn3,0));
                 if (dev) {
@@ -163,7 +130,7 @@ void get_bus_conf(void)
                         bus_8131_2++;
                 }
                 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);
 
                         bus_8131_1 = bus_8131_0+1;
                         bus_8131_2 = bus_8131_0+2;
@@ -176,7 +143,7 @@ void get_bus_conf(void)
                         bus_isa++;
                 }
                 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);
 
                         bus_8131_2 = bus_8131_1+1;
                         bus_isa = bus_8131_1+2;
@@ -187,8 +154,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_ck804 = apicid_base+0;
         apicid_8131_1 = apicid_base+1;