From patchwork Wed Jan 29 23:50:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 1231171 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.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.a=rsa-sha256 header.s=20161025 header.b=FKALrtct; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 487Kxf6RMGz9s1x for ; Thu, 30 Jan 2020 10:51:02 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8701181AB4; Thu, 30 Jan 2020 00:50:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FKALrtct"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 64DDC81B08; Thu, 30 Jan 2020 00:50:58 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8218881A81 for ; Thu, 30 Jan 2020 00:50:55 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=judge.packham@gmail.com Received: by mail-pl1-x644.google.com with SMTP id g6so587420plp.6 for ; Wed, 29 Jan 2020 15:50:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=USTewjycUCey4PAaG5At/aRvdjgPBOWTkfYCqn5M6EQ=; b=FKALrtctyl6e8uIRfZmxBF1UfoBifNLSoIruiDYgLWOoHeZPrDzdiRdtPlGYTAlAaq dwh9f/dMx1T1Q7snCszUxT05G3dP/dzQfZm5y0c/wKcGZ1C1hHsx57metgSl3sg4jzPe 3CL6CVZfJvvGr5IkC/QkecU9c0NYFS1xnidtIyk5/jRIeDm5EkH/Ib5NhIe3zJemToaK oPRXy9HdQfnCMdqg14xEybnHqZmICn/aLl3JJHGXIKFDgIwypFDZPHqsDeo4v7OgQNV3 psfZRejVktKcMZ5TmK9p7wwKzzRJTj6b2UMVum8mF8AELLDX0raD8l8aymJSVGtmdWdZ I/CQ== 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:mime-version :content-transfer-encoding; bh=USTewjycUCey4PAaG5At/aRvdjgPBOWTkfYCqn5M6EQ=; b=t1LTXti2T3BrvJszgRhZEnnc5EO1ejP94aR/Dh/a+S4jJVYG1IFXVF64gjw9NThr3D xbDYk5JH0XxCqJfh9ztxXNxj5uaK9z9ZF0ZUBqGLZ6SIBiHAAGryQw/w6FZSqH1Au2S8 K4k8Ib6WW9dckxq3mOnbuSbHXlCLFIkT9Sm0nSBMM42sugA7Va9FJ/56GItdQRY6y9oz TySVFcw0dlQd19tHcCYTPX/bs2WsCltCRVHVtUwTeXYLUrzUJTTTKBOyRbWwf3sCRGoe E/kptwuBThjrPPSrDSSuXU06CO+jpWYji0BXZMR074gUDJS9n3m/8as73y9B8O82ZFdS LRbQ== X-Gm-Message-State: APjAAAVDTjQKOoiSadutwkMbYy+UUtIq24rNztW8g2qsLwwSVwbsDL7t 0PREnlQwqvdVXtGg7bVu5J3U+KcU X-Google-Smtp-Source: APXvYqzXk7Io0HCW2VDaJuOLuw7w+ChFNjWVDVt00LfPWT2ZaWW7QT8P4MCzeUNS8ELOn/0ofP6VQw== X-Received: by 2002:a17:90a:2004:: with SMTP id n4mr2573031pjc.20.1580341853476; Wed, 29 Jan 2020 15:50:53 -0800 (PST) Received: from chrisp-dl.atlnz.lc ([2001:df5:b000:22:c554:284a:2009:90dd]) by smtp.gmail.com with ESMTPSA id x8sm4003096pfr.104.2020.01.29.15.50.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2020 15:50:52 -0800 (PST) From: Chris Packham To: u-boot@lists.denx.de Subject: [PATCH] ddr: marvell: a38x: llow boards to specify CK_DELAY parameter Date: Thu, 30 Jan 2020 12:50:44 +1300 Message-Id: <20200129235044.3745-1-judge.packham@gmail.com> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Tom Rini , baruch@tkos.co.il, tobi.wulff@alliedtelesis.co.nz, Chris Packham , Stefan Roese , Chris Packham Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean For some layouts it is necessary to adjust the CK_DELAY parameter to successfully complete DDR training. Add the ability to specify the CK_DELAY in the mv_ddr_topology_map. Signed-off-by: Chris Packham --- board/alliedtelesis/x530/x530.c | 6 +++++- drivers/ddr/marvell/a38x/ddr3_init.c | 5 +++++ drivers/ddr/marvell/a38x/ddr_topology_def.h | 3 +++ drivers/ddr/marvell/a38x/mv_ddr_topology.c | 10 ++++++++++ drivers/ddr/marvell/a38x/mv_ddr_topology.h | 1 + 5 files changed, 24 insertions(+), 1 deletion(-) diff --git a/board/alliedtelesis/x530/x530.c b/board/alliedtelesis/x530/x530.c index e0fa8067c1c5..04b053dc20e4 100644 --- a/board/alliedtelesis/x530/x530.c +++ b/board/alliedtelesis/x530/x530.c @@ -66,7 +66,11 @@ static struct mv_ddr_topology_map board_topology_map = { BUS_MASK_32BIT_ECC, /* subphys mask */ MV_DDR_CFG_DEFAULT, /* ddr configuration data source */ { {0} }, /* raw spd data */ - {0} /* timing parameters */ + {0}, /* timing parameters */ + { {0} }, /* electrical configuration */ + {0}, /* electrical parameters */ + 0, /* Clock enable mask */ + 160 /* Clock delay */ }; struct mv_ddr_topology_map *mv_ddr_topology_map_get(void) diff --git a/drivers/ddr/marvell/a38x/ddr3_init.c b/drivers/ddr/marvell/a38x/ddr3_init.c index 22c8f9ca54e5..a971cc155a01 100644 --- a/drivers/ddr/marvell/a38x/ddr3_init.c +++ b/drivers/ddr/marvell/a38x/ddr3_init.c @@ -106,8 +106,10 @@ static int mv_ddr_training_params_set(u8 dev_num) struct tune_train_params params; int status; u32 cs_num; + int ck_delay; cs_num = mv_ddr_cs_num_get(); + ck_delay = mv_ddr_ck_delay_get(); /* NOTE: do not remove any field initilization */ params.ck_delay = TUNE_TRAINING_PARAMS_CK_DELAY; @@ -131,6 +133,9 @@ static int mv_ddr_training_params_set(u8 dev_num) params.g_odt_config = TUNE_TRAINING_PARAMS_ODT_CONFIG_2CS; } + if (ck_delay > 0) + params.ck_delay = ck_delay; + status = ddr3_tip_tune_training_params(dev_num, ¶ms); if (MV_OK != status) { printf("%s Training Sequence - FAILED\n", ddr_type); diff --git a/drivers/ddr/marvell/a38x/ddr_topology_def.h b/drivers/ddr/marvell/a38x/ddr_topology_def.h index 950f296ff984..34196b166287 100644 --- a/drivers/ddr/marvell/a38x/ddr_topology_def.h +++ b/drivers/ddr/marvell/a38x/ddr_topology_def.h @@ -127,6 +127,9 @@ struct mv_ddr_topology_map { /* Clock enable mask */ u32 clk_enable; + + /* Clock delay */ + int ck_delay; }; enum mv_ddr_iface_mode { diff --git a/drivers/ddr/marvell/a38x/mv_ddr_topology.c b/drivers/ddr/marvell/a38x/mv_ddr_topology.c index ef3b658a7899..09840b1e70f1 100644 --- a/drivers/ddr/marvell/a38x/mv_ddr_topology.c +++ b/drivers/ddr/marvell/a38x/mv_ddr_topology.c @@ -229,6 +229,16 @@ int mv_ddr_is_ecc_ena(void) return 0; } +int mv_ddr_ck_delay_get(void) +{ + struct mv_ddr_topology_map *tm = mv_ddr_topology_map_get(); + + if (tm->ck_delay) + return tm->ck_delay; + + return -1; +} + /* translate topology map definition to real memory size in bits */ static unsigned int mem_size[] = { ADDR_SIZE_512MB, diff --git a/drivers/ddr/marvell/a38x/mv_ddr_topology.h b/drivers/ddr/marvell/a38x/mv_ddr_topology.h index 766f25db5733..4fca47689f11 100644 --- a/drivers/ddr/marvell/a38x/mv_ddr_topology.h +++ b/drivers/ddr/marvell/a38x/mv_ddr_topology.h @@ -319,6 +319,7 @@ unsigned short mv_ddr_bus_bit_mask_get(void); unsigned int mv_ddr_if_bus_width_get(void); unsigned int mv_ddr_cs_num_get(void); int mv_ddr_is_ecc_ena(void); +int mv_ddr_ck_delay_get(void); unsigned long long mv_ddr_mem_sz_per_cs_get(void); unsigned long long mv_ddr_mem_sz_get(void); unsigned int mv_ddr_rtt_nom_get(void);