[PATCH] arm: mach-k3: Remove ROM firewalls on GP devices

[PATCH] arm: mach-k3: Remove ROM firewalls on GP devices

[Andrew Davis]

This isn't strictly needed as these firewalls should all be disabled on
GP, but it also doesn't hurt, so do this unconditionally to remove this
use of CONFIG_TI_SECURE_DEVICE.

Signed-off-by: Andrew Davis <afd@ti.com>
---
 arch/arm/mach-k3/am6_init.c   | 4 ----
 arch/arm/mach-k3/j721e_init.c | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/arch/arm/mach-k3/am6_init.c b/arch/arm/mach-k3/am6_init.c
index 7992918adc..ded034140f 100644
--- a/arch/arm/mach-k3/am6_init.c
+++ b/arch/arm/mach-k3/am6_init.c
@@ -28,7 +28,6 @@ DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_SPL_BUILD
 #ifdef CONFIG_K3_LOAD_SYSFW
-#ifdef CONFIG_TI_SECURE_DEVICE
 struct fwl_data main_cbass_fwls[] = {
 	{ "MMCSD1_CFG", 2057, 1 },
 	{ "MMCSD0_CFG", 2058, 1 },
@@ -45,7 +44,6 @@ struct fwl_data main_cbass_fwls[] = {
 	{ "MCU_CPSW0", 1220, 1 },
 };
 #endif
-#endif
 
 static void ctrl_mmr_unlock(void)
 {
@@ -238,10 +236,8 @@ void board_init_f(ulong dummy)
 	preloader_console_init();
 
 	/* Disable ROM configured firewalls right after loading sysfw */
-#ifdef CONFIG_TI_SECURE_DEVICE
 	remove_fwl_configs(main_cbass_fwls, ARRAY_SIZE(main_cbass_fwls));
 	remove_fwl_configs(mcu_cbass_fwls, ARRAY_SIZE(mcu_cbass_fwls));
-#endif
 #else
 	/* Prepare console output */
 	preloader_console_init();
diff --git a/arch/arm/mach-k3/j721e_init.c b/arch/arm/mach-k3/j721e_init.c
index e56ca6d0f5..2000e8e29c 100644
--- a/arch/arm/mach-k3/j721e_init.c
+++ b/arch/arm/mach-k3/j721e_init.c
@@ -26,7 +26,6 @@
 
 #ifdef CONFIG_SPL_BUILD
 #ifdef CONFIG_K3_LOAD_SYSFW
-#ifdef CONFIG_TI_SECURE_DEVICE
 struct fwl_data cbass_hc_cfg0_fwls[] = {
 	{ "PCIE0_CFG", 2560, 8 },
 	{ "PCIE1_CFG", 2561, 8 },
@@ -64,7 +63,6 @@ struct fwl_data cbass_hc_cfg0_fwls[] = {
 	{ "WKUP_CTRL_MMR0", 131, 16 },
 };
 #endif
-#endif
 
 static void ctrl_mmr_unlock(void)
 {
@@ -255,7 +253,6 @@ void board_init_f(ulong dummy)
 	preloader_console_init();
 
 	/* Disable ROM configured firewalls right after loading sysfw */
-#ifdef CONFIG_TI_SECURE_DEVICE
 	remove_fwl_configs(cbass_hc_cfg0_fwls, ARRAY_SIZE(cbass_hc_cfg0_fwls));
 	remove_fwl_configs(cbass_hc0_fwls, ARRAY_SIZE(cbass_hc0_fwls));
 	remove_fwl_configs(cbass_rc_cfg0_fwls, ARRAY_SIZE(cbass_rc_cfg0_fwls));
@@ -263,7 +260,6 @@ void board_init_f(ulong dummy)
 	remove_fwl_configs(infra_cbass0_fwls, ARRAY_SIZE(infra_cbass0_fwls));
 	remove_fwl_configs(mcu_cbass0_fwls, ARRAY_SIZE(mcu_cbass0_fwls));
 	remove_fwl_configs(wkup_cbass0_fwls, ARRAY_SIZE(wkup_cbass0_fwls));
-#endif
 #else
 	/* Prepare console output */
 	preloader_console_init();
-- 
2.36.1

Re: [PATCH] arm: mach-k3: Remove ROM firewalls on GP devices

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 356 bytes --]

On Fri, Jul 15, 2022 at 11:21:27AM -0500, Andrew Davis wrote:

> This isn't strictly needed as these firewalls should all be disabled on
> GP, but it also doesn't hurt, so do this unconditionally to remove this
> use of CONFIG_TI_SECURE_DEVICE.
> 
> Signed-off-by: Andrew Davis <afd@ti.com>

Reviewed-by: Tom Rini <trini@konsulko.com>

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

Re: [PATCH] arm: mach-k3: Remove ROM firewalls on GP devices

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 393 bytes --]

On Fri, Jul 15, 2022 at 11:21:27AM -0500, Andrew Davis wrote:

> This isn't strictly needed as these firewalls should all be disabled on
> GP, but it also doesn't hurt, so do this unconditionally to remove this
> use of CONFIG_TI_SECURE_DEVICE.
> 
> Signed-off-by: Andrew Davis <afd@ti.com>
> Reviewed-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]