This patch unifies the use of config options in v2 to all start with CONFIG_
[coreboot.git] / src / northbridge / amd / amdk8 / debug.c
index d0841e878ed0f5c258835587d83035286106a986..a445f253c725ebb05ada21c17a70256f4a66d4c7 100644 (file)
@@ -2,26 +2,42 @@
  * generic K8 debug code, used by mainboard specific auto.c
  *
  */
+
+#ifndef CACHE_AS_RAM_ADDRESS_DEBUG
+#define CACHE_AS_RAM_ADDRESS_DEBUG 0
+#endif
+
+static inline void print_debug_addr(const char *str, void *val)
+{
+#if CACHE_AS_RAM_ADDRESS_DEBUG == 1
+       #if CONFIG_USE_PRINTK_IN_CAR
+               printk_debug("------Address debug: %s%x------\r\n", str, val);
+       #else
+               print_debug ("------Address debug: "); print_debug(str); print_debug_hex32(val); print_debug("------\r\n");
+       #endif
+#endif
+}
+
 #if 1
 static void print_debug_pci_dev(unsigned dev)
 {
-#if CONFIG_USE_INIT
-       printk_debug("PCI: %02x:%02x.%02x", (dev>>16) & 0xff, (dev>>11) & 0x1f, (dev>>8) & 0x7);
+#if CONFIG_USE_PRINTK_IN_CAR
+       printk_debug("PCI: %02x:%02x.%02x", (dev>>20) & 0xff, (dev>>15) & 0x1f, (dev>>12) & 0x7);
 #else
        print_debug("PCI: ");
-       print_debug_hex8((dev >> 16) & 0xff);
+       print_debug_hex8((dev >> 20) & 0xff);
        print_debug_char(':');
-       print_debug_hex8((dev >> 11) & 0x1f);
+       print_debug_hex8((dev >> 15) & 0x1f);
        print_debug_char('.');
-       print_debug_hex8((dev >> 8) & 7);
+       print_debug_hex8((dev >> 12) & 7);
 #endif
 }
 
 static void print_pci_devices(void)
 {
        device_t dev;
-       for(dev = PCI_DEV(0, 0, 0); 
-               dev <= PCI_DEV(0xff, 0x1f, 0x7); 
+       for(dev = PCI_DEV(0, 0, 0);
+               dev <= PCI_DEV(0xff, 0x1f, 0x7);
                dev += PCI_DEV(0,0,1)) {
                uint32_t id;
                id = pci_read_config32(dev, PCI_VENDOR_ID);
@@ -31,13 +47,14 @@ static void print_pci_devices(void)
                        continue;
                }
                print_debug_pci_dev(dev);
-#if CONFIG_USE_INIT
+#if CONFIG_USE_PRINTK_IN_CAR
                printk_debug(" %04x:%04x\r\n", (id & 0xffff), (id>>16));
 #else
+               print_debug(" ");
                print_debug_hex32(id);
                print_debug("\r\n");
 #endif
-               if(((dev>>8) & 0x07) == 0) {
+               if(((dev>>12) & 0x07) == 0) {
                        uint8_t hdr_type;
                        hdr_type = pci_read_config8(dev, PCI_HEADER_TYPE);
                        if((hdr_type & 0x80) != 0x80) {
@@ -51,12 +68,12 @@ static void dump_pci_device(unsigned dev)
 {
        int i;
        print_debug_pci_dev(dev);
-       
+
        for(i = 0; i < 256; i++) {
                unsigned char val;
                if ((i & 0x0f) == 0) {
-#if CONFIG_USE_INIT
-                        printk_debug("\r\n%02x:",i);
+#if CONFIG_USE_PRINTK_IN_CAR
+                       printk_debug("\r\n%02x:",i);
 #else
                        print_debug("\r\n");
                        print_debug_hex8(i);
@@ -64,7 +81,7 @@ static void dump_pci_device(unsigned dev)
 #endif
                }
                val = pci_read_config8(dev, i);
-#if CONFIG_USE_INIT
+#if CONFIG_USE_PRINTK_IN_CAR
                printk_debug(" %02x", val);
 #else
                print_debug_char(' ');
@@ -74,11 +91,44 @@ static void dump_pci_device(unsigned dev)
        print_debug("\r\n");
 }
 
+#if CONFIG_K8_REV_F_SUPPORT == 1
+static uint32_t pci_read_config32_index_wait(device_t dev, uint32_t index_reg, uint32_t index);
+static void dump_pci_device_index_wait(unsigned dev, uint32_t index_reg)
+{
+       int i;
+       print_debug_pci_dev(dev);
+       print_debug(" -- index_reg="); print_debug_hex32(index_reg);
+
+       for(i = 0; i < 0x40; i++) {
+               uint32_t val;
+               int j;
+#if CONFIG_USE_PRINTK_IN_CAR
+               printk_debug("\r\n%02x:",i);
+#else
+               print_debug("\r\n");
+               print_debug_hex8(i);
+               print_debug_char(':');
+#endif
+               val = pci_read_config32_index_wait(dev, index_reg, i);
+               for(j=0;j<4;j++) {
+#if CONFIG_USE_PRINTK_IN_CAR
+                       printk_debug(" %02x", val & 0xff);
+#else
+                       print_debug_char(' '); print_debug_hex8(val&0xff);
+#endif
+                       val >>= 8;
+               }
+
+       }
+       print_debug("\r\n");
+}
+#endif
+
 static void dump_pci_devices(void)
 {
        device_t dev;
-       for(dev = PCI_DEV(0, 0, 0); 
-               dev <= PCI_DEV(0xff, 0x1f, 0x7); 
+       for(dev = PCI_DEV(0, 0, 0);
+               dev <= PCI_DEV(0xff, 0x1f, 0x7);
                dev += PCI_DEV(0,0,1)) {
                uint32_t id;
                id = pci_read_config32(dev, PCI_VENDOR_ID);
@@ -89,41 +139,46 @@ static void dump_pci_devices(void)
                }
                dump_pci_device(dev);
 
-                if(((dev>>8) & 0x07) == 0) {
-                        uint8_t hdr_type;
-                        hdr_type = pci_read_config8(dev, PCI_HEADER_TYPE);
-                        if((hdr_type & 0x80) != 0x80) {
-                                dev += PCI_DEV(0,0,7);
-                        }
-                }
+               if(((dev>>12) & 0x07) == 0) {
+                       uint8_t hdr_type;
+                       hdr_type = pci_read_config8(dev, PCI_HEADER_TYPE);
+                       if((hdr_type & 0x80) != 0x80) {
+                               dev += PCI_DEV(0,0,7);
+                       }
+               }
        }
 }
 
 static void dump_pci_devices_on_bus(unsigned busn)
 {
-        device_t dev;
-        for(dev = PCI_DEV(busn, 0, 0);
-                dev <= PCI_DEV(busn, 0x1f, 0x7);
-                dev += PCI_DEV(0,0,1)) {
-                uint32_t id;
-                id = pci_read_config32(dev, PCI_VENDOR_ID);
-                if (((id & 0xffff) == 0x0000) || ((id & 0xffff) == 0xffff) ||
-                        (((id >> 16) & 0xffff) == 0xffff) ||
-                        (((id >> 16) & 0xffff) == 0x0000)) {
-                        continue;
-                }
-                dump_pci_device(dev);
+       device_t dev;
+       for(dev = PCI_DEV(busn, 0, 0);
+               dev <= PCI_DEV(busn, 0x1f, 0x7);
+               dev += PCI_DEV(0,0,1)) {
+               uint32_t id;
+               id = pci_read_config32(dev, PCI_VENDOR_ID);
+               if (((id & 0xffff) == 0x0000) || ((id & 0xffff) == 0xffff) ||
+                       (((id >> 16) & 0xffff) == 0xffff) ||
+                       (((id >> 16) & 0xffff) == 0x0000)) {
+                       continue;
+               }
+               dump_pci_device(dev);
 
-                if(((dev>>8) & 0x07) == 0) {
-                        uint8_t hdr_type;
-                        hdr_type = pci_read_config8(dev, PCI_HEADER_TYPE);
-                        if((hdr_type & 0x80) != 0x80) {
-                                dev += PCI_DEV(0,0,7);
-                        }
-                }
-        }
+               if(((dev>>12) & 0x07) == 0) {
+                       uint8_t hdr_type;
+                       hdr_type = pci_read_config8(dev, PCI_HEADER_TYPE);
+                       if((hdr_type & 0x80) != 0x80) {
+                               dev += PCI_DEV(0,0,7);
+                       }
+               }
+       }
 }
 
+#ifndef DEBUG_SMBUS
+#define DEBUG_SMBUS 0
+#endif
+
+#if DEBUG_SMBUS == 1
 static void dump_spd_registers(const struct mem_controller *ctrl)
 {
        int i;
@@ -133,11 +188,11 @@ static void dump_spd_registers(const struct mem_controller *ctrl)
                device = ctrl->channel0[i];
                if (device) {
                        int j;
-#if CONFIG_USE_INIT
+#if CONFIG_USE_PRINTK_IN_CAR
                        printk_debug("dimm: %02x.0: %02x", i, device);
 #else
-                       print_debug("dimm: "); 
-                       print_debug_hex8(i); 
+                       print_debug("dimm: ");
+                       print_debug_hex8(i);
                        print_debug(".0: ");
                        print_debug_hex8(device);
 #endif
@@ -145,7 +200,7 @@ static void dump_spd_registers(const struct mem_controller *ctrl)
                                int status;
                                unsigned char byte;
                                if ((j & 0xf) == 0) {
-#if CONFIG_USE_INIT
+#if CONFIG_USE_PRINTK_IN_CAR
                                        printk_debug("\r\n%02x: ", j);
 #else
                                        print_debug("\r\n");
@@ -158,7 +213,7 @@ static void dump_spd_registers(const struct mem_controller *ctrl)
                                        break;
                                }
                                byte = status & 0xff;
-#if CONFIG_USE_INIT
+#if CONFIG_USE_PRINTK_IN_CAR
                                printk_debug("%02x ", byte);
 #else
                                print_debug_hex8(byte);
@@ -170,11 +225,11 @@ static void dump_spd_registers(const struct mem_controller *ctrl)
                device = ctrl->channel1[i];
                if (device) {
                        int j;
-#if CONFIG_USE_INIT
-                        printk_debug("dimm: %02x.1: %02x", i, device);
+#if CONFIG_USE_PRINTK_IN_CAR
+                       printk_debug("dimm: %02x.1: %02x", i, device);
 #else
-                       print_debug("dimm: "); 
-                       print_debug_hex8(i); 
+                       print_debug("dimm: ");
+                       print_debug_hex8(i);
                        print_debug(".1: ");
                        print_debug_hex8(device);
 #endif
@@ -182,8 +237,8 @@ static void dump_spd_registers(const struct mem_controller *ctrl)
                                int status;
                                unsigned char byte;
                                if ((j & 0xf) == 0) {
-#if CONFIG_USE_INIT
-                                        printk_debug("\r\n%02x: ", j);
+#if CONFIG_USE_PRINTK_IN_CAR
+                                       printk_debug("\r\n%02x: ", j);
 #else
                                        print_debug("\r\n");
                                        print_debug_hex8(j);
@@ -195,8 +250,8 @@ static void dump_spd_registers(const struct mem_controller *ctrl)
                                        break;
                                }
                                byte = status & 0xff;
-#if CONFIG_USE_INIT
-                                printk_debug("%02x ", byte);
+#if CONFIG_USE_PRINTK_IN_CAR
+                               printk_debug("%02x ", byte);
 #else
                                print_debug_hex8(byte);
                                print_debug_char(' ');
@@ -209,100 +264,101 @@ static void dump_spd_registers(const struct mem_controller *ctrl)
 static void dump_smbus_registers(void)
 {
        unsigned device;
-        print_debug("\r\n");
-        for(device = 1; device < 0x80; device++) {
-                int j;
+       print_debug("\r\n");
+       for(device = 1; device < 0x80; device++) {
+               int j;
                if( smbus_read_byte(device, 0) < 0 ) continue;
-#if CONFIG_USE_INIT
+#if CONFIG_USE_PRINTK_IN_CAR
                printk_debug("smbus: %02x", device);
 #else
-                print_debug("smbus: ");
-                print_debug_hex8(device);
+               print_debug("smbus: ");
+               print_debug_hex8(device);
 #endif
-                for(j = 0; j < 256; j++) {
-                       int status; 
-                        unsigned char byte;
-                        status = smbus_read_byte(device, j);
-                        if (status < 0) {
+               for(j = 0; j < 256; j++) {
+                       int status;
+                       unsigned char byte;
+                       status = smbus_read_byte(device, j);
+                       if (status < 0) {
                                break;
-                        }
-                        if ((j & 0xf) == 0) {
-#if CONFIG_USE_INIT
+                       }
+                       if ((j & 0xf) == 0) {
+#if CONFIG_USE_PRINTK_IN_CAR
                                printk_debug("\r\n%02x: ",j);
 #else
-                               print_debug("\r\n");
-                                print_debug_hex8(j);
-                                print_debug(": ");
+                               print_debug("\r\n");
+                               print_debug_hex8(j);
+                               print_debug(": ");
 #endif
-                        }
-                        byte = status & 0xff;
-#if CONFIG_USE_INIT
-                        printk_debug("%02x ", byte);
+                       }
+                       byte = status & 0xff;
+#if CONFIG_USE_PRINTK_IN_CAR
+                       printk_debug("%02x ", byte);
 #else
-                        print_debug_hex8(byte);
-                        print_debug_char(' ');
+                       print_debug_hex8(byte);
+                       print_debug_char(' ');
 #endif
-                }
-                print_debug("\r\n");
-       }       
+               }
+               print_debug("\r\n");
+       }
 }
+#endif
 
-static void dump_io_resources(unsigned port) 
+static void dump_io_resources(unsigned port)
 {
 
        int i;
-        udelay(2000);
-#if CONFIG_USE_INIT
+       udelay(2000);
+#if CONFIG_USE_PRINTK_IN_CAR
        printk_debug("%04x:\r\n", port);
 #else
-        print_debug_hex16(port);
-        print_debug(":\r\n");
+       print_debug_hex16(port);
+       print_debug(":\r\n");
 #endif
-        for(i=0;i<256;i++) {
-                uint8_t val;
-                if ((i & 0x0f) == 0) {
-#if CONFIG_USE_INIT
+       for(i=0;i<256;i++) {
+               uint8_t val;
+               if ((i & 0x0f) == 0) {
+#if CONFIG_USE_PRINTK_IN_CAR
                        printk_debug("%02x:", i);
 #else
-                        print_debug_hex8(i);
-                        print_debug_char(':');
+                       print_debug_hex8(i);
+                       print_debug_char(':');
 #endif
-                }
-                val = inb(port);
-#if CONFIG_USE_INIT
+               }
+               val = inb(port);
+#if CONFIG_USE_PRINTK_IN_CAR
                printk_debug(" %02x",val);
 #else
-                print_debug_char(' ');
-                print_debug_hex8(val);
+               print_debug_char(' ');
+               print_debug_hex8(val);
 #endif
-                if ((i & 0x0f) == 0x0f) {
-                        print_debug("\r\n");
-                }
+               if ((i & 0x0f) == 0x0f) {
+                       print_debug("\r\n");
+               }
                port++;
-        }
+       }
 }
 
 static void dump_mem(unsigned start, unsigned end)
 {
-        unsigned i;
+       unsigned i;
        print_debug("dump_mem:");
-        for(i=start;i<end;i++) {
+       for(i=start;i<end;i++) {
                if((i & 0xf)==0) {
-#if CONFIG_USE_INIT
+#if CONFIG_USE_PRINTK_IN_CAR
                        printk_debug("\r\n%08x:", i);
-#else  
+#else
                        print_debug("\r\n");
                        print_debug_hex32(i);
                        print_debug(":");
 #endif
                }
-#if CONFIG_USE_INIT    
+#if CONFIG_USE_PRINTK_IN_CAR
                printk_debug(" %02x", (unsigned char)*((unsigned char *)i));
 #else
                print_debug(" ");
-               print_debug_hex8((unsigned char)*((unsigned char *)i));
+               print_debug_hex8((unsigned char)*((unsigned char *)i));
 #endif
-        }
-        print_debug("\r\n");
+       }
+       print_debug("\r\n");
  }
 #endif