| Message ID | 20230414-upstream-j7200-firewall-fix-v1-1-8525941b38d2@ti.com |
|---|---|
| State | Accepted |
| Commit | 4b6e3d39cf6a902778692b33a7324f5b5458f690 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | arm: mach-k3: j7200: Fix firewall warnings at boot time | expand |
On Mon, Apr 17, 2023 at 12:04:09PM +0530, Manorit Chawdhry wrote: > J721E and J7200 have same file j721e_init.c which had the firewall > configs for J721E being applied on J7200 causing the warnings. Split the > firewalls for both the boards to remove those warnings. > > Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com> Applied to u-boot/master, thanks!
diff --git a/arch/arm/mach-k3/j721e_init.c b/arch/arm/mach-k3/j721e_init.c index 9cae3ac67e9c..e60173529726 100644 --- a/arch/arm/mach-k3/j721e_init.c +++ b/arch/arm/mach-k3/j721e_init.c @@ -26,6 +26,7 @@ #ifdef CONFIG_K3_LOAD_SYSFW struct fwl_data cbass_hc_cfg0_fwls[] = { +#if defined(CONFIG_TARGET_J721E_R5_EVM) { "PCIE0_CFG", 2560, 8 }, { "PCIE1_CFG", 2561, 8 }, { "USB3SS0_CORE", 2568, 4 }, @@ -34,11 +35,16 @@ struct fwl_data cbass_hc_cfg0_fwls[] = { { "UFS_HCI0_CFG", 2580, 4 }, { "SERDES0", 2584, 1 }, { "SERDES1", 2585, 1 }, +#elif defined(CONFIG_TARGET_J7200_R5_EVM) + { "PCIE1_CFG", 2561, 7 }, +#endif }, cbass_hc0_fwls[] = { +#if defined(CONFIG_TARGET_J721E_R5_EVM) { "PCIE0_HP", 2528, 24 }, { "PCIE0_LP", 2529, 24 }, { "PCIE1_HP", 2530, 24 }, { "PCIE1_LP", 2531, 24 }, +#endif }, cbass_rc_cfg0_fwls[] = { { "EMMCSD4SS0_CFG", 2380, 4 }, }, cbass_rc0_fwls[] = {
J721E and J7200 have same file j721e_init.c which had the firewall configs for J721E being applied on J7200 causing the warnings. Split the firewalls for both the boards to remove those warnings. Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com> --- arch/arm/mach-k3/j721e_init.c | 6 ++++++ 1 file changed, 6 insertions(+) --- base-commit: a25dcda452bf6a6de72764a8d990d72e5def643d change-id: 20230414-upstream-j7200-firewall-fix-9f768170862b Best regards,