diff mbox

[U-Boot,9/9] x86: ivybridge: Enable the MRC cache

Message ID 1445205337-32504-10-git-send-email-sjg@chromium.org
State Accepted
Delegated to: Simon Glass
Headers show

Commit Message

Simon Glass Oct. 18, 2015, 9:55 p.m. UTC
From: Bin Meng <bmeng.cn@gmail.com>

This works correctly now, so enable it.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Dropped malloc() and adjusted commit message:
Signed-off-by: Simon Glass <sjg@chromium.org>

---

 arch/x86/cpu/ivybridge/sdram.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

Comments

Bin Meng Oct. 19, 2015, 2:23 a.m. UTC | #1
On Mon, Oct 19, 2015 at 5:55 AM, Simon Glass <sjg@chromium.org> wrote:
> From: Bin Meng <bmeng.cn@gmail.com>
>
> This works correctly now, so enable it.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> Dropped malloc() and adjusted commit message:
> Signed-off-by: Simon Glass <sjg@chromium.org>
>
> ---
>
>  arch/x86/cpu/ivybridge/sdram.c | 10 ++--------
>  1 file changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/arch/x86/cpu/ivybridge/sdram.c b/arch/x86/cpu/ivybridge/sdram.c
> index d9b3dfc..4372a5c 100644
> --- 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);
> --

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Simon Glass Oct. 21, 2015, 11:24 p.m. UTC | #2
On 18 October 2015 at 20:23, Bin Meng <bmeng.cn@gmail.com> wrote:
> On Mon, Oct 19, 2015 at 5:55 AM, Simon Glass <sjg@chromium.org> wrote:
>> From: Bin Meng <bmeng.cn@gmail.com>
>>
>> This works correctly now, so enable it.
>>
>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>> Dropped malloc() and adjusted commit message:
>> Signed-off-by: Simon Glass <sjg@chromium.org>
>>
>> ---
>>
>>  arch/x86/cpu/ivybridge/sdram.c | 10 ++--------
>>  1 file changed, 2 insertions(+), 8 deletions(-)
>>

[snip]
>
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

Applied to u-boot-x86.
diff mbox

Patch

diff --git a/arch/x86/cpu/ivybridge/sdram.c b/arch/x86/cpu/ivybridge/sdram.c
index d9b3dfc..4372a5c 100644
--- 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);