summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 66edc26)
raw | patch | inline | side by side (parent: 66edc26)
author | Nikhil Devshatwar <nikhil.nd@ti.com> | |
Mon, 20 Jan 2020 18:51:16 +0000 (00:21 +0530) | ||
committer | Lokesh Vutla <lokeshvutla@ti.com> | |
Wed, 22 Jan 2020 05:47:05 +0000 (11:17 +0530) |
Maximum number of entries supported in RM board config is
currently limited to 276 (2 * RESASG_UTYPE_CNT)
Any board config with more entries than this count will be
rejected and causes boot failure.
This needs to be fixed by increasing the max limit in SYSFW.
In the absence of this bugfix, restrict the number of entries
by folding all of R5, C6x, C7x host_id entries into single entry.
Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
currently limited to 276 (2 * RESASG_UTYPE_CNT)
Any board config with more entries than this count will be
rejected and causes boot failure.
This needs to be fixed by increasing the max limit in SYSFW.
In the absence of this bugfix, restrict the number of entries
by folding all of R5, C6x, C7x host_id entries into single entry.
Signed-off-by: Nikhil Devshatwar <nikhil.nd@ti.com>
soc/j721e/evm/rm-cfg.c | patch | blob | history | |
soc/j721e/evm/sysfw_img_cfg.h | patch | blob | history |
diff --git a/soc/j721e/evm/rm-cfg.c b/soc/j721e/evm/rm-cfg.c
index af1fa9653146b9f0dc1dc0d098721f52e0a27ed2..82bfe060699031d511bce4d7a81276b96709d3a5 100644 (file)
--- a/soc/j721e/evm/rm-cfg.c
+++ b/soc/j721e/evm/rm-cfg.c
},
{
.start_resource = 5,
- .num_resource = 1,
- .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0,
- RESASG_SUBTYPE_RA_MONITORS),
- .host_id = HOST_ID_MCU_0_R5_0,
- },
- {
- .start_resource = 6,
- .num_resource = 1,
- .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0,
- RESASG_SUBTYPE_RA_MONITORS),
- .host_id = HOST_ID_MCU_0_R5_2,
- },
- {
- .start_resource = 7,
- .num_resource = 3,
- .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0,
- RESASG_SUBTYPE_RA_MONITORS),
- .host_id = HOST_ID_MAIN_1_R5_0,
- },
- {
- .start_resource = 10,
- .num_resource = 3,
- .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0,
- RESASG_SUBTYPE_RA_MONITORS),
- .host_id = HOST_ID_MAIN_1_R5_2,
- },
- {
- .start_resource = 13,
- .num_resource = 3,
- .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0,
- RESASG_SUBTYPE_RA_MONITORS),
- .host_id = HOST_ID_C7X_1,
- },
- {
- .start_resource = 16,
- .num_resource = 3,
- .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0,
- RESASG_SUBTYPE_RA_MONITORS),
- .host_id = HOST_ID_C6X_0_1,
- },
- {
- .start_resource = 19,
- .num_resource = 3,
- .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0,
- RESASG_SUBTYPE_RA_MONITORS),
- .host_id = HOST_ID_C6X_1_1,
- },
- {
- .start_resource = 22,
- .num_resource = 6,
- .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0,
- RESASG_SUBTYPE_RA_MONITORS),
- .host_id = HOST_ID_MAIN_0_R5_0,
- },
- {
- .start_resource = 28,
- .num_resource = 3,
- .type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0,
- RESASG_SUBTYPE_RA_MONITORS),
- .host_id = HOST_ID_MAIN_0_R5_2,
- },
- {
- .start_resource = 31,
- .num_resource = 1,
+ .num_resource = 27,
.type = RESASG_UTYPE (J721E_DEV_NAVSS0_RINGACC_0,
RESASG_SUBTYPE_RA_MONITORS),
.host_id = HOST_ID_ALL,
},
{
.start_resource = 8,
- .num_resource = 4,
- .type = RESASG_UTYPE (J721E_DEV_NAVSS0_PROXY_0,
- RESASG_SUBTYPE_PROXY_PROXIES),
- .host_id = HOST_ID_MCU_0_R5_0,
- },
- {
- .start_resource = 12,
- .num_resource = 4,
- .type = RESASG_UTYPE (J721E_DEV_NAVSS0_PROXY_0,
- RESASG_SUBTYPE_PROXY_PROXIES),
- .host_id = HOST_ID_MCU_0_R5_2,
- },
- {
- .start_resource = 16,
- .num_resource = 4,
- .type = RESASG_UTYPE (J721E_DEV_NAVSS0_PROXY_0,
- RESASG_SUBTYPE_PROXY_PROXIES),
- .host_id = HOST_ID_MAIN_1_R5_0,
- },
- {
- .start_resource = 20,
- .num_resource = 4,
- .type = RESASG_UTYPE (J721E_DEV_NAVSS0_PROXY_0,
- RESASG_SUBTYPE_PROXY_PROXIES),
- .host_id = HOST_ID_MAIN_1_R5_2,
- },
- {
- .start_resource = 24,
- .num_resource = 4,
- .type = RESASG_UTYPE (J721E_DEV_NAVSS0_PROXY_0,
- RESASG_SUBTYPE_PROXY_PROXIES),
- .host_id = HOST_ID_C7X_1,
- },
- {
- .start_resource = 28,
- .num_resource = 4,
- .type = RESASG_UTYPE (J721E_DEV_NAVSS0_PROXY_0,
- RESASG_SUBTYPE_PROXY_PROXIES),
- .host_id = HOST_ID_C6X_0_1,
- },
- {
- .start_resource = 32,
- .num_resource = 4,
- .type = RESASG_UTYPE (J721E_DEV_NAVSS0_PROXY_0,
- RESASG_SUBTYPE_PROXY_PROXIES),
- .host_id = HOST_ID_C6X_1_1,
- },
- {
- .start_resource = 36,
- .num_resource = 8,
- .type = RESASG_UTYPE (J721E_DEV_NAVSS0_PROXY_0,
- RESASG_SUBTYPE_PROXY_PROXIES),
- .host_id = HOST_ID_MAIN_0_R5_0,
- },
- {
- .start_resource = 44,
- .num_resource = 8,
- .type = RESASG_UTYPE (J721E_DEV_NAVSS0_PROXY_0,
- RESASG_SUBTYPE_PROXY_PROXIES),
- .host_id = HOST_ID_MAIN_0_R5_2,
- },
- {
- .start_resource = 52,
- .num_resource = 12,
+ .num_resource = 56,
.type = RESASG_UTYPE (J721E_DEV_NAVSS0_PROXY_0,
RESASG_SUBTYPE_PROXY_PROXIES),
.host_id = HOST_ID_ALL,
},
{
.start_resource = 5,
- .num_resource = 3,
+ .num_resource = 27,
.type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_RINGACC_0,
RESASG_SUBTYPE_RA_MONITORS),
- .host_id = HOST_ID_MCU_0_R5_0,
- },
- {
- .start_resource = 8,
- .num_resource = 3,
- .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_RINGACC_0,
- RESASG_SUBTYPE_RA_MONITORS),
- .host_id = HOST_ID_MCU_0_R5_2,
- },
- {
- .start_resource = 11,
- .num_resource = 3,
- .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_RINGACC_0,
- RESASG_SUBTYPE_RA_MONITORS),
- .host_id = HOST_ID_MAIN_1_R5_0,
- },
- {
- .start_resource = 14,
- .num_resource = 3,
- .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_RINGACC_0,
- RESASG_SUBTYPE_RA_MONITORS),
- .host_id = HOST_ID_MAIN_1_R5_2,
- },
- {
- .start_resource = 17,
- .num_resource = 3,
- .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_RINGACC_0,
- RESASG_SUBTYPE_RA_MONITORS),
- .host_id = HOST_ID_C7X_1,
- },
- {
- .start_resource = 20,
- .num_resource = 3,
- .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_RINGACC_0,
- RESASG_SUBTYPE_RA_MONITORS),
- .host_id = HOST_ID_C6X_0_1,
- },
- {
- .start_resource = 23,
- .num_resource = 3,
- .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_RINGACC_0,
- RESASG_SUBTYPE_RA_MONITORS),
- .host_id = HOST_ID_C6X_1_1,
- },
- {
- .start_resource = 26,
- .num_resource = 3,
- .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_RINGACC_0,
- RESASG_SUBTYPE_RA_MONITORS),
- .host_id = HOST_ID_MAIN_0_R5_0,
- },
- {
- .start_resource = 29,
- .num_resource = 3,
- .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_RINGACC_0,
- RESASG_SUBTYPE_RA_MONITORS),
- .host_id = HOST_ID_MAIN_0_R5_2,
+ .host_id = HOST_ID_ALL,
},
/* MCU Nav nonsecure proxies */
},
{
.start_resource = 9,
- .num_resource = 4,
- .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_PROXY_0,
- RESASG_SUBTYPE_PROXY_PROXIES),
- .host_id = HOST_ID_MCU_0_R5_0,
- },
- {
- .start_resource = 13,
- .num_resource = 4,
- .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_PROXY_0,
- RESASG_SUBTYPE_PROXY_PROXIES),
- .host_id = HOST_ID_MCU_0_R5_2,
- },
- {
- .start_resource = 17,
- .num_resource = 4,
- .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_PROXY_0,
- RESASG_SUBTYPE_PROXY_PROXIES),
- .host_id = HOST_ID_MAIN_1_R5_0,
- },
- {
- .start_resource = 21,
- .num_resource = 4,
- .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_PROXY_0,
- RESASG_SUBTYPE_PROXY_PROXIES),
- .host_id = HOST_ID_MAIN_1_R5_2,
- },
- {
- .start_resource = 25,
- .num_resource = 4,
- .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_PROXY_0,
- RESASG_SUBTYPE_PROXY_PROXIES),
- .host_id = HOST_ID_C7X_1,
- },
- {
- .start_resource = 29,
- .num_resource = 4,
- .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_PROXY_0,
- RESASG_SUBTYPE_PROXY_PROXIES),
- .host_id = HOST_ID_C6X_0_1,
- },
- {
- .start_resource = 33,
- .num_resource = 4,
- .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_PROXY_0,
- RESASG_SUBTYPE_PROXY_PROXIES),
- .host_id = HOST_ID_C6X_1_1,
- },
- {
- .start_resource = 37,
- .num_resource = 4,
- .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_PROXY_0,
- RESASG_SUBTYPE_PROXY_PROXIES),
- .host_id = HOST_ID_MAIN_0_R5_0,
- },
- {
- .start_resource = 41,
- .num_resource = 16,
- .type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_PROXY_0,
- RESASG_SUBTYPE_PROXY_PROXIES),
- .host_id = HOST_ID_MAIN_0_R5_2,
- },
- {
- .start_resource = 57,
- .num_resource = 7,
+ .num_resource = 55,
.type = RESASG_UTYPE (J721E_DEV_MCU_NAVSS0_PROXY_0,
RESASG_SUBTYPE_PROXY_PROXIES),
.host_id = HOST_ID_ALL,
index 8e149ddb97964a5bca35390a8ffd60514394bd2d..35f24ca8a56cfc3bd6a38b30afba22c60a4fefc7 100644 (file)
#ifndef SYSFW_IMG_CFG_H
#define SYSFW_IMG_CFG_H
-#define BOARDCFG_RM_RESASG_ENTRIES 305
+#define BOARDCFG_RM_RESASG_ENTRIES 270
#endif /* SYSFW_IMG_CFG_H */