From: Jacky Bai Date: Wed, 6 May 2020 05:11:04 +0000 (+0800) Subject: fix(imx8m): fix the dfiphymaster setting after dvfs X-Git-Tag: baikal/aarch64/sdk5.10~1^2~173^2~14 X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=ad0cbbf513dfabe51a401c06be504e57d6b143ca;p=arm-tf.git fix(imx8m): fix the dfiphymaster setting after dvfs the dfi phy master setting need to be save/restore to make sure it aligned with the initial config. Signed-off-by: Jacky Bai Reviewed-by: Anson Huang Change-Id: I4f572b9aff9cc47a6c28524ce0fe03cdc66b88a1 --- diff --git a/plat/imx/imx8m/ddr/lpddr4_dvfs.c b/plat/imx/imx8m/ddr/lpddr4_dvfs.c index 2b4f300c7..2f5f7b5c9 100644 --- a/plat/imx/imx8m/ddr/lpddr4_dvfs.c +++ b/plat/imx/imx8m/ddr/lpddr4_dvfs.c @@ -1,5 +1,5 @@ /* - * Copyright 2018-2022 NXP + * Copyright 2018-2023 NXP * * SPDX-License-Identifier: BSD-3-Clause */ @@ -37,6 +37,7 @@ void lpddr4_swffc(struct dram_info *info, unsigned int init_fsp, uint32_t val; uint32_t derate_backup[3]; uint32_t (*mr_data)[8]; + uint32_t phy_master; /* 1. program targetd UMCTL2_REGS_FREQ1/2/3,already done, skip it. */ @@ -57,6 +58,8 @@ void lpddr4_swffc(struct dram_info *info, unsigned int init_fsp, /* 12. set PWRCTL.selfref_en=0 */ mmio_clrbits_32(DDRC_PWRCTL(0), 0xf); + phy_master = mmio_read_32(DDRC_DFIPHYMSTR(0)); + /* It is more safe to config it here */ mmio_clrbits_32(DDRC_DFIPHYMSTR(0), 0x1); @@ -225,8 +228,8 @@ void lpddr4_swffc(struct dram_info *info, unsigned int init_fsp, emr3 = (emr3 & 0x00f7) | 0x0d00; lpddr4_mr_write(3, 13, emr3); - /* enable PHY master */ - mmio_write_32(DDRC_DFIPHYMSTR(0), 0x1); + /* restore the PHY master */ + mmio_write_32(DDRC_DFIPHYMSTR(0), phy_master); /* 32. issue ZQ if required: zq_calib_short, bit 4 */ /* polling zq_calib_short_busy */