From f7502b8bc5970bbe76b8490508b1157633ad2b22 Mon Sep 17 00:00:00 2001 From: Jaroslaw Stelter Date: Thu, 30 Nov 2023 13:46:24 +0100 Subject: [PATCH] tools: rimage: config: add PTL config Add base PTL config derived from MTL. Signed-off-by: Jaroslaw Stelter --- src/audio/asrc/asrc.toml | 2 +- src/audio/copier/copier.toml | 2 +- src/audio/eq_iir/eq_iir.toml | 2 +- src/audio/mixin_mixout/mixin_mixout.toml | 4 +- src/audio/selector/selector.toml | 2 +- src/audio/src/src.toml | 2 +- src/audio/up_down_mixer/up_down_mixer.toml | 2 +- src/audio/volume/gain.toml | 2 +- src/audio/volume/peakvol.toml | 2 +- src/samples/audio/smart_amp_test.toml | 2 +- tools/rimage/config/platform-ptl.toml | 56 ++++++++++ tools/rimage/config/ptl.toml.h | 124 +++++++++++++++++++++ 12 files changed, 191 insertions(+), 11 deletions(-) create mode 100644 tools/rimage/config/platform-ptl.toml create mode 100644 tools/rimage/config/ptl.toml.h diff --git a/src/audio/asrc/asrc.toml b/src/audio/asrc/asrc.toml index 9e744452de20..0bf6ace59bd9 100644 --- a/src/audio/asrc/asrc.toml +++ b/src/audio/asrc/asrc.toml @@ -29,7 +29,7 @@ 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] -#elif CONFIG_LUNARLAKE +#elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_PANTHERLAKE) 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 12977121f342..e7cd23f5154b 100644 --- a/src/audio/copier/copier.toml +++ b/src/audio/copier/copier.toml @@ -60,7 +60,7 @@ 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] -#elif CONFIG_LUNARLAKE +#elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_PANTHERLAKE) 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/eq_iir/eq_iir.toml b/src/audio/eq_iir/eq_iir.toml index 441469af85a3..ad369d38edce 100644 --- a/src/audio/eq_iir/eq_iir.toml +++ b/src/audio/eq_iir/eq_iir.toml @@ -23,7 +23,7 @@ mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 1000, 0, 0, 0, 0, 0, 4096, 20663000, 768, 768, 0, 20663, 0, 0, 0, 0, 0, 4096, 11357000, 384, 384, 0, 11357, 0] -#elif CONFIG_LUNARLAKE +#elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_PANTHERLAKE) mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0] #endif diff --git a/src/audio/mixin_mixout/mixin_mixout.toml b/src/audio/mixin_mixout/mixin_mixout.toml index e342706fa773..22a6d3e471e6 100644 --- a/src/audio/mixin_mixout/mixin_mixout.toml +++ b/src/audio/mixin_mixout/mixin_mixout.toml @@ -26,7 +26,7 @@ 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] -#elif CONFIG_LUNARLAKE +#elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_PANTHERLAKE) 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 +70,7 @@ 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] -#elif CONFIG_LUNARLAKE +#elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_PANTHERLAKE) 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 45ce65a83213..e93327242579 100644 --- a/src/audio/selector/selector.toml +++ b/src/audio/selector/selector.toml @@ -18,7 +18,7 @@ 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 CONFIG_LUNARLAKE +#elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_PANTHERLAKE) 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 1568491051de..9cd67f28d9ce 100644 --- a/src/audio/src/src.toml +++ b/src/audio/src/src.toml @@ -41,7 +41,7 @@ 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] -#elif CONFIG_LUNARLAKE +#elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_PANTHERLAKE) 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 117d6a115069..34a1bf586188 100644 --- a/src/audio/up_down_mixer/up_down_mixer.toml +++ b/src/audio/up_down_mixer/up_down_mixer.toml @@ -45,7 +45,7 @@ 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] -#elif CONFIG_LUNARLAKE +#elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_PANTHERLAKE) 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/gain.toml b/src/audio/volume/gain.toml index 64894fa9ce7f..1bd8defc4e2b 100644 --- a/src/audio/volume/gain.toml +++ b/src/audio/volume/gain.toml @@ -20,7 +20,7 @@ 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] -#elif CONFIG_LUNARLAKE +#elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_PANTHERLAKE) 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, diff --git a/src/audio/volume/peakvol.toml b/src/audio/volume/peakvol.toml index 7eb9fe739e8e..c7a3bea647f3 100644 --- a/src/audio/volume/peakvol.toml +++ b/src/audio/volume/peakvol.toml @@ -20,7 +20,7 @@ 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] -#elif CONFIG_LUNARLAKE +#elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_PANTHERLAKE) 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, diff --git a/src/samples/audio/smart_amp_test.toml b/src/samples/audio/smart_amp_test.toml index 6862391af9c2..39f2a76c47a8 100644 --- a/src/samples/audio/smart_amp_test.toml +++ b/src/samples/audio/smart_amp_test.toml @@ -23,7 +23,7 @@ REM # mod_cfg [PAR_0 PAR_1 PAR_2 PAR_3 IS_BYTES CPS IBS OBS MOD_FLAGS CPC OBLS] #ifdef CONFIG_METEORLAKE mod_cfg = [0, 0, 0, 0, 296, 5000000, 384, 384, 0, 5000, 0] -#elif CONFIG_LUNARLAKE +#elif defined(CONFIG_LUNARLAKE) || defined(CONFIG_PANTHERLAKE) mod_cfg = [0, 0, 0, 0, 4096, 1000000, 128, 128, 0, 0, 0] #endif diff --git a/tools/rimage/config/platform-ptl.toml b/tools/rimage/config/platform-ptl.toml new file mode 100644 index 000000000000..e32b9a1776f9 --- /dev/null +++ b/tools/rimage/config/platform-ptl.toml @@ -0,0 +1,56 @@ +version = [3, 0] + +[adsp] +name = "ptl" +image_size = "0x2C0000" # (22) bank * 128KB +alias_mask = "0xE0000000" + +[[adsp.mem_zone]] +type = "ROM" +base = "0x1FF80000" +size = "0x400" +[[adsp.mem_zone]] +type = "IMR" +base = "0xA104A000" +size = "0x2000" +[[adsp.mem_zone]] +type = "SRAM" +base = "0xa00f0000" +size = "0x100000" + +[[adsp.mem_alias]] +type = "uncached" +base = "0x40000000" +[[adsp.mem_alias]] +type = "cached" +base = "0xA0000000" + +[cse] +partition_name = "ADSP" +[[cse.entry]] +name = "ADSP.man" +offset = "0x5c" +length = "0x4b8" +[[cse.entry]] +name = "ADSP.met" +offset = "0x4c0" +length = "0x70" +[[cse.entry]] +name = "ADSP" +offset = "0x540" +length = "0x0" # calculated by rimage + +[css] + +[signed_pkg] +name = "ADSP" +[[signed_pkg.module]] +name = "ADSP.met" + +[adsp_file] +[[adsp_file.comp]] +base_offset = "0x2000" + +[fw_desc.header] +name = "ADSPFW" +load_offset = "0x40000" diff --git a/tools/rimage/config/ptl.toml.h b/tools/rimage/config/ptl.toml.h new file mode 100644 index 000000000000..377bf22dd66e --- /dev/null +++ b/tools/rimage/config/ptl.toml.h @@ -0,0 +1,124 @@ +#include "platform-ptl.toml" + +[[module.entry]] +name = "BRNGUP" +uuid = "2B79E4F3-4675-F649-89DF-3BC194A91AEB" +affinity_mask = "0x1" +instance_count = "1" +domain_types = "0" +load_type = "0" +module_type = "0" +auto_start = "0" + +index = __COUNTER__ + +[[module.entry]] +name = "BASEFW" +uuid = "0E398C32-5ADE-BA4B-93B1-C50432280EE4" +affinity_mask = "3" +instance_count = "1" +domain_types = "0" +load_type = "0" +module_type = "0" +auto_start = "0" + +index = __COUNTER__ + +#ifdef CONFIG_COMP_MIXIN_MIXOUT +#include