From patchwork Mon Jun 17 07:31:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 609 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 018FD3F353 for ; Mon, 17 Jun 2019 09:38:30 +0200 (CEST) Received: by mail-pg1-f197.google.com with SMTP id b10sf7176592pgb.22 for ; Mon, 17 Jun 2019 00:38:29 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1560757108; cv=pass; d=google.com; s=arc-20160816; b=0JZU02POu2KsD1JsLdEmM18K1r7yFDgbnfN5HEqFetzPB0aYflUabbqRaO/HYKltT0 a7cwpRC8PvXd3VyJLuzxGHYZ03XiWOIeekFOr81albLjQhoiZg36iU8jmjhj54ABl13s 3aH0bGVf3kNLtUVXt0NGY/jG/o6QuQyaALE61uy9hRY/2acJ53k9l4fjZnd5Nl9eG+tY +Q4ohUcdoU7IMkWw2gYVqZ4Gqk5YVxEiL/sXYwkc0p9Nmr0hIszeaRJk6DhLaBEdhEVZ t5Hz7B/LU2sm7/OGeJrw7RPW/Rie1RzaTaejTD3AQPqtU4lk5VWJHmNCleR+iOdAWDkE 8OJQ== 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=P2DjcTxF0xsBkUijh6hTEzzzNOy8jBYlFd33aSvC+sA=; b=TCbi8h0LY5zkZX81XdKpP8ALKaRqAH6mOwRZMmCbkin4NCu/FTkSpLWUVJAVLOU59l B5rbnaXAcTHpwuhltnZPKtN4k1oOWl2V4f1OBcy6YsFLmhyAZWhRnad3rymjW8UA5aBN nQSndb3l0LRW/NqX6IQysn7OOViC2NAZFZ+d7gQP93vNPb5KXa9Ib8ATnASqGxUnvFfd XWNM49Y+17P4VxVWZZQRjZx1AdtfR2exXYvniQy4tgJp2L33a15Smbik4GCaA5s4xiWH Rj6iw15ewnA81lc8sPN5rERBBwGQ9NSPEdhRBt4CcPKW5Zn2vK2Ogmmj3Lx3Wo5xDpGa wibg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=phvcRzQW; 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=P2DjcTxF0xsBkUijh6hTEzzzNOy8jBYlFd33aSvC+sA=; b=phqkc7pMQEFJrWDwSCBDMD8fO9aKqdYYIX/5L876JFhiIy8FwJN3u5bpiNI+N0vdXu H4SaxOqamoV4FFyVBNAWq4yLmJa9JVqhGWIgcGg+hPXa4hkP+ZnMLgG7jPpxOYQeeUhy 54p3qh1UmKJ4MP3/DHE4maJ2IpmFp2HSktjP8= 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=P2DjcTxF0xsBkUijh6hTEzzzNOy8jBYlFd33aSvC+sA=; b=fIoFZVTMkBcu73mHkrvKaIzv04KKKE6Ze5BO2PiXvSSVa0N+2Ej04AwghdqiIAo75c lD0z+CPDuz9rNwRVKfmsjzaxhP7s+uZ5sxzGd3kFl9Mifj1tAzAs5M9ScMDJ7l7XTnud l8BZfsjzsvHKHptKLDQWZmaHZri/cFf1qZSNlvf1WhH2H4tOGDFdsGbM96+XR5/rF/Gk ZSkp0GkuAWZIkETfQuy4y89JatwdDk1B/msT940FpNc2kJl6/TNQcmqgKoLHVmHnw9tH 4F3OC4j/oeWDNb3nfqz6blPV1S0FvR9AfVbEvzkbDHpdqdUKbbrnDyB1DA0VhY5t8xdo DGHw== X-Gm-Message-State: APjAAAXGQ08BXjSR3TalvctdmrHWwqqLbYtcPi+ixZMKoTcKUXJYiKVB +gYYbfjtaHj467cy6mPNjuRrjht/ X-Google-Smtp-Source: APXvYqxlhESYnyaI6iVRnA+YWW/BDSwPzC7FTFmAgwvW0xgcQgC+PAmWxwPswb1ELbdMC+o3R9WKEg== X-Received: by 2002:a17:90a:8914:: with SMTP id u20mr2890634pjn.87.1560757108837; Mon, 17 Jun 2019 00:38:28 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:aa7:8614:: with SMTP id p20ls3366881pfn.14.gmail; Mon, 17 Jun 2019 00:38:28 -0700 (PDT) X-Received: by 2002:a65:5787:: with SMTP id b7mr48488619pgr.148.1560757108379; Mon, 17 Jun 2019 00:38:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560757108; cv=none; d=google.com; s=arc-20160816; b=Yg7Jc8WAyseDwhIj4ED/aU6uisllFX6mGnYo8cfY2dEjGCS2VmRPjmZv73Fl7COhGx YllehKF/Ajf+3VhcSwbImtoaqpBAMqPdUo7m0/OVukk98TDuNCCjiowy4WuYCBz/95Co CbHVRoQ6+AKel6TUy02RUSgDuc7VBVdCMObXjVzIf0mVUQIrVNvn/HHSQTJ3RJbUD3Tn jMjstripTPNOWBTqvK4ZKNlbOzKo72Bmgc2U0UecJS8dNjYK8svtchK58CoAZScH2vB8 IKdFXD+DI3Zx4HWX/2kkaaPitGxTy3egT3byZmRAvfjEEdzRZyLj6pKy7JpiUoiEBDFz 0g6Q== 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=7OIbEVJNgzQsV3cs0gxMDrL21oIqBVY0iTRPqRzNyEQ=; b=K1iVGxnDfkARCrbvj/YyT/PsFciYeloyU28F0b9YdxheZF2pfJlgxJVPXYpSzQTCI1 POp7VbgxkhN9LEZOEEo6Dohs4oPNOyEWdc2fo5lSEjhJgGcrcvc4V17n8C+m1shSKkl4 4WY/0Itm61HFQWsHddCBw6xNfxQI7uI2iAwElWnoQcWaU6Wo8xzmxpw9t7lHMywDyeRP tRSqstSyUJxdnyVhwsHu2OOJ/VPSpX76Ng/MUSSnv/SbWENjnSJlWYi26U9g9MkleErR nMqDBJ/pgMMfZLLYrYHzJ9BdNEPPqsktU73sLmuNnrFDi4BUOO50T6ptdXnWvTqP8ni1 9tMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=phvcRzQW; 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 m65sor11066340pfm.66.2019.06.17.00.38.28 for (Google Transport Security); Mon, 17 Jun 2019 00:38:28 -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:a62:3283:: with SMTP id y125mr62916159pfy.83.1560757108055; Mon, 17 Jun 2019 00:38:28 -0700 (PDT) Received: from localhost.localdomain ([49.206.203.245]) by smtp.gmail.com with ESMTPSA id m41sm15205998pje.18.2019.06.17.00.38.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jun 2019 00:38:27 -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 38/99] ram: rockchip: rk3399: Add cap_info structure Date: Mon, 17 Jun 2019 13:01:51 +0530 Message-Id: <20190617073252.27810-39-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=phvcRzQW; 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: , Group common ddr attributes like - rank - col - bk - bw - dbw - row_3_4 - cs0_row - cs1_row - ddrconfig into a common cap_info structure for more code readability and extend if possible based on the new features. Signed-off-by: Jagan Teki --- .../include/asm/arch-rockchip/sdram_rk3399.h | 6 +- drivers/ram/rockchip/sdram_rk3399.c | 71 ++++++++++--------- 2 files changed, 41 insertions(+), 36 deletions(-) diff --git a/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h b/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h index a191d242f8..67044f53e5 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_rk3399.h @@ -96,7 +96,7 @@ struct rk3399_ddr_cic_regs { /* DENALI_CTL_274 */ #define MEM_RST_VALID 1 -struct rk3399_sdram_channel { +struct sdram_cap_info { unsigned int rank; /* dram column number, 0 means this channel is invalid */ unsigned int col; @@ -114,6 +114,10 @@ struct rk3399_sdram_channel { unsigned int cs0_row; unsigned int cs1_row; unsigned int ddrconfig; +}; + +struct rk3399_sdram_channel { + struct sdram_cap_info cap_info; struct rk3399_msch_timings noc_timings; }; diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index 6c3a2b5453..231f69b173 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -155,35 +155,36 @@ static void set_memory_map(const struct chan_info *chan, u32 channel, u32 row; /* Get row number from ddrconfig setting */ - if (sdram_ch->ddrconfig < 2 || sdram_ch->ddrconfig == 4) + if (sdram_ch->cap_info.ddrconfig < 2 || + sdram_ch->cap_info.ddrconfig == 4) row = 16; - else if (sdram_ch->ddrconfig == 3) + else if (sdram_ch->cap_info.ddrconfig == 3) row = 14; else row = 15; - cs_map = (sdram_ch->rank > 1) ? 3 : 1; - reduc = (sdram_ch->bw == 2) ? 0 : 1; + cs_map = (sdram_ch->cap_info.rank > 1) ? 3 : 1; + reduc = (sdram_ch->cap_info.bw == 2) ? 0 : 1; /* Set the dram configuration to ctrl */ - clrsetbits_le32(&denali_ctl[191], 0xF, (12 - sdram_ch->col)); + clrsetbits_le32(&denali_ctl[191], 0xF, (12 - sdram_ch->cap_info.col)); clrsetbits_le32(&denali_ctl[190], (0x3 << 16) | (0x7 << 24), - ((3 - sdram_ch->bk) << 16) | + ((3 - sdram_ch->cap_info.bk) << 16) | ((16 - row) << 24)); clrsetbits_le32(&denali_ctl[196], 0x3 | (1 << 16), cs_map | (reduc << 16)); /* PI_199 PI_COL_DIFF:RW:0:4 */ - clrsetbits_le32(&denali_pi[199], 0xF, (12 - sdram_ch->col)); + clrsetbits_le32(&denali_pi[199], 0xF, (12 - sdram_ch->cap_info.col)); /* PI_155 PI_ROW_DIFF:RW:24:3 PI_BANK_DIFF:RW:16:2 */ clrsetbits_le32(&denali_pi[155], (0x3 << 16) | (0x7 << 24), - ((3 - sdram_ch->bk) << 16) | + ((3 - sdram_ch->cap_info.bk) << 16) | ((16 - row) << 24)); /* PI_41 PI_CS_MAP:RW:24:4 */ clrsetbits_le32(&denali_pi[41], 0xf << 24, cs_map << 24); - if (sdram_ch->rank == 1 && params->base.dramtype == DDR3) + if (sdram_ch->cap_info.rank == 1 && params->base.dramtype == DDR3) writel(0x2EC7FFFF, &denali_pi[34]); } @@ -681,7 +682,7 @@ static int data_training_ca(const struct chan_info *chan, u32 channel, u32 *denali_phy = chan->publ->denali_phy; u32 i, tmp; u32 obs_0, obs_1, obs_2, obs_err = 0; - u32 rank = params->ch[channel].rank; + u32 rank = params->ch[channel].cap_info.rank; u32 rank_mask; /* clear interrupt,PI_175 PI_INT_ACK:WR:0:17 */ @@ -744,7 +745,7 @@ static int data_training_wl(const struct chan_info *chan, u32 channel, u32 *denali_phy = chan->publ->denali_phy; u32 i, tmp; u32 obs_0, obs_1, obs_2, obs_3, obs_err = 0; - u32 rank = params->ch[channel].rank; + u32 rank = params->ch[channel].cap_info.rank; /* clear interrupt,PI_175 PI_INT_ACK:WR:0:17 */ writel(0x00003f7c, (&denali_pi[175])); @@ -806,7 +807,7 @@ static int data_training_rg(const struct chan_info *chan, u32 channel, u32 *denali_phy = chan->publ->denali_phy; u32 i, tmp; u32 obs_0, obs_1, obs_2, obs_3, obs_err = 0; - u32 rank = params->ch[channel].rank; + u32 rank = params->ch[channel].cap_info.rank; /* clear interrupt,PI_175 PI_INT_ACK:WR:0:17 */ writel(0x00003f7c, (&denali_pi[175])); @@ -868,7 +869,7 @@ static int data_training_rl(const struct chan_info *chan, u32 channel, { u32 *denali_pi = chan->pi->denali_pi; u32 i, tmp; - u32 rank = params->ch[channel].rank; + u32 rank = params->ch[channel].cap_info.rank; /* clear interrupt,PI_175 PI_INT_ACK:WR:0:17 */ writel(0x00003f7c, (&denali_pi[175])); @@ -916,7 +917,7 @@ static int data_training_wdql(const struct chan_info *chan, u32 channel, { u32 *denali_pi = chan->pi->denali_pi; u32 i, tmp; - u32 rank = params->ch[channel].rank; + u32 rank = params->ch[channel].cap_info.rank; u32 rank_mask; /* clear interrupt,PI_175 PI_INT_ACK:WR:0:17 */ @@ -1050,14 +1051,14 @@ static void set_ddrconfig(const struct chan_info *chan, unsigned int cs0_cap = 0; unsigned int cs1_cap = 0; - cs0_cap = (1 << (params->ch[channel].cs0_row - + params->ch[channel].col - + params->ch[channel].bk - + params->ch[channel].bw - 20)); - if (params->ch[channel].rank > 1) - cs1_cap = cs0_cap >> (params->ch[channel].cs0_row - - params->ch[channel].cs1_row); - if (params->ch[channel].row_3_4) { + cs0_cap = (1 << (params->ch[channel].cap_info.cs0_row + + params->ch[channel].cap_info.col + + params->ch[channel].cap_info.bk + + params->ch[channel].cap_info.bw - 20)); + if (params->ch[channel].cap_info.rank > 1) + cs1_cap = cs0_cap >> (params->ch[channel].cap_info.cs0_row + - params->ch[channel].cap_info.cs1_row); + if (params->ch[channel].cap_info.row_3_4) { cs0_cap = cs0_cap * 3 / 4; cs1_cap = cs1_cap * 3 / 4; } @@ -1084,22 +1085,22 @@ static void dram_all_config(struct dram_info *dram, struct rk3399_msch_regs *ddr_msch_regs; const struct rk3399_msch_timings *noc_timing; - if (params->ch[channel].col == 0) + if (params->ch[channel].cap_info.col == 0) continue; idx++; - sys_reg2 |= SYS_REG_ENC_ROW_3_4(info->row_3_4, channel); + sys_reg2 |= SYS_REG_ENC_ROW_3_4(info->cap_info.row_3_4, channel); sys_reg2 |= SYS_REG_ENC_CHINFO(channel); - sys_reg2 |= SYS_REG_ENC_RANK(info->rank, channel); - sys_reg2 |= SYS_REG_ENC_COL(info->col, channel); - sys_reg2 |= SYS_REG_ENC_BK(info->bk, channel); - sys_reg2 |= SYS_REG_ENC_BW(info->bw, channel); - sys_reg2 |= SYS_REG_ENC_DBW(info->dbw, channel); - SYS_REG_ENC_CS0_ROW(info->cs0_row, sys_reg2, sys_reg3, channel); - if (info->cs1_row) - SYS_REG_ENC_CS1_ROW(info->cs1_row, sys_reg2, + sys_reg2 |= SYS_REG_ENC_RANK(info->cap_info.rank, channel); + sys_reg2 |= SYS_REG_ENC_COL(info->cap_info.col, channel); + sys_reg2 |= SYS_REG_ENC_BK(info->cap_info.bk, channel); + sys_reg2 |= SYS_REG_ENC_BW(info->cap_info.bw, channel); + sys_reg2 |= SYS_REG_ENC_DBW(info->cap_info.dbw, channel); + SYS_REG_ENC_CS0_ROW(info->cap_info.cs0_row, sys_reg2, sys_reg3, channel); + if (info->cap_info.cs1_row) + SYS_REG_ENC_CS1_ROW(info->cap_info.cs1_row, sys_reg2, sys_reg3, channel); - sys_reg3 |= SYS_REG_ENC_CS1_COL(info->col, channel); + sys_reg3 |= SYS_REG_ENC_CS1_COL(info->cap_info.col, channel); sys_reg3 |= SYS_REG_ENC_VERSION(DDR_SYS_REG_VERSION); ddr_msch_regs = dram->chan[channel].msch; @@ -1116,7 +1117,7 @@ static void dram_all_config(struct dram_info *dram, &ddr_msch_regs->ddrmode); /* rank 1 memory clock disable (dfi_dram_clk_disable = 1) */ - if (params->ch[channel].rank == 1) + if (params->ch[channel].cap_info.rank == 1) setbits_le32(&dram->chan[channel].pctl->denali_ctl[276], 1 << 17); } @@ -1226,7 +1227,7 @@ static int sdram_init(struct dram_info *dram, } set_ddrconfig(chan, params, channel, - params->ch[channel].ddrconfig); + params->ch[channel].cap_info.ddrconfig); } dram_all_config(dram, params); switch_to_phy_index1(dram, params);