Skip to contentSkip to conversation

Add support for loading main_r5fss0_core0

PATCH Superseded Keerthy 3 participants 19 messages Jan 28, 2020 – Feb 4, 2020

Subsystems (3)

v5 of 8 Superseded Latest is v8 →

lore
Share & tools
lore

Keerthy

author
#0 lore raw

v5 cover Add support for loading main_r5fss0_core0

This patch series enables mcu_r5fss0_core0 & main_r5fss0_core0. Tested for firmware loading and execution on J721e.

Changes in v5:

* Moved the fs_loader node under r5-common-proc-board-u-boot.dtsi
* Added more information on the envnowhere patch.
* Added help LIB_ELF option and removed user configurable description.

Changes in v4:

* Changed env variable names, config names and enhanced commit logs.

Changes in v3:

* Removed saving env in MMC and fixed env saving in SPL when nowhere option is set.

Changes in v2:

* Factored out all the generic elf handling functions under lib/elf.c

Keerthy (10):
env: nowhere: set default enviroment
lib: elf: Move the generic elf loading/validating functions to lib
arm: k3: Add support for loading non linux remote cores
armv7R: K3: r5_mpu: Enable execute permission for MCU0 BTCM
armv7R: K3: Add support for jumping to firmware
arm: dts: k3-j721e-r5-u-boot: Add fs_loader node
arm: dts: k3-j721e-r5: Enable r5fss0 cluster in SPL
include: configs: j721e_evm: Add env variables for mcu_r5fss0_core0 &

    main_r5fss0_core0

configs: j721e_evm_r5: Enable R5F remoteproc support
configs: j721e_evm_r5_defconfig: Remove saving ENV in eMMC

 .../k3-j721e-r5-common-proc-board-u-boot.dtsi |  27 ++
 .../arm/dts/k3-j721e-r5-common-proc-board.dts |   2 +
 arch/arm/mach-k3/common.c                     | 106 +++++++-
 arch/arm/mach-k3/common.h                     |   2 +
 arch/arm/mach-k3/j721e_init.c                 |  34 +++
 arch/arm/mach-k3/r5_mpu.c                     |   4 +-
 cmd/Kconfig                                   |   1 +
 cmd/elf.c                                     | 229 ----------------
 configs/j721e_evm_r5_defconfig                |   6 +-
 env/nowhere.c                                 |   1 +
 include/configs/j721e_evm.h                   |   4 +
 include/elf.h                                 |   4 +
 lib/Kconfig                                   |   6 +
 lib/Makefile                                  |   1 +
 lib/elf.c                                     | 256 ++++++++++++++++++
 15 files changed, 438 insertions(+), 245 deletions(-)
 create mode 100644 arch/arm/dts/k3-j721e-r5-common-proc-board-u-boot.dtsi
 create mode 100644 lib/elf.c
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH v5 1/10 env: nowhere: set default enviroment

In case only CONFIG_ENV_IS_NOWHERE without any of the memory based configs like CONFIG_ENV_IS_IN_MMC the env_set function fails as the gd->flags & GD_FLG_ENV_READY check fails.

Set default enviroment so that set_env calls succeed when only ENV_IS_NOWHERE set.

---
 env/nowhere.c | 1 +
 1 file changed, 1 insertion(+)
env/nowhere.c +1 -0
index f5b0a17652..70c3b3e011 100644
@@ -23,6 +23,7 @@ static int env_nowhere_init(void)
 {
 	gd->env_addr	= (ulong)&default_environment[0];
 	gd->env_valid	= ENV_INVALID;
+	env_set_default(NULL, 0);
 
 	return 0;
 }
Signature · 1 line
2.17.1
#2 lore raw

PATCH v5 1/10 env: nowhere: set default enviroment

Quoted 8 lines · Keerthy

In case only CONFIG_ENV_IS_NOWHERE without any of the memory based configs like CONFIG_ENV_IS_IN_MMC the env_set function fails as the gd->flags & GD_FLG_ENV_READY check fails.

Set default enviroment so that set_env calls succeed when only ENV_IS_NOWHERE set.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200129/939cd90e/attachment.sig>
author
#3 lore raw

PATCH v5 2/10 lib: elf: Move the generic elf loading/validating functions to lib

In reply to Keerthy

Move the generic elf loading/validating functions to lib/ so that they can be re-used and accessed by code existing outside cmd.

---
 cmd/Kconfig   |   1 +
 cmd/elf.c     | 229 --------------------------------------------
 include/elf.h |   4 +
 lib/Kconfig   |   6 ++
 lib/Makefile  |   1 +
 lib/elf.c     | 256 ++++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 268 insertions(+), 229 deletions(-)
 create mode 100644 lib/elf.c
cmd/Kconfig +1 -0
index e6ba57035e..9819dd1aaf 100644
@@ -399,6 +399,7 @@ config CMD_ABOOTIMG
 config CMD_ELF
 	bool "bootelf, bootvx"
 	default y
+	select LIB_ELF
 	help
 	  Boot an ELF/vxWorks image from the memory.
 
cmd/elf.c +0 -229

241 lines not on this page · raw message

include/elf.h +4 -0
index 81f40191d7..e7c51986df 100644
@@ -692,6 +692,10 @@ unsigned long elf_hash(const unsigned char *name);
 
 #ifndef __ASSEMBLER__
 int valid_elf_image(unsigned long addr);
+unsigned long load_elf64_image_phdr(unsigned long addr);
+unsigned long load_elf64_image_shdr(unsigned long addr);
+unsigned long load_elf_image_phdr(unsigned long addr);
+unsigned long load_elf_image_shdr(unsigned long addr);
 #endif
 
 #endif /* _ELF_H */
lib/Kconfig +6 -0
index ab6aff710d..452f390c80 100644
@@ -602,4 +602,10 @@ config TEST_FDTDEC
 config LIB_DATE
 	bool
 
+config LIB_ELF
+	bool
+	help
+	  Supoort basic elf loading/validating functions.
+	  This supports fir 32 bit and 64 bit versions.
+
 endmenu
lib/Makefile +1 -0
index 15259d0473..32bf3f3693 100644
@@ -122,6 +122,7 @@ obj-y += vsprintf.o strto.o
 endif
 
 obj-y += date.o
+obj-$(CONFIG_LIB_ELF) += elf.o
 
 #
 # Build a fast OID lookup registry from include/linux/oid_registry.h
lib/elf.c new file +256 -0

256 lines not on this page · raw message

Signature · 1 line
2.17.1
#4 lore raw

PATCH v5 2/10 lib: elf: Move the generic elf loading/validating functions to lib

Quoted 7 lines · Keerthy

Move the generic elf loading/validating functions to lib/ so that they can be re-used and accessed by code existing outside cmd.

[snip]

Quoted 10 lines
lib/elf.c new file +4 -0
new file mode 100644
index 0000000000..c2097305ec
@@ -0,0 +1,256 @@
+/*
+ * Copyright (c) 2001 William L. Pitts
+ * All rights reserved.
+ *

lib/elf.c line 14

Quoted 10 lines
lib/elf.c new file +10 -0
+ * Redistribution and use in source and binary forms are freely
+ * permitted provided that the above copyright notice and this
+ * paragraph and the following disclaimer are duplicated in all
+ * such forms.
+ *
+ * This software is provided "AS IS" and without any express or
+ * implied warranties, including, without limitation, the implied
+ * warranties of merchantability and fitness for a particular
+ * purpose.
+ */

Ah, I see. cmd/elf.c is missing the SPDX tag, which this also needs. I looked and I don't think it's fair to ask you to put the SDPX tag on cmd/elf.c so I'm going to update it to BSD-2-Clause. You should depend on that patch and use the same tag here.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200129/4bbe8de3/attachment.sig>
author
#5 lore raw

PATCH v5 2/10 lib: elf: Move the generic elf loading/validating functions to lib

Quoted 26 lines · Tom Rini
Quoted 7 lines · Keerthy

Move the generic elf loading/validating functions to lib/ so that they can be re-used and accessed by code existing outside cmd.

[snip]

Quoted 17 lines
lib/elf.c new file +11 -0
new file mode 100644
index 0000000000..c2097305ec
@@ -0,0 +1,256 @@
+/*
+ * Copyright (c) 2001 William L. Pitts
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are freely
+ * permitted provided that the above copyright notice and this
+ * paragraph and the following disclaimer are duplicated in all
+ * such forms.
+ *
+ * This software is provided "AS IS" and without any express or
+ * implied warranties, including, without limitation, the implied
Quoted 9 lines

lib/elf.c line 14

Quoted 3 lines
lib/elf.c new file +3 -0
+ * warranties of merchantability and fitness for a particular
+ * purpose.
+ */

Ah, I see. cmd/elf.c is missing the SPDX tag, which this also needs. I looked and I don't think it's fair to ask you to put the SDPX tag on cmd/elf.c so I'm going to update it to BSD-2-Clause. You should depend on that patch and use the same tag here.

Tom,

I fixed that myself for lib/elf.c. Sending v7 with that fixed and with your Reviewed-by for the relevant patches. Let me know if that version looks good.

Thanks,
Keerthy

author
#6 lore raw

PATCH v5 3/10 arm: k3: Add support for loading non linux remote cores

In reply to Keerthy

Add MAIN domain R5FSS0 remoteproc support from spl. This enables loading the elf firmware in SPL and starting the remotecore.

In order to start the core, there should be a file with path "/lib/firmware/j7-main-r5f0_0-fw" under filesystem of respective boot mode.

[Guard start_non_linux_remote_cores under CONFIG_FS_LOADER]
---
 arch/arm/mach-k3/common.c     | 84 ++++++++++++++++++++++++++++++++---
 arch/arm/mach-k3/common.h     |  2 +
 arch/arm/mach-k3/j721e_init.c | 34 ++++++++++++++
 3 files changed, 115 insertions(+), 5 deletions(-)
arch/arm/mach-k3/common.c +79 -5
index 2f82edb970..bddb62ea5e 100644
@@ -17,6 +17,10 @@
 #include <asm/arch/sys_proto.h>
 #include <asm/hardware.h>
 #include <asm/io.h>
+#include <fs_loader.h>
+#include <fs.h>
+#include <env.h>
+#include <elf.h>
 
 struct ti_sci_handle *get_ti_sci_handle(void)
 {
@@ -58,6 +62,74 @@ int early_console_init(void)
 #endif
 
 #ifdef CONFIG_SYS_K3_SPL_ATF
+
+void init_env(void)
+{
+#ifdef CONFIG_SPL_ENV_SUPPORT
+	char *part;
+
+	env_init();
+	env_load();
+	switch (spl_boot_device()) {
+	case BOOT_DEVICE_MMC2:
+		part = env_get("bootpart");
+		env_set("storage_interface", "mmc");
+		env_set("fw_dev_part", part);
+		break;
+	case BOOT_DEVICE_SPI:
+		env_set("storage_interface", "ubi");
+		env_set("fw_ubi_mtdpart", "UBI");
+		env_set("fw_ubi_volume", "UBI0");
+		break;
+	default:
+		printf("%s from device %u not supported!\n",
+		       __func__, spl_boot_device());
+		return;
+	}
+#endif
+}
+
+#ifdef CONFIG_FS_LOADER
+int load_firmware(char *name_fw, char *name_loadaddr, u32 *loadaddr)
+{
+	struct udevice *fsdev;
+	char *name = NULL;
+	int size = 0;
+
+	*loadaddr = 0;
+#ifdef CONFIG_SPL_ENV_SUPPORT
+	switch (spl_boot_device()) {
+	case BOOT_DEVICE_MMC2:
+		name = env_get(name_fw);
+		*loadaddr = env_get_hex(name_loadaddr, *loadaddr);
+		break;
+	default:
+		printf("Loading rproc fw image from device %u not supported!\n",
+		       spl_boot_device());
+		return 0;
+	}
+#endif
+	if (!*loadaddr)
+		return 0;
+
+	if (!uclass_get_device(UCLASS_FS_FIRMWARE_LOADER, 0, &fsdev)) {
+		size = request_firmware_into_buf(fsdev, name, (void *)*loadaddr,
+						 0, 0);
+	}
+
+	return size;
+}
+#else
+int load_firmware(char *name_fw, char *name_loadaddr, u32 *loadaddr)
+{
+	return 0;
+}
+#endif
+
+__weak void start_non_linux_remote_cores(void)
+{
+}
+
 void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)
 {
 	struct ti_sci_handle *ti_sci = get_ti_sci_handle();
@@ -66,15 +138,17 @@ void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)
 	/* Release all the exclusive devices held by SPL before starting ATF */
 	ti_sci->ops.dev_ops.release_exclusive_devices(ti_sci);
 
+	ret = rproc_init();
+	if (ret)
+		panic("rproc failed to be initialized (%d)\n", ret);
+
+	init_env();
+	start_non_linux_remote_cores();
+
 	/*
 	 * It is assumed that remoteproc device 1 is the corresponding
 	 * Cortex-A core which runs ATF. Make sure DT reflects the same.
 	 */
-	ret = rproc_dev_init(1);
-	if (ret)
-		panic("%s: ATF failed to initialize on rproc (%d)\n", __func__,
-		      ret);
-
 	ret = rproc_load(1, spl_image->entry_point, 0x200);
 	if (ret)
 		panic("%s: ATF failed to load on rproc (%d)\n", __func__, ret);
arch/arm/mach-k3/common.h +2 -0
index d8b34fe060..42fb8ee6e7 100644
@@ -24,3 +24,5 @@ void setup_k3_mpu_regions(void);
 int early_console_init(void);
 void disable_linefill_optimization(void);
 void remove_fwl_configs(struct fwl_data *fwl_data, size_t fwl_data_size);
+void start_non_linux_remote_cores(void);
+int load_firmware(char *name_fw, char *name_loadaddr, u32 *loadaddr);
arch/arm/mach-k3/j721e_init.c +34 -0
index 0994522f6c..d80813e8bb 100644
@@ -19,6 +19,7 @@
 #include <dm/uclass-internal.h>
 #include <dm/pinctrl.h>
 #include <mmc.h>
+#include <remoteproc.h>
 
 #ifdef CONFIG_SPL_BUILD
 #ifdef CONFIG_K3_LOAD_SYSFW
@@ -326,3 +327,36 @@ void release_resources_for_core_shutdown(void)
 	}
 }
 #endif
+
+#ifdef CONFIG_SYS_K3_SPL_ATF
+void start_non_linux_remote_cores(void)
+{
+	int size = 0, ret;
+	u32 loadaddr = 0;
+
+	size = load_firmware("name_mainr5f0_0fw", "addr_mainr5f0_0load",
+			     &loadaddr);
+	if (size <= 0)
+		goto err_load;
+
+	/* assuming remoteproc 2 is aliased for the needed remotecore */
+	ret = rproc_load(2, loadaddr, size);
+	if (ret) {
+		printf("Firmware failed to start on rproc (%d)\n", ret);
+		goto err_load;
+	}
+
+	ret = rproc_start(2);
+	if (ret) {
+		printf("Firmware init failed on rproc (%d)\n", ret);
+		goto err_load;
+	}
+
+	printf("Remoteproc 2 started successfully\n");
+
+	return;
+
+err_load:
+	rproc_reset(2);
+}
+#endif
Signature · 1 line
2.17.1
author
#7 lore raw

PATCH v5 4/10 armv7R: K3: r5_mpu: Enable execute permission for MCU0 BTCM

In reply to Keerthy

Enable execute permission for mcu_r5fss0_core0 BTCM so that we can jump to a firmware directly from SPL.

---
 arch/arm/mach-k3/r5_mpu.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/mach-k3/r5_mpu.c +3 -1
index ee076ed877..3d2ff6775a 100644
@@ -26,7 +26,9 @@ struct mpu_region_config k3_mpu_regions[16] = {
 	/* U-Boot's code area marking it as WB and Write allocate */
 	{CONFIG_SYS_SDRAM_BASE, REGION_2, XN_DIS, PRIV_RW_USR_RW,
 	 O_I_WB_RD_WR_ALLOC, REGION_2GB},
-	{0x0, 3, 0x0, 0x0, 0x0, 0x0},
+	/* mcu_r5fss0_core0 BTCM area marking it as WB and Write allocate. */
+	{0x41010000, 3, XN_DIS, PRIV_RW_USR_RW, O_I_WB_RD_WR_ALLOC,
+	 REGION_8MB},
 	{0x0, 4, 0x0, 0x0, 0x0, 0x0},
 	{0x0, 5, 0x0, 0x0, 0x0, 0x0},
 	{0x0, 6, 0x0, 0x0, 0x0, 0x0},
Signature · 1 line
2.17.1
author
#8 lore raw

PATCH v5 5/10 armv7R: K3: Add support for jumping to firmware

In reply to Keerthy

MCU Domain rf50 is currently shutting down after loading the ATF. Load elf firmware and jump to firmware post loading ATF.

ROM doesn't enable ATCM memory, so make sure that firmware that is being loaded doesn't use ATCM memory or override SPL.

---
 arch/arm/mach-k3/common.c | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)
arch/arm/mach-k3/common.c +16 -6
index bddb62ea5e..5c5eedb6eb 100644
@@ -132,8 +132,10 @@ __weak void start_non_linux_remote_cores(void)
 
 void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)
 {
+	typedef void __noreturn (*image_entry_noargs_t)(void);
 	struct ti_sci_handle *ti_sci = get_ti_sci_handle();
-	int ret;
+	u32 loadaddr = 0;
+	int ret, size;
 
 	/* Release all the exclusive devices held by SPL before starting ATF */
 	ti_sci->ops.dev_ops.release_exclusive_devices(ti_sci);
@@ -144,6 +146,9 @@ void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)
 
 	init_env();
 	start_non_linux_remote_cores();
+	size = load_firmware("name_mcur5f0_0fw", "addr_mcur5f0_0load",
+			     &loadaddr);
+
 
 	/*
 	 * It is assumed that remoteproc device 1 is the corresponding
@@ -159,13 +164,18 @@ void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)
 	ret = rproc_start(1);
 	if (ret)
 		panic("%s: ATF failed to start on rproc (%d)\n", __func__, ret);
+	if (!(size > 0 && valid_elf_image(loadaddr))) {
+		debug("Shutting down...\n");
+		release_resources_for_core_shutdown();
+
+		while (1)
+			asm volatile("wfe");
+	}
 
-	debug("Releasing resources...\n");
-	release_resources_for_core_shutdown();
+	image_entry_noargs_t image_entry =
+		(image_entry_noargs_t)load_elf_image_phdr(loadaddr);
 
-	debug("Finalizing core shutdown...\n");
-	while (1)
-		asm volatile("wfe");
+	image_entry();
 }
 #endif
 
Signature · 1 line
2.17.1
author
#9 lore raw

PATCH v5 6/10 arm: dts: k3-j721e-r5-u-boot: Add fs_loader node

In reply to Keerthy

Add fs_loader node which will be needed for loading firmwares from the boot media/filesystem.

---
 .../dts/k3-j721e-r5-common-proc-board-u-boot.dtsi | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 arch/arm/dts/k3-j721e-r5-common-proc-board-u-boot.dtsi
arch/arm/dts/k3-j721e-r5-common-proc-board-u-boot.dtsi new file +15 -0
new file mode 100644
index 0000000000..f98be993e8
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2020 Texas Instruments Incorporated - http://www.ti.com/
+ */
+
+/ {
+	chosen {
+		firmware-loader = &fs_loader0;
+	};
+
+	fs_loader0: fs_loader at 0 {
+		u-boot,dm-pre-reloc;
+		compatible = "u-boot,fs-loader";
+	};
+};
Signature · 1 line
2.17.1
#10 lore raw

PATCH v5 6/10 arm: dts: k3-j721e-r5-u-boot: Add fs_loader node

Quoted 4 lines · Keerthy

Add fs_loader node which will be needed for loading firmwares from the boot media/filesystem.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200129/17c0beb1/attachment.sig>
author
#11 lore raw

PATCH v5 7/10 arm: dts: k3-j721e-r5: Enable r5fss0 cluster in SPL

In reply to Keerthy

Enable MAIN domain r5fss0 cluster and its core0 in R5 spl.

---
 .../dts/k3-j721e-r5-common-proc-board-u-boot.dtsi    | 12 ++++++++++++
 arch/arm/dts/k3-j721e-r5-common-proc-board.dts       |  2 ++
 2 files changed, 14 insertions(+)
arch/arm/dts/k3-j721e-r5-common-proc-board-u-boot.dtsi +12 -0
index f98be993e8..526f42e3a9 100644
@@ -13,3 +13,15 @@
 		compatible = "u-boot,fs-loader";
 	};
 };
+
+&main_r5fss0 {
+	u-boot,dm-spl;
+};
+
+&main_r5fss0_core0 {
+	u-boot,dm-spl;
+};
+
+&main_r5fss0_core1 {
+	u-boot,dm-spl;
+};
arch/arm/dts/k3-j721e-r5-common-proc-board.dts +2 -0
index 1f14d71438..ba2a312602 100644
@@ -13,6 +13,8 @@
 	aliases {
 		remoteproc0 = &sysctrler;
 		remoteproc1 = &a72_0;
+		remoteproc2 = &main_r5fss0_core0;
+		remoteproc3 = &main_r5fss0_core1;
 	};
 
 	chosen {
Signature · 1 line
2.17.1
#12 lore raw

PATCH v5 7/10 arm: dts: k3-j721e-r5: Enable r5fss0 cluster in SPL

Quoted 3 lines · Keerthy

Enable MAIN domain r5fss0 cluster and its core0 in R5 spl.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200129/0a92a33d/attachment.sig>
author
#13 lore raw

PATCH v5 8/10 include: configs: j721e_evm: Add env variables for mcu_r5fss0_core0 & main_r5fss0_core0

In reply to Keerthy

Add env variables for mcu_r5fss0_core0 & main_r5fss0_core0 firmware loadaddr and name.

---
 include/configs/j721e_evm.h | 4 ++++
 1 file changed, 4 insertions(+)
include/configs/j721e_evm.h +4 -0
index 4371c471e5..fc73a9c932 100644
@@ -88,6 +88,10 @@
 	"mmcdev=1\0"							\
 	"bootpart=1:2\0"						\
 	"bootdir=/boot\0"						\
+	"addr_mainr5f0_0load=88000000\0"					\
+	"name_mainr5f0_0fw=/lib/firmware/j7-main-r5f0_0-fw\0"		\
+	"addr_mcur5f0_0load=89000000\0"					\
+	"name_mcur5f0_0fw=/lib/firmware/j7-mcu-r5f0_0-fw\0"		\
 	"rd_spec=-\0"							\
 	"init_mmc=run args_all args_mmc\0"				\
 	"get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}\0" \
Signature · 1 line
2.17.1
author
#14 lore raw

PATCH v5 9/10 configs: j721e_evm_r5: Enable R5F remoteproc support

In reply to Keerthy

Enable R5F remoteproc support in R5 defconfig so that R5s can be started in SPL. While at it enable the SPL_FS_EXT4 config option to load the firmwares from file system.

---
 configs/j721e_evm_r5_defconfig | 2 ++
 1 file changed, 2 insertions(+)
configs/j721e_evm_r5_defconfig +2 -0
index d5e9fdd089..36fb71b84d 100644
@@ -28,6 +28,7 @@ CONFIG_SPL_EARLY_BSS=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
 CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x400
 CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_SPL_FS_EXT4=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_DM_MAILBOX=y
 CONFIG_SPL_DM_RESET=y
@@ -99,6 +100,7 @@ CONFIG_SPL_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_TPS65941=y
 CONFIG_K3_SYSTEM_CONTROLLER=y
 CONFIG_REMOTEPROC_TI_K3_ARM64=y
+CONFIG_REMOTEPROC_TI_K3_R5F=y
 CONFIG_DM_RESET=y
 CONFIG_RESET_TI_SCI=y
 CONFIG_DM_SERIAL=y
Signature · 1 line
2.17.1
author
#15 lore raw

PATCH v5 10/10 configs: j721e_evm_r5_defconfig: Remove saving ENV in eMMC

In reply to Keerthy

Remove saving ENV in eMMC in R5 as the power domains are not setup. Environment in eMMC cannot be read if we do not boot from eMMC.

---
 configs/j721e_evm_r5_defconfig | 4 ----
 1 file changed, 4 deletions(-)
configs/j721e_evm_r5_defconfig +0 -4
index 36fb71b84d..39e32caec2 100644
@@ -7,7 +7,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x70000
 CONFIG_SOC_K3_J721E=y
 CONFIG_TARGET_J721E_R5_EVM=y
 CONFIG_ENV_SIZE=0x20000
-CONFIG_ENV_OFFSET=0x680000
 CONFIG_DM_GPIO=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
@@ -54,9 +53,6 @@ CONFIG_CMD_FAT=y
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="k3-j721e-r5-common-proc-board"
-CONFIG_ENV_IS_IN_MMC=y
-CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
-CONFIG_ENV_OFFSET_REDUND=0x700000
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM=y
 CONFIG_SPL_DM=y
Signature · 1 line
2.17.1
#16 lore raw

v5 cover Add support for loading main_r5fss0_core0

In reply to Keerthy
Quoted 8 lines · Keerthy

This patch series enables mcu_r5fss0_core0 & main_r5fss0_core0. Tested for firmware loading and execution on J721e.

Changes in v5:

* Moved the fs_loader node under r5-common-proc-board-u-boot.dtsi
* Added more information on the envnowhere patch.
* Added help LIB_ELF option and removed user configurable description.

There are many build errors with this series.

https://travis-ci.org/lokeshvutla/u-boot/builds/642979303

Thanks and regards,
Lokesh

Quoted 46 lines

Changes in v4:

* Changed env variable names, config names and enhanced commit logs.

Changes in v3:

* Removed saving env in MMC and fixed env saving in SPL when nowhere option is set.

Changes in v2:

* Factored out all the generic elf handling functions under lib/elf.c

Keerthy (10):
env: nowhere: set default enviroment
lib: elf: Move the generic elf loading/validating functions to lib
arm: k3: Add support for loading non linux remote cores
armv7R: K3: r5_mpu: Enable execute permission for MCU0 BTCM
armv7R: K3: Add support for jumping to firmware
arm: dts: k3-j721e-r5-u-boot: Add fs_loader node
arm: dts: k3-j721e-r5: Enable r5fss0 cluster in SPL
include: configs: j721e_evm: Add env variables for mcu_r5fss0_core0 &

    main_r5fss0_core0

configs: j721e_evm_r5: Enable R5F remoteproc support
configs: j721e_evm_r5_defconfig: Remove saving ENV in eMMC

 .../k3-j721e-r5-common-proc-board-u-boot.dtsi |  27 ++
 .../arm/dts/k3-j721e-r5-common-proc-board.dts |   2 +
 arch/arm/mach-k3/common.c                     | 106 +++++++-
 arch/arm/mach-k3/common.h                     |   2 +
 arch/arm/mach-k3/j721e_init.c                 |  34 +++
 arch/arm/mach-k3/r5_mpu.c                     |   4 +-
 cmd/Kconfig                                   |   1 +
 cmd/elf.c                                     | 229 ----------------
 configs/j721e_evm_r5_defconfig                |   6 +-
 env/nowhere.c                                 |   1 +
 include/configs/j721e_evm.h                   |   4 +
 include/elf.h                                 |   4 +
 lib/Kconfig                                   |   6 +
 lib/Makefile                                  |   1 +
 lib/elf.c                                     | 256 ++++++++++++++++++
 15 files changed, 438 insertions(+), 245 deletions(-)
 create mode 100644 arch/arm/dts/k3-j721e-r5-common-proc-board-u-boot.dtsi
 create mode 100644 lib/elf.c
author
#17 lore raw

v5 cover Add support for loading main_r5fss0_core0

Quoted 8 lines · Lokesh Vutla
Quoted 5 lines · Keerthy

This patch series enables mcu_r5fss0_core0 & main_r5fss0_core0. Tested for firmware loading and execution on J721e.

Changes in v5:

Quoted 7 lines
Quoted 3 lines

* Moved the fs_loader node under r5-common-proc-board-u-boot.dtsi
* Added more information on the envnowhere patch.
* Added help LIB_ELF option and removed user configurable description.

There are many build errors with this series.

https://travis-ci.org/lokeshvutla/u-boot/builds/642979303

Ah there is a static declaration of load_elf_image_phdr in arch/arm/mach-imx/imx_bootaux.c

Should i send a fix patch alone on top?

Quoted 50 lines

Thanks and regards,
Lokesh

Quoted 46 lines

Changes in v4:

* Changed env variable names, config names and enhanced commit logs.

Changes in v3:

* Removed saving env in MMC and fixed env saving in SPL when nowhere option is set.

Changes in v2:

* Factored out all the generic elf handling functions under lib/elf.c

Keerthy (10):
env: nowhere: set default enviroment
lib: elf: Move the generic elf loading/validating functions to lib
arm: k3: Add support for loading non linux remote cores
armv7R: K3: r5_mpu: Enable execute permission for MCU0 BTCM
armv7R: K3: Add support for jumping to firmware
arm: dts: k3-j721e-r5-u-boot: Add fs_loader node
arm: dts: k3-j721e-r5: Enable r5fss0 cluster in SPL
include: configs: j721e_evm: Add env variables for mcu_r5fss0_core0 &

     main_r5fss0_core0

configs: j721e_evm_r5: Enable R5F remoteproc support
configs: j721e_evm_r5_defconfig: Remove saving ENV in eMMC

  .../k3-j721e-r5-common-proc-board-u-boot.dtsi |  27 ++
  .../arm/dts/k3-j721e-r5-common-proc-board.dts |   2 +
  arch/arm/mach-k3/common.c                     | 106 +++++++-
  arch/arm/mach-k3/common.h                     |   2 +
  arch/arm/mach-k3/j721e_init.c                 |  34 +++
  arch/arm/mach-k3/r5_mpu.c                     |   4 +-
  cmd/Kconfig                                   |   1 +
  cmd/elf.c                                     | 229 ----------------
  configs/j721e_evm_r5_defconfig                |   6 +-
  env/nowhere.c                                 |   1 +
  include/configs/j721e_evm.h                   |   4 +
  include/elf.h                                 |   4 +
  lib/Kconfig                                   |   6 +
  lib/Makefile                                  |   1 +
  lib/elf.c                                     | 256 ++++++++++++++++++
  15 files changed, 438 insertions(+), 245 deletions(-)

create mode 100644 arch/arm/dts/k3-j721e-r5-common-proc-board-u-boot.dtsi create mode 100644 lib/elf.c

#18 lore raw

v5 cover Add support for loading main_r5fss0_core0

Quoted 15 lines · Keerthy
Quoted 12 lines · Lokesh Vutla
Quoted 8 lines · Keerthy

This patch series enables mcu_r5fss0_core0 & main_r5fss0_core0. Tested for firmware loading and execution on J721e.

Changes in v5:

* Moved the fs_loader node under r5-common-proc-board-u-boot.dtsi
* Added more information on the envnowhere patch.
* Added help LIB_ELF option and removed user configurable description.

Quoted 8 lines
Quoted 3 lines

There are many build errors with this series.

https://travis-ci.org/lokeshvutla/u-boot/builds/642979303

Ah there is a static declaration of load_elf_image_phdr in arch/arm/mach-imx/imx_bootaux.c

Should i send a fix patch alone on top?

You should integrate reworking it into your series and please CC Stefano Babic and Fabio Estevam and Igor Opaniuk for testing / review. Thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200129/04c30a37/attachment.sig>