Tools: Rimage: Add RTNR component to TGL, MTL, and LNL platforms

This patch allows load of RTNR component with these platforms. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
thesofproject · Dec 19, 2023 · 7756bfd · 7756bfd
1 parent af70eac
commit 7756bfd
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 5 deletions.
diff --git a/tools/rimage/config/lnl.toml b/tools/rimage/config/lnl.toml
@@ -56,7 +56,7 @@ name = "ADSPFW"
 load_offset = "0x40000"
 
 [module]
-count = 25
+count = 26
 	[[module.entry]]
 	name = "BRNGUP"
 	uuid = "2B79E4F3-4675-F649-89DF-3BC194A91AEB"
@@ -585,3 +585,19 @@ count = 25
 	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
 	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
 	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+
+	# RTNR module config
+	[[module.entry]]
+	name = "RTNR"
+	uuid = "5C7CA334-E15D-11EB-BA80-0242AC130004"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
diff --git a/tools/rimage/config/mtl.toml b/tools/rimage/config/mtl.toml
@@ -56,7 +56,7 @@ name = "ADSPFW"
 load_offset = "0x40000"
 
 [module]
-count = 28
+count = 29
 	[[module.entry]]
 	name = "BRNGUP"
 	uuid = "2B79E4F3-4675-F649-89DF-3BC194A91AEB"
@@ -710,4 +710,20 @@ count = 28
 			1, 0, 0xfeef, 0xf, 0xa, 0x45ff]
 
 	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
-	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
+
+	# RTNR module config
+	[[module.entry]]
+	name = "RTNR"
+	uuid = "5C7CA334-E15D-11EB-BA80-0242AC130004"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
diff --git a/tools/rimage/config/tgl-h.toml b/tools/rimage/config/tgl-h.toml
@@ -60,7 +60,7 @@ name = "ADSPFW"
 load_offset = "0x30000"
 
 [module]
-count = 22
+count = 23
 	[[module.entry]]
 	name = "BRNGUP"
 	uuid = "61EB0CB9-34D8-4F59-A21D-04C54C21D3A4"
@@ -513,3 +513,19 @@ count = 22
 	pin = [0, 0, 0x8, 0x2, 0x2, 0x1,
 	       0, 0, 0x8, 0x2, 0x2, 0x4,
 	       1, 0, 0x8, 0x2, 0x2, 0x1]
+
+	# RTNR module config
+	[[module.entry]]
+	name = "RTNR"
+	uuid = "5C7CA334-E15D-11EB-BA80-0242AC130004"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]
diff --git a/tools/rimage/config/tgl.toml b/tools/rimage/config/tgl.toml
@@ -60,7 +60,7 @@ name = "ADSPFW"
 load_offset = "0x30000"
 
 [module]
-count = 22
+count = 23
 	[[module.entry]]
 	name = "BRNGUP"
 	uuid = "61EB0CB9-34D8-4F59-A21D-04C54C21D3A4"
@@ -513,3 +513,19 @@ count = 22
 	pin = [0, 0, 0x8, 0x2, 0x2, 0x1,
 	       0, 0, 0x8, 0x2, 0x2, 0x4,
 	       1, 0, 0x8, 0x2, 0x2, 0x1]
+
+	# RTNR module config
+	[[module.entry]]
+	name = "RTNR"
+	uuid = "5C7CA334-E15D-11EB-BA80-0242AC130004"
+	affinity_mask = "0x1"
+	instance_count = "40"
+	domain_types = "0"
+	load_type = "0"
+	module_type = "9"
+	auto_start = "0"
+	sched_caps = [1, 0x00008000]
+	# pin = [dir, type, sample rate, size, container, channel-cfg]
+	pin = [0, 0, 0xfeef, 0xf, 0xf, 0x45ff, 1, 0, 0xfeef, 0xf, 0xf, 0x1ff]
+	# mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS]
+	mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0]