Tools: Topology2: Update configuration blobs for Aria

The blob for Aria is updated for current ABI version and with options for all possible configurations. The new blobs are passthrough.conf, and blobs for parameter values 1 - 3. The benchmark topologies are configured to to use parameter value 2 (+12 dB level boost target) and parameter value 1 (+6 dB boost target). Signed-off-by: Seppo Ingalsuo <[email protected]>
thesofproject · Oct 28, 2024 · 6392107 · 6392107
1 parent 81eb004
commit 6392107
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 10 deletions.
diff --git a/tools/topology/topology2/cavs-benchmark-hda.conf b/tools/topology/topology2/cavs-benchmark-hda.conf
@@ -161,6 +161,12 @@ IncludeByKey.BENCH_CONFIG {
 						]
 						Object.Control.bytes."1" {
 							name '$ANALOG_PLAYBACK_PCM ARIA bytes'
+							IncludeByKey.BENCH_ARIA_PARAMS {
+								"passthrough"	"include/components/aria/passthrough.conf"
+								"param_1"	"include/components/aria/param_1.conf"
+								"param_2"	"include/components/aria/param_2.conf"
+								"param_3"	"include/components/aria/param_3.conf"
+							}
 						}
 					}
 					Object.Widget.mixout.1 {

diff --git a/tools/topology/topology2/development/tplg-targets-bench.cmake b/tools/topology/topology2/development/tplg-targets-bench.cmake
@@ -42,7 +42,7 @@ set(components_s24
 )
 
 set(component_parameters_s24
-	"BENCH_ARIA_PARAMS=default"
+	"BENCH_ARIA_PARAMS=param_2"
 )
 
 # Add components with all sample formats

diff --git a/tools/topology/topology2/development/tplg-targets.cmake b/tools/topology/topology2/development/tplg-targets.cmake
@@ -258,7 +258,7 @@ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-nocodec-bt-mtl-lbm.bin"
 
 # CAVS HDA topology for benchmarking performance
 # Copier - peak volume - mixin - mixout - aria - peak volume - mixin - mixout - copier
-"sof-hda-generic\;sof-hda-benchmark-generic\;HDA_CONFIG=benchmark,BENCH_CONFIG=benchmark"
+"sof-hda-generic\;sof-hda-benchmark-generic\;HDA_CONFIG=benchmark,BENCH_CONFIG=benchmark,BENCH_ARIA_PARAMS=param_1"
 
 # Topology to test IPC4 Crossover
 "development/cavs-nocodec-crossover\;sof-tgl-nocodec-crossover-2way\;PLATFORM=tgl,\

diff --git a/tools/topology/topology2/include/bench/aria_controls_capture.conf b/tools/topology/topology2/include/bench/aria_controls_capture.conf
@@ -3,6 +3,12 @@
 			Object.Control {
 				bytes."1" {
 					name '$ANALOG_CAPTURE_PCM ARIA bytes'
+					IncludeByKey.BENCH_ARIA_PARAMS {
+						"passthrough"	"include/components/aria/passthrough.conf"
+						"param_1"	"include/components/aria/param_1.conf"
+						"param_2"	"include/components/aria/param_2.conf"
+						"param_3"	"include/components/aria/param_3.conf"
+					}
 				}
 				#mixer."1" {
 				#	name '$ANALOG_CAPTURE_PCM ARIA switch or volume'

diff --git a/tools/topology/topology2/include/bench/aria_controls_playback.conf b/tools/topology/topology2/include/bench/aria_controls_playback.conf
@@ -3,6 +3,12 @@
 			Object.Control {
 				bytes."1" {
 					name '$ANALOG_PLAYBACK_PCM ARIA bytes'
+					IncludeByKey.BENCH_ARIA_PARAMS {
+						"passthrough"	"include/components/aria/passthrough.conf"
+						"param_1"	"include/components/aria/param_1.conf"
+						"param_2"	"include/components/aria/param_2.conf"
+						"param_3"	"include/components/aria/param_3.conf"
+					}
 				}
 				#mixer."1" {
 				#	name '$ANALOG_PLAYBACK_PCM ARIA switch or volume'

diff --git a/tools/topology/topology2/include/components/aria.conf b/tools/topology/topology2/include/components/aria.conf
@@ -43,14 +43,6 @@ Class.Widget."aria" {
 			put 0
 		}
 		max 4096
-		Object.Base.data. 1 {
-			# attenuation for the aria module
-			bytes "0x53, 0x4f, 0x46, 0x34, 0x01, 0x00, 0x00, 0x00,
-			0x4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x01, 0x00, 0x00, 0x00"
-		}
 	}
 
 	# Attribute categories

diff --git a/tools/topology/topology2/include/components/aria/param_1.conf b/tools/topology/topology2/include/components/aria/param_1.conf
@@ -0,0 +1,10 @@
+# Exported with script sof_aria_blobs.m 24-Oct-2024
+# cd tools/tune/aria; octave sof_aria_blobs.m
+Object.Base.data."aria_config" {
+	bytes "
+		0x53,0x4f,0x46,0x34,0x01,0x00,0x00,0x00,
+		0x04,0x00,0x00,0x00,0x00,0xa0,0x01,0x03,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x01,0x00,0x00,0x00"
+}
diff --git a/tools/topology/topology2/include/components/aria/param_2.conf b/tools/topology/topology2/include/components/aria/param_2.conf
@@ -0,0 +1,10 @@
+# Exported with script sof_aria_blobs.m 24-Oct-2024
+# cd tools/tune/aria; octave sof_aria_blobs.m
+Object.Base.data."aria_config" {
+	bytes "
+		0x53,0x4f,0x46,0x34,0x01,0x00,0x00,0x00,
+		0x04,0x00,0x00,0x00,0x00,0xa0,0x01,0x03,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x02,0x00,0x00,0x00"
+}
diff --git a/tools/topology/topology2/include/components/aria/param_3.conf b/tools/topology/topology2/include/components/aria/param_3.conf
@@ -0,0 +1,10 @@
+# Exported with script sof_aria_blobs.m 24-Oct-2024
+# cd tools/tune/aria; octave sof_aria_blobs.m
+Object.Base.data."aria_config" {
+	bytes "
+		0x53,0x4f,0x46,0x34,0x01,0x00,0x00,0x00,
+		0x04,0x00,0x00,0x00,0x00,0xa0,0x01,0x03,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x03,0x00,0x00,0x00"
+}
diff --git a/tools/topology/topology2/include/components/aria/passthrough.conf b/tools/topology/topology2/include/components/aria/passthrough.conf
@@ -0,0 +1,10 @@
+# Exported with script sof_aria_blobs.m 24-Oct-2024
+# cd tools/tune/aria; octave sof_aria_blobs.m
+Object.Base.data."aria_config" {
+	bytes "
+		0x53,0x4f,0x46,0x34,0x01,0x00,0x00,0x00,
+		0x04,0x00,0x00,0x00,0x00,0xa0,0x01,0x03,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+		0x00,0x00,0x00,0x00"
+}