x86: ivybridge: Move lpc_early_init() to probe()

[u-boot] / arch / x86 / cpu / ivybridge / sdram.c

diff --git a/arch/x86/cpu/ivybridge/sdram.c b/arch/x86/cpu/ivybridge/sdram.c
index e63790963c9c73d3aa4f60fb60de865c9f2fe6a4..4372a5caf2d23e8942a078e580cef4014d37e530 100644 (file)
--- a/arch/x86/cpu/ivybridge/sdram.c
+++ b/arch/x86/cpu/ivybridge/sdram.c
@@ -158,14 +158,8 @@ static int prepare_mrc_cache(struct pei_data *pei_data)
        if (!mrc_cache)
                return -ENOENT;
 
-       /*
-        * TODO(sjg@chromium.org): Skip this for now as it causes boot
-        * problems
-        */
-       if (0) {
-               pei_data->mrc_input = mrc_cache->data;
-               pei_data->mrc_input_len = mrc_cache->data_size;
-       }
+       pei_data->mrc_input = mrc_cache->data;
+       pei_data->mrc_input_len = mrc_cache->data_size;
        debug("%s: at %p, size %x checksum %04x\n", __func__,
              pei_data->mrc_input, pei_data->mrc_input_len,
              mrc_cache->checksum);
@@ -336,9 +330,11 @@ int sdram_initialise(struct pei_data *pei_data)
        if (data) {
                int rv;
                int (*func)(struct pei_data *);
+               ulong start;
 
                debug("Calling MRC at %p\n", data);
                post_code(POST_PRE_MRC);
+               start = get_timer(0);
                func = (int (*)(struct pei_data *))data;
                rv = func(pei_data);
                post_code(POST_MRC);
@@ -356,6 +352,7 @@ int sdram_initialise(struct pei_data *pei_data)
                        printf("Nonzero MRC return value.\n");
                        return -EFAULT;
                }
+               debug("MRC execution time %lu ms\n", get_timer(start));
        } else {
                printf("UEFI PEI System Agent not found.\n");
                return -ENOSYS;