From a9a43d5effcd17b4f3364cc7e6d483abd7f56e0f Mon Sep 17 00:00:00 2001
From: nehamalcom <n-francis@ti.com>
Date: Thu, 3 Nov 2022 15:23:11 +0530
Subject: [PATCH] j784s4: j721s2: j721e: Update RM data

k3-resource-partitioning tool updated to reflect these changes:
	* j784s4: increase the number of MAIN NAVSS DMA Block Copy
	  allocated to mcu4_0
	* j721s2: increase the number of DMA Rx/Tx channels allocated to
	  Linux
	* j721e/j721s2: updates to support HWA allocation on any core

Signed-off-by: Neha Francis <n-francis@ti.com>
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
---
 soc/j721e/evm/rm-cfg.c         |  6 ++---
 soc/j721e/evm/sysfw_img_cfg.h  |  3 ++-
 soc/j721s2/evm/rm-cfg.c        | 34 ++++++++++++------------
 soc/j721s2/evm/sysfw_img_cfg.h |  3 ++-
 soc/j784s4/evm/rm-cfg.c        | 48 +++++++++++++++++-----------------
 soc/j784s4/evm/tifs-rm-cfg.c   | 48 +++++++++++++++++-----------------
 6 files changed, 70 insertions(+), 72 deletions(-)

diff --git a/soc/j721e/evm/rm-cfg.c b/soc/j721e/evm/rm-cfg.c
index 88cce93..04127fb 100644
--- a/soc/j721e/evm/rm-cfg.c
+++ b/soc/j721e/evm/rm-cfg.c
@@ -1021,7 +1021,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = {
 					RESASG_SUBTYPE_RA_UDMAP_TX),
 			.host_id = HOST_ID_ALL,
 		},
-		/* Main NAVSS Rings for extended Tx channels for DRU */
+		/* Main NAVSS Rings for extended Tx channels */
 		{
 			.start_resource = 140,
 			.num_resource = 16,
@@ -1057,7 +1057,6 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = {
 					RESASG_SUBTYPE_RA_UDMAP_TX_EXT),
 			.host_id = HOST_ID_MAIN_0_R5_2,
 		},
-		/* Main NAVSS Rings for extended Tx channels for HWA */
 		{
 			.start_resource = 172,
 			.num_resource = 96,
@@ -1702,7 +1701,7 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = {
 					RESASG_SUBTYPE_UDMAP_TX_CHAN),
 			.host_id = HOST_ID_ALL,
 		},
-		/* Main NAVSS UDMA extended Tx channels for DRU */
+		/* Main NAVSS UDMA Extended Tx channels */
 		{
 			.start_resource = 140,
 			.num_resource = 16,
@@ -1738,7 +1737,6 @@ const struct boardcfg_rm_local j721e_boardcfg_rm_data = {
 					RESASG_SUBTYPE_UDMAP_TX_ECHAN),
 			.host_id = HOST_ID_MAIN_0_R5_2,
 		},
-		/* Main NAVSS UDMA extended Tx channels for HWA */
 		{
 			.start_resource = 172,
 			.num_resource = 96,
diff --git a/soc/j721e/evm/sysfw_img_cfg.h b/soc/j721e/evm/sysfw_img_cfg.h
index 5bd33a4..13f08f1 100644
--- a/soc/j721e/evm/sysfw_img_cfg.h
+++ b/soc/j721e/evm/sysfw_img_cfg.h
@@ -37,6 +37,7 @@
 #ifndef SYSFW_IMG_CFG_H
 #define SYSFW_IMG_CFG_H
 
-#define BOARDCFG_RM_RESASG_ENTRIES	418
+#define BOARDCFG_RM_RESASG_ENTRIES			418
+#define BOARDCFG_TIFS_RM_RESASG_ENTRIES		347
 
 #endif /* SYSFW_IMG_CFG_H */
diff --git a/soc/j721s2/evm/rm-cfg.c b/soc/j721s2/evm/rm-cfg.c
index ba1c22e..c77c2c0 100644
--- a/soc/j721s2/evm/rm-cfg.c
+++ b/soc/j721s2/evm/rm-cfg.c
@@ -707,14 +707,14 @@ const struct boardcfg_rm_local j721s2_boardcfg_rm_data = {
 		},
 		{
 			.start_resource = 368,
-			.num_resource = 16,
+			.num_resource = 22,
 			.type = RESASG_UTYPE (J721S2_DEV_NAVSS0_RINGACC_0,
 					RESASG_SUBTYPE_RA_UDMAP_RX),
 			.host_id = HOST_ID_A72_2,
 		},
 		{
-			.start_resource = 384,
-			.num_resource = 12,
+			.start_resource = 390,
+			.num_resource = 6,
 			.type = RESASG_UTYPE (J721S2_DEV_NAVSS0_RINGACC_0,
 					RESASG_SUBTYPE_RA_UDMAP_RX),
 			.host_id = HOST_ID_A72_3,
@@ -841,14 +841,14 @@ const struct boardcfg_rm_local j721s2_boardcfg_rm_data = {
 		},
 		{
 			.start_resource = 27,
-			.num_resource = 16,
+			.num_resource = 22,
 			.type = RESASG_UTYPE (J721S2_DEV_NAVSS0_RINGACC_0,
 					RESASG_SUBTYPE_RA_UDMAP_TX),
 			.host_id = HOST_ID_A72_2,
 		},
 		{
-			.start_resource = 43,
-			.num_resource = 12,
+			.start_resource = 49,
+			.num_resource = 6,
 			.type = RESASG_UTYPE (J721S2_DEV_NAVSS0_RINGACC_0,
 					RESASG_SUBTYPE_RA_UDMAP_TX),
 			.host_id = HOST_ID_A72_3,
@@ -902,7 +902,7 @@ const struct boardcfg_rm_local j721s2_boardcfg_rm_data = {
 					RESASG_SUBTYPE_RA_UDMAP_TX),
 			.host_id = HOST_ID_ALL,
 		},
-		/* Main NAVSS Rings for extended Tx channels for DRU */
+		/* Main NAVSS Rings for extended Tx channels */
 		{
 			.start_resource = 85,
 			.num_resource = 16,
@@ -931,10 +931,9 @@ const struct boardcfg_rm_local j721s2_boardcfg_rm_data = {
 					RESASG_SUBTYPE_RA_UDMAP_TX_EXT),
 			.host_id = HOST_ID_MAIN_0_R5_2,
 		},
-		/* Main NAVSS Rings for extended Tx channels for HWA */
 		{
 			.start_resource = 117,
-			.num_resource = 192,
+			.num_resource = 96,
 			.type = RESASG_UTYPE (J721S2_DEV_NAVSS0_RINGACC_0,
 					RESASG_SUBTYPE_RA_UDMAP_TX_EXT),
 			.host_id = HOST_ID_MAIN_0_R5_0,
@@ -1218,14 +1217,14 @@ const struct boardcfg_rm_local j721s2_boardcfg_rm_data = {
 		},
 		{
 			.start_resource = 27,
-			.num_resource = 16,
+			.num_resource = 22,
 			.type = RESASG_UTYPE (J721S2_DEV_NAVSS0_UDMAP_0,
 					RESASG_SUBTYPE_UDMAP_RX_CHAN),
 			.host_id = HOST_ID_A72_2,
 		},
 		{
-			.start_resource = 43,
-			.num_resource = 12,
+			.start_resource = 49,
+			.num_resource = 6,
 			.type = RESASG_UTYPE (J721S2_DEV_NAVSS0_UDMAP_0,
 					RESASG_SUBTYPE_UDMAP_RX_CHAN),
 			.host_id = HOST_ID_A72_3,
@@ -1382,14 +1381,14 @@ const struct boardcfg_rm_local j721s2_boardcfg_rm_data = {
 		},
 		{
 			.start_resource = 27,
-			.num_resource = 16,
+			.num_resource = 22,
 			.type = RESASG_UTYPE (J721S2_DEV_NAVSS0_UDMAP_0,
 					RESASG_SUBTYPE_UDMAP_TX_CHAN),
 			.host_id = HOST_ID_A72_2,
 		},
 		{
-			.start_resource = 43,
-			.num_resource = 12,
+			.start_resource = 49,
+			.num_resource = 6,
 			.type = RESASG_UTYPE (J721S2_DEV_NAVSS0_UDMAP_0,
 					RESASG_SUBTYPE_UDMAP_TX_CHAN),
 			.host_id = HOST_ID_A72_3,
@@ -1443,7 +1442,7 @@ const struct boardcfg_rm_local j721s2_boardcfg_rm_data = {
 					RESASG_SUBTYPE_UDMAP_TX_CHAN),
 			.host_id = HOST_ID_ALL,
 		},
-		/* Main NAVSS UDMA Extended Tx channels for DRU */
+		/* Main NAVSS UDMA Extended Tx channels */
 		{
 			.start_resource = 85,
 			.num_resource = 16,
@@ -1472,10 +1471,9 @@ const struct boardcfg_rm_local j721s2_boardcfg_rm_data = {
 					RESASG_SUBTYPE_UDMAP_TX_ECHAN),
 			.host_id = HOST_ID_MAIN_0_R5_2,
 		},
-		/* Main NAVSS UDMA Extended Tx channels for HWA */
 		{
 			.start_resource = 117,
-			.num_resource = 192,
+			.num_resource = 96,
 			.type = RESASG_UTYPE (J721S2_DEV_NAVSS0_UDMAP_0,
 					RESASG_SUBTYPE_UDMAP_TX_ECHAN),
 			.host_id = HOST_ID_MAIN_0_R5_0,
diff --git a/soc/j721s2/evm/sysfw_img_cfg.h b/soc/j721s2/evm/sysfw_img_cfg.h
index 862d9c2..b3d7d76 100644
--- a/soc/j721s2/evm/sysfw_img_cfg.h
+++ b/soc/j721s2/evm/sysfw_img_cfg.h
@@ -37,6 +37,7 @@
 #ifndef SYSFW_IMG_CFG_H
 #define SYSFW_IMG_CFG_H
 
-#define BOARDCFG_RM_RESASG_ENTRIES	379
+#define BOARDCFG_RM_RESASG_ENTRIES			379
+#define BOARDCFG_TIFS_RM_RESASG_ENTRIES		317
 
 #endif /* SYSFW_IMG_CFG_H */
diff --git a/soc/j784s4/evm/rm-cfg.c b/soc/j784s4/evm/rm-cfg.c
index b156cac..7569960 100644
--- a/soc/j784s4/evm/rm-cfg.c
+++ b/soc/j784s4/evm/rm-cfg.c
@@ -844,28 +844,28 @@ const struct boardcfg_rm_local j784s4_boardcfg_rm_data = {
 		},
 		{
 			.start_resource = 362,
-			.num_resource = 1,
+			.num_resource = 3,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_RINGACC_0,
 					RESASG_SUBTYPE_RA_UDMAP_RX),
 			.host_id = HOST_ID_MAIN_2_R5_0,
 		},
 		{
-			.start_resource = 363,
+			.start_resource = 365,
 			.num_resource = 1,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_RINGACC_0,
 					RESASG_SUBTYPE_RA_UDMAP_RX),
 			.host_id = HOST_ID_MAIN_2_R5_2,
 		},
 		{
-			.start_resource = 364,
-			.num_resource = 2,
+			.start_resource = 366,
+			.num_resource = 1,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_RINGACC_0,
 					RESASG_SUBTYPE_RA_UDMAP_RX),
 			.host_id = HOST_ID_MCU_0_R5_0,
 		},
 		{
-			.start_resource = 366,
-			.num_resource = 2,
+			.start_resource = 367,
+			.num_resource = 1,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_RINGACC_0,
 					RESASG_SUBTYPE_RA_UDMAP_RX),
 			.host_id = HOST_ID_MCU_0_R5_2,
@@ -1027,28 +1027,28 @@ const struct boardcfg_rm_local j784s4_boardcfg_rm_data = {
 		},
 		{
 			.start_resource = 21,
-			.num_resource = 1,
+			.num_resource = 3,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_RINGACC_0,
 					RESASG_SUBTYPE_RA_UDMAP_TX),
 			.host_id = HOST_ID_MAIN_2_R5_0,
 		},
 		{
-			.start_resource = 22,
+			.start_resource = 24,
 			.num_resource = 1,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_RINGACC_0,
 					RESASG_SUBTYPE_RA_UDMAP_TX),
 			.host_id = HOST_ID_MAIN_2_R5_2,
 		},
 		{
-			.start_resource = 23,
-			.num_resource = 2,
+			.start_resource = 25,
+			.num_resource = 1,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_RINGACC_0,
 					RESASG_SUBTYPE_RA_UDMAP_TX),
 			.host_id = HOST_ID_MCU_0_R5_0,
 		},
 		{
-			.start_resource = 25,
-			.num_resource = 2,
+			.start_resource = 26,
+			.num_resource = 1,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_RINGACC_0,
 					RESASG_SUBTYPE_RA_UDMAP_TX),
 			.host_id = HOST_ID_MCU_0_R5_2,
@@ -1508,28 +1508,28 @@ const struct boardcfg_rm_local j784s4_boardcfg_rm_data = {
 		},
 		{
 			.start_resource = 21,
-			.num_resource = 1,
+			.num_resource = 3,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_UDMAP_0,
 					RESASG_SUBTYPE_UDMAP_RX_CHAN),
 			.host_id = HOST_ID_MAIN_2_R5_0,
 		},
 		{
-			.start_resource = 22,
+			.start_resource = 24,
 			.num_resource = 1,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_UDMAP_0,
 					RESASG_SUBTYPE_UDMAP_RX_CHAN),
 			.host_id = HOST_ID_MAIN_2_R5_2,
 		},
 		{
-			.start_resource = 23,
-			.num_resource = 2,
+			.start_resource = 25,
+			.num_resource = 1,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_UDMAP_0,
 					RESASG_SUBTYPE_UDMAP_RX_CHAN),
 			.host_id = HOST_ID_MCU_0_R5_0,
 		},
 		{
-			.start_resource = 25,
-			.num_resource = 2,
+			.start_resource = 26,
+			.num_resource = 1,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_UDMAP_0,
 					RESASG_SUBTYPE_UDMAP_RX_CHAN),
 			.host_id = HOST_ID_MCU_0_R5_2,
@@ -1721,28 +1721,28 @@ const struct boardcfg_rm_local j784s4_boardcfg_rm_data = {
 		},
 		{
 			.start_resource = 21,
-			.num_resource = 1,
+			.num_resource = 3,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_UDMAP_0,
 					RESASG_SUBTYPE_UDMAP_TX_CHAN),
 			.host_id = HOST_ID_MAIN_2_R5_0,
 		},
 		{
-			.start_resource = 22,
+			.start_resource = 24,
 			.num_resource = 1,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_UDMAP_0,
 					RESASG_SUBTYPE_UDMAP_TX_CHAN),
 			.host_id = HOST_ID_MAIN_2_R5_2,
 		},
 		{
-			.start_resource = 23,
-			.num_resource = 2,
+			.start_resource = 25,
+			.num_resource = 1,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_UDMAP_0,
 					RESASG_SUBTYPE_UDMAP_TX_CHAN),
 			.host_id = HOST_ID_MCU_0_R5_0,
 		},
 		{
-			.start_resource = 25,
-			.num_resource = 2,
+			.start_resource = 26,
+			.num_resource = 1,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_UDMAP_0,
 					RESASG_SUBTYPE_UDMAP_TX_CHAN),
 			.host_id = HOST_ID_MCU_0_R5_2,
diff --git a/soc/j784s4/evm/tifs-rm-cfg.c b/soc/j784s4/evm/tifs-rm-cfg.c
index 7024177..64b8956 100755
--- a/soc/j784s4/evm/tifs-rm-cfg.c
+++ b/soc/j784s4/evm/tifs-rm-cfg.c
@@ -561,28 +561,28 @@ const struct boardcfg_tifs_rm_local j784s4_boardcfg_rm_data = {
 		},
 		{
 			.start_resource = 362,
-			.num_resource = 1,
+			.num_resource = 3,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_RINGACC_0,
 					RESASG_SUBTYPE_RA_UDMAP_RX),
 			.host_id = HOST_ID_MAIN_2_R5_0,
 		},
 		{
-			.start_resource = 363,
+			.start_resource = 365,
 			.num_resource = 1,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_RINGACC_0,
 					RESASG_SUBTYPE_RA_UDMAP_RX),
 			.host_id = HOST_ID_MAIN_2_R5_2,
 		},
 		{
-			.start_resource = 364,
-			.num_resource = 2,
+			.start_resource = 366,
+			.num_resource = 1,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_RINGACC_0,
 					RESASG_SUBTYPE_RA_UDMAP_RX),
 			.host_id = HOST_ID_MCU_0_R5_0,
 		},
 		{
-			.start_resource = 366,
-			.num_resource = 2,
+			.start_resource = 367,
+			.num_resource = 1,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_RINGACC_0,
 					RESASG_SUBTYPE_RA_UDMAP_RX),
 			.host_id = HOST_ID_MCU_0_R5_2,
@@ -744,28 +744,28 @@ const struct boardcfg_tifs_rm_local j784s4_boardcfg_rm_data = {
 		},
 		{
 			.start_resource = 21,
-			.num_resource = 1,
+			.num_resource = 3,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_RINGACC_0,
 					RESASG_SUBTYPE_RA_UDMAP_TX),
 			.host_id = HOST_ID_MAIN_2_R5_0,
 		},
 		{
-			.start_resource = 22,
+			.start_resource = 24,
 			.num_resource = 1,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_RINGACC_0,
 					RESASG_SUBTYPE_RA_UDMAP_TX),
 			.host_id = HOST_ID_MAIN_2_R5_2,
 		},
 		{
-			.start_resource = 23,
-			.num_resource = 2,
+			.start_resource = 25,
+			.num_resource = 1,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_RINGACC_0,
 					RESASG_SUBTYPE_RA_UDMAP_TX),
 			.host_id = HOST_ID_MCU_0_R5_0,
 		},
 		{
-			.start_resource = 25,
-			.num_resource = 2,
+			.start_resource = 26,
+			.num_resource = 1,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_RINGACC_0,
 					RESASG_SUBTYPE_RA_UDMAP_TX),
 			.host_id = HOST_ID_MCU_0_R5_2,
@@ -1213,28 +1213,28 @@ const struct boardcfg_tifs_rm_local j784s4_boardcfg_rm_data = {
 		},
 		{
 			.start_resource = 21,
-			.num_resource = 1,
+			.num_resource = 3,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_UDMAP_0,
 					RESASG_SUBTYPE_UDMAP_RX_CHAN),
 			.host_id = HOST_ID_MAIN_2_R5_0,
 		},
 		{
-			.start_resource = 22,
+			.start_resource = 24,
 			.num_resource = 1,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_UDMAP_0,
 					RESASG_SUBTYPE_UDMAP_RX_CHAN),
 			.host_id = HOST_ID_MAIN_2_R5_2,
 		},
 		{
-			.start_resource = 23,
-			.num_resource = 2,
+			.start_resource = 25,
+			.num_resource = 1,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_UDMAP_0,
 					RESASG_SUBTYPE_UDMAP_RX_CHAN),
 			.host_id = HOST_ID_MCU_0_R5_0,
 		},
 		{
-			.start_resource = 25,
-			.num_resource = 2,
+			.start_resource = 26,
+			.num_resource = 1,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_UDMAP_0,
 					RESASG_SUBTYPE_UDMAP_RX_CHAN),
 			.host_id = HOST_ID_MCU_0_R5_2,
@@ -1426,28 +1426,28 @@ const struct boardcfg_tifs_rm_local j784s4_boardcfg_rm_data = {
 		},
 		{
 			.start_resource = 21,
-			.num_resource = 1,
+			.num_resource = 3,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_UDMAP_0,
 					RESASG_SUBTYPE_UDMAP_TX_CHAN),
 			.host_id = HOST_ID_MAIN_2_R5_0,
 		},
 		{
-			.start_resource = 22,
+			.start_resource = 24,
 			.num_resource = 1,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_UDMAP_0,
 					RESASG_SUBTYPE_UDMAP_TX_CHAN),
 			.host_id = HOST_ID_MAIN_2_R5_2,
 		},
 		{
-			.start_resource = 23,
-			.num_resource = 2,
+			.start_resource = 25,
+			.num_resource = 1,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_UDMAP_0,
 					RESASG_SUBTYPE_UDMAP_TX_CHAN),
 			.host_id = HOST_ID_MCU_0_R5_0,
 		},
 		{
-			.start_resource = 25,
-			.num_resource = 2,
+			.start_resource = 26,
+			.num_resource = 1,
 			.type = RESASG_UTYPE (J784S4_DEV_NAVSS0_UDMAP_0,
 					RESASG_SUBTYPE_UDMAP_TX_CHAN),
 			.host_id = HOST_ID_MCU_0_R5_2,
-- 
GitLab