andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rcar_gen3: drivers: ddr: Update DDR setting for H3, M3, M3N 

[IPL/DDR]
- Update H3, M3, M3N DDR setting rev.0.39.

Signed-off-by: Chiaki Fujii <chiaki.fujii.wj@renesas.com>
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> # upstream update
Change-Id: I0dbf8091f9de9bb6d2d4f94007a5813fff14789f
This commit is contained in:
Chiaki Fujii 2019-12-06 19:33:34 +09:00 committed by Marek Vasut
parent 0fdfe245f1
commit 1f420077b6
4 changed files with 65 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
drivers/renesas/rcar/ddr/ddr_b/boot_init_dram.c
View File

@ -510,6 +510,14 @@ static void send_dbcmd(uint32_t cmd)
dsb_sev(); dsb_sev();
} }
static void dbwait_loop(uint32_t wait_loop)
{
uint32_t i;
for (i = 0; i < wait_loop; i++)
wait_dbcmd();
}
/* DDRPHY register access (raw) */ /* DDRPHY register access (raw) */
static uint32_t reg_ddrphy_read(uint32_t phyno, uint32_t regadd) static uint32_t reg_ddrphy_read(uint32_t phyno, uint32_t regadd)
{ {
@ -866,6 +874,7 @@ struct _jedec_spec1 {
uint8_t WL; uint8_t WL;
uint8_t nwr; uint8_t nwr;
uint8_t nrtp; uint8_t nrtp;
uint8_t odtlon;
uint8_t MR1; uint8_t MR1;
uint8_t MR2; uint8_t MR2;
}; };
@ -877,21 +886,21 @@ struct _jedec_spec1 {
#define JS1_MR2(f) (0x00 | ((f) << 3) | (f)) #define JS1_MR2(f) (0x00 | ((f) << 3) | (f))
const struct _jedec_spec1 js1[JS1_FREQ_TBL_NUM] = { const struct _jedec_spec1 js1[JS1_FREQ_TBL_NUM] = {
/* 533.333Mbps */ /* 533.333Mbps */
{ 800, 6, 6, 4, 6, 8, JS1_MR1(0), JS1_MR2(0) | 0x40 }, { 800, 6, 6, 4, 6, 8, 0, JS1_MR1(0), JS1_MR2(0) | 0x40 },
/* 1066.666Mbps */ /* 1066.666Mbps */
{ 1600, 10, 12, 8, 10, 8, JS1_MR1(1), JS1_MR2(1) | 0x40 }, { 1600, 10, 12, 8, 10, 8, 0, JS1_MR1(1), JS1_MR2(1) | 0x40 },
/* 1600.000Mbps */ /* 1600.000Mbps */
{ 2400, 14, 16, 12, 16, 8, JS1_MR1(2), JS1_MR2(2) | 0x40 }, { 2400, 14, 16, 12, 16, 8, 6, JS1_MR1(2), JS1_MR2(2) | 0x40 },
/* 2133.333Mbps */ /* 2133.333Mbps */
{ 3200, 20, 22, 10, 20, 8, JS1_MR1(3), JS1_MR2(3) }, { 3200, 20, 22, 10, 20, 8, 4, JS1_MR1(3), JS1_MR2(3) },
/* 2666.666Mbps */ /* 2666.666Mbps */
{ 4000, 24, 28, 12, 24, 10, JS1_MR1(4), JS1_MR2(4) }, { 4000, 24, 28, 12, 24, 10, 4, JS1_MR1(4), JS1_MR2(4) },
/* 3200.000Mbps */ /* 3200.000Mbps */
{ 4800, 28, 32, 14, 30, 12, JS1_MR1(5), JS1_MR2(5) }, { 4800, 28, 32, 14, 30, 12, 6, JS1_MR1(5), JS1_MR2(5) },
/* 3733.333Mbps */ /* 3733.333Mbps */
{ 5600, 32, 36, 16, 34, 14, JS1_MR1(6), JS1_MR2(6) }, { 5600, 32, 36, 16, 34, 14, 6, JS1_MR1(6), JS1_MR2(6) },
/* 4266.666Mbps */ /* 4266.666Mbps */
{ 6400, 36, 40, 18, 40, 16, JS1_MR1(7), JS1_MR2(7) } { 6400, 36, 40, 18, 40, 16, 8, JS1_MR1(7), JS1_MR2(7) }
}; };
struct _jedec_spec2 { struct _jedec_spec2 {
@ -921,7 +930,8 @@ struct _jedec_spec2 {
#define js2_tzqcalns 19 #define js2_tzqcalns 19
#define js2_tzqlat 20 #define js2_tzqlat 20
#define js2_tiedly 21 #define js2_tiedly 21
#define JS2_TBLCNT 22 #define js2_tODTon_min 22
#define JS2_TBLCNT 23
#define js2_trcpb (JS2_TBLCNT) #define js2_trcpb (JS2_TBLCNT)
#define js2_trcab (JS2_TBLCNT + 1) #define js2_trcab (JS2_TBLCNT + 1)
@ -954,7 +964,8 @@ const struct _jedec_spec2 jedec_spec2[2][JS2_TBLCNT] = {
/*tMRD*/ {14000, 10}, /*tMRD*/ {14000, 10},
/*tZQCALns*/ {1000 * 10, 0}, /*tZQCALns*/ {1000 * 10, 0},
/*tZQLAT*/ {30000, 10}, /*tZQLAT*/ {30000, 10},
/*tIEdly*/ {12500, 0} /*tIEdly*/ {12500, 0},
/*tODTon_min*/ {1500, 0}
}, { }, {
/*tSR */ {15000, 3}, /*tSR */ {15000, 3},
/*tXP */ {7500, 3}, /*tXP */ {7500, 3},
@ -977,7 +988,8 @@ const struct _jedec_spec2 jedec_spec2[2][JS2_TBLCNT] = {
/*tMRD*/ {14000, 10}, /*tMRD*/ {14000, 10},
/*tZQCALns*/ {1000 * 10, 0}, /*tZQCALns*/ {1000 * 10, 0},
/*tZQLAT*/ {30000, 10}, /*tZQLAT*/ {30000, 10},
/*tIEdly*/ {12500, 0} /*tIEdly*/ {12500, 0},
/*tODTon_min*/ {1500, 0}
} }
}; };
@ -1452,7 +1464,7 @@ static void ddrtbl_load(void)
if ((prr_product == PRR_PRODUCT_M3N) || if ((prr_product == PRR_PRODUCT_M3N) ||
(prr_product == PRR_PRODUCT_V3H)) { (prr_product == PRR_PRODUCT_V3H)) {
ddrtbl_setval(_cnf_DDR_PHY_SLICE_REGSET, ddrtbl_setval(_cnf_DDR_PHY_SLICE_REGSET,
_reg_PHY_RDDATA_EN_OE_DLY, dataS); _reg_PHY_RDDATA_EN_OE_DLY, dataS - 2);
} }
ddrtbl_setval(_cnf_DDR_PI_REGSET, _reg_PI_RDLAT_ADJ_F1, RL - dataS); ddrtbl_setval(_cnf_DDR_PI_REGSET, _reg_PI_RDLAT_ADJ_F1, RL - dataS);
@ -1498,9 +1510,10 @@ static void ddrtbl_load(void)
/* DDRPHY INT START */ /* DDRPHY INT START */
if ((prr_product == PRR_PRODUCT_H3) && (prr_cut <= PRR_PRODUCT_11)) { if ((prr_product == PRR_PRODUCT_H3) && (prr_cut <= PRR_PRODUCT_11)) {
/* non */ /* non */
} else { } else {
regif_pll_wa(); regif_pll_wa();
dbwait_loop(5);
} }
/* FREQ_SEL_MULTICAST & PER_CS_TRAINING_MULTICAST SET (for safety) */ /* FREQ_SEL_MULTICAST & PER_CS_TRAINING_MULTICAST SET (for safety) */
@ -2067,12 +2080,18 @@ static void dbsc_regset(void)
/* DBTR9.TRDPR : tRTP */ /* DBTR9.TRDPR : tRTP */
mmio_write_32(DBSC_DBTR(9), js2[js2_trtp]); mmio_write_32(DBSC_DBTR(9), js2[js2_trtp]);
/* DBTR10.TWR : nwr */ /* DBTR10.TWR : nWR + 1 */
mmio_write_32(DBSC_DBTR(10), js1[js1_ind].nwr); mmio_write_32(DBSC_DBTR(10), js1[js1_ind].nwr + 1);
/* DBTR11.TRDWR : RL + tDQSCK + BL/2 + Rounddown(tRPST) - WL + tWPRE */ /*
* DBTR11.TRDWR : RL + BL / 2 + Rounddown(tRPST) + PHY_ODTLoff -
* odtlon + tDQSCK - tODTon,min +
* PCB delay (out+in) + tPHY_ODToff
*/
mmio_write_32(DBSC_DBTR(11), mmio_write_32(DBSC_DBTR(11),
RL + js2[js2_tdqsck] + (16 / 2) + 1 - WL + 2 + 2); RL + (16 / 2) + 1 + 2 - js1[js1_ind].odtlon +
js2[js2_tdqsck] - js2[js2_tODTon_min] +
_f_scale(ddr_mbps, ddr_mbpsdiv, 1300, 0));
/* DBTR12.TWRRD : WL + 1 + BL/2 + tWTR */ /* DBTR12.TWRRD : WL + 1 + BL/2 + tWTR */
data_l = WL + 1 + (16 / 2) + js2[js2_twtr]; data_l = WL + 1 + (16 / 2) + js2[js2_twtr];
@ -2338,10 +2357,23 @@ static void dbsc_regset_post(void)
} }
} }
if ((prr_product == PRR_PRODUCT_H3) && (prr_cut > PRR_PRODUCT_11)) { if ((prr_product == PRR_PRODUCT_H3) && (prr_cut > PRR_PRODUCT_11)) {
#if RCAR_DRAM_SPLIT == 2
if (board_cnf->phyvalid == 0x05) {
mmio_write_32(DBSC_DBTR(24),
(rdlat_max << 24) + (rdlat_min << 16) +
mmio_read_32(DBSC_DBTR(24)));
} else {
mmio_write_32(DBSC_DBTR(24),
((rdlat_max * 2 - rdlat_min + 4) << 24) +
((rdlat_min + 2) << 16) +
mmio_read_32(DBSC_DBTR(24)));
}
#else /*RCAR_DRAM_SPLIT == 2 */
mmio_write_32(DBSC_DBTR(24), mmio_write_32(DBSC_DBTR(24),
((rdlat_max * 2 - rdlat_min + 4) << 24) + ((rdlat_max * 2 - rdlat_min + 4) << 24) +
((rdlat_min + 2) << 16) + ((rdlat_min + 2) << 16) +
mmio_read_32(DBSC_DBTR(24))); mmio_read_32(DBSC_DBTR(24)));
#endif /*RCAR_DRAM_SPLIT == 2 */
} else { } else {
mmio_write_32(DBSC_DBTR(24), mmio_write_32(DBSC_DBTR(24),
((rdlat_max + 2) << 24) + ((rdlat_max + 2) << 24) +
@ -3474,10 +3506,13 @@ static uint32_t wdqdm_man(void)
{ {
uint32_t err, retry_cnt; uint32_t err, retry_cnt;
const uint32_t retry_max = 0x10; const uint32_t retry_max = 0x10;
uint32_t ch, ddr_csn, mr14_bkup[4][4]; uint32_t datal, ch, ddr_csn, mr14_bkup[4][4];
datal = RL + js2[js2_tdqsck] + (16 / 2) + 1 - WL + 2 + 2 + 19;
if ((mmio_read_32(DBSC_DBTR(11)) & 0xFF) > datal)
datal = mmio_read_32(DBSC_DBTR(11)) & 0xFF;
ddr_setval_ach(_reg_PI_TDFI_WDQLVL_RW, datal);
ddr_setval_ach(_reg_PI_TDFI_WDQLVL_RW,
(mmio_read_32(DBSC_DBTR(11)) & 0xFF) + 19);
if (((prr_product == PRR_PRODUCT_H3) && (prr_cut > PRR_PRODUCT_11)) || if (((prr_product == PRR_PRODUCT_H3) && (prr_cut > PRR_PRODUCT_11)) ||
(prr_product == PRR_PRODUCT_M3N) || (prr_product == PRR_PRODUCT_M3N) ||
(prr_product == PRR_PRODUCT_V3H)) { (prr_product == PRR_PRODUCT_V3H)) {

9
drivers/renesas/rcar/ddr/ddr_b/boot_init_dram_config.c
View File

@ -1727,8 +1727,13 @@ static uint32_t _board_judge(void)
#endif #endif
} }
} else if (prr_product == PRR_PRODUCT_M3) { } else if (prr_product == PRR_PRODUCT_M3) {
/* RENESAS Starter Kit(M3-W/SIP 8Gbit 1rank) board */ if (prr_cut >= PRR_PRODUCT_30) {
brd = 3; /* RENESAS Starter Kit (M3-W Ver.3.0/SIP) */
brd = 18;
} else {
/* RENESAS Starter Kit(M3-W/SIP 8Gbit 1rank) board */
brd = 3;
}
} else { } else {
/* RENESAS Starter Kit(M3-N/SIP) board */ /* RENESAS Starter Kit(M3-N/SIP) board */
brd = 11; brd = 11;

2
drivers/renesas/rcar/ddr/ddr_b/boot_init_dram_regdef.h
View File

@ -5,7 +5,7 @@
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#define RCAR_DDR_VERSION "rev.0.38" #define RCAR_DDR_VERSION "rev.0.39"
#define DRAM_CH_CNT 0x04 #define DRAM_CH_CNT 0x04
#define SLICE_CNT 0x04 #define SLICE_CNT 0x04
#define CS_CNT 0x02 #define CS_CNT 0x02

4
drivers/renesas/rcar/ddr/ddr_b/init_dram_tbl_m3n.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015-2019, Renesas Electronics Corporation. * Copyright (c) 2015-2020, Renesas Electronics Corporation.
* All rights reserved. * All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
@ -116,7 +116,7 @@ static const uint32_t DDR_PHY_SLICE_REGSET_M3N[DDR_PHY_SLICE_REGSET_NUM_M3N] = {
/*0859*/ 0x00000200, /*0859*/ 0x00000200,
/*085a*/ 0x00000004, /*085a*/ 0x00000004,
/*085b*/ 0x4041a151, /*085b*/ 0x4041a151,
/*085c*/ 0x0141c0a0, /*085c*/ 0x0141a0a0,
/*085d*/ 0x0000c0c0, /*085d*/ 0x0000c0c0,
/*085e*/ 0x0e0c000e, /*085e*/ 0x0e0c000e,
/*085f*/ 0x10001000, /*085f*/ 0x10001000,