From patchwork Mon Jun 17 07:32:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 661 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 8DFED3F353 for ; Mon, 17 Jun 2019 09:41:21 +0200 (CEST) Received: by mail-pg1-f198.google.com with SMTP id k36sf7213012pgl.7 for ; Mon, 17 Jun 2019 00:41:21 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1560757280; cv=pass; d=google.com; s=arc-20160816; b=bnzxJXv/IKpKq35t+w7KhilEi4UL+AwqOlHJL1ajDKqgbSwA5iEa7YBnzpOEISaSVn aQ+vf1NguEHgVX9xr7MyytKrgEGUPoMHSPIoq5KMa98Ib4X7BSMmBwU1wpKDi5khwDBW qd4XtsSG26+LYymyHE/C65kL7Ew0IDtU4vVYrnpicahDZpn8LkalWgZDnVP2sBQKWUPY ryyhfzrwSrq8oZkR4mljwcf3QbmH4q0BS17jwCRJT5d4hlr44LfQCXLFZmiq8O5XNkMR 6k5cnjxYVKpQj0gc/Kz1uiH2zHA+jlkEEab1vilv1qGftesLd8Z6XtoSzC1RQuSilaWp wZdQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=AxBVLheQSGte0c7aAsFZKAw2thm8H4j1n3jv7Bs7pNM=; b=0I+4ATEGh9Ei4gtQMpXcl/krKDRcow0ZqJtH+r9PPfz08+9k4Mvxe4jyPpAmA7qyCH b8p3Pec+OEM0JG6G8YKtvgSepUjC7wb8O1WEN2EdRqBzxklQQ7/uAkX/uiKUCDDX3Nkz +VrXQwDDD+kQ8YRRIhUDVFQ5xga2sLhA3UijTWlQ9sIYZEjeWNgqUhIbnqb9aIeZuRfj /laogcXVruPIP79e4CDzzSzLRf6YlAAEEz58SYHyIMGk9MXfjLfhL8z954s7HUjk3jxQ Uj1kjscSP3iWWc2iflqhsMi2q6LkFr2v4RFBku5orhEsVdAUcBT9Q068IYyQkqvf1Aa2 3soA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=nyoh2GPr; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=AxBVLheQSGte0c7aAsFZKAw2thm8H4j1n3jv7Bs7pNM=; b=VLGAmRIpewBGJ/Zayme+n8N1ig1MxaAbv8Bfy7n3ysQ3+mjN+Up3ayH99nbQUvA/RN H/eAQNZG1yqu+apHDTHoiuloC9q83MJxhZhLEp6GnRXDtqSylbhuAoHnaC8V4HNMh/Es CuuLIQvSuGJXzReYfJIIQ8wkdkBoCIiK+1LnE= 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:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=AxBVLheQSGte0c7aAsFZKAw2thm8H4j1n3jv7Bs7pNM=; b=Qkj8+jh2DuYYsc9Z8rCu0X0LL3Q60SEAyEf9SYrkjZs6vu8AYZnrzKk8TIxdNWOsDY d8nEI3gEDsLA6H+mkAhmImq5oMZoFqN3RPqyi++/OVk25sQHd50AMoB9EdPq2kHcgdbD rbHd4Ikpq+utd/3s5VA8WE0XjNvigIN5MrmWe9W1H06VXTEPhU678B/IFJozjSG6wj9K BpUyCRz1ItHlxFp2ib3a/rTShHE5O0NHqjbWCOMboQp+9tc8nF5s27yhaoKJbhJKPjKK zBRWBjuPkzIk7G4ukxdIckA+9ynDWv3Aar/JveC4a46FGFrSPe1nBVuL26ZDRzGxAXkQ DkIA== X-Gm-Message-State: APjAAAUdpjFE/N5ZDjO4k1aDatgccGSFCah3iPgF7bmtYgmkmUq/Fi8K k6i2pxGViJekG5wjLH3mhLM6ioJO X-Google-Smtp-Source: APXvYqwQ1j2r6E42JXUFNp8W3QXFNXKI76tKuiEWeC2LHSrAGO3BOwndpk9+kl1qNABidVbO04dG8Q== X-Received: by 2002:a17:902:728b:: with SMTP id d11mr77547592pll.78.1560757280387; Mon, 17 Jun 2019 00:41:20 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:90a:9301:: with SMTP id p1ls3980777pjo.3.canary-gmail; Mon, 17 Jun 2019 00:41:20 -0700 (PDT) X-Received: by 2002:a17:902:8a94:: with SMTP id p20mr87469731plo.312.1560757280090; Mon, 17 Jun 2019 00:41:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560757280; cv=none; d=google.com; s=arc-20160816; b=e1Fz3ePudRHGg2ZtIEEZ/0i7miweHVsddCMnrhnaXNn5mrxtgv0pGo+rZDeQydIBbN 1HtFLclDZZ3LufoPQfol28NWloGifQottP/xeAy9+XjqsUWWUIrOfxteoDTxRoCTxiVP yTCDppdfau164pY4h06TMaDfgZ5M2O2CzUkSo+KRE2Pm6VoagglqIsvFJQHdl7q/wRgd 87UAFD9LBhBiFzdtjX4umkI1MTqcqNh5Ww87A86PtxttYZndmW4s0gl0kciFlZgEI/81 vogsu6mS+/ymym9uQvgx22PJSAH0UyrEVWGZ4ERQ3SBdW/j1z9uRPlXIXDOb8rmh9FCQ /jEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=dAfgTPZadk9TFr+HjBgU/KxFFR+Gxjp4JsZhrejy6cE=; b=rgrEyaO+cIIi4ygOW0a2aoLIKQJ3Rnyv06jwx/sjg/0vj+LLrlsp9gTlm1PDaf+r9w PHYaPT7Wbfr9OpWu63WGiYYPaOxUctSFe749uWmpsw7aHpHauAHILf9ldXkDrerkPhfP dsYPUGgddhkL/BHBjs7dEQps543BJbRCIEPDwYigPkgy4fPq2k424btcCbVnxiZURbLf 1+FtLdRvN1o5I8ZBjwPjncsw/oFVnLRPU/X4KK5e9L5t/qq/a1foNgT5l7Zh5r6a5ERd xQYP23SUSRg8WpGnNKyb6QoHRhUiETtnVuoEtIULx+PhvwWCjvrfMupF5vtC7saYEp3u zZtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=nyoh2GPr; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id l7sor10126609pgm.25.2019.06.17.00.41.20 for (Google Transport Security); Mon, 17 Jun 2019 00:41:20 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a63:454a:: with SMTP id u10mr45545756pgk.291.1560757279713; Mon, 17 Jun 2019 00:41:19 -0700 (PDT) Received: from localhost.localdomain ([49.206.203.245]) by smtp.gmail.com with ESMTPSA id m41sm15205998pje.18.2019.06.17.00.41.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jun 2019 00:41:19 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , YouMin Chen , u-boot@lists.denx.de Cc: Manivannan Sadhasivam , gajjar04akash@gmail.com, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH v2 90/99] ram: rk3399: Set lpddr4 dq odt Date: Mon, 17 Jun 2019 13:02:43 +0530 Message-Id: <20190617073252.27810-91-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190617073252.27810-1-jagan@amarulasolutions.com> References: <20190617073252.27810-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=nyoh2GPr; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Set DQ ODT based identified controller in lpddr4 as part of LPDDR set rate initialization phase. Signed-off-by: Jagan Teki Signed-off-by: YouMin Chen --- drivers/ram/rockchip/sdram_rk3399.c | 82 +++++++++++++++++++++++++++-- 1 file changed, 79 insertions(+), 3 deletions(-) diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index 07759e8956..ddda6f8ebd 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -1559,13 +1559,26 @@ struct rk3399_sdram_params lpddr4_timings[] = { #include "sdram-rk3399-lpddr4-800.inc" }; -static u32 lpddr4_get_phy(const struct rk3399_sdram_params *params, u32 ctl) +static void *get_denali_pi(const struct chan_info *chan, + struct rk3399_sdram_params *params, bool reg) +{ + return reg ? &chan->pi->denali_pi : ¶ms->pi_regs.denali_pi; +} + +static u32 lpddr4_get_phy(struct rk3399_sdram_params *params, u32 ctl) { u32 lpddr4_phy[] = {1, 0, 0xb}; return lpddr4_phy[ctl]; } +static u32 lpddr4_get_ctl(struct rk3399_sdram_params *params, u32 phy) +{ + u32 lpddr4_ctl[] = {1, 0, 2}; + + return lpddr4_ctl[phy]; +} + static u32 get_ddr_stride(struct rk3399_pmusgrf_regs *pmusgrf) { return ((readl(&pmusgrf->soc_con4) >> 10) & 0x1F); @@ -1784,16 +1797,65 @@ end: return ret; } +static void set_lpddr4_dq_odt(const struct chan_info *chan, + struct rk3399_sdram_params *params, u32 ctl, + bool en, bool ctl_phy_reg, u32 mr5) +{ + u32 *denali_ctl = get_denali_ctl(chan, params, ctl_phy_reg); + u32 *denali_pi = get_denali_pi(chan, params, ctl_phy_reg); + struct io_setting *io; + u32 reg_value; + + if (!en) + return; + + io = lpddr4_get_io_settings(params, mr5); + + reg_value = io->dq_odt; + + switch (ctl) { + case 0: + clrsetbits_le32(&denali_ctl[139], 0x7 << 24, reg_value << 24); + clrsetbits_le32(&denali_ctl[153], 0x7 << 24, reg_value << 24); + + clrsetbits_le32(&denali_pi[132], 0x7 << 0, (reg_value << 0)); + clrsetbits_le32(&denali_pi[139], 0x7 << 16, (reg_value << 16)); + clrsetbits_le32(&denali_pi[147], 0x7 << 0, (reg_value << 0)); + clrsetbits_le32(&denali_pi[154], 0x7 << 16, (reg_value << 16)); + break; + case 1: + clrsetbits_le32(&denali_ctl[140], 0x7 << 0, reg_value << 0); + clrsetbits_le32(&denali_ctl[154], 0x7 << 0, reg_value << 0); + + clrsetbits_le32(&denali_pi[129], 0x7 << 16, (reg_value << 16)); + clrsetbits_le32(&denali_pi[137], 0x7 << 0, (reg_value << 0)); + clrsetbits_le32(&denali_pi[144], 0x7 << 16, (reg_value << 16)); + clrsetbits_le32(&denali_pi[152], 0x7 << 0, (reg_value << 0)); + break; + case 2: + default: + clrsetbits_le32(&denali_ctl[140], 0x7 << 8, (reg_value << 8)); + clrsetbits_le32(&denali_ctl[154], 0x7 << 8, (reg_value << 8)); + + clrsetbits_le32(&denali_pi[127], 0x7 << 0, (reg_value << 0)); + clrsetbits_le32(&denali_pi[134], 0x7 << 16, (reg_value << 16)); + clrsetbits_le32(&denali_pi[142], 0x7 << 0, (reg_value << 0)); + clrsetbits_le32(&denali_pi[149], 0x7 << 16, (reg_value << 16)); + break; + } +} + static void lpddr4_copy_phy(struct dram_info *dram, struct rk3399_sdram_params *params, u32 phy, struct rk3399_sdram_params *timings, u32 channel) { - u32 *denali_phy; + u32 *denali_ctl, *denali_phy; u32 *denali_phy_params; u32 speed = 0; - u32 mr5; + u32 ctl, mr5; + denali_ctl = dram->chan[channel].pctl->denali_ctl; denali_phy = dram->chan[channel].publ->denali_phy; denali_phy_params = timings->phy_regs.denali_phy; @@ -2028,6 +2090,9 @@ static void lpddr4_copy_phy(struct dram_info *dram, read_mr(dram->chan[channel].pctl, 1, 5, &mr5); set_ds_odt(&dram->chan[channel], timings, true, mr5); + ctl = lpddr4_get_ctl(timings, phy); + set_lpddr4_dq_odt(&dram->chan[channel], timings, ctl, true, true, mr5); + /* * if phy_sw_master_mode_x not bypass mode, * clear phy_slice_pwr_rdc_disable. @@ -2039,6 +2104,17 @@ static void lpddr4_copy_phy(struct dram_info *dram, clrbits_le32(&denali_phy[266], 1 << 16); clrbits_le32(&denali_phy[394], 1 << 16); } + + /* + * when PHY_PER_CS_TRAINING_EN=1, W2W_DIFFCS_DLY_Fx can't + * smaller than 8 + * NOTE: need use timings, not ddr_publ_regs + */ + if ((denali_phy_params[84] >> 16) & 1) { + if (((readl(&denali_ctl[217 + ctl]) >> 16) & 0x1f) < 8) + clrsetbits_le32(&denali_ctl[217 + ctl], + 0x1f << 16, 8 << 16); + } } static void lpddr4_set_phy(struct dram_info *dram,