Merge branch 'master' of git://git.denx.de/u-boot-ti

[karo-tx-uboot.git] / arch / x86 / cpu / ivybridge / sdram.c

diff --git a/arch/x86/cpu/ivybridge/sdram.c b/arch/x86/cpu/ivybridge/sdram.c
index df2b9901fc0cc8a64944b544699e55b7d4c8bf0f..95047359ffaca080dfaf3820d0d8c16ceefc9dfe 100644 (file)
--- a/arch/x86/cpu/ivybridge/sdram.c
+++ b/arch/x86/cpu/ivybridge/sdram.c
@@ -17,6 +17,7 @@
 #include <asm/processor.h>
 #include <asm/gpio.h>
 #include <asm/global_data.h>
+#include <asm/mtrr.h>
 #include <asm/pci.h>
 #include <asm/arch/me.h>
 #include <asm/arch/pei_data.h>
@@ -177,7 +178,7 @@ int sdram_initialise(struct pei_data *pei_data)
 
        debug("PEI data at %p, size %x:\n", pei_data, sizeof(*pei_data));
 
-       data = (char *)CONFIG_X86_MRC_START;
+       data = (char *)CONFIG_X86_MRC_ADDR;
        if (data) {
                int rv;
                int (*func)(struct pei_data *);
@@ -430,6 +431,15 @@ static int sdram_find(pci_dev_t dev)
        add_memory_area(info, (2 << 28) + (2 << 20), 4 << 28);
        add_memory_area(info, (4 << 28) + (2 << 20), tseg_base);
        add_memory_area(info, 1ULL << 32, touud);
+
+       /* Add MTRRs for memory */
+       mtrr_add_request(MTRR_TYPE_WRBACK, 0, 2ULL << 30);
+       mtrr_add_request(MTRR_TYPE_WRBACK, 2ULL << 30, 512 << 20);
+       mtrr_add_request(MTRR_TYPE_WRBACK, 0xaULL << 28, 256 << 20);
+       mtrr_add_request(MTRR_TYPE_UNCACHEABLE, tseg_base, 16 << 20);
+       mtrr_add_request(MTRR_TYPE_UNCACHEABLE, tseg_base + (16 << 20),
+                        32 << 20);
+
        /*
         * If >= 4GB installed then memory from TOLUD to 4GB
         * is remapped above TOM, TOUUD will account for both