Since some people disapprove of white space cleanups mixed in regular commits
[coreboot.git] / src / northbridge / intel / i82810 / raminit.c
index 61fb2b63960aa175770183a169f366b3a111620a..81148e313dc055b9c05bcf9b3f17f7213507a46c 100644 (file)
@@ -21,7 +21,6 @@
  */
 
 #include <spd.h>
-#include <sdram_mode.h>
 #include <delay.h>
 #include "i82810.h"
 
 Macros and definitions.
 -----------------------------------------------------------------------------*/
 
-/* Uncomment this to enable debugging output. */
-// #define DEBUG_RAM_SETUP 1
-
 /* Debugging macros. */
-#if defined(DEBUG_RAM_SETUP)
+#define HAVE_ENOUGH_REGISTERS   0 /* Don't have enough registers to compile all
+                                  * debugging code with ROMCC
+                                  */
+#if CONFIG_DEBUG_RAM_SETUP
 #define PRINT_DEBUG(x)         print_debug(x)
 #define PRINT_DEBUG_HEX8(x)    print_debug_hex8(x)
 #define PRINT_DEBUG_HEX16(x)   print_debug_hex16(x)
 #define PRINT_DEBUG_HEX32(x)   print_debug_hex32(x)
-#define DUMPNORTH()            dump_pci_device(PCI_DEV(0, 0, 0))
+// no dump_pci_device in src/northbridge/intel/i82810/
+// #define DUMPNORTH()         dump_pci_device(PCI_DEV(0, 0, 0))
+#define DUMPNORTH()
 #else
 #define PRINT_DEBUG(x)
 #define PRINT_DEBUG_HEX8(x)
@@ -141,26 +142,29 @@ static void do_ram_command(u8 command)
                drp = (drp >> (i * 4)) & 0x0f;
 
                dimm_size = translate_i82810_to_mb[drp];
-               addr = (dimm_start * 1024 * 1024) + addr_offset;
                if (dimm_size) {
+                       addr = (dimm_start * 1024 * 1024) + addr_offset;
+#if HAVE_ENOUGH_REGISTERS
                        PRINT_DEBUG("    Sending RAM command 0x");
                        PRINT_DEBUG_HEX8(reg8);
                        PRINT_DEBUG(" to 0x");
                        PRINT_DEBUG_HEX32(addr);
-                       PRINT_DEBUG("\r\n");
+                       PRINT_DEBUG("\n");
+#endif
 
                        read32(addr);
                }
 
                dimm_bank = translate_i82810_to_bank[drp];
-               addr = ((dimm_start + dimm_bank) * 1024 * 1024) + addr_offset;
                if (dimm_bank) {
+                       addr = ((dimm_start + dimm_bank) * 1024 * 1024) + addr_offset;
+#if HAVE_ENOUGH_REGISTERS
                        PRINT_DEBUG("    Sending RAM command 0x");
                        PRINT_DEBUG_HEX8(reg8);
                        PRINT_DEBUG(" to 0x");
                        PRINT_DEBUG_HEX32(addr);
-                       PRINT_DEBUG("\r\n");
-
+                       PRINT_DEBUG("\n");
+#endif
                        read32(addr);
                }
 
@@ -189,14 +193,14 @@ static void spd_set_dram_size(void)
                if (smbus_read_byte(DIMM_SPD_BASE + i, 2) == 4) {
                        print_debug("Found DIMM in slot ");
                        print_debug_hex8(i);
-                       print_debug("\r\n");
+                       print_debug("\n");
 
                        dimm_size = smbus_read_byte(DIMM_SPD_BASE + i, 31);
 
                        /* WISHLIST: would be nice to display it as decimal? */
                        print_debug("DIMM is 0x");
                        print_debug_hex8(dimm_size * 4);
-                       print_debug("MB\r\n");
+                       print_debug("MB\n");
 
                        /* The i810 can't handle DIMMs larger than 128MB per
                         * side. This will fail if the DIMM uses a
@@ -206,9 +210,9 @@ static void spd_set_dram_size(void)
                         */
                        if (dimm_size > 32) {
                                print_err("DIMM row sizes larger than 128MB not"
-                                         "supported on i810\r\n");
+                                         "supported on i810\n");
                                print_err
-                                   ("Attempting to treat as 128MB DIMM\r\n");
+                                   ("Attempting to treat as 128MB DIMM\n");
                                dimm_size = 32;
                        }
 
@@ -220,19 +224,19 @@ static void spd_set_dram_size(void)
 
                        print_debug("After translation, dimm_size is 0x");
                        print_debug_hex8(dimm_size);
-                       print_debug("\r\n");
+                       print_debug("\n");
 
                        /* If the DIMM is dual-sided, the DRP value is +2 */
                        /* TODO: Figure out asymetrical configurations. */
                        if ((smbus_read_byte(DIMM_SPD_BASE + i, 127) | 0xf) ==
                            0xff) {
-                               print_debug("DIMM is dual-sided\r\n");
+                               print_debug("DIMM is dual-sided\n");
                                dimm_size += 2;
                        }
                } else {
                        print_debug("No DIMM found in slot ");
                        print_debug_hex8(i);
-                       print_debug("\r\n");
+                       print_debug("\n");
 
                        /* If there's no DIMM in the slot, set value to 0. */
                        dimm_size = 0x00;
@@ -244,7 +248,7 @@ static void spd_set_dram_size(void)
 
        print_debug("DRP calculated to 0x");
        print_debug_hex8(drp);
-       print_debug("\r\n");
+       print_debug("\n");
 
        pci_write_config8(PCI_DEV(0, 0, 0), DRP, drp);
 }
@@ -308,7 +312,7 @@ static void set_dram_buffer_strength(void)
                                        SPD_NUM_DIMM_BANKS) > 1;
                d1.ss = !d1.ds;
        }
-       
+
        buff_sc = 0;
 
        /* Tame the beast... */
@@ -346,10 +350,10 @@ static void set_dram_buffer_strength(void)
                buff_sc |= 1 << 14;
        if (!d0.size && d1.size)
                buff_sc |= 1 << 15;
-       
+
        print_debug("BUFF_SC calculated to 0x");
        print_debug_hex16(buff_sc);
-       print_debug("\r\n");
+       print_debug("\n");
 
        pci_write_config16(PCI_DEV(0, 0, 0), BUFF_SC, buff_sc);
 }
@@ -367,11 +371,11 @@ static void sdram_set_registers(void)
 
        /* Ideally, this should be R/W for as many ranges as possible. */
        pci_write_config8(PCI_DEV(0, 0, 0), PAMR, 0xff);
-       
+
        /* Set size for onboard-VGA framebuffer. */
        reg8 = pci_read_config8(PCI_DEV(0, 0, 0), SMRAM);
        reg8 &= 0x3f;                        /* Disable graphics (for now). */
-#ifdef CONFIG_VIDEO_MB
+#if CONFIG_VIDEO_MB
        if (CONFIG_VIDEO_MB == 512)
                reg8 |= (1 << 7);            /* Enable graphics (512KB RAM). */
        else if (CONFIG_VIDEO_MB == 1)
@@ -406,32 +410,32 @@ static void sdram_enable(void)
        int i;
 
        /* 1. Apply NOP. */
-       PRINT_DEBUG("RAM Enable 1: Apply NOP\r\n");
+       PRINT_DEBUG("RAM Enable 1: Apply NOP\n");
        do_ram_command(RAM_COMMAND_NOP);
        udelay(200);
 
        /* 2. Precharge all. Wait tRP. */
-       PRINT_DEBUG("RAM Enable 2: Precharge all\r\n");
+       PRINT_DEBUG("RAM Enable 2: Precharge all\n");
        do_ram_command(RAM_COMMAND_PRECHARGE);
        udelay(1);
 
        /* 3. Perform 8 refresh cycles. Wait tRC each time. */
-       PRINT_DEBUG("RAM Enable 3: CBR\r\n");
+       PRINT_DEBUG("RAM Enable 3: CBR\n");
        for (i = 0; i < 8; i++) {
                do_ram_command(RAM_COMMAND_CBR);
                udelay(1);
        }
 
        /* 4. Mode register set. Wait two memory cycles. */
-       PRINT_DEBUG("RAM Enable 4: Mode register set\r\n");
+       PRINT_DEBUG("RAM Enable 4: Mode register set\n");
        do_ram_command(RAM_COMMAND_MRS);
        udelay(2);
 
        /* 5. Normal operation (enables refresh at 15.6usec). */
-       PRINT_DEBUG("RAM Enable 5: Normal operation\r\n");
+       PRINT_DEBUG("RAM Enable 5: Normal operation\n");
        do_ram_command(RAM_COMMAND_NORMAL);
        udelay(1);
 
-       PRINT_DEBUG("Northbridge following SDRAM init:\r\n");
+       PRINT_DEBUG("Northbridge following SDRAM init:\n");
        DUMPNORTH();
 }