[U-Boot] [PATCH v3 42/57] ram: rk3399: Handle data training via ops

Kever Yang
2019-07-16T13:18:11Z

On 2019/7/16 下午7:57, Jagan Teki wrote:
> data training can be even required for lpddr4 and we
> need to keep the lpddr4 code to compile only for relevant
> boards which do support lpddr4.
>
> For this requirement, and for code readability handle
> data training via sdram_rk3399_ops and same will update
> in future while supporting lpddr4 code.
>
> Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>

Reviewed-by: Kever Yang <Kever.yang@rock-chips.com>

Thanks,
- Kever
> ---
> drivers/ram/rockchip/sdram_rk3399.c | 43 ++++++++++++++++++++++-------
> 1 file changed, 33 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c
> index 1aaaeb5b88..da01f08732 100644
> --- a/drivers/ram/rockchip/sdram_rk3399.c
> +++ b/drivers/ram/rockchip/sdram_rk3399.c
> @@ -65,11 +65,17 @@ struct dram_info {
> struct rk3399_pmucru *pmucru;
> struct rk3399_pmusgrf_regs *pmusgrf;
> struct rk3399_ddr_cic_regs *cic;
> + const struct sdram_rk3399_ops *ops;
> #endif
> struct ram_info info;
> struct rk3399_pmugrf_regs *pmugrf;
> };
>
> +struct sdram_rk3399_ops {
> + int (*data_training)(struct dram_info *dram, u32 channel, u8 rank,
> + struct rk3399_sdram_params *sdram);
> +};
> +
> #if defined(CONFIG_TPL_BUILD) || \
> (!defined(CONFIG_TPL) && defined(CONFIG_SPL_BUILD))
>
> @@ -1464,6 +1470,23 @@ static void dram_all_config(struct dram_info *dram,
> clrsetbits_le32(&dram->cru->glb_rst_con, 0x3, 0x3);
> }
>
> +static int default_data_training(struct dram_info *dram, u32 channel, u8 rank,
> + struct rk3399_sdram_params *params)
> +{
> + u8 training_flag = PI_READ_GATE_TRAINING;
> +
> + /*
> + * LPDDR3 CA training msut be trigger before
> + * other training.
> + * DDR3 is not have CA training.
> + */
> +
> + if (params->base.dramtype == LPDDR3)
> + training_flag |= PI_CA_TRAINING;
> +
> + return data_training(dram, channel, params, training_flag);
> +}
> +
> static int switch_to_phy_index1(struct dram_info *dram,
> const struct rk3399_sdram_params *params)
> {
> @@ -1626,7 +1649,6 @@ static int sdram_init(struct dram_info *dram,
> {
> unsigned char dramtype = params->base.dramtype;
> unsigned int ddr_freq = params->base.ddr_freq;
> - u32 training_flag = PI_READ_GATE_TRAINING;
> int channel, ch, rank;
> int ret;
>
> @@ -1654,16 +1676,12 @@ static int sdram_init(struct dram_info *dram,
>
> params->ch[ch].cap_info.rank = rank;
>
> - /*
> - * LPDDR3 CA training msut be trigger before
> - * other training.
> - * DDR3 is not have CA training.
> - */
> - if (params->base.dramtype == LPDDR3)
> - training_flag |= PI_CA_TRAINING;
> -
> - if (!(data_training(dram, ch, params, training_flag)))
> + ret = dram->ops->data_training(dram, ch, rank, params);
> + if (!ret) {
> + debug("%s: data trained for rank %d, ch %d\n",
> + __func__, rank, ch);
> break;
> + }
> }
> /* Computed rank with associated channel number */
> params->ch[ch].cap_info.rank = rank;
> @@ -1743,6 +1761,10 @@ static int conv_of_platdata(struct udevice *dev)
> }
> #endif
>
> +static const struct sdram_rk3399_ops rk3399_ops = {
> + .data_training = default_data_training,
> +};
> +
> static int rk3399_dmc_init(struct udevice *dev)
> {
> struct dram_info *priv = dev_get_priv(dev);
> @@ -1760,6 +1782,7 @@ static int rk3399_dmc_init(struct udevice *dev)
> return ret;
> #endif
>
> + priv->ops = &rk3399_ops;
> priv->cic = syscon_get_first_range(ROCKCHIP_SYSCON_CIC);
> priv->grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF);
> priv->pmugrf = syscon_get_first_range(ROCKCHIP_SYSCON_PMUGRF);