[coreboot-gerrit] Patch set updated for coreboot: 0506f4a amd/amdfam10: Enhance resource debugging when enabled

[Timothy Pearson (tpearson@raptorengineeringinc.com)]

Timothy Pearson (tpearson at raptorengineeringinc.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8266

-gerrit

commit 0506f4a3dc81f35612a2b1f49bcffe350b712a2b
Author: Timothy Pearson <tpearson at raptorengineeringinc.com>
Date:   Fri Jan 23 20:26:31 2015 -0600

    amd/amdfam10: Enhance resource debugging when enabled
    
    Change-Id: Ie39652bded9a42d1d816ca5198db59a83e5c083a
    Signed-off-by: Timothy Pearson <tpearson at raptorengineeringinc.com>
---
 src/northbridge/amd/amdfam10/setup_resource_map.c | 36 ++++++++++++++++++-----
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/northbridge/amd/amdfam10/setup_resource_map.c b/src/northbridge/amd/amdfam10/setup_resource_map.c
index ca7f964..395c638 100644
--- a/src/northbridge/amd/amdfam10/setup_resource_map.c
+++ b/src/northbridge/amd/amdfam10/setup_resource_map.c
@@ -1,6 +1,8 @@
 /*
  * This file is part of the coreboot project.
  *
+ * Copyright (C) 2015 Timothy Pearson <tpearson at raptorengineeringinc.com>, Raptor Engineering
+ *
  * Copyright (C) 2007 Advanced Micro Devices, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
@@ -68,16 +70,16 @@ void setup_resource_map_x_offset(const u32 *register_values, u32 max, u32 offset
 {
 	u32 i;
 
-#if RES_DEBUG
+#if IS_ENABLED(RES_DEBUG)
 	printk(BIOS_DEBUG, "setting up resource map ex offset....");
 
 #endif
 
-#if RES_DEBUG
+#if IS_ENABLED(RES_DEBUG)
 	printk(BIOS_DEBUG, "\n");
 #endif
 	for(i = 0; i < max; i += 4) {
-#if RES_DEBUG
+#if IS_ENABLED(RES_DEBUG)
 		printk(BIOS_DEBUG, "%04x: %02x %08x <- & %08x | %08x\n",
 			i/4, register_values[i],
 			register_values[i+1] + ( (register_values[i]==RES_PCI_IO) ? offset_pci_dev : 0),
@@ -94,9 +96,15 @@ void setup_resource_map_x_offset(const u32 *register_values, u32 max, u32 offset
 			dev = (register_values[i+1] & ~0xfff) + offset_pci_dev;
 			where = register_values[i+1] & 0xfff;
 			reg = pci_read_config32(dev, where);
+#if IS_ENABLED(RES_DEBUG)
+			printk(BIOS_SPEW, "WAS: %08x\n", reg);
+#endif
 			reg &= register_values[i+2];
 			reg |= register_values[i+3];
 			pci_write_config32(dev, where, reg);
+#if IS_ENABLED(RES_DEBUG)
+			printk(BIOS_SPEW, "NOW: %08x\n", reg);
+#endif
 			}
 			break;
 		case RES_PORT_IO_8: // io 8
@@ -105,9 +113,15 @@ void setup_resource_map_x_offset(const u32 *register_values, u32 max, u32 offset
 			u32 reg;
 			where = register_values[i+1] + offset_io_base;
 			reg = inb(where);
+#if IS_ENABLED(RES_DEBUG)
+			printk(BIOS_SPEW, "WAS: %08x\n", reg);
+#endif
 			reg &= register_values[i+2];
 			reg |= register_values[i+3];
 			outb(reg, where);
+#if IS_ENABLED(RES_DEBUG)
+			printk(BIOS_SPEW, "NOW: %08x\n", reg);
+#endif
 			}
 			break;
 		case RES_PORT_IO_32:  //io32
@@ -116,9 +130,15 @@ void setup_resource_map_x_offset(const u32 *register_values, u32 max, u32 offset
 			u32 reg;
 			where = register_values[i+1] + offset_io_base;
 			reg = inl(where);
+#if IS_ENABLED(RES_DEBUG)
+			printk(BIOS_SPEW, "WAS: %08x\n", reg);
+#endif
 			reg &= register_values[i+2];
 			reg |= register_values[i+3];
 			outl(reg, where);
+#if IS_ENABLED(RES_DEBUG)
+			printk(BIOS_SPEW, "NOW: %08x\n", reg);
+#endif
 			}
 			break;
 		} // switch
@@ -126,7 +146,7 @@ void setup_resource_map_x_offset(const u32 *register_values, u32 max, u32 offset
 
 	}
 
-#if RES_DEBUG
+#if IS_ENABLED(RES_DEBUG)
 	printk(BIOS_DEBUG, "done.\n");
 #endif
 }
@@ -135,15 +155,15 @@ void setup_resource_map_x(const u32 *register_values, u32 max)
 {
 	u32 i;
 
-#if RES_DEBUG
+#if IS_ENABLED(RES_DEBUG)
 	printk(BIOS_DEBUG, "setting up resource map ex offset....");
 #endif
 
-#if RES_DEBUG
+#if IS_ENABLED(RES_DEBUG)
 	printk(BIOS_DEBUG, "\n");
 #endif
 	for(i = 0; i < max; i += 4) {
-#if RES_DEBUG
+#if IS_ENABLED(RES_DEBUG)
 		printk(BIOS_DEBUG, "%04x: %02x %08x <- & %08x | %08x\n",
 		i/4, register_values[i],register_values[i+1], register_values[i+2], register_values[i+3]);
 #endif
@@ -188,7 +208,7 @@ void setup_resource_map_x(const u32 *register_values, u32 max)
 
 	}
 
-#if RES_DEBUG
+#if IS_ENABLED(RES_DEBUG)
 	printk(BIOS_DEBUG, "done.\n");
 #endif
 }