Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Tools: Rimage: Add RTNR component to TGL, MTL, and LNL platforms
Browse files Browse the repository at this point in the history
This patch allows load of RTNR component with these platforms.

Signed-off-by: Seppo Ingalsuo <[email protected]>
singalsu committed Jan 12, 2024
1 parent 1bd1654 commit 210899d
Showing 5 changed files with 72 additions and 3 deletions.
17 changes: 17 additions & 0 deletions src/audio/rtnr/rtnr.toml
Original file line number Diff line number Diff line change
@@ -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__
18 changes: 17 additions & 1 deletion tools/rimage/config/lnl.toml
Original file line number Diff line number Diff line change
@@ -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]
4 changes: 4 additions & 0 deletions tools/rimage/config/mtl.toml.h
Original file line number Diff line number Diff line change
@@ -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__
18 changes: 17 additions & 1 deletion tools/rimage/config/tgl-h.toml
Original file line number Diff line number Diff line change
@@ -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]
18 changes: 17 additions & 1 deletion tools/rimage/config/tgl.toml
Original file line number Diff line number Diff line change
@@ -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]

0 comments on commit 210899d

Please sign in to comment.