From patchwork Thu May 10 01:28:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 911237 X-Patchwork-Delegate: sr@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="V20Y4Mx2"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40hG0D58KCz9s1w for ; Thu, 10 May 2018 11:31:24 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 6D42AC21F4F; Thu, 10 May 2018 01:31:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 82F59C21F8E; Thu, 10 May 2018 01:30:19 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8F620C21F0F; Thu, 10 May 2018 01:29:19 +0000 (UTC) Received: from mail-pl0-f66.google.com (mail-pl0-f66.google.com [209.85.160.66]) by lists.denx.de (Postfix) with ESMTPS id D5FFDC21F8E for ; Thu, 10 May 2018 01:29:14 +0000 (UTC) Received: by mail-pl0-f66.google.com with SMTP id ay10-v6so311589plb.1 for ; Wed, 09 May 2018 18:29:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PfJ4Uvf8jpVJ3zKAE0b7XfdBa2IVwRCHTuqvfLa0Tu8=; b=V20Y4Mx2+6McZ+fNAi2QlDrwSMiYTtmSLXMqw9rLoT3f72wuzZYm/+A1ikK5xEvstT YyjiGHJRRAt4smul2h6hf9JEgnho/cnY7OAzQJH5XlMsuZ3hbXK+JNxN3jA62cjB/Er3 tNqSIBoqh0YvR7nWv/cy2pK9oldR9I+RGKLb26pT/rgVbCYYxkn4GBwStc2wjhpQmoAY axfwqQqxi4AkZYdQiCXeusV5o19roiLZyhTnCLcpTjlcOoOw54rIUu6IwdxMwrK7kmWF JyR5bBpujVDXnps34jQm6YqAsBZfwQwxCuC/8IB85JRTpl9CBuU6AffSEk9TA/xePE/0 764Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PfJ4Uvf8jpVJ3zKAE0b7XfdBa2IVwRCHTuqvfLa0Tu8=; b=cg4VRiMeyRXdAEINoVnOEt9HiJ+Sc2tEYnF/QNPkGbbF8e+3bSiZgUu+tp+OOlC9V0 UqqUMVMOgoH/mLjxS90PwJUC4OdIEHI5O+gFYpSKrFH9Kfe1sQhIvSDkZw6i1A5lDGfP MZ6Ph6Uf3FrIatOXDnrAgMukOmbMho7ATFkl094tPxJKJkDIqT80iNYqE584T5oZNIKX jaN/5GGUKgEXKUVD1pyRNvIH3A03JOjwv6zwPIVsUUprXYARIiKT9H1Ql6ABe9RAzeJ9 JaCSM9iR+dbuATBXF0P3d/E8fAVfGUu3ckOWGPfVEVS0HXr17jTS6FdorDjJeTnFd2UG HNcA== X-Gm-Message-State: ALQs6tAERiVShL9gIpotxaeDYeE/YRVRqJADNgtzpF7us7P6ttuQLZnK 8R74VLxoMnVCSJ//TMHekEMG2P9r X-Google-Smtp-Source: AB8JxZq4heoCTlCFxr8kXSlMr385XTFfSgiBrnHJV3X5G4NEhXMXfNoj9rwo16ELW/9EA/lnF97tCA== X-Received: by 2002:a17:902:8486:: with SMTP id c6-v6mr20188169plo.23.1525915753346; Wed, 09 May 2018 18:29:13 -0700 (PDT) Received: from chrisp-dl.ws.atlnz.lc ([2001:df5:b000:22:3a2c:4aff:fe70:2b02]) by smtp.gmail.com with ESMTPSA id e87sm69712179pfl.65.2018.05.09.18.29.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 May 2018 18:29:12 -0700 (PDT) From: Chris Packham To: u-boot@lists.denx.de Date: Thu, 10 May 2018 13:28:31 +1200 Message-Id: <20180510012831.21677-7-judge.packham@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180510012831.21677-1-judge.packham@gmail.com> References: <20180510012831.21677-1-judge.packham@gmail.com> Cc: Tom Rini , Chris Packham , Tuan Pham , Victor Axelrod , Stefan Roese , Chris Packham Subject: [U-Boot] [PATCH v3 6/6] ARM: mvebu: a38x: use non-zero size for ddr scrubbing X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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: Chris Packham Make ddr3_calc_mem_cs_size() global scope and use it in ddr3_new_tip_ecc_scrub to correctly initialize all of DDR memory. Signed-off-by: Chris Packham --- Changes in v3: None Changes in v2: None drivers/ddr/marvell/a38x/mv_ddr_plat.c | 2 +- drivers/ddr/marvell/a38x/mv_ddr_plat.h | 1 + drivers/ddr/marvell/a38x/xor.c | 3 +++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/ddr/marvell/a38x/mv_ddr_plat.c b/drivers/ddr/marvell/a38x/mv_ddr_plat.c index 2070bb38b099..2f318cb9ea7b 100644 --- a/drivers/ddr/marvell/a38x/mv_ddr_plat.c +++ b/drivers/ddr/marvell/a38x/mv_ddr_plat.c @@ -995,7 +995,7 @@ static u32 ddr3_get_device_size(u32 cs) } } -static int ddr3_calc_mem_cs_size(u32 cs, uint64_t *cs_size) +int ddr3_calc_mem_cs_size(u32 cs, uint64_t *cs_size) { u32 cs_mem_size; diff --git a/drivers/ddr/marvell/a38x/mv_ddr_plat.h b/drivers/ddr/marvell/a38x/mv_ddr_plat.h index 61f10302fcca..9c5fdecd9341 100644 --- a/drivers/ddr/marvell/a38x/mv_ddr_plat.h +++ b/drivers/ddr/marvell/a38x/mv_ddr_plat.h @@ -232,4 +232,5 @@ u32 mv_ddr_dm_pad_get(void); int mv_ddr_pre_training_fixup(void); int mv_ddr_post_training_fixup(void); int mv_ddr_manual_cal_do(void); +int ddr3_calc_mem_cs_size(u32 cs, uint64_t *cs_size); #endif /* _MV_DDR_PLAT_H */ diff --git a/drivers/ddr/marvell/a38x/xor.c b/drivers/ddr/marvell/a38x/xor.c index 024cecd777c5..f859596d8953 100644 --- a/drivers/ddr/marvell/a38x/xor.c +++ b/drivers/ddr/marvell/a38x/xor.c @@ -347,6 +347,9 @@ void ddr3_new_tip_ecc_scrub(void) for (cs_c = 0; cs_c < max_cs; cs_c++) cs_ena |= 1 << cs_c; + /* assume that all CS have same size */ + ddr3_calc_mem_cs_size(0, &cs_mem_size); + mv_sys_xor_init(max_cs, cs_ena, cs_mem_size, 0); total_mem_size = max_cs * cs_mem_size; mv_xor_mem_init(0, 0, total_mem_size, 0xdeadbeef, 0xdeadbeef);