Move C labels to start-of-line
[coreboot.git] / src / northbridge / intel / i945 / raminit.c
index 25ba6c25bff8f38be1107b5dcdbbe2db81a969da..a4512d7ba80743c5d5561fb4d5cffe955399b513 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * This file is part of the coreboot project.
  *
- * Copyright (C) 2007-2008 coresystems GmbH
+ * Copyright (C) 2007-2009 coresystems GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-
-#include <cpu/x86/mem.h>
+#include <console/console.h>
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/cache.h>
+#include <pc80/mc146818rtc.h>
 #include <spd.h>
+#include <string.h>
+#include <arch/romcc_io.h>
 #include "raminit.h"
 #include "i945.h"
+#include <cbmem.h>
 
-#include "lib/memset.c"
-
-#define DEBUG_RAM_SETUP 
+struct cbmem_entry *get_cbmem_toc(void)
+{
+       return (struct cbmem_entry *)(get_top_of_ram() - HIGH_MEMORY_SIZE);
+}
 
 /* Debugging macros. */
-#if defined(DEBUG_RAM_SETUP)
-#define PRINTK_DEBUG(x...)     printk_debug(x)
+#if CONFIG_DEBUG_RAM_SETUP
+#define PRINTK_DEBUG(x...)     printk(BIOS_DEBUG, x)
 #else
 #define PRINTK_DEBUG(x...)
 #endif
 
-
 #define RAM_INITIALIZATION_COMPLETE    (1 << 19)
 
 #define RAM_COMMAND_SELF_REFRESH       (0x0 << 16)
 #define RAM_EMRS_2                     (0x1 << 21)
 #define RAM_EMRS_3                     (0x2 << 21)
 
-static void do_ram_command(u32 command)
+static int get_dimm_spd_address(struct sys_info *sysinfo, int device)
+{
+       if (sysinfo->spd_addresses)
+               return sysinfo->spd_addresses[device];
+       else
+               return DIMM0 + device;
+
+}
+
+static inline int spd_read_byte(unsigned device, unsigned address)
+{
+       return smbus_read_byte(device, address);
+}
+
+static __attribute__((noinline)) void do_ram_command(u32 command)
 {
        u32 reg32;
 
@@ -68,8 +85,9 @@ static void do_ram_command(u32 command)
        MCHBAR32(DCC) = reg32;  /* This is the actual magic */
 
        PRINTK_DEBUG("...done\n");
-}
 
+       udelay(1);
+}
 
 static void ram_read32(u32 offset)
 {
@@ -78,25 +96,68 @@ static void ram_read32(u32 offset)
        read32(offset);
 }
 
-#ifdef DEBUG_RAM_SETUP
-static void sdram_dump_mchbar_registers(void)
+#if CONFIG_DEBUG_RAM_SETUP
+void sdram_dump_mchbar_registers(void)
 {
        int i;
-       printk_debug("Dumping MCHBAR Registers\n");
+       printk(BIOS_DEBUG, "Dumping MCHBAR Registers\n");
 
        for (i=0; i<0xfff; i+=4) {
                if (MCHBAR32(i) == 0)
                        continue;
-               printk_debug("0x%04x: 0x%08x\n", i, MCHBAR32(i));
+               printk(BIOS_DEBUG, "0x%04x: 0x%08x\n", i, MCHBAR32(i));
        }
 }
 #endif
 
+static int memclk(void)
+{
+       int offset = 0;
+#if CONFIG_NORTHBRIDGE_INTEL_I945GM
+       offset++;
+#endif
+       switch (((MCHBAR32(CLKCFG) >> 4) & 7) - offset) {
+       case 1: return 400;
+       case 2: return 533;
+       case 3: return 667;
+       default: printk(BIOS_DEBUG, "memclk: unknown register value %x\n", ((MCHBAR32(CLKCFG) >> 4) & 7) - offset);
+       }
+       return -1;
+}
+
+#if CONFIG_NORTHBRIDGE_INTEL_I945GM
+static u16 fsbclk(void)
+{
+       switch (MCHBAR32(CLKCFG) & 7) {
+       case 0: return 400;
+       case 1: return 533;
+       case 3: return 667;
+       default: printk(BIOS_DEBUG, "fsbclk: unknown register value %x\n", MCHBAR32(CLKCFG) & 7);
+       }
+       return 0xffff;
+}
+#elif CONFIG_NORTHBRIDGE_INTEL_I945GC
+static u16 fsbclk(void)
+{
+       switch (MCHBAR32(CLKCFG) & 7) {
+       case 0: return 1066;
+       case 1: return 533;
+       case 2: return 800;
+       default: printk(BIOS_DEBUG, "fsbclk: unknown register value %x\n", MCHBAR32(CLKCFG) & 7);
+       }
+       return 0xffff;
+}
+#endif
+
 static int sdram_capabilities_max_supported_memory_frequency(void)
 {
        u32 reg32;
 
-       reg32 = pci_read_config32(PCI_DEV(0, 0x00, 0), 0xe4); 
+#if CONFIG_MAXIMUM_SUPPORTED_FREQUENCY
+       return CONFIG_MAXIMUM_SUPPORTED_FREQUENCY;
+#endif
+
+       reg32 = pci_read_config32(PCI_DEV(0, 0x00, 0), 0xe4); /* CAPID0 + 4 */
        reg32 &= (7 << 0);
 
        switch (reg32) {
@@ -120,7 +181,7 @@ static int sdram_capabilities_interleave(void)
 {
        u32 reg32;
 
-       reg32 = pci_read_config8(PCI_DEV(0, 0x00,0), 0xe4);
+       reg32 = pci_read_config32(PCI_DEV(0, 0x00,0), 0xe4); /* CAPID0 + 4 */
        reg32 >>= 25;
        reg32 &= 1;
 
@@ -136,7 +197,7 @@ static int sdram_capabilities_dual_channel(void)
 {
        u32 reg32;
 
-       reg32 = pci_read_config8(PCI_DEV(0, 0x00,0), 0xe4);
+       reg32 = pci_read_config32(PCI_DEV(0, 0x00,0), 0xe4); /* CAPID0 + 4 */
        reg32 >>= 24;
        reg32 &= 1;
 
@@ -149,7 +210,7 @@ static int sdram_capabilities_enhanced_addressing_xor(void)
 
        reg8 = pci_read_config8(PCI_DEV(0, 0x00, 0), 0xe5); /* CAPID0 + 5 */
        reg8 &= (1 << 7);
-       
+
        return (!reg8);
 }
 
@@ -159,37 +220,60 @@ static int sdram_capabilities_two_dimms_per_channel(void)
 
        reg8 = pci_read_config8(PCI_DEV(0, 0x00, 0), 0xe8); /* CAPID0 + 8 */
        reg8 &= (1 << 0);
-       
+
        return (reg8 != 0);
 }
 
+// TODO check if we ever need this function
+#if 0
 static int sdram_capabilities_MEM4G_disable(void)
 {
        u8 reg8;
 
-       reg8 = pci_read_config8(PCI_DEV(0, 0x00, 0), 0xe5); 
+       reg8 = pci_read_config8(PCI_DEV(0, 0x00, 0), 0xe5); /* CAPID0 + 5 */
        reg8 &= (1 << 0);
-       
+
        return (reg8 != 0);
 }
+#endif
+
+#define GFX_FREQUENCY_CAP_166MHZ       0x04
+#define GFX_FREQUENCY_CAP_200MHZ       0x03
+#define GFX_FREQUENCY_CAP_250MHZ       0x02
+#define GFX_FREQUENCY_CAP_ALL          0x00
 
-static void sdram_detect_errors(void)
+static int sdram_capabilities_core_frequencies(void)
 {
        u8 reg8;
 
+       reg8 = pci_read_config8(PCI_DEV(0, 0x00, 0), 0xe5); /* CAPID0 + 5 */
+       reg8 &= (1 << 3) | (1 << 2) | (1 << 1);
+       reg8 >>= 1;
+
+       return (reg8);
+}
+
+static void sdram_detect_errors(struct sys_info *sysinfo)
+{
+       u8 reg8;
+       u8 do_reset = 0;
+
        reg8 = pci_read_config8(PCI_DEV(0, 0x1f, 0), 0xa2);
-       
+
        if (reg8 & ((1<<7)|(1<<2))) {
                if (reg8 & (1<<2)) {
-                       printk_debug("SLP S4# Assertion Width Violation.\n");
-                       
+                       printk(BIOS_DEBUG, "SLP S4# Assertion Width Violation.\n");
+                       /* Write back clears bit 2 */
                        pci_write_config8(PCI_DEV(0, 0x1f, 0), 0xa2, reg8);
+                       do_reset = 1;
+
                }
 
                if (reg8 & (1<<7)) {
-                       printk_debug("DRAM initialization was interrupted.\n");
+                       printk(BIOS_DEBUG, "DRAM initialization was interrupted.\n");
                        reg8 &= ~(1<<7);
                        pci_write_config8(PCI_DEV(0, 0x1f, 0), 0xa2, reg8);
+                       do_reset = 1;
                }
 
                /* Set SLP_S3# Assertion Stretch Enable */
@@ -197,19 +281,43 @@ static void sdram_detect_errors(void)
                reg8 |= (1 << 3);
                pci_write_config8(PCI_DEV(0, 0x1f, 0), 0xa4, reg8);
 
-               printk_debug("Reset required.\n");
-               outb(0x00, 0xcf9);
-               outb(0x0e, 0xcf9);
-               for (;;) ; /* Wait for reset! */
+               if (do_reset) {
+                       printk(BIOS_DEBUG, "Reset required.\n");
+                       outb(0x00, 0xcf9);
+                       outb(0x0e, 0xcf9);
+                       for (;;) asm("hlt"); /* Wait for reset! */
+               }
        }
 
        /* Set DRAM initialization bit in ICH7 */
        reg8 = pci_read_config8(PCI_DEV(0, 0x1f, 0), 0xa2);
        reg8 |= (1<<7);
        pci_write_config8(PCI_DEV(0, 0x1f, 0), 0xa2, reg8);
-       
-}
 
+       /* clear self refresh status if check is disabled or not a resume */
+       if (!CONFIG_CHECK_SLFRCS_ON_RESUME || sysinfo->boot_path != 2) {
+               MCHBAR8(0xf14) |= 3;
+       } else {
+               /* Validate self refresh config */
+               if (((sysinfo->dimm[0] != SYSINFO_DIMM_NOT_POPULATED) ||
+                    (sysinfo->dimm[1] != SYSINFO_DIMM_NOT_POPULATED)) &&
+                   !(MCHBAR8(0xf14) & (1<<0))) {
+                       do_reset = 1;
+               }
+               if (((sysinfo->dimm[2] != SYSINFO_DIMM_NOT_POPULATED) ||
+                    (sysinfo->dimm[3] != SYSINFO_DIMM_NOT_POPULATED)) &&
+                   !(MCHBAR8(0xf14) & (1<<1))) {
+                       do_reset = 1;
+               }
+       }
+
+       if (do_reset) {
+               printk(BIOS_DEBUG, "Reset required.\n");
+               outb(0x00, 0xcf9);
+               outb(0x0e, 0xcf9);
+               for (;;) asm("hlt"); /* Wait for reset! */
+       }
+}
 
 /**
  * @brief Get generic DIMM parameters.
@@ -230,28 +338,27 @@ static void sdram_get_dram_configuration(struct sys_info *sysinfo)
        /**
         * i945 supports two DIMMs, in two configurations:
         *
-        * - single channel with two dimms
-        * - dual channel with one dimm per channel
+        * - single channel with two DIMMs
+        * - dual channel with one DIMM per channel
+        *
+        * In practice dual channel mainboards have their SPD at 0x50/0x52
+        * whereas single channel configurations have their SPD at 0x50/0x51.
         *
-        * In practice dual channel mainboards have their spd at 0x50, 0x52
-        * whereas single channel configurations have their spd at 0x50/x51
-        * 
         * The capability register knows a lot about the channel configuration
-        * but for now we stick with the information we gather from the SPD
-        * ROMs
+        * but for now we stick with the information we gather via SPD.
         */
 
        if (sdram_capabilities_dual_channel()) {
                sysinfo->dual_channel = 1;
-               printk_debug("This mainboard supports Dual Channel Operation.\n");
+               printk(BIOS_DEBUG, "This mainboard supports Dual Channel Operation.\n");
        } else {
                sysinfo->dual_channel = 0;
-               printk_debug("This mainboard supports only Single Channel Operation.\n");
+               printk(BIOS_DEBUG, "This mainboard supports only Single Channel Operation.\n");
        }
 
        /**
         * Since we only support two DIMMs in total, there is a limited number
-        * of combinations. This function returns the type of DIMMs. 
+        * of combinations. This function returns the type of DIMMs.
         * return value:
         *   [0:7]  lower DIMM population
         *   [8-15] higher DIMM population
@@ -269,20 +376,24 @@ static void sdram_get_dram_configuration(struct sys_info *sysinfo)
         */
 
        for (i=0; i<(2 * DIMM_SOCKETS); i++) {
-               u8 reg8, device = DIMM_SPD_BASE + i;
+               int device = get_dimm_spd_address(sysinfo, i);
+               u8 reg8;
 
                /* Initialize the socket information with a sane value */
                sysinfo->dimm[i] = SYSINFO_DIMM_NOT_POPULATED;
 
-               if (!sdram_capabilities_dual_channel() && (i >> 1)) 
+               /* Dual Channel not supported, but Channel 1? Bail out */
+               if (!sdram_capabilities_dual_channel() && (i >> 1))
                        continue;
-               if (!sdram_capabilities_two_dimms_per_channel() && (i& 1)) 
+
+               /* Two DIMMs per channel not supported, but odd DIMM number? */
+               if (!sdram_capabilities_two_dimms_per_channel() && (i& 1))
                        continue;
 
-               printk_debug("DDR II Channel %d Socket %d: ", (i >> 1), (i & 1));
+               printk(BIOS_DEBUG, "DDR II Channel %d Socket %d: ", (i >> 1), (i & 1));
 
                if (spd_read_byte(device, SPD_MEMORY_TYPE) != SPD_MEMORY_TYPE_SDRAM_DDR2) {
-                       printk_debug("N/A\n");
+                       printk(BIOS_DEBUG, "N/A\n");
                        continue;
                }
 
@@ -297,32 +408,32 @@ static void sdram_get_dram_configuration(struct sys_info *sysinfo)
                        die("Error: Registered memory not supported by this chipset\n");
 
                switch (spd_read_byte(device, SPD_PRIMARY_SDRAM_WIDTH)) {
-               case 0x08: 
+               case 0x08:
                        switch (spd_read_byte(device, SPD_NUM_DIMM_BANKS) & 0x0f) {
                        case 1:
-                               printk_debug("x8DDS\n");
+                               printk(BIOS_DEBUG, "x8DDS\n");
                                sysinfo->dimm[i] = SYSINFO_DIMM_X8DDS;
                                break;
                        case 0:
-                               printk_debug("x8DS\n");
+                               printk(BIOS_DEBUG, "x8DS\n");
                                sysinfo->dimm[i] = SYSINFO_DIMM_X8DS;
                                break;
                        default:
-                               printk_debug ("Unsupported.\n");
+                               printk(BIOS_DEBUG, "Unsupported.\n");
                        }
                        break;
                case 0x10:
                        switch (spd_read_byte(device, SPD_NUM_DIMM_BANKS) & 0x0f) {
                        case 1:
-                               printk_debug("x16DS\n");
+                               printk(BIOS_DEBUG, "x16DS\n");
                                sysinfo->dimm[i] = SYSINFO_DIMM_X16DS;
                                break;
                        case 0:
-                               printk_debug("x16SS\n");
+                               printk(BIOS_DEBUG, "x16SS\n");
                                sysinfo->dimm[i] = SYSINFO_DIMM_X16SS;
                                break;
                        default:
-                               printk_debug ("Unsupported.\n");
+                               printk(BIOS_DEBUG, "Unsupported.\n");
                        }
                        break;
                default:
@@ -336,12 +447,8 @@ static void sdram_get_dram_configuration(struct sys_info *sysinfo)
                die("No memory installed.\n");
        }
 
-       /* The chipset might be able to do this. What the heck, legacy bios
-        * just beeps when a single DIMM is in the Channel 1 socket. So let's
-        * not bother until someone needs this enough to cope with it.
-        */
        if (!(dimm_mask & ((1 << DIMM_SOCKETS) - 1))) {
-               printk_err("Channel 0 has no memory populated. This setup is not usable. Please move the DIMM.\n");
+               printk(BIOS_INFO, "Channel 0 has no memory populated.\n");
        }
 }
 
@@ -361,7 +468,7 @@ static void sdram_verify_package_type(struct sys_info * sysinfo)
                        continue;
 
                /* Is the current DIMM a stacked DIMM? */
-               if (spd_read_byte(DIMM_SPD_BASE + i, SPD_NUM_DIMM_BANKS) & (1 << 4))
+               if (spd_read_byte(get_dimm_spd_address(sysinfo, i), SPD_NUM_DIMM_BANKS) & (1 << 4))
                        sysinfo->package = 1;
        }
 }
@@ -378,7 +485,8 @@ static u8 sdram_possible_cas_latencies(struct sys_info * sysinfo)
 
        for (i=0; i<2*DIMM_SOCKETS; i++) {
                if (sysinfo->dimm[i] != SYSINFO_DIMM_NOT_POPULATED)
-                       cas_mask &= spd_read_byte(DIMM_SPD_BASE + i, SPD_ACCEPTABLE_CAS_LATENCIES);
+                       cas_mask &= spd_read_byte(get_dimm_spd_address(sysinfo, i),
+                                                 SPD_ACCEPTABLE_CAS_LATENCIES);
        }
 
        if(!cas_mask) {
@@ -392,7 +500,7 @@ static void sdram_detect_cas_latency_and_ram_speed(struct sys_info * sysinfo, u8
 {
        int i, j, idx;
        int lowest_common_cas = 0;
-       int max_ram_speed;
+       int max_ram_speed = 0;
 
        const u8 ddr2_speeds_table[] = {
                0x50, 0x60,     /* DDR2 400: tCLK = 5.0ns  tAC = 0.6ns  */
@@ -412,6 +520,9 @@ static void sdram_detect_cas_latency_and_ram_speed(struct sys_info * sysinfo, u8
        case 667: max_ram_speed = 2; break;
        }
 
+       if (fsbclk() == 533)
+               max_ram_speed = 1;
+
        sysinfo->memory_frequency = 0;
        sysinfo->cas = 0;
 
@@ -429,14 +540,15 @@ static void sdram_detect_cas_latency_and_ram_speed(struct sys_info * sysinfo, u8
 
                PRINTK_DEBUG("Probing Speed %d\n", j);
                for (i=0; i<2*DIMM_SOCKETS; i++) {
+                       int device = get_dimm_spd_address(sysinfo, i);
                        int current_cas_mask;
-                       
+
                        PRINTK_DEBUG("  DIMM: %d\n", i);
                        if (sysinfo->dimm[i] == SYSINFO_DIMM_NOT_POPULATED) {
                                continue;
                        }
 
-                       current_cas_mask = spd_read_byte(DIMM_SPD_BASE + i, SPD_ACCEPTABLE_CAS_LATENCIES);
+                       current_cas_mask = spd_read_byte(device, SPD_ACCEPTABLE_CAS_LATENCIES);
 
                        while (current_cas_mask) {
                                int highest_supported_cas = 0, current_cas = 0;
@@ -447,6 +559,8 @@ static void sdram_detect_cas_latency_and_ram_speed(struct sys_info * sysinfo, u8
                                        highest_supported_cas = 4;
                                } else if (current_cas_mask & SPD_CAS_LATENCY_DDR2_3) {
                                        highest_supported_cas = 3;
+                               } else {
+                                       die("Invalid max. CAS.\n");
                                }
                                if (current_cas_mask & SPD_CAS_LATENCY_DDR2_3) {
                                        current_cas = 3;
@@ -454,24 +568,26 @@ static void sdram_detect_cas_latency_and_ram_speed(struct sys_info * sysinfo, u8
                                        current_cas = 4;
                                } else if (current_cas_mask & SPD_CAS_LATENCY_DDR2_5) {
                                        current_cas = 5;
+                               } else {
+                                       die("Invalid CAS.\n");
                                }
 
                                idx = highest_supported_cas - current_cas;
                                PRINTK_DEBUG("idx=%d, ", idx);
-                               PRINTK_DEBUG("tCLK=%x, ", spd_read_byte(DIMM_SPD_BASE + i, spd_lookup_table[2*idx]));
-                               PRINTK_DEBUG("tAC=%x", spd_read_byte(DIMM_SPD_BASE + i, spd_lookup_table[(2*idx)+1]));
+                               PRINTK_DEBUG("tCLK=%x, ", spd_read_byte(device, spd_lookup_table[2*idx]));
+                               PRINTK_DEBUG("tAC=%x", spd_read_byte(device, spd_lookup_table[(2*idx)+1]));
 
-                               if (spd_read_byte(DIMM_SPD_BASE + i, spd_lookup_table[2*idx]) <= ddr2_speeds_table[2*j] &&
-                                               spd_read_byte(DIMM_SPD_BASE + i, spd_lookup_table[(2*idx)+1]) <= ddr2_speeds_table[(2*j)+1]) {
+                               if (spd_read_byte(device, spd_lookup_table[2*idx]) <= ddr2_speeds_table[2*j] &&
+                                               spd_read_byte(device, spd_lookup_table[(2*idx)+1]) <= ddr2_speeds_table[(2*j)+1]) {
                                        PRINTK_DEBUG(":    OK\n");
                                        break;
-                               } 
-                               
+                               }
+
                                PRINTK_DEBUG(":    Not fast enough!\n");
 
                                current_cas_mask &= ~(1 << (current_cas));
                        }
-                       
+
                        freq_cas_mask &= current_cas_mask;
                        if (!current_cas_mask) {
                                PRINTK_DEBUG("    No valid CAS for this speed on DIMM %d\n", i);
@@ -495,9 +611,9 @@ static void sdram_detect_cas_latency_and_ram_speed(struct sys_info * sysinfo, u8
                        break;
                }
        }
-       
+
        if (sysinfo->memory_frequency && sysinfo->cas) {
-               printk_debug("Memory will be driven at %dMHz with CAS=%d clocks\n",
+               printk(BIOS_DEBUG, "Memory will be driven at %dMHz with CAS=%d clocks\n",
                                sysinfo->memory_frequency, sysinfo->cas);
        } else {
                die("Could not find common memory frequency and CAS\n");
@@ -526,7 +642,7 @@ static void sdram_detect_smallest_tRAS(struct sys_info * sysinfo)
                if (sysinfo->dimm[i] == SYSINFO_DIMM_NOT_POPULATED)
                        continue;
 
-               reg8 = spd_read_byte(DIMM_SPD_BASE + i, SPD_MIN_ACTIVE_TO_PRECHARGE_DELAY);
+               reg8 = spd_read_byte(get_dimm_spd_address(sysinfo, i), SPD_MIN_ACTIVE_TO_PRECHARGE_DELAY);
                if (!reg8) {
                        die("Invalid tRAS value.\n");
                }
@@ -540,7 +656,7 @@ static void sdram_detect_smallest_tRAS(struct sys_info * sysinfo)
                die("DDR-II Module does not support this frequency (tRAS error)\n");
        }
 
-       printk_debug("tRAS = %d cycles\n", tRAS_cycles);
+       printk(BIOS_DEBUG, "tRAS = %d cycles\n", tRAS_cycles);
        sysinfo->tras = tRAS_cycles;
 }
 
@@ -566,7 +682,7 @@ static void sdram_detect_smallest_tRP(struct sys_info * sysinfo)
                if (sysinfo->dimm[i] == SYSINFO_DIMM_NOT_POPULATED)
                        continue;
 
-               reg8 = spd_read_byte(DIMM_SPD_BASE + i, SPD_MIN_ROW_PRECHARGE_TIME);
+               reg8 = spd_read_byte(get_dimm_spd_address(sysinfo, i), SPD_MIN_ROW_PRECHARGE_TIME);
                if (!reg8) {
                        die("Invalid tRP value.\n");
                }
@@ -581,7 +697,7 @@ static void sdram_detect_smallest_tRP(struct sys_info * sysinfo)
                die("DDR-II Module does not support this frequency (tRP error)\n");
        }
 
-       printk_debug("tRP = %d cycles\n", tRP_cycles);
+       printk(BIOS_DEBUG, "tRP = %d cycles\n", tRP_cycles);
        sysinfo->trp = tRP_cycles;
 }
 
@@ -598,7 +714,7 @@ static void sdram_detect_smallest_tRCD(struct sys_info * sysinfo)
        case 667: freq_multiplier = 0x0c; break; /* 3ns */
        }
 
-       tRCD_cycles = 2; 
+       tRCD_cycles = 2; /* 2 clocks minimum */
        tRCD_time = tRCD_cycles * freq_multiplier;
 
        for (i=0; i<2*DIMM_SOCKETS; i++) {
@@ -607,7 +723,7 @@ static void sdram_detect_smallest_tRCD(struct sys_info * sysinfo)
                if (sysinfo->dimm[i] == SYSINFO_DIMM_NOT_POPULATED)
                        continue;
 
-               reg8 = spd_read_byte(DIMM_SPD_BASE + i, SPD_MIN_RAS_TO_CAS_DELAY);
+               reg8 = spd_read_byte(get_dimm_spd_address(sysinfo, i), SPD_MIN_RAS_TO_CAS_DELAY);
                if (!reg8) {
                        die("Invalid tRCD value.\n");
                }
@@ -621,7 +737,7 @@ static void sdram_detect_smallest_tRCD(struct sys_info * sysinfo)
                die("DDR-II Module does not support this frequency (tRCD error)\n");
        }
 
-       printk_debug("tRCD = %d cycles\n", tRCD_cycles);
+       printk(BIOS_DEBUG, "tRCD = %d cycles\n", tRCD_cycles);
        sysinfo->trcd = tRCD_cycles;
 }
 
@@ -647,7 +763,7 @@ static void sdram_detect_smallest_tWR(struct sys_info * sysinfo)
                if (sysinfo->dimm[i] == SYSINFO_DIMM_NOT_POPULATED)
                        continue;
 
-               reg8 = spd_read_byte(DIMM_SPD_BASE + i, SPD_WRITE_RECOVERY_TIME);
+               reg8 = spd_read_byte(get_dimm_spd_address(sysinfo, i), SPD_WRITE_RECOVERY_TIME);
                if (!reg8) {
                        die("Invalid tWR value.\n");
                }
@@ -661,7 +777,7 @@ static void sdram_detect_smallest_tWR(struct sys_info * sysinfo)
                die("DDR-II Module does not support this frequency (tWR error)\n");
        }
 
-       printk_debug("tWR = %d cycles\n", tWR_cycles);
+       printk(BIOS_DEBUG, "tWR = %d cycles\n", tWR_cycles);
        sysinfo->twr = tWR_cycles;
 }
 
@@ -697,7 +813,7 @@ static void sdram_detect_smallest_tRFC(struct sys_info * sysinfo)
                        /* Can this happen? Go back to 127.5ns just to be sure
                         * we don't run out of the array. This may be wrong
                         */
-                       printk_debug("DIMM %d is 1Gb x16.. Please report.\n", i);
+                       printk(BIOS_DEBUG, "DIMM %d is 1Gb x16.. Please report.\n", i);
                        reg8 = 3;
                }
 
@@ -707,20 +823,19 @@ static void sdram_detect_smallest_tRFC(struct sys_info * sysinfo)
        }
        index--;
        switch (sysinfo->memory_frequency) {
-       case 667: index += 3;
-       case 533: index += 3;
+       case 667: index += 3; /* Fallthrough */
+       case 533: index += 3; /* Fallthrough */
        case 400: break;
        }
 
        sysinfo->trfc = tRFC_cycles[index];
-       printk_debug("tRFC = %d cycles\n", tRFC_cycles[index]);
+       printk(BIOS_DEBUG, "tRFC = %d cycles\n", tRFC_cycles[index]);
 }
 
-
 static void sdram_detect_smallest_refresh(struct sys_info * sysinfo)
 {
        int i;
-       
+
        sysinfo->refresh = 0;
 
        for (i=0; i<2*DIMM_SOCKETS; i++) {
@@ -729,7 +844,8 @@ static void sdram_detect_smallest_refresh(struct sys_info * sysinfo)
                if (sysinfo->dimm[i] == SYSINFO_DIMM_NOT_POPULATED)
                        continue;
 
-               refresh = spd_read_byte(DIMM_SPD_BASE + i, SPD_REFRESH) & ~(1 << 7);
+               refresh = spd_read_byte(get_dimm_spd_address(sysinfo, i),
+                                       SPD_REFRESH) & ~(1 << 7);
 
                /* 15.6us */
                if (!refresh)
@@ -746,7 +862,7 @@ static void sdram_detect_smallest_refresh(struct sys_info * sysinfo)
 
                die("DDR-II module has unsupported refresh value\n");
        }
-       printk_debug("Refresh: %s\n", sysinfo->refresh?"7.8us":"15.6us");
+       printk(BIOS_DEBUG, "Refresh: %s\n", sysinfo->refresh?"7.8us":"15.6us");
 }
 
 static void sdram_verify_burst_length(struct sys_info * sysinfo)
@@ -757,7 +873,8 @@ static void sdram_verify_burst_length(struct sys_info * sysinfo)
                if (sysinfo->dimm[i] == SYSINFO_DIMM_NOT_POPULATED)
                        continue;
 
-               if (!(spd_read_byte(DIMM_SPD_BASE + i, SPD_SUPPORTED_BURST_LENGTHS) & SPD_BURST_LENGTH_8))
+               if (!(spd_read_byte(get_dimm_spd_address(sysinfo, i),
+                                   SPD_SUPPORTED_BURST_LENGTHS) & SPD_BURST_LENGTH_8))
                        die("Only DDR-II RAM with burst length 8 is supported by this chipset.\n");
        }
 }
@@ -806,231 +923,317 @@ static void sdram_write_slew_rates(u32 offset, const u32 *slew_rate_table)
                MCHBAR32(offset+(i*4)) = slew_rate_table[i];
 }
 
-static void sdram_rcomp_buffer_strength_and_slew(struct sys_info *sysinfo)
-{
-       static const u32 dq2030[] = {
-               0x08070706, 0x0a090908, 0x0d0c0b0a, 0x12100f0e, 
-               0x1a181614, 0x22201e1c, 0x2a282624, 0x3934302d,
-               0x0a090908, 0x0c0b0b0a, 0x0e0d0d0c, 0x1211100f, 
-               0x19171513, 0x211f1d1b, 0x2d292623, 0x3f393531
-       };
+static const u32 dq2030[] = {
+       0x08070706, 0x0a090908, 0x0d0c0b0a, 0x12100f0e,
+       0x1a181614, 0x22201e1c, 0x2a282624, 0x3934302d,
+       0x0a090908, 0x0c0b0b0a, 0x0e0d0d0c, 0x1211100f,
+       0x19171513, 0x211f1d1b, 0x2d292623, 0x3f393531
+};
 
-       static const u32 dq2330[] = {
-               0x08070706, 0x0a090908, 0x0d0c0b0a, 0x12100f0e, 
-               0x1a181614, 0x22201e1c, 0x2a282624, 0x3934302d,
-               0x0a090908, 0x0c0b0b0a, 0x0e0d0d0c, 0x1211100f, 
-               0x19171513, 0x211f1d1b, 0x2d292623, 0x3f393531
-       };
+static const u32 dq2330[] = {
+       0x08070706, 0x0a090908, 0x0d0c0b0a, 0x12100f0e,
+       0x1a181614, 0x22201e1c, 0x2a282624, 0x3934302d,
+       0x0a090908, 0x0c0b0b0a, 0x0e0d0d0c, 0x1211100f,
+       0x19171513, 0x211f1d1b, 0x2d292623, 0x3f393531
+};
 
-       static const u32 cmd2710[] = {
-               0x07060605, 0x0f0d0b09, 0x19171411, 0x1f1f1d1b, 
-               0x1f1f1f1f, 0x1f1f1f1f, 0x1f1f1f1f, 0x1f1f1f1f,
-               
-               0x1110100f, 0x0f0d0b09, 0x19171411, 0x1f1f1d1b, 
-               0x1f1f1f1f, 0x1f1f1f1f, 0x1f1f1f1f, 0x1f1f1f1f
-       };
+static const u32 cmd2710[] = {
+       0x07060605, 0x0f0d0b09, 0x19171411, 0x1f1f1d1b,
+       0x1f1f1f1f, 0x1f1f1f1f, 0x1f1f1f1f, 0x1f1f1f1f,
+       0x1110100f, 0x0f0d0b09, 0x19171411, 0x1f1f1d1b,
+       0x1f1f1f1f, 0x1f1f1f1f, 0x1f1f1f1f, 0x1f1f1f1f
+};
 
-       static const u32 cmd3210[] = {
-               0x0f0d0b0a, 0x17151311, 0x1f1d1b19, 0x1f1f1f1f, 
-               0x1f1f1f1f, 0x1f1f1f1f, 0x1f1f1f1f, 0x1f1f1f1f,
-               0x18171615, 0x1f1f1c1a, 0x1f1f1f1f, 0x1f1f1f1f, 
-               0x1f1f1f1f, 0x1f1f1f1f, 0x1f1f1f1f, 0x1f1f1f1f
-       };
+static const u32 cmd3210[] = {
+       0x0f0d0b0a, 0x17151311, 0x1f1d1b19, 0x1f1f1f1f,
+       0x1f1f1f1f, 0x1f1f1f1f, 0x1f1f1f1f, 0x1f1f1f1f,
+       0x18171615, 0x1f1f1c1a, 0x1f1f1f1f, 0x1f1f1f1f,
+       0x1f1f1f1f, 0x1f1f1f1f, 0x1f1f1f1f, 0x1f1f1f1f
+};
 
-       static const u32 clk2030[] = {
-               0x0e0d0d0c, 0x100f0f0e, 0x100f0e0d, 0x15131211, 
-               0x1d1b1917, 0x2523211f, 0x2a282927, 0x32302e2c, 
-               0x17161514, 0x1b1a1918, 0x1f1e1d1c, 0x23222120, 
-               0x27262524, 0x2d2b2928, 0x3533312f, 0x3d3b3937
-       };
+static const u32 clk2030[] = {
+       0x0e0d0d0c, 0x100f0f0e, 0x100f0e0d, 0x15131211,
+       0x1d1b1917, 0x2523211f, 0x2a282927, 0x32302e2c,
+       0x17161514, 0x1b1a1918, 0x1f1e1d1c, 0x23222120,
+       0x27262524, 0x2d2b2928, 0x3533312f, 0x3d3b3937
+};
 
-       static const u32 ctl3215[] = {
-               0x01010000, 0x03020101, 0x07060504, 0x0b0a0908, 
-               0x100f0e0d, 0x14131211, 0x18171615, 0x1c1b1a19,
-               0x05040403, 0x07060605, 0x0a090807, 0x0f0d0c0b, 
-               0x14131211, 0x18171615, 0x1c1b1a19, 0x201f1e1d
-       };
+static const u32 ctl3215[] = {
+       0x01010000, 0x03020101, 0x07060504, 0x0b0a0908,
+       0x100f0e0d, 0x14131211, 0x18171615, 0x1c1b1a19,
+       0x05040403, 0x07060605, 0x0a090807, 0x0f0d0c0b,
+       0x14131211, 0x18171615, 0x1c1b1a19, 0x201f1e1d
+};
 
-       static const u32 ctl3220[] = {
-               0x05040403, 0x07060505, 0x0e0c0a08, 0x1a171411, 
-               0x2825221f, 0x35322f2b, 0x3e3e3b38, 0x3e3e3e3e,
-               0x09080807, 0x0b0a0a09, 0x0f0d0c0b, 0x1b171311, 
-               0x2825221f, 0x35322f2b, 0x3e3e3b38, 0x3e3e3e3e
-       };
+static const u32 ctl3220[] = {
+       0x05040403, 0x07060505, 0x0e0c0a08, 0x1a171411,
+       0x2825221f, 0x35322f2b, 0x3e3e3b38, 0x3e3e3e3e,
+       0x09080807, 0x0b0a0a09, 0x0f0d0c0b, 0x1b171311,
+       0x2825221f, 0x35322f2b, 0x3e3e3b38, 0x3e3e3e3e
+};
 
-       static const u32 nc[] = {
-               0x00000000, 0x00000000, 0x00000000, 0x00000000,
-               0x00000000, 0x00000000, 0x00000000, 0x00000000,
-               0x00000000, 0x00000000, 0x00000000, 0x00000000,
-               0x00000000, 0x00000000, 0x00000000, 0x00000000
-       };
+static const u32 nc[] = {
+       0x00000000, 0x00000000, 0x00000000, 0x00000000,
+       0x00000000, 0x00000000, 0x00000000, 0x00000000,
+       0x00000000, 0x00000000, 0x00000000, 0x00000000,
+       0x00000000, 0x00000000, 0x00000000, 0x00000000
+};
 
-       static const u32 const * const dual_channel_slew_group_lookup[] = {
-               dq2030, cmd3210, ctl3215, ctl3215, clk2030, clk2030, dq2030, cmd3210, 
-               dq2030, cmd3210, ctl3215, ctl3215, clk2030, clk2030, dq2030, cmd3210, 
-               dq2030, cmd3210, nc,      ctl3215, nc,      clk2030, dq2030, cmd3210, 
-               dq2030, cmd3210, ctl3215, ctl3215, clk2030, clk2030, dq2030, cmd2710, 
-               dq2030, cmd3210, nc,      ctl3215, nc,      clk2030, nc,     nc,      
-
-               dq2030, cmd3210, ctl3215, ctl3215, clk2030, clk2030, dq2030, cmd3210, 
-               dq2030, cmd3210, ctl3215, nc,      clk2030, nc,      dq2030, cmd3210, 
-               dq2030, cmd3210, ctl3215, ctl3215, clk2030, clk2030, dq2030, cmd3210, 
-               dq2030, cmd3210, ctl3215, nc,      clk2030, nc,      dq2030, cmd2710, 
-               dq2030, cmd3210, ctl3215, nc,      clk2030, nc,      nc,     nc,      
-
-               dq2030, cmd3210, nc,      ctl3215, nc,      clk2030, dq2030, cmd3210, 
-               dq2030, cmd3210, ctl3215, ctl3215, clk2030, clk2030, dq2030, cmd3210, 
-               dq2030, cmd3210, nc,      ctl3215, nc,      clk2030, dq2030, cmd3210, 
-               dq2030, cmd3210, ctl3215, ctl3215, clk2030, clk2030, dq2030, cmd2710, 
-               dq2030, cmd3210, nc,      ctl3215, nc,      clk2030, nc,     nc,      
-
-               dq2030, cmd2710, ctl3215, ctl3215, clk2030, clk2030, dq2030, cmd3210, 
-               dq2030, cmd2710, ctl3215, nc,      clk2030, nc,      dq2030, cmd3210, 
-               dq2030, cmd2710, ctl3215, ctl3215, clk2030, clk2030, dq2030, cmd3210, 
-               dq2030, cmd2710, ctl3215, nc,      clk2030, nc,      dq2030, cmd2710, 
-               dq2030, cmd2710, ctl3215, nc,      clk2030, nc,      nc,     nc,      
-
-               nc,     nc,      nc,      ctl3215, nc,      clk2030, dq2030, cmd3210, 
-               nc,     nc,      ctl3215, nc,      clk2030, nc,      dq2030, cmd3210, 
-               nc,     nc,      nc,      ctl3215, nc,      clk2030, dq2030, cmd3210, 
-               nc,     nc,      ctl3215, nc,      clk2030, clk2030, dq2030, cmd2710  
-       };
+enum {
+       DQ2030,
+       DQ2330,
+       CMD2710,
+       CMD3210,
+       CLK2030,
+       CTL3215,
+       CTL3220,
+       NC,
+};
 
-       static const u32 const * const single_channel_slew_group_lookup[] = {
-               dq2330, cmd3210, ctl3215, ctl3215, clk2030, clk2030, dq2330, cmd3210, 
-               dq2330, cmd3210, ctl3215, ctl3215, clk2030, clk2030, dq2330, cmd3210, 
-               dq2330, cmd3210, nc,      ctl3215, nc,      clk2030, dq2330, cmd3210, 
-               dq2330, cmd3210, ctl3215, ctl3215, clk2030, clk2030, dq2330, cmd3210, 
-               dq2330, cmd3210, nc,      ctl3215, nc,      clk2030, nc,     nc,      
-
-               dq2330, cmd3210, ctl3215, ctl3215, clk2030, clk2030, dq2330, cmd3210, 
-               dq2330, cmd3210, ctl3215, nc,      clk2030, nc,      dq2330, cmd3210, 
-               dq2330, cmd3210, ctl3215, ctl3215, clk2030, clk2030, dq2330, cmd3210, 
-               dq2330, cmd3210, ctl3215, nc,      clk2030, nc,      dq2330, cmd3210, 
-               dq2330, cmd3210, ctl3215, nc,      clk2030, nc,      nc,     nc,      
-
-               dq2330, cmd3210, nc,      ctl3215, nc,      clk2030, dq2330, cmd3210, 
-               dq2330, cmd3210, ctl3215, ctl3215, clk2030, clk2030, dq2330, cmd3210, 
-               dq2330, cmd3210, nc,      ctl3215, nc,      clk2030, dq2330, cmd3210, 
-               dq2330, cmd3210, ctl3215, ctl3215, clk2030, clk2030, dq2330, cmd3210, 
-               dq2330, cmd3210, nc,      ctl3215, nc,      clk2030, nc,     nc,      
-
-               dq2330, cmd3210, ctl3215, ctl3215, clk2030, clk2030, dq2330, cmd3210, 
-               dq2330, cmd3210, ctl3215, nc,      clk2030, nc,      dq2330, cmd3210, 
-               dq2330, cmd3210, ctl3215, ctl3215, clk2030, clk2030, dq2330, cmd3210, 
-               dq2330, cmd3210, ctl3215, nc,      clk2030, nc,      dq2330, cmd3210, 
-               dq2330, cmd3210, ctl3215, nc,      clk2030, nc,      nc,     nc,      
-
-               dq2330, nc,      nc,      ctl3215, nc,      clk2030, dq2030, cmd3210, 
-               dq2330, nc,      ctl3215, nc,      clk2030, nc,      dq2030, cmd3210, 
-               dq2330, nc,      nc,      ctl3215, nc,      clk2030, dq2030, cmd3210, 
-               dq2330, nc,      ctl3215, nc,      clk2030, clk2030, dq2030, cmd3210  
-       };
+static const u8 dual_channel_slew_group_lookup[] = {
+       DQ2030, CMD3210, CTL3215, CTL3215, CLK2030, CLK2030, DQ2030, CMD3210,
+       DQ2030, CMD3210, CTL3215, CTL3215, CLK2030, CLK2030, DQ2030, CMD3210,
+       DQ2030, CMD3210, NC,      CTL3215, NC,      CLK2030, DQ2030, CMD3210,
+       DQ2030, CMD3210, CTL3215, CTL3215, CLK2030, CLK2030, DQ2030, CMD2710,
+       DQ2030, CMD3210, NC,      CTL3215, NC,      CLK2030, NC,     NC,
+
+       DQ2030, CMD3210, CTL3215, CTL3215, CLK2030, CLK2030, DQ2030, CMD3210,
+       DQ2030, CMD3210, CTL3215, NC,      CLK2030, NC,      DQ2030, CMD3210,
+       DQ2030, CMD3210, CTL3215, CTL3215, CLK2030, CLK2030, DQ2030, CMD3210,
+       DQ2030, CMD3210, CTL3215, NC,      CLK2030, NC,      DQ2030, CMD2710,
+       DQ2030, CMD3210, CTL3215, NC,      CLK2030, NC,      NC,     NC,
+
+       DQ2030, CMD3210, NC,      CTL3215, NC,      CLK2030, DQ2030, CMD3210,
+       DQ2030, CMD3210, CTL3215, CTL3215, CLK2030, CLK2030, DQ2030, CMD3210,
+       DQ2030, CMD3210, NC,      CTL3215, NC,      CLK2030, DQ2030, CMD3210,
+       DQ2030, CMD3210, CTL3215, CTL3215, CLK2030, CLK2030, DQ2030, CMD2710,
+       DQ2030, CMD3210, NC,      CTL3215, NC,      CLK2030, NC,     NC,
+
+       DQ2030, CMD2710, CTL3215, CTL3215, CLK2030, CLK2030, DQ2030, CMD3210,
+       DQ2030, CMD2710, CTL3215, NC,      CLK2030, NC,      DQ2030, CMD3210,
+       DQ2030, CMD2710, CTL3215, CTL3215, CLK2030, CLK2030, DQ2030, CMD3210,
+       DQ2030, CMD2710, CTL3215, NC,      CLK2030, NC,      DQ2030, CMD2710,
+       DQ2030, CMD2710, CTL3215, NC,      CLK2030, NC,      NC,     NC,
+
+       NC,     NC,      NC,      CTL3215, NC,      CLK2030, DQ2030, CMD3210,
+       NC,     NC,      CTL3215, NC,      CLK2030, NC,      DQ2030, CMD3210,
+       NC,     NC,      NC,      CTL3215, NC,      CLK2030, DQ2030, CMD3210,
+       NC,     NC,      CTL3215, NC,      CLK2030, CLK2030, DQ2030, CMD2710
+};
+
+static const u8 single_channel_slew_group_lookup[] = {
+       DQ2330, CMD3210, CTL3215, CTL3215, CLK2030, CLK2030, DQ2330, CMD3210,
+       DQ2330, CMD3210, CTL3215, CTL3215, CLK2030, CLK2030, DQ2330, CMD3210,
+       DQ2330, CMD3210, NC,      CTL3215, NC,      CLK2030, DQ2330, CMD3210,
+       DQ2330, CMD3210, CTL3215, CTL3215, CLK2030, CLK2030, DQ2330, CMD3210,
+       DQ2330, CMD3210, NC,      CTL3215, NC,      CLK2030, NC,     NC,
+
+       DQ2330, CMD3210, CTL3215, CTL3215, CLK2030, CLK2030, DQ2330, CMD3210,
+       DQ2330, CMD3210, CTL3215, NC,      CLK2030, NC,      DQ2330, CMD3210,
+       DQ2330, CMD3210, CTL3215, CTL3215, CLK2030, CLK2030, DQ2330, CMD3210,
+       DQ2330, CMD3210, CTL3215, NC,      CLK2030, NC,      DQ2330, CMD3210,
+       DQ2330, CMD3210, CTL3215, NC,      CLK2030, NC,      NC,     NC,
+
+       DQ2330, CMD3210, NC,      CTL3215, NC,      CLK2030, DQ2330, CMD3210,
+       DQ2330, CMD3210, CTL3215, CTL3215, CLK2030, CLK2030, DQ2330, CMD3210,
+       DQ2330, CMD3210, NC,      CTL3215, NC,      CLK2030, DQ2330, CMD3210,
+       DQ2330, CMD3210, CTL3215, CTL3215, CLK2030, CLK2030, DQ2330, CMD3210,
+       DQ2330, CMD3210, NC,      CTL3215, NC,      CLK2030, NC,     NC,
+
+       DQ2330, CMD3210, CTL3215, CTL3215, CLK2030, CLK2030, DQ2330, CMD3210,
+       DQ2330, CMD3210, CTL3215, NC,      CLK2030, NC,      DQ2330, CMD3210,
+       DQ2330, CMD3210, CTL3215, CTL3215, CLK2030, CLK2030, DQ2330, CMD3210,
+       DQ2330, CMD3210, CTL3215, NC,      CLK2030, NC,      DQ2330, CMD3210,
+       DQ2330, CMD3210, CTL3215, NC,      CLK2030, NC,      NC,     NC,
+
+       DQ2330, NC,      NC,      CTL3215, NC,      CLK2030, DQ2030, CMD3210,
+       DQ2330, NC,      CTL3215, NC,      CLK2030, NC,      DQ2030, CMD3210,
+       DQ2330, NC,      NC,      CTL3215, NC,      CLK2030, DQ2030, CMD3210,
+       DQ2330, NC,      CTL3215, NC,      CLK2030, CLK2030, DQ2030, CMD3210
+};
 
+static const u32 *slew_group_lookup(int dual_channel, int index)
+{
+       const u8 *slew_group;
+       /* Dual Channel needs different tables. */
+       if (dual_channel)
+               slew_group   = dual_channel_slew_group_lookup;
+       else
+               slew_group   = single_channel_slew_group_lookup;
 
-       /* Strength multiplier tables */
-       static const u8 dual_channel_strength_multiplier[] = {
-               0x44, 0x11, 0x11, 0x11, 0x44, 0x44, 0x44, 0x11, 
-               0x44, 0x11, 0x11, 0x11, 0x44, 0x44, 0x44, 0x11, 
-               0x44, 0x11, 0x00, 0x11, 0x00, 0x44, 0x44, 0x11, 
-               0x44, 0x11, 0x11, 0x11, 0x44, 0x44, 0x44, 0x22, 
-               0x44, 0x11, 0x00, 0x11, 0x00, 0x44, 0x00, 0x00, 
-               0x44, 0x11, 0x11, 0x11, 0x44, 0x44, 0x44, 0x11, 
-               0x44, 0x11, 0x11, 0x00, 0x44, 0x00, 0x44, 0x11, 
-               0x44, 0x11, 0x11, 0x11, 0x44, 0x44, 0x44, 0x11, 
-               0x44, 0x11, 0x11, 0x00, 0x44, 0x00, 0x44, 0x22, 
-               0x44, 0x11, 0x11, 0x00, 0x44, 0x00, 0x00, 0x00, 
-               0x44, 0x11, 0x00, 0x11, 0x00, 0x44, 0x44, 0x11, 
-               0x44, 0x11, 0x11, 0x11, 0x44, 0x44, 0x44, 0x11, 
-               0x44, 0x11, 0x00, 0x11, 0x00, 0x44, 0x44, 0x11, 
-               0x44, 0x11, 0x11, 0x11, 0x44, 0x44, 0x44, 0x22, 
-               0x44, 0x11, 0x00, 0x11, 0x00, 0x44, 0x00, 0x00, 
-               0x44, 0x22, 0x11, 0x11, 0x44, 0x44, 0x44, 0x11, 
-               0x44, 0x22, 0x11, 0x00, 0x44, 0x00, 0x44, 0x11, 
-               0x44, 0x22, 0x11, 0x11, 0x44, 0x44, 0x44, 0x11, 
-               0x44, 0x22, 0x11, 0x00, 0x44, 0x00, 0x44, 0x22, 
-               0x44, 0x22, 0x11, 0x00, 0x44, 0x00, 0x00, 0x00, 
-               0x00, 0x00, 0x00, 0x11, 0x00, 0x44, 0x44, 0x11, 
-               0x00, 0x00, 0x11, 0x00, 0x44, 0x00, 0x44, 0x11, 
-               0x00, 0x00, 0x00, 0x11, 0x00, 0x44, 0x44, 0x11, 
-               0x00, 0x00, 0x11, 0x00, 0x44, 0x44, 0x44, 0x22  
-       };
+       switch (slew_group[index]) {
+       case DQ2030:    return dq2030;
+       case DQ2330:    return dq2330;
+       case CMD2710:   return cmd2710;
+       case CMD3210:   return cmd3210;
+       case CLK2030:   return clk2030;
+       case CTL3215:   return ctl3215;
+       case CTL3220:   return ctl3220;
+       case NC:        return nc;
+       }
 
-       static const u8 single_channel_strength_multiplier[] = {
-               0x33, 0x11, 0x11, 0x11, 0x44, 0x44, 0x33, 0x11, 
-               0x33, 0x11, 0x11, 0x11, 0x44, 0x44, 0x33, 0x11, 
-               0x33, 0x11, 0x00, 0x11, 0x00, 0x44, 0x33, 0x11, 
-               0x33, 0x11, 0x11, 0x11, 0x44, 0x44, 0x33, 0x11, 
-               0x33, 0x11, 0x00, 0x11, 0x00, 0x44, 0x00, 0x00, 
-               0x33, 0x11, 0x11, 0x11, 0x44, 0x44, 0x33, 0x11, 
-               0x33, 0x11, 0x11, 0x00, 0x44, 0x00, 0x33, 0x11, 
-               0x33, 0x11, 0x11, 0x11, 0x44, 0x44, 0x33, 0x11, 
-               0x33, 0x11, 0x11, 0x00, 0x44, 0x00, 0x33, 0x11, 
-               0x33, 0x11, 0x11, 0x00, 0x44, 0x00, 0x00, 0x00, 
-               0x33, 0x11, 0x00, 0x11, 0x00, 0x44, 0x33, 0x11, 
-               0x33, 0x11, 0x11, 0x11, 0x44, 0x44, 0x33, 0x11, 
-               0x33, 0x11, 0x00, 0x11, 0x00, 0x44, 0x33, 0x11, 
-               0x33, 0x11, 0x11, 0x11, 0x44, 0x44, 0x33, 0x11, 
-               0x33, 0x11, 0x00, 0x11, 0x00, 0x44, 0x00, 0x00, 
-               0x33, 0x11, 0x11, 0x11, 0x44, 0x44, 0x33, 0x11, 
-               0x33, 0x11, 0x11, 0x00, 0x44, 0x00, 0x33, 0x11, 
-               0x33, 0x11, 0x11, 0x11, 0x44, 0x44, 0x33, 0x11, 
-               0x33, 0x11, 0x11, 0x00, 0x44, 0x00, 0x33, 0x11, 
-               0x33, 0x11, 0x11, 0x00, 0x44, 0x00, 0x00, 0x00, 
-               0x33, 0x00, 0x00, 0x11, 0x00, 0x44, 0x33, 0x11, 
-               0x33, 0x00, 0x11, 0x00, 0x44, 0x00, 0x33, 0x11, 
-               0x33, 0x00, 0x00, 0x11, 0x00, 0x44, 0x33, 0x11, 
-               0x33, 0x00, 0x11, 0x00, 0x44, 0x44, 0x33, 0x11  
-       };
+       return nc;
+}
+
+#if CONFIG_NORTHBRIDGE_INTEL_I945GM
+/* Strength multiplier tables */
+static const u8 dual_channel_strength_multiplier[] = {
+       0x44, 0x11, 0x11, 0x11, 0x44, 0x44, 0x44, 0x11,
+       0x44, 0x11, 0x11, 0x11, 0x44, 0x44, 0x44, 0x11,
+       0x44, 0x11, 0x00, 0x11, 0x00, 0x44, 0x44, 0x11,
+       0x44, 0x11, 0x11, 0x11, 0x44, 0x44, 0x44, 0x22,
+       0x44, 0x11, 0x00, 0x11, 0x00, 0x44, 0x00, 0x00,
+       0x44, 0x11, 0x11, 0x11, 0x44, 0x44, 0x44, 0x11,
+       0x44, 0x11, 0x11, 0x00, 0x44, 0x00, 0x44, 0x11,
+       0x44, 0x11, 0x11, 0x11, 0x44, 0x44, 0x44, 0x11,
+       0x44, 0x11, 0x11, 0x00, 0x44, 0x00, 0x44, 0x22,
+       0x44, 0x11, 0x11, 0x00, 0x44, 0x00, 0x00, 0x00,
+       0x44, 0x11, 0x00, 0x11, 0x00, 0x44, 0x44, 0x11,
+       0x44, 0x11, 0x11, 0x11, 0x44, 0x44, 0x44, 0x11,
+       0x44, 0x11, 0x00, 0x11, 0x00, 0x44, 0x44, 0x11,
+       0x44, 0x11, 0x11, 0x11, 0x44, 0x44, 0x44, 0x22,
+       0x44, 0x11, 0x00, 0x11, 0x00, 0x44, 0x00, 0x00,
+       0x44, 0x22, 0x11, 0x11, 0x44, 0x44, 0x44, 0x11,
+       0x44, 0x22, 0x11, 0x00, 0x44, 0x00, 0x44, 0x11,
+       0x44, 0x22, 0x11, 0x11, 0x44, 0x44, 0x44, 0x11,
+       0x44, 0x22, 0x11, 0x00, 0x44, 0x00, 0x44, 0x22,
+       0x44, 0x22, 0x11, 0x00, 0x44, 0x00, 0x00, 0x00,
+       0x00, 0x00, 0x00, 0x11, 0x00, 0x44, 0x44, 0x11,
+       0x00, 0x00, 0x11, 0x00, 0x44, 0x00, 0x44, 0x11,
+       0x00, 0x00, 0x00, 0x11, 0x00, 0x44, 0x44, 0x11,
+       0x00, 0x00, 0x11, 0x00, 0x44, 0x44, 0x44, 0x22
+};
 
+static const u8 single_channel_strength_multiplier[] = {
+       0x33, 0x11, 0x11, 0x11, 0x44, 0x44, 0x33, 0x11,
+       0x33, 0x11, 0x11, 0x11, 0x44, 0x44, 0x33, 0x11,
+       0x33, 0x11, 0x00, 0x11, 0x00, 0x44, 0x33, 0x11,
+       0x33, 0x11, 0x11, 0x11, 0x44, 0x44, 0x33, 0x11,
+       0x33, 0x11, 0x00, 0x11, 0x00, 0x44, 0x00, 0x00,
+       0x33, 0x11, 0x11, 0x11, 0x44, 0x44, 0x33, 0x11,
+       0x33, 0x11, 0x11, 0x00, 0x44, 0x00, 0x33, 0x11,
+       0x33, 0x11, 0x11, 0x11, 0x44, 0x44, 0x33, 0x11,
+       0x33, 0x11, 0x11, 0x00, 0x44, 0x00, 0x33, 0x11,
+       0x33, 0x11, 0x11, 0x00, 0x44, 0x00, 0x00, 0x00,
+       0x33, 0x11, 0x00, 0x11, 0x00, 0x44, 0x33, 0x11,
+       0x33, 0x11, 0x11, 0x11, 0x44, 0x44, 0x33, 0x11,
+       0x33, 0x11, 0x00, 0x11, 0x00, 0x44, 0x33, 0x11,
+       0x33, 0x11, 0x11, 0x11, 0x44, 0x44, 0x33, 0x11,
+       0x33, 0x11, 0x00, 0x11, 0x00, 0x44, 0x00, 0x00,
+       0x33, 0x11, 0x11, 0x11, 0x44, 0x44, 0x33, 0x11,
+       0x33, 0x11, 0x11, 0x00, 0x44, 0x00, 0x33, 0x11,
+       0x33, 0x11, 0x11, 0x11, 0x44, 0x44, 0x33, 0x11,
+       0x33, 0x11, 0x11, 0x00, 0x44, 0x00, 0x33, 0x11,
+       0x33, 0x11, 0x11, 0x00, 0x44, 0x00, 0x00, 0x00,
+       0x33, 0x00, 0x00, 0x11, 0x00, 0x44, 0x33, 0x11,
+       0x33, 0x00, 0x11, 0x00, 0x44, 0x00, 0x33, 0x11,
+       0x33, 0x00, 0x00, 0x11, 0x00, 0x44, 0x33, 0x11,
+       0x33, 0x00, 0x11, 0x00, 0x44, 0x44, 0x33, 0x11
+};
+#elif CONFIG_NORTHBRIDGE_INTEL_I945GC
+static const u8 dual_channel_strength_multiplier[] = {
+       0x44, 0x22, 0x00, 0x00, 0x44, 0x44, 0x44, 0x22,
+       0x44, 0x22, 0x00, 0x00, 0x44, 0x44, 0x44, 0x22,
+       0x44, 0x22, 0x00, 0x00, 0x44, 0x44, 0x44, 0x22,
+       0x44, 0x22, 0x00, 0x00, 0x44, 0x44, 0x44, 0x33,
+       0x44, 0x22, 0x00, 0x00, 0x44, 0x44, 0x44, 0x00,
+       0x44, 0x22, 0x00, 0x00, 0x44, 0x44, 0x44, 0x22,
+       0x44, 0x22, 0x00, 0x00, 0x44, 0x44, 0x44, 0x22,
+       0x44, 0x22, 0x00, 0x00, 0x44, 0x44, 0x44, 0x22,
+       0x44, 0x22, 0x00, 0x00, 0x44, 0x44, 0x44, 0x33,
+       0x44, 0x22, 0x00, 0x00, 0x44, 0x44, 0x44, 0x00,
+       0x44, 0x22, 0x00, 0x00, 0x44, 0x44, 0x44, 0x22,
+       0x44, 0x22, 0x00, 0x00, 0x44, 0x44, 0x44, 0x22,
+       0x44, 0x22, 0x00, 0x00, 0x44, 0x44, 0x44, 0x22,
+       0x44, 0x22, 0x00, 0x00, 0x44, 0x44, 0x44, 0x33,
+       0x44, 0x22, 0x00, 0x00, 0x44, 0x44, 0x44, 0x00,
+       0x44, 0x33, 0x00, 0x00, 0x44, 0x44, 0x44, 0x22,
+       0x44, 0x33, 0x00, 0x00, 0x44, 0x44, 0x44, 0x22,
+       0x44, 0x33, 0x00, 0x00, 0x44, 0x44, 0x44, 0x22,
+       0x44, 0x33, 0x00, 0x00, 0x44, 0x44, 0x44, 0x33,
+       0x44, 0x33, 0x00, 0x00, 0x44, 0x44, 0x44, 0x00,
+       0x44, 0x00, 0x00, 0x00, 0x44, 0x44, 0x44, 0x22,
+       0x44, 0x00, 0x00, 0x00, 0x44, 0x44, 0x44, 0x22,
+       0x44, 0x00, 0x00, 0x00, 0x44, 0x44, 0x44, 0x22,
+       0x44, 0x00, 0x00, 0x00, 0x44, 0x44, 0x44, 0x33
+};
+
+static const u8 single_channel_strength_multiplier[] = {
+       0x44, 0x33, 0x00, 0x00, 0x44, 0x44, 0x44, 0x00,
+       0x44, 0x44, 0x00, 0x00, 0x44, 0x44, 0x44, 0x00,
+       0x44, 0x33, 0x00, 0x00, 0x44, 0x44, 0x44, 0x00,
+       0x44, 0x55, 0x00, 0x00, 0x44, 0x44, 0x44, 0x00,
+       0x44, 0x22, 0x00, 0x00, 0x44, 0x44, 0x44, 0x00,
+       0x44, 0x44, 0x00, 0x00, 0x44, 0x44, 0x44, 0x00,
+       0x44, 0x55, 0x00, 0x00, 0x44, 0x44, 0x44, 0x00,
+       0x44, 0x44, 0x00, 0x00, 0x44, 0x44, 0x44, 0x00,
+       0x44, 0x88, 0x00, 0x00, 0x44, 0x44, 0x44, 0x00,
+       0x44, 0x22, 0x00, 0x00, 0x44, 0x44, 0x44, 0x00,
+       0x44, 0x33, 0x00, 0x00, 0x44, 0x44, 0x44, 0x00,
+       0x44, 0x44, 0x00, 0x00, 0x44, 0x44, 0x44, 0x00,
+       0x44, 0x33, 0x00, 0x00, 0x44, 0x44, 0x44, 0x00,
+       0x44, 0x55, 0x00, 0x00, 0x44, 0x44, 0x44, 0x00,
+       0x44, 0x22, 0x00, 0x00, 0x44, 0x44, 0x44, 0x00,
+       0x44, 0x55, 0x00, 0x00, 0x44, 0x44, 0x44, 0x00,
+       0x44, 0x88, 0x00, 0x00, 0x44, 0x44, 0x44, 0x00,
+       0x44, 0x55, 0x00, 0x00, 0x44, 0x44, 0x44, 0x00,
+       0x44, 0x88, 0x00, 0x00, 0x44, 0x44, 0x44, 0x00,
+       0x44, 0x33, 0x00, 0x00, 0x44, 0x44, 0x44, 0x00,
+       0x44, 0x22, 0x00, 0x00, 0x44, 0x44, 0x44, 0x00,
+       0x44, 0x22, 0x00, 0x00, 0x44, 0x44, 0x44, 0x00,
+       0x44, 0x22, 0x00, 0x00, 0x44, 0x44, 0x44, 0x00,
+       0x44, 0x33, 0x00, 0x00, 0x44, 0x44, 0x44, 0x00
+};
+#endif
+
+static void sdram_rcomp_buffer_strength_and_slew(struct sys_info *sysinfo)
+{
        const u8 * strength_multiplier;
-       const u32* const * slew_group_lookup;
-       int idx;
+       int idx, dual_channel;
 
        /* Set Strength Multipliers */
 
        /* Dual Channel needs different tables. */
        if (sdram_capabilities_dual_channel()) {
-               printk_debug("Programming Dual Channel RCOMP\n");
+               printk(BIOS_DEBUG, "Programming Dual Channel RCOMP\n");
                strength_multiplier = dual_channel_strength_multiplier;
-               slew_group_lookup   = dual_channel_slew_group_lookup;
+               dual_channel = 1;
                idx = 5 * sysinfo->dimm[0] +  sysinfo->dimm[2];
        } else {
-               printk_debug("Programming Single Channel RCOMP\n");
+               printk(BIOS_DEBUG, "Programming Single Channel RCOMP\n");
                strength_multiplier = single_channel_strength_multiplier;
-               slew_group_lookup   = single_channel_slew_group_lookup;
+               dual_channel = 0;
                idx = 5 * sysinfo->dimm[0] + sysinfo->dimm[1];
        }
 
-       printk_debug("Table Index: %d\n", idx);
+       printk(BIOS_DEBUG, "Table Index: %d\n", idx);
 
-       MCHBAR8(G1SC) = strength_multiplier[idx * 8 + 0]; 
-       MCHBAR8(G2SC) = strength_multiplier[idx * 8 + 1]; 
-       MCHBAR8(G3SC) = strength_multiplier[idx * 8 + 2]; 
-       MCHBAR8(G4SC) = strength_multiplier[idx * 8 + 3]; 
-       MCHBAR8(G5SC) = strength_multiplier[idx * 8 + 4]; 
-       MCHBAR8(G6SC) = strength_multiplier[idx * 8 + 5]; 
-       MCHBAR8(G7SC) = strength_multiplier[idx * 8 + 6]; 
-       MCHBAR8(G8SC) = strength_multiplier[idx * 8 + 7]; 
+       MCHBAR8(G1SC) = strength_multiplier[idx * 8 + 0];
+       MCHBAR8(G2SC) = strength_multiplier[idx * 8 + 1];
+       MCHBAR8(G3SC) = strength_multiplier[idx * 8 + 2];
+       MCHBAR8(G4SC) = strength_multiplier[idx * 8 + 3];
+       MCHBAR8(G5SC) = strength_multiplier[idx * 8 + 4];
+       MCHBAR8(G6SC) = strength_multiplier[idx * 8 + 5];
+       MCHBAR8(G7SC) = strength_multiplier[idx * 8 + 6];
+       MCHBAR8(G8SC) = strength_multiplier[idx * 8 + 7];
 
        /* Channel 0 */
-       sdram_write_slew_rates(G1SRPUT, slew_group_lookup[idx * 8 + 0]);
-       sdram_write_slew_rates(G2SRPUT, slew_group_lookup[idx * 8 + 1]);
-       if ((slew_group_lookup[idx * 8 + 2] != nc) && (sysinfo->package == SYSINFO_PACKAGE_STACKED)) {
-               
-               
+       sdram_write_slew_rates(G1SRPUT, slew_group_lookup(dual_channel, idx * 8 + 0));
+       sdram_write_slew_rates(G2SRPUT, slew_group_lookup(dual_channel, idx * 8 + 1));
+       if ((slew_group_lookup(dual_channel, idx * 8 + 2) != nc) && (sysinfo->package == SYSINFO_PACKAGE_STACKED)) {
+
                sdram_write_slew_rates(G3SRPUT, ctl3220);
        } else {
-               sdram_write_slew_rates(G3SRPUT, slew_group_lookup[idx * 8 + 2]);
+               sdram_write_slew_rates(G3SRPUT, slew_group_lookup(dual_channel, idx * 8 + 2));
        }
-       sdram_write_slew_rates(G4SRPUT, slew_group_lookup[idx * 8 + 3]);
-       sdram_write_slew_rates(G5SRPUT, slew_group_lookup[idx * 8 + 4]);
-       sdram_write_slew_rates(G6SRPUT, slew_group_lookup[idx * 8 + 5]);
+       sdram_write_slew_rates(G4SRPUT, slew_group_lookup(dual_channel, idx * 8 + 3));
+       sdram_write_slew_rates(G5SRPUT, slew_group_lookup(dual_channel, idx * 8 + 4));
+       sdram_write_slew_rates(G6SRPUT, slew_group_lookup(dual_channel, idx * 8 + 5));
 
        /* Channel 1 */
        if (sysinfo->dual_channel) {
-               sdram_write_slew_rates(G7SRPUT, slew_group_lookup[idx * 8 + 6]);
-               sdram_write_slew_rates(G8SRPUT, slew_group_lookup[idx * 8 + 7]);
+               sdram_write_slew_rates(G7SRPUT, slew_group_lookup(dual_channel, idx * 8 + 6));
+               sdram_write_slew_rates(G8SRPUT, slew_group_lookup(dual_channel, idx * 8 + 7));
        } else {
                sdram_write_slew_rates(G7SRPUT, nc);
                sdram_write_slew_rates(G8SRPUT, nc);
@@ -1040,7 +1243,7 @@ static void sdram_rcomp_buffer_strength_and_slew(struct sys_info *sysinfo)
 static void sdram_enable_rcomp(void)
 {
        u32 reg32;
-       
+       /* Enable Global Periodic RCOMP */
        udelay(300);
        reg32 = MCHBAR32(GBRCOMPCTL);
        reg32 &= ~(1 << 23);
@@ -1052,8 +1255,8 @@ static void sdram_program_dll_timings(struct sys_info *sysinfo)
        u32 chan0dll = 0, chan1dll = 0;
        int i;
 
-       printk_debug ("Programming DLL Timings... \n");
-       
+       printk(BIOS_DEBUG, "Programming DLL Timings... \n");
+
        MCHBAR16(DQSMT) &= ~( (3 << 12) | (1 << 10) | ( 0xf << 0) );
        MCHBAR16(DQSMT) |= (1 << 13) | (0xc << 0);
 
@@ -1076,7 +1279,7 @@ static void sdram_force_rcomp(void)
 {
        u32 reg32;
        u8 reg8;
-       
+
        reg32 = MCHBAR32(ODTC);
        reg32 |= (1 << 28);
        MCHBAR32(ODTC) = reg32;
@@ -1085,12 +1288,14 @@ static void sdram_force_rcomp(void)
        reg32 |= (1 << 0);
        MCHBAR32(SMSRCTL) = reg32;
 
+       /* Start initial RCOMP */
        reg32 = MCHBAR32(GBRCOMPCTL);
        reg32 |= (1 << 8);
        MCHBAR32(GBRCOMPCTL) = reg32;
 
        reg8 = i945_silicon_revision();
        if ((reg8 == 0 && (MCHBAR32(DCC) & (3 << 0)) == 0) || (reg8 == 1)) {
+
                reg32 = MCHBAR32(GBRCOMPCTL);
                reg32 |= (3 << 5);
                MCHBAR32(GBRCOMPCTL) = reg32;
@@ -1102,8 +1307,8 @@ static void sdram_initialize_system_memory_io(struct sys_info *sysinfo)
        u8 reg8;
        u32 reg32;
 
-       printk_debug ("Initializing System Memory IO... \n");
-       
+       printk(BIOS_DEBUG, "Initializing System Memory IO... \n");
+       /* Enable Data Half Clock Pushout */
        reg8 = MCHBAR8(C0HCTC);
        reg8 &= ~0x1f;
        reg8 |= ( 1 << 0);
@@ -1114,17 +1319,18 @@ static void sdram_initialize_system_memory_io(struct sys_info *sysinfo)
        reg8 |= ( 1 << 0);
        MCHBAR8(C1HCTC) = reg8;
 
-       
        MCHBAR16(WDLLBYPMODE) &= ~( (1 << 9) | (1 << 6) | (1 << 4) | (1 << 3) | (1 << 1) );
        MCHBAR16(WDLLBYPMODE) |= (1 << 8) | (1 << 7) | (1 << 5) | (1 << 2) | (1 << 0);
 
        MCHBAR8(C0WDLLCMC) = 0;
        MCHBAR8(C1WDLLCMC) = 0;
 
+       /* Program RCOMP Settings */
        sdram_program_dram_width(sysinfo);
 
        sdram_rcomp_buffer_strength_and_slew(sysinfo);
 
+       /* Indicate that RCOMP programming is done */
        reg32 = MCHBAR32(GBRCOMPCTL);
        reg32 &= ~( (1 << 29) | (1 << 26) | (3 << 21) | (3 << 2) );
        reg32 |= (3 << 27) | (3 << 0);
@@ -1132,8 +1338,10 @@ static void sdram_initialize_system_memory_io(struct sys_info *sysinfo)
 
        MCHBAR32(GBRCOMPCTL) |= (1 << 10);
 
+       /* Program DLL Timings */
        sdram_program_dll_timings(sysinfo);
 
+       /* Force RCOMP cycle */
        sdram_force_rcomp();
 }
 
@@ -1141,11 +1349,11 @@ static void sdram_enable_system_memory_io(struct sys_info *sysinfo)
 {
        u32 reg32;
 
-       printk_debug ("Enabling System Memory IO... \n");
-       
+       printk(BIOS_DEBUG, "Enabling System Memory IO... \n");
+
        reg32 = MCHBAR32(RCVENMT);
        reg32 &= ~(0x3f << 6);
-       MCHBAR32(RCVENMT) = reg32; 
+       MCHBAR32(RCVENMT) = reg32; /* [11:6] = 0 */
 
        reg32 |= (1 << 11) | (1 << 9);
        MCHBAR32(RCVENMT) = reg32;
@@ -1158,7 +1366,7 @@ static void sdram_enable_system_memory_io(struct sys_info *sysinfo)
        reg32 |= (1 << 6) | (1 << 4);
        MCHBAR32(DRTST) = reg32;
 
-       asm volatile ("nop; nop;");
+       asm volatile ("nop; nop;" ::: "memory");
 
        reg32 = MCHBAR32(DRTST);
 
@@ -1178,6 +1386,7 @@ static void sdram_enable_system_memory_io(struct sys_info *sysinfo)
 
        MCHBAR32(DRTST) = reg32;
 
+       /* Activate DRAM Channel IO Buffers */
        if (sysinfo->dimm[0] != SYSINFO_DIMM_NOT_POPULATED ||
                        sysinfo->dimm[1] != SYSINFO_DIMM_NOT_POPULATED) {
                reg32 = MCHBAR32(C0DRC1);
@@ -1197,12 +1406,13 @@ struct dimm_size {
        unsigned long side2;
 };
 
-static struct dimm_size sdram_get_dimm_size(u16 device)
+static struct dimm_size sdram_get_dimm_size(struct sys_info *sysinfo, u16 dimmno)
 {
        /* Calculate the log base 2 size of a DIMM in bits */
        struct dimm_size sz;
-       int value, low, rows, columns;
+       int value, low, rows, columns, device;
 
+       device = get_dimm_spd_address(sysinfo, dimmno);
        sz.side1 = 0;
        sz.side2 = 0;
 
@@ -1226,7 +1436,7 @@ static struct dimm_size sdram_get_dimm_size(u16 device)
        if (value < 0) goto hw_err;
        value &= 0xff;
        value <<= 8;
-       
+
        low = spd_read_byte(device, SPD_MODULE_DATA_WIDTH_LSB); /* (low byte) */
        if (low < 0) goto hw_err;
        value = value | (low & 0xff);
@@ -1250,7 +1460,7 @@ static struct dimm_size sdram_get_dimm_size(u16 device)
        /* Don't die here, I have not come across any of these to test what
         * actually happens.
         */
-       printk_err("Assymetric DIMMs are not supported by this chipset\n");
+       printk(BIOS_ERR, "Assymetric DIMMs are not supported by this chipset\n");
 
        sz.side2 -= (rows & 0x0f);              /* Subtract out rows on side 1 */
        sz.side2 += ((rows >> 4) & 0x0f);       /* Add in rows on side 2 */
@@ -1262,13 +1472,13 @@ static struct dimm_size sdram_get_dimm_size(u16 device)
 
  val_err:
        die("Bad SPD value\n");
- hw_err: 
+ hw_err:
        /* If a hardware error occurs the spd rom probably does not exist.
         * In this case report that there is no memory
         */
        sz.side1 = 0;
        sz.side2 = 0;
- out:
+out:
        return sz;
 }
 
@@ -1285,17 +1495,18 @@ static void sdram_detect_dimm_size(struct sys_info * sysinfo)
                if (sysinfo->dimm[i] == SYSINFO_DIMM_NOT_POPULATED)
                        continue;
 
-               sz = sdram_get_dimm_size(DIMM_SPD_BASE + i);
+               sz = sdram_get_dimm_size(sysinfo, i);
 
-               sysinfo->banks[i] = spd_read_byte(DIMM_SPD_BASE + i, SPD_NUM_BANKS_PER_SDRAM);  /* banks */
+               sysinfo->banks[i] = spd_read_byte(get_dimm_spd_address(sysinfo, i),
+                                                 SPD_NUM_BANKS_PER_SDRAM);     /* banks */
 
                if (sz.side1 < 30)
                        die("DDR-II rank size smaller than 128MB is not supported.\n");
 
-               sysinfo->banksize[i * 2] = sz.side1 - 30;
+               sysinfo->banksize[i * 2] = 1 << (sz.side1 - 28);
+
+               printk(BIOS_DEBUG, "DIMM %d side 0 = %d MB\n", i, sysinfo->banksize[i * 2] * 32 );
 
-               printk_debug("DIMM %d side 0 = %d MB\n", i, (1 << sysinfo->banksize[i * 2]) * 128 );
-       
                if (!sz.side2)
                        continue;
 
@@ -1303,22 +1514,22 @@ static void sdram_detect_dimm_size(struct sys_info * sysinfo)
                if (sz.side2 < 30)
                        die("DDR-II rank size smaller than 128MB is not supported.\n");
 
-               sysinfo->banksize[(i * 2) + 1] = sz.side2 - 30;
+               sysinfo->banksize[(i * 2) + 1] = 1 << (sz.side2 - 28);
 
-               printk_debug("DIMM %d side 1 = %d MB\n", i, (1 << sysinfo->banksize[(i * 2) + 1]) * 128);
+               printk(BIOS_DEBUG, "DIMM %d side 1 = %d MB\n", i, sysinfo->banksize[(i * 2) + 1] * 32);
        }
 }
 
 static int sdram_program_row_boundaries(struct sys_info *sysinfo)
 {
        int i;
-       int cum0, cum1, tolud;
+       int cum0, cum1, tolud, tom;
 
-       printk_debug ("Setting RAM size... \n");
+       printk(BIOS_DEBUG, "Setting RAM size... \n");
 
        cum0 = 0;
        for(i = 0; i < 2 * DIMM_SOCKETS; i++) {
-               cum0 += (sysinfo->banksize[i] << 3);
+               cum0 += sysinfo->banksize[i];
                MCHBAR8(C0DRB0+i) = cum0;
        }
 
@@ -1329,13 +1540,15 @@ static int sdram_program_row_boundaries(struct sys_info *sysinfo)
        if (sysinfo->interleaved)
                cum1 = 0;
 
+#if 0
        /* Exception: Channel 1 is not populated. C1DRB stays zero */
        if (sysinfo->dimm[2] == SYSINFO_DIMM_NOT_POPULATED &&
                        sysinfo->dimm[3] == SYSINFO_DIMM_NOT_POPULATED)
                cum1 = 0;
+#endif
 
        for(i = 0; i < 2 * DIMM_SOCKETS; i++) {
-               cum1 += (sysinfo->banksize[i + 4] << 3);
+               cum1 += sysinfo->banksize[i + 4];
                MCHBAR8(C1DRB0+i) = cum1;
        }
 
@@ -1345,27 +1558,30 @@ static int sdram_program_row_boundaries(struct sys_info *sysinfo)
        else
                tolud = (cum1 ? cum1 : cum0)  << 1;
 
-       /* Some extra checks needed. See 4.1.26 in the 
-        * 82945G MCH datasheet (30750203)
-        */
-       pci_write_config16(PCI_DEV(0,0,0), TOLUD, tolud);
-       
-       printk_debug("C0DRB = 0x%08x\n", MCHBAR32(C0DRB0));
-       printk_debug("C1DRB = 0x%08x\n", MCHBAR32(C1DRB0));
-       printk_debug("TOLUD = 0x%04x\n", tolud);
+       /* The TOM register has a different format */
+       tom = tolud >> 3;
+
+       /* Limit the value of TOLUD to leave some space for PCI memory. */
+       if (tolud > 0xd0)
+               tolud = 0xd0;   /* 3.25GB : 0.75GB */
+
+       pci_write_config8(PCI_DEV(0,0,0), TOLUD, tolud);
 
-       pci_write_config16(PCI_DEV(0,0,0), TOM, tolud>>3);
+       printk(BIOS_DEBUG, "C0DRB = 0x%08x\n", MCHBAR32(C0DRB0));
+       printk(BIOS_DEBUG, "C1DRB = 0x%08x\n", MCHBAR32(C1DRB0));
+       printk(BIOS_DEBUG, "TOLUD = 0x%04x\n", pci_read_config8(PCI_DEV(0,0,0), TOLUD));
+
+       pci_write_config16(PCI_DEV(0,0,0), TOM, tom);
 
        return 0;
 }
 
-
 static int sdram_set_row_attributes(struct sys_info *sysinfo)
 {
        int i, value;
        u16 dra0=0, dra1=0, dra = 0;
 
-       printk_debug ("Setting row attributes... \n");
+       printk(BIOS_DEBUG, "Setting row attributes... \n");
        for(i=0; i < 2 * DIMM_SOCKETS; i++) {
                u16 device;
                u8 columnsrows;
@@ -1374,8 +1590,7 @@ static int sdram_set_row_attributes(struct sys_info *sysinfo)
                        continue;
                }
 
-               device = DIMM_SPD_BASE + i;
-               columnsrows = 0;
+               device = get_dimm_spd_address(sysinfo, i);
 
                value = spd_read_byte(device, SPD_NUM_ROWS);    /* rows */
                columnsrows = (value & 0x0f);
@@ -1396,7 +1611,7 @@ static int sdram_set_row_attributes(struct sys_info *sysinfo)
                if (sysinfo->banksize[(2 * i) + 1] != 0) {
                        dra = (dra << 4) | dra;
                }
-               
+
                if (i < DIMM_SOCKETS)
                        dra0 |= (dra << (i*8));
                else
@@ -1405,9 +1620,9 @@ static int sdram_set_row_attributes(struct sys_info *sysinfo)
 
        MCHBAR16(C0DRA0) = dra0;
        MCHBAR16(C1DRA0) = dra1;
-               
-       printk_debug("C0DRA = 0x%04x\n", dra0);
-       printk_debug("C1DRA = 0x%04x\n", dra1);
+
+       printk(BIOS_DEBUG, "C0DRA = 0x%04x\n", dra0);
+       printk(BIOS_DEBUG, "C1DRA = 0x%04x\n", dra1);
 
        return 0;
 }
@@ -1432,7 +1647,7 @@ static void sdram_set_bank_architecture(struct sys_info *sysinfo)
                if (sysinfo->banks[i] != 8)
                        continue;
 
-               printk_spew("DIMM%d has 8 banks.\n");
+               printk(BIOS_SPEW, "DIMM%d has 8 banks.\n", i);
 
                if (i & 1)
                        MCHBAR16(off32) |= 0x50;
@@ -1446,7 +1661,7 @@ static void sdram_set_bank_architecture(struct sys_info *sysinfo)
 static void sdram_program_refresh_rate(struct sys_info *sysinfo)
 {
        u32 reg32;
-       
+
        if (sysinfo->refresh == REFRESH_7_8US) {
                reg32 = (2 << 8); /* Refresh enabled at 7.8us */
        } else {
@@ -1466,29 +1681,29 @@ static void sdram_program_cke_tristate(struct sys_info *sysinfo)
        int i;
 
        reg32 = MCHBAR32(C0DRC1);
-       
+
        for (i=0; i < 4; i++) {
                if (sysinfo->banksize[i] == 0) {
                        reg32 |= (1 << (16 + i));
                }
        }
-       
+
        reg32 |= (1 << 12);
-       
+
        reg32 |= (1 << 11);
        MCHBAR32(C0DRC1) = reg32;
 
        /* Do we have to do this if we're in Single Channel Mode?  */
        reg32 = MCHBAR32(C1DRC1);
-       
+
        for (i=4; i < 8; i++) {
                if (sysinfo->banksize[i] == 0) {
                        reg32 |= (1 << (12 + i));
                }
        }
-       
+
        reg32 |= (1 << 12);
-       
+
        reg32 |= (1 << 11);
        MCHBAR32(C1DRC1) = reg32;
 }
@@ -1499,7 +1714,7 @@ static void sdram_program_odt_tristate(struct sys_info *sysinfo)
        int i;
 
        reg32 = MCHBAR32(C0DRC2);
-       
+
        for (i=0; i < 4; i++) {
                if (sysinfo->banksize[i] == 0) {
                        reg32 |= (1 << (24 + i));
@@ -1508,7 +1723,7 @@ static void sdram_program_odt_tristate(struct sys_info *sysinfo)
        MCHBAR32(C0DRC2) = reg32;
 
        reg32 = MCHBAR32(C1DRC2);
-       
+
        for (i=4; i < 8; i++) {
                if (sysinfo->banksize[i] == 0) {
                        reg32 |= (1 << (20 + i));
@@ -1537,18 +1752,18 @@ static void sdram_set_timing_and_control(struct sys_info *sysinfo)
 
        reg32 = MCHBAR32(C0DRC0);
        reg32 |= (1 << 2);      /* Burst Length 8 */
-       reg32 &= ~( (1 << 13) | (1 << 12) ); 
+       reg32 &= ~( (1 << 13) | (1 << 12) );
        MCHBAR32(C0DRC0) = reg32;
 
        reg32 = MCHBAR32(C1DRC0);
        reg32 |= (1 << 2);      /* Burst Length 8 */
-       reg32 &= ~( (1 << 13) | (1 << 12) ); 
+       reg32 &= ~( (1 << 13) | (1 << 12) );
        MCHBAR32(C1DRC0) = reg32;
 
        if (!sysinfo->dual_channel && sysinfo->dimm[1] !=
                        SYSINFO_DIMM_NOT_POPULATED) {
                reg32 = MCHBAR32(C0DRC0);
-               reg32 |= (1 << 15);     
+               reg32 |= (1 << 15);
                MCHBAR32(C0DRC0) = reg32;
        }
 
@@ -1580,7 +1795,7 @@ static void sdram_set_timing_and_control(struct sys_info *sysinfo)
        reg32 = (sysinfo->cas - 1) + (BURSTLENGTH / 2) + tWTR;
        temp_drt |= (reg32 << 24);
 
-       
+       /* CxDRT0 [23:22], [21:20], [19:18] [16] have fixed values */
        temp_drt |= ( (1 << 22) | (3 << 20) | (1 << 18) | (0 << 16) );
 
        /* Program Write Auto Precharge to Activate */
@@ -1596,14 +1811,14 @@ static void sdram_set_timing_and_control(struct sys_info *sysinfo)
        temp_drt |= (reg32 << 11);
 
        /* Read Auto Precharge to Activate */
-       
+
        temp_drt |= (8 << 0);
 
        MCHBAR32(C0DRT0) = temp_drt;
        MCHBAR32(C1DRT0) = temp_drt;
 
        /* Calculate DRT1 */
-       
+
        temp_drt = MCHBAR32(C0DRT1) & 0x00020088;
 
        /* DRAM RASB Precharge */
@@ -1617,13 +1832,13 @@ static void sdram_set_timing_and_control(struct sys_info *sysinfo)
 
        /* Refresh Cycle Time */
        temp_drt |= (sysinfo->trfc) << 10;
-       
+
        /* Pre-All to Activate Delay */
        temp_drt |= (0 << 16);
-       
+
        /* Precharge to Precharge Delay stays at 1 clock */
        temp_drt |= (0 << 18);
-       
+
        /* Activate to Precharge Delay */
        temp_drt |= (sysinfo->tras << 19);
 
@@ -1649,7 +1864,7 @@ static void sdram_set_timing_and_control(struct sys_info *sysinfo)
        if (sysinfo->memory_frequency == 667) {
                reg32 = page_size;
        }
-       
+
        temp_drt |= (reg32 << 30);
 
        MCHBAR32(C0DRT1) = temp_drt;
@@ -1697,15 +1912,14 @@ static void sdram_set_channel_mode(struct sys_info *sysinfo)
 {
        u32 reg32;
 
-       printk_debug("Setting mode of operation for memory channels...");
+       printk(BIOS_DEBUG, "Setting mode of operation for memory channels...");
 
-       if (sdram_capabilities_interleave() && 
+       if (sdram_capabilities_interleave() &&
                    ( ( sysinfo->banksize[0] + sysinfo->banksize[1] +
                        sysinfo->banksize[2] + sysinfo->banksize[3] ) ==
                      ( sysinfo->banksize[4] + sysinfo->banksize[5] +
                        sysinfo->banksize[6] + sysinfo->banksize[7] ) ) ) {
                /* Both channels equipped with DIMMs of the same size */
-               
                sysinfo->interleaved = 1;
        } else {
                sysinfo->interleaved = 0;
@@ -1716,63 +1930,59 @@ static void sdram_set_channel_mode(struct sys_info *sysinfo)
 
        if(sysinfo->interleaved) {
                /* Dual Channel Interleaved */
-               printk_debug("Dual Channel Interleaved.\n");
+               printk(BIOS_DEBUG, "Dual Channel Interleaved.\n");
                reg32 |= (1 << 1);
        } else if (sysinfo->dimm[0] == SYSINFO_DIMM_NOT_POPULATED &&
                        sysinfo->dimm[1] == SYSINFO_DIMM_NOT_POPULATED) {
                /* Channel 1 only */
-               printk_debug("Single Channel 1 only.\n");
+               printk(BIOS_DEBUG, "Single Channel 1 only.\n");
                reg32 |= (1 << 2);
        } else if (sdram_capabilities_dual_channel() && sysinfo->dimm[2] !=
                        SYSINFO_DIMM_NOT_POPULATED) {
                /* Dual Channel Assymetric */
-               printk_debug("Dual Channel Assymetric.\n");
+               printk(BIOS_DEBUG, "Dual Channel Assymetric.\n");
                reg32 |= (1 << 0);
        } else {
                /* All bits 0 means Single Channel 0 operation */
-               printk_debug("Single Channel 0 only.\n");
+               printk(BIOS_DEBUG, "Single Channel 0 only.\n");
        }
 
-       reg32 |= (1 << 10); 
+       /* Now disable channel XORing */
+       reg32 |= (1 << 10);
 
        MCHBAR32(DCC) = reg32;
 
        PRINTK_DEBUG("DCC=0x%08x\n", MCHBAR32(DCC));
 }
 
-static void sdram_program_pll_settings(void)
+static void sdram_program_pll_settings(struct sys_info *sysinfo)
 {
        volatile u16 reg16;
-       volatile u32 reg32;
-
-       const u8 HPLLGPLLPowerDown[] = {
-               0x90, /* 400MHz */
-               0x95, /* 533MHz */
-               0x00, /* --- */
-               0x8d, /* 667MHz */
-       };
 
        MCHBAR32(PLLMON) = 0x80800000;
 
-       reg32 = MCHBAR32(CLKCFG);
-       reg32 &= (7 << 0);
+       sysinfo->fsb_frequency = fsbclk();
+       if (sysinfo->fsb_frequency == 0xffff)
+               die("Unsupported FSB speed");
 
-       reg16 = MCHBAR16(CPCTL);
-       reg16 &= 0xff00;
-       reg16 |= HPLLGPLLPowerDown[reg32];
-       MCHBAR16(CPCTL) = reg16;
+       /* Program CPCTL according to FSB speed */
+       /* Only write the lower byte */
+       switch (sysinfo->fsb_frequency) {
+       case 400: MCHBAR8(CPCTL) = 0x90; break; /* FSB400 */
+       case 533: MCHBAR8(CPCTL) = 0x95; break; /* FSB533 */
+       case 667: MCHBAR8(CPCTL) = 0x8d; break; /* FSB667 */
+       }
 
-       reg16 &= ~(1 << 11);
-       MCHBAR16(CPCTL) = reg16;
+       MCHBAR16(CPCTL) &= ~(1 << 11);
 
-       reg16 = MCHBAR16(CPCTL); 
+       reg16 = MCHBAR16(CPCTL); /* Read back register to activate settings */
 }
 
 static void sdram_program_graphics_frequency(struct sys_info *sysinfo)
 {
        u8  reg8;
        u16 reg16;
-       u8  freq, second_vco;
+       u8  freq, second_vco, voltage;
 
 #define CRCLK_166MHz   0x00
 #define CRCLK_200MHz   0x01
@@ -1782,62 +1992,63 @@ static void sdram_program_graphics_frequency(struct sys_info *sysinfo)
 #define CDCLK_200MHz   0x00
 #define CDCLK_320MHz   0x40
 
-       printk_debug ("Setting Graphics Frequency... \n");
+#define VOLTAGE_1_05   0x00
+#define VOLTAGE_1_50   0x01
 
-       reg16 = pci_read_config16(PCI_DEV(0,2,0), GCFC);
-       reg16 |= (1<<11) | (1<<9); 
-       pci_write_config16(PCI_DEV(0,2,0), GCFC, reg16);
+       printk(BIOS_DEBUG, "Setting Graphics Frequency... \n");
 
-       /* Program CPCTL according to FSB speed */
-       reg16 = MCHBAR16(CPCTL);
-       reg16 &= 0xff00; 
+       printk(BIOS_DEBUG, "FSB: %d MHz ", sysinfo->fsb_frequency);
 
-       switch (MCHBAR32(CLKCFG) & 0x7) {
-       case 0: sysinfo->fsb_frequency = 400; break;    /* FSB400 */
-       case 1: sysinfo->fsb_frequency = 533; break;    /* FSB533 */
-       case 3: sysinfo->fsb_frequency = 667; break;    /* FSB667 */
-       default: die("Unsupported FSB speed");
-       }
+       voltage = VOLTAGE_1_05;
+       if (MCHBAR32(DFT_STRAP1) & (1 << 20))
+               voltage = VOLTAGE_1_50;
+       printk(BIOS_DEBUG, "Voltage: %s ", (voltage==VOLTAGE_1_05)?"1.05V":"1.5V");
 
-       switch (sysinfo->fsb_frequency) {
-       case 533: reg16 |= 0x95; break; /* FSB533 */
-       case 667: reg16 |= 0x8d; break; /* FSB667 */
-       }
-       MCHBAR16(CPCTL) = reg16;
+       /* Gate graphics hardware for frequency change */
+       reg8 = pci_read_config16(PCI_DEV(0,2,0), GCFC + 1);
+       reg8 = (1<<3) | (1<<1); /* disable crclk, gate cdclk */
+       pci_write_config8(PCI_DEV(0,2,0), GCFC + 1, reg8);
 
        /* Get graphics frequency capabilities */
-       reg8 = (pci_read_config8(PCI_DEV(0, 0x00,0), 0xe5) & 0x0e) >> 1;
-       
+       reg8 = sdram_capabilities_core_frequencies();
+
        freq = CRCLK_250MHz;
        switch (reg8) {
-       case 0:
-               if (MCHBAR32(DFT_STRAP1) & (1 << 20))
+       case GFX_FREQUENCY_CAP_ALL:
+               if (voltage == VOLTAGE_1_05)
                        freq = CRCLK_250MHz;
                else
-                       freq = CRCLK_400MHz;
+                       freq = CRCLK_400MHz; /* 1.5V requires 400MHz */
                break;
-       case 2: freq = CRCLK_250MHz; break;
-       case 3: freq = CRCLK_200MHz; break;
-       case 4: freq = CRCLK_166MHz; break;
+       case GFX_FREQUENCY_CAP_250MHZ: freq = CRCLK_250MHz; break;
+       case GFX_FREQUENCY_CAP_200MHZ: freq = CRCLK_200MHz; break;
+       case GFX_FREQUENCY_CAP_166MHZ: freq = CRCLK_166MHz; break;
        }
 
        if (freq != CRCLK_400MHz) {
-               
+               /* What chipset are we? Force 166MHz for GMS */
                reg8 = (pci_read_config8(PCI_DEV(0, 0x00,0), 0xe7) & 0x70) >> 4;
                if (reg8==2)
                        freq = CRCLK_166MHz;
        }
 
+       printk(BIOS_DEBUG, "Render: ");
+       switch (freq) {
+       case CRCLK_166MHz: printk(BIOS_DEBUG, "166Mhz"); break;
+       case CRCLK_200MHz: printk(BIOS_DEBUG, "200Mhz"); break;
+       case CRCLK_250MHz: printk(BIOS_DEBUG, "250Mhz"); break;
+       case CRCLK_400MHz: printk(BIOS_DEBUG, "400Mhz"); break;
+       }
+
        if (i945_silicon_revision() == 0) {
                sysinfo->mvco4x = 1;
        } else {
                sysinfo->mvco4x = 0;
        }
 
-       
        second_vco = 0;
 
-       if (MCHBAR32(DFT_STRAP1) & (1 << 20)) {
+       if (voltage == VOLTAGE_1_50) {
                second_vco = 1;
        } else if ((i945_silicon_revision() > 0) && (freq == CRCLK_250MHz))  {
                u16 mem = sysinfo->memory_frequency;
@@ -1854,34 +2065,41 @@ static void sdram_program_graphics_frequency(struct sys_info *sysinfo)
        }
 
        if (second_vco) {
-               printk_debug("Programming second TCO\n");
                sysinfo->clkcfg_bit7=1;
        } else {
                sysinfo->clkcfg_bit7=0;
        }
 
+       /* Graphics Core Render Clock */
        reg16 = pci_read_config16(PCI_DEV(0,2,0), GCFC);
        reg16 &= ~( (7 << 0) | (1 << 13) );
        reg16 |= freq;
        pci_write_config16(PCI_DEV(0,2,0), GCFC, reg16);
 
-       reg16 = pci_read_config16(PCI_DEV(0,2,0), GCFC);
-       reg16 &= ~( (1<<7) | (7<<4) );
-       if (MCHBAR32(DFT_STRAP1) & (1 << 20)) {
-               reg16 |= CDCLK_200MHz; 
+       /* Graphics Core Display Clock */
+       reg8 = pci_read_config8(PCI_DEV(0,2,0), GCFC);
+       reg8 &= ~( (1<<7) | (7<<4) );
+
+       if (voltage == VOLTAGE_1_05) {
+               reg8 |= CDCLK_200MHz;
+               printk(BIOS_DEBUG, " Display: 200MHz\n");
        } else {
-               reg16 |= CDCLK_320MHz; 
+               reg8 |= CDCLK_320MHz;
+               printk(BIOS_DEBUG, " Display: 320MHz\n");
        }
-       pci_write_config16(PCI_DEV(0,2,0), GCFC, reg16);
+       pci_write_config8(PCI_DEV(0,2,0), GCFC, reg8);
 
-       reg16 = pci_read_config16(PCI_DEV(0,2,0), GCFC);
-       reg16 &= ~( (1<<10) | (1<<8) );
-       pci_write_config16(PCI_DEV(0,2,0), GCFC, reg16);
-       reg16 |= (1<<10) | (1<<8);
-       pci_write_config16(PCI_DEV(0,2,0), GCFC, reg16);
+       reg8 = pci_read_config8(PCI_DEV(0,2,0), GCFC + 1);
 
-       reg16 &= 0xf0ff;
-       pci_write_config16(PCI_DEV(0,2,0), GCFC, reg16);
+       reg8 |= (1<<3) | (1<<1);
+       pci_write_config8(PCI_DEV(0,2,0), GCFC + 1, reg8);
+
+       reg8 |= 0x0f;
+       pci_write_config8(PCI_DEV(0,2,0), GCFC + 1, reg8);
+
+       /* Ungate core render and display clocks */
+       reg8 &= 0xf0;
+       pci_write_config8(PCI_DEV(0,2,0), GCFC + 1, reg8);
 }
 
 static void sdram_program_memory_frequency(struct sys_info *sysinfo)
@@ -1889,22 +2107,22 @@ static void sdram_program_memory_frequency(struct sys_info *sysinfo)
        u32 clkcfg;
        u8 reg8;
 
-       printk_debug ("Setting Memory Frequency... ");
-       
+       printk(BIOS_DEBUG, "Setting Memory Frequency... ");
+
        clkcfg = MCHBAR32(CLKCFG);
 
-       printk_debug("CLKCFG=0x%08x, ", clkcfg);
+       printk(BIOS_DEBUG, "CLKCFG=0x%08x, ", clkcfg);
 
        clkcfg &= ~( (1 << 12) | (1 << 7) | ( 7 << 4) );
 
        if (sysinfo->mvco4x) {
-               printk_debug("MVCO 4x, ");
+               printk(BIOS_DEBUG, "MVCO 4x, ");
                clkcfg &= ~(1 << 12);
        }
 
        if (sysinfo->clkcfg_bit7) {
-               printk_debug("second VCO, ");
-               
+               printk(BIOS_DEBUG, "second VCO, ");
+
                clkcfg |= (1 << 7);
        }
 
@@ -1916,13 +2134,13 @@ static void sdram_program_memory_frequency(struct sys_info *sysinfo)
        }
 
        if (MCHBAR32(CLKCFG) == clkcfg) {
-               printk_debug ("ok (unchanged)\n");
+               printk(BIOS_DEBUG, "ok (unchanged)\n");
                return;
        }
 
        MCHBAR32(CLKCFG) = clkcfg;
 
-       /* Make sure the following code is in the 
+       /* Make sure the following code is in the
         * cache before we execute it.
         */
        goto cache_code;
@@ -1931,14 +2149,12 @@ vco_update:
        reg8 &= ~(1 << 7);
        pci_write_config8(PCI_DEV(0, 0x1f, 0), 0xa2, reg8);
 
-       
        clkcfg &= ~(1 << 10);
        MCHBAR32(CLKCFG) = clkcfg;
        clkcfg |= (1 << 10);
        MCHBAR32(CLKCFG) = clkcfg;
 
-       
-       __asm__ __volatile__ (
+       asm volatile (
                "       movl $0x100, %%ecx\n"
                "delay_update:\n"
                "       nop\n"
@@ -1948,10 +2164,9 @@ vco_update:
                "       loop delay_update\n"
                : /* No outputs */
                : /* No inputs */
-               : "%ecx"
+               : "%ecx", "memory"
                );
 
-       
        clkcfg &= ~(1 << 10);
        MCHBAR32(CLKCFG) = clkcfg;
 
@@ -1960,67 +2175,142 @@ cache_code:
        goto vco_update;
 out:
 
-       printk_debug("CLKCFG=0x%08x, ", MCHBAR32(CLKCFG));
-       printk_debug ("ok\n");
+       printk(BIOS_DEBUG, "CLKCFG=0x%08x, ", MCHBAR32(CLKCFG));
+       printk(BIOS_DEBUG, "ok\n");
 }
 
 static void sdram_program_clock_crossing(void)
 {
-       u32 reg32;
        int idx = 0;
 
        /**
-        * The first two lines of each of these tables are for FSB533,
-        * the following three lines are for FSB667. We ignore FSB400.
-        * Thus we add the indices according to our clocks from CLKCFG.
+        * We add the indices according to our clocks from CLKCFG.
         */
-
+#if CONFIG_NORTHBRIDGE_INTEL_I945GM
        static const u32 data_clock_crossing[] = {
+               0x00100401, 0x00000000, /* DDR400 FSB400 */
+               0xffffffff, 0xffffffff, /*  nonexistant  */
+               0xffffffff, 0xffffffff, /*  nonexistant  */
+
                0x08040120, 0x00000000, /* DDR400 FSB533 */
                0x00100401, 0x00000000, /* DDR533 FSB533 */
+               0x00010402, 0x00000000, /* DDR667 FSB533 - fake values */
 
                0x04020120, 0x00000010, /* DDR400 FSB667 */
                0x10040280, 0x00000040, /* DDR533 FSB667 */
-               0x00100401, 0x00000000  /* DDR667 FSB667 */
+               0x00100401, 0x00000000, /* DDR667 FSB667 */
+
+               0xffffffff, 0xffffffff, /*  nonexistant  */
+               0xffffffff, 0xffffffff, /*  nonexistant  */
+               0xffffffff, 0xffffffff, /*  nonexistant  */
+
+               0xffffffff, 0xffffffff, /*  nonexistant  */
+               0xffffffff, 0xffffffff, /*  nonexistant  */
+               0xffffffff, 0xffffffff, /*  nonexistant  */
        };
 
        static const u32 command_clock_crossing[] = {
+               0x04020208, 0x00000000, /* DDR400 FSB400 */
+               0xffffffff, 0xffffffff, /*  nonexistant  */
+               0xffffffff, 0xffffffff, /*  nonexistant  */
+
                0x00060108, 0x00000000, /* DDR400 FSB533 */
                0x04020108, 0x00000000, /* DDR533 FSB533 */
+               0xffffffff, 0xffffffff, /*  nonexistant  */
 
                0x00040318, 0x00000000, /* DDR400 FSB667 */
                0x04020118, 0x00000000, /* DDR533 FSB667 */
-               0x02010804, 0x00000000  /* DDR667 FSB667 */
+               0x02010804, 0x00000000, /* DDR667 FSB667 */
+
+               0xffffffff, 0xffffffff, /*  nonexistant  */
+               0xffffffff, 0xffffffff, /*  nonexistant  */
+               0xffffffff, 0xffffffff, /*  nonexistant  */
+
+               0xffffffff, 0xffffffff, /*  nonexistant  */
+               0xffffffff, 0xffffffff, /*  nonexistant  */
+               0xffffffff, 0xffffffff, /*  nonexistant  */
+       };
+
+#elif CONFIG_NORTHBRIDGE_INTEL_I945GC
+       /* i945 G/P */
+       static const u32 data_clock_crossing[] = {
+               0xffffffff, 0xffffffff, /*  nonexistant  */
+               0xffffffff, 0xffffffff, /*  nonexistant  */
+               0xffffffff, 0xffffffff, /*  nonexistant  */
+
+               0x10080201, 0x00000000, /* DDR400 FSB533 */
+               0x00100401, 0x00000000, /* DDR533 FSB533 */
+               0x00010402, 0x00000000, /* DDR667 FSB533 - fake values */
+
+               0xffffffff, 0xffffffff, /*  nonexistant  */
+               0xffffffff, 0xffffffff, /*  nonexistant  */
+               0xffffffff, 0xffffffff, /*  nonexistant  */
+
+               0x04020108, 0x00000000, /* DDR400 FSB800 */
+               0x00020108, 0x00000000, /* DDR533 FSB800 */
+               0x00080201, 0x00000000, /* DDR667 FSB800 */
+
+               0x00010402, 0x00000000, /* DDR400 FSB1066 */
+               0x04020108, 0x00000000, /* DDR533 FSB1066 */
+               0x08040110, 0x00000000, /* DDR667 FSB1066 */
        };
 
-       printk_debug("Programming Clock Crossing...");
-       reg32 = MCHBAR32(CLKCFG);
+       static const u32 command_clock_crossing[] = {
+               0xffffffff, 0xffffffff, /*  nonexistant  */
+               0xffffffff, 0xffffffff, /*  nonexistant  */
+               0xffffffff, 0xffffffff, /*  nonexistant  */
+
+               0x00010800, 0x00000402, /* DDR400 FSB533 */
+               0x01000400, 0x00000200, /* DDR533 FSB533 */
+               0x00020904, 0x00000000, /* DDR667 FSB533 - fake values */
+
+               0xffffffff, 0xffffffff, /*  nonexistant  */
+               0xffffffff, 0xffffffff, /*  nonexistant  */
+               0xffffffff, 0xffffffff, /*  nonexistant  */
+
+               0x02010804, 0x00000000, /* DDR400 FSB800 */
+               0x00010402, 0x00000000, /* DDR533 FSB800 */
+               0x04020180, 0x00000008, /* DDR667 FSB800 */
+
+               0x00020904, 0x00000000, /* DDR400 FSB1066 */
+               0x02010804, 0x00000000, /* DDR533 FSB1066 */
+               0x180601c0, 0x00000020, /* DDR667 FSB1066 */
+       };
+#endif
 
-       printk_debug("MEM=");
-       switch ((reg32 >> 4) & 7) {
-       case 2: printk_debug("400"); idx += 0; break;
-       case 3: printk_debug("533"); idx += 2; break;
-       case 4: printk_debug("667"); idx += 4; break;
-       default: printk_debug("RSVD\n"); return;
+       printk(BIOS_DEBUG, "Programming Clock Crossing...");
+
+       printk(BIOS_DEBUG, "MEM=");
+       switch (memclk()) {
+       case 400:       printk(BIOS_DEBUG, "400"); idx += 0; break;
+       case 533:       printk(BIOS_DEBUG, "533"); idx += 2; break;
+       case 667:       printk(BIOS_DEBUG, "667"); idx += 4; break;
+       default: printk(BIOS_DEBUG, "RSVD %x", memclk()); return;
+       }
+
+       printk(BIOS_DEBUG, " FSB=");
+       switch (fsbclk()) {
+       case 400:       printk(BIOS_DEBUG, "400"); idx += 0; break;
+       case 533:       printk(BIOS_DEBUG, "533"); idx += 6; break;
+       case 667:       printk(BIOS_DEBUG, "667"); idx += 12; break;
+       case 800:       printk(BIOS_DEBUG, "800"); idx += 18; break;
+       case 1066:      printk(BIOS_DEBUG, "1066"); idx += 24; break;
+       default: printk(BIOS_DEBUG, "RSVD %x\n", fsbclk()); return;
        }
 
-       printk_debug(" FSB=");
-       switch (reg32 & 7) {
-       case 0: printk_debug("400\n"); return;
-       case 1: printk_debug("533"); idx += 0; break;
-       case 3: printk_debug("667"); idx += 4; break;
-       default: printk_debug("RSVD\n"); return;
+       if (command_clock_crossing[idx]==0xffffffff) {
+               printk(BIOS_DEBUG, "Invalid MEM/FSB combination!\n");
        }
 
+       MCHBAR32(CCCFT + 0) = command_clock_crossing[idx];
+       MCHBAR32(CCCFT + 4) = command_clock_crossing[idx + 1];
+
        MCHBAR32(C0DCCFT + 0) = data_clock_crossing[idx];
        MCHBAR32(C0DCCFT + 4) = data_clock_crossing[idx + 1];
        MCHBAR32(C1DCCFT + 0) = data_clock_crossing[idx];
        MCHBAR32(C1DCCFT + 4) = data_clock_crossing[idx + 1];
 
-       MCHBAR32(CCCFT + 0) = command_clock_crossing[idx];
-       MCHBAR32(CCCFT + 4) = command_clock_crossing[idx + 1];
-
-       printk_debug("... ok\n");
+       printk(BIOS_DEBUG, "... ok\n");
 }
 
 static void sdram_disable_fast_dispatch(void)
@@ -2039,7 +2329,7 @@ static void sdram_disable_fast_dispatch(void)
 static void sdram_pre_jedec_initialization(void)
 {
        u32 reg32;
-       
+
        reg32 = MCHBAR32(WCC);
        reg32 &= 0x113ff3ff;
        reg32 |= (4 << 29) | (3 << 25) | (1 << 10);
@@ -2053,6 +2343,7 @@ static void sdram_pre_jedec_initialization(void)
        MCHBAR32(MMARB1) &= ~(7 << 8);
        MCHBAR32(MMARB1) |= (3 << 8);
 
+       /* Adaptive Idle Timer Control */
        MCHBAR32(C0AIT) = 0x000006c4;
        MCHBAR32(C0AIT+4) = 0x871a066d;
 
@@ -2074,9 +2365,9 @@ static void sdram_enhanced_addressing_mode(struct sys_info *sysinfo)
        u32 chan0 = 0, chan1 = 0;
        int chan0_dualsided, chan1_dualsided, chan0_populated, chan1_populated;
 
-       chan0_populated =  (sysinfo->dimm[0] != SYSINFO_DIMM_NOT_POPULATED || 
+       chan0_populated =  (sysinfo->dimm[0] != SYSINFO_DIMM_NOT_POPULATED ||
                        sysinfo->dimm[1] != SYSINFO_DIMM_NOT_POPULATED);
-       chan1_populated = (sysinfo->dimm[0] != SYSINFO_DIMM_NOT_POPULATED || 
+       chan1_populated = (sysinfo->dimm[0] != SYSINFO_DIMM_NOT_POPULATED ||
                        sysinfo->dimm[1] != SYSINFO_DIMM_NOT_POPULATED);
        chan0_dualsided = (sysinfo->banksize[1] || sysinfo->banksize[3]);
        chan1_dualsided = (sysinfo->banksize[5] || sysinfo->banksize[7]);
@@ -2157,8 +2448,9 @@ static void sdram_post_jedec_initialization(struct sys_info *sysinfo)
 
        /* Enable Channel XORing for Dual Channel Interleave */
        if (sysinfo->interleaved) {
+
                reg32 = MCHBAR32(DCC);
-#if CHANNEL_XOR_RANDOMIZATION
+#if CONFIG_CHANNEL_XOR_RANDOMIZATION
                reg32 &= ~(1 << 10);
                reg32 |= (1 << 9);
 #else
@@ -2191,34 +2483,40 @@ static void sdram_power_management(struct sys_info *sysinfo)
        u32 reg32;
        int integrated_graphics = 1;
        int i;
-       
+
        reg32 = MCHBAR32(C0DRT2);
        reg32 &= 0xffffff00;
        /* Idle timer = 8 clocks, CKE idle timer = 16 clocks */
-       reg32 |= (1 << 5) | (1 << 4); 
+       reg32 |= (1 << 5) | (1 << 4);
        MCHBAR32(C0DRT2) = reg32;
 
        reg32 = MCHBAR32(C1DRT2);
        reg32 &= 0xffffff00;
        /* Idle timer = 8 clocks, CKE idle timer = 16 clocks */
-       reg32 |= (1 << 5) | (1 << 4); 
+       reg32 |= (1 << 5) | (1 << 4);
        MCHBAR32(C1DRT2) = reg32;
 
        reg32 = MCHBAR32(C0DRC1);
-       
-       reg32 |= (1 << 12) | (1 << 11); 
+
+       reg32 |= (1 << 12) | (1 << 11);
        MCHBAR32(C0DRC1) = reg32;
 
        reg32 = MCHBAR32(C1DRC1);
-       
-       reg32 |= (1 << 12) | (1 << 11); 
+
+       reg32 |= (1 << 12) | (1 << 11);
        MCHBAR32(C1DRC1) = reg32;
 
        if (i945_silicon_revision()>1) {
-               MCHBAR16(UPMC1) = 0x1010;
+               /* FIXME bits 5 and 0 only if PCIe graphics is disabled */
+               u16 peg_bits = (1 << 5) | (1 << 0);
+
+               MCHBAR16(UPMC1) = 0x1010 | peg_bits;
        } else {
+               /* FIXME bits 5 and 0 only if PCIe graphics is disabled */
+               u16 peg_bits = (1 << 5) | (1 << 0);
+
                /* Rev 0 and 1 */
-               MCHBAR16(UPMC1) = 0x0010;
+               MCHBAR16(UPMC1) = 0x0010 | peg_bits;
        }
 
        reg16 = MCHBAR16(UPMC2);
@@ -2227,7 +2525,7 @@ static void sdram_power_management(struct sys_info *sysinfo)
        MCHBAR16(UPMC2) = reg16;
 
        MCHBAR32(UPMC3) = 0x000f06ff;
-       
+
        for (i=0; i<5; i++) {
                MCHBAR32(UPMC3) &= ~(1 << 16);
                MCHBAR32(UPMC3) |= (1 << 16);
@@ -2235,7 +2533,7 @@ static void sdram_power_management(struct sys_info *sysinfo)
 
        MCHBAR32(GIPMC1) = 0x8000000c;
 
-       reg16 = MCHBAR16(CPCTL); 
+       reg16 = MCHBAR16(CPCTL);
        reg16 &= ~(7 << 11);
        if (i945_silicon_revision()>2) {
                reg16 |= (6 << 11);
@@ -2245,7 +2543,6 @@ static void sdram_power_management(struct sys_info *sysinfo)
        MCHBAR16(CPCTL) = reg16;
 
 #if 0
-       /* This is set later in the game */
        if ((MCHBAR32(ECO) & (1 << 16)) != 0) {
 #else
        if (i945_silicon_revision() != 0) {
@@ -2286,6 +2583,7 @@ static void sdram_power_management(struct sys_info *sysinfo)
        }
 
 #if 0
+
        if (i945_silicon_revision() == 0) {
                MCHBAR32(FSBPMC3) &= ~(1 << 29);
        } else {
@@ -2309,8 +2607,8 @@ static void sdram_power_management(struct sys_info *sysinfo)
 
        MCHBAR32(FSBPMC4) |= (1 << 5);
 
-       if (i945_silicon_revision() < 2) {
-               /* stepping 0 and 1 */
+       if ((i945_silicon_revision() < 2) /* || cpuid() = 0x6e8 */ ) {
+               /* stepping 0 and 1 or CPUID 6e8 */
                MCHBAR32(FSBPMC4) &= ~(1 << 4);
        } else {
                MCHBAR32(FSBPMC4) |= (1 << 4);
@@ -2324,7 +2622,10 @@ static void sdram_power_management(struct sys_info *sysinfo)
        reg8 |= (1 << 2);
        pci_write_config8(PCI_DEV(0, 0x2, 0), 0xc1, reg8);
 
+#ifdef C2_SELF_REFRESH_DISABLE
+
        if (integrated_graphics) {
+               printk(BIOS_DEBUG, "C2 self-refresh with IGD\n");
                MCHBAR16(MIPMC4) = 0x0468;
                MCHBAR16(MIPMC5) = 0x046c;
                MCHBAR16(MIPMC6) = 0x046c;
@@ -2333,13 +2634,26 @@ static void sdram_power_management(struct sys_info *sysinfo)
                MCHBAR16(MIPMC5) = 0x646c;
                MCHBAR16(MIPMC6) = 0x646c;
        }
+#else
+       if (integrated_graphics) {
+               MCHBAR16(MIPMC4) = 0x04f8;
+               MCHBAR16(MIPMC5) = 0x04fc;
+               MCHBAR16(MIPMC6) = 0x04fc;
+       } else {
+               MCHBAR16(MIPMC4) = 0x64f8;
+               MCHBAR16(MIPMC5) = 0x64fc;
+               MCHBAR16(MIPMC6) = 0x64fc;
+       }
+
+#endif
 
        reg32 = MCHBAR32(PMCFG);
        reg32 &= ~(3 << 17);
        reg32 |= (2 << 17);
-       reg32 |= (1 << 4);
        MCHBAR32(PMCFG) = reg32;
 
+       MCHBAR32(PMCFG) |= (1 << 4);
+
        reg32 = MCHBAR32(0xc30);
        reg32 &= 0xffffff00;
        reg32 |= 0x01;
@@ -2350,13 +2664,77 @@ static void sdram_power_management(struct sys_info *sysinfo)
 
 static void sdram_thermal_management(void)
 {
-       /* The Thermal Sensors for DIMMs at 0x50, 0x52 are at I2C addr
-        * 0x30/0x32. 
-        */
 
-       /* Explicitly set to 0 */
        MCHBAR8(TCO1) = 0x00;
        MCHBAR8(TCO0) = 0x00;
+
+       /* The Thermal Sensors for DIMMs at 0x50, 0x52 are at I2C addr
+        * 0x30/0x32.
+        */
+
+       /* TODO This is not implemented yet. Volunteers? */
+}
+
+static void sdram_save_receive_enable(void)
+{
+       int i;
+       u32 reg32;
+       u8 values[4];
+
+       /* The following values are stored to an unused CMOS
+        * area and restored instead of recalculated in case
+        * of an S3 resume.
+        *
+        * C0WL0REOST [7:0]             -> 8 bit
+        * C1WL0REOST [7:0]             -> 8 bit
+        * RCVENMT    [11:8] [3:0]      -> 8 bit
+        * C0DRT1     [27:24]           -> 4 bit
+        * C1DRT1     [27:24]           -> 4 bit
+        */
+
+       values[0] = MCHBAR8(C0WL0REOST);
+       values[1] = MCHBAR8(C1WL0REOST);
+
+       reg32 = MCHBAR32(RCVENMT);
+       values[2] = (u8)((reg32 >> (8 - 4)) & 0xf0) | (reg32 & 0x0f);
+
+       reg32 = MCHBAR32(C0DRT1);
+       values[3] = (reg32 >> 24) & 0x0f;
+       reg32 = MCHBAR32(C1DRT1);
+       values[3] |= (reg32 >> (24 - 4)) & 0xf0;
+
+       /* coreboot only uses bytes 0 - 127 for its CMOS values so far
+        * so we grab bytes 128 - 131 to save the receive enable values
+        */
+
+       for (i=0; i<4; i++)
+               cmos_write(values[i], 128 + i);
+}
+
+static void sdram_recover_receive_enable(void)
+{
+       int i;
+       u32 reg32;
+       u8 values[4];
+
+       for (i=0; i<4; i++)
+               values[i] = cmos_read(128 + i);
+
+       MCHBAR8(C0WL0REOST) = values[0];
+       MCHBAR8(C1WL0REOST) = values[1];
+
+       reg32 = MCHBAR32(RCVENMT);
+       reg32 &= ~((0x0f << 8) | (0x0f << 0));
+       reg32 |= ((u32)(values[2] & 0xf0) << (8 - 4)) | (values[2] & 0x0f);
+       MCHBAR32(RCVENMT) = reg32;
+
+       reg32 = MCHBAR32(C0DRT1) & ~(0x0f << 24);
+       reg32 |= (u32)(values[3] & 0x0f) << 24;
+       MCHBAR32(C0DRT1) = reg32;
+
+       reg32 = MCHBAR32(C1DRT1) & ~(0x0f << 24);
+       reg32 |= (u32)(values[3] & 0xf0) << (24 - 4);
+       MCHBAR32(C1DRT1) = reg32;
 }
 
 #include "rcven.c"
@@ -2365,14 +2743,23 @@ static void sdram_program_receive_enable(struct sys_info *sysinfo)
 {
        MCHBAR32(REPC) |= (1 << 0);
 
-       receive_enable_adjust(sysinfo);
+       /* enable upper CMOS */
+       RCBA32(0x3400) = (1 << 2);
+
+       /* Program Receive Enable Timings */
+       if (sysinfo->boot_path == BOOT_PATH_RESUME) {
+               sdram_recover_receive_enable();
+       } else {
+               receive_enable_adjust(sysinfo);
+               sdram_save_receive_enable();
+       }
 
        MCHBAR32(C0DRC1) |= (1 << 6);
        MCHBAR32(C1DRC1) |= (1 << 6);
        MCHBAR32(C0DRC1) &= ~(1 << 6);
        MCHBAR32(C1DRC1) &= ~(1 << 6);
 
-       MCHBAR32(MIPMC3) |= (0x0f << 0); 
+       MCHBAR32(MIPMC3) |= (0x0f << 0);
 }
 
 /**
@@ -2383,9 +2770,9 @@ static void sdram_program_receive_enable(struct sys_info *sysinfo)
 static void sdram_on_die_termination(struct sys_info *sysinfo)
 {
        static const u32 odt[] = {
-               0x00024911, 0xe0010000, 
-               0x00049211, 0xe0020000, 
-               0x0006db11, 0xe0030000, 
+               0x00024911, 0xe0010000,
+               0x00049211, 0xe0020000,
+               0x0006db11, 0xe0030000,
        };
 
        u32 reg32;
@@ -2398,8 +2785,8 @@ static void sdram_on_die_termination(struct sys_info *sysinfo)
 
        if ( !(sysinfo->dimm[0] != SYSINFO_DIMM_NOT_POPULATED &&
                        sysinfo->dimm[1] != SYSINFO_DIMM_NOT_POPULATED) ) {
-               printk_debug("one dimm per channel config.. \n");
-               
+               printk(BIOS_DEBUG, "one dimm per channel config.. \n");
+
                reg32 = MCHBAR32(C0ODT);
                reg32 &= ~(7 << 28);
                MCHBAR32(C0ODT) = reg32;
@@ -2435,27 +2822,40 @@ static void sdram_enable_memory_clocks(struct sys_info *sysinfo)
 {
        u8 clocks[2] = { 0, 0 };
 
+#if CONFIG_NORTHBRIDGE_INTEL_I945GM
+#define CLOCKS_WIDTH 2
+#elif CONFIG_NORTHBRIDGE_INTEL_I945GC
+#define CLOCKS_WIDTH 3
+#endif
        if (sysinfo->dimm[0] != SYSINFO_DIMM_NOT_POPULATED)
-               clocks[0] |= (1 << 0) | (1 << 1);
+               clocks[0] |= (1 << CLOCKS_WIDTH)-1;
 
        if (sysinfo->dimm[1] != SYSINFO_DIMM_NOT_POPULATED)
-               clocks[0] |= (1 << 2) | (1 << 3);
+               clocks[0] |= ((1 << CLOCKS_WIDTH)-1) << CLOCKS_WIDTH;
 
        if (sysinfo->dimm[2] != SYSINFO_DIMM_NOT_POPULATED)
-               clocks[1] |= (1 << 0) | (1 << 1);
+               clocks[1] |= (1 << CLOCKS_WIDTH)-1;
 
        if (sysinfo->dimm[3] != SYSINFO_DIMM_NOT_POPULATED)
-               clocks[1] |= (1 << 2) | (1 << 3);
+               clocks[1] |= ((1 << CLOCKS_WIDTH)-1) << CLOCKS_WIDTH;
 
-#ifdef OVERRIDE_CLOCK_DISABLE
-       clocks[0] = 0xf; 
-       clocks[1] = 0xf; 
+#if CONFIG_OVERRIDE_CLOCK_DISABLE
+       /* Usually system firmware turns off system memory clock signals
+        * to unused SO-DIMM slots to reduce EMI and power consumption.
+        * However, the Kontron 986LCD-M does not like unused clock
+        * signals to be disabled.
+        */
+
+       clocks[0] = 0xf; /* force all clock gate pairs to enable */
+       clocks[1] = 0xf; /* force all clock gate pairs to enable */
 #endif
 
        MCHBAR8(C0DCLKDIS) = clocks[0];
        MCHBAR8(C1DCLKDIS) = clocks[1];
 }
 
+#define RTT_ODT_NONE   0
+#define RTT_ODT_50_OHM  ( (1 << 9) | (1 << 5) )
 #define RTT_ODT_75_OHM (1 << 5)
 #define RTT_ODT_150_OHM        (1 << 9)
 
@@ -2483,8 +2883,8 @@ static void sdram_jedec_enable(struct sys_info *sysinfo)
                if (sysinfo->banksize[i]  == 0) {
                        continue;
                }
-               
-               printk_debug("jedec enable sequence: bank %d\n", i);
+
+               printk(BIOS_DEBUG, "jedec enable sequence: bank %d\n", i);
                switch (i) {
                case 0:
                        /* Start at address 0 */
@@ -2497,15 +2897,16 @@ static void sdram_jedec_enable(struct sys_info *sysinfo)
                        }
                default:
                        if (nonzero != -1) {
-                               printk_debug("bankaddr from bank size of rank %d\n", nonzero);
-                               bankaddr += (1 << sysinfo->banksize[nonzero]) << (sysinfo->interleaved?28:27);
+                               printk(BIOS_DEBUG, "bankaddr from bank size of rank %d\n", nonzero);
+                               bankaddr += sysinfo->banksize[nonzero] <<
+                                       (sysinfo->interleaved ? 26 : 25);
                                break;
                        }
                        /* No populated bank hit before. Start at address 0 */
                        bankaddr = 0;
                }
 
-               /* We have a bank with a non-zero size.. Remember it 
+               /* We have a bank with a non-zero size.. Remember it
                 * for the next offset we have to calculate
                 */
                nonzero = i;
@@ -2526,9 +2927,11 @@ static void sdram_jedec_enable(struct sys_info *sysinfo)
                default: die("Jedec Error (tWR).\n");
                }
 
+               /* Set "Burst Type" */
+               mrsaddr |= MRS_BT;
+
                /* Interleaved */
                if (sysinfo->interleaved) {
-                       mrsaddr |= MRS_BT;
                        mrsaddr = mrsaddr << 1;
                }
 
@@ -2574,7 +2977,7 @@ static void sdram_jedec_enable(struct sys_info *sysinfo)
                tmpaddr = bankaddr;
                tmpaddr |= mrsaddr;
                /* Set DLL reset bit */
-               if (sysinfo->interleaved) 
+               if (sysinfo->interleaved)
                        tmpaddr |= (1 << 12);
                else
                        tmpaddr |= (1 << 11);
@@ -2600,14 +3003,14 @@ static void sdram_jedec_enable(struct sys_info *sysinfo)
                tmpaddr = bankaddr;
                tmpaddr |= mrsaddr;
                ram_read32(tmpaddr);
-       
+
                /* Extended Mode Register Set */
                PRINTK_DEBUG("Extended Mode Register Set: ODT/OCD\n");
                do_ram_command(RAM_COMMAND_EMRS | RAM_EMRS_1);
-               
+
                tmpaddr = bankaddr;
                if (!sdram_capabilities_dual_channel()) {
-                       
+
                        tmpaddr |= RTT_ODT_75_OHM | EMRS_OCD_DEFAULT;
                } else if (sysinfo->interleaved) {
                        tmpaddr |= ((RTT_ODT_150_OHM | EMRS_OCD_DEFAULT) << 1);
@@ -2649,61 +3052,62 @@ static void sdram_setup_processor_side(void)
                MCHBAR32(SLPCTL) |= (1 << 8);
 }
 
-#define BOOT_MODE_RESUME       1
-#define BOOT_MODE_NORMAL       0
-
 /**
- * @param boot_mode: 0 = normal, 1 = resume
+ * @param boot_path: 0 = normal, 1 = reset, 2 = resume from s3
  */
-void sdram_initialize(int boot_mode)
+void sdram_initialize(int boot_path, const u8 *spd_addresses)
 {
        struct sys_info sysinfo;
        u8 reg8, cas_mask;
 
-       sdram_detect_errors();
-
-       printk_debug ("Setting up RAM controller.\n");
+       printk(BIOS_DEBUG, "Setting up RAM controller.\n");
 
        memset(&sysinfo, 0, sizeof(sysinfo));
 
+       sysinfo.boot_path = boot_path;
+       sysinfo.spd_addresses = spd_addresses;
+
        /* Look at the type of DIMMs and verify all DIMMs are x8 or x16 width */
        sdram_get_dram_configuration(&sysinfo);
 
+       /* If error, do cold boot */
+       sdram_detect_errors(&sysinfo);
+
        /* Check whether we have stacked DIMMs */
        sdram_verify_package_type(&sysinfo);
 
        /* Determine common CAS */
        cas_mask = sdram_possible_cas_latencies(&sysinfo);
-       
+
        /* Choose Common Frequency */
        sdram_detect_cas_latency_and_ram_speed(&sysinfo, cas_mask);
-       
+
        /* Determine smallest common tRAS */
        sdram_detect_smallest_tRAS(&sysinfo);
-       
+
        /* Determine tRP */
        sdram_detect_smallest_tRP(&sysinfo);
-       
+
        /* Determine tRCD */
        sdram_detect_smallest_tRCD(&sysinfo);
-       
+
        /* Determine smallest refresh period */
        sdram_detect_smallest_refresh(&sysinfo);
-       
+
        /* Verify all DIMMs support burst length 8 */
        sdram_verify_burst_length(&sysinfo);
-       
+
        /* determine tWR */
        sdram_detect_smallest_tWR(&sysinfo);
 
        /* Determine DIMM size parameters (rows, columns banks) */
        sdram_detect_dimm_size(&sysinfo);
-       
+
        /* determine tRFC */
        sdram_detect_smallest_tRFC(&sysinfo);
-        
+
        /* Program PLL settings */
-       sdram_program_pll_settings();
+       sdram_program_pll_settings(&sysinfo);
 
        /* Program Graphics Frequency */
        sdram_program_graphics_frequency(&sysinfo);
@@ -2713,10 +3117,10 @@ void sdram_initialize(int boot_mode)
 
        /* Determine Mode of Operation (Interleaved etc) */
        sdram_set_channel_mode(&sysinfo);
-       
+
        /* Program Clock Crossing values */
        sdram_program_clock_crossing();
-       
+
        /* Disable fast dispatch */
        sdram_disable_fast_dispatch();
 
@@ -2726,13 +3130,11 @@ void sdram_initialize(int boot_mode)
 
        /* Program DRAM Row Boundary/Attribute Registers */
 
-       if (boot_mode != BOOT_MODE_RESUME) {
-               /* program row size DRB and set TOLUD */
-               sdram_program_row_boundaries(&sysinfo);
-       
-               /* program page size DRA */
-               sdram_set_row_attributes(&sysinfo);
-       }
+       /* program row size DRB and set TOLUD */
+       sdram_program_row_boundaries(&sysinfo);
+
+       /* program page size DRA */
+       sdram_set_row_attributes(&sysinfo);
 
        /* Program CxBNKARC */
        sdram_set_bank_architecture(&sysinfo);
@@ -2755,7 +3157,7 @@ void sdram_initialize(int boot_mode)
        /* Enable System Memory Clocks */
        sdram_enable_memory_clocks(&sysinfo);
 
-       if (boot_mode != BOOT_MODE_RESUME) {
+       if (boot_path == BOOT_PATH_NORMAL) {
                /* Jedec Initialization sequence */
                sdram_jedec_enable(&sysinfo);
        }
@@ -2768,7 +3170,7 @@ void sdram_initialize(int boot_mode)
 
        /* Program DRAM Throttling */
        sdram_thermal_management();
-       
+
        /* Normal Operations */
        sdram_init_complete();
 
@@ -2783,8 +3185,40 @@ void sdram_initialize(int boot_mode)
        reg8 &= ~(1 << 7);
        pci_write_config8(PCI_DEV(0, 0x1f, 0), 0xa2, reg8);
 
-       printk_debug("RAM initialization finished.\n");
-       
+       printk(BIOS_DEBUG, "RAM initialization finished.\n");
+
        sdram_setup_processor_side();
 }
 
+unsigned long get_top_of_ram(void)
+{
+       u32 tom;
+
+       if (pci_read_config8(PCI_DEV(0, 0x0, 0), DEVEN) & ((1 << 4) | (1 << 3))) {
+               /* IGD enabled, get top of Memory from BSM register */
+               tom = pci_read_config32(PCI_DEV(0,2,0), 0x5c);
+       } else {
+               tom = (pci_read_config8(PCI_DEV(0,0,0), TOLUD) & 0xf7) << 24;
+       }
+
+       /* if TSEG enabled subtract size */
+       switch(pci_read_config8(PCI_DEV(0, 0, 0), ESMRAM)) {
+       case 0x01:
+               /* 1MB TSEG */
+               tom -= 0x10000;
+               break;
+       case 0x03:
+               /* 2MB TSEG */
+               tom -= 0x20000;
+               break;
+       case 0x05:
+               /* 8MB TSEG */
+               tom -= 0x80000;
+               break;
+       default:
+               /* TSEG either disabled or invalid */
+               break;
+       }
+       return (unsigned long) tom;
+}
+