diff options
author | Suman Anna | 2020-05-14 18:01:09 -0500 |
---|---|---|
committer | Dave Gerlach | 2020-05-19 15:18:16 -0500 |
commit | 61f7fb2282d132b532d91869318c6ee265bd9646 (patch) | |
tree | 8a67510db0a41689ec143ac4bf5f8b5538da606e | |
parent | a7d3909ed8ae23a7c90f7ef821713a8b0c3c061d (diff) | |
download | k3-image-gen-61f7fb2282d132b532d91869318c6ee265bd9646.tar.gz k3-image-gen-61f7fb2282d132b532d91869318c6ee265bd9646.tar.xz k3-image-gen-61f7fb2282d132b532d91869318c6ee265bd9646.zip |
j721e: rm-cfg: Switch back to non-secure host for C7x resources
The C7x core comes up in secure mode by default, and all the resources
reserved for C7x are currently using the secure context id HOST_ID_C7X_0.
The latest SYS/BIOS 6.82.00.16 adds the support for properly switching
the C7x applications to non-secure mode, so switch back all the
resources to use the non-secure context id HOST_ID_C7X_1.
All the application firmwares are expected to perform the necessary
steps to switch from secure to non-secure context from now on.
Signed-off-by: Suman Anna <s-anna@ti.com>
-rw-r--r-- | soc/j721e/evm/rm-cfg.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/soc/j721e/evm/rm-cfg.c b/soc/j721e/evm/rm-cfg.c index e0beedbd4..e6ce6b243 100644 --- a/soc/j721e/evm/rm-cfg.c +++ b/soc/j721e/evm/rm-cfg.c | |||
@@ -228,7 +228,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = { | |||
228 | .num_resource = 4, | 228 | .num_resource = 4, |
229 | .type = RESASG_UTYPE (J721E_DEV_GPIOMUX_INTRTR0, | 229 | .type = RESASG_UTYPE (J721E_DEV_GPIOMUX_INTRTR0, |
230 | RESASG_SUBTYPE_IR_OUTPUT), | 230 | RESASG_SUBTYPE_IR_OUTPUT), |
231 | .host_id = HOST_ID_C7X_0, | 231 | .host_id = HOST_ID_C7X_1, |
232 | }, | 232 | }, |
233 | 233 | ||
234 | /* Interrupt router for R5FSS0 cluster */ | 234 | /* Interrupt router for R5FSS0 cluster */ |
@@ -327,7 +327,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = { | |||
327 | .num_resource = 2, | 327 | .num_resource = 2, |
328 | .type = RESASG_UTYPE (J721E_DEV_WKUP_GPIOMUX_INTRTR0, | 328 | .type = RESASG_UTYPE (J721E_DEV_WKUP_GPIOMUX_INTRTR0, |
329 | RESASG_SUBTYPE_IR_OUTPUT), | 329 | RESASG_SUBTYPE_IR_OUTPUT), |
330 | .host_id = HOST_ID_C7X_0, | 330 | .host_id = HOST_ID_C7X_1, |
331 | }, | 331 | }, |
332 | { | 332 | { |
333 | .start_resource = 28, | 333 | .start_resource = 28, |
@@ -414,7 +414,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = { | |||
414 | .num_resource = 12, | 414 | .num_resource = 12, |
415 | .type = RESASG_UTYPE (J721E_DEV_NAVSS0_UDMASS_INTAGGR_0, | 415 | .type = RESASG_UTYPE (J721E_DEV_NAVSS0_UDMASS_INTAGGR_0, |
416 | RESASG_SUBTYPE_IA_VINT), | 416 | RESASG_SUBTYPE_IA_VINT), |
417 | .host_id = HOST_ID_C7X_0, | 417 | .host_id = HOST_ID_C7X_1, |
418 | }, | 418 | }, |
419 | { | 419 | { |
420 | .start_resource = 192, | 420 | .start_resource = 192, |
@@ -507,7 +507,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = { | |||
507 | .num_resource = 256, | 507 | .num_resource = 256, |
508 | .type = RESASG_UTYPE (J721E_DEV_NAVSS0_UDMASS_INTAGGR_0, | 508 | .type = RESASG_UTYPE (J721E_DEV_NAVSS0_UDMASS_INTAGGR_0, |
509 | RESASG_SUBTYPE_GLOBAL_EVENT_SEVT), | 509 | RESASG_SUBTYPE_GLOBAL_EVENT_SEVT), |
510 | .host_id = HOST_ID_C7X_0, | 510 | .host_id = HOST_ID_C7X_1, |
511 | }, | 511 | }, |
512 | { | 512 | { |
513 | .start_resource = 2406, | 513 | .start_resource = 2406, |
@@ -600,7 +600,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = { | |||
600 | .num_resource = 4, | 600 | .num_resource = 4, |
601 | .type = RESASG_UTYPE (J721E_DEV_NAVSS0_PROXY_0, | 601 | .type = RESASG_UTYPE (J721E_DEV_NAVSS0_PROXY_0, |
602 | RESASG_SUBTYPE_PROXY_PROXIES), | 602 | RESASG_SUBTYPE_PROXY_PROXIES), |
603 | .host_id = HOST_ID_C7X_0, | 603 | .host_id = HOST_ID_C7X_1, |
604 | }, | 604 | }, |
605 | { | 605 | { |
606 | .start_resource = 28, | 606 | .start_resource = 28, |
@@ -702,7 +702,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = { | |||
702 | .num_resource = 32, | 702 | .num_resource = 32, |
703 | .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0, | 703 | .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0, |
704 | RESASG_SUBTYPE_RA_GP), | 704 | RESASG_SUBTYPE_RA_GP), |
705 | .host_id = HOST_ID_C7X_0, | 705 | .host_id = HOST_ID_C7X_1, |
706 | }, | 706 | }, |
707 | { | 707 | { |
708 | .start_resource = 694, | 708 | .start_resource = 694, |
@@ -795,7 +795,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = { | |||
795 | .num_resource = 6, | 795 | .num_resource = 6, |
796 | .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0, | 796 | .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0, |
797 | RESASG_SUBTYPE_RA_UDMAP_RX), | 797 | RESASG_SUBTYPE_RA_UDMAP_RX), |
798 | .host_id = HOST_ID_C7X_0, | 798 | .host_id = HOST_ID_C7X_1, |
799 | }, | 799 | }, |
800 | { | 800 | { |
801 | .start_resource = 394, | 801 | .start_resource = 394, |
@@ -881,7 +881,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = { | |||
881 | .num_resource = 6, | 881 | .num_resource = 6, |
882 | .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0, | 882 | .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0, |
883 | RESASG_SUBTYPE_RA_UDMAP_TX), | 883 | RESASG_SUBTYPE_RA_UDMAP_TX), |
884 | .host_id = HOST_ID_C7X_0, | 884 | .host_id = HOST_ID_C7X_1, |
885 | }, | 885 | }, |
886 | { | 886 | { |
887 | .start_resource = 94, | 887 | .start_resource = 94, |
@@ -925,7 +925,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = { | |||
925 | .num_resource = 16, | 925 | .num_resource = 16, |
926 | .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0, | 926 | .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0, |
927 | RESASG_SUBTYPE_RA_UDMAP_TX_EXT), | 927 | RESASG_SUBTYPE_RA_UDMAP_TX_EXT), |
928 | .host_id = HOST_ID_C7X_0, | 928 | .host_id = HOST_ID_C7X_1, |
929 | }, | 929 | }, |
930 | { | 930 | { |
931 | .start_resource = 156, | 931 | .start_resource = 156, |
@@ -1105,7 +1105,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = { | |||
1105 | .num_resource = 3, | 1105 | .num_resource = 3, |
1106 | .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0, | 1106 | .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0, |
1107 | RESASG_SUBTYPE_RA_MONITORS), | 1107 | RESASG_SUBTYPE_RA_MONITORS), |
1108 | .host_id = HOST_ID_C7X_0, | 1108 | .host_id = HOST_ID_C7X_1, |
1109 | }, | 1109 | }, |
1110 | { | 1110 | { |
1111 | .start_resource = 16, | 1111 | .start_resource = 16, |
@@ -1248,7 +1248,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = { | |||
1248 | .num_resource = 6, | 1248 | .num_resource = 6, |
1249 | .type = RESASG_UTYPE (J721E_DEV_NAVSS0_UDMAP_0, | 1249 | .type = RESASG_UTYPE (J721E_DEV_NAVSS0_UDMAP_0, |
1250 | RESASG_SUBTYPE_UDMAP_RX_CHAN), | 1250 | RESASG_SUBTYPE_UDMAP_RX_CHAN), |
1251 | .host_id = HOST_ID_C7X_0, | 1251 | .host_id = HOST_ID_C7X_1, |
1252 | }, | 1252 | }, |
1253 | { | 1253 | { |
1254 | .start_resource = 94, | 1254 | .start_resource = 94, |
@@ -1373,7 +1373,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = { | |||
1373 | .num_resource = 6, | 1373 | .num_resource = 6, |
1374 | .type = RESASG_UTYPE (J721E_DEV_NAVSS0_UDMAP_0, | 1374 | .type = RESASG_UTYPE (J721E_DEV_NAVSS0_UDMAP_0, |
1375 | RESASG_SUBTYPE_UDMAP_TX_CHAN), | 1375 | RESASG_SUBTYPE_UDMAP_TX_CHAN), |
1376 | .host_id = HOST_ID_C7X_0, | 1376 | .host_id = HOST_ID_C7X_1, |
1377 | }, | 1377 | }, |
1378 | { | 1378 | { |
1379 | .start_resource = 94, | 1379 | .start_resource = 94, |
@@ -1417,7 +1417,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = { | |||
1417 | .num_resource = 16, | 1417 | .num_resource = 16, |
1418 | .type = RESASG_UTYPE (J721E_DEV_NAVSS0_UDMAP_0, | 1418 | .type = RESASG_UTYPE (J721E_DEV_NAVSS0_UDMAP_0, |
1419 | RESASG_SUBTYPE_UDMAP_TX_ECHAN), | 1419 | RESASG_SUBTYPE_UDMAP_TX_ECHAN), |
1420 | .host_id = HOST_ID_C7X_0, | 1420 | .host_id = HOST_ID_C7X_1, |
1421 | }, | 1421 | }, |
1422 | { | 1422 | { |
1423 | .start_resource = 156, | 1423 | .start_resource = 156, |
@@ -1500,7 +1500,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = { | |||
1500 | .num_resource = 46, | 1500 | .num_resource = 46, |
1501 | .type = RESASG_UTYPE (J721E_DEV_NAVSS0_INTR_ROUTER_0, | 1501 | .type = RESASG_UTYPE (J721E_DEV_NAVSS0_INTR_ROUTER_0, |
1502 | RESASG_SUBTYPE_IR_OUTPUT), | 1502 | RESASG_SUBTYPE_IR_OUTPUT), |
1503 | .host_id = HOST_ID_C7X_0, | 1503 | .host_id = HOST_ID_C7X_1, |
1504 | }, | 1504 | }, |
1505 | { | 1505 | { |
1506 | .start_resource = 196, | 1506 | .start_resource = 196, |
@@ -1642,7 +1642,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = { | |||
1642 | .num_resource = 8, | 1642 | .num_resource = 8, |
1643 | .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_INTAGGR_0, | 1643 | .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_INTAGGR_0, |
1644 | RESASG_SUBTYPE_IA_VINT), | 1644 | RESASG_SUBTYPE_IA_VINT), |
1645 | .host_id = HOST_ID_C7X_0, | 1645 | .host_id = HOST_ID_C7X_1, |
1646 | }, | 1646 | }, |
1647 | { | 1647 | { |
1648 | .start_resource = 164, | 1648 | .start_resource = 164, |
@@ -1735,7 +1735,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = { | |||
1735 | .num_resource = 64, | 1735 | .num_resource = 64, |
1736 | .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_INTAGGR_0, | 1736 | .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_INTAGGR_0, |
1737 | RESASG_SUBTYPE_GLOBAL_EVENT_SEVT), | 1737 | RESASG_SUBTYPE_GLOBAL_EVENT_SEVT), |
1738 | .host_id = HOST_ID_C7X_0, | 1738 | .host_id = HOST_ID_C7X_1, |
1739 | }, | 1739 | }, |
1740 | { | 1740 | { |
1741 | .start_resource = 17288, | 1741 | .start_resource = 17288, |
@@ -1828,7 +1828,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = { | |||
1828 | .num_resource = 4, | 1828 | .num_resource = 4, |
1829 | .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_PROXY_0, | 1829 | .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_PROXY_0, |
1830 | RESASG_SUBTYPE_PROXY_PROXIES), | 1830 | RESASG_SUBTYPE_PROXY_PROXIES), |
1831 | .host_id = HOST_ID_C7X_0, | 1831 | .host_id = HOST_ID_C7X_1, |
1832 | }, | 1832 | }, |
1833 | { | 1833 | { |
1834 | .start_resource = 29, | 1834 | .start_resource = 29, |
@@ -1930,7 +1930,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = { | |||
1930 | .num_resource = 8, | 1930 | .num_resource = 8, |
1931 | .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_RINGACC_0, | 1931 | .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_RINGACC_0, |
1932 | RESASG_SUBTYPE_RA_GP), | 1932 | RESASG_SUBTYPE_RA_GP), |
1933 | .host_id = HOST_ID_C7X_0, | 1933 | .host_id = HOST_ID_C7X_1, |
1934 | }, | 1934 | }, |
1935 | { | 1935 | { |
1936 | .start_resource = 192, | 1936 | .start_resource = 192, |
@@ -2023,7 +2023,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = { | |||
2023 | .num_resource = 2, | 2023 | .num_resource = 2, |
2024 | .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_RINGACC_0, | 2024 | .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_RINGACC_0, |
2025 | RESASG_SUBTYPE_RA_UDMAP_RX), | 2025 | RESASG_SUBTYPE_RA_UDMAP_RX), |
2026 | .host_id = HOST_ID_C7X_0, | 2026 | .host_id = HOST_ID_C7X_1, |
2027 | }, | 2027 | }, |
2028 | { | 2028 | { |
2029 | .start_resource = 81, | 2029 | .start_resource = 81, |
@@ -2116,7 +2116,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = { | |||
2116 | .num_resource = 2, | 2116 | .num_resource = 2, |
2117 | .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_RINGACC_0, | 2117 | .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_RINGACC_0, |
2118 | RESASG_SUBTYPE_RA_UDMAP_TX), | 2118 | RESASG_SUBTYPE_RA_UDMAP_TX), |
2119 | .host_id = HOST_ID_C7X_0, | 2119 | .host_id = HOST_ID_C7X_1, |
2120 | }, | 2120 | }, |
2121 | { | 2121 | { |
2122 | .start_resource = 33, | 2122 | .start_resource = 33, |
@@ -2264,7 +2264,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = { | |||
2264 | .num_resource = 3, | 2264 | .num_resource = 3, |
2265 | .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_RINGACC_0, | 2265 | .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_RINGACC_0, |
2266 | RESASG_SUBTYPE_RA_MONITORS), | 2266 | RESASG_SUBTYPE_RA_MONITORS), |
2267 | .host_id = HOST_ID_C7X_0, | 2267 | .host_id = HOST_ID_C7X_1, |
2268 | }, | 2268 | }, |
2269 | { | 2269 | { |
2270 | .start_resource = 20, | 2270 | .start_resource = 20, |
@@ -2449,7 +2449,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = { | |||
2449 | .num_resource = 2, | 2449 | .num_resource = 2, |
2450 | .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_UDMAP_0, | 2450 | .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_UDMAP_0, |
2451 | RESASG_SUBTYPE_UDMAP_RX_CHAN), | 2451 | RESASG_SUBTYPE_UDMAP_RX_CHAN), |
2452 | .host_id = HOST_ID_C7X_0, | 2452 | .host_id = HOST_ID_C7X_1, |
2453 | }, | 2453 | }, |
2454 | { | 2454 | { |
2455 | .start_resource = 33, | 2455 | .start_resource = 33, |
@@ -2558,7 +2558,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = { | |||
2558 | .num_resource = 2, | 2558 | .num_resource = 2, |
2559 | .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_UDMAP_0, | 2559 | .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_UDMAP_0, |
2560 | RESASG_SUBTYPE_UDMAP_TX_CHAN), | 2560 | RESASG_SUBTYPE_UDMAP_TX_CHAN), |
2561 | .host_id = HOST_ID_C7X_0, | 2561 | .host_id = HOST_ID_C7X_1, |
2562 | }, | 2562 | }, |
2563 | { | 2563 | { |
2564 | .start_resource = 33, | 2564 | .start_resource = 33, |