From 14237ed1264aea54c7decb3163e33f54d8ef3092 Mon Sep 17 00:00:00 2001
From: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
Date: Tue, 19 Dec 2023 16:14:04 +0200
Subject: [PATCH] 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>
---
 src/audio/rtnr/rtnr.toml       | 17 +++++++++++++++++
 tools/rimage/config/lnl.toml   | 18 +++++++++++++++++-
 tools/rimage/config/mtl.toml.h |  4 ++++
 tools/rimage/config/tgl-h.toml | 18 +++++++++++++++++-
 tools/rimage/config/tgl.toml   | 18 +++++++++++++++++-
 5 files changed, 72 insertions(+), 3 deletions(-)
 create mode 100644 src/audio/rtnr/rtnr.toml

diff --git a/src/audio/rtnr/rtnr.toml b/src/audio/rtnr/rtnr.toml
new file mode 100644
index 000000000000..f071d5845bdf
--- /dev/null
+++ b/src/audio/rtnr/rtnr.toml
@@ -0,0 +1,17 @@
+	// 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]
+
+	index = __COUNTER__
diff --git a/tools/rimage/config/lnl.toml b/tools/rimage/config/lnl.toml
index 879ec9097231..4af33a2b365f 100644
--- 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.h b/tools/rimage/config/mtl.toml.h
index a5472ec6e736..efe33899e71f 100644
--- a/tools/rimage/config/mtl.toml.h
+++ b/tools/rimage/config/mtl.toml.h
@@ -177,5 +177,9 @@ load_offset = "0x40000"
 #include <audio/module_adapter/module/cadence.toml>
 #endif
 
+#ifdef CONFIG_COMP_RTNR
+#include <audio/rtnr/rtnr.toml>
+#endif
+
 [module]
 count = __COUNTER__
diff --git a/tools/rimage/config/tgl-h.toml b/tools/rimage/config/tgl-h.toml
index e84736ea1fa0..4c119eb3cd9b 100644
--- 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
index 3811e2e170c7..9ceabe135f33 100644
--- 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]