projects / coreboot.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
amdfam10: add phenom II as known cpu
[coreboot.git] / src / northbridge / amd / amdfam10 / debug.c
diff --git a/src/northbridge/amd/amdfam10/debug.c b/src/northbridge/amd/amdfam10/debug.c
index b0aee4bccc825fedcfacbf045fcce930050a3d4e..2dc54275fd1b4cad1bcbe0c38e3861855f6541c8 100644 (file)
--- a/src/northbridge/amd/amdfam10/debug.c
+++ b/src/northbridge/amd/amdfam10/debug.c
@@ -18,30 +18,29 @@
  */
 
 /*
- * Generic FAM10 debug code, used by mainboard specific car_auto.c
+ * Generic FAM10 debug code, used by mainboard specific romstage.c
  */
 
-#include "amdfam10_pci.c"
+#include "pci.c"
+#include <delay.h>
 
-static void udelay_tsc(u32 us);
-
-static  void print_debug_addr(const char *str, void *val)
+static inline void print_debug_addr(const char *str, void *val)
 {
-#if CACHE_AS_RAM_ADDRESS_DEBUG == 1
-               printk_debug("------Address debug: %s%x------\n", str, val);
+#if CONFIG_DEBUG_CAR
+               printk(BIOS_DEBUG, "------Address debug: %s%p------\n", str, val);
 #endif
 }
 
 static void print_debug_pci_dev(u32 dev)
 {
 #if CONFIG_PCI_BUS_SEGN_BITS==0
-       printk_debug("PCI: %02x:%02x.%02x", (dev>>20) & 0xff, (dev>>15) & 0x1f, (dev>>12) & 0x7);
+       printk(BIOS_DEBUG, "PCI: %02x:%02x.%02x", (dev>>20) & 0xff, (dev>>15) & 0x1f, (dev>>12) & 0x7);
 #else
-       printk_debug("PCI: %04x:%02x:%02x.%02x", (dev>>28) & 0x0f, (dev>>20) & 0xff, (dev>>15) & 0x1f, (dev>>12) & 0x7);
+       printk(BIOS_DEBUG, "PCI: %04x:%02x:%02x.%02x", (dev>>28) & 0x0f, (dev>>20) & 0xff, (dev>>15) & 0x1f, (dev>>12) & 0x7);
 #endif
 }
 
-static void print_pci_devices(void)
+static inline void print_pci_devices(void)
 {
        device_t dev;
        for(dev = PCI_DEV(0, 0, 0);
@@ -55,7 +54,7 @@ static void print_pci_devices(void)
                        continue;
                }
                print_debug_pci_dev(dev);
-               printk_debug(" %04x:%04x\n", (id & 0xffff), (id>>16));
+               printk(BIOS_DEBUG, " %04x:%04x\n", (id & 0xffff), (id>>16));
                if(((dev>>12) & 0x07) == 0) {
                        u8 hdr_type;
                        hdr_type = pci_read_config8(dev, PCI_HEADER_TYPE);
@@ -66,7 +65,7 @@ static void print_pci_devices(void)
        }
 }
 
-static void print_pci_devices_on_bus(u32 busn)
+static inline void print_pci_devices_on_bus(u32 busn)
 {
        device_t dev;
        for(dev = PCI_DEV(busn, 0, 0);
@@ -80,7 +79,7 @@ static void print_pci_devices_on_bus(u32 busn)
                        continue;
                }
                print_debug_pci_dev(dev);
-               printk_debug(" %04x:%04x\n", (id & 0xffff), (id>>16));
+               printk(BIOS_DEBUG, " %04x:%04x\n", (id & 0xffff), (id>>16));
                if(((dev>>12) & 0x07) == 0) {
                        u8 hdr_type;
                        hdr_type = pci_read_config8(dev, PCI_HEADER_TYPE);
@@ -91,8 +90,6 @@ static void print_pci_devices_on_bus(u32 busn)
        }
 }
 
-
-
 static void dump_pci_device_range(u32 dev, u32 start_reg, u32 size)
 {
        int i;
@@ -103,21 +100,22 @@ static void dump_pci_device_range(u32 dev, u32 start_reg, u32 size)
        for(i = start_reg; i < end; i+=4) {
                u32 val;
                if ((i & 0x0f) == 0) {
-                       printk_debug("\n%04x:",i);
+                       printk(BIOS_DEBUG, "\n%04x:",i);
                }
                val = pci_read_config32(dev, i);
                for(j=0;j<4;j++) {
-                       printk_debug(" %02x", val & 0xff);
+                       printk(BIOS_DEBUG, " %02x", val & 0xff);
                        val >>= 8;
                }
        }
        print_debug("\n");
 }
+
 static void dump_pci_device(u32 dev)
 {
        dump_pci_device_range(dev, 0, 4096);
 }
-static u32 pci_read_config32_index_wait(device_t dev, u32 index_reg, u32 index);
+
 static void dump_pci_device_index_wait_range(u32 dev, u32 index_reg, u32 start,
                                        u32 size)
 {
@@ -129,26 +127,26 @@ static void dump_pci_device_index_wait_range(u32 dev, u32 index_reg, u32 start,
        for(i = start; i < end; i++) {
                u32 val;
                int j;
-               printk_debug("\n%02x:",i);
+               printk(BIOS_DEBUG, "\n%02x:",i);
                val = pci_read_config32_index_wait(dev, index_reg, i);
                for(j=0;j<4;j++) {
-                       printk_debug(" %02x", val & 0xff);
+                       printk(BIOS_DEBUG, " %02x", val & 0xff);
                        val >>= 8;
                }
 
        }
        print_debug("\n");
 }
-static void dump_pci_device_index_wait(u32 dev, u32 index_reg)
+
+static inline void dump_pci_device_index_wait(u32 dev, u32 index_reg)
 {
        dump_pci_device_index_wait_range(dev, index_reg, 0, 0x54);
        dump_pci_device_index_wait_range(dev, index_reg, 0x100, 0x08); //DIMM1 when memclk > 400Hz
 //     dump_pci_device_index_wait_range(dev, index_reg, 0x200, 0x08); //DIMM2
 //     dump_pci_device_index_wait_range(dev, index_reg, 0x300, 0x08); //DIMM3
-
 }
 
-static void dump_pci_device_index(u32 dev, u32 index_reg, u32 type, u32 length)
+static inline void dump_pci_device_index(u32 dev, u32 index_reg, u32 type, u32 length)
 {
        int i;
        print_debug_pci_dev(dev);
@@ -160,16 +158,15 @@ static void dump_pci_device_index(u32 dev, u32 index_reg, u32 type, u32 length)
        for(i = 0; i < length; i++) {
                u32 val;
                if ((i & 0x0f) == 0) {
-                       printk_debug("\n%02x:",i);
+                       printk(BIOS_DEBUG, "\n%02x:",i);
                }
                val = pci_read_config32_index(dev, index_reg, i|type);
-               printk_debug(" %08x", val);
+               printk(BIOS_DEBUG, " %08x", val);
        }
        print_debug("\n");
 }
 
-
-static void dump_pci_devices(void)
+static inline void dump_pci_devices(void)
 {
        device_t dev;
        for(dev = PCI_DEV(0, 0, 0);
@@ -194,8 +191,7 @@ static void dump_pci_devices(void)
        }
 }
 
-
-static void dump_pci_devices_on_bus(u32 busn)
+static inline void dump_pci_devices_on_bus(u32 busn)
 {
        device_t dev;
        for(dev = PCI_DEV(busn, 0, 0);
@@ -220,11 +216,7 @@ static void dump_pci_devices_on_bus(u32 busn)
        }
 }
 
-#ifndef DEBUG_SMBUS
-#define DEBUG_SMBUS 0
-#endif
-
-#if DEBUG_SMBUS == 1
+#if CONFIG_DEBUG_SMBUS
 
 static void dump_spd_registers(const struct mem_controller *ctrl)
 {
@@ -235,38 +227,38 @@ static void dump_spd_registers(const struct mem_controller *ctrl)
                device = ctrl->spd_addr[i];
                if (device) {
                        int j;
-                       printk_debug("dimm: %02x.0: %02x", i, device);
+                       printk(BIOS_DEBUG, "dimm: %02x.0: %02x", i, device);
                        for(j = 0; j < 128; j++) {
                                int status;
                                u8 byte;
                                if ((j & 0xf) == 0) {
-                                       printk_debug("\n%02x: ", j);
+                                       printk(BIOS_DEBUG, "\n%02x: ", j);
                                }
                                status = smbus_read_byte(device, j);
                                if (status < 0) {
                                        break;
                                }
                                byte = status & 0xff;
-                               printk_debug("%02x ", byte);
+                               printk(BIOS_DEBUG, "%02x ", byte);
                        }
                        print_debug("\n");
                }
                device = ctrl->spd_addr[i+DIMM_SOCKETS];
                if (device) {
                        int j;
-                       printk_debug("dimm: %02x.1: %02x", i, device);
+                       printk(BIOS_DEBUG, "dimm: %02x.1: %02x", i, device);
                        for(j = 0; j < 128; j++) {
                                int status;
                                u8 byte;
                                if ((j & 0xf) == 0) {
-                                       printk_debug("\n%02x: ", j);
+                                       printk(BIOS_DEBUG, "\n%02x: ", j);
                                }
                                status = smbus_read_byte(device, j);
                                if (status < 0) {
                                        break;
                                }
                                byte = status & 0xff;
-                               printk_debug("%02x ", byte);
+                               printk(BIOS_DEBUG, "%02x ", byte);
                        }
                        print_debug("\n");
                }
@@ -279,7 +271,7 @@ static void dump_smbus_registers(void)
        for(device = 1; device < 0x80; device++) {
                int j;
                if( smbus_read_byte(device, 0) < 0 ) continue;
-               printk_debug("smbus: %02x", device);
+               printk(BIOS_DEBUG, "smbus: %02x", device);
                for(j = 0; j < 256; j++) {
                        int status;
                        u8 byte;
@@ -288,28 +280,28 @@ static void dump_smbus_registers(void)
                                break;
                        }
                        if ((j & 0xf) == 0) {
-                               printk_debug("\n%02x: ",j);
+                               printk(BIOS_DEBUG, "\n%02x: ",j);
                        }
                        byte = status & 0xff;
-                       printk_debug("%02x ", byte);
+                       printk(BIOS_DEBUG, "%02x ", byte);
                }
                print_debug("\n");
        }
 }
 #endif
-static void dump_io_resources(u32 port)
+static inline void dump_io_resources(u32 port)
 {
 
        int i;
-       udelay_tsc(2000);
-       printk_debug("%04x:\n", port);
+       udelay(2000);
+       printk(BIOS_DEBUG, "%04x:\n", port);
        for(i=0;i<256;i++) {
                u8 val;
                if ((i & 0x0f) == 0) {
-                       printk_debug("%02x:", i);
+                       printk(BIOS_DEBUG, "%02x:", i);
                }
                val = inb(port);
-               printk_debug(" %02x",val);
+               printk(BIOS_DEBUG, " %02x",val);
                if ((i & 0x0f) == 0x0f) {
                        print_debug("\n");
                }
@@ -317,15 +309,15 @@ static void dump_io_resources(u32 port)
        }
 }
 
-static void dump_mem(u32 start, u32 end)
+static inline void dump_mem(u32 start, u32 end)
 {
        u32 i;
        print_debug("dump_mem:");
        for(i=start;i<end;i++) {
                if((i & 0xf)==0) {
-                       printk_debug("\n%08x:", i);
+                       printk(BIOS_DEBUG, "\n%08x:", i);
                }
-               printk_debug(" %02x", (u8)*((u8 *)i));
+               printk(BIOS_DEBUG, " %02x", (u8)*((u8 *)i));
        }
        print_debug("\n");
 }
my coreboot WIP stuff (asus m5a99x-evo board)