Skip to contentSkip to conversation

arm: mach-k3: Initial support for Texas Instrument's J7200 Platform

PATCH Superseded Lokesh Vutla 3 participants 30 messages Jul 27, 2020 – Aug 5, 2020

Subsystems (2)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

v2 cover arm: mach-k3: Initial support for Texas Instrument's J7200 Platform

This series adds initial support for latest new SoC, J7200, from Texas Instruments.

The J7200 SoC is a part of the K3 Multicore SoC architecture platform. It is targeted for for automotive gateway, vehicle compute systems, Vehicle-to-Vehicle (V2V) and Vehicle-to-Everything (V2X) applications. The SoC aims to meet the complex processing needs of modern embedded products.

See J7200 Technical Reference Manual (SPRUIU1, June 2020) for further details: https://www.ti.com/lit/pdf/spruiu1

Changes since v1:
- Updated compatible for sdhci
- Enabled CONFIG_OF_BOARD_SETUP for fixuping up msmc dt node.
- Split R5 dts and A72 dts

Dave Gerlach (1):
arm: dts: k3-j7200: Add R5 specific dts support

Jean-Jacques Hiblot (1):
arm: mach-k3: Fix platform hang when SPL_MULTI_DTB_FIT is not enabled

Lokesh Vutla (15):
board: ti: board_detect: Add stub functions for EEPROM detection apis
board: ti: j721e: Probe eeprom only when CONFIG_TI_I2C_BOARD_DETECT is
defined
arm: mach-k3: Move mmr_unlock to a common location
arm: mach-k3: sysfw-loader: Add support for rom loading sysfw image
arm: mach-k3: j721e: Add detection for j721e
arm: mach-k3: j721e: Fix unlocking control module registers
arm: mach-k3: j7200: Add support for SOC detection
arm: mach-k3: j7200: Add support for storing extended boot info from
ROM
arm: mach-k3: j7200: Detect if ROM has already loaded sysfw
board: ti: j7200: Introduce support for j7200 build targets
board: ti: j7200: Add board detection support for j7200
ram: k3-j721e: Relax version checks for memory controller
arm: dts: k3-j7200: Add dts support
configs: j7200_evm_r5: Add initial support
configs: j7200_evm_a72: Add Initial support

Suman Anna (1):
board: ti: j721e: Update fdt fixup logic for interconnect nodes

 arch/arm/dts/Makefile                         |    4 +-
 .../k3-j7200-common-proc-board-u-boot.dtsi    |   92 +
 arch/arm/dts/k3-j7200-common-proc-board.dts   |   94 +
 arch/arm/dts/k3-j7200-ddr-evm-lp4-1600.dtsi   | 2195 +++++++++++++++++
 arch/arm/dts/k3-j7200-main.dtsi               |  313 +++
 arch/arm/dts/k3-j7200-mcu-wakeup.dtsi         |  117 +
 .../arm/dts/k3-j7200-r5-common-proc-board.dts |  199 ++
 arch/arm/dts/k3-j7200-som-p0.dtsi             |   29 +
 arch/arm/dts/k3-j7200.dtsi                    |  175 ++
 arch/arm/mach-k3/am6_init.c                   |   12 +-
 arch/arm/mach-k3/common.c                     |   38 +
 arch/arm/mach-k3/common.h                     |    4 +
 arch/arm/mach-k3/config.mk                    |    8 +-
 arch/arm/mach-k3/include/mach/hardware.h      |    7 +
 .../arm/mach-k3/include/mach/j721e_hardware.h |    3 +
 arch/arm/mach-k3/include/mach/sys_proto.h     |    3 +
 arch/arm/mach-k3/include/mach/sysfw-loader.h  |    4 +-
 arch/arm/mach-k3/j721e_init.c                 |   30 +-
 arch/arm/mach-k3/sysfw-loader.c               |   56 +-
 board/ti/common/board_detect.h                |   13 +
 board/ti/j721e/Kconfig                        |   53 +
 board/ti/j721e/evm.c                          |   25 +-
 configs/j7200_evm_a72_defconfig               |  172 ++
 configs/j7200_evm_r5_defconfig                |  126 +
 drivers/ram/k3-j721e/lpddr4.c                 |   16 +-
 25 files changed, 3719 insertions(+), 69 deletions(-)
 create mode 100644 arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi
 create mode 100644 arch/arm/dts/k3-j7200-common-proc-board.dts
 create mode 100644 arch/arm/dts/k3-j7200-ddr-evm-lp4-1600.dtsi
 create mode 100644 arch/arm/dts/k3-j7200-main.dtsi
 create mode 100644 arch/arm/dts/k3-j7200-mcu-wakeup.dtsi
 create mode 100644 arch/arm/dts/k3-j7200-r5-common-proc-board.dts
 create mode 100644 arch/arm/dts/k3-j7200-som-p0.dtsi
 create mode 100644 arch/arm/dts/k3-j7200.dtsi
 create mode 100644 configs/j7200_evm_a72_defconfig
 create mode 100644 configs/j7200_evm_r5_defconfig
Signature · 1 line
2.27.0
#1 lore raw

PATCH v2 1/18 board: ti: board_detect: Add stub functions for EEPROM detection apis

Current usage of eeprom apis produce a build failure when CONFIG_TI_I2C_BOARD_DETECT is not defined. Add stub function for these apis to avoid build failures.

---
 board/ti/common/board_detect.h | 13 +++++++++++++
 1 file changed, 13 insertions(+)
board/ti/common/board_detect.h +13 -0
index 9f75b5c004..de7cb52dfc 100644
@@ -311,6 +311,7 @@ int __maybe_unused ti_i2c_eeprom_am6_get(int bus_addr, int dev_addr,
  */
 int __maybe_unused ti_i2c_eeprom_am6_get_base(int bus_addr, int dev_addr);
 
+#ifdef CONFIG_TI_I2C_BOARD_DETECT
 /**
  * board_ti_is() - Board detection logic for TI EVMs
  * @name_tag:	Tag used in eeprom for the board
@@ -454,5 +455,17 @@ bool board_ti_was_eeprom_read(void);
  * Return: 0 if all went fine, else return error.
  */
 int ti_i2c_eeprom_am_set(const char *name, const char *rev);
+#else
+static inline bool board_ti_is(char *name_tag) { return false; };
+static inline bool board_ti_k3_is(char *name_tag) { return false; };
+static inline bool board_ti_rev_is(char *rev_tag, int cmp_len)
+{ return false; };
+static inline char *board_ti_get_rev(void) { return NULL; };
+static inline char *board_ti_get_config(void) { return NULL; };
+static inline char *board_ti_get_name(void) { return NULL; };
+static inline bool board_ti_was_eeprom_read(void) { return false; };
+static inline int ti_i2c_eeprom_am_set(const char *name, const char *rev)
+{ return -EINVAL; };
+#endif
 
 #endif	/* __BOARD_DETECT_H */
Signature · 1 line
2.27.0
#2 lore raw

PATCH v2 2/18 board: ti: j721e: Probe eeprom only when CONFIG_TI_I2C_BOARD_DETECT is defined

In reply to Lokesh Vutla

Guard all eeprom probe with TI_I2C_BOARD_DETECT to avoid reading eeprom when eeprom is not available

---
 arch/arm/mach-k3/j721e_init.c |  3 ++-
 board/ti/j721e/evm.c          | 16 +++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)
arch/arm/mach-k3/j721e_init.c +2 -1
index f9454e3273..5ec62a92f8 100644
@@ -208,7 +208,8 @@ void board_init_f(ulong dummy)
 	k3_sysfw_print_ver();
 
 	/* Perform EEPROM-based board detection */
-	do_board_detect();
+	if (IS_ENABLED(CONFIG_TI_I2C_BOARD_DETECT))
+		do_board_detect();
 
 #if defined(CONFIG_CPU_V7R) && defined(CONFIG_K3_AVS0)
 	ret = uclass_get_device_by_driver(UCLASS_MISC, DM_GET_DRIVER(k3_avs),
board/ti/j721e/evm.c +11 -5
index a1e8fe59c4..7199d11e95 100644
@@ -100,6 +100,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)
 }
 #endif
 
+#ifdef CONFIG_TI_I2C_BOARD_DETECT
 int do_board_detect(void)
 {
 	int ret;
@@ -336,14 +337,17 @@ static int probe_daughtercards(void)
 
 	return 0;
 }
+#endif
 
 int board_late_init(void)
 {
-	setup_board_eeprom_env();
-	setup_serial();
+	if (IS_ENABLED(CONFIG_TI_I2C_BOARD_DETECT)) {
+		setup_board_eeprom_env();
+		setup_serial();
 
-	/* Check for and probe any plugged-in daughtercards */
-	probe_daughtercards();
+		/* Check for and probe any plugged-in daughtercards */
+		probe_daughtercards();
+	}
 
 	return 0;
 }
@@ -355,7 +359,9 @@ void spl_board_init(void)
 	int ret;
 #endif
 
-	probe_daughtercards();
+	if (IS_ENABLED(CONFIG_TARGET_J721E_A72_EVM) &&
+	    IS_ENABLED(CONFIG_TI_I2C_BOARD_DETECT))
+		probe_daughtercards();
 
 #ifdef CONFIG_ESM_K3
 	if (board_ti_k3_is("J721EX-PM2-SOM")) {
Signature · 1 line
2.27.0
#3 lore raw

PATCH v2 3/18 board: ti: j721e: Update fdt fixup logic for interconnect nodes

In reply to Lokesh Vutla

From: Suman Anna <[email protected]>

The DT nodes on J721E SoCs currently use a node name "interconnect" for the various interconnects. This name is not following the DT schema, and should simply be "bus". Update the fdt fixup logic to use both the current and the expected corrected path names so that this logic won't be broken with newer kernels.

---
 board/ti/j721e/evm.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
board/ti/j721e/evm.c +4 -1
index 7199d11e95..86e7cd4051 100644
@@ -92,7 +92,10 @@ int ft_board_setup(void *blob, struct bd_info *bd)
 {
 	int ret;
 
-	ret = fdt_fixup_msmc_ram(blob, "/interconnect at 100000", "sram at 70000000");
+	ret = fdt_fixup_msmc_ram(blob, "/bus at 100000", "sram at 70000000");
+	if (ret < 0)
+		ret = fdt_fixup_msmc_ram(blob, "/interconnect at 100000",
+					 "sram@70000000");
 	if (ret)
 		printf("%s: fixing up msmc ram failed %d\n", __func__, ret);
 
Signature · 1 line
2.27.0
#4 lore raw

PATCH v2 4/18 arm: mach-k3: Fix platform hang when SPL_MULTI_DTB_FIT is not enabled

In reply to Lokesh Vutla

From: Jean-Jacques Hiblot <[email protected]>

If SPL_MULTI_DTB_FIT is not enabled, then CONFIG_SPL_OF_LIST is not defined And in turn tispl.bin ends up not embedding any DTB.
Fixing it by using CONFIG_DEFAULT_DEVICE_TREE if SPL_OF_LIST is empty.

---
 arch/arm/mach-k3/config.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
arch/arm/mach-k3/config.mk +7 -1
index f7afef610c..d20aceb3c8 100644
@@ -58,10 +58,16 @@ SPL_ITS := u-boot-spl-k3.its
 ALL-y	+= tispl.bin
 endif
 
+ifeq ($(CONFIG_SPL_OF_LIST),)
+LIST_OF_DTB := $(CONFIG_DEFAULT_DEVICE_TREE)
+else
+LIST_OF_DTB := $(CONFIG_SPL_OF_LIST)
+endif
+
 quiet_cmd_k3_mkits = MKITS   $@
 cmd_k3_mkits = \
 	$(srctree)/tools/k3_fit_atf.sh \
-	$(patsubst %,$(obj)/dts/%.dtb,$(subst ",,$(CONFIG_SPL_OF_LIST))) > $@
+	$(patsubst %,$(obj)/dts/%.dtb,$(subst ",,$(LIST_OF_DTB))) > $@
 
 $(SPL_ITS): FORCE
 	$(call cmd,k3_mkits)
Signature · 1 line
2.27.0
#5 lore raw

PATCH v2 5/18 arm: mach-k3: Move mmr_unlock to a common location

In reply to Lokesh Vutla

mmr_unlock api is common for all k3 devices. Move it to a common location.

---
 arch/arm/mach-k3/am6_init.c   | 10 ----------
 arch/arm/mach-k3/common.c     | 10 ++++++++++
 arch/arm/mach-k3/common.h     |  1 +
 arch/arm/mach-k3/j721e_init.c | 10 ----------
 4 files changed, 11 insertions(+), 20 deletions(-)
arch/arm/mach-k3/am6_init.c +0 -10
index 516a02e8a8..abdec76d73 100644
@@ -41,16 +41,6 @@ struct fwl_data main_cbass_fwls[] = {
 #endif
 #endif
 
-static void mmr_unlock(u32 base, u32 partition)
-{
-	/* Translate the base address */
-	phys_addr_t part_base = base + partition * CTRL_MMR0_PARTITION_SIZE;
-
-	/* Unlock the requested partition if locked using two-step sequence */
-	writel(CTRLMMR_LOCK_KICK0_UNLOCK_VAL, part_base + CTRLMMR_LOCK_KICK0);
-	writel(CTRLMMR_LOCK_KICK1_UNLOCK_VAL, part_base + CTRLMMR_LOCK_KICK1);
-}
-
 static void ctrl_mmr_unlock(void)
 {
 	/* Unlock all WKUP_CTRL_MMR0 module registers */
arch/arm/mach-k3/common.c +10 -0
index 63bf060616..eb72451d06 100644
@@ -61,6 +61,16 @@ void k3_sysfw_print_ver(void)
 	       ti_sci->version.firmware_revision, fw_desc);
 }
 
+void mmr_unlock(phys_addr_t base, u32 partition)
+{
+	/* Translate the base address */
+	phys_addr_t part_base = base + partition * CTRL_MMR0_PARTITION_SIZE;
+
+	/* Unlock the requested partition if locked using two-step sequence */
+	writel(CTRLMMR_LOCK_KICK0_UNLOCK_VAL, part_base + CTRLMMR_LOCK_KICK0);
+	writel(CTRLMMR_LOCK_KICK1_UNLOCK_VAL, part_base + CTRLMMR_LOCK_KICK1);
+}
+
 DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_K3_EARLY_CONS
arch/arm/mach-k3/common.h +1 -0
index 94cdcb56ad..e8cc3daac1 100644
@@ -28,3 +28,4 @@ void start_non_linux_remote_cores(void);
 int load_firmware(char *name_fw, char *name_loadaddr, u32 *loadaddr);
 void k3_sysfw_print_ver(void);
 void spl_enable_dcache(void);
+void mmr_unlock(phys_addr_t base, u32 partition);
arch/arm/mach-k3/j721e_init.c +0 -10
index 5ec62a92f8..2010cab1d1 100644
@@ -64,16 +64,6 @@ struct fwl_data cbass_hc_cfg0_fwls[] = {
 #endif
 #endif
 
-static void mmr_unlock(u32 base, u32 partition)
-{
-	/* Translate the base address */
-	phys_addr_t part_base = base + partition * CTRL_MMR0_PARTITION_SIZE;
-
-	/* Unlock the requested partition if locked using two-step sequence */
-	writel(CTRLMMR_LOCK_KICK0_UNLOCK_VAL, part_base + CTRLMMR_LOCK_KICK0);
-	writel(CTRLMMR_LOCK_KICK1_UNLOCK_VAL, part_base + CTRLMMR_LOCK_KICK1);
-}
-
 static void ctrl_mmr_unlock(void)
 {
 	/* Unlock all WKUP_CTRL_MMR0 module registers */
Signature · 1 line
2.27.0
#6 lore raw

PATCH v2 5/18 arm: mach-k3: Move mmr_unlock to a common location

Quoted 4 lines · Lokesh Vutla

mmr_unlock api is common for all k3 devices. Move it to a common location.

Quoted 80 lines
---
  arch/arm/mach-k3/am6_init.c   | 10 ----------
  arch/arm/mach-k3/common.c     | 10 ++++++++++
  arch/arm/mach-k3/common.h     |  1 +
  arch/arm/mach-k3/j721e_init.c | 10 ----------
  4 files changed, 11 insertions(+), 20 deletions(-)
arch/arm/mach-k3/am6_init.c +0 -10
index 516a02e8a8..abdec76d73 100644
@@ -41,16 +41,6 @@ struct fwl_data main_cbass_fwls[] = {
  #endif
  #endif
 
-static void mmr_unlock(u32 base, u32 partition)
-{
-	/* Translate the base address */
-	phys_addr_t part_base = base + partition * CTRL_MMR0_PARTITION_SIZE;
-
-	/* Unlock the requested partition if locked using two-step sequence */
-	writel(CTRLMMR_LOCK_KICK0_UNLOCK_VAL, part_base + CTRLMMR_LOCK_KICK0);
-	writel(CTRLMMR_LOCK_KICK1_UNLOCK_VAL, part_base + CTRLMMR_LOCK_KICK1);
-}
-
  static void ctrl_mmr_unlock(void)
  {
  	/* Unlock all WKUP_CTRL_MMR0 module registers */
arch/arm/mach-k3/common.c +10 -0
index 63bf060616..eb72451d06 100644
@@ -61,6 +61,16 @@ void k3_sysfw_print_ver(void)
  	       ti_sci->version.firmware_revision, fw_desc);
  }
 
+void mmr_unlock(phys_addr_t base, u32 partition)
+{
+	/* Translate the base address */
+	phys_addr_t part_base = base + partition * CTRL_MMR0_PARTITION_SIZE;
+
+	/* Unlock the requested partition if locked using two-step sequence */
+	writel(CTRLMMR_LOCK_KICK0_UNLOCK_VAL, part_base + CTRLMMR_LOCK_KICK0);
+	writel(CTRLMMR_LOCK_KICK1_UNLOCK_VAL, part_base + CTRLMMR_LOCK_KICK1);
+}
+
  DECLARE_GLOBAL_DATA_PTR;
 
  #ifdef CONFIG_K3_EARLY_CONS
arch/arm/mach-k3/common.h +1 -0
index 94cdcb56ad..e8cc3daac1 100644
@@ -28,3 +28,4 @@ void start_non_linux_remote_cores(void);
  int load_firmware(char *name_fw, char *name_loadaddr, u32 *loadaddr);
  void k3_sysfw_print_ver(void);
  void spl_enable_dcache(void);
+void mmr_unlock(phys_addr_t base, u32 partition);
arch/arm/mach-k3/j721e_init.c +0 -10
index 5ec62a92f8..2010cab1d1 100644
@@ -64,16 +64,6 @@ struct fwl_data cbass_hc_cfg0_fwls[] = {
  #endif
  #endif
 
-static void mmr_unlock(u32 base, u32 partition)
-{
-	/* Translate the base address */
-	phys_addr_t part_base = base + partition * CTRL_MMR0_PARTITION_SIZE;
-
-	/* Unlock the requested partition if locked using two-step sequence */
-	writel(CTRLMMR_LOCK_KICK0_UNLOCK_VAL, part_base + CTRLMMR_LOCK_KICK0);
-	writel(CTRLMMR_LOCK_KICK1_UNLOCK_VAL, part_base + CTRLMMR_LOCK_KICK1);
-}
-
  static void ctrl_mmr_unlock(void)
  {
  	/* Unlock all WKUP_CTRL_MMR0 module registers */
#7 lore raw

PATCH v2 6/18 arm: mach-k3: sysfw-loader: Add support for rom loading sysfw image

In reply to Lokesh Vutla

Starting J7200 SoC, ROM supports for loading sysfw directly from boot image. In such cases, SPL need not load sysfw from boot media, but need to receive boot notification message from sysfw. So separate out remoteproc calls for system controller from sysfw loader and just receive the boot notification if sysfw is already loaded.

---
 arch/arm/mach-k3/am6_init.c                  |  2 +-
 arch/arm/mach-k3/include/mach/sysfw-loader.h |  4 +-
 arch/arm/mach-k3/j721e_init.c                |  2 +-
 arch/arm/mach-k3/sysfw-loader.c              | 56 +++++++++++++-------
 4 files changed, 43 insertions(+), 21 deletions(-)
arch/arm/mach-k3/am6_init.c +1 -1
index abdec76d73..4250ac355b 100644
@@ -155,7 +155,7 @@ void board_init_f(ulong dummy)
 	 * Load, start up, and configure system controller firmware while
 	 * also populating the SYSFW post-PM configuration callback hook.
 	 */
-	k3_sysfw_loader(k3_mmc_stop_clock, k3_mmc_restart_clock);
+	k3_sysfw_loader(false, k3_mmc_stop_clock, k3_mmc_restart_clock);
 
 	/* Prepare console output */
 	preloader_console_init();
arch/arm/mach-k3/include/mach/sysfw-loader.h +3 -1
index 6f5612b4fd..b23a9e821e 100644
@@ -7,6 +7,8 @@
 #ifndef _SYSFW_LOADER_H_
 #define _SYSFW_LOADER_H_
 
-void k3_sysfw_loader(void (*config_pm_pre_callback)(void), void (*config_pm_done_callback)(void));
+void k3_sysfw_loader(bool rom_loaded_sysfw,
+		     void (*config_pm_pre_callback)(void),
+		     void (*config_pm_done_callback)(void));
 
 #endif
arch/arm/mach-k3/j721e_init.c +1 -1
index 2010cab1d1..461a9d7f8f 100644
@@ -174,7 +174,7 @@ void board_init_f(ulong dummy)
 	 * callback hook, effectively switching on (or over) the console
 	 * output.
 	 */
-	k3_sysfw_loader(k3_mmc_stop_clock, k3_mmc_restart_clock);
+	k3_sysfw_loader(false, k3_mmc_stop_clock, k3_mmc_restart_clock);
 
 	/* Prepare console output */
 	preloader_console_init();
arch/arm/mach-k3/sysfw-loader.c +38 -18

86 lines not on this page · raw message

Signature · 1 line
2.27.0
#8 lore raw

PATCH v2 6/18 arm: mach-k3: sysfw-loader: Add support for rom loading sysfw image

Hi Lokesh,

Quoted 46 lines · Lokesh Vutla

Starting J7200 SoC, ROM supports for loading sysfw directly from boot image. In such cases, SPL need not load sysfw from boot media, but need to receive boot notification message from sysfw. So separate out remoteproc calls for system controller from sysfw loader and just receive the boot notification if sysfw is already loaded.

---
  arch/arm/mach-k3/am6_init.c                  |  2 +-
  arch/arm/mach-k3/include/mach/sysfw-loader.h |  4 +-
  arch/arm/mach-k3/j721e_init.c                |  2 +-
  arch/arm/mach-k3/sysfw-loader.c              | 56 +++++++++++++-------
  4 files changed, 43 insertions(+), 21 deletions(-)
arch/arm/mach-k3/am6_init.c +1 -1
index abdec76d73..4250ac355b 100644
@@ -155,7 +155,7 @@ void board_init_f(ulong dummy)
  	 * Load, start up, and configure system controller firmware while
  	 * also populating the SYSFW post-PM configuration callback hook.
  	 */
-	k3_sysfw_loader(k3_mmc_stop_clock, k3_mmc_restart_clock);
+	k3_sysfw_loader(false, k3_mmc_stop_clock, k3_mmc_restart_clock);
 
  	/* Prepare console output */
  	preloader_console_init();
arch/arm/mach-k3/include/mach/sysfw-loader.h +3 -1
index 6f5612b4fd..b23a9e821e 100644
@@ -7,6 +7,8 @@
  #ifndef _SYSFW_LOADER_H_
  #define _SYSFW_LOADER_H_
 
-void k3_sysfw_loader(void (*config_pm_pre_callback)(void), void (*config_pm_done_callback)(void));
+void k3_sysfw_loader(bool rom_loaded_sysfw,
+		     void (*config_pm_pre_callback)(void),
+		     void (*config_pm_done_callback)(void));
 
  #endif
arch/arm/mach-k3/j721e_init.c +0 -0
index 2010cab1d1..461a9d7f8f 100644

arch/arm/mach-k3/j721e_init.c void board_init_f(ulong dummy) · line 177

Quoted 5 lines
arch/arm/mach-k3/j721e_init.c +1 -1
@@ -174,7 +174,7 @@ void board_init_f(ulong dummy)
  	 * callback hook, effectively switching on (or over) the console
  	 * output.
  	 */
-	k3_sysfw_loader(k3_mmc_stop_clock, k3_mmc_restart_clock);
+	k3_sysfw_loader(false, k3_mmc_stop_clock, k3_mmc_restart_clock);

Any reason why you want to add the new argument at the front, rather than the end which is typical?

Quoted 21 lines
arch/arm/mach-k3/j721e_init.c +0 -0
  	/* Prepare console output */
  	preloader_console_init();
arch/arm/mach-k3/sysfw-loader.c +6 -0
index 513be09c68..f62bfa995c 100644
@@ -32,6 +32,12 @@ DECLARE_GLOBAL_DATA_PTR;
  #define SYSFW_CFG_RM			"rm-cfg.bin"
  #define SYSFW_CFG_SEC			"sec-cfg.bin"
 
+/*
+ * It is assumed that remoteproc device 0 is the corresponding
+ * system-controller that runs SYSFW. Make sure DT reflects the same.
+ */
+#define K3_SYSTEM_CONTROLLER_RPROC_ID	0
+
  static bool sysfw_loaded;
  static void *sysfw_load_address;
 

arch/arm/mach-k3/sysfw-loader.c static int fit_get_data_by_name(const void *fit, int images, const char *name, · line 81

Quoted 5 lines
arch/arm/mach-k3/sysfw-loader.c +2 -0
@@ -71,6 +77,26 @@ static int fit_get_data_by_name(const void *fit, int images, const char *name,
  	return fit_image_get_data(fit, node_offset, addr, size);
  }
 
+static void k3_start_system_controller(int rproc_id, bool rproc_loaded,
+				       ulong addr, ulong size)

Are you expecting the SYSTEM_CONTROLLER_RPROC_ID to be a different value from 0? Do you really need the rproc_id argument, rather than directly using it in code?

regards
Suman

Quoted 73 lines
arch/arm/mach-k3/sysfw-loader.c +30 -18
+{
+	int ret;
+
+	ret = rproc_dev_init(rproc_id);
+	if (ret)
+		panic("rproc failed to be initialized (%d)\n", ret);
+
+	if (!rproc_loaded) {
+		ret = rproc_load(rproc_id, addr, size);
+		if (ret)
+			panic("Firmware failed to start on rproc (%d)\n", ret);
+	}
+
+	ret = rproc_start(0);
+	if (ret)
+		panic("Firmware init failed on rproc (%d)\n", ret);
+}
+
  static void k3_sysfw_load_using_fit(void *fit)
  {
  	int images;
@@ -90,23 +116,9 @@ static void k3_sysfw_load_using_fit(void *fit)
  		panic("Error accessing %s node in FIT (%d)\n", SYSFW_FIRMWARE,
  		      ret);
 
-	/*
-	 * Start up system controller firmware
-	 *
-	 * It is assumed that remoteproc device 0 is the corresponding
-	 * system-controller that runs SYSFW. Make sure DT reflects the same.
-	 */
-	ret = rproc_dev_init(0);
-	if (ret)
-		panic("rproc failed to be initialized (%d)\n", ret);
-
-	ret = rproc_load(0, (ulong)sysfw_addr, (ulong)sysfw_size);
-	if (ret)
-		panic("Firmware failed to start on rproc (%d)\n", ret);
-
-	ret = rproc_start(0);
-	if (ret)
-		panic("Firmware init failed on rproc (%d)\n", ret);
+	/* Start up system controller firmware */
+	k3_start_system_controller(K3_SYSTEM_CONTROLLER_RPROC_ID, false,
+				   (ulong)sysfw_addr, (ulong)sysfw_size);
  }
 
  static void k3_sysfw_configure_using_fit(void *fit,
@@ -222,7 +234,8 @@ static void *k3_sysfw_get_spi_addr(void)
  }
  #endif
 
-void k3_sysfw_loader(void (*config_pm_pre_callback) (void),
+void k3_sysfw_loader(bool rom_loaded_sysfw,
+		     void (*config_pm_pre_callback)(void),
  		     void (*config_pm_done_callback)(void))
  {
  	struct spl_image_info spl_image = { 0 };
@@ -230,6 +243,13 @@ void k3_sysfw_loader(void (*config_pm_pre_callback) (void),
  	struct ti_sci_handle *ti_sci;
  	int ret = 0;
 
+	if (rom_loaded_sysfw) {
+		k3_start_system_controller(K3_SYSTEM_CONTROLLER_RPROC_ID,
+					   rom_loaded_sysfw, 0, 0);
+		sysfw_loaded = true;
+		return;
+	}
+
  	/* Reserve a block of aligned memory for loading the SYSFW image */
  	sysfw_load_address = memalign(ARCH_DMA_MINALIGN,
  				      CONFIG_K3_SYSFW_IMAGE_SIZE_MAX);
#9 lore raw

PATCH v2 6/18 arm: mach-k3: sysfw-loader: Add support for rom loading sysfw image

Quoted 48 lines · Suman Anna

Hi Lokesh,

Quoted 45 lines · Lokesh Vutla

Starting J7200 SoC, ROM supports for loading sysfw directly from boot image. In such cases, SPL need not load sysfw from boot media, but need to receive boot notification message from sysfw. So separate out remoteproc calls for system controller from sysfw loader and just receive the boot notification if sysfw is already loaded.

---

? arch/arm/mach-k3/am6_init.c????????????????? |? 2 +-
? arch/arm/mach-k3/include/mach/sysfw-loader.h |? 4 +-
? arch/arm/mach-k3/j721e_init.c??????????????? |? 2 +-
? arch/arm/mach-k3/sysfw-loader.c????????????? | 56 +++++++++++++-------

? 4 files changed, 43 insertions(+), 21 deletions(-)

arch/arm/mach-k3/am6_init.c +0 -0
index abdec76d73..4250ac355b 100644
@@ -155,7 +155,7 @@ void board_init_f(ulong dummy)

?????? * Load, start up, and configure system controller firmware while ?????? * also populating the SYSFW post-PM configuration callback hook. ?????? */
-??? k3_sysfw_loader(k3_mmc_stop_clock, k3_mmc_restart_clock); +??? k3_sysfw_loader(false, k3_mmc_stop_clock, k3_mmc_restart_clock); ? ????? /* Prepare console output */
????? preloader_console_init();

arch/arm/mach-k3/include/mach/sysfw-loader.h +0 -0
index 6f5612b4fd..b23a9e821e 100644
@@ -7,6 +7,8 @@

? #ifndef _SYSFW_LOADER_H_
? #define _SYSFW_LOADER_H_
? -void k3_sysfw_loader(void (*config_pm_pre_callback)(void), void (*config_pm_done_callback)(void));
+void k3_sysfw_loader(bool rom_loaded_sysfw, +???????????? void (*config_pm_pre_callback)(void), +???????????? void (*config_pm_done_callback)(void));
? ? #endif

arch/arm/mach-k3/j721e_init.c +0 -0
index 2010cab1d1..461a9d7f8f 100644
@@ -174,7 +174,7 @@ void board_init_f(ulong dummy)
Quoted 8 lines
Quoted 5 lines

?????? * callback hook, effectively switching on (or over) the console ?????? * output.
?????? */
-??? k3_sysfw_loader(k3_mmc_stop_clock, k3_mmc_restart_clock); +??? k3_sysfw_loader(false, k3_mmc_stop_clock, k3_mmc_restart_clock);

Any reason why you want to add the new argument at the front, rather than the end which is typical?

Yes this was intentional. It made more sense to get the sysfw state as a first parameter and then look for other parameters,

Quoted 19 lines
Quoted 19 lines

? ????? /* Prepare console output */
????? preloader_console_init();

arch/arm/mach-k3/sysfw-loader.c +0 -0
index 513be09c68..f62bfa995c 100644
@@ -32,6 +32,12 @@ DECLARE_GLOBAL_DATA_PTR;

? #define SYSFW_CFG_RM??????????? "rm-cfg.bin"
? #define SYSFW_CFG_SEC??????????? "sec-cfg.bin"
? +/*
+ * It is assumed that remoteproc device 0 is the corresponding
+ * system-controller that runs SYSFW. Make sure DT reflects the same.
+ */

arch/arm/mach-k3/sysfw-loader.c +2 -0
+#define K3_SYSTEM_CONTROLLER_RPROC_ID??? 0
+

? static bool sysfw_loaded;
? static void *sysfw_load_address;
? @@ -71,6 +77,26 @@ static int fit_get_data_by_name(const void *fit, int

Quoted 8 lines
Quoted 5 lines

images, const char *name,
????? return fit_image_get_data(fit, node_offset, addr, size); ? }
? +static void k3_start_system_controller(int rproc_id, bool rproc_loaded, +?????????????????????? ulong addr, ulong size)

Are you expecting the SYSTEM_CONTROLLER_RPROC_ID to be a different value from 0? Do you really need the rproc_id argument, rather than directly using it in code?

I didn't want to hardcode in multiple places and I cannot guarantee if it can change in future. So I added it as a future proof.

Thanks and regards,
Lokesh

#10 lore raw

PATCH v2 7/18 arm: mach-k3: j721e: Add detection for j721e

In reply to Lokesh Vutla

Add an api soc_is_j721e(), and use it to enable certain functionality that is available only on j721e.

---
 arch/arm/mach-k3/common.c                 | 10 ++++++++++
 arch/arm/mach-k3/include/mach/sys_proto.h |  2 ++
 arch/arm/mach-k3/j721e_init.c             |  3 +++
 3 files changed, 15 insertions(+)
arch/arm/mach-k3/common.c +10 -0
index eb72451d06..aec6c600b9 100644
@@ -355,6 +355,16 @@ int print_cpuinfo(void)
 }
 #endif
 
+bool soc_is_j721e(void)
+{
+	u32 soc;
+
+	soc = (readl(CTRLMMR_WKUP_JTAG_ID) &
+		JTAG_ID_PARTNO_MASK) >> JTAG_ID_PARTNO_SHIFT;
+
+	return soc == J721E;
+}
+
 #ifdef CONFIG_ARM64
 void board_prep_linux(bootm_headers_t *images)
 {
arch/arm/mach-k3/include/mach/sys_proto.h +2 -0
index 3c825aa3d1..48b11178c3 100644
@@ -16,4 +16,6 @@ int do_board_detect(void);
 void release_resources_for_core_shutdown(void);
 int fdt_disable_node(void *blob, char *node_path);
 
+bool soc_is_j721e(void);
+
 #endif
arch/arm/mach-k3/j721e_init.c +3 -0
index 461a9d7f8f..3b15da2d7c 100644
@@ -361,6 +361,9 @@ void start_non_linux_remote_cores(void)
 	int size = 0, ret;
 	u32 loadaddr = 0;
 
+	if (!soc_is_j721e())
+		return;
+
 	size = load_firmware("name_mainr5f0_0fw", "addr_mainr5f0_0load",
 			     &loadaddr);
 	if (size <= 0)
Signature · 1 line
2.27.0
#11 lore raw

PATCH v2 8/18 arm: mach-k3: j721e: Fix unlocking control module registers

In reply to Lokesh Vutla

In main control mmr there is no partition 4 and partition 6 is available only on J721e. Fix the same in ctrl_mmr_unlock function

---
 arch/arm/mach-k3/j721e_init.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-k3/j721e_init.c +2 -2
index 3b15da2d7c..63a31c18ce 100644
@@ -87,9 +87,9 @@ static void ctrl_mmr_unlock(void)
 	mmr_unlock(CTRL_MMR0_BASE, 1);
 	mmr_unlock(CTRL_MMR0_BASE, 2);
 	mmr_unlock(CTRL_MMR0_BASE, 3);
-	mmr_unlock(CTRL_MMR0_BASE, 4);
 	mmr_unlock(CTRL_MMR0_BASE, 5);
-	mmr_unlock(CTRL_MMR0_BASE, 6);
+	if (soc_is_j721e())
+		mmr_unlock(CTRL_MMR0_BASE, 6);
 	mmr_unlock(CTRL_MMR0_BASE, 7);
 }
 
Signature · 1 line
2.27.0
#12 lore raw

PATCH v2 8/18 arm: mach-k3: j721e: Fix unlocking control module registers

Quoted 4 lines · Lokesh Vutla

In main control mmr there is no partition 4 and partition 6 is available only on J721e. Fix the same in ctrl_mmr_unlock function

Quoted 21 lines
---
  arch/arm/mach-k3/j721e_init.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-k3/j721e_init.c +2 -2
index 3b15da2d7c..63a31c18ce 100644
@@ -87,9 +87,9 @@ static void ctrl_mmr_unlock(void)
  	mmr_unlock(CTRL_MMR0_BASE, 1);
  	mmr_unlock(CTRL_MMR0_BASE, 2);
  	mmr_unlock(CTRL_MMR0_BASE, 3);
-	mmr_unlock(CTRL_MMR0_BASE, 4);
  	mmr_unlock(CTRL_MMR0_BASE, 5);
-	mmr_unlock(CTRL_MMR0_BASE, 6);
+	if (soc_is_j721e())
+		mmr_unlock(CTRL_MMR0_BASE, 6);
  	mmr_unlock(CTRL_MMR0_BASE, 7);
  }
 
#13 lore raw

PATCH v2 9/18 arm: mach-k3: j7200: Add support for SOC detection

In reply to Lokesh Vutla

The J7200 SoC is a part of the K3 Multicore SoC architecture platform. It is targeted for automotive gateway, vehicle compute systems, Vehicle-to-Vehicle (V2V) and Vehicle-to-Everything (V2X) applications. The SoC aims to meet the complex processing needs of modern embedded products.

Some highlights of this SoC are:
* Dual Cortex-A72s in a single cluster, two clusters of lockstep capable dual Cortex-R5F MCUs and a Centralized Device Management and Security Controller (DMSC).
* Configurable L3 Cache and IO-coherent architecture with high data throughput capable distributed DMA architecture under NAVSS.
* Integrated Ethernet switch supporting up to a total of 4 external ports in addition to legacy Ethernet switch of up to 2 ports.
* Upto 1 PCIe-GEN3 controller, 1 USB3.0 Dual-role device subsystems, 20 MCANs, 3 McASP, eMMC and SD, OSPI/HyperBus memory controller, I3C and I2C, eCAP/eQEP, eHRPWM among other peripherals.
* One hardware accelerator block containing AES/DES/SHA/MD5 called SA2UL management.

See J7200 Technical Reference Manual (SPRUIU1, June 2020) for further details: https://www.ti.com/lit/pdf/spruiu1

Add support for detection J7200 SoC

---
 arch/arm/mach-k3/common.c                 | 10 ++++++++++
 arch/arm/mach-k3/common.h                 |  1 +
 arch/arm/mach-k3/include/mach/sys_proto.h |  1 +
 3 files changed, 12 insertions(+)
arch/arm/mach-k3/common.c +10 -0
index aec6c600b9..d065bdbc83 100644
@@ -365,6 +365,16 @@ bool soc_is_j721e(void)
 	return soc == J721E;
 }
 
+bool soc_is_j7200(void)
+{
+	u32 soc;
+
+	soc = (readl(CTRLMMR_WKUP_JTAG_ID) &
+		JTAG_ID_PARTNO_MASK) >> JTAG_ID_PARTNO_SHIFT;
+
+	return soc == J7200;
+}
+
 #ifdef CONFIG_ARM64
 void board_prep_linux(bootm_headers_t *images)
 {
arch/arm/mach-k3/common.h +1 -0
index e8cc3daac1..8f5a5f323a 100644
@@ -10,6 +10,7 @@
 
 #define AM65X	0xbb5a
 #define J721E	0xbb64
+#define J7200	0xbb6d
 
 #define REV_PG1_0	0
 #define REV_PG2_0	1
arch/arm/mach-k3/include/mach/sys_proto.h +1 -0
index 48b11178c3..60287b261c 100644
@@ -17,5 +17,6 @@ void release_resources_for_core_shutdown(void);
 int fdt_disable_node(void *blob, char *node_path);
 
 bool soc_is_j721e(void);
+bool soc_is_j7200(void);
 
 #endif
Signature · 1 line
2.27.0
#14 lore raw

PATCH v2 10/18 arm: mach-k3: j7200: Add support for storing extended boot info from ROM

In reply to Lokesh Vutla

Starting J7200 SoC, ROM supports for loading sysfw directly from boot image. ROM passes this information on number of images that are loaded to bootloader at certain location. Add support for storing this information before it gets corrupted.

---
 arch/arm/mach-k3/include/mach/hardware.h       | 7 +++++++
 arch/arm/mach-k3/include/mach/j721e_hardware.h | 3 +++
 arch/arm/mach-k3/j721e_init.c                  | 7 +++++--
 3 files changed, 15 insertions(+), 2 deletions(-)
arch/arm/mach-k3/include/mach/hardware.h +7 -0
index 0ad761418b..02b3df0e1b 100644
@@ -21,4 +21,11 @@
 #define JTAG_ID_PARTNO_SHIFT	12
 #define JTAG_ID_PARTNO_MASK	(0xffff << 12)
 
+#define K3_ROM_BOOT_HEADER_MAGIC	"EXTBOOT"
+
+struct rom_extended_boot_data {
+	char header[8];
+	u32 num_components;
+};
+
 #endif /* _ASM_ARCH_HARDWARE_H_ */
arch/arm/mach-k3/include/mach/j721e_hardware.h +3 -0
index 19873d6e28..b98f0a82f1 100644
@@ -51,6 +51,9 @@
 #define CTRLMMR_LOCK_KICK1				0x0100c
 #define CTRLMMR_LOCK_KICK1_UNLOCK_VAL			0xd172bc5a
 
+/* ROM HANDOFF Structure location */
+#define ROM_ENTENDED_BOOT_DATA_INFO			0x41cffb00
+
 /* MCU SCRATCHPAD usage */
 #define TI_SRAM_SCRATCH_BOARD_EEPROM_START	CONFIG_SYS_K3_MCU_SCRATCHPAD_BASE
 
arch/arm/mach-k3/j721e_init.c +5 -2
index 63a31c18ce..6246de3a26 100644
@@ -126,10 +126,13 @@ void k3_mmc_restart_clock(void)
  * it to the .data section.
  */
 u32 bootindex __attribute__((section(".data")));
+static struct rom_extended_boot_data bootdata __section(.data);
 
-static void store_boot_index_from_rom(void)
+static void store_boot_info_from_rom(void)
 {
 	bootindex = *(u32 *)(CONFIG_SYS_K3_BOOT_PARAM_TABLE_INDEX);
+	memcpy(&bootdata, (uintptr_t *)ROM_ENTENDED_BOOT_DATA_INFO,
+	       sizeof(struct rom_extended_boot_data));
 }
 
 void board_init_f(ulong dummy)
@@ -142,7 +145,7 @@ void board_init_f(ulong dummy)
 	 * Cannot delay this further as there is a chance that
 	 * K3_BOOT_PARAM_TABLE_INDEX can be over written by SPL MALLOC section.
 	 */
-	store_boot_index_from_rom();
+	store_boot_info_from_rom();
 
 	/* Make all control module registers accessible */
 	ctrl_mmr_unlock();
Signature · 1 line
2.27.0
#15 lore raw

PATCH v2 10/18 arm: mach-k3: j7200: Add support for storing extended boot info from ROM

Quoted 3 lines · Lokesh Vutla

Starting J7200 SoC, ROM supports for loading sysfw directly from boot image. ROM passes this information on number of images that are loaded to bootloader at certain location. Add support for storing this

Extra whitespace before certain. Otherwise,

Quoted 68 lines

information before it gets corrupted.

---
  arch/arm/mach-k3/include/mach/hardware.h       | 7 +++++++
  arch/arm/mach-k3/include/mach/j721e_hardware.h | 3 +++
  arch/arm/mach-k3/j721e_init.c                  | 7 +++++--
  3 files changed, 15 insertions(+), 2 deletions(-)
arch/arm/mach-k3/include/mach/hardware.h +7 -0
index 0ad761418b..02b3df0e1b 100644
@@ -21,4 +21,11 @@
  #define JTAG_ID_PARTNO_SHIFT	12
  #define JTAG_ID_PARTNO_MASK	(0xffff << 12)
 
+#define K3_ROM_BOOT_HEADER_MAGIC	"EXTBOOT"
+
+struct rom_extended_boot_data {
+	char header[8];
+	u32 num_components;
+};
+
  #endif /* _ASM_ARCH_HARDWARE_H_ */
arch/arm/mach-k3/include/mach/j721e_hardware.h +3 -0
index 19873d6e28..b98f0a82f1 100644
@@ -51,6 +51,9 @@
  #define CTRLMMR_LOCK_KICK1				0x0100c
  #define CTRLMMR_LOCK_KICK1_UNLOCK_VAL			0xd172bc5a
 
+/* ROM HANDOFF Structure location */
+#define ROM_ENTENDED_BOOT_DATA_INFO			0x41cffb00
+
  /* MCU SCRATCHPAD usage */
  #define TI_SRAM_SCRATCH_BOARD_EEPROM_START	CONFIG_SYS_K3_MCU_SCRATCHPAD_BASE
 
arch/arm/mach-k3/j721e_init.c +5 -2
index 63a31c18ce..6246de3a26 100644
@@ -126,10 +126,13 @@ void k3_mmc_restart_clock(void)
   * it to the .data section.
   */
  u32 bootindex __attribute__((section(".data")));
+static struct rom_extended_boot_data bootdata __section(.data);
 
-static void store_boot_index_from_rom(void)
+static void store_boot_info_from_rom(void)
  {
  	bootindex = *(u32 *)(CONFIG_SYS_K3_BOOT_PARAM_TABLE_INDEX);
+	memcpy(&bootdata, (uintptr_t *)ROM_ENTENDED_BOOT_DATA_INFO,
+	       sizeof(struct rom_extended_boot_data));
  }
 
  void board_init_f(ulong dummy)
@@ -142,7 +145,7 @@ void board_init_f(ulong dummy)
  	 * Cannot delay this further as there is a chance that
  	 * K3_BOOT_PARAM_TABLE_INDEX can be over written by SPL MALLOC section.
  	 */
-	store_boot_index_from_rom();
+	store_boot_info_from_rom();
 
  	/* Make all control module registers accessible */
  	ctrl_mmr_unlock();
#16 lore raw

PATCH v2 11/18 arm: mach-k3: j7200: Detect if ROM has already loaded sysfw

In reply to Lokesh Vutla

Detect if sysfw is already loaded by ROM and pass this information to sysfw loader. Based on this information sysfw loader either loads the sysfw image from boot media or just received the boot notification message form sysfw.

---
 arch/arm/mach-k3/common.c     | 8 ++++++++
 arch/arm/mach-k3/common.h     | 2 ++
 arch/arm/mach-k3/j721e_init.c | 3 ++-
 3 files changed, 12 insertions(+), 1 deletion(-)
arch/arm/mach-k3/common.c +8 -0
index d065bdbc83..7b0369ffb0 100644
@@ -71,6 +71,14 @@ void mmr_unlock(phys_addr_t base, u32 partition)
 	writel(CTRLMMR_LOCK_KICK1_UNLOCK_VAL, part_base + CTRLMMR_LOCK_KICK1);
 }
 
+bool is_rom_loaded_sysfw(struct rom_extended_boot_data *data)
+{
+	if (strncmp(data->header, K3_ROM_BOOT_HEADER_MAGIC, 7))
+		return false;
+
+	return data->num_components > 1;
+}
+
 DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_K3_EARLY_CONS
arch/arm/mach-k3/common.h +2 -0
index 8f5a5f323a..15a98fb653 100644
@@ -7,6 +7,7 @@
  */
 
 #include <asm/armv7_mpu.h>
+#include <asm/hardware.h>
 
 #define AM65X	0xbb5a
 #define J721E	0xbb64
@@ -30,3 +31,4 @@ int load_firmware(char *name_fw, char *name_loadaddr, u32 *loadaddr);
 void k3_sysfw_print_ver(void);
 void spl_enable_dcache(void);
 void mmr_unlock(phys_addr_t base, u32 partition);
+bool is_rom_loaded_sysfw(struct rom_extended_boot_data *data);
arch/arm/mach-k3/j721e_init.c +2 -1
index 6246de3a26..a36e4ed603 100644
@@ -177,7 +177,8 @@ void board_init_f(ulong dummy)
 	 * callback hook, effectively switching on (or over) the console
 	 * output.
 	 */
-	k3_sysfw_loader(false, k3_mmc_stop_clock, k3_mmc_restart_clock);
+	k3_sysfw_loader(is_rom_loaded_sysfw(&bootdata),
+			k3_mmc_stop_clock, k3_mmc_restart_clock);
 
 	/* Prepare console output */
 	preloader_console_init();
Signature · 1 line
2.27.0
#17 lore raw

PATCH v2 11/18 arm: mach-k3: j7200: Detect if ROM has already loaded sysfw

Quoted 3 lines · Lokesh Vutla

Detect if sysfw is already loaded by ROM and pass this information to sysfw loader. Based on this information sysfw loader either loads the sysfw image from boot media or just received the boot notification

%s/received/receives/

Pending the discussion on the argument list on k3_sysfw_loader(),

regards
Suman

Quoted 60 lines

message form sysfw.

---
  arch/arm/mach-k3/common.c     | 8 ++++++++
  arch/arm/mach-k3/common.h     | 2 ++
  arch/arm/mach-k3/j721e_init.c | 3 ++-
  3 files changed, 12 insertions(+), 1 deletion(-)
arch/arm/mach-k3/common.c +8 -0
index d065bdbc83..7b0369ffb0 100644
@@ -71,6 +71,14 @@ void mmr_unlock(phys_addr_t base, u32 partition)
  	writel(CTRLMMR_LOCK_KICK1_UNLOCK_VAL, part_base + CTRLMMR_LOCK_KICK1);
  }
 
+bool is_rom_loaded_sysfw(struct rom_extended_boot_data *data)
+{
+	if (strncmp(data->header, K3_ROM_BOOT_HEADER_MAGIC, 7))
+		return false;
+
+	return data->num_components > 1;
+}
+
  DECLARE_GLOBAL_DATA_PTR;
 
  #ifdef CONFIG_K3_EARLY_CONS
arch/arm/mach-k3/common.h +2 -0
index 8f5a5f323a..15a98fb653 100644
@@ -7,6 +7,7 @@
   */
 
  #include <asm/armv7_mpu.h>
+#include <asm/hardware.h>
 
  #define AM65X	0xbb5a
  #define J721E	0xbb64
@@ -30,3 +31,4 @@ int load_firmware(char *name_fw, char *name_loadaddr, u32 *loadaddr);
  void k3_sysfw_print_ver(void);
  void spl_enable_dcache(void);
  void mmr_unlock(phys_addr_t base, u32 partition);
+bool is_rom_loaded_sysfw(struct rom_extended_boot_data *data);
arch/arm/mach-k3/j721e_init.c +2 -1
index 6246de3a26..a36e4ed603 100644
@@ -177,7 +177,8 @@ void board_init_f(ulong dummy)
  	 * callback hook, effectively switching on (or over) the console
  	 * output.
  	 */
-	k3_sysfw_loader(false, k3_mmc_stop_clock, k3_mmc_restart_clock);
+	k3_sysfw_loader(is_rom_loaded_sysfw(&bootdata),
+			k3_mmc_stop_clock, k3_mmc_restart_clock);
 
  	/* Prepare console output */
  	preloader_console_init();
#18 lore raw

PATCH v2 12/18 board: ti: j7200: Introduce support for j7200 build targets

In reply to Lokesh Vutla

j7200-evm has minor differences with j721e-evm based on the IPs available in the SoC. Introduce separate build targets for j7200-evm to incorporate the differences.

---
 board/ti/j721e/Kconfig | 53 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
board/ti/j721e/Kconfig +53 -0
index e56dc53bfa..2cbe2b2481 100644
@@ -27,6 +27,26 @@ config TARGET_J721E_R5_EVM
 	imply SYS_K3_SPL_ATF
 	imply TI_I2C_BOARD_DETECT
 
+config TARGET_J7200_A72_EVM
+	bool "TI K3 based J7200 EVM running on A72"
+	select ARM64
+	select SOC_K3_J721E
+	select BOARD_LATE_INIT
+	imply TI_I2C_BOARD_DETECT
+	select SYS_DISABLE_DCACHE_OPS
+
+config TARGET_J7200_R5_EVM
+	bool "TI K3 based J7200 EVM running on R5"
+	select CPU_V7R
+	select SYS_THUMB_BUILD
+	select SOC_K3_J721E
+	select K3_LOAD_SYSFW
+	select RAM
+	select SPL_RAM
+	select K3_J721E_DDRSS
+	imply SYS_K3_SPL_ATF
+	imply TI_I2C_BOARD_DETECT
+
 endchoice
 
 if TARGET_J721E_A72_EVM
@@ -61,3 +81,36 @@ config SPL_LDSCRIPT
 source "board/ti/common/Kconfig"
 
 endif
+
+if TARGET_J7200_A72_EVM
+
+config SYS_BOARD
+       default "j721e"
+
+config SYS_VENDOR
+       default "ti"
+
+config SYS_CONFIG_NAME
+       default "j721e_evm"
+
+source "board/ti/common/Kconfig"
+
+endif
+
+if TARGET_J7200_R5_EVM
+
+config SYS_BOARD
+       default "j721e"
+
+config SYS_VENDOR
+       default "ti"
+
+config SYS_CONFIG_NAME
+       default "j721e_evm"
+
+config SPL_LDSCRIPT
+	default "arch/arm/mach-omap2/u-boot-spl.lds"
+
+source "board/ti/common/Kconfig"
+
+endif
Signature · 1 line
2.27.0
#19 lore raw

PATCH v2 12/18 board: ti: j7200: Introduce support for j7200 build targets

Hi

Quoted 15 lines · Lokesh Vutla

j7200-evm has minor differences with j721e-evm based on the IPs available in the SoC. Introduce separate build targets for j7200-evm to incorporate the differences.

---
  board/ti/j721e/Kconfig | 53 ++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 53 insertions(+)
board/ti/j721e/Kconfig +0 -0
index e56dc53bfa..2cbe2b2481 100644
@@ -27,6 +27,26 @@ config TARGET_J721E_R5_EVM
  	imply SYS_K3_SPL_ATF

board/ti/j721e/Kconfig config TARGET_J721E_R5_EVM · line 37

Quoted 10 lines
board/ti/j721e/Kconfig +8 -0
  	imply TI_I2C_BOARD_DETECT
 
+config TARGET_J7200_A72_EVM
+	bool "TI K3 based J7200 EVM running on A72"
+	select ARM64
+	select SOC_K3_J721E
+	select BOARD_LATE_INIT
+	imply TI_I2C_BOARD_DETECT
+	select SYS_DISABLE_DCACHE_OPS
+

I don't see update to:

    include/configs/j721e_evm.h          23 #ifdef CONFIG_TARGET_J721E_A72_EVM
    include/configs/j721e_evm.h         130 #ifdef CONFIG_TARGET_J721E_A72_EVM

Don't we need to update j721e_evm.h with TARGET_J7200_A72_EVM?

Regards
Vignesh

Quoted 53 lines
board/ti/j721e/Kconfig +45 -0
+config TARGET_J7200_R5_EVM
+	bool "TI K3 based J7200 EVM running on R5"
+	select CPU_V7R
+	select SYS_THUMB_BUILD
+	select SOC_K3_J721E
+	select K3_LOAD_SYSFW
+	select RAM
+	select SPL_RAM
+	select K3_J721E_DDRSS
+	imply SYS_K3_SPL_ATF
+	imply TI_I2C_BOARD_DETECT
+
  endchoice
 
  if TARGET_J721E_A72_EVM
@@ -61,3 +81,36 @@ config SPL_LDSCRIPT
  source "board/ti/common/Kconfig"
 
  endif
+
+if TARGET_J7200_A72_EVM
+
+config SYS_BOARD
+       default "j721e"
+
+config SYS_VENDOR
+       default "ti"
+
+config SYS_CONFIG_NAME
+       default "j721e_evm"
+
+source "board/ti/common/Kconfig"
+
+endif
+
+if TARGET_J7200_R5_EVM
+
+config SYS_BOARD
+       default "j721e"
+
+config SYS_VENDOR
+       default "ti"
+
+config SYS_CONFIG_NAME
+       default "j721e_evm"
+
+config SPL_LDSCRIPT
+	default "arch/arm/mach-omap2/u-boot-spl.lds"
+
+source "board/ti/common/Kconfig"
+
+endif
#20 lore raw

PATCH v2 12/18 board: ti: j7200: Introduce support for j7200 build targets

Quoted 31 lines · Vignesh Raghavendra

Hi

Quoted 15 lines · Lokesh Vutla

j7200-evm has minor differences with j721e-evm based on the IPs available in the SoC. Introduce separate build targets for j7200-evm to incorporate the differences.

---
  board/ti/j721e/Kconfig | 53 ++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 53 insertions(+)
board/ti/j721e/Kconfig +0 -0
index e56dc53bfa..2cbe2b2481 100644
@@ -27,6 +27,26 @@ config TARGET_J721E_R5_EVM
  	imply SYS_K3_SPL_ATF

board/ti/j721e/Kconfig config TARGET_J721E_R5_EVM · line 37

Quoted 10 lines
board/ti/j721e/Kconfig +8 -0
  	imply TI_I2C_BOARD_DETECT
 
+config TARGET_J7200_A72_EVM
+	bool "TI K3 based J7200 EVM running on A72"
+	select ARM64
+	select SOC_K3_J721E
+	select BOARD_LATE_INIT
+	imply TI_I2C_BOARD_DETECT
+	select SYS_DISABLE_DCACHE_OPS
+

I don't see update to:

Quoted 4 lines
    include/configs/j721e_evm.h          23 #ifdef CONFIG_TARGET_J721E_A72_EVM
    include/configs/j721e_evm.h         130 #ifdef CONFIG_TARGET_J721E_A72_EVM

Don't we need to update j721e_evm.h with TARGET_J7200_A72_EVM?

You are right. Will fix in v2.

Thanks and regards,
Lokesh

#21 lore raw

PATCH v2 13/18 board: ti: j7200: Add board detection support for j7200

In reply to Lokesh Vutla

Add board detection support for j7200 common processor board.

---
 board/ti/j721e/evm.c | 4 ++++
 1 file changed, 4 insertions(+)
board/ti/j721e/evm.c +4 -0
index 86e7cd4051..87cdbf9798 100644
@@ -28,6 +28,8 @@
 #define board_is_j721e_som()	(board_ti_k3_is("J721EX-PM1-SOM") || \
 				 board_ti_k3_is("J721EX-PM2-SOM"))
 
+#define board_is_j7200_som()	board_ti_k3_is("J7200X-PM1-SOM")
+
 /* Max number of MAC addresses that are parsed/processed per daughter card */
 #define DAUGHTER_CARD_NO_OF_MAC_ADDR	8
 
@@ -139,6 +141,8 @@ static void setup_board_eeprom_env(void)
 
 	if (board_is_j721e_som())
 		name = "j721e";
+	else if (board_is_j7200_som())
+		name = "j7200";
 	else
 		printf("Unidentified board claims %s in eeprom header\n",
 		       board_ti_get_name());
Signature · 1 line
2.27.0
#22 lore raw

PATCH v2 13/18 board: ti: j7200: Add board detection support for j7200

Quoted 4 lines · Lokesh Vutla

Add board detection support for j7200 common processor board.

Quoted 27 lines
---
  board/ti/j721e/evm.c | 4 ++++
  1 file changed, 4 insertions(+)
board/ti/j721e/evm.c +4 -0
index 86e7cd4051..87cdbf9798 100644
@@ -28,6 +28,8 @@
  #define board_is_j721e_som()	(board_ti_k3_is("J721EX-PM1-SOM") || \
  				 board_ti_k3_is("J721EX-PM2-SOM"))
 
+#define board_is_j7200_som()	board_ti_k3_is("J7200X-PM1-SOM")
+
  /* Max number of MAC addresses that are parsed/processed per daughter card */
  #define DAUGHTER_CARD_NO_OF_MAC_ADDR	8
 
@@ -139,6 +141,8 @@ static void setup_board_eeprom_env(void)
 
  	if (board_is_j721e_som())
  		name = "j721e";
+	else if (board_is_j7200_som())
+		name = "j7200";
  	else
  		printf("Unidentified board claims %s in eeprom header\n",
  		       board_ti_get_name());
#23 lore raw

PATCH v2 14/18 ram: k3-j721e: Relax version checks for memory controller

In reply to Lokesh Vutla

k3-j721e ddr driver sanity checks for product id and version number. Version number gets changed for every minor update in the IP. So discard the version check and just sanity check for product id.

---
 drivers/ram/k3-j721e/lpddr4.c | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)
drivers/ram/k3-j721e/lpddr4.c +1 -15
index 2c3892d8d7..fc80fb1e2c 100644
@@ -199,7 +199,6 @@ uint32_t lpddr4_init(lpddr4_privatedata * pd, const lpddr4_config * cfg)
 {
 	uint32_t result = 0U;
 	uint16_t productid = 0U;
-	uint32_t version[2] = { 0, 0 };
 
 	result = lpddr4_initsf(pd, cfg);
 	if (result == (uint32_t) CDN_EOK) {
@@ -209,20 +208,7 @@ uint32_t lpddr4_init(lpddr4_privatedata * pd, const lpddr4_config * cfg)
 						     CPS_REG_READ(&
 								  (ctlregbase->
 								   LPDDR4__CONTROLLER_ID__REG))));
-		version[0] =
-		    (uint32_t) (CPS_FLD_READ
-				(LPDDR4__CONTROLLER_VERSION_0__FLD,
-				 CPS_REG_READ(&
-					      (ctlregbase->
-					       LPDDR4__CONTROLLER_VERSION_0__REG))));
-		version[1] =
-		    (uint32_t) (CPS_FLD_READ
-				(LPDDR4__CONTROLLER_VERSION_1__FLD,
-				 CPS_REG_READ(&
-					      (ctlregbase->
-					       LPDDR4__CONTROLLER_VERSION_1__REG))));
-		if ((productid == PRODUCT_ID) && (version[0] == VERSION_0)
-		    && (version[1] == VERSION_1)) {
+		if (productid == PRODUCT_ID) {
 			/* Populating configuration data to pD */
 			pd->ctlbase = ctlregbase;
 			pd->infohandler =
Signature · 1 line
2.27.0
#24 lore raw

PATCH v2 15/18 arm: dts: k3-j7200: Add dts support

In reply to Lokesh Vutla

Add the basic a72 dts for j7200. Following nodes were supported:
- UART
- MMC SD
- I2C
- TISCI communication

---
 arch/arm/dts/Makefile                         |   3 +-
 .../k3-j7200-common-proc-board-u-boot.dtsi    |  92 +++++
 arch/arm/dts/k3-j7200-common-proc-board.dts   |  94 ++++++
 arch/arm/dts/k3-j7200-main.dtsi               | 313 ++++++++++++++++++
 arch/arm/dts/k3-j7200-mcu-wakeup.dtsi         | 117 +++++++
 arch/arm/dts/k3-j7200-som-p0.dtsi             |  29 ++
 arch/arm/dts/k3-j7200.dtsi                    | 175 ++++++++++
 7 files changed, 822 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi
 create mode 100644 arch/arm/dts/k3-j7200-common-proc-board.dts
 create mode 100644 arch/arm/dts/k3-j7200-main.dtsi
 create mode 100644 arch/arm/dts/k3-j7200-mcu-wakeup.dtsi
 create mode 100644 arch/arm/dts/k3-j7200-som-p0.dtsi
 create mode 100644 arch/arm/dts/k3-j7200.dtsi
arch/arm/dts/Makefile +2 -1
index cee10f533f..08717ea197 100644
@@ -938,7 +938,8 @@ dtb-$(CONFIG_STM32MP15x) += \
 
 dtb-$(CONFIG_SOC_K3_AM6) += k3-am654-base-board.dtb k3-am654-r5-base-board.dtb
 dtb-$(CONFIG_SOC_K3_J721E) += k3-j721e-common-proc-board.dtb \
-			      k3-j721e-r5-common-proc-board.dtb
+			      k3-j721e-r5-common-proc-board.dtb \
+			      k3-j7200-common-proc-board.dtb
 
 dtb-$(CONFIG_ARCH_MEDIATEK) += \
 	mt7622-rfb.dtb \
arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi new file +92 -0

92 lines not on this page · raw message

arch/arm/dts/k3-j7200-common-proc-board.dts new file +94 -0

94 lines not on this page · raw message

arch/arm/dts/k3-j7200-main.dtsi new file +313 -0

313 lines not on this page · raw message

arch/arm/dts/k3-j7200-mcu-wakeup.dtsi new file +117 -0

117 lines not on this page · raw message

arch/arm/dts/k3-j7200-som-p0.dtsi new file +29 -0
new file mode 100644
index 0000000000..22fc50bd5c
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2020 Texas Instruments Incorporated - https://www.ti.com/
+ */
+
+/dts-v1/;
+
+#include "k3-j7200.dtsi"
+
+/ {
+	memory at 80000000 {
+		device_type = "memory";
+		/* 4G RAM */
+		reg = <0x00000000 0x80000000 0x00000000 0x80000000>,
+		      <0x00000008 0x80000000 0x00000000 0x80000000>;
+	};
+
+	reserved_memory: reserved-memory {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+
+		secure_ddr: optee at 9e800000 {
+			reg = <0x00 0x9e800000 0x00 0x01800000>;
+			alignment = <0x1000>;
+			no-map;
+		};
+	};
+};
arch/arm/dts/k3-j7200.dtsi new file +175 -0

175 lines not on this page · raw message

Signature · 1 line
2.27.0
#25 lore raw

PATCH v2 15/18 arm: dts: k3-j7200: Add dts support

Hi Lokesh,

Quoted 19 lines · Lokesh Vutla

Add the basic a72 dts for j7200. Following nodes were supported:
- UART
- MMC SD
- I2C
- TISCI communication

---
  arch/arm/dts/Makefile                         |   3 +-
  .../k3-j7200-common-proc-board-u-boot.dtsi    |  92 +++++
  arch/arm/dts/k3-j7200-common-proc-board.dts   |  94 ++++++
  arch/arm/dts/k3-j7200-main.dtsi               | 313 ++++++++++++++++++
  arch/arm/dts/k3-j7200-mcu-wakeup.dtsi         | 117 +++++++
  arch/arm/dts/k3-j7200-som-p0.dtsi             |  29 ++
  arch/arm/dts/k3-j7200.dtsi                    | 175 ++++++++++
  7 files changed, 822 insertions(+), 1 deletion(-)
Quoted 7 lines

create mode 100644 arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi create mode 100644 arch/arm/dts/k3-j7200-common-proc-board.dts create mode 100644 arch/arm/dts/k3-j7200-main.dtsi
create mode 100644 arch/arm/dts/k3-j7200-mcu-wakeup.dtsi create mode 100644 arch/arm/dts/k3-j7200-som-p0.dtsi create mode 100644 arch/arm/dts/k3-j7200.dtsi

This patch is missing IO expander nodes that are used by MMC/SD (same is present in 16/18) Could you squash the below diff into this patch while merging/reposting?

--><8--

arch/arm/dts/k3-j7200-common-proc-board-u-boot.dtsi +12 -0
index 593417565e..10bb069492 100644
@@ -90,3 +90,15 @@
 &wkup_i2c0 {
 	u-boot,dm-spl;
 };
+
+&main_i2c0 {
+	u-boot,dm-spl;
+};
+
+&main_i2c0_pins_default {
+	u-boot,dm-spl;
+};
+
+&exp2 {
+	u-boot,dm-spl;
+};
arch/arm/dts/k3-j7200-common-proc-board.dts +29 -0
index 3f33fb5650..537ef2a79d 100644
@@ -23,6 +23,15 @@
 	};
 };
 
+&main_pmx0 {
+	main_i2c0_pins_default: main-i2c0-pins-default {
+		pinctrl-single,pins = <
+			J721E_IOPAD(0xd4, PIN_INPUT_PULLUP, 0) /* (V3) I2C0_SCL */
+			J721E_IOPAD(0xd8, PIN_INPUT_PULLUP, 0) /* (W2) I2C0_SDA */
+		>;
+	};
+};
+
 &wkup_uart0 {
 	/* Wakeup UART is used by System firmware */
 	status = "disabled";
@@ -92,3 +101,23 @@
 	no-1-8-v;
 	sdhci-caps-mask = <0x8000000F 0x0>;
 };
+
+&main_i2c0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&main_i2c0_pins_default>;
+	clock-frequency = <400000>;
+
+	exp1: gpio at 20 {
+		compatible = "ti,tca6416";
+		reg = <0x20>;
+		gpio-controller;
+		#gpio-cells = <2>;
+	};
+
+	exp2: gpio at 22 {
+		compatible = "ti,tca6424";
+		reg = <0x22>;
+		gpio-controller;
+		#gpio-cells = <2>;
+	};
+};

[...]

#26 lore raw

PATCH v2 16/18 arm: dts: k3-j7200: Add R5 specific dts support

In reply to Lokesh Vutla

From: Dave Gerlach <[email protected]>

Add the basic a72 basic dts for j7200. Following nodes were supported:
- UART
- MMC SD
- I2C
- TISCI communication
- LPDDR with 1600MTs configuration.

---
 arch/arm/dts/Makefile                         |    3 +-
 arch/arm/dts/k3-j7200-ddr-evm-lp4-1600.dtsi   | 2195 +++++++++++++++++
 .../arm/dts/k3-j7200-r5-common-proc-board.dts |  199 ++
 3 files changed, 2396 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/dts/k3-j7200-ddr-evm-lp4-1600.dtsi
 create mode 100644 arch/arm/dts/k3-j7200-r5-common-proc-board.dts
arch/arm/dts/Makefile +2 -1
index 08717ea197..cdca20206f 100644
@@ -939,7 +939,8 @@ dtb-$(CONFIG_STM32MP15x) += \
 dtb-$(CONFIG_SOC_K3_AM6) += k3-am654-base-board.dtb k3-am654-r5-base-board.dtb
 dtb-$(CONFIG_SOC_K3_J721E) += k3-j721e-common-proc-board.dtb \
 			      k3-j721e-r5-common-proc-board.dtb \
-			      k3-j7200-common-proc-board.dtb
+			      k3-j7200-common-proc-board.dtb \
+			      k3-j7200-r5-common-proc-board.dtb
 
 dtb-$(CONFIG_ARCH_MEDIATEK) += \
 	mt7622-rfb.dtb \
arch/arm/dts/k3-j7200-ddr-evm-lp4-1600.dtsi new file +2195 -0

2,195 lines not on this page · raw message

arch/arm/dts/k3-j7200-r5-common-proc-board.dts new file +199 -0

199 lines not on this page · raw message

Signature · 1 line
2.27.0
#27 lore raw

PATCH v2 17/18 configs: j7200_evm_r5: Add initial support

In reply to Lokesh Vutla

Add initial R5 defconfig support

---
 configs/j7200_evm_r5_defconfig | 126 +++++++++++++++++++++++++++++++++
 1 file changed, 126 insertions(+)
 create mode 100644 configs/j7200_evm_r5_defconfig
configs/j7200_evm_r5_defconfig new file +126 -0
new file mode 100644
index 0000000000..c387cb7ccb
@@ -0,0 +1,126 @@
+CONFIG_ARM=y
+CONFIG_ARCH_K3=y
+CONFIG_SPL_LIBCOMMON_SUPPORT=y
+CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_SYS_MALLOC_F_LEN=0x70000
+CONFIG_SOC_K3_J721E=y
+CONFIG_K3_EARLY_CONS=y
+CONFIG_TARGET_J7200_R5_EVM=y
+CONFIG_ENV_SIZE=0x20000
+CONFIG_SYS_SPI_U_BOOT_OFFS=0x80000
+CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
+CONFIG_SPL_TEXT_BASE=0x41c00000
+CONFIG_SPL_MMC_SUPPORT=y
+CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_SPL_STACK_R_ADDR=0x82000000
+CONFIG_SPL_FS_FAT=y
+CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
+CONFIG_DEFAULT_DEVICE_TREE="k3-j7200-r5-common-proc-board"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_SPL_LOAD_FIT=y
+CONFIG_USE_BOOTCOMMAND=y
+# CONFIG_DISPLAY_CPUINFO is not set
+CONFIG_SPL_BOARD_INIT=y
+CONFIG_SPL_STACK_R=y
+CONFIG_SPL_SEPARATE_BSS=y
+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_DMA=y
+CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_SPL_I2C_SUPPORT=y
+CONFIG_SPL_DM_MAILBOX=y
+CONFIG_SPL_DM_SPI_FLASH=y
+CONFIG_SPL_DM_RESET=y
+CONFIG_SPL_POWER_SUPPORT=y
+CONFIG_SPL_POWER_DOMAIN=y
+CONFIG_SPL_RAM_SUPPORT=y
+CONFIG_SPL_RAM_DEVICE=y
+CONFIG_SPL_REMOTEPROC=y
+# CONFIG_SPL_SPI_FLASH_TINY is not set
+CONFIG_SPL_SPI_FLASH_SFDP_SUPPORT=y
+CONFIG_SPL_SPI_LOAD=y
+CONFIG_SPL_USB_GADGET=y
+CONFIG_SPL_DFU=y
+CONFIG_SPL_YMODEM_SUPPORT=y
+CONFIG_HUSH_PARSER=y
+CONFIG_CMD_DFU=y
+# CONFIG_CMD_FLASH is not set
+CONFIG_CMD_GPT=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_REMOTEPROC=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_TIME=y
+CONFIG_CMD_FAT=y
+CONFIG_OF_CONTROL=y
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_DM=y
+CONFIG_SPL_DM=y
+CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_REGMAP=y
+CONFIG_SPL_REGMAP=y
+CONFIG_SPL_OF_TRANSLATE=y
+CONFIG_CLK=y
+CONFIG_SPL_CLK=y
+CONFIG_CLK_TI_SCI=y
+CONFIG_DMA_CHANNELS=y
+CONFIG_TI_K3_NAVSS_UDMA=y
+CONFIG_TI_SCI_PROTOCOL=y
+CONFIG_DA8XX_GPIO=y
+CONFIG_DM_PCA953X=y
+CONFIG_DM_I2C=y
+CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
+CONFIG_SYS_I2C_OMAP24XX=y
+CONFIG_DM_MAILBOX=y
+CONFIG_K3_SEC_PROXY=y
+CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
+CONFIG_SPL_MMC_HS400_SUPPORT=y
+CONFIG_MMC_SDHCI=y
+CONFIG_SPL_MMC_SDHCI_ADMA=y
+CONFIG_MMC_SDHCI_AM654=y
+CONFIG_MTD=y
+CONFIG_DM_SPI_FLASH=y
+CONFIG_SPI_FLASH_SFDP_SUPPORT=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_PINCTRL=y
+# CONFIG_PINCTRL_GENERIC is not set
+CONFIG_SPL_PINCTRL=y
+# CONFIG_SPL_PINCTRL_GENERIC is not set
+CONFIG_PINCTRL_SINGLE=y
+CONFIG_POWER_DOMAIN=y
+CONFIG_TI_SCI_POWER_DOMAIN=y
+CONFIG_K3_SYSTEM_CONTROLLER=y
+CONFIG_REMOTEPROC_TI_K3_ARM64=y
+CONFIG_DM_RESET=y
+CONFIG_RESET_TI_SCI=y
+CONFIG_DM_SERIAL=y
+CONFIG_SOC_TI=y
+CONFIG_SPI=y
+CONFIG_DM_SPI=y
+CONFIG_CADENCE_QSPI=y
+CONFIG_SYSRESET=y
+CONFIG_SPL_SYSRESET=y
+CONFIG_SYSRESET_TI_SCI=y
+CONFIG_TIMER=y
+CONFIG_SPL_TIMER=y
+CONFIG_OMAP_TIMER=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_DM_USB_GADGET=y
+CONFIG_SPL_DM_USB_GADGET=y
+CONFIG_USB_CDNS3=y
+CONFIG_USB_CDNS3_GADGET=y
+CONFIG_SPL_USB_CDNS3_GADGET=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0451
+CONFIG_USB_GADGET_PRODUCT_NUM=0x6163
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_FS_EXT4=y
+CONFIG_FS_FAT_MAX_CLUSTSIZE=16384
Signature · 1 line
2.27.0
#28 lore raw

PATCH v2 18/18 configs: j7200_evm_a72: Add Initial support

In reply to Lokesh Vutla

Add initial A72 defconfig support.

---
 configs/j7200_evm_a72_defconfig | 172 ++++++++++++++++++++++++++++++++
 1 file changed, 172 insertions(+)
 create mode 100644 configs/j7200_evm_a72_defconfig
configs/j7200_evm_a72_defconfig new file +172 -0
new file mode 100644
index 0000000000..14c30a8f28
@@ -0,0 +1,172 @@
+CONFIG_ARM=y
+CONFIG_ARCH_K3=y
+CONFIG_SPL_GPIO_SUPPORT=y
+CONFIG_SPL_LIBCOMMON_SUPPORT=y
+CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_SYS_MALLOC_F_LEN=0x8000
+CONFIG_SOC_K3_J721E=y
+CONFIG_TARGET_J7200_A72_EVM=y
+CONFIG_ENV_SIZE=0x20000
+CONFIG_ENV_OFFSET=0x680000
+CONFIG_SYS_SPI_U_BOOT_OFFS=0x280000
+CONFIG_DM_GPIO=y
+CONFIG_SPL_DM_SPI=y
+CONFIG_SPL_TEXT_BASE=0x80080000
+CONFIG_SPL_MMC_SUPPORT=y
+CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_SPL_STACK_R_ADDR=0x82000000
+CONFIG_NR_DRAM_BANKS=2
+CONFIG_ENV_OFFSET_REDUND=0x6A0000
+CONFIG_SPL_FS_FAT=y
+CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_SPL_SPI_FLASH_SUPPORT=y
+CONFIG_SPL_SPI_SUPPORT=y
+# CONFIG_PSCI_RESET is not set
+CONFIG_DEFAULT_DEVICE_TREE="k3-j7200-common-proc-board"
+CONFIG_DISTRO_DEFAULTS=y
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_SPL_LOAD_FIT=y
+CONFIG_OF_BOARD_SETUP=y
+CONFIG_BOOTCOMMAND="run findfdt; run envboot; run init_${boot}; run get_kern_${boot}; run get_fdt_${boot}; run get_overlay_${boot}; run run_kern"
+# CONFIG_DISPLAY_CPUINFO is not set
+CONFIG_SPL_BOARD_INIT=y
+CONFIG_SPL_SYS_MALLOC_SIMPLE=y
+CONFIG_SPL_STACK_R=y
+CONFIG_SPL_SEPARATE_BSS=y
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y
+CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x1400
+CONFIG_SPL_DMA=y
+CONFIG_SPL_ENV_SUPPORT=y
+CONFIG_SPL_I2C_SUPPORT=y
+CONFIG_SPL_DM_MAILBOX=y
+CONFIG_SPL_DM_SPI_FLASH=y
+CONFIG_SPL_DM_RESET=y
+CONFIG_SPL_POWER_SUPPORT=y
+CONFIG_SPL_POWER_DOMAIN=y
+CONFIG_SPL_RAM_SUPPORT=y
+CONFIG_SPL_RAM_DEVICE=y
+# CONFIG_SPL_SPI_FLASH_TINY is not set
+CONFIG_SPL_SPI_FLASH_SFDP_SUPPORT=y
+CONFIG_SPL_SPI_LOAD=y
+CONFIG_SPL_USB_GADGET=y
+CONFIG_SPL_DFU=y
+CONFIG_SPL_YMODEM_SUPPORT=y
+CONFIG_CMD_ASKENV=y
+CONFIG_CMD_DFU=y
+# CONFIG_CMD_FLASH is not set
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_GPT=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_MTD=y
+CONFIG_CMD_REMOTEPROC=y
+CONFIG_CMD_UFS=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_USB_MASS_STORAGE=y
+# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_TIME=y
+CONFIG_CMD_EXT4_WRITE=y
+CONFIG_MTDIDS_DEFAULT="nor0=47040000.spi.0,nor0=47034000.hyperbus"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=47040000.spi.0:512k(ospi.tiboot3),2m(ospi.tispl),4m(ospi.u-boot),128k(ospi.env),128k(ospi.env.backup),1m(ospi.sysfw),- at 8m(ospi.rootfs);47034000.hyperbus:512k(hbmc.tiboot3),2m(hbmc.tispl),4m(hbmc.u-boot),256k(hbmc.env),1m(hbmc.sysfw),- at 8m(hbmc.rootfs)"
+CONFIG_CMD_UBI=y
+# CONFIG_ISO_PARTITION is not set
+# CONFIG_SPL_EFI_PARTITION is not set
+CONFIG_OF_CONTROL=y
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_SPL_MULTI_DTB_FIT=y
+CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_DM=y
+CONFIG_SPL_DM=y
+CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_REGMAP=y
+CONFIG_SPL_REGMAP=y
+CONFIG_SYSCON=y
+CONFIG_SPL_OF_TRANSLATE=y
+CONFIG_CLK=y
+CONFIG_SPL_CLK=y
+CONFIG_CLK_TI_SCI=y
+CONFIG_DFU_MMC=y
+CONFIG_DFU_RAM=y
+CONFIG_DFU_SF=y
+CONFIG_DMA_CHANNELS=y
+CONFIG_TI_K3_NAVSS_UDMA=y
+CONFIG_USB_FUNCTION_FASTBOOT=y
+CONFIG_FASTBOOT_BUF_ADDR=0x82000000
+CONFIG_FASTBOOT_BUF_SIZE=0x2F000000
+CONFIG_FASTBOOT_FLASH=y
+CONFIG_FASTBOOT_FLASH_MMC_DEV=0
+CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
+CONFIG_TI_SCI_PROTOCOL=y
+CONFIG_DA8XX_GPIO=y
+CONFIG_DM_PCA953X=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_OMAP24XX=y
+CONFIG_DM_MAILBOX=y
+CONFIG_K3_SEC_PROXY=y
+CONFIG_DM_MMC=y
+CONFIG_SUPPORT_EMMC_BOOT=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_ADMA=y
+CONFIG_SPL_MMC_SDHCI_ADMA=y
+CONFIG_MMC_SDHCI_AM654=y
+CONFIG_MTD=y
+CONFIG_DM_MTD=y
+CONFIG_MTD_NOR_FLASH=y
+CONFIG_FLASH_CFI_DRIVER=y
+CONFIG_CFI_FLASH=y
+CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
+CONFIG_FLASH_CFI_MTD=y
+CONFIG_SYS_FLASH_CFI=y
+CONFIG_HBMC_AM654=y
+CONFIG_DM_SPI_FLASH=y
+CONFIG_SPI_FLASH_STMICRO=y
+# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
+CONFIG_SPI_FLASH_MTD=y
+CONFIG_PHY_FIXED=y
+CONFIG_DM_ETH=y
+CONFIG_TI_AM65_CPSW_NUSS=y
+CONFIG_PINCTRL=y
+# CONFIG_PINCTRL_GENERIC is not set
+CONFIG_SPL_PINCTRL=y
+# CONFIG_SPL_PINCTRL_GENERIC is not set
+CONFIG_PINCTRL_SINGLE=y
+CONFIG_POWER_DOMAIN=y
+CONFIG_TI_SCI_POWER_DOMAIN=y
+CONFIG_RAM=y
+CONFIG_SPL_RAM=y
+CONFIG_REMOTEPROC_TI_K3_DSP=y
+CONFIG_REMOTEPROC_TI_K3_R5F=y
+CONFIG_DM_RESET=y
+CONFIG_RESET_TI_SCI=y
+CONFIG_SCSI=y
+CONFIG_DM_SCSI=y
+CONFIG_DM_SERIAL=y
+CONFIG_SOC_TI=y
+CONFIG_SPI=y
+CONFIG_DM_SPI=y
+CONFIG_CADENCE_QSPI=y
+CONFIG_SYSRESET=y
+CONFIG_SPL_SYSRESET=y
+CONFIG_SYSRESET_TI_SCI=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_DM_USB_GADGET=y
+CONFIG_SPL_DM_USB_GADGET=y
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_CDNS3=y
+CONFIG_USB_CDNS3_GADGET=y
+CONFIG_USB_CDNS3_HOST=y
+CONFIG_SPL_USB_CDNS3_GADGET=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0451
+CONFIG_USB_GADGET_PRODUCT_NUM=0x6163
+CONFIG_UFS=y
+CONFIG_CADENCE_UFS=y
+CONFIG_TI_J721E_UFS=y
+CONFIG_OF_LIBFDT_OVERLAY=y
Signature · 1 line
2.27.0
#29 lore raw

PATCH v2 18/18 configs: j7200_evm_a72: Add Initial support

Quoted 13 lines · Lokesh Vutla

Add initial A72 defconfig support.

---
  configs/j7200_evm_a72_defconfig | 172 ++++++++++++++++++++++++++++++++
  1 file changed, 172 insertions(+)

create mode 100644 configs/j7200_evm_a72_defconfig

configs/j7200_evm_a72_defconfig new file +0 -0
new file mode 100644
index 0000000000..14c30a8f28

[...]

configs/j7200_evm_a72_defconfig line 168

Quoted 8 lines
configs/j7200_evm_a72_defconfig new file +8 -0
+CONFIG_USB_CDNS3=y
+CONFIG_USB_CDNS3_GADGET=y
+CONFIG_USB_CDNS3_HOST=y
+CONFIG_SPL_USB_CDNS3_GADGET=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
+CONFIG_USB_GADGET_VENDOR_NUM=0x0451
+CONFIG_USB_GADGET_PRODUCT_NUM=0x6163

This is for J721e. Could you change this to:
CONFIG_USB_GADGET_PRODUCT_NUM=0x6164

for J7200?

Applies to r5 defconfig too..

Regards
Vignesh