From 3cfdc7e82272b02b47734d8ffd82f949be627629 Mon Sep 17 00:00:00 2001 From: Adrian Bonislawski Date: Thu, 12 Jun 2025 10:20:22 +0200 Subject: [PATCH 1/3] toml: unify mod_cfg indexing This patch will fix mod_cfg indexing and always start from 0 Signed-off-by: Adrian Bonislawski --- src/audio/asrc/asrc.toml | 30 ++++---- src/audio/copier/copier.toml | 82 +++++++++++----------- src/audio/mixin_mixout/mixin_mixout.toml | 20 +++--- src/audio/src/src.toml | 52 +++++++------- src/audio/up_down_mixer/up_down_mixer.toml | 54 +++++++------- src/audio/volume/volume.toml | 20 +++--- src/debug/tester/tester.toml | 52 +++++++------- tools/rimage/config/tgl-h.toml | 30 ++++---- tools/rimage/config/tgl.toml | 30 ++++---- 9 files changed, 185 insertions(+), 185 deletions(-) diff --git a/src/audio/asrc/asrc.toml b/src/audio/asrc/asrc.toml index 59da1bf0a99e..3a26fec0b5e7 100644 --- a/src/audio/asrc/asrc.toml +++ b/src/audio/asrc/asrc.toml @@ -18,21 +18,21 @@ 1, 0, 0xfeef, 0xc, 0x8, 0x45ff] #if CONFIG_METEORLAKE - mod_cfg = [1, 0, 0, 0, 20480, 21808000, 64, 192, 0, 21808, 0, - 2, 0, 0, 0, 20480, 45820000, 64, 384, 0, 45820, 0, - 3, 0, 0, 0, 20480, 75236000, 512, 1440, 0, 75236, 0, - 4, 0, 0, 0, 20480, 79732000, 512, 1536, 0, 79732, 0, - 5, 0, 0, 0, 20480, 50411000, 184, 384, 0, 50411, 0, - 6, 0, 0, 0, 20480, 24236000, 192, 128, 0, 24236, 0, - 7, 0, 0, 0, 20480, 46753000, 192, 384, 0, 46753, 0, - 8, 0, 0, 0, 20480, 30032000, 256, 256, 0, 30032, 0, - 9, 0, 0, 0, 20480, 48676000, 256, 384, 0, 48676, 0, - 10, 0, 0, 0, 20480, 46548000, 360, 360, 0, 46548, 0, - 11, 0, 0, 0, 20480, 94372000, 1440, 1536, 0, 94372, 0, - 12, 0, 0, 0, 20480, 42912000, 1536, 512, 0, 42912, 0, - 13, 0, 0, 0, 20480, 31871000, 384, 192, 0, 31871, 0, - 14, 0, 0, 0, 20480, 34216000, 384, 256, 0, 34216, 0, - 15, 0, 0, 0, 20480, 83448000, 1536, 1440, 0, 83448, 0] + mod_cfg = [0, 0, 0, 0, 20480, 21808000, 64, 192, 0, 21808, 0, + 1, 0, 0, 0, 20480, 45820000, 64, 384, 0, 45820, 0, + 2, 0, 0, 0, 20480, 75236000, 512, 1440, 0, 75236, 0, + 3, 0, 0, 0, 20480, 79732000, 512, 1536, 0, 79732, 0, + 4, 0, 0, 0, 20480, 50411000, 184, 384, 0, 50411, 0, + 5, 0, 0, 0, 20480, 24236000, 192, 128, 0, 24236, 0, + 6, 0, 0, 0, 20480, 46753000, 192, 384, 0, 46753, 0, + 7, 0, 0, 0, 20480, 30032000, 256, 256, 0, 30032, 0, + 8, 0, 0, 0, 20480, 48676000, 256, 384, 0, 48676, 0, + 9, 0, 0, 0, 20480, 46548000, 360, 360, 0, 46548, 0, + 10, 0, 0, 0, 20480, 94372000, 1440, 1536, 0, 94372, 0, + 11, 0, 0, 0, 20480, 42912000, 1536, 512, 0, 42912, 0, + 12, 0, 0, 0, 20480, 31871000, 384, 192, 0, 31871, 0, + 13, 0, 0, 0, 20480, 34216000, 384, 256, 0, 34216, 0, + 14, 0, 0, 0, 20480, 83448000, 1536, 1440, 0, 83448, 0] #elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_SOC_INTEL_ACE30) mod_cfg = [0, 0, 0, 0, 20480, 4065600, 24, 22, 0, 0, 0, 1, 0, 0, 0, 20480, 5616000, 8, 25, 0, 0, 0, diff --git a/src/audio/copier/copier.toml b/src/audio/copier/copier.toml index d71ac665605c..a9332b456abb 100644 --- a/src/audio/copier/copier.toml +++ b/src/audio/copier/copier.toml @@ -18,48 +18,48 @@ REM # mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS] #if CONFIG_METEORLAKE - mod_cfg = [1, 0, 0, 0, 280, 4918000, 768, 768, 0, 4918, 0, - 2, 0, 0, 0, 280, 6526000, 768, 768, 0, 6526, 0, - 3, 0, 0, 0, 280, 6388000, 384, 384, 0, 6388, 0, - 4, 0, 0, 0, 280, 4682000, 512, 512, 0, 4682, 0, - 5, 0, 0, 0, 280, 5738000, 512, 512, 0, 5738, 0, - 6, 0, 0, 0, 280, 6250000, 256, 256, 0, 6250, 0, - 7, 0, 0, 0, 280, 6460000, 768, 768, 0, 6460, 0, - 8, 0, 0, 0, 280, 7116000, 768, 768, 0, 7116, 0, - 9, 0, 0, 0, 280, 6008000, 384, 384, 0, 6008, 0, - 10, 0, 0, 0, 280, 6258000, 512, 512, 0, 6258, 0, - 11, 0, 0, 0, 280, 7188000, 1024, 1024, 0, 7188, 0, - 12, 0, 0, 0, 280, 7272000, 1536, 1536, 0, 7272, 0, - 13, 0, 0, 0, 280, 6290000, 768, 768, 0, 6290, 0, - 14, 0, 0, 0, 280, 6604000, 1024, 1024, 0, 6604, 0, - 15, 0, 0, 0, 280, 6198000, 384, 384, 0, 6198, 0, - 16, 0, 0, 0, 280, 6250000, 384, 384, 0, 6250, 0, - 17, 0, 0, 0, 280, 6258000, 256, 256, 0, 6258, 0, - 18, 0, 0, 0, 280, 4354000, 256, 256, 0, 4354, 0, - 19, 0, 0, 0, 280, 6198000, 256, 256, 0, 6198, 0, + mod_cfg = [0, 0, 0, 0, 280, 4918000, 768, 768, 0, 4918, 0, + 1, 0, 0, 0, 280, 6526000, 768, 768, 0, 6526, 0, + 2, 0, 0, 0, 280, 6388000, 384, 384, 0, 6388, 0, + 3, 0, 0, 0, 280, 4682000, 512, 512, 0, 4682, 0, + 4, 0, 0, 0, 280, 5738000, 512, 512, 0, 5738, 0, + 5, 0, 0, 0, 280, 6250000, 256, 256, 0, 6250, 0, + 6, 0, 0, 0, 280, 6460000, 768, 768, 0, 6460, 0, + 7, 0, 0, 0, 280, 7116000, 768, 768, 0, 7116, 0, + 8, 0, 0, 0, 280, 6008000, 384, 384, 0, 6008, 0, + 9, 0, 0, 0, 280, 6258000, 512, 512, 0, 6258, 0, + 10, 0, 0, 0, 280, 7188000, 1024, 1024, 0, 7188, 0, + 11, 0, 0, 0, 280, 7272000, 1536, 1536, 0, 7272, 0, + 12, 0, 0, 0, 280, 6290000, 768, 768, 0, 6290, 0, + 13, 0, 0, 0, 280, 6604000, 1024, 1024, 0, 6604, 0, + 14, 0, 0, 0, 280, 6198000, 384, 384, 0, 6198, 0, + 15, 0, 0, 0, 280, 6250000, 384, 384, 0, 6250, 0, + 16, 0, 0, 0, 280, 6258000, 256, 256, 0, 6258, 0, + 17, 0, 0, 0, 280, 4354000, 256, 256, 0, 4354, 0, + 18, 0, 0, 0, 280, 6198000, 256, 256, 0, 6198, 0, + 19, 0, 0, 0, 280, 6250000, 128, 128, 0, 6250, 0, 20, 0, 0, 0, 280, 6250000, 128, 128, 0, 6250, 0, - 21, 0, 0, 0, 280, 6250000, 128, 128, 0, 6250, 0, - 22, 0, 0, 0, 280, 6206000, 128, 128, 0, 6206, 0, - 23, 0, 0, 0, 280, 4170000, 64, 64, 0, 4170, 0, - 24, 0, 0, 0, 280, 4234000, 96, 96, 0, 4234, 0, - 25, 0, 0, 0, 280, 6198000, 96, 96, 0, 6198, 0, - 26, 0, 0, 0, 280, 6250000, 96, 96, 0, 6250, 0, - 27, 0, 0, 0, 280, 6198000, 192, 192, 0, 6198, 0, - 28, 0, 0, 0, 280, 6258000, 192, 192, 0, 6258, 0, - 29, 0, 0, 0, 280, 6392000, 720, 720, 0, 6392, 0, - 30, 0, 0, 0, 280, 6250000, 360, 360, 0, 6250, 0, - 31, 0, 0, 0, 280, 5326000, 360, 360, 0, 5326, 0, - 32, 0, 0, 0, 280, 6258000, 180, 180, 0, 6258, 0, - 33, 0, 0, 0, 280, 4354000, 256, 256, 0, 4354, 0, - 34, 0, 0, 0, 280, 4898000, 256, 256, 0, 4898, 0, - 35, 0, 0, 0, 280, 6246000, 128, 128, 0, 6246, 0, - 36, 0, 0, 0, 280, 6250000, 192, 192, 0, 6250, 0, - 37, 0, 0, 0, 280, 6250000, 48, 48, 0, 6250, 0, - 38, 0, 0, 0, 280, 4170000, 64, 64, 0, 4170, 0, - 39, 0, 0, 0, 280, 6198000, 64, 64, 0, 6198, 0, - 40, 0, 0, 0, 280, 6246000, 32, 32, 0, 6246, 0, - 41, 0, 0, 0, 280, 5272000, 192, 384, 0, 5272, 0, - 42, 0, 0, 0, 280, 5350000, 384, 192, 0, 5350, 0] + 21, 0, 0, 0, 280, 6206000, 128, 128, 0, 6206, 0, + 22, 0, 0, 0, 280, 4170000, 64, 64, 0, 4170, 0, + 23, 0, 0, 0, 280, 4234000, 96, 96, 0, 4234, 0, + 24, 0, 0, 0, 280, 6198000, 96, 96, 0, 6198, 0, + 25, 0, 0, 0, 280, 6250000, 96, 96, 0, 6250, 0, + 26, 0, 0, 0, 280, 6198000, 192, 192, 0, 6198, 0, + 27, 0, 0, 0, 280, 6258000, 192, 192, 0, 6258, 0, + 28, 0, 0, 0, 280, 6392000, 720, 720, 0, 6392, 0, + 29, 0, 0, 0, 280, 6250000, 360, 360, 0, 6250, 0, + 30, 0, 0, 0, 280, 5326000, 360, 360, 0, 5326, 0, + 31, 0, 0, 0, 280, 6258000, 180, 180, 0, 6258, 0, + 32, 0, 0, 0, 280, 4354000, 256, 256, 0, 4354, 0, + 33, 0, 0, 0, 280, 4898000, 256, 256, 0, 4898, 0, + 34, 0, 0, 0, 280, 6246000, 128, 128, 0, 6246, 0, + 35, 0, 0, 0, 280, 6250000, 192, 192, 0, 6250, 0, + 36, 0, 0, 0, 280, 6250000, 48, 48, 0, 6250, 0, + 37, 0, 0, 0, 280, 4170000, 64, 64, 0, 4170, 0, + 38, 0, 0, 0, 280, 6198000, 64, 64, 0, 6198, 0, + 39, 0, 0, 0, 280, 6246000, 32, 32, 0, 6246, 0, + 40, 0, 0, 0, 280, 5272000, 192, 384, 0, 5272, 0, + 41, 0, 0, 0, 280, 5350000, 384, 192, 0, 5350, 0] #elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_SOC_INTEL_ACE30) mod_cfg = [ 0, 0, 0, 0, 280, 640100, 45, 60, 0, 0, 0, 1, 0, 0, 0, 280, 1106300, 192, 192, 0, 0, 0, diff --git a/src/audio/mixin_mixout/mixin_mixout.toml b/src/audio/mixin_mixout/mixin_mixout.toml index 39f7a4539bcb..7cb4e2285fa1 100644 --- a/src/audio/mixin_mixout/mixin_mixout.toml +++ b/src/audio/mixin_mixout/mixin_mixout.toml @@ -21,11 +21,11 @@ REM # mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS] #if CONFIG_METEORLAKE - mod_cfg = [1, 0, 0, 0, 296, 4996000, 384, 384, 0, 4996, 0, - 2, 0, 0, 0, 296, 2652000, 384, 384, 0, 2652, 0, - 3, 0, 0, 0, 296, 2928000, 512, 512, 0, 2928, 0, - 4, 0, 0, 0, 296, 2572000, 128, 128, 0, 2572, 0, - 5, 0, 0, 0, 296, 3760000, 1536, 1536, 0, 3760, 0] + mod_cfg = [0, 0, 0, 0, 296, 4996000, 384, 384, 0, 4996, 0, + 1, 0, 0, 0, 296, 2652000, 384, 384, 0, 2652, 0, + 2, 0, 0, 0, 296, 2928000, 512, 512, 0, 2928, 0, + 3, 0, 0, 0, 296, 2572000, 128, 128, 0, 2572, 0, + 4, 0, 0, 0, 296, 3760000, 1536, 1536, 0, 3760, 0] #elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_SOC_INTEL_ACE30) mod_cfg = [ 0, 0, 0, 0, 296, 644000, 45, 60, 0, 0, 0, 1, 0, 0, 0, 296, 669900, 48, 64, 0, 0, 0, @@ -65,11 +65,11 @@ REM # mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS] #if CONFIG_METEORLAKE - mod_cfg = [1, 0, 0, 0, 520, 2280000, 384, 384, 0, 2280, 0, - 2, 0, 0, 0, 520, 1988000, 384, 384, 0, 1988, 0, - 3, 0, 0, 0, 520, 7631000, 512, 512, 0, 7631, 0, - 4, 0, 0, 0, 520, 1953000, 128, 128, 0, 1953, 0, - 5, 0, 0, 0, 520, 2301000, 1536, 1536, 0, 2301, 0] + mod_cfg = [0, 0, 0, 0, 520, 2280000, 384, 384, 0, 2280, 0, + 1, 0, 0, 0, 520, 1988000, 384, 384, 0, 1988, 0, + 2, 0, 0, 0, 520, 7631000, 512, 512, 0, 7631, 0, + 3, 0, 0, 0, 520, 1953000, 128, 128, 0, 1953, 0, + 4, 0, 0, 0, 520, 2301000, 1536, 1536, 0, 2301, 0] #elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_SOC_INTEL_ACE30) mod_cfg = [0, 0, 0, 0, 520, 649600, 48, 64, 0, 0, 0, 1, 0, 0, 0, 520, 966300, 96, 128, 0, 0, 0, diff --git a/src/audio/src/src.toml b/src/audio/src/src.toml index 4c497b6e0a4c..b9cf79d1c84e 100644 --- a/src/audio/src/src.toml +++ b/src/audio/src/src.toml @@ -19,32 +19,32 @@ REM # mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS] #if CONFIG_METEORLAKE - mod_cfg = [1, 0, 0, 0, 12832, 15976000, 128, 512, 0, 15976, 0, - 2, 0, 0, 0, 12832, 15340000, 64, 256, 0, 15340, 0, - 3, 0, 0, 0, 12832, 21880000, 96, 512, 0, 21880, 0, - 4, 0, 0, 0, 12832, 19968000, 48, 256, 0, 19968, 0, - 5, 0, 0, 0, 12832, 18236000, 64, 256, 0, 18236, 0, - 6, 0, 0, 0, 12832, 15244000, 32, 256, 0, 15244, 0, - 7, 0, 0, 0, 12832, 56028000, 1536, 512, 0, 56028, 0, - 8, 0, 0, 0, 12832, 46740000, 768, 256, 0, 46740, 0, - 9, 0, 0, 0, 12832, 24656000, 768, 512, 0, 24656, 0, - 10, 0, 0, 0, 12832, 23516000, 384, 256, 0, 23516, 0, - 11, 0, 0, 0, 12832, 29368000, 384, 488, 0, 29368, 0, - 12, 0, 0, 0, 12832, 27164000, 192, 244, 0, 27164, 0, - 13, 0, 0, 0, 12832, 15892000, 384, 384, 0, 15892, 0, - 14, 0, 0, 0, 12832, 19916000, 192, 512, 0, 19916, 0, - 15, 0, 0, 0, 12832, 19176000, 96, 256, 0, 19176, 0, - 16, 0, 0, 0, 12832, 12676000, 192, 192, 0, 12676, 0, - 17, 0, 0, 0, 12832, 16280000, 384, 320, 0, 16280, 0, - 18, 0, 0, 0, 12832, 13076000, 192, 160, 0, 13076, 0, - 19, 0, 0, 0, 12832, 11440000, 384, 256, 0, 11440, 0, - 20, 0, 0, 0, 12832, 10996000, 192, 128, 0, 10996, 0, - 21, 0, 0, 0, 12832, 11428000, 384, 192, 0, 11428, 0, - 22, 0, 0, 0, 12832, 10740000, 192, 96, 0, 10740, 0, - 23, 0, 0, 0, 12832, 29936000, 360, 512, 0, 29936, 0, - 24, 0, 0, 0, 12832, 27696000, 180, 256, 0, 27696, 0, - 25, 0, 0, 0, 12832, 18368000, 256, 512, 0, 18368, 0, - 26, 0, 0, 0, 12832, 15204000, 128, 256, 0, 15204, 0] + mod_cfg = [0, 0, 0, 0, 12832, 15976000, 128, 512, 0, 15976, 0, + 1, 0, 0, 0, 12832, 15340000, 64, 256, 0, 15340, 0, + 2, 0, 0, 0, 12832, 21880000, 96, 512, 0, 21880, 0, + 3, 0, 0, 0, 12832, 19968000, 48, 256, 0, 19968, 0, + 4, 0, 0, 0, 12832, 18236000, 64, 256, 0, 18236, 0, + 5, 0, 0, 0, 12832, 15244000, 32, 256, 0, 15244, 0, + 6, 0, 0, 0, 12832, 56028000, 1536, 512, 0, 56028, 0, + 7, 0, 0, 0, 12832, 46740000, 768, 256, 0, 46740, 0, + 8, 0, 0, 0, 12832, 24656000, 768, 512, 0, 24656, 0, + 9, 0, 0, 0, 12832, 23516000, 384, 256, 0, 23516, 0, + 10, 0, 0, 0, 12832, 29368000, 384, 488, 0, 29368, 0, + 11, 0, 0, 0, 12832, 27164000, 192, 244, 0, 27164, 0, + 12, 0, 0, 0, 12832, 15892000, 384, 384, 0, 15892, 0, + 13, 0, 0, 0, 12832, 19916000, 192, 512, 0, 19916, 0, + 14, 0, 0, 0, 12832, 19176000, 96, 256, 0, 19176, 0, + 15, 0, 0, 0, 12832, 12676000, 192, 192, 0, 12676, 0, + 16, 0, 0, 0, 12832, 16280000, 384, 320, 0, 16280, 0, + 17, 0, 0, 0, 12832, 13076000, 192, 160, 0, 13076, 0, + 18, 0, 0, 0, 12832, 11440000, 384, 256, 0, 11440, 0, + 19, 0, 0, 0, 12832, 10996000, 192, 128, 0, 10996, 0, + 20, 0, 0, 0, 12832, 11428000, 384, 192, 0, 11428, 0, + 21, 0, 0, 0, 12832, 10740000, 192, 96, 0, 10740, 0, + 22, 0, 0, 0, 12832, 29936000, 360, 512, 0, 29936, 0, + 23, 0, 0, 0, 12832, 27696000, 180, 256, 0, 27696, 0, + 24, 0, 0, 0, 12832, 18368000, 256, 512, 0, 18368, 0, + 25, 0, 0, 0, 12832, 15204000, 128, 256, 0, 15204, 0] #elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_SOC_INTEL_ACE30) mod_cfg = [0, 0, 0, 0, 12832, 1365500, 0, 0, 0, 1365, 0, 1, 0, 0, 0, 12832, 2302300, 0, 0, 0, 2302, 0, diff --git a/src/audio/up_down_mixer/up_down_mixer.toml b/src/audio/up_down_mixer/up_down_mixer.toml index ae3e9beab58e..25c4a0c15990 100644 --- a/src/audio/up_down_mixer/up_down_mixer.toml +++ b/src/audio/up_down_mixer/up_down_mixer.toml @@ -15,36 +15,36 @@ REM # mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS] #if CONFIG_METEORLAKE - mod_cfg = [1, 0, 0, 0, 216, 5044000, 384, 192, 0, 5044, 0, - 2, 0, 0, 0, 216, 2660000, 384, 384, 0, 2660, 0, - 3, 0, 0, 0, 216, 3164000, 576, 384, 0, 3164, 0, - 4, 0, 0, 0, 216, 3316000, 768, 384, 0, 3316, 0, - 5, 0, 0, 0, 216, 5264000, 768, 384, 0, 5264, 0, - 6, 0, 0, 0, 216, 5440000, 768, 384, 0, 5440, 0, - 7, 0, 0, 0, 216, 2888000, 768, 192, 0, 2888, 0, - 8, 0, 0, 0, 216, 2856000, 768, 192, 0, 2856, 0, - 9, 0, 0, 0, 216, 2876000, 768, 192, 0, 2876, 0, - 10, 0, 0, 0, 216, 2956000, 960, 192, 0, 2956, 0, + mod_cfg = [0, 0, 0, 0, 216, 5044000, 384, 192, 0, 5044, 0, + 1, 0, 0, 0, 216, 2660000, 384, 384, 0, 2660, 0, + 2, 0, 0, 0, 216, 3164000, 576, 384, 0, 3164, 0, + 3, 0, 0, 0, 216, 3316000, 768, 384, 0, 3316, 0, + 4, 0, 0, 0, 216, 5264000, 768, 384, 0, 5264, 0, + 5, 0, 0, 0, 216, 5440000, 768, 384, 0, 5440, 0, + 6, 0, 0, 0, 216, 2888000, 768, 192, 0, 2888, 0, + 7, 0, 0, 0, 216, 2856000, 768, 192, 0, 2856, 0, + 8, 0, 0, 0, 216, 2876000, 768, 192, 0, 2876, 0, + 9, 0, 0, 0, 216, 2956000, 960, 192, 0, 2956, 0, + 10, 0, 0, 0, 216, 2888000, 1152, 192, 0, 2888, 0, 11, 0, 0, 0, 216, 2888000, 1152, 192, 0, 2888, 0, - 12, 0, 0, 0, 216, 2888000, 1152, 192, 0, 2888, 0, - 13, 0, 0, 0, 216, 2816000, 1536, 192, 0, 2816, 0, - 14, 0, 0, 0, 216, 2468000, 192, 384, 0, 2468, 0, - 15, 0, 0, 0, 216, 3084000, 576, 384, 0, 3084, 0, - 16, 0, 0, 0, 216, 3442000, 960, 384, 0, 3442, 0, + 12, 0, 0, 0, 216, 2816000, 1536, 192, 0, 2816, 0, + 13, 0, 0, 0, 216, 2468000, 192, 384, 0, 2468, 0, + 14, 0, 0, 0, 216, 3084000, 576, 384, 0, 3084, 0, + 15, 0, 0, 0, 216, 3442000, 960, 384, 0, 3442, 0, + 16, 0, 0, 0, 216, 3478000, 1152, 384, 0, 3478, 0, 17, 0, 0, 0, 216, 3478000, 1152, 384, 0, 3478, 0, - 18, 0, 0, 0, 216, 3478000, 1152, 384, 0, 3478, 0, - 19, 0, 0, 0, 216, 3736000, 1536, 384, 0, 3736, 0, - 20, 0, 0, 0, 216, 3216000, 192, 1152, 0, 3216, 0, - 21, 0, 0, 0, 216, 3308000, 384, 1152, 0, 3308, 0, + 18, 0, 0, 0, 216, 3736000, 1536, 384, 0, 3736, 0, + 19, 0, 0, 0, 216, 3216000, 192, 1152, 0, 3216, 0, + 20, 0, 0, 0, 216, 3308000, 384, 1152, 0, 3308, 0, + 21, 0, 0, 0, 216, 3616000, 768, 1152, 0, 3616, 0, 22, 0, 0, 0, 216, 3616000, 768, 1152, 0, 3616, 0, - 23, 0, 0, 0, 216, 3616000, 768, 1152, 0, 3616, 0, - 24, 0, 0, 0, 216, 4916000, 1536, 1152, 0, 4916, 0, - 25, 0, 0, 0, 216, 3228000, 192, 1152, 0, 3228, 0, - 26, 0, 0, 0, 216, 3452000, 384, 1152, 0, 3452, 0, - 27, 0, 0, 0, 216, 4016000, 768, 1152, 0, 4016, 0, - 28, 0, 0, 0, 216, 5080000, 1536, 1152, 0, 5080, 0, - 29, 0, 0, 0, 216, 3552000, 384, 1536, 0, 3552, 0, - 30, 0, 0, 0, 216, 3728000, 768, 1152, 0, 3728, 0] + 23, 0, 0, 0, 216, 4916000, 1536, 1152, 0, 4916, 0, + 24, 0, 0, 0, 216, 3228000, 192, 1152, 0, 3228, 0, + 25, 0, 0, 0, 216, 3452000, 384, 1152, 0, 3452, 0, + 26, 0, 0, 0, 216, 4016000, 768, 1152, 0, 4016, 0, + 27, 0, 0, 0, 216, 5080000, 1536, 1152, 0, 5080, 0, + 28, 0, 0, 0, 216, 3552000, 384, 1536, 0, 3552, 0, + 29, 0, 0, 0, 216, 3728000, 768, 1152, 0, 3728, 0] #elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_SOC_INTEL_ACE30) mod_cfg = [0, 0, 0, 0, 216, 706000, 12, 16, 0, 0, 0, 1, 0, 0, 0, 216, 1271000, 8, 8, 0, 0, 0, diff --git a/src/audio/volume/volume.toml b/src/audio/volume/volume.toml index 55a460546500..ccfe470022a8 100644 --- a/src/audio/volume/volume.toml +++ b/src/audio/volume/volume.toml @@ -20,11 +20,11 @@ REM # mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS] #if CONFIG_METEORLAKE - mod_cfg = [1, 0, 0, 0, 480, 11667000, 384, 384, 0, 11667, 0, - 2, 0, 0, 0, 480, 5943000, 192, 192, 0, 5943, 0, - 3, 0, 0, 0, 480, 12567000, 720, 720, 0, 12567, 0, - 4, 0, 0, 0, 480, 7360000, 768, 768, 0, 7360, 0, - 5, 0, 0, 0, 480, 12236000, 1536, 1536, 0, 12236, 0] + mod_cfg = [0, 0, 0, 0, 480, 11667000, 384, 384, 0, 11667, 0, + 1, 0, 0, 0, 480, 5943000, 192, 192, 0, 5943, 0, + 2, 0, 0, 0, 480, 12567000, 720, 720, 0, 12567, 0, + 3, 0, 0, 0, 480, 7360000, 768, 768, 0, 7360, 0, + 4, 0, 0, 0, 480, 12236000, 1536, 1536, 0, 12236, 0] #elif CONFIG_LUNARLAKE || CONFIG_SOC_INTEL_ACE30 mod_cfg = [0, 0, 0, 0, 480, 1114000, 48, 64, 0, 0, 0, 1, 0, 0, 0, 480, 3321600, 192, 256, 0, 0, 0, @@ -56,11 +56,11 @@ REM # mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS] #if CONFIG_METEORLAKE - mod_cfg = [1, 0, 0, 0, 416, 12100000, 1536, 1536, 0, 12100, 0, - 2, 0, 0, 0, 416, 10183000, 384, 384, 0, 10183, 0, - 3, 0, 0, 0, 416, 8192000, 512, 512, 0, 8192, 0, - 4, 0, 0, 0, 416, 10091000, 128, 128, 0, 10091, 0, - 5, 0, 0, 0, 416, 5908000, 768, 768, 0, 5908, 0] + mod_cfg = [0, 0, 0, 0, 416, 12100000, 1536, 1536, 0, 12100, 0, + 1, 0, 0, 0, 416, 10183000, 384, 384, 0, 10183, 0, + 2, 0, 0, 0, 416, 8192000, 512, 512, 0, 8192, 0, + 3, 0, 0, 0, 416, 10091000, 128, 128, 0, 10091, 0, + 4, 0, 0, 0, 416, 5908000, 768, 768, 0, 5908, 0] #elif CONFIG_LUNARLAKE || CONFIG_SOC_INTEL_ACE30 mod_cfg = [0, 0, 0, 0, 416, 914000, 48, 64, 0, 0, 0, 1, 0, 0, 0, 416, 1321600, 192, 256, 0, 0, 0, diff --git a/src/debug/tester/tester.toml b/src/debug/tester/tester.toml index 8b914f004672..415383eca039 100644 --- a/src/debug/tester/tester.toml +++ b/src/debug/tester/tester.toml @@ -19,32 +19,32 @@ REM # mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS] #if CONFIG_METEORLAKE - mod_cfg = [1, 0, 0, 0, 12832, 15976000, 128, 512, 0, 15976, 0, - 2, 0, 0, 0, 12832, 15340000, 64, 256, 0, 15340, 0, - 3, 0, 0, 0, 12832, 21880000, 96, 512, 0, 21880, 0, - 4, 0, 0, 0, 12832, 19968000, 48, 256, 0, 19968, 0, - 5, 0, 0, 0, 12832, 18236000, 64, 256, 0, 18236, 0, - 6, 0, 0, 0, 12832, 15244000, 32, 256, 0, 15244, 0, - 7, 0, 0, 0, 12832, 56028000, 1536, 512, 0, 56028, 0, - 8, 0, 0, 0, 12832, 46740000, 768, 256, 0, 46740, 0, - 9, 0, 0, 0, 12832, 24656000, 768, 512, 0, 24656, 0, - 10, 0, 0, 0, 12832, 23516000, 384, 256, 0, 23516, 0, - 11, 0, 0, 0, 12832, 29368000, 384, 488, 0, 29368, 0, - 12, 0, 0, 0, 12832, 27164000, 192, 244, 0, 27164, 0, - 13, 0, 0, 0, 12832, 15892000, 384, 384, 0, 15892, 0, - 14, 0, 0, 0, 12832, 19916000, 192, 512, 0, 19916, 0, - 15, 0, 0, 0, 12832, 19176000, 96, 256, 0, 19176, 0, - 16, 0, 0, 0, 12832, 12676000, 192, 192, 0, 12676, 0, - 17, 0, 0, 0, 12832, 16280000, 384, 320, 0, 16280, 0, - 18, 0, 0, 0, 12832, 13076000, 192, 160, 0, 13076, 0, - 19, 0, 0, 0, 12832, 11440000, 384, 256, 0, 11440, 0, - 20, 0, 0, 0, 12832, 10996000, 192, 128, 0, 10996, 0, - 21, 0, 0, 0, 12832, 11428000, 384, 192, 0, 11428, 0, - 22, 0, 0, 0, 12832, 10740000, 192, 96, 0, 10740, 0, - 23, 0, 0, 0, 12832, 29936000, 360, 512, 0, 29936, 0, - 24, 0, 0, 0, 12832, 27696000, 180, 256, 0, 27696, 0, - 25, 0, 0, 0, 12832, 18368000, 256, 512, 0, 18368, 0, - 26, 0, 0, 0, 12832, 15204000, 128, 256, 0, 15204, 0] + mod_cfg = [0, 0, 0, 0, 12832, 15976000, 128, 512, 0, 15976, 0, + 1, 0, 0, 0, 12832, 15340000, 64, 256, 0, 15340, 0, + 2, 0, 0, 0, 12832, 21880000, 96, 512, 0, 21880, 0, + 3, 0, 0, 0, 12832, 19968000, 48, 256, 0, 19968, 0, + 4, 0, 0, 0, 12832, 18236000, 64, 256, 0, 18236, 0, + 5, 0, 0, 0, 12832, 15244000, 32, 256, 0, 15244, 0, + 6, 0, 0, 0, 12832, 56028000, 1536, 512, 0, 56028, 0, + 7, 0, 0, 0, 12832, 46740000, 768, 256, 0, 46740, 0, + 8, 0, 0, 0, 12832, 24656000, 768, 512, 0, 24656, 0, + 9, 0, 0, 0, 12832, 23516000, 384, 256, 0, 23516, 0, + 10, 0, 0, 0, 12832, 29368000, 384, 488, 0, 29368, 0, + 11, 0, 0, 0, 12832, 27164000, 192, 244, 0, 27164, 0, + 12, 0, 0, 0, 12832, 15892000, 384, 384, 0, 15892, 0, + 13, 0, 0, 0, 12832, 19916000, 192, 512, 0, 19916, 0, + 14, 0, 0, 0, 12832, 19176000, 96, 256, 0, 19176, 0, + 15, 0, 0, 0, 12832, 12676000, 192, 192, 0, 12676, 0, + 16, 0, 0, 0, 12832, 16280000, 384, 320, 0, 16280, 0, + 17, 0, 0, 0, 12832, 13076000, 192, 160, 0, 13076, 0, + 18, 0, 0, 0, 12832, 11440000, 384, 256, 0, 11440, 0, + 19, 0, 0, 0, 12832, 10996000, 192, 128, 0, 10996, 0, + 20, 0, 0, 0, 12832, 11428000, 384, 192, 0, 11428, 0, + 21, 0, 0, 0, 12832, 10740000, 192, 96, 0, 10740, 0, + 22, 0, 0, 0, 12832, 29936000, 360, 512, 0, 29936, 0, + 23, 0, 0, 0, 12832, 27696000, 180, 256, 0, 27696, 0, + 24, 0, 0, 0, 12832, 18368000, 256, 512, 0, 18368, 0, + 25, 0, 0, 0, 12832, 15204000, 128, 256, 0, 15204, 0] #elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_SOC_INTEL_ACE30) mod_cfg = [0, 0, 0, 0, 12832, 1365500, 0, 0, 0, 1365, 0, 1, 0, 0, 0, 12832, 2302300, 0, 0, 0, 2302, 0, diff --git a/tools/rimage/config/tgl-h.toml b/tools/rimage/config/tgl-h.toml index f403ce798ba5..b43f19bb17f8 100644 --- a/tools/rimage/config/tgl-h.toml +++ b/tools/rimage/config/tgl-h.toml @@ -575,21 +575,21 @@ count = 27 auto_start = "0" sched_caps = [1, 0x00008000] pin = [0, 0, 0xfeef, 0xc, 0x8, 0x45ff, 1, 0, 0xfeef, 0xc, 0x8, 0x45ff] - mod_cfg = [1, 0, 0, 0, 20480, 21808000, 64, 192, 0, 21808, 0, - 2, 0, 0, 0, 20480, 45820000, 64, 384, 0, 45820, 0, - 3, 0, 0, 0, 20480, 75236000, 512, 1440, 0, 75236, 0, - 4, 0, 0, 0, 20480, 79732000, 512, 1536, 0, 79732, 0, - 5, 0, 0, 0, 20480, 50411000, 184, 384, 0, 50411, 0, - 6, 0, 0, 0, 20480, 24236000, 192, 128, 0, 24236, 0, - 7, 0, 0, 0, 20480, 46753000, 192, 384, 0, 46753, 0, - 8, 0, 0, 0, 20480, 30032000, 256, 256, 0, 30032, 0, - 9, 0, 0, 0, 20480, 48676000, 256, 384, 0, 48676, 0, - 10, 0, 0, 0, 20480, 46548000, 360, 360, 0, 46548, 0, - 11, 0, 0, 0, 20480, 94372000, 1440, 1536, 0, 94372, 0, - 12, 0, 0, 0, 20480, 42912000, 1536, 512, 0, 42912, 0, - 13, 0, 0, 0, 20480, 31871000, 384, 192, 0, 31871, 0, - 14, 0, 0, 0, 20480, 34216000, 384, 256, 0, 34216, 0, - 15, 0, 0, 0, 20480, 83448000, 1536, 1440, 0, 83448, 0] + mod_cfg = [0, 0, 0, 0, 20480, 21808000, 64, 192, 0, 21808, 0, + 1, 0, 0, 0, 20480, 45820000, 64, 384, 0, 45820, 0, + 2, 0, 0, 0, 20480, 75236000, 512, 1440, 0, 75236, 0, + 3, 0, 0, 0, 20480, 79732000, 512, 1536, 0, 79732, 0, + 4, 0, 0, 0, 20480, 50411000, 184, 384, 0, 50411, 0, + 5, 0, 0, 0, 20480, 24236000, 192, 128, 0, 24236, 0, + 6, 0, 0, 0, 20480, 46753000, 192, 384, 0, 46753, 0, + 7, 0, 0, 0, 20480, 30032000, 256, 256, 0, 30032, 0, + 8, 0, 0, 0, 20480, 48676000, 256, 384, 0, 48676, 0, + 9, 0, 0, 0, 20480, 46548000, 360, 360, 0, 46548, 0, + 10, 0, 0, 0, 20480, 94372000, 1440, 1536, 0, 94372, 0, + 11, 0, 0, 0, 20480, 42912000, 1536, 512, 0, 42912, 0, + 12, 0, 0, 0, 20480, 31871000, 384, 192, 0, 31871, 0, + 13, 0, 0, 0, 20480, 34216000, 384, 256, 0, 34216, 0, + 14, 0, 0, 0, 20480, 83448000, 1536, 1440, 0, 83448, 0] # Template component module config [[module.entry]] diff --git a/tools/rimage/config/tgl.toml b/tools/rimage/config/tgl.toml index 82065f8d2d0a..c3999b42fd6d 100644 --- a/tools/rimage/config/tgl.toml +++ b/tools/rimage/config/tgl.toml @@ -575,21 +575,21 @@ count = 27 auto_start = "0" sched_caps = [1, 0x00008000] pin = [0, 0, 0xfeef, 0xc, 0x8, 0x45ff, 1, 0, 0xfeef, 0xc, 0x8, 0x45ff] - mod_cfg = [1, 0, 0, 0, 20480, 21808000, 64, 192, 0, 21808, 0, - 2, 0, 0, 0, 20480, 45820000, 64, 384, 0, 45820, 0, - 3, 0, 0, 0, 20480, 75236000, 512, 1440, 0, 75236, 0, - 4, 0, 0, 0, 20480, 79732000, 512, 1536, 0, 79732, 0, - 5, 0, 0, 0, 20480, 50411000, 184, 384, 0, 50411, 0, - 6, 0, 0, 0, 20480, 24236000, 192, 128, 0, 24236, 0, - 7, 0, 0, 0, 20480, 46753000, 192, 384, 0, 46753, 0, - 8, 0, 0, 0, 20480, 30032000, 256, 256, 0, 30032, 0, - 9, 0, 0, 0, 20480, 48676000, 256, 384, 0, 48676, 0, - 10, 0, 0, 0, 20480, 46548000, 360, 360, 0, 46548, 0, - 11, 0, 0, 0, 20480, 94372000, 1440, 1536, 0, 94372, 0, - 12, 0, 0, 0, 20480, 42912000, 1536, 512, 0, 42912, 0, - 13, 0, 0, 0, 20480, 31871000, 384, 192, 0, 31871, 0, - 14, 0, 0, 0, 20480, 34216000, 384, 256, 0, 34216, 0, - 15, 0, 0, 0, 20480, 83448000, 1536, 1440, 0, 83448, 0] + mod_cfg = [0, 0, 0, 0, 20480, 21808000, 64, 192, 0, 21808, 0, + 1, 0, 0, 0, 20480, 45820000, 64, 384, 0, 45820, 0, + 2, 0, 0, 0, 20480, 75236000, 512, 1440, 0, 75236, 0, + 3, 0, 0, 0, 20480, 79732000, 512, 1536, 0, 79732, 0, + 4, 0, 0, 0, 20480, 50411000, 184, 384, 0, 50411, 0, + 5, 0, 0, 0, 20480, 24236000, 192, 128, 0, 24236, 0, + 6, 0, 0, 0, 20480, 46753000, 192, 384, 0, 46753, 0, + 7, 0, 0, 0, 20480, 30032000, 256, 256, 0, 30032, 0, + 8, 0, 0, 0, 20480, 48676000, 256, 384, 0, 48676, 0, + 9, 0, 0, 0, 20480, 46548000, 360, 360, 0, 46548, 0, + 10, 0, 0, 0, 20480, 94372000, 1440, 1536, 0, 94372, 0, + 11, 0, 0, 0, 20480, 42912000, 1536, 512, 0, 42912, 0, + 12, 0, 0, 0, 20480, 31871000, 384, 192, 0, 31871, 0, + 13, 0, 0, 0, 20480, 34216000, 384, 256, 0, 34216, 0, + 14, 0, 0, 0, 20480, 83448000, 1536, 1440, 0, 83448, 0] # Template component module config [[module.entry]] From 8e5d164c145565bbd104cbf952e53b6d29aa2948 Mon Sep 17 00:00:00 2001 From: Adrian Bonislawski Date: Thu, 12 Jun 2025 09:33:30 +0200 Subject: [PATCH 2/3] modules: toml: add LNL performance data This patch will add LNL perf data for base modules Signed-off-by: Adrian Bonislawski --- src/audio/asrc/asrc.toml | 18 +++++++++++- src/audio/copier/copier.toml | 34 +++++++++++++++++++++- src/audio/mixin_mixout/mixin_mixout.toml | 16 ++++++++-- src/audio/selector/selector.toml | 19 +++++++++++- src/audio/src/src.toml | 29 +++++++++++++++++- src/audio/up_down_mixer/up_down_mixer.toml | 22 +++++++++++++- src/audio/volume/volume.toml | 16 ++++++++-- 7 files changed, 145 insertions(+), 9 deletions(-) diff --git a/src/audio/asrc/asrc.toml b/src/audio/asrc/asrc.toml index 3a26fec0b5e7..c87016cc2af1 100644 --- a/src/audio/asrc/asrc.toml +++ b/src/audio/asrc/asrc.toml @@ -33,7 +33,23 @@ 12, 0, 0, 0, 20480, 31871000, 384, 192, 0, 31871, 0, 13, 0, 0, 0, 20480, 34216000, 384, 256, 0, 34216, 0, 14, 0, 0, 0, 20480, 83448000, 1536, 1440, 0, 83448, 0] -#elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_SOC_INTEL_ACE30) +#elif CONFIG_LUNARLAKE + mod_cfg = [0, 0, 0, 0, 20480, 22736000, 64, 192, 0, 22736, 0, + 1, 0, 0, 0, 20480, 44703000, 64, 384, 0, 44703, 0, + 2, 0, 0, 0, 20480, 73092000, 512, 1440, 0, 73092, 0, + 3, 0, 0, 0, 20480, 78604000, 512, 1536, 0, 78604, 0, + 4, 0, 0, 0, 20480, 47674000, 184, 384, 0, 47674, 0, + 5, 0, 0, 0, 20480, 19524000, 192, 128, 0, 19524, 0, + 6, 0, 0, 0, 20480, 45942000, 192, 384, 0, 45942, 0, + 7, 0, 0, 0, 20480, 31244000, 256, 256, 0, 31244, 0, + 8, 0, 0, 0, 20480, 46978000, 256, 384, 0, 46978, 0, + 9, 0, 0, 0, 20480, 45016000, 360, 360, 0, 45016, 0, + 10, 0, 0, 0, 20480, 92684000, 1440, 1536, 0, 92684, 0, + 11, 0, 0, 0, 20480, 44535000, 1536, 512, 0, 44535, 0, + 12, 0, 0, 0, 20480, 30050000, 384, 192, 0, 30050, 0, + 13, 0, 0, 0, 20480, 35152000, 384, 256, 0, 35152, 0, + 14, 0, 0, 0, 20480, 81647000, 1536, 1440, 0, 81647, 0] +#elif defined(CONFIG_SOC_INTEL_ACE30) mod_cfg = [0, 0, 0, 0, 20480, 4065600, 24, 22, 0, 0, 0, 1, 0, 0, 0, 20480, 5616000, 8, 25, 0, 0, 0, 2, 0, 0, 0, 20480, 7319200, 24, 27, 0, 0, 0, diff --git a/src/audio/copier/copier.toml b/src/audio/copier/copier.toml index a9332b456abb..d82ba15f54ea 100644 --- a/src/audio/copier/copier.toml +++ b/src/audio/copier/copier.toml @@ -60,7 +60,39 @@ 39, 0, 0, 0, 280, 6246000, 32, 32, 0, 6246, 0, 40, 0, 0, 0, 280, 5272000, 192, 384, 0, 5272, 0, 41, 0, 0, 0, 280, 5350000, 384, 192, 0, 5350, 0] -#elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_SOC_INTEL_ACE30) +#elif CONFIG_LUNARLAKE + mod_cfg = [0, 0, 0, 0, 280, 6057000, 768, 768, 0, 6057, 0, + 1, 0, 0, 0, 280, 8062000, 768, 768, 0, 8062, 0, + 2, 0, 0, 0, 280, 6250000, 384, 384, 0, 6250, 0, + 3, 0, 0, 0, 280, 6290000, 512, 512, 0, 6290, 0, + 4, 0, 0, 0, 280, 7254000, 512, 512, 0, 7254, 0, + 5, 0, 0, 0, 280, 5607000, 256, 256, 0, 5607, 0, + 6, 0, 0, 0, 280, 6514000, 768, 768, 0, 6514, 0, + 7, 0, 0, 0, 280, 7974000, 768, 768, 0, 7974, 0, + 8, 0, 0, 0, 280, 6242000, 384, 384, 0, 6242, 0, + 9, 0, 0, 0, 280, 6294000, 512, 512, 0, 6294, 0, + 10, 0, 0, 0, 280, 8704000, 1024, 1024, 0, 8704, 0, + 11, 0, 0, 0, 280, 6165000, 1536, 1536, 0, 6165, 0, + 12, 0, 0, 0, 280, 5775000, 768, 768, 0, 5775, 0, + 13, 0, 0, 0, 280, 6610000, 1024, 1024, 0, 6610, 0, + 14, 0, 0, 0, 280, 6457000, 384, 384, 0, 6457, 0, + 15, 0, 0, 0, 280, 7442000, 384, 384, 0, 7442, 0, + 16, 0, 0, 0, 280, 6618000, 256, 256, 0, 6618, 0, + 17, 0, 0, 0, 280, 9104000, 128, 128, 0, 9104, 0, + 18, 0, 0, 0, 280, 6098000, 128, 128, 0, 6098, 0, + 19, 0, 0, 0, 280, 10360000, 128, 128, 0, 10360, 0, + 20, 0, 0, 0, 280, 6046000, 64, 64, 0, 6046, 0, + 21, 0, 0, 0, 280, 6026000, 96, 96, 0, 6026, 0, + 22, 0, 0, 0, 280, 10928000, 96, 96, 0, 10928, 0, + 23, 0, 0, 0, 280, 6688000, 192, 192, 0, 6688, 0, + 24, 0, 0, 0, 280, 8054000, 720, 720, 0, 8054, 0, + 25, 0, 0, 0, 280, 6978000, 360, 360, 0, 6978, 0, + 26, 0, 0, 0, 280, 6118000, 180, 180, 0, 6118, 0, + 27, 0, 0, 0, 280, 6046000, 48, 48, 0, 6046, 0, + 28, 0, 0, 0, 280, 6058000, 64, 64, 0, 6058, 0, + 29, 0, 0, 0, 280, 6198000, 64, 64, 0, 6198, 0, + 30, 0, 0, 0, 280, 6034000, 32, 32, 0, 6034, 0] +#elif defined(CONFIG_SOC_INTEL_ACE30) mod_cfg = [ 0, 0, 0, 0, 280, 640100, 45, 60, 0, 0, 0, 1, 0, 0, 0, 280, 1106300, 192, 192, 0, 0, 0, 2, 0, 0, 0, 280, 1573000, 45, 45, 0, 0, 0, diff --git a/src/audio/mixin_mixout/mixin_mixout.toml b/src/audio/mixin_mixout/mixin_mixout.toml index 7cb4e2285fa1..c52688138d51 100644 --- a/src/audio/mixin_mixout/mixin_mixout.toml +++ b/src/audio/mixin_mixout/mixin_mixout.toml @@ -26,7 +26,13 @@ 2, 0, 0, 0, 296, 2928000, 512, 512, 0, 2928, 0, 3, 0, 0, 0, 296, 2572000, 128, 128, 0, 2572, 0, 4, 0, 0, 0, 296, 3760000, 1536, 1536, 0, 3760, 0] -#elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_SOC_INTEL_ACE30) +#elif CONFIG_LUNARLAKE + mod_cfg = [0, 0, 0, 0, 296, 2336000, 384, 384, 0, 2336, 0, + 1, 0, 0, 0, 296, 2344000, 384, 384, 0, 2344, 0, + 2, 0, 0, 0, 296, 2448000, 512, 512, 0, 2448, 0, + 3, 0, 0, 0, 296, 2160000, 128, 128, 0, 2160, 0, + 4, 0, 0, 0, 296, 3268000, 1536, 1536, 0, 3268, 0] +#elif defined(CONFIG_SOC_INTEL_ACE30) mod_cfg = [ 0, 0, 0, 0, 296, 644000, 45, 60, 0, 0, 0, 1, 0, 0, 0, 296, 669900, 48, 64, 0, 0, 0, 2, 0, 0, 0, 296, 934000, 96, 128, 0, 0, 0, @@ -70,7 +76,13 @@ 2, 0, 0, 0, 520, 7631000, 512, 512, 0, 7631, 0, 3, 0, 0, 0, 520, 1953000, 128, 128, 0, 1953, 0, 4, 0, 0, 0, 520, 2301000, 1536, 1536, 0, 2301, 0] -#elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_SOC_INTEL_ACE30) +#elif CONFIG_LUNARLAKE + mod_cfg = [0, 0, 0, 0, 520, 2280000, 384, 384, 0, 0, 0, + 1, 0, 0, 0, 520, 1988000, 384, 384, 0, 0, 0, + 2, 0, 0, 0, 520, 7631000, 512, 512, 0, 0, 0, + 3, 0, 0, 0, 520, 1953000, 128, 128, 0, 0, 0, + 4, 0, 0, 0, 520, 2301000, 1536, 1536, 0, 0, 0] +#elif defined(CONFIG_SOC_INTEL_ACE30) mod_cfg = [0, 0, 0, 0, 520, 649600, 48, 64, 0, 0, 0, 1, 0, 0, 0, 520, 966300, 96, 128, 0, 0, 0, 2, 0, 0, 0, 520, 2101000, 48, 64, 0, 0, 0, diff --git a/src/audio/selector/selector.toml b/src/audio/selector/selector.toml index f35bac7b3269..fea1f526d7c0 100644 --- a/src/audio/selector/selector.toml +++ b/src/audio/selector/selector.toml @@ -22,7 +22,24 @@ mod_cfg = [0, 0, 0, 0, 960, 488500, 16, 16, 0, 0, 0, 1, 0, 0, 0, 960, 964500, 16, 16, 0, 0, 0, 2, 0, 0, 0, 960, 2003000, 16, 16, 0, 0, 0] -#elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_SOC_INTEL_ACE30) +#elif CONFIG_LUNARLAKE + mod_cfg = [0, 0, 0, 0, 216, 2338000, 384, 192, 0, 2338, 0, + 1, 0, 0, 0, 216, 3634000, 384, 384, 0, 3634, 0, + 2, 0, 0, 0, 216, 4524000, 576, 384, 0, 4524, 0, + 3, 0, 0, 0, 216, 4786000, 768, 384, 0, 4786, 0, + 4, 0, 0, 0, 216, 2914000, 768, 192, 0, 2914, 0, + 5, 0, 0, 0, 216, 3372000, 960, 192, 0, 3372, 0, + 6, 0, 0, 0, 216, 3516000, 1152, 192, 0, 3516, 0, + 7, 0, 0, 0, 216, 4066000, 1536, 192, 0, 4066, 0, + 8, 0, 0, 0, 216, 3058000, 192, 384, 0, 3058, 0, + 9, 0, 0, 0, 216, 5676000, 960, 384, 0, 5676, 0, + 10, 0, 0, 0, 216, 5964000, 1152, 384, 0, 5964, 0, + 11, 0, 0, 0, 216, 7090000, 1536, 384, 0, 7090, 0, + 12, 0, 0, 0, 216, 7090000, 192, 1152, 0, 7090, 0, + 13, 0, 0, 0, 216, 8818000, 384, 1152, 0, 8818, 0, + 14, 0, 0, 0, 216, 12274000, 768, 1152, 0, 12274, 0, + 15, 0, 0, 0, 216, 19186000, 1536, 1152, 0, 19186, 0] +#elif defined(CONFIG_SOC_INTEL_ACE30) mod_cfg = [0, 0, 0, 0, 216, 706000, 12, 16, 0, 0, 0, 1, 0, 0, 0, 216, 1271000, 8, 8, 0, 0, 0, 2, 0, 0, 0, 216, 1839000, 89, 118, 0, 0, 0, diff --git a/src/audio/src/src.toml b/src/audio/src/src.toml index b9cf79d1c84e..d38e74e6eb2f 100644 --- a/src/audio/src/src.toml +++ b/src/audio/src/src.toml @@ -45,7 +45,34 @@ 23, 0, 0, 0, 12832, 27696000, 180, 256, 0, 27696, 0, 24, 0, 0, 0, 12832, 18368000, 256, 512, 0, 18368, 0, 25, 0, 0, 0, 12832, 15204000, 128, 256, 0, 15204, 0] -#elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_SOC_INTEL_ACE30) +#elif CONFIG_LUNARLAKE + mod_cfg = [0, 0, 0, 0, 12832, 14748000, 128, 512, 0, 14748, 0, + 1, 0, 0, 0, 12832, 14152000, 64, 256, 0, 14152, 0, + 2, 0, 0, 0, 12832, 16988000, 96, 512, 0, 16988, 0, + 3, 0, 0, 0, 12832, 15972000, 48, 256, 0, 15972, 0, + 4, 0, 0, 0, 12832, 13272000, 64, 256, 0, 13272, 0, + 5, 0, 0, 0, 12832, 12872000, 32, 256, 0, 12872, 0, + 6, 0, 0, 0, 12832, 45419000, 1536, 512, 0, 45419, 0, + 7, 0, 0, 0, 12832, 43279000, 768, 256, 0, 43279, 0, + 8, 0, 0, 0, 12832, 25796000, 768, 512, 0, 25796, 0, + 9, 0, 0, 0, 12832, 25131000, 384, 256, 0, 25131, 0, + 10, 0, 0, 0, 12832, 27360000, 384, 488, 0, 27360, 0, + 11, 0, 0, 0, 12832, 23032000, 192, 244, 0, 23032, 0, + 12, 0, 0, 0, 12832, 12432000, 384, 384, 0, 12432, 0, + 13, 0, 0, 0, 12832, 15584000, 192, 512, 0, 15584, 0, + 14, 0, 0, 0, 12832, 15360000, 96, 256, 0, 15360, 0, + 15, 0, 0, 0, 12832, 12104000, 192, 192, 0, 12104, 0, + 16, 0, 0, 0, 12832, 13064000, 384, 320, 0, 13064, 0, + 17, 0, 0, 0, 12832, 12768000, 192, 160, 0, 12768, 0, + 18, 0, 0, 0, 12832, 11636000, 384, 256, 0, 11636, 0, + 19, 0, 0, 0, 12832, 11244000, 192, 128, 0, 11244, 0, + 20, 0, 0, 0, 12832, 11224000, 384, 192, 0, 11224, 0, + 21, 0, 0, 0, 12832, 10360000, 192, 96, 0, 10360, 0, + 22, 0, 0, 0, 12832, 27616000, 360, 512, 0, 27616, 0, + 23, 0, 0, 0, 12832, 21852000, 180, 256, 0, 21852, 0, + 24, 0, 0, 0, 12832, 12629000, 256, 512, 0, 12629, 0, + 25, 0, 0, 0, 12832, 13996000, 128, 256, 0, 13996, 0] +#elif defined(CONFIG_SOC_INTEL_ACE30) mod_cfg = [0, 0, 0, 0, 12832, 1365500, 0, 0, 0, 1365, 0, 1, 0, 0, 0, 12832, 2302300, 0, 0, 0, 2302, 0, 2, 0, 0, 0, 12832, 3218200, 0, 0, 0, 3218, 0, diff --git a/src/audio/up_down_mixer/up_down_mixer.toml b/src/audio/up_down_mixer/up_down_mixer.toml index 25c4a0c15990..20708fd72ff3 100644 --- a/src/audio/up_down_mixer/up_down_mixer.toml +++ b/src/audio/up_down_mixer/up_down_mixer.toml @@ -45,7 +45,27 @@ 27, 0, 0, 0, 216, 5080000, 1536, 1152, 0, 5080, 0, 28, 0, 0, 0, 216, 3552000, 384, 1536, 0, 3552, 0, 29, 0, 0, 0, 216, 3728000, 768, 1152, 0, 3728, 0] -#elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_SOC_INTEL_ACE30) +#elif CONFIG_LUNARLAKE + mod_cfg = [0, 0, 0, 0, 216, 4153000, 384, 192, 0, 4153, 0, + 1, 0, 0, 0, 216, 3604000, 384, 384, 0, 3604, 0, + 2, 0, 0, 0, 216, 4320000, 576, 384, 0, 4320, 0, + 3, 0, 0, 0, 216, 4436000, 768, 384, 0, 4436, 0, + 4, 0, 0, 0, 216, 7792000, 768, 384, 0, 7792, 0, + 5, 0, 0, 0, 216, 4332000, 768, 384, 0, 4332, 0, + 6, 0, 0, 0, 216, 4412000, 768, 192, 0, 4412, 0, + 7, 0, 0, 0, 216, 4404000, 960, 192, 0, 4404, 0, + 8, 0, 0, 0, 216, 4420000, 1152, 192, 0, 4420, 0, + 9, 0, 0, 0, 216, 4464000, 1536, 192, 0, 4464, 0, + 10, 0, 0, 0, 216, 3616000, 192, 384, 0, 3616, 0, + 11, 0, 0, 0, 216, 4300000, 960, 384, 0, 4300, 0, + 12, 0, 0, 0, 216, 4740000, 1152, 384, 0, 4740, 0, + 13, 0, 0, 0, 216, 4844000, 1536, 384, 0, 4844, 0, + 14, 0, 0, 0, 216, 4660000, 192, 1152, 0, 4660, 0, + 15, 0, 0, 0, 216, 4548000, 384, 1152, 0, 4548, 0, + 16, 0, 0, 0, 216, 4596000, 768, 1152, 0, 4596, 0, + 17, 0, 0, 0, 216, 5572000, 1536, 1152, 0, 5572, 0, + 18, 0, 0, 0, 216, 4896000, 384, 1536, 0, 4896, 0] +#elif defined(CONFIG_SOC_INTEL_ACE30) mod_cfg = [0, 0, 0, 0, 216, 706000, 12, 16, 0, 0, 0, 1, 0, 0, 0, 216, 1271000, 8, 8, 0, 0, 0, 2, 0, 0, 0, 216, 1839000, 89, 118, 0, 0, 0, diff --git a/src/audio/volume/volume.toml b/src/audio/volume/volume.toml index ccfe470022a8..ff06f34d943d 100644 --- a/src/audio/volume/volume.toml +++ b/src/audio/volume/volume.toml @@ -25,7 +25,13 @@ 2, 0, 0, 0, 480, 12567000, 720, 720, 0, 12567, 0, 3, 0, 0, 0, 480, 7360000, 768, 768, 0, 7360, 0, 4, 0, 0, 0, 480, 12236000, 1536, 1536, 0, 12236, 0] -#elif CONFIG_LUNARLAKE || CONFIG_SOC_INTEL_ACE30 +#elif CONFIG_LUNARLAKE + mod_cfg = [0, 0, 0, 0, 480, 5546000, 384, 384, 0, 5546, 0, + 1, 0, 0, 0, 480, 4966000, 192, 192, 0, 4966, 0, + 2, 0, 0, 0, 480, 6846000, 720, 720, 0, 6846, 0, + 3, 0, 0, 0, 480, 7212000, 768, 768, 0, 7212, 0, + 4, 0, 0, 0, 480, 9532000, 1536, 1536, 0, 9532, 0] +#elif CONFIG_SOC_INTEL_ACE30 mod_cfg = [0, 0, 0, 0, 480, 1114000, 48, 64, 0, 0, 0, 1, 0, 0, 0, 480, 3321600, 192, 256, 0, 0, 0, 2, 0, 0, 0, 480, 3786000, 192, 256, 0, 0, 0, @@ -61,7 +67,13 @@ 2, 0, 0, 0, 416, 8192000, 512, 512, 0, 8192, 0, 3, 0, 0, 0, 416, 10091000, 128, 128, 0, 10091, 0, 4, 0, 0, 0, 416, 5908000, 768, 768, 0, 5908, 0] -#elif CONFIG_LUNARLAKE || CONFIG_SOC_INTEL_ACE30 +#elif CONFIG_LUNARLAKE + mod_cfg = [0, 0, 0, 0, 416, 9525000, 1536, 1536, 0, 9525, 0, + 1, 0, 0, 0, 416, 6266000, 384, 384, 0, 6266, 0, + 2, 0, 0, 0, 416, 7882000, 512, 512, 0, 7882, 0, + 3, 0, 0, 0, 416, 5170000, 128, 128, 0, 5170, 0, + 4, 0, 0, 0, 416, 5908000, 768, 768, 0, 0, 0] +#elif CONFIG_SOC_INTEL_ACE30 mod_cfg = [0, 0, 0, 0, 416, 914000, 48, 64, 0, 0, 0, 1, 0, 0, 0, 416, 1321600, 192, 256, 0, 0, 0, 2, 0, 0, 0, 416, 1786000, 192, 256, 0, 0, 0, From 603fdf62f4b74bb0e80447386de5cdeed2d36c1d Mon Sep 17 00:00:00 2001 From: Adrian Bonislawski Date: Thu, 12 Jun 2025 09:52:17 +0200 Subject: [PATCH 3/3] modules: toml: add PTL performance data This patch will add PTL perf data for base modules Signed-off-by: Adrian Bonislawski --- src/audio/asrc/asrc.toml | 33 +++++++------- src/audio/copier/copier.toml | 45 ++++++++++++++----- src/audio/mixin_mixout/mixin_mixout.toml | 32 +++++--------- src/audio/selector/selector.toml | 26 +++++++---- src/audio/src/src.toml | 51 ++++++++++++---------- src/audio/up_down_mixer/up_down_mixer.toml | 29 ++++++++---- src/audio/volume/volume.toml | 23 ++++------ 7 files changed, 135 insertions(+), 104 deletions(-) diff --git a/src/audio/asrc/asrc.toml b/src/audio/asrc/asrc.toml index c87016cc2af1..75bd79878c94 100644 --- a/src/audio/asrc/asrc.toml +++ b/src/audio/asrc/asrc.toml @@ -49,23 +49,22 @@ 12, 0, 0, 0, 20480, 30050000, 384, 192, 0, 30050, 0, 13, 0, 0, 0, 20480, 35152000, 384, 256, 0, 35152, 0, 14, 0, 0, 0, 20480, 81647000, 1536, 1440, 0, 81647, 0] -#elif defined(CONFIG_SOC_INTEL_ACE30) - mod_cfg = [0, 0, 0, 0, 20480, 4065600, 24, 22, 0, 0, 0, - 1, 0, 0, 0, 20480, 5616000, 8, 25, 0, 0, 0, - 2, 0, 0, 0, 20480, 7319200, 24, 27, 0, 0, 0, - 3, 0, 0, 0, 20480, 9155300, 8, 27, 0, 0, 0, - 4, 0, 0, 0, 20480, 10972600, 48, 54, 0, 0, 0, - 5, 0, 0, 0, 20480, 12661000, 16, 36, 0, 0, 0, - 6, 0, 0, 0, 20480, 14448500, 48, 96, 0, 0, 0, - 7, 0, 0, 0, 20480, 16145000, 19, 68, 0, 0, 0, - 8, 0, 0, 0, 20480, 17861300, 45, 102, 0, 0, 0, - 9, 0, 0, 0, 20480, 21425900, 8, 36, 0, 0, 0, - 10, 0, 0, 0, 20480, 22771000, 32, 102, 0, 0, 0, - 11, 0, 0, 0, 20480, 23439000, 48, 27, 0, 0, 0, - 12, 0, 0, 0, 20480, 33394000, 48, 51, 0, 0, 0, - 13, 0, 0, 0, 20480, 36140000, 16, 96, 0, 0, 0, - 14, 0, 0, 0, 20480, 38003000, 16, 68, 0, 0, 0, - 15, 0, 0, 0, 20480, 39787000, 45, 51, 0, 0, 0] +#elif CONFIG_SOC_INTEL_ACE30 + mod_cfg = [0, 0, 0, 0, 20480, 29755000, 64, 192, 0, 29755, 0, + 1, 0, 0, 0, 20480, 58017000, 64, 384, 0, 58017, 0, + 2, 0, 0, 0, 20480, 103471000, 512, 1440, 0, 103471, 0, + 3, 0, 0, 0, 20480, 111431000, 512, 1536, 0, 111431, 0, + 4, 0, 0, 0, 20480, 59433000, 184, 384, 0, 59433, 0, + 5, 0, 0, 0, 20480, 25771000, 192, 128, 0, 25771, 0, + 6, 0, 0, 0, 20480, 54923000, 192, 384, 0, 54923, 0, + 7, 0, 0, 0, 20480, 42727000, 256, 256, 0, 42727, 0, + 8, 0, 0, 0, 20480, 55791000, 256, 384, 0, 55791, 0, + 9, 0, 0, 0, 20480, 57647000, 360, 360, 0, 57647, 0, + 10, 0, 0, 0, 20480, 129703000, 1440, 1536, 0, 129703, 0, + 11, 0, 0, 0, 20480, 60467000, 1536, 512, 0, 60467, 0, + 12, 0, 0, 0, 20480, 34239000, 384, 192, 0, 34239, 0, + 13, 0, 0, 0, 20480, 45743000, 384, 256, 0, 45743, 0, + 14, 0, 0, 0, 20480, 113667000, 1536, 1440, 0, 113667, 0] #endif index = __COUNTER__ diff --git a/src/audio/copier/copier.toml b/src/audio/copier/copier.toml index d82ba15f54ea..d28d9e77aa4e 100644 --- a/src/audio/copier/copier.toml +++ b/src/audio/copier/copier.toml @@ -92,17 +92,40 @@ 28, 0, 0, 0, 280, 6058000, 64, 64, 0, 6058, 0, 29, 0, 0, 0, 280, 6198000, 64, 64, 0, 6198, 0, 30, 0, 0, 0, 280, 6034000, 32, 32, 0, 6034, 0] -#elif defined(CONFIG_SOC_INTEL_ACE30) - mod_cfg = [ 0, 0, 0, 0, 280, 640100, 45, 60, 0, 0, 0, - 1, 0, 0, 0, 280, 1106300, 192, 192, 0, 0, 0, - 2, 0, 0, 0, 280, 1573000, 45, 45, 0, 0, 0, - 3, 0, 0, 0, 280, 2040600, 192, 256, 0, 0, 0, - 4, 0, 0, 0, 280, 2507500, 192, 256, 0, 0, 0, - 5, 0, 0, 0, 280, 2999000, 192, 256, 0, 0, 0, - 6, 0, 0, 0, 280, 3501000, 45, 60, 0, 0, 0, - 7, 0, 0, 0, 280, 3927000, 192, 256, 0, 0, 0, - 8, 0, 0, 0, 280, 4424000, 192, 256, 0, 0, 0, - 9, 0, 0, 0, 280, 4941000, 192, 256, 0, 0, 0] +#elif CONFIG_SOC_INTEL_ACE30 + mod_cfg = [0, 0, 0, 0, 280, 7915000, 768, 768, 0, 7915, 0, + 1, 0, 0, 0, 280, 9487000, 768, 768, 0, 9487, 0, + 2, 0, 0, 0, 280, 7363000, 384, 384, 0, 7363, 0, + 3, 0, 0, 0, 280, 7731000, 512, 512, 0, 7731, 0, + 4, 0, 0, 0, 280, 8459000, 512, 512, 0, 8459, 0, + 5, 0, 0, 0, 280, 7523000, 256, 256, 0, 7523, 0, + 6, 0, 0, 0, 280, 7927000, 768, 768, 0, 7927, 0, + 7, 0, 0, 0, 280, 9507000, 768, 768, 0, 9507, 0, + 8, 0, 0, 0, 280, 7639000, 384, 384, 0, 7639, 0, + 9, 0, 0, 0, 280, 7787000, 512, 512, 0, 7787, 0, + 10, 0, 0, 0, 280, 10211000, 1024, 1024, 0, 10211, 0, + 11, 0, 0, 0, 280, 8387000, 1536, 1536, 0, 8387, 0, + 12, 0, 0, 0, 280, 7923000, 768, 768, 0, 7923, 0, + 13, 0, 0, 0, 280, 8075000, 1024, 1024, 0, 8075, 0, + 14, 0, 0, 0, 280, 8103000, 384, 384, 0, 8103, 0, + 15, 0, 0, 0, 280, 9431000, 2304, 2304, 0, 9431, 0, + 16, 0, 0, 0, 280, 7523000, 256, 256, 0, 7523, 0, + 17, 0, 0, 0, 280, 7479000, 256, 256, 0, 7479, 0, + 18, 0, 0, 0, 280, 7791000, 256, 256, 0, 7791, 0, + 19, 0, 0, 0, 280, 9987000, 3072, 3072, 0, 9987, 0, + 20, 0, 0, 0, 280, 7451000, 128, 128, 0, 7451, 0, + 21, 0, 0, 0, 280, 11495000, 4608, 4608, 0, 11495, 0, + 22, 0, 0, 0, 280, 7627000, 64, 64, 0, 7627, 0, + 23, 0, 0, 0, 280, 7407000, 96, 96, 0, 7407, 0, + 24, 0, 0, 0, 280, 12879000, 6144, 6144, 0, 12879, 0, + 25, 0, 0, 0, 280, 7431000, 192, 192, 0, 7431, 0, + 26, 0, 0, 0, 280, 8580000, 720, 720, 0, 8580, 0, + 27, 0, 0, 0, 280, 7935000, 360, 360, 0, 7935, 0, + 28, 0, 0, 0, 280, 7487000, 180, 180, 0, 7487, 0, + 29, 0, 0, 0, 280, 7623000, 48, 48, 0, 7623, 0, + 30, 0, 0, 0, 280, 7647000, 64, 64, 0, 7647, 0, + 31, 0, 0, 0, 280, 7103000, 32, 32, 0, 7103, 0, +] #endif index = __COUNTER__ diff --git a/src/audio/mixin_mixout/mixin_mixout.toml b/src/audio/mixin_mixout/mixin_mixout.toml index c52688138d51..2fd8fcd30c04 100644 --- a/src/audio/mixin_mixout/mixin_mixout.toml +++ b/src/audio/mixin_mixout/mixin_mixout.toml @@ -32,17 +32,12 @@ 2, 0, 0, 0, 296, 2448000, 512, 512, 0, 2448, 0, 3, 0, 0, 0, 296, 2160000, 128, 128, 0, 2160, 0, 4, 0, 0, 0, 296, 3268000, 1536, 1536, 0, 3268, 0] -#elif defined(CONFIG_SOC_INTEL_ACE30) - mod_cfg = [ 0, 0, 0, 0, 296, 644000, 45, 60, 0, 0, 0, - 1, 0, 0, 0, 296, 669900, 48, 64, 0, 0, 0, - 2, 0, 0, 0, 296, 934000, 96, 128, 0, 0, 0, - 3, 0, 0, 0, 296, 1137000, 96, 128, 0, 0, 0, - 4, 0, 0, 0, 296, 1482000, 48, 64, 0, 0, 0, - 5, 0, 0, 0, 296, 1746000, 96, 128, 0, 0, 0, - 6, 0, 0, 0, 296, 2274000, 192, 256, 0, 0, 0, - 7, 0, 0, 0, 296, 2700000, 48, 64, 0, 0, 0, - 8, 0, 0, 0, 296, 2964000, 96, 128, 0, 0, 0, - 9, 0, 0, 0, 296, 3492000, 192, 256, 0, 0, 0] +#elif CONFIG_SOC_INTEL_ACE30 + mod_cfg = [0, 0, 0, 0, 296, 5091000, 384, 384, 0, 5091, 0, + 1, 0, 0, 0, 296, 5111000, 384, 384, 0, 5111, 0, + 2, 0, 0, 0, 296, 5195000, 512, 512, 0, 5195, 0, + 3, 0, 0, 0, 296, 5219000, 128, 128, 0, 5219, 0, + 4, 0, 0, 0, 296, 5631000, 1536, 1536, 0, 5631, 0] #endif index = __COUNTER__ @@ -82,15 +77,12 @@ 2, 0, 0, 0, 520, 7631000, 512, 512, 0, 0, 0, 3, 0, 0, 0, 520, 1953000, 128, 128, 0, 0, 0, 4, 0, 0, 0, 520, 2301000, 1536, 1536, 0, 0, 0] -#elif defined(CONFIG_SOC_INTEL_ACE30) - mod_cfg = [0, 0, 0, 0, 520, 649600, 48, 64, 0, 0, 0, - 1, 0, 0, 0, 520, 966300, 96, 128, 0, 0, 0, - 2, 0, 0, 0, 520, 2101000, 48, 64, 0, 0, 0, - 3, 0, 0, 0, 520, 2500800, 192, 256, 0, 0, 0, - 4, 0, 0, 0, 520, 2616700, 192, 256, 0, 0, 0, - 5, 0, 0, 0, 520, 2964500, 192, 256, 0, 0, 0, - 6, 0, 0, 0, 520, 4202000, 96, 128, 0, 0, 0, - 7, 0, 0, 0, 520, 3730000, 192, 256, 0, 0, 0] +#elif CONFIG_SOC_INTEL_ACE30 + mod_cfg = [0, 0, 0, 0, 520, 3999000, 384, 384, 0, 3999, 0, + 1, 0, 0, 0, 520, 3999000, 384, 384, 0, 3999, 0, + 2, 0, 0, 0, 520, 4055000, 512, 512, 0, 4055, 0, + 3, 0, 0, 0, 520, 3987000, 128, 128, 0, 3987, 0, + 4, 0, 0, 0, 520, 2273000, 1536, 1536, 0, 2273, 0] #endif index = __COUNTER__ diff --git a/src/audio/selector/selector.toml b/src/audio/selector/selector.toml index fea1f526d7c0..1341931af7c9 100644 --- a/src/audio/selector/selector.toml +++ b/src/audio/selector/selector.toml @@ -39,15 +39,23 @@ 13, 0, 0, 0, 216, 8818000, 384, 1152, 0, 8818, 0, 14, 0, 0, 0, 216, 12274000, 768, 1152, 0, 12274, 0, 15, 0, 0, 0, 216, 19186000, 1536, 1152, 0, 19186, 0] -#elif defined(CONFIG_SOC_INTEL_ACE30) - mod_cfg = [0, 0, 0, 0, 216, 706000, 12, 16, 0, 0, 0, - 1, 0, 0, 0, 216, 1271000, 8, 8, 0, 0, 0, - 2, 0, 0, 0, 216, 1839000, 89, 118, 0, 0, 0, - 3, 0, 0, 0, 216, 2435000, 48, 64, 0, 0, 0, - 4, 0, 0, 0, 216, 3343000, 192, 192, 0, 0, 0, - 5, 0, 0, 0, 216, 3961000, 177, 177, 0, 0, 0, - 6, 0, 0, 0, 216, 4238000, 192, 256, 0, 0, 0, - 7, 0, 0, 0, 216, 6691000, 192, 256, 0, 0, 0] +#elif CONFIG_SOC_INTEL_ACE30 + mod_cfg = [0, 0, 0, 0, 216, 2952000, 384, 192, 0, 2952, 0, + 1, 0, 0, 0, 216, 4720000, 384, 384, 0, 4720, 0, + 2, 0, 0, 0, 216, 5705000, 576, 384, 0, 5705, 0, + 3, 0, 0, 0, 216, 6640000, 768, 384, 0, 6640, 0, + 4, 0, 0, 0, 216, 3910000, 768, 192, 0, 3910, 0, + 5, 0, 0, 0, 216, 4421000, 960, 192, 0, 4421, 0, + 6, 0, 0, 0, 216, 4899000, 1152, 192, 0, 4899, 0, + 7, 0, 0, 0, 216, 5832000, 1536, 192, 0, 5832, 0, + 8, 0, 0, 0, 216, 3768000, 192, 384, 0, 3768, 0, + 9, 0, 0, 0, 216, 7625000, 960, 384, 0, 7625, 0, + 10, 0, 0, 0, 216, 8595000, 1152, 384, 0, 8595, 0, + 11, 0, 0, 0, 216, 10488000, 1536, 384, 0, 10488, 0, + 12, 0, 0, 0, 216, 8952000, 192, 1152, 0, 8952, 0, + 13, 0, 0, 0, 216, 11832000, 384, 1152, 0, 11832, 0, + 14, 0, 0, 0, 216, 17592000, 768, 1152, 0, 17592, 0, + 15, 0, 0, 0, 216, 30172000, 1536, 1152, 0, 30172, 0] #endif index = __COUNTER__ diff --git a/src/audio/src/src.toml b/src/audio/src/src.toml index d38e74e6eb2f..30c42adc0907 100644 --- a/src/audio/src/src.toml +++ b/src/audio/src/src.toml @@ -72,30 +72,33 @@ 23, 0, 0, 0, 12832, 21852000, 180, 256, 0, 21852, 0, 24, 0, 0, 0, 12832, 12629000, 256, 512, 0, 12629, 0, 25, 0, 0, 0, 12832, 13996000, 128, 256, 0, 13996, 0] -#elif defined(CONFIG_SOC_INTEL_ACE30) - mod_cfg = [0, 0, 0, 0, 12832, 1365500, 0, 0, 0, 1365, 0, - 1, 0, 0, 0, 12832, 2302300, 0, 0, 0, 2302, 0, - 2, 0, 0, 0, 12832, 3218200, 0, 0, 0, 3218, 0, - 3, 0, 0, 0, 12832, 4169700, 0, 0, 0, 4169, 0, - 4, 0, 0, 0, 12832, 5095100, 0, 0, 0, 5095, 0, - 5, 0, 0, 0, 12832, 6014800, 0, 0, 0, 6014, 0, - 6, 0, 0, 0, 12832, 6963500, 0, 0, 0, 6963, 0, - 7, 0, 0, 0, 12832, 7791000, 0, 0, 0, 7791, 0, - 8, 0, 0, 0, 12832, 8843000, 0, 0, 0, 8843, 0, - 9, 0, 0, 0, 12832, 9755100, 0, 0, 0, 9755, 0, - 10, 0, 0, 0, 12832, 10726500, 0, 0, 0, 10726, 0, - 11, 0, 0, 0, 12832, 11624100, 0, 0, 0, 11624, 0, - 12, 0, 0, 0, 12832, 12518700, 0, 0, 0, 12518, 0, - 13, 0, 0, 0, 12832, 13555000, 0, 0, 0, 13555, 0, - 14, 0, 0, 0, 12832, 14144500, 0, 0, 0, 14144, 0, - 15, 0, 0, 0, 12832, 15809800, 0, 0, 0, 15809, 0, - 16, 0, 0, 0, 12832, 16749000, 0, 0, 0, 16749, 0, - 17, 0, 0, 0, 12832, 18433500, 0, 0, 0, 18433, 0, - 18, 0, 0, 0, 12832, 19425900, 0, 0, 0, 19425, 0, - 19, 0, 0, 0, 12832, 20396900, 0, 0, 0, 20396, 0, - 20, 0, 0, 0, 12832, 20881000, 0, 0, 0, 20881, 0, - 21, 0, 0, 0, 12832, 23431000, 0, 0, 0, 23431, 0, - 22, 0, 0, 0, 12832, 30471000, 0, 0, 0, 30471, 0] +#elif CONFIG_SOC_INTEL_ACE30 + mod_cfg = [0, 0, 0, 0, 12832, 30633000, 128, 512, 0, 30633, 0, + 1, 0, 0, 0, 12832, 28143000, 64, 256, 0, 28143, 0, + 2, 0, 0, 0, 12832, 33513000, 96, 512, 0, 33513, 0, + 3, 0, 0, 0, 12832, 0, 48, 256, 0, 0, 0, + 4, 0, 0, 0, 12832, 22867000, 64, 256, 0, 22867, 0, + 5, 0, 0, 0, 12832, 19779000, 32, 256, 0, 19779, 0, + 6, 0, 0, 0, 12832, 80857000, 1536, 512, 0, 80857, 0, + 7, 0, 0, 0, 12832, 62393000, 768, 256, 0, 62393, 0, + 8, 0, 0, 0, 12832, 46159000, 768, 512, 0, 46159, 0, + 9, 0, 0, 0, 12832, 36607000, 384, 256, 0, 36607, 0, + 10, 0, 0, 0, 12832, 49951000, 384, 488, 0, 49951, 0, + 11, 0, 0, 0, 12832, 44031000, 192, 244, 0, 44031, 0, + 12, 0, 0, 0, 12832, 28973000, 384, 384, 0, 28973, 0, + 13, 0, 0, 0, 12832, 35669000, 192, 512, 0, 35669, 0, + 14, 0, 0, 0, 12832, 25931000, 96, 256, 0, 25931, 0, + 15, 0, 0, 0, 12832, 19423000, 192, 192, 0, 19423, 0, + 16, 0, 0, 0, 12832, 25667000, 384, 320, 0, 25667, 0, + 17, 0, 0, 0, 12832, 20623000, 192, 160, 0, 20623, 0, + 18, 0, 0, 0, 12832, 23383000, 384, 256, 0, 23383, 0, + 19, 0, 0, 0, 12832, 18269000, 192, 128, 0, 18269, 0, + 20, 0, 0, 0, 12832, 18181000, 384, 192, 0, 18181, 0, + 21, 0, 0, 0, 12832, 15345000, 192, 96, 0, 15345, 0, + 22, 0, 0, 0, 12832, 49977000, 360, 512, 0, 49977, 0, + 23, 0, 0, 0, 12832, 40403000, 180, 256, 0, 40403, 0, + 24, 0, 0, 0, 12832, 28085000, 256, 512, 0, 28085, 0, + 25, 0, 0, 0, 12832, 22923000, 128, 256, 0, 22923, 0] #endif index = __COUNTER__ diff --git a/src/audio/up_down_mixer/up_down_mixer.toml b/src/audio/up_down_mixer/up_down_mixer.toml index 20708fd72ff3..5f5104037321 100644 --- a/src/audio/up_down_mixer/up_down_mixer.toml +++ b/src/audio/up_down_mixer/up_down_mixer.toml @@ -65,15 +65,26 @@ 16, 0, 0, 0, 216, 4596000, 768, 1152, 0, 4596, 0, 17, 0, 0, 0, 216, 5572000, 1536, 1152, 0, 5572, 0, 18, 0, 0, 0, 216, 4896000, 384, 1536, 0, 4896, 0] -#elif defined(CONFIG_SOC_INTEL_ACE30) - mod_cfg = [0, 0, 0, 0, 216, 706000, 12, 16, 0, 0, 0, - 1, 0, 0, 0, 216, 1271000, 8, 8, 0, 0, 0, - 2, 0, 0, 0, 216, 1839000, 89, 118, 0, 0, 0, - 3, 0, 0, 0, 216, 2435000, 48, 64, 0, 0, 0, - 4, 0, 0, 0, 216, 3343000, 192, 192, 0, 0, 0, - 5, 0, 0, 0, 216, 3961000, 177, 177, 0, 0, 0, - 6, 0, 0, 0, 216, 4238000, 192, 256, 0, 0, 0, - 7, 0, 0, 0, 216, 6691000, 192, 256, 0, 0, 0] +#elif CONFIG_SOC_INTEL_ACE30 + mod_cfg = [0, 0, 0, 0, 216, 4841000, 384, 192, 0, 4841, 0, + 1, 0, 0, 0, 216, 4355000, 384, 384, 0, 4355, 0, + 2, 0, 0, 0, 216, 5079000, 576, 384, 0, 5079, 0, + 3, 0, 0, 0, 216, 5275000, 768, 384, 0, 5275, 0, + 4, 0, 0, 0, 216, 9177000, 768, 384, 0, 9177, 0, + 5, 0, 0, 0, 216, 5175000, 768, 384, 0, 5175, 0, + 6, 0, 0, 0, 216, 5141000, 768, 192, 0, 5141, 0, + 7, 0, 0, 0, 216, 5207000, 960, 192, 0, 5207, 0, + 8, 0, 0, 0, 216, 5367000, 1152, 192, 0, 5367, 0, + 9, 0, 0, 0, 216, 5485000, 1536, 192, 0, 5485, 0, + 10, 0, 0, 0, 216, 4469000, 192, 384, 0, 4469, 0, + 11, 0, 0, 0, 216, 5185000, 960, 384, 0, 5185, 0, + 12, 0, 0, 0, 216, 5405000, 1152, 384, 0, 5405, 0, + 13, 0, 0, 0, 216, 5691000, 1536, 384, 0, 5691, 0, + 14, 0, 0, 0, 216, 5577000, 192, 1152, 0, 5577, 0, + 15, 0, 0, 0, 216, 5311000, 384, 1152, 0, 5311, 0, + 16, 0, 0, 0, 216, 5323000, 768, 1152, 0, 5323, 0, + 17, 0, 0, 0, 216, 6269000, 1536, 1152, 0, 6269, 0, + 18, 0, 0, 0, 216, 5699000, 384, 1536, 0, 5699, 0] #endif index = __COUNTER__ diff --git a/src/audio/volume/volume.toml b/src/audio/volume/volume.toml index ff06f34d943d..98aab232ac54 100644 --- a/src/audio/volume/volume.toml +++ b/src/audio/volume/volume.toml @@ -32,13 +32,11 @@ 3, 0, 0, 0, 480, 7212000, 768, 768, 0, 7212, 0, 4, 0, 0, 0, 480, 9532000, 1536, 1536, 0, 9532, 0] #elif CONFIG_SOC_INTEL_ACE30 - mod_cfg = [0, 0, 0, 0, 480, 1114000, 48, 64, 0, 0, 0, - 1, 0, 0, 0, 480, 3321600, 192, 256, 0, 0, 0, - 2, 0, 0, 0, 480, 3786000, 192, 256, 0, 0, 0, - 3, 0, 0, 0, 480, 4333000, 48, 64, 0, 0, 0, - 4, 0, 0, 0, 480, 4910000, 192, 256, 0, 0, 0, - 5, 0, 0, 0, 480, 5441000, 192, 256, 0, 0, 0, - 6, 0, 0, 0, 480, 6265000, 192, 256, 0, 0, 0] + mod_cfg = [0, 0, 0, 0, 480, 6993000, 384, 384, 0, 6993, 0, + 1, 0, 0, 0, 480, 6385000, 192, 192, 0, 6385, 0, + 2, 0, 0, 0, 480, 10887000, 720, 720, 0, 10887, 0, + 3, 0, 0, 0, 480, 10575000, 768, 768, 0, 10575, 0, + 4, 0, 0, 0, 480, 11897000, 1536, 1536, 0, 11897, 0] #endif index = __COUNTER__ @@ -74,13 +72,10 @@ 3, 0, 0, 0, 416, 5170000, 128, 128, 0, 5170, 0, 4, 0, 0, 0, 416, 5908000, 768, 768, 0, 0, 0] #elif CONFIG_SOC_INTEL_ACE30 - mod_cfg = [0, 0, 0, 0, 416, 914000, 48, 64, 0, 0, 0, - 1, 0, 0, 0, 416, 1321600, 192, 256, 0, 0, 0, - 2, 0, 0, 0, 416, 1786000, 192, 256, 0, 0, 0, - 3, 0, 0, 0, 416, 2333000, 48, 64, 0, 0, 0, - 4, 0, 0, 0, 416, 2910000, 192, 256, 0, 0, 0, - 5, 0, 0, 0, 416, 3441000, 192, 256, 0, 0, 0, - 6, 0, 0, 0, 416, 4265000, 192, 256, 0, 0, 0] + mod_cfg = [0, 0, 0, 0, 416, 11865000, 1536, 1536, 0, 11865, 0, + 1, 0, 0, 0, 416, 7797000, 384, 384, 1, 7797, 1, + 2, 0, 0, 0, 416, 12083000, 512, 512, 2, 12083, 2, + 3, 0, 0, 0, 416, 7163000, 128, 128, 3, 7163, 3] #endif index = __COUNTER__