more motherboard specific cleanups

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

diff --git a/src/mainboard/amd/quartet/auto.c b/src/mainboard/amd/quartet/auto.c
index 54fef9304bfd72762f6fc8c6dcc98a3f81b29f63..a347f20b70c078dda8d6f2db7008f096cbce19b6 100644 (file)
--- a/src/mainboard/amd/quartet/auto.c
+++ b/src/mainboard/amd/quartet/auto.c
@@ -91,6 +91,11 @@ static inline int spd_read_byte(unsigned device, unsigned address)
        return smbus_read_byte(device, address);
 }
 
+/* no specific code here. this should go away completely */
+static void coherent_ht_mainboard(unsigned cpus)
+{
+}
+
 #include "northbridge/amd/amdk8/cpu_ldtstop.c"
 #include "southbridge/amd/amd8111/amd8111_ldtstop.c"
 

diff --git a/src/mainboard/amd/solo/auto.c b/src/mainboard/amd/solo/auto.c
index 2b3ef3210b5a883ddb13a744432fd69e96f58bb9..895d97ea143fdbebcd1aa24f1a451e9e900cbad2 100644 (file)
--- a/src/mainboard/amd/solo/auto.c
+++ b/src/mainboard/amd/solo/auto.c
@@ -41,6 +41,11 @@ static inline int spd_read_byte(unsigned device, unsigned address)
        return smbus_read_byte(device, address);
 }
 
+/* no specific code here. this should go away completely */
+static void coherent_ht_mainboard(unsigned cpus)
+{
+}
+
 #include "northbridge/amd/amdk8/cpu_ldtstop.c"
 #include "southbridge/amd/amd8111/amd8111_ldtstop.c"
 

diff --git a/src/mainboard/arima/hdama/auto.c b/src/mainboard/arima/hdama/auto.c
index f47c7a0b421548678ca3f081e72797f0fa24e092..ca192452935c4c5f35afba66309b10b1022b6a1a 100644 (file)
--- a/src/mainboard/arima/hdama/auto.c
+++ b/src/mainboard/arima/hdama/auto.c
@@ -85,6 +85,11 @@ static inline int spd_read_byte(unsigned device, unsigned address)
        return smbus_read_byte(device, address);
 }
 
+/* no specific code here. this should go away completely */
+static void coherent_ht_mainboard(unsigned cpus)
+{
+}
+
 #include "northbridge/amd/amdk8/cpu_ldtstop.c"
 #include "southbridge/amd/amd8111/amd8111_ldtstop.c"
 

diff --git a/src/mainboard/tyan/s2880/auto.c b/src/mainboard/tyan/s2880/auto.c
index 5386b10d97350a71a5513735f83799515bae2789..2de3c2f5c4c446befb728d0a1c16d10978f3d3ac 100644 (file)
--- a/src/mainboard/tyan/s2880/auto.c
+++ b/src/mainboard/tyan/s2880/auto.c
@@ -81,6 +81,9 @@ static inline int spd_read_byte(unsigned device, unsigned address)
        return smbus_read_byte(device, address);
 }
 
+/* include mainboard specific ht code */
+#include "hypertransport.c"
+
 #include "northbridge/amd/amdk8/cpu_ldtstop.c"
 #include "southbridge/amd/amd8111/amd8111_ldtstop.c"
 

diff --git a/src/mainboard/tyan/s2882/auto.c b/src/mainboard/tyan/s2882/auto.c
index 5386b10d97350a71a5513735f83799515bae2789..2de3c2f5c4c446befb728d0a1c16d10978f3d3ac 100644 (file)
--- a/src/mainboard/tyan/s2882/auto.c
+++ b/src/mainboard/tyan/s2882/auto.c
@@ -81,6 +81,9 @@ static inline int spd_read_byte(unsigned device, unsigned address)
        return smbus_read_byte(device, address);
 }
 
+/* include mainboard specific ht code */
+#include "hypertransport.c"
+
 #include "northbridge/amd/amdk8/cpu_ldtstop.c"
 #include "southbridge/amd/amd8111/amd8111_ldtstop.c"
 

diff --git a/src/mainboard/tyan/s2885/auto.c b/src/mainboard/tyan/s2885/auto.c
index d2f6c648f1a82772996e284d7bbcbdb64755e839..628f018ce48cc4e594cb566a31ea985a108da30d 100644 (file)
--- a/src/mainboard/tyan/s2885/auto.c
+++ b/src/mainboard/tyan/s2885/auto.c
@@ -81,11 +81,14 @@ static inline int spd_read_byte(unsigned device, unsigned address)
        return smbus_read_byte(device, address);
 }
 
+/* include mainboard specific ht code */
+#include "hypertransport.c"
+
 #include "northbridge/amd/amdk8/cpu_ldtstop.c"
 #include "southbridge/amd/amd8111/amd8111_ldtstop.c"
 
 #include "northbridge/amd/amdk8/raminit.c"
-#include "northbridge/amd/amdk8/coherent_ht.1.c"
+#include "northbridge/amd/amdk8/coherent_ht.c"
 #include "sdram/generic_sdram.c"
 
 #include "resourcemap.c" /* tyan does not want the default */

diff --git a/src/northbridge/amd/amdk8/coherent_ht.c b/src/northbridge/amd/amdk8/coherent_ht.c
index 8bf8d15dd957a82614a4d8e4b11eaacc91910287..baf3781bf5ae23b385c400ff66fff7cf011dab17 100644 (file)
--- a/src/northbridge/amd/amdk8/coherent_ht.c
+++ b/src/northbridge/amd/amdk8/coherent_ht.c
@@ -436,42 +436,6 @@ static unsigned int cpuid(unsigned int op)
 
 static void coherent_ht_finalize(unsigned cpus)
 {
-//BY LYH 
-#if 1
-     static const unsigned int register_values[] = {
-        PCI_ADDR(0, 0x18, 0, 0x84), 0x88ff9c05, 0x11000020,
-        PCI_ADDR(0, 0x18, 0, 0xa4), 0x88ff9c05, 0x11000020,
-        PCI_ADDR(0, 0x18, 0, 0xc4), 0x88ff9c05, 0x770000d0,
-        PCI_ADDR(0, 0x19, 0, 0x84), 0x88ff9c05, 0x770000d0,
-        PCI_ADDR(0, 0x19, 0, 0xa4), 0x88ff9c05, 0x11000020,
-        PCI_ADDR(0, 0x19, 0, 0xc4), 0x88ff9c05, 0x770000d0,
-
-
-        PCI_ADDR(0, 0x18, 0, 0x88), 0xfffff0ff, 0x00000400,
-        PCI_ADDR(0, 0x18, 0, 0xa8), 0xfffff0ff, 0x00000500,
-        PCI_ADDR(0, 0x18, 0, 0xc8), 0xfffff0ff, 0x00000000,
-        PCI_ADDR(0, 0x19, 0, 0x88), 0xfffff0ff, 0x00000000,
-        PCI_ADDR(0, 0x19, 0, 0xa8), 0xfffff0ff, 0x00000500,
-        PCI_ADDR(0, 0x19, 0, 0xc8), 0xfffff0ff, 0x00000000,
-
-        PCI_ADDR(0, 0x18, 0, 0x94), 0xff0000ff, 0x00ff0000,
-        PCI_ADDR(0, 0x18, 0, 0xb4), 0xff0000ff, 0x00000000,
-        PCI_ADDR(0, 0x18, 0, 0xd4), 0xff0000ff, 0x00000000,
-        PCI_ADDR(0, 0x19, 0, 0x94), 0xff0000ff, 0x00000000,
-        PCI_ADDR(0, 0x19, 0, 0xb4), 0xff0000ff, 0x00000000,
-        PCI_ADDR(0, 0x19, 0, 0xd4), 0xff0000ff, 0x00000000,
-
-      };
-        int i;
-        int max;
-
-
-        device_t dev;
-        unsigned where;
-        unsigned long reg;
-#endif
-//BY LYH END
-
        int node;
        bool rev_a0;
        
@@ -503,29 +467,6 @@ static void coherent_ht_finalize(unsigned cpus)
                        pci_write_config32(NODE_HT(node),0xd4,0);
                }
        }
-//BY LYH
-#if 1
-        print_debug("setting up coherent ht domain....\r\n");
-        max = sizeof(register_values)/sizeof(register_values[0]);
-        for(i = 0; i < max; i += 3) {
-#if 0
-                print_debug_hex32(i);
-                print_debug(": ");
-                print_debug_hex32(register_values[i]);
-                print_debug(" <-");
-                print_debug_hex32(register_values[i+2]);
-                print_debug("\r\n");
-#endif
-                dev = register_values[i] & ~0xff;
-                where = register_values[i] & 0xff;
-                reg = pci_read_config32(dev, where);
-                reg &= register_values[i+1];
-                reg |= register_values[i+2];
-                pci_write_config32(dev, where, reg);
-        }
-#endif
-//BY LYH END
-
 #if 1
        print_debug("done\r\n");
 #endif
@@ -546,5 +487,7 @@ static int setup_coherent_ht_domain(void)
 #endif
        coherent_ht_finalize(cpus);
 
+       /* this should probably go away again. */
+       coherent_ht_mainboard(cpus);
        return reset_needed;
 }