aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuman Anna2020-05-05 11:25:12 -0500
committerDave Gerlach2020-05-06 14:32:15 -0500
commitd36bdd2c1dc257b2eb7cb3f449707f58ba96b48b (patch)
tree9034951baa2e7d27160c2c42bffb5b72fbb347ae
parent8e928afbfb3d38dbaf31fccd3554f3d2ab3ab505 (diff)
downloadk3-image-gen-d36bdd2c1dc257b2eb7cb3f449707f58ba96b48b.tar.gz
k3-image-gen-d36bdd2c1dc257b2eb7cb3f449707f58ba96b48b.tar.xz
k3-image-gen-d36bdd2c1dc257b2eb7cb3f449707f58ba96b48b.zip
j721e: rm-cfg: Switch to secure context for C7X resources
The C7x core comes up in secure mode by default, and all the current firmwares continue to run in this context until the necessary support is added to SYS/BIOS to switch the context. All the C7x RM resources are currently assigned using the non-secure context id HOST_ID_C7X_1. Switch these to the secure context id HOST_ID_C7X_0 to match the usage in PDK and current RTOS firmwares. Signed-off-by: Suman Anna <s-anna@ti.com> Signed-off-by: Dave Gerlach <d-gerlach@ti.com>
-rw-r--r--soc/j721e/evm/rm-cfg.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/soc/j721e/evm/rm-cfg.c b/soc/j721e/evm/rm-cfg.c
index da697d02c..76e05169f 100644
--- a/soc/j721e/evm/rm-cfg.c
+++ b/soc/j721e/evm/rm-cfg.c
@@ -207,7 +207,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = {
207 .num_resource = 4, 207 .num_resource = 4,
208 .type = RESASG_UTYPE (J721E_DEV_GPIOMUX_INTRTR0, 208 .type = RESASG_UTYPE (J721E_DEV_GPIOMUX_INTRTR0,
209 RESASG_SUBTYPE_IR_OUTPUT), 209 RESASG_SUBTYPE_IR_OUTPUT),
210 .host_id = HOST_ID_C7X_1, 210 .host_id = HOST_ID_C7X_0,
211 }, 211 },
212 212
213 /* Main R5FSS0 IR */ 213 /* Main R5FSS0 IR */
@@ -329,7 +329,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = {
329 .num_resource = 12, 329 .num_resource = 12,
330 .type = RESASG_UTYPE (J721E_DEV_NAVSS0_UDMASS_INTAGGR_0, 330 .type = RESASG_UTYPE (J721E_DEV_NAVSS0_UDMASS_INTAGGR_0,
331 RESASG_SUBTYPE_IA_VINT), 331 RESASG_SUBTYPE_IA_VINT),
332 .host_id = HOST_ID_C7X_1, 332 .host_id = HOST_ID_C7X_0,
333 }, 333 },
334 { 334 {
335 .start_resource = 192, 335 .start_resource = 192,
@@ -422,7 +422,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = {
422 .num_resource = 256, 422 .num_resource = 256,
423 .type = RESASG_UTYPE (J721E_DEV_NAVSS0_UDMASS_INTAGGR_0, 423 .type = RESASG_UTYPE (J721E_DEV_NAVSS0_UDMASS_INTAGGR_0,
424 RESASG_SUBTYPE_GLOBAL_EVENT_SEVT), 424 RESASG_SUBTYPE_GLOBAL_EVENT_SEVT),
425 .host_id = HOST_ID_C7X_1, 425 .host_id = HOST_ID_C7X_0,
426 }, 426 },
427 { 427 {
428 .start_resource = 2406, 428 .start_resource = 2406,
@@ -515,7 +515,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = {
515 .num_resource = 32, 515 .num_resource = 32,
516 .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0, 516 .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0,
517 RESASG_SUBTYPE_RA_GP), 517 RESASG_SUBTYPE_RA_GP),
518 .host_id = HOST_ID_C7X_1, 518 .host_id = HOST_ID_C7X_0,
519 }, 519 },
520 { 520 {
521 .start_resource = 694, 521 .start_resource = 694,
@@ -608,7 +608,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = {
608 .num_resource = 6, 608 .num_resource = 6,
609 .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0, 609 .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0,
610 RESASG_SUBTYPE_RA_UDMAP_RX), 610 RESASG_SUBTYPE_RA_UDMAP_RX),
611 .host_id = HOST_ID_C7X_1, 611 .host_id = HOST_ID_C7X_0,
612 }, 612 },
613 { 613 {
614 .start_resource = 394, 614 .start_resource = 394,
@@ -694,7 +694,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = {
694 .num_resource = 6, 694 .num_resource = 6,
695 .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0, 695 .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0,
696 RESASG_SUBTYPE_RA_UDMAP_TX), 696 RESASG_SUBTYPE_RA_UDMAP_TX),
697 .host_id = HOST_ID_C7X_1, 697 .host_id = HOST_ID_C7X_0,
698 }, 698 },
699 { 699 {
700 .start_resource = 94, 700 .start_resource = 94,
@@ -738,7 +738,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = {
738 .num_resource = 16, 738 .num_resource = 16,
739 .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0, 739 .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0,
740 RESASG_SUBTYPE_RA_UDMAP_TX_EXT), 740 RESASG_SUBTYPE_RA_UDMAP_TX_EXT),
741 .host_id = HOST_ID_C7X_1, 741 .host_id = HOST_ID_C7X_0,
742 }, 742 },
743 { 743 {
744 .start_resource = 156, 744 .start_resource = 156,
@@ -909,7 +909,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = {
909 .num_resource = 3, 909 .num_resource = 3,
910 .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0, 910 .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0,
911 RESASG_SUBTYPE_RA_MONITORS), 911 RESASG_SUBTYPE_RA_MONITORS),
912 .host_id = HOST_ID_C7X_1, 912 .host_id = HOST_ID_C7X_0,
913 }, 913 },
914 { 914 {
915 .start_resource = 16, 915 .start_resource = 16,
@@ -1039,7 +1039,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = {
1039 .num_resource = 6, 1039 .num_resource = 6,
1040 .type = RESASG_UTYPE (J721E_DEV_NAVSS0_UDMAP_0, 1040 .type = RESASG_UTYPE (J721E_DEV_NAVSS0_UDMAP_0,
1041 RESASG_SUBTYPE_UDMAP_RX_CHAN), 1041 RESASG_SUBTYPE_UDMAP_RX_CHAN),
1042 .host_id = HOST_ID_C7X_1, 1042 .host_id = HOST_ID_C7X_0,
1043 }, 1043 },
1044 { 1044 {
1045 .start_resource = 94, 1045 .start_resource = 94,
@@ -1171,7 +1171,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = {
1171 .num_resource = 6, 1171 .num_resource = 6,
1172 .type = RESASG_UTYPE (J721E_DEV_NAVSS0_UDMAP_0, 1172 .type = RESASG_UTYPE (J721E_DEV_NAVSS0_UDMAP_0,
1173 RESASG_SUBTYPE_UDMAP_TX_CHAN), 1173 RESASG_SUBTYPE_UDMAP_TX_CHAN),
1174 .host_id = HOST_ID_C7X_1, 1174 .host_id = HOST_ID_C7X_0,
1175 }, 1175 },
1176 { 1176 {
1177 .start_resource = 94, 1177 .start_resource = 94,
@@ -1215,7 +1215,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = {
1215 .num_resource = 16, 1215 .num_resource = 16,
1216 .type = RESASG_UTYPE (J721E_DEV_NAVSS0_UDMAP_0, 1216 .type = RESASG_UTYPE (J721E_DEV_NAVSS0_UDMAP_0,
1217 RESASG_SUBTYPE_UDMAP_TX_ECHAN), 1217 RESASG_SUBTYPE_UDMAP_TX_ECHAN),
1218 .host_id = HOST_ID_C7X_1, 1218 .host_id = HOST_ID_C7X_0,
1219 }, 1219 },
1220 { 1220 {
1221 .start_resource = 156, 1221 .start_resource = 156,
@@ -1305,7 +1305,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = {
1305 .num_resource = 46, 1305 .num_resource = 46,
1306 .type = RESASG_UTYPE (J721E_DEV_NAVSS0_INTR_ROUTER_0, 1306 .type = RESASG_UTYPE (J721E_DEV_NAVSS0_INTR_ROUTER_0,
1307 RESASG_SUBTYPE_IR_OUTPUT), 1307 RESASG_SUBTYPE_IR_OUTPUT),
1308 .host_id = HOST_ID_C7X_1, 1308 .host_id = HOST_ID_C7X_0,
1309 }, 1309 },
1310 { 1310 {
1311 .start_resource = 196, 1311 .start_resource = 196,
@@ -1433,7 +1433,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = {
1433 .num_resource = 8, 1433 .num_resource = 8,
1434 .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_INTAGGR_0, 1434 .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_INTAGGR_0,
1435 RESASG_SUBTYPE_IA_VINT), 1435 RESASG_SUBTYPE_IA_VINT),
1436 .host_id = HOST_ID_C7X_1, 1436 .host_id = HOST_ID_C7X_0,
1437 }, 1437 },
1438 { 1438 {
1439 .start_resource = 164, 1439 .start_resource = 164,
@@ -1526,7 +1526,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = {
1526 .num_resource = 64, 1526 .num_resource = 64,
1527 .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_INTAGGR_0, 1527 .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_INTAGGR_0,
1528 RESASG_SUBTYPE_GLOBAL_EVENT_SEVT), 1528 RESASG_SUBTYPE_GLOBAL_EVENT_SEVT),
1529 .host_id = HOST_ID_C7X_1, 1529 .host_id = HOST_ID_C7X_0,
1530 }, 1530 },
1531 { 1531 {
1532 .start_resource = 17288, 1532 .start_resource = 17288,
@@ -1619,7 +1619,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = {
1619 .num_resource = 8, 1619 .num_resource = 8,
1620 .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_RINGACC_0, 1620 .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_RINGACC_0,
1621 RESASG_SUBTYPE_RA_GP), 1621 RESASG_SUBTYPE_RA_GP),
1622 .host_id = HOST_ID_C7X_1, 1622 .host_id = HOST_ID_C7X_0,
1623 }, 1623 },
1624 { 1624 {
1625 .start_resource = 192, 1625 .start_resource = 192,
@@ -1712,7 +1712,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = {
1712 .num_resource = 2, 1712 .num_resource = 2,
1713 .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_RINGACC_0, 1713 .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_RINGACC_0,
1714 RESASG_SUBTYPE_RA_UDMAP_RX), 1714 RESASG_SUBTYPE_RA_UDMAP_RX),
1715 .host_id = HOST_ID_C7X_1, 1715 .host_id = HOST_ID_C7X_0,
1716 }, 1716 },
1717 { 1717 {
1718 .start_resource = 81, 1718 .start_resource = 81,
@@ -1805,7 +1805,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = {
1805 .num_resource = 2, 1805 .num_resource = 2,
1806 .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_RINGACC_0, 1806 .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_RINGACC_0,
1807 RESASG_SUBTYPE_RA_UDMAP_TX), 1807 RESASG_SUBTYPE_RA_UDMAP_TX),
1808 .host_id = HOST_ID_C7X_1, 1808 .host_id = HOST_ID_C7X_0,
1809 }, 1809 },
1810 { 1810 {
1811 .start_resource = 33, 1811 .start_resource = 33,
@@ -1930,7 +1930,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = {
1930 .num_resource = 3, 1930 .num_resource = 3,
1931 .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_RINGACC_0, 1931 .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_RINGACC_0,
1932 RESASG_SUBTYPE_RA_MONITORS), 1932 RESASG_SUBTYPE_RA_MONITORS),
1933 .host_id = HOST_ID_C7X_1, 1933 .host_id = HOST_ID_C7X_0,
1934 }, 1934 },
1935 { 1935 {
1936 .start_resource = 20, 1936 .start_resource = 20,
@@ -2088,7 +2088,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = {
2088 .num_resource = 2, 2088 .num_resource = 2,
2089 .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_UDMAP_0, 2089 .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_UDMAP_0,
2090 RESASG_SUBTYPE_UDMAP_RX_CHAN), 2090 RESASG_SUBTYPE_UDMAP_RX_CHAN),
2091 .host_id = HOST_ID_C7X_1, 2091 .host_id = HOST_ID_C7X_0,
2092 }, 2092 },
2093 { 2093 {
2094 .start_resource = 33, 2094 .start_resource = 33,
@@ -2197,7 +2197,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = {
2197 .num_resource = 2, 2197 .num_resource = 2,
2198 .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_UDMAP_0, 2198 .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_UDMAP_0,
2199 RESASG_SUBTYPE_UDMAP_TX_CHAN), 2199 RESASG_SUBTYPE_UDMAP_TX_CHAN),
2200 .host_id = HOST_ID_C7X_1, 2200 .host_id = HOST_ID_C7X_0,
2201 }, 2201 },
2202 { 2202 {
2203 .start_resource = 33, 2203 .start_resource = 33,