- Cleanups on the romcc side including a pci interface that uses

  fewer registers, and is easier to hardcode.


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@838 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

2 files changed, 1025 insertions, 539 deletions

diff --git a/src/mainboard/amd/solo/auto.c b/src/mainboard/amd/solo/auto.c
index 61cf7cd356..c2d5b88190 100644
--- a/src/mainboard/amd/solo/auto.c
+++ b/src/mainboard/amd/solo/auto.c
@@ -1,313 +1,25 @@
 #define ASSEMBLY 1
+#include <stdint.h>
+#include <device/pci_def.h>
 #include "arch/romcc_io.h"
 #include "pc80/serial.c"
 #include "arch/i386/lib/console.c"
 #include "ram/ramtest.c"
 
+static void die(const char *str)
+{
+	print_emerg(str);
+	do {
+		hlt();
+	} while(1);
+}
 
 #define MEMORY_512MB  0  /* SuSE Solo configuration */
 #define MEMORY_1024MB 1  /* LNXI Solo configuration */
 
-
-
 static void sdram_set_registers(void)
 {
 	static const unsigned int register_values[] = {
-	/* Routing Table Node i 
-	 * F0:0x40 i = 0, 
-	 * F0:0x44 i = 1,
-	 * F0:0x48 i = 2, 
-	 * F0:0x4c i = 3,
-	 * F0:0x50 i = 4, 
-	 * F0:0x54 i = 5,
-	 * F0:0x58 i = 6, 
-	 * F0:0x5c i = 7
-	 * [ 0: 3] Request Route
-	 *     [0] Route to this node
-	 *     [1] Route to Link 0
-	 *     [2] Route to Link 1
-	 *     [3] Route to Link 2
-	 * [11: 8] Response Route
-	 *     [0] Route to this node
-	 *     [1] Route to Link 0
-	 *     [2] Route to Link 1
-	 *     [3] Route to Link 2
-	 * [19:16] Broadcast route
-	 *     [0] Route to this node
-	 *     [1] Route to Link 0
-	 *     [2] Route to Link 1
-	 *     [3] Route to Link 2
-	 */
-	0xc040, 0xfff0f0f0, 0x00010101,
-	0xc044, 0xfff0f0f0, 0x00010101,
-	0xc048, 0xfff0f0f0, 0x00010101,
-	0xc04c, 0xfff0f0f0, 0x00010101,
-	0xc050, 0xfff0f0f0, 0x00010101,
-	0xc054, 0xfff0f0f0, 0x00010101,
-	0xc058, 0xfff0f0f0, 0x00010101,
-	0xc05c, 0xfff0f0f0, 0x00010101,
-
-	/* Hypetransport Transaction Control Register 
-	 * F0:0x68
-	 * [ 0: 0] Disable read byte probe
-	 *         0 = Probes issues
-	 *         1 = Probes not issued
-	 * [ 1: 1] Disable Read Doubleword probe
-	 *         0 = Probes issued
-	 *         1 = Probes not issued
-	 * [ 2: 2] Disable write byte probes
-	 *         0 = Probes issued
-	 *         1 = Probes not issued
-	 * [ 3: 3] Disalbe Write Doubleword Probes
-	 *         0 = Probes issued
-	 *         1 = Probes not issued.
-	 * [ 4: 4] Disable Memroy Controller Target Start
-	 *         0 = TgtStart packets are generated
-	 *         1 = TgtStart packets are not generated.
-	 * [ 5: 5] CPU1 Enable
-	 *         0 = Second CPU disabled or not present
-	 *         1 = Second CPU enabled.
-	 * [ 6: 6] CPU Request PassPW
-	 *         0 = CPU requests do not pass posted writes
-	 *         1 = CPU requests pass posted writes.
-	 * [ 7: 7] CPU read Respons PassPW
-	 *         0 = CPU Responses do not pass posted writes
-	 *         1 = CPU responses pass posted writes.
-	 * [ 8: 8] Disable Probe Memory Cancel
-	 *         0 = Probes may generate MemCancels
-	 *         1 = Probes may not generate MemCancels
-	 * [ 9: 9] Disable Remote Probe Memory Cancel.
-	 *         0 = Probes hitting dirty blocks generate memory cancel packets
-	 *         1 = Only probed caches on the same node as the memory controller
-	 *              generate cancel packets.
-	 * [10:10] Disable Fill Probe
-	 *         0 = Probes issued for cache fills
-	 *         1 = Probes not issued for cache fills.
-	 * [11:11] Response PassPw
-	 *         0 = Downstream response PassPW based on original request
-	 *         1 = Downstream response PassPW set to 1
-	 * [12:12] Change ISOC to Ordered
-	 *         0 = Bit 1 of coherent HT RdSz/WrSz command used for iosynchronous prioritization
-	 *         1 = Bit 1 of coherent HT RdSz/WrSz command used for ordering.
-	 * [14:13] Buffer Release Priority select 
-	 *         00 = 64
-	 *         01 = 16
-	 *         10 = 8
-	 *         11 = 2
-	 * [15:15] Limit Coherent HT Configuration Space Range
-	 *         0 = No coherent HT configuration space restrictions
-	 *         1 = Limit coherent HT configuration space based on node count
-	 * [16:16] Local Interrupt Conversion Enable.
-	 *         0 = ExtInt/NMI interrups unaffected.
-	 *         1 = ExtInt/NMI broadcat interrupts converted to LINT0/1
-	 * [17:17] APIC Extended Broadcast Enable.
-	 *         0 = APIC broadcast is 0F
-	 *         1 = APIC broadcast is FF
-	 * [18:18] APIC Extended ID Enable
-	 *         0 = APIC ID is 4 bits.
-	 *         1 = APIC ID is 8 bits.
-	 * [19:19] APIC Extended Spurious Vector Enable
-	 *         0 = Lower 4 bits of spurious vector are read-only 1111
-	 *         1 = Lower 4 bits of spurious vecotr are writeable.
-	 * [20:20] Sequence ID Source Node Enable
-	 *         0 = Normal operation
-	 *         1 = Keep SeqID on routed packets for debugging.
-	 * [22:21] Downstream non-posted request limit
-	 *         00 = No limit
-	 *         01 = Limited to 1
-	 *         10 = Limited to 4
-	 *         11 = Limited to 8
-	 * [23:23] RESERVED
-	 * [25:24] Medium-Priority Bypass Count
-	 *         - Maximum # of times a medium priority access can pass a low
-	 *           priority access before Medium-Priority mode is disabled for one access.
-	 * [27:26] High-Priority Bypass Count
-	 *         - Maximum # of times a high prioirty access can pass a medium or low
-	 *           priority access before High-prioirty mode is disabled for one access.
-	 * [28:28] Enable High Priority CPU Reads
-	 *         0 = Cpu reads are medium prioirty
-	 *         1 = Cpu reads are high prioirty
-	 * [29:29] Disable Low Priority Writes
-	 *         0 = Non-isochronous writes are low priority
-	 *         1 = Non-isochronous writes are medium prioirty
-	 * [30:30] Disable High Priority Isochronous writes
-	 *         0 = Isochronous writes are high priority
-	 *         1 = Isochronous writes are medium priority
-	 * [31:31] Disable Medium Priority Isochronous writes
-	 *         0 = Isochronous writes are medium are high
-	 *         1 = With bit 30 set makes Isochrouns writes low priority.
-	 */
-	0xc068, 0x00800000, 0x0f00840f,
-	/* HT Initialization Control Register
-	 * F0:0x68
-	 * [ 0: 0] Routing Table Disable
-	 *         0 = Packets are routed according to routing tables
-	 *         1 = Packets are routed according to the default link field
-	 * [ 1: 1] Request Disable (BSP should clear this)
-	 *         0 = Request packets may be generated
-	 *         1 = Request packets may not be generated.
-	 * [ 3: 2] Default Link (Read-only)
-	 *         00 = LDT0
-	 *         01 = LDT1
-	 *         10 = LDT2
-	 *         11 = CPU on same node
-	 * [ 4: 4] Cold Reset
-	 *         - Scratch bit cleared by a cold reset
-	 * [ 5: 5] BIOS Reset Detect
-	 *         - Scratch bit cleared by a cold reset
-	 * [ 6: 6] INIT Detect
-	 *         - Scratch bit cleared by a warm or cold reset not by an INIT
-	 *
-	 */
-	0xc06C, 0xffffff8c, 0x00000000,
-	/* LDTi Capabilities Registers
-	 * F0:0x80 i = 0,
-	 * F0:0xA0 i = 1,
-	 * F0:0xC0 i = 2,
-	 */
-	/* LDTi Link Control Registrs
-	 * F0:0x84 i = 0,
-	 * F0:0xA4 i = 1,
-	 * F0:0xC4 i = 2,
-	 * [ 1: 1] CRC Flood Enable
-	 *         0 = Do not generate sync packets on CRC error
-	 *         1 = Generate sync packets on CRC error
-	 * [ 2: 2] CRC Start Test (Read-Only)
-	 * [ 3: 3] CRC Force Frame Error
-	 *         0 = Do not generate bad CRC
-	 *         1 = Generate bad CRC
-	 * [ 4: 4] Link Failure
-	 *         0 = No link failure detected
-	 *         1 = Link failure detected
-	 * [ 5: 5] Initialization Complete
-	 *         0 = Initialization not complete
-	 *         1 = Initialization complete
-	 * [ 6: 6] Receiver off
-	 *         0 = Recevier on
-	 *         1 = Receiver off
-	 * [ 7: 7] Transmitter Off
-	 *         0 = Transmitter on
-	 *         1 = Transmitter off
-	 * [ 9: 8] CRC_Error
-	 *         00 = No error
-	 *         [0] = 1 Error on byte lane 0
-	 *         [1] = 1 Error on byte lane 1
-	 * [12:12] Isochrnous Enable  (Read-Only)
-	 * [13:13] HT Stop Tristate Enable
-	 *         0 = Driven during an LDTSTOP_L
-	 *         1 = Tristated during and LDTSTOP_L
-	 * [14:14] Extended CTL Time 
-	 *         0 = CTL is asserted for 16 bit times during link initialization
-	 *         1 = CTL is asserted for 50us during link initialization
-	 * [18:16] Max Link Width In (Read-Only?)
-	 *         000 = 8 bit link
-	 *         001 = 16bit link
-	 * [19:19] Doubleword Flow Control in (Read-Only)
-	 *         0 = This link does not support doubleword flow control
-	 *         1 = This link supports doubleword flow control
-	 * [22:20] Max Link Width Out (Read-Only?)
-	 *         000 = 8 bit link
-	 *         001 = 16bit link
-	 * [23:23] Doubleworld Flow Control out (Read-Only)
-	 *         0 = This link does not support doubleword flow control
-	 *         1 = This link supports doubleworkd flow control
-	 * [26:24] Link Width In
-	 *         000 = Use 8 bits
-	 *         001 = Use 16 bits
-	 *         010 = reserved
-	 *         011 = Use 32 bits
-	 *         100 = Use 2 bits
-	 *         101 = Use 4 bits
-	 *         110 = reserved
-	 *         111 = Link physically not connected
-	 * [27:27] Doubleword Flow Control In Enable
-	 *         0 = Doubleword flow control disabled
-	 *         1 = Doubleword flow control enabled (Not currently supported)
-	 * [30:28] Link Width Out
-	 *         000 = Use 8 bits
-	 *         001 = Use 16 bits
-	 *         010 = reserved
-	 *         011 = Use 32 bits
-	 *         100 = Use 2 bits
-	 *         101 = Use 4 bits
-	 *         110 = reserved
-	 *         111 = Link physically not connected
-	 * [31:31] Doubleworld Flow Control Out Enable
-	 *         0 = Doubleworld flow control disabled
-	 *         1 = Doubleword flow control enabled (Not currently supported)
-	 */
-	0xc084, 0x00009c05, 0x11110020,
-	/* LDTi Frequency/Revision Registers
-	 * F0:0x88 i = 0,
-	 * F0:0xA8 i = 1,
-	 * F0:0xC8 i = 2,
-	 * [ 4: 0] Minor Revision
-	 *         Contains the HT Minor revision
-	 * [ 7: 5] Major Revision
-	 *         Contains the HT Major revision
-	 * [11: 8] Link Frequency  (Takes effect the next time the link is reconnected)
-	 *         0000 = 200Mhz
-	 *         0001 = reserved
-	 *         0010 = 400Mhz
-	 *         0011 = reserved
-	 *         0100 = 600Mhz
-	 *         0101 = 800Mhz
-	 *         0110 = 1000Mhz
-	 *         0111 = reserved
-	 *         1000 = reserved
-	 *         1001 = reserved
-	 *         1010 = reserved
-	 *         1011 = reserved
-	 *         1100 = reserved
-	 *         1101 = reserved
-	 *         1110 = reserved
-	 *         1111 = 100 Mhz
-	 * [15:12] Error (Not currently Implemented)
-	 * [31:16] Indicates the frequency capabilities of the link
-	 *         [16] = 1 encoding 0000 of freq supported
-	 *         [17] = 1 encoding 0001 of freq supported
-	 *         [18] = 1 encoding 0010 of freq supported
-	 *         [19] = 1 encoding 0011 of freq supported
-	 *         [20] = 1 encoding 0100 of freq supported
-	 *         [21] = 1 encoding 0101 of freq supported
-	 *         [22] = 1 encoding 0110 of freq supported
-	 *         [23] = 1 encoding 0111 of freq supported
-	 *         [24] = 1 encoding 1000 of freq supported
-	 *         [25] = 1 encoding 1001 of freq supported
-	 *         [26] = 1 encoding 1010 of freq supported
-	 *         [27] = 1 encoding 1011 of freq supported
-	 *         [28] = 1 encoding 1100 of freq supported
-	 *         [29] = 1 encoding 1101 of freq supported
-	 *         [30] = 1 encoding 1110 of freq supported
-	 *         [31] = 1 encoding 1111 of freq supported
-	 */
-	0xC088, 0xfffff0ff, 0x00000200,
-	/* LDTi Feature Capability
-	 * F0:0x8C i = 0,
-	 * F0:0xAC i = 1,
-	 * F0:0xCC i = 2,
-	 */
-	/* LDTi Buffer Count Registers
-	 * F0:0x90 i = 0,
-	 * F0:0xB0 i = 1,
-	 * F0:0xD0 i = 2,
-	 */
-	/* LDTi Bus Number Registers
-	 * F0:0x94 i = 0,
-	 * F0:0xB4 i = 1,
-	 * F0:0xD4 i = 2,
-	 * For NonCoherent HT specifies the bus number downstream (behind the host bridge)
-	 * [ 0: 7] Primary Bus Number
-	 * [15: 8] Secondary Bus Number
-	 * [23:15] Subordiante Bus Number
-	 * [31:24] reserved
-	 */
-	0xC094, 0xff000000, 0x00ff0000,
-	/* LDTi Type Registers
-	 * F0:0x98 i = 0,
-	 * F0:0xB8 i = 1,
-	 * F0:0xD8 i = 2,
-	 */
 	/* Careful set limit registers before base registers which contain the enables */
 	/* DRAM Limit i Registers
 	 * F1:0x44 i = 0
@@ -336,18 +48,18 @@ static void sdram_set_registers(void)
 	 *         that define the end of the DRAM region.
 	 */
 #if MEMORY_1024MB
-	0xC144, 0x0000f8f8, 0x003f0000,
+	PCI_ADDR(0, 0x18, 1, 0x44), 0x0000f8f8, 0x003f0000,
 #endif
 #if MEMORY_512MB
-	0xC144, 0x0000f8f8, 0x001f0000,
+	PCI_ADDR(0, 0x18, 1, 0x44), 0x0000f8f8, 0x001f0000,
 #endif
-	0xC14C, 0x0000f8f8, 0x00000001,
-	0xC154, 0x0000f8f8, 0x00000002,
-	0xC15C, 0x0000f8f8, 0x00000003,
-	0xC164, 0x0000f8f8, 0x00000004,
-	0xC16C, 0x0000f8f8, 0x00000005,
-	0xC174, 0x0000f8f8, 0x00000006,
-	0xC17C, 0x0000f8f8, 0x00000007,
+	PCI_ADDR(0, 0x18, 1, 0x4C), 0x0000f8f8, 0x00000001,
+	PCI_ADDR(0, 0x18, 1, 0x54), 0x0000f8f8, 0x00000002,
+	PCI_ADDR(0, 0x18, 1, 0x5C), 0x0000f8f8, 0x00000003,
+	PCI_ADDR(0, 0x18, 1, 0x64), 0x0000f8f8, 0x00000004,
+	PCI_ADDR(0, 0x18, 1, 0x6C), 0x0000f8f8, 0x00000005,
+	PCI_ADDR(0, 0x18, 1, 0x74), 0x0000f8f8, 0x00000006,
+	PCI_ADDR(0, 0x18, 1, 0x7C), 0x0000f8f8, 0x00000007,
 	/* DRAM Base i Registers
 	 * F1:0x40 i = 0
 	 * F1:0x48 i = 1
@@ -378,24 +90,24 @@ static void sdram_set_registers(void)
 	 *         This field defines the upper address bits of a 40-bit address
 	 *         that define the start of the DRAM region.
 	 */
-	0xC140, 0x0000f8fc, 0x00000003,
+	PCI_ADDR(0, 0x18, 1, 0x40), 0x0000f8fc, 0x00000003,
 #if MEMORY_1024MB
-	0xC148, 0x0000f8fc, 0x00400000,
-	0xC150, 0x0000f8fc, 0x00400000,
-	0xC158, 0x0000f8fc, 0x00400000,
-	0xC160, 0x0000f8fc, 0x00400000,
-	0xC168, 0x0000f8fc, 0x00400000,
-	0xC170, 0x0000f8fc, 0x00400000,
-	0xC178, 0x0000f8fc, 0x00400000,
+	PCI_ADDR(0, 0x18, 1, 0x48), 0x0000f8fc, 0x00400000,
+	PCI_ADDR(0, 0x18, 1, 0x50), 0x0000f8fc, 0x00400000,
+	PCI_ADDR(0, 0x18, 1, 0x58), 0x0000f8fc, 0x00400000,
+	PCI_ADDR(0, 0x18, 1, 0x60), 0x0000f8fc, 0x00400000,
+	PCI_ADDR(0, 0x18, 1, 0x68), 0x0000f8fc, 0x00400000,
+	PCI_ADDR(0, 0x18, 1, 0x70), 0x0000f8fc, 0x00400000,
+	PCI_ADDR(0, 0x18, 1, 0x78), 0x0000f8fc, 0x00400000,
 #endif
 #if MEMORY_512MB
-	0xC148, 0x0000f8fc, 0x00200000,
-	0xC150, 0x0000f8fc, 0x00200000,
-	0xC158, 0x0000f8fc, 0x00200000,
-	0xC160, 0x0000f8fc, 0x00200000,
-	0xC168, 0x0000f8fc, 0x00200000,
-	0xC170, 0x0000f8fc, 0x00200000,
-	0xC178, 0x0000f8fc, 0x00200000,
+	PCI_ADDR(0, 0x18, 1, 0x48), 0x0000f8fc, 0x00200000,
+	PCI_ADDR(0, 0x18, 1, 0x50), 0x0000f8fc, 0x00200000,
+	PCI_ADDR(0, 0x18, 1, 0x58), 0x0000f8fc, 0x00200000,
+	PCI_ADDR(0, 0x18, 1, 0x60), 0x0000f8fc, 0x00200000,
+	PCI_ADDR(0, 0x18, 1, 0x68), 0x0000f8fc, 0x00200000,
+	PCI_ADDR(0, 0x18, 1, 0x70), 0x0000f8fc, 0x00200000,
+	PCI_ADDR(0, 0x18, 1, 0x78), 0x0000f8fc, 0x00200000,
 #endif
 
 	/* Memory-Mapped I/O Limit i Registers
@@ -430,14 +142,14 @@ static void sdram_set_registers(void)
 	 *         This field defines the upp adddress bits of a 40-bit address that
 	 *         defines the end of a memory-mapped I/O region n
 	 */
-	0xC184, 0x00000048, 0x00e1ff00,
-	0xC18C, 0x00000048, 0x00dfff00,
-	0xC194, 0x00000048, 0x00e3ff00,
-	0xC19C, 0x00000048, 0x00000000,
-	0xC1A4, 0x00000048, 0x00000000,
-	0xC1AC, 0x00000048, 0x00000000,
-	0xC1B4, 0x00000048, 0x00000b00,
-	0xC1BC, 0x00000048, 0x00fe0b00,
+	PCI_ADDR(0, 0x18, 1, 0x84), 0x00000048, 0x00e1ff00,
+	PCI_ADDR(0, 0x18, 1, 0x8C), 0x00000048, 0x00dfff00,
+	PCI_ADDR(0, 0x18, 1, 0x94), 0x00000048, 0x00e3ff00,
+	PCI_ADDR(0, 0x18, 1, 0x9C), 0x00000048, 0x00000000,
+	PCI_ADDR(0, 0x18, 1, 0xA4), 0x00000048, 0x00000000,
+	PCI_ADDR(0, 0x18, 1, 0xAC), 0x00000048, 0x00000000,
+	PCI_ADDR(0, 0x18, 1, 0xB4), 0x00000048, 0x00000b00,
+	PCI_ADDR(0, 0x18, 1, 0xBC), 0x00000048, 0x00fe0b00,
 
 	/* Memory-Mapped I/O Base i Registers
 	 * F1:0x80 i = 0
@@ -465,18 +177,18 @@ static void sdram_set_registers(void)
 	 *         This field defines the upper address bits of a 40bit address 
 	 *         that defines the start of memory-mapped I/O region i
 	 */
-	0xC180, 0x000000f0, 0x00e00003,
-	0xC188, 0x000000f0, 0x00d80003,
-	0xC190, 0x000000f0, 0x00e20003,
-	0xC198, 0x000000f0, 0x00000000,
-	0xC1A0, 0x000000f0, 0x00000000,
-	0xC1A8, 0x000000f0, 0x00000000,
-	0xC1B0, 0x000000f0, 0x00000a03,
+	PCI_ADDR(0, 0x18, 1, 0x80), 0x000000f0, 0x00e00003,
+	PCI_ADDR(0, 0x18, 1, 0x88), 0x000000f0, 0x00d80003,
+	PCI_ADDR(0, 0x18, 1, 0x90), 0x000000f0, 0x00e20003,
+	PCI_ADDR(0, 0x18, 1, 0x98), 0x000000f0, 0x00000000,
+	PCI_ADDR(0, 0x18, 1, 0xA0), 0x000000f0, 0x00000000,
+	PCI_ADDR(0, 0x18, 1, 0xA8), 0x000000f0, 0x00000000,
+	PCI_ADDR(0, 0x18, 1, 0xB0), 0x000000f0, 0x00000a03,
 #if MEMORY_1024MB
-	0xC1B8, 0x000000f0, 0x00400003,
+	PCI_ADDR(0, 0x18, 1, 0xB8), 0x000000f0, 0x00400003,
 #endif
 #if MEMORY_512MB
-	0xC1B8, 0x000000f0, 0x00200003,
+	PCI_ADDR(0, 0x18, 1, 0xB8), 0x000000f0, 0x00200003,
 #endif
 
 	/* PCI I/O Limit i Registers
@@ -504,10 +216,10 @@ static void sdram_set_registers(void)
 	 *         This field defines the end of PCI I/O region n
 	 * [31:25] Reserved
 	 */
-	0xC1C4, 0xFE000FC8, 0x0000d000,
-	0xC1CC, 0xFE000FC8, 0x000ff000,
-	0xC1D4, 0xFE000FC8, 0x00000000,
-	0xC1DC, 0xFE000FC8, 0x00000000,
+	PCI_ADDR(0, 0x18, 1, 0xC4), 0xFE000FC8, 0x0000d000,
+	PCI_ADDR(0, 0x18, 1, 0xCC), 0xFE000FC8, 0x000ff000,
+	PCI_ADDR(0, 0x18, 1, 0xD4), 0xFE000FC8, 0x00000000,
+	PCI_ADDR(0, 0x18, 1, 0xDC), 0xFE000FC8, 0x00000000,
 
 	/* PCI I/O Base i Registers
 	 * F1:0xC0 i = 0
@@ -534,10 +246,10 @@ static void sdram_set_registers(void)
 	 *         This field defines the start of PCI I/O region n 
 	 * [31:25] Reserved
 	 */
-	0xC1C0, 0xFE000FCC, 0x0000d003,
-	0xC1C8, 0xFE000FCC, 0x00001013,
-	0xC1D0, 0xFE000FCC, 0x00000000,
-	0xC1D8, 0xFE000FCC, 0x00000000,
+	PCI_ADDR(0, 0x18, 1, 0xC0), 0xFE000FCC, 0x0000d003,
+	PCI_ADDR(0, 0x18, 1, 0xC8), 0xFE000FCC, 0x00001013,
+	PCI_ADDR(0, 0x18, 1, 0xD0), 0xFE000FCC, 0x00000000,
+	PCI_ADDR(0, 0x18, 1, 0xD8), 0xFE000FCC, 0x00000000,
 
 	/* Config Base and Limit i Registers
 	 * F1:0xE0 i = 0
@@ -575,10 +287,10 @@ static void sdram_set_registers(void)
 	 * [31:24] Bus Number Limit i
 	 *         This field defines the highest bus number in configuration regin i
 	 */
-	0xC1E0, 0x0000FC88, 0xff000003,
-	0xC1E4, 0x0000FC88, 0x00000000,
-	0xC1E8, 0x0000FC88, 0x00000000,
-	0xC1EC, 0x0000FC88, 0x00000000,
+	PCI_ADDR(0, 0x18, 1, 0xE0), 0x0000FC88, 0xff000003,
+	PCI_ADDR(0, 0x18, 1, 0xE4), 0x0000FC88, 0x00000000,
+	PCI_ADDR(0, 0x18, 1, 0xE8), 0x0000FC88, 0x00000000,
+	PCI_ADDR(0, 0x18, 1, 0xEC), 0x0000FC88, 0x00000000,
 
 	/* DRAM CS Base Address i Registers
 	 * F2:0x40 i = 0
@@ -601,21 +313,21 @@ static void sdram_set_registers(void)
 	 *         address that define the memory address space.  These
 	 *         bits decode 32-MByte blocks of memory.
 	 */
-	0xC240, 0x001f01fe, 0x00000001,
+	PCI_ADDR(0, 0x18, 2, 0x40), 0x001f01fe, 0x00000001,
 #if MEMORY_1024MB
-	0xC244, 0x001f01fe, 0x01000001,
-	0xC248, 0x001f01fe, 0x02000001,
-	0xC24C, 0x001f01fe, 0x03000001,
+	PCI_ADDR(0, 0x18, 2, 0x44), 0x001f01fe, 0x01000001,
+	PCI_ADDR(0, 0x18, 2, 0x48), 0x001f01fe, 0x02000001,
+	PCI_ADDR(0, 0x18, 2, 0x4C), 0x001f01fe, 0x03000001,
 #endif
 #if MEMORY_512MB
-	0xC244, 0x001f01fe, 0x00800001,
-	0xC248, 0x001f01fe, 0x01000001,
-	0xC24C, 0x001f01fe, 0x01800001,
+	PCI_ADDR(0, 0x18, 2, 0x44), 0x001f01fe, 0x00800001,
+	PCI_ADDR(0, 0x18, 2, 0x48), 0x001f01fe, 0x01000001,
+	PCI_ADDR(0, 0x18, 2, 0x4C), 0x001f01fe, 0x01800001,
 #endif
-	0xC250, 0x001f01fe, 0x00000000,
-	0xC254, 0x001f01fe, 0x00000000,
-	0xC258, 0x001f01fe, 0x00000000,
-	0xC25C, 0x001f01fe, 0x00000000,
+	PCI_ADDR(0, 0x18, 2, 0x50), 0x001f01fe, 0x00000000,
+	PCI_ADDR(0, 0x18, 2, 0x54), 0x001f01fe, 0x00000000,
+	PCI_ADDR(0, 0x18, 2, 0x58), 0x001f01fe, 0x00000000,
+	PCI_ADDR(0, 0x18, 2, 0x5C), 0x001f01fe, 0x00000000,
 	/* DRAM CS Mask Address i Registers
 	 * F2:0x60 i = 0
 	 * F2:0x64 i = 1
@@ -636,21 +348,21 @@ static void sdram_set_registers(void)
 	 * 
 	 */
 #if MEMORY_1024MB
-	0xC260, 0xC01f01ff, 0x00e0fe00,
-	0xC264, 0xC01f01ff, 0x00e0fe00,
-	0xC268, 0xC01f01ff, 0x00e0fe00,
-	0xC26C, 0xC01f01ff, 0x00e0fe00,
+	PCI_ADDR(0, 0x18, 2, 0x60), 0xC01f01ff, 0x00e0fe00,
+	PCI_ADDR(0, 0x18, 2, 0x64), 0xC01f01ff, 0x00e0fe00,
+	PCI_ADDR(0, 0x18, 2, 0x68), 0xC01f01ff, 0x00e0fe00,
+	PCI_ADDR(0, 0x18, 2, 0x6C), 0xC01f01ff, 0x00e0fe00,
 #endif
 #if MEMORY_512MB
-	0xC260, 0xC01f01ff, 0x0060fe00,
-	0xC264, 0xC01f01ff, 0x0060fe00,
-	0xC268, 0xC01f01ff, 0x0060fe00,
-	0xC26C, 0xC01f01ff, 0x0060fe00,
+	PCI_ADDR(0, 0x18, 2, 0x60), 0xC01f01ff, 0x0060fe00,
+	PCI_ADDR(0, 0x18, 2, 0x64), 0xC01f01ff, 0x0060fe00,
+	PCI_ADDR(0, 0x18, 2, 0x68), 0xC01f01ff, 0x0060fe00,
+	PCI_ADDR(0, 0x18, 2, 0x6C), 0xC01f01ff, 0x0060fe00,
 #endif
-	0xC270, 0xC01f01ff, 0x00000000,
-	0xC274, 0xC01f01ff, 0x00000000,
-	0xC278, 0xC01f01ff, 0x00000000,
-	0xC27C, 0xC01f01ff, 0x00000000,
+	PCI_ADDR(0, 0x18, 2, 0x70), 0xC01f01ff, 0x00000000,
+	PCI_ADDR(0, 0x18, 2, 0x74), 0xC01f01ff, 0x00000000,
+	PCI_ADDR(0, 0x18, 2, 0x78), 0xC01f01ff, 0x00000000,
+	PCI_ADDR(0, 0x18, 2, 0x7C), 0xC01f01ff, 0x00000000,
 	/* DRAM Bank Address Mapping Register
 	 * F2:0x80
 	 * Specify the memory module size
@@ -672,10 +384,10 @@ static void sdram_set_registers(void)
 	 * [31:15]
 	 */
 #if MEMORY_1024MB
-	0xC280, 0xffff8888, 0x00000033,
+	PCI_ADDR(0, 0x18, 2, 0x80), 0xffff8888, 0x00000033,
 #endif
 #if MEMORY_512MB
-	0xC280, 0xffff8888, 0x00000022,
+	PCI_ADDR(0, 0x18, 2, 0x80), 0xffff8888, 0x00000022,
 #endif
 	/* DRAM Timing Low Register
 	 * F2:0x88
@@ -741,7 +453,7 @@ static void sdram_set_registers(void)
 	 *         1 = 3 bus clocks
 	 * [31:29] Reserved
 	 */
-	0xC288, 0xe8088008, 0x03623125,
+	PCI_ADDR(0, 0x18, 2, 0x88), 0xe8088008, 0x03623125,
 	/* DRAM Timing High Register
 	 * F2:0x8C
 	 * [ 0: 0] Twtr (Write to Read Delay)
@@ -772,10 +484,10 @@ static void sdram_set_registers(void)
 	 * [31:23] Reserved
 	 */
 #if MEMORY_1024MB
-	0xC28c, 0xff8fe08e, 0x00000930,
+	PCI_ADDR(0, 0x18, 2, 0x8c), 0xff8fe08e, 0x00000930,
 #endif
 #if MEMORY_512MB
-	0xC28c, 0xff8fe08e, 0x00000130,
+	PCI_ADDR(0, 0x18, 2, 0x8c), 0xff8fe08e, 0x00000130,
 #endif
 
 	/* DRAM Config Low Register
@@ -848,7 +560,7 @@ static void sdram_set_registers(void)
 	 *         111 = Oldest entry in DCQ can be bypassed 7 times
 	 * [31:28] Reserved
 	 */
-	0xC290, 0xf0000000, 
+	PCI_ADDR(0, 0x18, 2, 0x90), 0xf0000000, 
 	(4 << 25)|(0 << 24)| 
 	(0 << 23)|(0 << 22)|(0 << 21)|(0 << 20)| 
 	(1 << 19)|(1 << 18)|(0 << 17)|(0 << 16)| 
@@ -920,10 +632,10 @@ static void sdram_set_registers(void)
 	 * [31:30] Reserved
 	 */
 #if MEMORY_1024MB
-	0xC294, 0xc180f0f0, 0x0e2b0a05,
+	PCI_ADDR(0, 0x18, 2, 0x94), 0xc180f0f0, 0x0e2b0a05,
 #endif
 #if MEMORY_512MB
-	0xC294, 0xc180f0f0, 0x0e2b0a06,
+	PCI_ADDR(0, 0x18, 2, 0x94), 0xc180f0f0, 0x0e2b0a06,
 #endif
 	/* DRAM Delay Line Register
 	 * F2:0x98
@@ -940,7 +652,7 @@ static void sdram_set_registers(void)
 	 *         1 = Adj is used to decrease the PDL delay
 	 * [31:26] Reserved
 	 */
-	0xC298, 0xfc00ffff, 0x00000000,
+	PCI_ADDR(0, 0x18, 2, 0x98), 0xfc00ffff, 0x00000000,
 	/* DRAM Scrub Control Register
 	 * F3:0x58
 	 * [ 4: 0] DRAM Scrube Rate
@@ -974,7 +686,7 @@ static void sdram_set_registers(void)
 	 *         10110 =  84.00 ms
 	 *         All Others = Reserved
 	 */
-	0xC358, 0xffe0e0e0, 0x00000000,
+	PCI_ADDR(0, 0x18, 3, 0x58), 0xffe0e0e0, 0x00000000,
 	/* DRAM Scrub Address Low Register
 	 * F3:0x5C
 	 * [ 0: 0] DRAM Scrubber Redirect Enable
@@ -983,17 +695,17 @@ static void sdram_set_registers(void)
 	 * [ 5: 1] Reserved
 	 * [31: 6] DRAM Scrub Address 31-6
 	 */
-	0xC35C, 0x0000003e, 0x00000000,
+	PCI_ADDR(0, 0x18, 3, 0x5C), 0x0000003e, 0x00000000,
 	/* DRAM Scrub Address High Register
 	 * F3:0x60
 	 * [ 7: 0] DRAM Scrubb Address 39-32
 	 * [31: 8] Reserved
 	 */
-	0xC360, 0xffffff00, 0x00000000,
+	PCI_ADDR(0, 0x18, 3, 0x60), 0xffffff00, 0x00000000,
 	};
 	int i;
 	int max;
-	print_debug("setting up northbridge registers\r\n");
+	print_debug("setting up CPU0 northbridge registers\r\n");
 	max = sizeof(register_values)/sizeof(register_values[0]);
 	for(i = 0; i < max; i += 3) {
 		unsigned long reg;
@@ -1003,18 +715,14 @@ static void sdram_set_registers(void)
 		print_debug_hex32(register_values[i+2]);
 		print_debug("\r\n");
 #endif
-		reg = pcibios_read_config_dword(
-			0, register_values[i] >> 8, register_values[i] & 0xff);
+		reg = pci_read_config32(register_values[i]);
 		reg &= register_values[i+1];
-		reg |= register_values[i+2] & ~register_values[i+1];
-		pcibios_write_config_dword(
-			0, register_values[i] >> 8, register_values[i] & 0xff, reg);
+		reg |= register_values[i+2];
+		pci_write_config32(register_values[i], reg);
 	}
-	print_debug("setting up northbridge registers done. hurray!\r\n");
+	print_debug("done.\r\n");
 }
 
-#define PCI_DEVFN(slot,func)	((((slot) & 0x1f) << 3) | ((func) & 0x07))
-
 #define DRAM_CONFIG_LOW 0x90
 #define  DCL_DLL_Disable   (1<<0)
 #define  DCL_D_DRV         (1<<1)
@@ -1025,13 +733,20 @@ static void sdram_set_registers(void)
 #define  DCL_MemClrStatus  (1<<11)
 #define  DCL_DimmEcEn      (1<<17)
 
+#define NODE_ID		0x60
+#define	HT_INIT_CONTROL 0x6c
+
+#define HTIC_ColdR_Detect  (1<<4)
+#define HTIC_BIOSR_Detect  (1<<5)
+#define HTIC_INIT_Detect   (1<<6)
+
 static void sdram_set_spd_registers(void) 
 {
 	unsigned long dcl;
-	dcl = pcibios_read_config_dword(0, PCI_DEVFN(0x18,2), DRAM_CONFIG_LOW);
+	dcl = pci_read_config32(PCI_ADDR(0, 0x18, 2, DRAM_CONFIG_LOW));
 	/* Until I know what is going on disable ECC support */
 	dcl &= ~DCL_DimmEcEn;
-	pcibios_write_config_dword(0, PCI_DEVFN(0x18,2), DRAM_CONFIG_LOW, dcl);
+	pci_write_config32(PCI_ADDR(0, 0x18, 2, DRAM_CONFIG_LOW), dcl);
 }
 
 #define TIMEOUT_LOOPS 300000
@@ -1040,27 +755,26 @@ static void sdram_enable(void)
 	unsigned long dcl;
 
 	/* Toggle DisDqsHys to get it working */
-	dcl = pcibios_read_config_dword(0, PCI_DEVFN(0x18,2), DRAM_CONFIG_LOW);
+	dcl = pci_read_config32(PCI_ADDR(0, 0x18, 2, DRAM_CONFIG_LOW));
 	print_debug("dcl: ");
 	print_debug_hex32(dcl);
 	print_debug("\r\n");
 	dcl |= DCL_DisDqsHys;
-	pcibios_write_config_dword(0, PCI_DEVFN(0x18, 2), DRAM_CONFIG_LOW, dcl);
+	pci_write_config32(PCI_ADDR(0, 0x18, 2, DRAM_CONFIG_LOW), dcl);
 	dcl &= ~DCL_DisDqsHys;
 	dcl &= ~DCL_DLL_Disable;
 	dcl &= ~DCL_D_DRV;
 	dcl &= ~DCL_QFC_EN;
 	dcl |= DCL_DramInit;
-	pcibios_write_config_dword(0, PCI_DEVFN(0x18, 2), DRAM_CONFIG_LOW, dcl);
+	pci_write_config32(PCI_ADDR(0, 0x18, 2, DRAM_CONFIG_LOW), dcl);
 	
 	print_debug("Initializing memory: ");
 	int loops = 0;
 	do {
-		dcl = pcibios_read_config_dword(0, PCI_DEVFN(0x18, 2), DRAM_CONFIG_LOW);
+		dcl = pci_read_config32(PCI_ADDR(0, 0x18, 2, DRAM_CONFIG_LOW));
 		loops += 1;
 		if ((loops & 1023) == 0) {
-			print_debug(" ");
-			print_debug_hex32(loops);
+			print_debug(".");
 		}
 	} while(((dcl & DCL_DramInit) != 0) && (loops < TIMEOUT_LOOPS));
 	if (loops >= TIMEOUT_LOOPS) {
@@ -1073,7 +787,7 @@ static void sdram_enable(void)
 	print_debug("Clearing memory: ");
 	loops = 0;
 	do {
-		dcl = pcibios_read_config_dword(0, PCI_DEVFN(0x18, 2), DRAM_CONFIG_LOW);
+		dcl = pci_read_config32(PCI_ADDR(0, 0x18, 2, DRAM_CONFIG_LOW));
 		loops += 1;
 		if ((loops & 1023) == 0) {
 			print_debug(" ");
@@ -1092,34 +806,932 @@ static void sdram_first_normal_reference(void) {}
 static void sdram_enable_refresh(void) {}
 static void sdram_special_finishup(void) {}
 
-static int sdram_enabled(void)
+#include "sdram/generic_sdram.c"
+
+static int boot_cpu(void)
+{
+	volatile unsigned long *local_apic;
+	unsigned long apic_id;
+	int bsp;
+	msr_t msr;
+	msr = rdmsr(0x1b);
+	bsp = !!(msr.lo & (1 << 8));
+	if (bsp) {
+		print_debug("Bootstrap cpu\r\n");
+	}
+
+	return bsp;
+}
+
+static int cpu_init_detected(void)
 {
 	unsigned long dcl;
-	int enabled;
-	dcl = pcibios_read_config_dword(0, PCI_DEVFN(0x18, 2), DRAM_CONFIG_LOW);
-	enabled = !!(dcl & DCL_DramEnable);
-	if (enabled) {
-		print_debug("DRAM already enabled.");
+	int cpu_init;
+
+	unsigned long htic;
+
+	htic = pci_read_config32(PCI_ADDR(0, 0x18, 0, HT_INIT_CONTROL));
+#if 0
+	print_debug("htic: ");
+	print_debug_hex32(htic);
+	print_debug("\r\n");
+
+	if (!(htic & HTIC_ColdR_Detect)) {
+		print_debug("Cold Reset.\r\n");
+	}
+	if ((htic & HTIC_ColdR_Detect) && !(htic & HTIC_BIOSR_Detect)) {
+		print_debug("BIOS generated Reset.\r\n");
 	}
-	return enabled;
+	if (htic & HTIC_INIT_Detect) {
+		print_debug("Init event.\r\n");
+	}
+#endif
+	cpu_init = (htic & HTIC_INIT_Detect);
+	if (cpu_init) {
+		print_debug("CPU INIT Detected.\r\n");
+	}
+	return cpu_init;
 }
 
+static void setup_coherent_ht_domain(void)
+{
+	static const unsigned int register_values[] = {
+	/* Routing Table Node i 
+	 * F0:0x40 i = 0, 
+	 * F0:0x44 i = 1,
+	 * F0:0x48 i = 2, 
+	 * F0:0x4c i = 3,
+	 * F0:0x50 i = 4, 
+	 * F0:0x54 i = 5,
+	 * F0:0x58 i = 6, 
+	 * F0:0x5c i = 7
+	 * [ 0: 3] Request Route
+	 *     [0] Route to this node
+	 *     [1] Route to Link 0
+	 *     [2] Route to Link 1
+	 *     [3] Route to Link 2
+	 * [11: 8] Response Route
+	 *     [0] Route to this node
+	 *     [1] Route to Link 0
+	 *     [2] Route to Link 1
+	 *     [3] Route to Link 2
+	 * [19:16] Broadcast route
+	 *     [0] Route to this node
+	 *     [1] Route to Link 0
+	 *     [2] Route to Link 1
+	 *     [3] Route to Link 2
+	 */
+	PCI_ADDR(0, 0x18, 0, 0x40), 0xfff0f0f0, 0x00010101,
+	PCI_ADDR(0, 0x18, 0, 0x44), 0xfff0f0f0, 0x00010101,
+	PCI_ADDR(0, 0x18, 0, 0x48), 0xfff0f0f0, 0x00010101,
+	PCI_ADDR(0, 0x18, 0, 0x4c), 0xfff0f0f0, 0x00010101,
+	PCI_ADDR(0, 0x18, 0, 0x50), 0xfff0f0f0, 0x00010101,
+	PCI_ADDR(0, 0x18, 0, 0x54), 0xfff0f0f0, 0x00010101,
+	PCI_ADDR(0, 0x18, 0, 0x58), 0xfff0f0f0, 0x00010101,
+	PCI_ADDR(0, 0x18, 0, 0x5c), 0xfff0f0f0, 0x00010101,
 
-#include "sdram/generic_sdram.c"
+	/* Hypetransport Transaction Control Register 
+	 * F0:0x68
+	 * [ 0: 0] Disable read byte probe
+	 *         0 = Probes issues
+	 *         1 = Probes not issued
+	 * [ 1: 1] Disable Read Doubleword probe
+	 *         0 = Probes issued
+	 *         1 = Probes not issued
+	 * [ 2: 2] Disable write byte probes
+	 *         0 = Probes issued
+	 *         1 = Probes not issued
+	 * [ 3: 3] Disable Write Doubleword Probes
+	 *         0 = Probes issued
+	 *         1 = Probes not issued.
+	 * [ 4: 4] Disable Memroy Controller Target Start
+	 *         0 = TgtStart packets are generated
+	 *         1 = TgtStart packets are not generated.
+	 * [ 5: 5] CPU1 Enable
+	 *         0 = Second CPU disabled or not present
+	 *         1 = Second CPU enabled.
+	 * [ 6: 6] CPU Request PassPW
+	 *         0 = CPU requests do not pass posted writes
+	 *         1 = CPU requests pass posted writes.
+	 * [ 7: 7] CPU read Respons PassPW
+	 *         0 = CPU Responses do not pass posted writes
+	 *         1 = CPU responses pass posted writes.
+	 * [ 8: 8] Disable Probe Memory Cancel
+	 *         0 = Probes may generate MemCancels
+	 *         1 = Probes may not generate MemCancels
+	 * [ 9: 9] Disable Remote Probe Memory Cancel.
+	 *         0 = Probes hitting dirty blocks generate memory cancel packets
+	 *         1 = Only probed caches on the same node as the memory controller
+	 *              generate cancel packets.
+	 * [10:10] Disable Fill Probe
+	 *         0 = Probes issued for cache fills
+	 *         1 = Probes not issued for cache fills.
+	 * [11:11] Response PassPw
+	 *         0 = Downstream response PassPW based on original request
+	 *         1 = Downstream response PassPW set to 1
+	 * [12:12] Change ISOC to Ordered
+	 *         0 = Bit 1 of coherent HT RdSz/WrSz command used for iosynchronous prioritization
+	 *         1 = Bit 1 of coherent HT RdSz/WrSz command used for ordering.
+	 * [14:13] Buffer Release Priority select 
+	 *         00 = 64
+	 *         01 = 16
+	 *         10 = 8
+	 *         11 = 2
+	 * [15:15] Limit Coherent HT Configuration Space Range
+	 *         0 = No coherent HT configuration space restrictions
+	 *         1 = Limit coherent HT configuration space based on node count
+	 * [16:16] Local Interrupt Conversion Enable.
+	 *         0 = ExtInt/NMI interrups unaffected.
+	 *         1 = ExtInt/NMI broadcat interrupts converted to LINT0/1
+	 * [17:17] APIC Extended Broadcast Enable.
+	 *         0 = APIC broadcast is 0F
+	 *         1 = APIC broadcast is FF
+	 * [18:18] APIC Extended ID Enable
+	 *         0 = APIC ID is 4 bits.
+	 *         1 = APIC ID is 8 bits.
+	 * [19:19] APIC Extended Spurious Vector Enable
+	 *         0 = Lower 4 bits of spurious vector are read-only 1111
+	 *         1 = Lower 4 bits of spurious vecotr are writeable.
+	 * [20:20] Sequence ID Source Node Enable
+	 *         0 = Normal operation
+	 *         1 = Keep SeqID on routed packets for debugging.
+	 * [22:21] Downstream non-posted request limit
+	 *         00 = No limit
+	 *         01 = Limited to 1
+	 *         10 = Limited to 4
+	 *         11 = Limited to 8
+	 * [23:23] RESERVED
+	 * [25:24] Medium-Priority Bypass Count
+	 *         - Maximum # of times a medium priority access can pass a low
+	 *           priority access before Medium-Priority mode is disabled for one access.
+	 * [27:26] High-Priority Bypass Count
+	 *         - Maximum # of times a high prioirty access can pass a medium or low
+	 *           priority access before High-prioirty mode is disabled for one access.
+	 * [28:28] Enable High Priority CPU Reads
+	 *         0 = Cpu reads are medium prioirty
+	 *         1 = Cpu reads are high prioirty
+	 * [29:29] Disable Low Priority Writes
+	 *         0 = Non-isochronous writes are low priority
+	 *         1 = Non-isochronous writes are medium prioirty
+	 * [30:30] Disable High Priority Isochronous writes
+	 *         0 = Isochronous writes are high priority
+	 *         1 = Isochronous writes are medium priority
+	 * [31:31] Disable Medium Priority Isochronous writes
+	 *         0 = Isochronous writes are medium are high
+	 *         1 = With bit 30 set makes Isochrouns writes low priority.
+	 */
+	PCI_ADDR(0, 0x18, 0, 0x68), 0x00800000, 0x0f00840f,
+	/* HT Initialization Control Register
+	 * F0:0x6C
+	 * [ 0: 0] Routing Table Disable
+	 *         0 = Packets are routed according to routing tables
+	 *         1 = Packets are routed according to the default link field
+	 * [ 1: 1] Request Disable (BSP should clear this)
+	 *         0 = Request packets may be generated
+	 *         1 = Request packets may not be generated.
+	 * [ 3: 2] Default Link (Read-only)
+	 *         00 = LDT0
+	 *         01 = LDT1
+	 *         10 = LDT2
+	 *         11 = CPU on same node
+	 * [ 4: 4] Cold Reset
+	 *         - Scratch bit cleared by a cold reset
+	 * [ 5: 5] BIOS Reset Detect
+	 *         - Scratch bit cleared by a cold reset
+	 * [ 6: 6] INIT Detect
+	 *         - Scratch bit cleared by a warm or cold reset not by an INIT
+	 *
+	 */
+	PCI_ADDR(0, 0x18, 0, 0x6C), 0xffffff8c, 0x00000000 | (1 << 6) |(1 << 5)| (1 << 4),
+	/* LDTi Capabilities Registers
+	 * F0:0x80 i = 0,
+	 * F0:0xA0 i = 1,
+	 * F0:0xC0 i = 2,
+	 */
+	/* LDTi Link Control Registrs
+	 * F0:0x84 i = 0,
+	 * F0:0xA4 i = 1,
+	 * F0:0xC4 i = 2,
+	 * [ 1: 1] CRC Flood Enable
+	 *         0 = Do not generate sync packets on CRC error
+	 *         1 = Generate sync packets on CRC error
+	 * [ 2: 2] CRC Start Test (Read-Only)
+	 * [ 3: 3] CRC Force Frame Error
+	 *         0 = Do not generate bad CRC
+	 *         1 = Generate bad CRC
+	 * [ 4: 4] Link Failure
+	 *         0 = No link failure detected
+	 *         1 = Link failure detected
+	 * [ 5: 5] Initialization Complete
+	 *         0 = Initialization not complete
+	 *         1 = Initialization complete
+	 * [ 6: 6] Receiver off
+	 *         0 = Recevier on
+	 *         1 = Receiver off
+	 * [ 7: 7] Transmitter Off
+	 *         0 = Transmitter on
+	 *         1 = Transmitter off
+	 * [ 9: 8] CRC_Error
+	 *         00 = No error
+	 *         [0] = 1 Error on byte lane 0
+	 *         [1] = 1 Error on byte lane 1
+	 * [12:12] Isochrnous Enable  (Read-Only)
+	 * [13:13] HT Stop Tristate Enable
+	 *         0 = Driven during an LDTSTOP_L
+	 *         1 = Tristated during and LDTSTOP_L
+	 * [14:14] Extended CTL Time 
+	 *         0 = CTL is asserted for 16 bit times during link initialization
+	 *         1 = CTL is asserted for 50us during link initialization
+	 * [18:16] Max Link Width In (Read-Only?)
+	 *         000 = 8 bit link
+	 *         001 = 16bit link
+	 * [19:19] Doubleword Flow Control in (Read-Only)
+	 *         0 = This link does not support doubleword flow control
+	 *         1 = This link supports doubleword flow control
+	 * [22:20] Max Link Width Out (Read-Only?)
+	 *         000 = 8 bit link
+	 *         001 = 16bit link
+	 * [23:23] Doubleworld Flow Control out (Read-Only)
+	 *         0 = This link does not support doubleword flow control
+	 *         1 = This link supports doubleworkd flow control
+	 * [26:24] Link Width In
+	 *         000 = Use 8 bits
+	 *         001 = Use 16 bits
+	 *         010 = reserved
+	 *         011 = Use 32 bits
+	 *         100 = Use 2 bits
+	 *         101 = Use 4 bits
+	 *         110 = reserved
+	 *         111 = Link physically not connected
+	 * [27:27] Doubleword Flow Control In Enable
+	 *         0 = Doubleword flow control disabled
+	 *         1 = Doubleword flow control enabled (Not currently supported)
+	 * [30:28] Link Width Out
+	 *         000 = Use 8 bits
+	 *         001 = Use 16 bits
+	 *         010 = reserved
+	 *         011 = Use 32 bits
+	 *         100 = Use 2 bits
+	 *         101 = Use 4 bits
+	 *         110 = reserved
+	 *         111 = Link physically not connected
+	 * [31:31] Doubleworld Flow Control Out Enable
+	 *         0 = Doubleworld flow control disabled
+	 *         1 = Doubleword flow control enabled (Not currently supported)
+	 */
+	PCI_ADDR(0, 0x18, 0, 0x84), 0x00009c05, 0x11110020,
+	/* LDTi Frequency/Revision Registers
+	 * F0:0x88 i = 0,
+	 * F0:0xA8 i = 1,
+	 * F0:0xC8 i = 2,
+	 * [ 4: 0] Minor Revision
+	 *         Contains the HT Minor revision
+	 * [ 7: 5] Major Revision
+	 *         Contains the HT Major revision
+	 * [11: 8] Link Frequency  (Takes effect the next time the link is reconnected)
+	 *         0000 = 200Mhz
+	 *         0001 = reserved
+	 *         0010 = 400Mhz
+	 *         0011 = reserved
+	 *         0100 = 600Mhz
+	 *         0101 = 800Mhz
+	 *         0110 = 1000Mhz
+	 *         0111 = reserved
+	 *         1000 = reserved
+	 *         1001 = reserved
+	 *         1010 = reserved
+	 *         1011 = reserved
+	 *         1100 = reserved
+	 *         1101 = reserved
+	 *         1110 = reserved
+	 *         1111 = 100 Mhz
+	 * [15:12] Error (Not currently Implemented)
+	 * [31:16] Indicates the frequency capabilities of the link
+	 *         [16] = 1 encoding 0000 of freq supported
+	 *         [17] = 1 encoding 0001 of freq supported
+	 *         [18] = 1 encoding 0010 of freq supported
+	 *         [19] = 1 encoding 0011 of freq supported
+	 *         [20] = 1 encoding 0100 of freq supported
+	 *         [21] = 1 encoding 0101 of freq supported
+	 *         [22] = 1 encoding 0110 of freq supported
+	 *         [23] = 1 encoding 0111 of freq supported
+	 *         [24] = 1 encoding 1000 of freq supported
+	 *         [25] = 1 encoding 1001 of freq supported
+	 *         [26] = 1 encoding 1010 of freq supported
+	 *         [27] = 1 encoding 1011 of freq supported
+	 *         [28] = 1 encoding 1100 of freq supported
+	 *         [29] = 1 encoding 1101 of freq supported
+	 *         [30] = 1 encoding 1110 of freq supported
+	 *         [31] = 1 encoding 1111 of freq supported
+	 */
+	PCI_ADDR(0, 0x18, 0, 0x88), 0xfffff0ff, 0x00000200,
+	/* LDTi Feature Capability
+	 * F0:0x8C i = 0,
+	 * F0:0xAC i = 1,
+	 * F0:0xCC i = 2,
+	 */
+	/* LDTi Buffer Count Registers
+	 * F0:0x90 i = 0,
+	 * F0:0xB0 i = 1,
+	 * F0:0xD0 i = 2,
+	 */
+	/* LDTi Bus Number Registers
+	 * F0:0x94 i = 0,
+	 * F0:0xB4 i = 1,
+	 * F0:0xD4 i = 2,
+	 * For NonCoherent HT specifies the bus number downstream (behind the host bridge)
+	 * [ 0: 7] Primary Bus Number
+	 * [15: 8] Secondary Bus Number
+	 * [23:15] Subordiante Bus Number
+	 * [31:24] reserved
+	 */
+	PCI_ADDR(0, 0x18, 0, 0x94), 0xff000000, 0x00ff0000,
+	/* LDTi Type Registers
+	 * F0:0x98 i = 0,
+	 * F0:0xB8 i = 1,
+	 * F0:0xD8 i = 2,
+	 */
+	/* Careful set limit registers before base registers which contain the enables */
+	/* DRAM Limit i Registers
+	 * F1:0x44 i = 0
+	 * F1:0x4C i = 1
+	 * F1:0x54 i = 2
+	 * F1:0x5C i = 3
+	 * F1:0x64 i = 4
+	 * F1:0x6C i = 5
+	 * F1:0x74 i = 6
+	 * F1:0x7C i = 7
+	 * [ 2: 0] Destination Node ID
+	 *         000 = Node 0
+	 *         001 = Node 1
+	 *         010 = Node 2
+	 *         011 = Node 3
+	 *         100 = Node 4
+	 *         101 = Node 5
+	 *         110 = Node 6
+	 *         111 = Node 7
+	 * [ 7: 3] Reserved
+	 * [10: 8] Interleave select
+	 *         specifies the values of A[14:12] to use with interleave enable.
+	 * [15:11] Reserved
+	 * [31:16] DRAM Limit Address i Bits 39-24
+	 *         This field defines the upper address bits of a 40 bit  address
+	 *         that define the end of the DRAM region.
+	 */
+#if MEMORY_1024MB
+	PCI_ADDR(0, 0x18, 1, 0x44), 0x0000f8f8, 0x003f0000,
+#endif
+#if MEMORY_512MB
+	PCI_ADDR(0, 0x18, 1, 0x44), 0x0000f8f8, 0x001f0000,
+#endif
+	PCI_ADDR(0, 0x18, 1, 0x4C), 0x0000f8f8, 0x00000001,
+	PCI_ADDR(0, 0x18, 1, 0x54), 0x0000f8f8, 0x00000002,
+	PCI_ADDR(0, 0x18, 1, 0x5C), 0x0000f8f8, 0x00000003,
+	PCI_ADDR(0, 0x18, 1, 0x64), 0x0000f8f8, 0x00000004,
+	PCI_ADDR(0, 0x18, 1, 0x6C), 0x0000f8f8, 0x00000005,
+	PCI_ADDR(0, 0x18, 1, 0x74), 0x0000f8f8, 0x00000006,
+	PCI_ADDR(0, 0x18, 1, 0x7C), 0x0000f8f8, 0x00000007,
+	/* DRAM Base i Registers
+	 * F1:0x40 i = 0
+	 * F1:0x48 i = 1
+	 * F1:0x50 i = 2
+	 * F1:0x58 i = 3
+	 * F1:0x60 i = 4
+	 * F1:0x68 i = 5
+	 * F1:0x70 i = 6
+	 * F1:0x78 i = 7
+	 * [ 0: 0] Read Enable
+	 *         0 = Reads Disabled
+	 *         1 = Reads Enabled
+	 * [ 1: 1] Write Enable
+	 *         0 = Writes Disabled
+	 *         1 = Writes Enabled
+	 * [ 7: 2] Reserved
+	 * [10: 8] Interleave Enable
+	 *         000 = No interleave
+	 *         001 = Interleave on A[12] (2 nodes)
+	 *         010 = reserved
+	 *         011 = Interleave on A[12] and A[14] (4 nodes)
+	 *         100 = reserved
+	 *         101 = reserved
+	 *         110 = reserved
+	 *         111 = Interleve on A[12] and A[13] and A[14] (8 nodes)
+	 * [15:11] Reserved
+	 * [13:16] DRAM Base Address i Bits 39-24
+	 *         This field defines the upper address bits of a 40-bit address
+	 *         that define the start of the DRAM region.
+	 */
+	PCI_ADDR(0, 0x18, 1, 0x40), 0x0000f8fc, 0x00000003,
+#if MEMORY_1024MB
+	PCI_ADDR(0, 0x18, 1, 0x48), 0x0000f8fc, 0x00400000,
+	PCI_ADDR(0, 0x18, 1, 0x50), 0x0000f8fc, 0x00400000,
+	PCI_ADDR(0, 0x18, 1, 0x58), 0x0000f8fc, 0x00400000,
+	PCI_ADDR(0, 0x18, 1, 0x60), 0x0000f8fc, 0x00400000,
+	PCI_ADDR(0, 0x18, 1, 0x68), 0x0000f8fc, 0x00400000,
+	PCI_ADDR(0, 0x18, 1, 0x70), 0x0000f8fc, 0x00400000,
+	PCI_ADDR(0, 0x18, 1, 0x78), 0x0000f8fc, 0x00400000,
+#endif
+#if MEMORY_512MB
+	PCI_ADDR(0, 0x18, 1, 0x48), 0x0000f8fc, 0x00200000,
+	PCI_ADDR(0, 0x18, 1, 0x50), 0x0000f8fc, 0x00200000,
+	PCI_ADDR(0, 0x18, 1, 0x58), 0x0000f8fc, 0x00200000,
+	PCI_ADDR(0, 0x18, 1, 0x60), 0x0000f8fc, 0x00200000,
+	PCI_ADDR(0, 0x18, 1, 0x68), 0x0000f8fc, 0x00200000,
+	PCI_ADDR(0, 0x18, 1, 0x70), 0x0000f8fc, 0x00200000,
+	PCI_ADDR(0, 0x18, 1, 0x78), 0x0000f8fc, 0x00200000,
+#endif
+
+	/* Memory-Mapped I/O Limit i Registers
+	 * F1:0x84 i = 0
+	 * F1:0x8C i = 1
+	 * F1:0x94 i = 2
+	 * F1:0x9C i = 3
+	 * F1:0xA4 i = 4
+	 * F1:0xAC i = 5
+	 * F1:0xB4 i = 6
+	 * F1:0xBC i = 7
+	 * [ 2: 0] Destination Node ID
+	 *         000 = Node 0
+	 *         001 = Node 1
+	 *         010 = Node 2
+	 *         011 = Node 3
+	 *         100 = Node 4
+	 *         101 = Node 5
+	 *         110 = Node 6
+	 *         111 = Node 7
+	 * [ 3: 3] Reserved
+	 * [ 5: 4] Destination Link ID
+	 *         00 = Link 0
+	 *         01 = Link 1
+	 *         10 = Link 2
+	 *         11 = Reserved
+	 * [ 6: 6] Reserved
+	 * [ 7: 7] Non-Posted
+	 *         0 = CPU writes may be posted
+	 *         1 = CPU writes must be non-posted
+	 * [31: 8] Memory-Mapped I/O Limit Address i (39-16)
+	 *         This field defines the upp adddress bits of a 40-bit address that
+	 *         defines the end of a memory-mapped I/O region n
+	 */
+	PCI_ADDR(0, 0x18, 1, 0x84), 0x00000048, 0x00e1ff00,
+	PCI_ADDR(0, 0x18, 1, 0x8C), 0x00000048, 0x00dfff00,
+	PCI_ADDR(0, 0x18, 1, 0x94), 0x00000048, 0x00e3ff00,
+	PCI_ADDR(0, 0x18, 1, 0x9C), 0x00000048, 0x00000000,
+	PCI_ADDR(0, 0x18, 1, 0xA4), 0x00000048, 0x00000000,
+	PCI_ADDR(0, 0x18, 1, 0xAC), 0x00000048, 0x00000000,
+	PCI_ADDR(0, 0x18, 1, 0xB4), 0x00000048, 0x00000b00,
+	PCI_ADDR(0, 0x18, 1, 0xBC), 0x00000048, 0x00fe0b00,
+
+	/* Memory-Mapped I/O Base i Registers
+	 * F1:0x80 i = 0
+	 * F1:0x88 i = 1
+	 * F1:0x90 i = 2
+	 * F1:0x98 i = 3
+	 * F1:0xA0 i = 4
+	 * F1:0xA8 i = 5
+	 * F1:0xB0 i = 6
+	 * F1:0xB8 i = 7
+	 * [ 0: 0] Read Enable
+	 *         0 = Reads disabled
+	 *         1 = Reads Enabled
+	 * [ 1: 1] Write Enable
+	 *         0 = Writes disabled
+	 *         1 = Writes Enabled
+	 * [ 2: 2] Cpu Disable
+	 *         0 = Cpu can use this I/O range
+	 *         1 = Cpu requests do not use this I/O range
+	 * [ 3: 3] Lock
+	 *         0 = base/limit registers i are read/write
+	 *         1 = base/limit registers i are read-only
+	 * [ 7: 4] Reserved
+	 * [31: 8] Memory-Mapped I/O Base Address i (39-16)
+	 *         This field defines the upper address bits of a 40bit address 
+	 *         that defines the start of memory-mapped I/O region i
+	 */
+	PCI_ADDR(0, 0x18, 1, 0x80), 0x000000f0, 0x00e00003,
+	PCI_ADDR(0, 0x18, 1, 0x88), 0x000000f0, 0x00d80003,
+	PCI_ADDR(0, 0x18, 1, 0x90), 0x000000f0, 0x00e20003,
+	PCI_ADDR(0, 0x18, 1, 0x98), 0x000000f0, 0x00000000,
+	PCI_ADDR(0, 0x18, 1, 0xA0), 0x000000f0, 0x00000000,
+	PCI_ADDR(0, 0x18, 1, 0xA8), 0x000000f0, 0x00000000,
+	PCI_ADDR(0, 0x18, 1, 0xB0), 0x000000f0, 0x00000a03,
+#if MEMORY_1024MB
+	PCI_ADDR(0, 0x18, 1, 0xB8), 0x000000f0, 0x00400003,
+#endif
+#if MEMORY_512MB
+	PCI_ADDR(0, 0x18, 1, 0xB8), 0x000000f0, 0x00200003,
+#endif
+
+	/* PCI I/O Limit i Registers
+	 * F1:0xC4 i = 0
+	 * F1:0xCC i = 1
+	 * F1:0xD4 i = 2
+	 * F1:0xDC i = 3
+	 * [ 2: 0] Destination Node ID
+	 *         000 = Node 0
+	 *         001 = Node 1
+	 *         010 = Node 2
+	 *         011 = Node 3
+	 *         100 = Node 4
+	 *         101 = Node 5
+	 *         110 = Node 6
+	 *         111 = Node 7
+	 * [ 3: 3] Reserved
+	 * [ 5: 4] Destination Link ID
+	 *         00 = Link 0
+	 *         01 = Link 1
+	 *         10 = Link 2
+	 *         11 = reserved
+	 * [11: 6] Reserved
+	 * [24:12] PCI I/O Limit Address i
+	 *         This field defines the end of PCI I/O region n
+	 * [31:25] Reserved
+	 */
+	PCI_ADDR(0, 0x18, 1, 0xC4), 0xFE000FC8, 0x0000d000,
+	PCI_ADDR(0, 0x18, 1, 0xCC), 0xFE000FC8, 0x000ff000,
+	PCI_ADDR(0, 0x18, 1, 0xD4), 0xFE000FC8, 0x00000000,
+	PCI_ADDR(0, 0x18, 1, 0xDC), 0xFE000FC8, 0x00000000,
+
+	/* PCI I/O Base i Registers
+	 * F1:0xC0 i = 0
+	 * F1:0xC8 i = 1
+	 * F1:0xD0 i = 2
+	 * F1:0xD8 i = 3
+	 * [ 0: 0] Read Enable
+	 *         0 = Reads Disabled
+	 *         1 = Reads Enabled
+	 * [ 1: 1] Write Enable
+	 *         0 = Writes Disabled
+	 *         1 = Writes Enabled
+	 * [ 3: 2] Reserved
+	 * [ 4: 4] VGA Enable
+	 *         0 = VGA matches Disabled
+	 *         1 = matches all address < 64K and where A[9:0] is in the 
+	 *             range 3B0-3BB or 3C0-3DF independen of the base & limit registers
+	 * [ 5: 5] ISA Enable
+	 *         0 = ISA matches Disabled
+	 *         1 = Blocks address < 64K and in the last 768 bytes of eack 1K block
+	 *             from matching agains this base/limit pair
+	 * [11: 6] Reserved
+	 * [24:12] PCI I/O Base i
+	 *         This field defines the start of PCI I/O region n 
+	 * [31:25] Reserved
+	 */
+	PCI_ADDR(0, 0x18, 1, 0xC0), 0xFE000FCC, 0x0000d003,
+	PCI_ADDR(0, 0x18, 1, 0xC8), 0xFE000FCC, 0x00001013,
+	PCI_ADDR(0, 0x18, 1, 0xD0), 0xFE000FCC, 0x00000000,
+	PCI_ADDR(0, 0x18, 1, 0xD8), 0xFE000FCC, 0x00000000,
+
+	/* Config Base and Limit i Registers
+	 * F1:0xE0 i = 0
+	 * F1:0xE4 i = 1
+	 * F1:0xE8 i = 2
+	 * F1:0xEC i = 3
+	 * [ 0: 0] Read Enable
+	 *         0 = Reads Disabled
+	 *         1 = Reads Enabled
+	 * [ 1: 1] Write Enable
+	 *         0 = Writes Disabled
+	 *         1 = Writes Enabled
+	 * [ 2: 2] Device Number Compare Enable
+	 *         0 = The ranges are based on bus number
+	 *         1 = The ranges are ranges of devices on bus 0
+	 * [ 3: 3] Reserved
+	 * [ 6: 4] Destination Node
+	 *         000 = Node 0
+	 *         001 = Node 1
+	 *         010 = Node 2
+	 *         011 = Node 3
+	 *         100 = Node 4
+	 *         101 = Node 5
+	 *         110 = Node 6
+	 *         111 = Node 7
+	 * [ 7: 7] Reserved
+	 * [ 9: 8] Destination Link
+	 *         00 = Link 0
+	 *         01 = Link 1
+	 *         10 = Link 2
+	 *         11 - Reserved
+	 * [15:10] Reserved
+	 * [23:16] Bus Number Base i
+	 *         This field defines the lowest bus number in configuration region i
+	 * [31:24] Bus Number Limit i
+	 *         This field defines the highest bus number in configuration regin i
+	 */
+	PCI_ADDR(0, 0x18, 1, 0xE0), 0x0000FC88, 0xff000003,
+	PCI_ADDR(0, 0x18, 1, 0xE4), 0x0000FC88, 0x00000000,
+	PCI_ADDR(0, 0x18, 1, 0xE8), 0x0000FC88, 0x00000000,
+	PCI_ADDR(0, 0x18, 1, 0xEC), 0x0000FC88, 0x00000000,
+
+	};
+	int i;
+	int max;
+	print_debug("setting up coherent ht domain....\r\n");
+	max = sizeof(register_values)/sizeof(register_values[0]);
+	for(i = 0; i < max; i += 3) {
+		unsigned long reg;
+#if 0
+		print_debug_hex32(register_values[i]);
+		print_debug(" <-");
+		print_debug_hex32(register_values[i+2]);
+		print_debug("\r\n");
+#endif
+		reg = pci_read_config32(register_values[i]);
+		reg &= register_values[i+1];
+		reg |= register_values[i+2] & ~register_values[i+1];
+		pci_write_config32(register_values[i], reg);
+	}
+	print_debug("done.\r\n");
+}
+
+static void enumerate_ht_chain(void)
+{
+	unsigned next_unitid, last_unitid;;
+	next_unitid = 1;
+	do {
+		uint32_t id;
+		uint8_t hdr_type, pos;
+		last_unitid = next_unitid;
+
+		id = pci_read_config32(PCI_ADDR(0,0,0,PCI_VENDOR_ID));
+		/* If the chain is enumerated quit */
+		if (((id & 0xffff) == 0x0000) || ((id & 0xffff) == 0xffff) ||
+			(((id >> 16) & 0xffff) == 0xffff) ||
+			(((id >> 16) & 0xffff) == 0x0000)) {
+			break;
+		}
+		hdr_type = pci_read_config8(PCI_ADDR(0,0,0,PCI_HEADER_TYPE));
+		pos = 0;
+		hdr_type &= 0x7f;
+
+		if ((hdr_type == PCI_HEADER_TYPE_NORMAL) ||
+			(hdr_type == PCI_HEADER_TYPE_BRIDGE)) {
+			pos = pci_read_config8(PCI_ADDR(0,0,0, PCI_CAPABILITY_LIST));
+		}
+		while(pos != 0) {
+			uint8_t cap;
+			cap = pci_read_config8(PCI_ADDR(0,0,0, pos + PCI_CAP_LIST_ID));
+			if (cap == PCI_CAP_ID_HT) {
+				uint16_t flags;
+				flags = pci_read_config16(PCI_ADDR(0,0,0, pos + PCI_CAP_FLAGS));
+				if ((flags >> 13) == 0) {
+					unsigned count;
+					flags &= ~0x1f;
+					flags |= next_unitid & 0x1f;
+					count = (flags >> 5) & 0x1f;
+					pci_write_config16(PCI_ADDR(0, 0, 0, pos + PCI_CAP_FLAGS), flags);
+					next_unitid += count;
+					break;
+				}
+			}
+			pos = pci_read_config8(PCI_ADDR(0, 0, 0, pos + PCI_CAP_LIST_NEXT));
+		}
+	} while((last_unitid != next_unitid) && (next_unitid <= 0x1f));
+}
+
+static void print_pci_devices(void)
+{
+	uint32_t addr;
+	for(addr = PCI_ADDR(0, 0, 0, 0); 
+		addr <= PCI_ADDR(0, 0x1f, 0x7, 0); 
+		addr += PCI_ADDR(0,0,1,0)) {
+		uint32_t id;
+		id = pci_read_config32(addr + PCI_VENDOR_ID);
+		if (((id & 0xffff) == 0x0000) || ((id & 0xffff) == 0xffff) ||
+			(((id >> 16) & 0xffff) == 0xffff) ||
+			(((id >> 16) & 0xffff) == 0x0000)) {
+			continue;
+		}
+		print_debug("PCI: 00:");
+		print_debug_hex8(addr >> 11);
+		print_debug_char('.');
+		print_debug_hex8((addr >> 8) & 7);
+		print_debug("\r\n");
+	}
+}
+
+#define PCI_ID(VENDOR_ID, DEVICE_ID) ((DEVICE_ID << 16) | (VENDOR_ID))
+#define SMBUS_IO_BASE 0x1000
+
+#define SMBGSTATUS 0xe0
+#define SMBGCTL    0xe2
+#define SMBHSTADDR 0xe4
+#define SMBHSTDAT  0xe6
+#define SMBHSTCMD  0xe8
+#define SMBHSTFIFO 0xe9
+
+#define SMBUS_TIMEOUT (100*1000*10)
+
+static void enable_smbus(void)
+{
+	uint32_t addr;
+	for(addr = PCI_ADDR(0, 0, 0, 0);
+		addr <= PCI_ADDR(0, 0x1f, 0x7, 0);
+		addr += PCI_ADDR(0,0,1,0)) {
+		uint32_t id;
+		id = pci_read_config32(addr);
+		if (id == PCI_ID(0x1022, 0x746b)) {
+			break;
+		}
+	}
+	if (addr > PCI_ADDR(0, 0x1f, 0x7, 0)) {
+		die("SMBUS controller not found\r\n");
+	}
+	uint8_t enable;
+	print_debug("SMBus controller enabled\r\n");
+	pci_write_config32(addr + 0x58, SMBUS_IO_BASE | 1);
+	enable = pci_read_config8(addr + 0x41);
+	pci_write_config8(addr + 0x41, enable | (1 << 7));
+}
+
+
+static inline void smbus_delay(void)
+{
+	outb(0x80, 0x80);
+}
+
+static int smbus_wait_until_ready(void)
+{
+	unsigned long loops;
+	loops = SMBUS_TIMEOUT;
+	do {
+		unsigned short val;
+		smbus_delay();
+		val = inw(SMBUS_IO_BASE + SMBGSTATUS);
+		if ((val & 0x800) == 0) {
+			break;
+		}
+	} while(--loops);
+	return loops?0:-1;
+}
+
+static int smbus_wait_until_done(void)
+{
+	unsigned long loops;
+	loops = SMBUS_TIMEOUT;
+	do {
+		unsigned short val;
+		smbus_delay();
+		
+		val = inw(SMBUS_IO_BASE + SMBGSTATUS);
+		if (((val & 0x8) == 0) || ((val & 0x437) != 0)) {
+			break;
+		}
+	} while(--loops);
+	return loops?0:-1;
+}
+
+static int smbus_read_byte(unsigned device, unsigned address)
+{
+	unsigned char global_control_register;
+	unsigned char global_status_register;
+	unsigned char byte;
+
+	if (smbus_wait_until_ready() < 0) {
+		return -1;
+	}
+	
+	/* setup transaction */
+	/* disable interrupts */
+	outw(inw(SMBUS_IO_BASE + SMBGCTL) & ~((1<<10)|(1<<9)|(1<<8)|(1<<4)), SMBUS_IO_BASE + SMBGCTL);
+	/* set the device I'm talking too */
+	outw(((device & 0x7f) << 1) | 1, SMBUS_IO_BASE + SMBHSTADDR);
+	/* set the command/address... */
+	outb(address & 0xFF, SMBUS_IO_BASE + SMBHSTCMD);
+	/* set up for a byte data read */
+	outw((inw(SMBUS_IO_BASE + SMBGCTL) & ~7) | (0x2), SMBUS_IO_BASE + SMBGCTL);
+
+	/* clear any lingering errors, so the transaction will run */
+	/* Do I need to write the bits to a 1 to clear an error? */
+	outw(inw(SMBUS_IO_BASE + SMBGSTATUS), SMBUS_IO_BASE + SMBGSTATUS);
+
+	/* clear the data word...*/
+	outw(0, SMBUS_IO_BASE + SMBHSTDAT);
+
+	/* start the command */
+	outw((inw(SMBUS_IO_BASE + SMBGCTL) | (1 << 3)), SMBUS_IO_BASE + SMBGCTL);
+
+
+	/* poll for transaction completion */
+	if (smbus_wait_until_done() < 0) {
+		return -1;
+	}
+
+	global_status_register = inw(SMBUS_IO_BASE + SMBGSTATUS);
+
+	/* read results of transaction */
+	byte = inw(SMBUS_IO_BASE + SMBHSTDAT) & 0xff;
+
+	if (global_status_register != (1 << 4)) {
+		return -1;
+	}
+	return byte;
+}
+
+static void dump_spd_registers(void)
+{
+	unsigned device;
+	device = SMBUS_MEM_DEVICE_START;
+	print_debug("\r\n");
+	while(device <= SMBUS_MEM_DEVICE_END) {
+		int i;
+		print_debug("dimm: "); 
+		print_debug_hex8(device); 
+		for(i = 0; i < 256; i++) {
+			int status;
+			unsigned char byte;
+			if ((i & 0xf) == 0) {
+				print_debug("\r\n");
+				print_debug_hex8(i);
+				print_debug(": ");
+			}
+			status = smbus_read_byte(device, i);
+			if (status < 0) {
+				print_debug("bad device\r\n");
+				continue;
+			}
+			byte = status & 0xff;
+			print_debug_hex8(byte);
+			print_debug_char(' ');
+		}
+		device += SMBUS_MEM_DEVICE_INC;
+		print_debug("\r\n");
+	}
+}
+
+static void dump_spd_registers1(void)
+{
+	int i;
+	print_debug("dimm: "); 
+	print_debug_hex8(SMBUS_MEM_DEVICE_START); 
+	for(i = 0; i < 256; i++) {
+		int status;
+		unsigned char byte;
+		if ((i & 0xf) == 0) {
+			print_debug("\r\n");
+			print_debug_hex8(i);
+			print_debug(": ");
+		}
+		status = smbus_read_byte(SMBUS_MEM_DEVICE_START, i);
+		if (status < 0) {
+			print_debug("bad device\r\n");
+			break;
+		}
+		byte = status & 0xff;
+		print_debug_hex8(byte);
+		print_debug_char(' ');
+	}
+	print_debug("\r\n");
+}
+
+
+
+static void dump_spd_registers2(void)
+{
+	unsigned dev;
+	print_debug("\r\n");
+	for(dev = SMBUS_MEM_DEVICE_START; dev <= SMBUS_MEM_DEVICE_END; dev += SMBUS_MEM_DEVICE_INC) {
+		print_debug("dimm: "); 
+		print_debug_hex8(dev); 
+		int status;
+		unsigned char byte;
+		status = smbus_read_byte(dev, 0);
+		if (status < 0) {
+			print_debug("bad device\r\n");
+			continue;
+		}
+		byte = status & 0xff;
+		print_debug_hex8(byte);
+		print_debug("\r\n");
+	}
+}
 
 static void main(void)
 {
 	uart_init();
 	console_init();
-	if (!sdram_enabled()) {
+	if (boot_cpu() && !cpu_init_detected()) {
+		setup_coherent_ht_domain();
+		enumerate_ht_chain();
+		print_pci_devices();
+		enable_smbus();
 		sdram_initialize();
 #if 0
+		dump_spd_registers();
+#endif
+		dump_spd_registers1();
+		dump_spd_registers2();
+#if 0
 		ram_fill(  0x00100000, 0x00180000);
 		ram_verify(0x00100000, 0x00180000);
 #endif
-#if 1
+#ifdef MEMORY_1024MB
 		ram_fill(  0x00000000, 0x00001000);
 		ram_verify(0x00000000, 0x00001000);
 #endif
+#ifdef MEMROY_512MB
+		ram_fill(  0x00000000, 0x01ffffff);
+		ram_verify(0x00000000, 0x01ffffff);
+#endif
 	}
 }
diff --git a/src/mainboard/amd/solo/mainboard.c b/src/mainboard/amd/solo/mainboard.c
index 6578ef606f..5690bd5afd 100644
--- a/src/mainboard/amd/solo/mainboard.c
+++ b/src/mainboard/amd/solo/mainboard.c
@@ -9,129 +9,3 @@ unsigned long initial_apicid[MAX_CPUS] =
 {
 	0
 };
-
-void
-mainboard_fixup(void)
-{
-}
-
-void
-final_mainboard_fixup(void)
-{
-#if 0
-//	void final_southbridge_fixup(void);
-//	void final_superio_fixup(void);
-
-	printk_info("AMD Solo initializing...");
-
-//	final_southbridge_fixup();
-
-//#ifndef USE_NEW_SUPERIO_INTERFACE
-//final_superio_fixup();
-//#endif
-#endif
-}
-
-struct ioapicreg {
-	unsigned int reg;
-	unsigned int value_low, value_high;
-};
-static struct ioapicreg ioapicregvalues[] = {
-#define ALL		(0xff << 24)
-#define NONE		(0)
-#define DISABLED	(1 << 16)
-#define ENABLED		(0 << 16)
-#define TRIGGER_EDGE	(0 << 15)
-#define TRIGGER_LEVEL	(1 << 15)
-#define POLARITY_HIGH	(0 << 13)
-#define POLARITY_LOW	(1 << 13)
-#define PHYSICAL_DEST	(0 << 11)
-#define LOGICAL_DEST	(1 << 11)
-#define ExtINT		(7 << 8)
-#define NMI		(4 << 8)
-#define SMI		(2 << 8)
-#define INT		(1 << 8)
-	/* mask, trigger, polarity, destination, delivery, vector */
-	{0x00, ENABLED | TRIGGER_EDGE | POLARITY_HIGH | PHYSICAL_DEST | ExtINT | 0, 0},
-	{0x01, DISABLED, NONE},
-	{0x02, ENABLED | TRIGGER_EDGE | POLARITY_HIGH | PHYSICAL_DEST | INT | 0,  0},
-	{0x03, DISABLED, NONE},
-	{0x04, DISABLED, NONE},
-	{0x05, DISABLED, NONE},
-	{0x06, DISABLED, NONE},
-	{0x07, DISABLED, NONE},
-	{0x08, DISABLED, NONE},
-	{0x09, DISABLED, NONE},
-	{0x0a, DISABLED, NONE},
-	{0x0b, DISABLED, NONE},
-	{0x0c, DISABLED, NONE},
-	{0x0d, DISABLED, NONE},
-	{0x0e, DISABLED, NONE},
-	{0x0f, DISABLED, NONE},
-	{0x10, DISABLED, NONE},
-	{0x11, DISABLED, NONE},
-	{0x12, DISABLED, NONE},
-	{0x13, DISABLED, NONE},
-	{0x14, DISABLED, NONE},
-	{0x14, DISABLED, NONE},
-	{0x15, DISABLED, NONE},
-	{0x16, DISABLED, NONE},
-	{0x17, DISABLED, NONE},
-	{0x18, DISABLED, NONE},
-	{0x19, DISABLED, NONE},
-	{0x20, DISABLED, NONE},
-	{0x21, DISABLED, NONE},
-	{0x22, DISABLED, NONE},
-	{0x23, DISABLED, NONE},
-};
-
-static void setup_ioapic(void)
-{
-	int i;
-	unsigned long value_low, value_high;
-	unsigned long ioapic_base = 0xfec00000;
-	volatile unsigned long *l;
-	struct ioapicreg *a = ioapicregvalues;
-
-	l = (unsigned long *) ioapic_base;
-	for (i = 0; i < sizeof(ioapicregvalues) / sizeof(ioapicregvalues[0]);
-	     i++, a++) {
-		l[0] = (a->reg * 2) + 0x10;
-		l[4] = a->value_low;
-		value_low = l[4];
-		l[0] = (a->reg *2) + 0x11;
-		l[4] = a->value_high;
-		value_high = l[4];
-		if ((i==0) && (value_low == 0xffffffff)) {
-			printk_warning("IO APIC not responding.\n");
-			return;
-		}
-		printk_spew("for IRQ, reg 0x%08x value 0x%08x 0x%08x\n", 
-			a->reg, a->value_low, a->value_high);
-	}
-}
-
-static void lpc_init(struct device *dev)
-{
-	uint8_t byte;
-	printk_debug("lpc_init\n");
-#if 0
-	pci_read_config_byte(dev, 0x4B, &byte);
-	byte |= 1;
-	pci_write_config_byte(dev, 0x4B, byte);
-	setup_ioapic();
-#endif
-}
-
-static struct device_operations lpc_ops  = {
-	.read_resources = pci_dev_read_resources,
-	.set_resources  = pci_dev_set_resources,
-	.init = lpc_init,
-	.scan_bus = 0,
-};
-
-static struct pci_driver lpc_driver __pci_driver = {
-	.ops    = &lpc_ops,
-	.vendor = PCI_VENDOR_ID_AMD,
-	.device = 0x7468,
-};