aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMadhukar Pappireddy <madhukar.pappireddy@arm.com>2022-06-27 15:46:58 +0200
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2022-06-27 15:46:58 +0200
commit6f614219c70fbfea2b8ea20351ed83a34e9612c9 (patch)
tree437c0287ea4df6372590599ef31213e3f5102449
parent63d49c49c2943b82930d1303ac64aa3286832f23 (diff)
parent742c23aab79a21803472c5b4314b43057f1d3e84 (diff)
downloadtrusted-firmware-a-6f614219c70fbfea2b8ea20351ed83a34e9612c9.tar.gz
Merge "fix(nxp-ddr): fix firmware buffer re-mapping issue" into integration
-rw-r--r--drivers/nxp/ddr/phy-gen2/phy.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/nxp/ddr/phy-gen2/phy.c b/drivers/nxp/ddr/phy-gen2/phy.c
index c8245a846e..9e52145d8d 100644
--- a/drivers/nxp/ddr/phy-gen2/phy.c
+++ b/drivers/nxp/ddr/phy-gen2/phy.c
@@ -2216,14 +2216,6 @@ static int load_fw(uint16_t **phy_ptr,
size = PHY_GEN2_MAX_IMAGE_SIZE;
image_buf = (uintptr_t)phy_gen2_fw_img_buf;
- ret = mmap_add_dynamic_region(phy_gen2_fw_img_buf,
- phy_gen2_fw_img_buf,
- PHY_GEN2_MAX_IMAGE_SIZE,
- MT_MEMORY | MT_RW | MT_SECURE);
- if (ret != 0) {
- ERROR("Failed to add dynamic memory region.\n");
- return ret;
- }
ret = img_loadr(imem_id, &image_buf, &size);
if (ret != 0) {
ERROR("Failed to load %d firmware.\n", imem_id);
@@ -2592,6 +2584,15 @@ int compute_ddr_phy(struct ddr_info *priv)
}
} else {
#endif
+ /* Mapping IMG buffer firstly */
+ ret = mmap_add_dynamic_region(priv->phy_gen2_fw_img_buf,
+ priv->phy_gen2_fw_img_buf,
+ PHY_GEN2_MAX_IMAGE_SIZE,
+ MT_MEMORY | MT_RW | MT_SECURE);
+ if (ret != 0) {
+ ERROR("Failed to add dynamic memory region.\n");
+ return ret;
+ }
debug("Load 1D firmware\n");
ret = load_fw(priv->phy, &input, 0, &msg_1d,