From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com>
To: sbabic@denx.de, festevam@gmail.com, trini@konsulko.com,
alpernebiyasak@gmail.com
Cc: u-boot@lists.denx.de, Peng Fan <peng.fan@nxp.com>,
Tim Harvey <tharvey@gateworks.com>
Subject: [PATCH 5/8] ddr: imx8m: helper: load ddr firmware according to binman symbols
Date: Fri, 3 Jun 2022 15:17:12 +0800 [thread overview]
Message-ID: <20220603071715.15212-6-peng.fan@oss.nxp.com> (raw)
In-Reply-To: <20220603071715.15212-1-peng.fan@oss.nxp.com>
From: Peng Fan <peng.fan@nxp.com>
By reading binman symbols, we no need hard coded IMEM_LEN/DMEM_LEN after
we update the binman dtsi to drop 0x8000/0x4000 length for the firmware.
And that could save binary size for many KBs.
Tested-by: Tim Harvey <tharvey@gateworks.com> #imx8m[m,n,p]-venice
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
drivers/ddr/imx/imx8m/helper.c | 51 ++++++++++++++++++++++++++++------
1 file changed, 43 insertions(+), 8 deletions(-)
diff --git a/drivers/ddr/imx/imx8m/helper.c b/drivers/ddr/imx/imx8m/helper.c
index f23904bf712..d9a4ced4462 100644
--- a/drivers/ddr/imx/imx8m/helper.c
+++ b/drivers/ddr/imx/imx8m/helper.c
@@ -4,6 +4,7 @@
*/
#include <common.h>
+#include <binman_sym.h>
#include <log.h>
#include <spl.h>
#include <asm/global_data.h>
@@ -25,15 +26,30 @@ DECLARE_GLOBAL_DATA_PTR;
#define DMEM_OFFSET_ADDR 0x00054000
#define DDR_TRAIN_CODE_BASE_ADDR IP2APB_DDRPHY_IPS_BASE_ADDR(0)
+binman_sym_declare(ulong, ddr_1d_imem_fw, image_pos);
+binman_sym_declare(ulong, ddr_1d_imem_fw, size);
+
+binman_sym_declare(ulong, ddr_1d_dmem_fw, image_pos);
+binman_sym_declare(ulong, ddr_1d_dmem_fw, size);
+
+#if !IS_ENABLED(CONFIG_IMX8M_DDR3L)
+binman_sym_declare(ulong, ddr_2d_imem_fw, image_pos);
+binman_sym_declare(ulong, ddr_2d_imem_fw, size);
+
+binman_sym_declare(ulong, ddr_2d_dmem_fw, image_pos);
+binman_sym_declare(ulong, ddr_2d_dmem_fw, size);
+#endif
+
/* We need PHY iMEM PHY is 32KB padded */
void ddr_load_train_firmware(enum fw_type type)
{
u32 tmp32, i;
u32 error = 0;
unsigned long pr_to32, pr_from32;
- unsigned long fw_offset = type ? IMEM_2D_OFFSET : 0;
- unsigned long imem_start = (unsigned long)&_end + fw_offset;
- unsigned long dmem_start;
+ uint32_t fw_offset = type ? IMEM_2D_OFFSET : 0;
+ uint32_t imem_start = (unsigned long)&_end + fw_offset;
+ uint32_t dmem_start;
+ uint32_t imem_len = IMEM_LEN, dmem_len = DMEM_LEN;
#ifdef CONFIG_SPL_OF_CONTROL
if (gd->fdt_blob && !fdt_check_header(gd->fdt_blob)) {
@@ -43,11 +59,30 @@ void ddr_load_train_firmware(enum fw_type type)
}
#endif
- dmem_start = imem_start + IMEM_LEN;
+ dmem_start = imem_start + imem_len;
+
+ if (CONFIG_IS_ENABLED(BINMAN_SYMBOLS)) {
+ switch (type) {
+ case FW_1D_IMAGE:
+ imem_start = binman_sym(ulong, ddr_1d_imem_fw, image_pos);
+ imem_len = binman_sym(ulong, ddr_1d_imem_fw, size);
+ dmem_start = binman_sym(ulong, ddr_1d_dmem_fw, image_pos);
+ dmem_len = binman_sym(ulong, ddr_1d_dmem_fw, size);
+ break;
+ case FW_2D_IMAGE:
+#if !IS_ENABLED(CONFIG_IMX8M_DDR3L)
+ imem_start = binman_sym(ulong, ddr_2d_imem_fw, image_pos);
+ imem_len = binman_sym(ulong, ddr_2d_imem_fw, size);
+ dmem_start = binman_sym(ulong, ddr_2d_dmem_fw, image_pos);
+ dmem_len = binman_sym(ulong, ddr_2d_dmem_fw, size);
+#endif
+ break;
+ }
+ }
pr_from32 = imem_start;
pr_to32 = DDR_TRAIN_CODE_BASE_ADDR + 4 * IMEM_OFFSET_ADDR;
- for (i = 0x0; i < IMEM_LEN; ) {
+ for (i = 0x0; i < imem_len; ) {
tmp32 = readl(pr_from32);
writew(tmp32 & 0x0000ffff, pr_to32);
pr_to32 += 4;
@@ -59,7 +94,7 @@ void ddr_load_train_firmware(enum fw_type type)
pr_from32 = dmem_start;
pr_to32 = DDR_TRAIN_CODE_BASE_ADDR + 4 * DMEM_OFFSET_ADDR;
- for (i = 0x0; i < DMEM_LEN; ) {
+ for (i = 0x0; i < dmem_len; ) {
tmp32 = readl(pr_from32);
writew(tmp32 & 0x0000ffff, pr_to32);
pr_to32 += 4;
@@ -72,7 +107,7 @@ void ddr_load_train_firmware(enum fw_type type)
debug("check ddr_pmu_train_imem code\n");
pr_from32 = imem_start;
pr_to32 = DDR_TRAIN_CODE_BASE_ADDR + 4 * IMEM_OFFSET_ADDR;
- for (i = 0x0; i < IMEM_LEN; ) {
+ for (i = 0x0; i < imem_len; ) {
tmp32 = (readw(pr_to32) & 0x0000ffff);
pr_to32 += 4;
tmp32 += ((readw(pr_to32) & 0x0000ffff) << 16);
@@ -93,7 +128,7 @@ void ddr_load_train_firmware(enum fw_type type)
debug("check ddr4_pmu_train_dmem code\n");
pr_from32 = dmem_start;
pr_to32 = DDR_TRAIN_CODE_BASE_ADDR + 4 * DMEM_OFFSET_ADDR;
- for (i = 0x0; i < DMEM_LEN;) {
+ for (i = 0x0; i < dmem_len;) {
tmp32 = (readw(pr_to32) & 0x0000ffff);
pr_to32 += 4;
tmp32 += ((readw(pr_to32) & 0x0000ffff) << 16);
--
2.36.0
next prev parent reply other threads:[~2022-06-03 6:36 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-03 7:17 [PATCH 0/8] arm64: binman: use binman symbols for imx Peng Fan (OSS)
2022-06-03 6:37 ` Peng Fan
2022-06-03 7:17 ` [PATCH 1/8] spl: Kconfig: not select SPL_RAW_IMAGE_SUPPORT for i.MX8M Peng Fan (OSS)
2022-06-03 12:19 ` Tom Rini
2022-06-04 11:49 ` Alper Nebi Yasak
2022-06-03 7:17 ` [PATCH 2/8] configs: imx8mm_data_modul_edm_sbc: not select SPL_RAM_DEVICE Peng Fan (OSS)
2022-06-04 11:49 ` Alper Nebi Yasak
2022-06-06 14:07 ` Marek Vasut
2022-06-07 17:26 ` Alper Nebi Yasak
2022-06-07 18:11 ` Marek Vasut
2022-06-07 20:54 ` Alper Nebi Yasak
2022-06-07 22:54 ` Marek Vasut
2022-06-10 15:51 ` Alper Nebi Yasak
2022-06-11 10:09 ` Marek Vasut
2022-06-03 7:17 ` [PATCH 3/8] arm: dts: imx8m: update binman ddr firmware node name Peng Fan (OSS)
2022-06-04 11:50 ` Alper Nebi Yasak
2022-06-03 7:17 ` [PATCH 4/8] armv8: u-boot-spl.lds: mark __image_copy_start as symbol Peng Fan (OSS)
2022-06-04 11:50 ` Alper Nebi Yasak
2022-06-03 7:17 ` Peng Fan (OSS) [this message]
2022-06-04 11:50 ` [PATCH 5/8] ddr: imx8m: helper: load ddr firmware according to binman symbols Alper Nebi Yasak
2022-06-03 7:17 ` [PATCH 6/8] arm: dts: imx8m: shrink ddr firmware size to actual file size Peng Fan (OSS)
2022-06-04 11:50 ` Alper Nebi Yasak
2022-06-03 7:17 ` [PATCH 7/8] binman_sym: guard with CONFIG_IS_ENABLED(BINMAN_SYMBOLS) Peng Fan (OSS)
2022-06-04 11:50 ` Alper Nebi Yasak
2022-06-10 16:47 ` Alper Nebi Yasak
2022-06-11 10:32 ` Peng Fan (OSS)
2022-06-11 12:44 ` Alper Nebi Yasak
2022-06-13 2:34 ` Peng Fan (OSS)
2022-06-14 21:20 ` Alper Nebi Yasak
2022-06-14 23:25 ` Peng Fan
2022-06-18 12:24 ` Alper Nebi Yasak
2022-06-13 2:31 ` Peng Fan (OSS)
2022-06-14 21:01 ` Alper Nebi Yasak
2022-06-03 7:17 ` [PATCH 8/8] imx: imx8mm-icore: migrate to use BINMAN Peng Fan (OSS)
2022-06-04 11:50 ` Alper Nebi Yasak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220603071715.15212-6-peng.fan@oss.nxp.com \
--to=peng.fan@oss.nxp.com \
--cc=alpernebiyasak@gmail.com \
--cc=festevam@gmail.com \
--cc=peng.fan@nxp.com \
--cc=sbabic@denx.de \
--cc=tharvey@gateworks.com \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).