From: Tom Rini <trini@konsulko.com>
Date: Wed, 18 Jun 2025 18:20:41 +0000 (-0600)
Subject: Merge patch series "Print version of the DM firmware"
X-Git-Tag: v2025.10-rc1~118^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff43c2272a7450cd0fc9d77f7b45abca81b137a6;p=thirdparty%2Fu-boot.git

Merge patch series "Print version of the DM firmware"

Moteen Shah <m-shah@ti.com> says:

This patch series adds the functionality to print the DM firmware
version being used. Before requesting TISCI for the DM version we
first check if the DM split mode capability exists, if yes, we proceed
onto making the call to TISCI for retrieving the version information.

DM split mode capability indicates that the DM is a separate binary
altogether and has its own versioning information similar to TIFS.

Boot Logs: https://gist.github.com/Jamm02/37864f605445944a0c0caf426e0aba50

Link: https://software-dl.ti.com/tisci/esd/latest/2_tisci_msgs/general/core.html#tisci-msg-query-fw-caps
Link: https://lore.kernel.org/r/20250609081434.1000377-1-m-shah@ti.com
---

ff43c2272a7450cd0fc9d77f7b45abca81b137a6
diff --cc arch/arm/mach-k3/j721s2/j721s2_init.c
index 6342161f830,528590f0434..eee3d0440ac
--- a/arch/arm/mach-k3/j721s2/j721s2_init.c
+++ b/arch/arm/mach-k3/j721s2/j721s2_init.c
@@@ -230,15 -230,12 +230,19 @@@ void k3_spl_init(void
  		remove_fwl_configs(navss_cbass0_fwls, ARRAY_SIZE(navss_cbass0_fwls));
  	}
  
 +	/* Shutdown MCU_R5 Core 1 in Split mode at A72 SPL Stage */
 +	if (IS_ENABLED(CONFIG_ARM64)) {
 +		ret = shutdown_mcu_r5_core1();
 +		if (ret)
 +			printf("Unable to shutdown MCU R5 core 1, %d\n", ret);
 +	}
 +
  	/* Output System Firmware version info */
  	k3_sysfw_print_ver();
+ 
+ 	/* Output DM Firmware version info */
+ 	if (IS_ENABLED(CONFIG_ARM64))
+ 		k3_dm_print_ver();
  }
  
  bool check_rom_loaded_sysfw(void)
diff --cc arch/arm/mach-k3/j784s4/j784s4_init.c
index 5c06632a5ca,ccf29810849..0f11511bda0
--- a/arch/arm/mach-k3/j784s4/j784s4_init.c
+++ b/arch/arm/mach-k3/j784s4/j784s4_init.c
@@@ -206,15 -206,12 +206,19 @@@ void k3_spl_init(void
  
  	writel(AUDIO_REFCLK1_DEFAULT, (uintptr_t)CTRL_MMR_CFG0_AUDIO_REFCLK1_CTRL);
  
 +	/* Shutdown MCU_R5 Core 1 in Split mode at A72 SPL Stage */
 +	if (IS_ENABLED(CONFIG_ARM64)) {
 +		ret = shutdown_mcu_r5_core1();
 +		if (ret)
 +			printf("Unable to shutdown MCU R5 core 1, %d\n", ret);
 +	}
 +
  	/* Output System Firmware version info */
  	k3_sysfw_print_ver();
+ 
+ 	/* Output DM Firmware version info */
+ 	if (IS_ENABLED(CONFIG_ARM64))
+ 		k3_dm_print_ver();
  }
  
  void k3_mem_init(void)