From patchwork Sun Oct 18 21:55:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 532059 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 1009D1401F6 for ; Mon, 19 Oct 2015 08:57:06 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=JcC0a6aI; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B8AC14B6F4; Sun, 18 Oct 2015 23:56:40 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id selvG2hvjUtw; Sun, 18 Oct 2015 23:56:40 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7DE034B669; Sun, 18 Oct 2015 23:56:18 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 42FC74B67F for ; Sun, 18 Oct 2015 23:55:58 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tGaOjbI_5Q8D for ; Sun, 18 Oct 2015 23:55:58 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-ig0-f169.google.com (mail-ig0-f169.google.com [209.85.213.169]) by theia.denx.de (Postfix) with ESMTPS id 7E42F4B676 for ; Sun, 18 Oct 2015 23:55:46 +0200 (CEST) Received: by igbdj2 with SMTP id dj2so45389216igb.1 for ; Sun, 18 Oct 2015 14:55:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=v3b1XjmZQr7Bm1ZFfBu0BfaOEvSiCM1wFKY5I7NFFRg=; b=JcC0a6aI731SH9ui/JGMkaohFrS8f5IGmbXliooPt3CxgIm6Z5l+Xu/Cna4KESeF6R BLh/bR3UQCqJouVh3FuhZKawJPfCj/OLgtncfh5/VYHFy2iY+hW81kHWMPfx3EVnxbAl ldecJ6A2SW5whJf50R7HJ/49fDlQexFiG6IjgVDYzxFhMC81D+KW+kUu4IDVxdfmp/t3 /VyzegzsO1wEgbZmPYSz3gIzSHLhG+d9HnfeUU5FUEy4nMbawq43JWfoT0apC2Cxmvpw rhR7MWC1DfnXi1yfGiCZsQCN4eTpbQ+OBI7pPoOPKP2kOEKh2E2L/7nTxJ4sy/BRh8ca UYpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=v3b1XjmZQr7Bm1ZFfBu0BfaOEvSiCM1wFKY5I7NFFRg=; b=UbkpSzn3lU11NSp2YbIF0WDbYImU8dWuZjU5Etl0IXspTh3SpW9MSKmex6YnyqPLCy rXt0oEEXbDNlU31r/q8oMbDKMHsjSsY1AWOIM6pQtTTgjnB1eQeKa9WwAvTxD4CZReBi jFSHCGuSFhziE2xvCawBi3B7LpKdPg3HKkKLJ+27DxS7J6G5XV5XSi9MdxqYhTyxu9oT JiCapw2HNArLvvC+S5m9yKbCZviEmziFjnMTw40EP6TOmYRifTHF844I85FTGU4vOO/w SDsDiCvJA0mx16DMiLzWKzhrtn2r3HOqnFzDTDZpAB78f1Bea8PMX+XCXhFql6vvN9/s 3dSQ== X-Gm-Message-State: ALoCoQny9dST0WrEqGWEiNePX2F8YBZZrp03a5qtKujxT+vCD2BeuTBsk5Whap7ILytP3JhVun0p X-Received: by 10.50.20.38 with SMTP id k6mr14831400ige.97.1445205345590; Sun, 18 Oct 2015 14:55:45 -0700 (PDT) Received: from kaki.bld.corp.google.com ([172.29.216.32]) by smtp.gmail.com with ESMTPSA id rs6sm6705138igb.20.2015.10.18.14.55.42 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 Oct 2015 14:55:44 -0700 (PDT) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id E5487221A6B; Sun, 18 Oct 2015 15:55:41 -0600 (MDT) From: Simon Glass To: U-Boot Mailing List Date: Sun, 18 Oct 2015 15:55:37 -0600 Message-Id: <1445205337-32504-10-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 In-Reply-To: <1445205337-32504-1-git-send-email-sjg@chromium.org> References: <1445205337-32504-1-git-send-email-sjg@chromium.org> Cc: Graeme Russ Subject: [U-Boot] [PATCH 9/9] x86: ivybridge: Enable the MRC cache X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Bin Meng This works correctly now, so enable it. Signed-off-by: Bin Meng Dropped malloc() and adjusted commit message: Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- 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);