March 2018 - Sound-open-firmware - mailman.alsa-project.org

[Sound-open-firmware] Open Source Firmware Conference 2018
by Philipp Deppenwiese 20 Mar '18

20 Mar '18

Hi There! On behalf on myself and 9elements GmbH. I would like to invite you to the Open Source Firmware Conference 2018, that is going to held from September 12th to 15th in Erlangen, Germany. Open Source has revolutionised the process of software development. However, firmware has traditionally been developed closed source by hardware manufactures. Today's use cases have new requirements regarding security and features like running web browser inside the firmware. Our conference is for everyone that is interested in the use cases and possibilities offered by open source firmware development. If you project is interested to join our conference which includes slots for talks and free tickets, feel free to contact us via osfc(a)9elements.com . Homepage: www.osfc.io Twiterr: osfc_io Best Regards, Philipp

1 0

[Sound-open-firmware] [PATCH] Disable high frequent trace message in dw_dma_irq_handler().
by yan.wang＠linux.intel.com 20 Mar '18

20 Mar '18

From: Yan Wang <yan.wang(a)linux.intel.com> It will cause DMA trace local buffer overflow and unnecessary. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/drivers/dw-dma.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/drivers/dw-dma.c b/src/drivers/dw-dma.c index a5717f3..2c46545 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -910,11 +910,12 @@ static void dw_dma_irq_handler(void *data) int i = dma_int->channel; status_intr = dw_read(dma, DW_INTR_STATUS); - if (!status_intr) + if (!status_intr) { trace_dma_error("eDI"); + trace_value(status_intr); + } - trace_dma("irq"); - trace_value(status_intr); + tracev_dma("irq"); /* get the source of our IRQ. */ status_block = dw_read(dma, DW_STATUS_BLOCK); -- 2.14.3

5 4

[Sound-open-firmware] [PATCH] dw-dma: Fix channel status for CNL
by Xiuli Pan 20 Mar '18

20 Mar '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> At the end of the DMA, we need to set the channel status into parapre, otherwise next dma start will fail. This will fix CNL pause resume issues. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- Test with: Mininow max rt5651 and GP-MRB nocodec and CNL nocodec SOF 1.1-stable: a3fab58d59dc9fc66ee8e5474d479a22e7f180bd SOF-Tool 1.1-stable: cc91c73aa3e91eea35abdeb76d578b97f718feff https://github.com/plbossart/sound/tree/topic/sof-v4.14: 4881a4bd906f8b52bebd209b88ff920005550d53 --- src/drivers/dw-dma.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/drivers/dw-dma.c b/src/drivers/dw-dma.c index a5717f3..768f204 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -1101,6 +1101,7 @@ static void dw_dma_irq_handler(void *data) trace_dma("LSo"); /* disable channel, finished */ dw_write(dma, DW_DMA_CHAN_EN, CHAN_DISABLE(i)); + p->chan[i].status = COMP_STATE_PREPARE; } } #endif -- 2.7.4

2 1

[Sound-open-firmware] [PATCH 1/2] volume: fix errors in volume scaling multiplication
by Ranjani Sridharan 20 Mar '18

20 Mar '18

This patch fixes the errors in fixed-point multiplication function for volume scaling that caused sign inversions. It also breaks up the operation into 4 separate functions depending on the source and sink formats. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/include/reef/audio/format.h | 114 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 105 insertions(+), 9 deletions(-) diff --git a/src/include/reef/audio/format.h b/src/include/reef/audio/format.h index c9c23ec..669a314 100644 --- a/src/include/reef/audio/format.h +++ b/src/include/reef/audio/format.h @@ -153,22 +153,118 @@ static inline int16_t sat_int16(int32_t x) return (int16_t)x; } -/* Fractional multiplication with shift and saturation */ -static inline int32_t q_multsr_sat_32x32(int32_t x, int32_t y, - const int shift_bits) +static inline int32_t sign_extend_s24(int32_t x) { - return sat_int32(((((int64_t)x * y) >> (shift_bits - 1)) + 1) >> 1); + return (x << 8) >> 8; } -static inline int16_t q_multsr_sat_16x16(int16_t x, int32_t y, - const int shift_bits) +/* Truncate a 64-bit int by shift_bits + * This function rounds the result before truncating + */ +static inline int64_t shift_64(int64_t x, int shift_bits) { - return sat_int16(((((int32_t)x * y) >> (shift_bits - 1)) + 1) >> 1); + return (int64_t)(((x >> (shift_bits - 1)) + 1) >> 1); } -static inline int32_t sign_extend_s24(int32_t x) +/* Truncate a 32-bit int by shift_bits + * This function rounds the result before truncating + */ +static inline int32_t shift_32(int32_t x, int shift_bits) { - return (x << 8) >> 8; + return (int32_t)(((x >> (shift_bits - 1)) + 1) >> 1); +} + +/* Fractional multiplication with shift and saturation + * This function multiplies a 16-bit number by a 32-bit unsigned number and + * copies the result to a 32-bit int + */ +static inline void q_multsr_sat_16x32_32(int16_t *src, uint32_t vol, + const int shift_bits, int32_t *dest, + int offset, int sign_extend) +{ + int64_t temp; + + if (shift_bits == 0) { + /* Samples are Q1.15 and volume unsigned is Q1.16 */ + dest[offset] = (int32_t)(src[offset] * vol); + return; + } + + /* store the intermediate product in an int64 */ + temp = (int64_t)((int64_t)src[offset] * vol); + + /* round, truncate and saturate if needed */ + dest[offset] = sat_int32(shift_64(temp, shift_bits)); +} + +/* Fractional multiplication with shift and saturation + * This function multiplies 2 32-bit numbers and stores + * copies the result to a 32-bit int + */ +static inline void q_multsr_sat_32x32_32(int32_t *src, uint32_t vol, + const int shift_bits, int32_t *dest, + int offset, int sign_extend) +{ + int64_t temp; + + /* store the intermediate product in an int64 */ + if (sign_extend) { + /* Sample are Q1.23 and volume is unsigned Q1.16 + * sign extend the input samples + */ + temp = (int64_t)((int64_t)sign_extend_s24(src[offset]) * + vol); + } else { + /* Sample are Q1.31 and volume unsigned is Q1.16 */ + temp = (int64_t)((int64_t)src[offset] * vol); + } + + /* round, truncate and saturate if needed */ + dest[offset] = sat_int32(shift_64(temp, shift_bits)); +} + +/* Fractional multiplication with shift and saturation + * This function multiplies a 16-bit number by a 32-bit unsigned number and + * copies the result to a 16-bit int + */ +static inline void q_multsr_sat_16x16_16(int16_t *src, uint32_t vol, + const int shift_bits, int16_t *dest, + int offset, int sign_extend) +{ + int32_t temp; + + /* Sample are Q1.15 and volume is unsigned Q1.16 + * store the intermediate product in an int32 + */ + temp = (int32_t)((int32_t)src[offset] * vol); + + /* round, truncate and saturate if needed */ + dest[offset] = sat_int16(shift_32(temp, shift_bits)); +} + +/* Fractional multiplication with shift and saturation + * This function multiplies 2 32-bit numbers and + * copies the result to a 16-bit int + */ +static inline void q_multsr_sat_32x32_16(int32_t *src, uint32_t vol, + const int shift_bits, int16_t *dest, + int offset, int sign_extend) +{ + int64_t temp; + + /* store the intermediate product in an int64 */ + if (sign_extend) { + /* Sample are Q1.23 and volume is unsigned Q1.16 + * sign extend the input samples + */ + temp = (int64_t)((int64_t)sign_extend_s24(src[offset]) * vol); + } else { + /* Sample are Q1.31 and volume is unsigned Q1.16 */ + temp = (int64_t)((int64_t)src[offset] * vol); + } + + /* round, truncate and saturate if needed */ + dest[offset] = (int16_t)sat_int32(shift_64(temp, shift_bits)); } #endif -- 2.14.1

2 3

[Sound-open-firmware] Using the Qemu DSP emulator
by Daniel Baluta 19 Mar '18

19 Mar '18

Hi, I'm following the instruction on SOF wiki page on how to use the emulator [1] and both VM0 and VM1 are up, anyhow SOF DSP device isn't probed. How do you do it in your qemu setup? Are you using an ACPI file? (or DT?). I'm running the following commands: # ./xtensa-host.sh bxt # ./x86-host.sh bxt and pointing qemu to load my bzimage. thanks, Daniel. [1] https://www.alsa-project.org/main/index.php/Firmware#Using_the_Qemu_DSP_emu…

2 14

[Sound-open-firmware] [PATCH] topology: media: fix incorrect pipeline ID for media PCM
by Liam Girdwood 19 Mar '18

19 Mar '18

Missing include for pcm.m4 Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/sof/pipe-pcm-media.m4 | 1 + 1 file changed, 1 insertion(+) diff --git a/topology/sof/pipe-pcm-media.m4 b/topology/sof/pipe-pcm-media.m4 index 1ca829f..9eaa187 100644 --- a/topology/sof/pipe-pcm-media.m4 +++ b/topology/sof/pipe-pcm-media.m4 @@ -14,6 +14,7 @@ include(`buffer.m4') include(`pga.m4') include(`mixercontrol.m4') include(`pipeline.m4') +include(`pcm.m4') # # Controls -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] Use tracev instead of trace for some high frequent traces on APL/CNL.
by yan.wang＠linux.intel.com 19 Mar '18

19 Mar '18

From: Yan Wang <yan.wang(a)linux.intel.com> DMA trace itself uses DMA copying which will cause some DMA copying related traces are called recursively. So use tracev to avoid this. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/drivers/hda-dma.c | 2 +- src/ipc/apl-ipc.c | 4 ++-- src/ipc/cnl-ipc.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/drivers/hda-dma.c b/src/drivers/hda-dma.c index d2064e8..caea70e 100644 --- a/src/drivers/hda-dma.c +++ b/src/drivers/hda-dma.c @@ -114,7 +114,7 @@ static inline void hda_update_bits(struct dma *dma, uint32_t chan, /* notify DMA to copy bytes */ static int hda_dma_copy(struct dma *dma, int channel, int bytes) { - trace_host("GwU"); + tracev_host("GwU"); /* reset BSC before start next copy */ hda_update_bits(dma, channel, DGCS, DGCS_BSC, DGCS_BSC); diff --git a/src/ipc/apl-ipc.c b/src/ipc/apl-ipc.c index 4b8ee6b..5665482 100644 --- a/src/ipc/apl-ipc.c +++ b/src/ipc/apl-ipc.c @@ -61,7 +61,7 @@ static void irq_handler(void *arg) uint32_t dipcie; uint32_t msg = 0; - trace_ipc("IRQ"); + tracev_ipc("IRQ"); dipct = ipc_read(IPC_DIPCT); dipcie = ipc_read(IPC_DIPCIE); @@ -86,7 +86,7 @@ static void irq_handler(void *arg) /* reply message(done) from host */ if (dipcie & IPC_DIPCIE_DONE) { - trace_ipc("Rpy"); + tracev_ipc("Rpy"); /* mask Done interrupt */ ipc_write(IPC_DIPCCTL, ipc_read(IPC_DIPCCTL) & ~IPC_DIPCCTL_IPCIDIE); diff --git a/src/ipc/cnl-ipc.c b/src/ipc/cnl-ipc.c index 15687fc..347cad2 100644 --- a/src/ipc/cnl-ipc.c +++ b/src/ipc/cnl-ipc.c @@ -62,7 +62,7 @@ static void irq_handler(void *arg) uint32_t dipcida; uint32_t msg = 0; - trace_ipc("IRQ"); + tracev_ipc("IRQ"); dipctdr = ipc_read(IPC_DIPCTDR); dipcida = ipc_read(IPC_DIPCIDA); @@ -86,7 +86,7 @@ static void irq_handler(void *arg) /* reply message(done) from host */ if (dipcida & IPC_DIPCIDA_DONE) { - trace_ipc("Rpy"); + tracev_ipc("Rpy"); /* mask Done interrupt */ ipc_write(IPC_DIPCCTL, ipc_read(IPC_DIPCCTL) & ~IPC_DIPCCTL_IPCIDIE); -- 2.14.3

2 1

[Sound-open-firmware] [PATCH] rimage: manifest: Move text offset into non immutable ROM structure.
by Liam Girdwood 19 Mar '18

19 Mar '18

text_offset was added to an immutable ROM structure that would break some tools and cause instability. Fix this by creating a new structure for rimage manifest data that can be modified without breaking the ROM ABI. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- rimage/manifest.c | 18 +++++++++--------- src/include/uapi/manifest.h | 27 +++++++++++++++++---------- src/platform/apollolake/base_module.c | 20 +++++++++++--------- src/platform/cannonlake/base_module.c | 20 +++++++++++--------- src/platform/cannonlake/boot_module.c | 20 +++++++++++--------- 5 files changed, 59 insertions(+), 46 deletions(-) diff --git a/rimage/manifest.c b/rimage/manifest.c index 337f82a4..243c194f 100644 --- a/rimage/manifest.c +++ b/rimage/manifest.c @@ -194,7 +194,7 @@ static int man_get_module_manifest(struct image *image, struct module *module, { Elf32_Shdr *section; struct sof_man_segment_desc *segment; - struct sof_man_module sof_mod; + struct sof_man_module_manifest sof_mod; size_t count; int ret, man_section_idx; @@ -224,14 +224,14 @@ static int man_get_module_manifest(struct image *image, struct module *module, /* configure man_module with sofmod data */ memcpy(man_module->struct_id, "$AME", 4); - man_module->entry_point = sof_mod.entry_point; - memcpy(man_module->name, sof_mod.name, SOF_MAN_MOD_NAME_LEN); - memcpy(man_module->uuid, sof_mod.uuid, 16); - man_module->affinity_mask = sof_mod.affinity_mask; - man_module->type.auto_start = sof_mod.type.auto_start; - man_module->type.domain_dp = sof_mod.type.domain_dp; - man_module->type.domain_ll = sof_mod.type.domain_ll; - man_module->type.load_type = sof_mod.type.load_type; + man_module->entry_point = sof_mod.module.entry_point; + memcpy(man_module->name, sof_mod.module.name, SOF_MAN_MOD_NAME_LEN); + memcpy(man_module->uuid, sof_mod.module.uuid, 16); + man_module->affinity_mask = sof_mod.module.affinity_mask; + man_module->type.auto_start = sof_mod.module.type.auto_start; + man_module->type.domain_dp = sof_mod.module.type.domain_dp; + man_module->type.domain_ll = sof_mod.module.type.domain_ll; + man_module->type.load_type = sof_mod.module.type.load_type; /* read out text_fixup_size from memory mapping */ module->text_fixup_size = sof_mod.text_size; diff --git a/src/include/uapi/manifest.h b/src/include/uapi/manifest.h index e83725bd..f53a6628 100644 --- a/src/include/uapi/manifest.h +++ b/src/include/uapi/manifest.h @@ -75,7 +75,7 @@ union sof_man_segment_flags { } __attribute__((packed)); /* - * Module segment descriptor. + * Module segment descriptor. Used by ROM - Immutable. */ struct sof_man_segment_desc { union sof_man_segment_flags flags; @@ -93,7 +93,7 @@ struct sof_man_segment_desc { #define SOF_MAN_MOD_ID {'$', 'A', 'M', 'E'} /* - * Each module has an entry in the FW header. + * Each module has an entry in the FW header. Used by ROM - Immutable. */ struct sof_man_module { uint8_t struct_id[SOF_MAN_MOD_ID_LEN]; /* SOF_MAN_MOD_ID */ @@ -102,7 +102,6 @@ struct sof_man_module { struct sof_man_module_type type; uint8_t hash[SOF_MAN_MOD_SHA256_LEN]; uint32_t entry_point; - uint32_t text_size; uint16_t cfg_offset; uint16_t cfg_count; uint32_t affinity_mask; @@ -112,7 +111,7 @@ struct sof_man_module { } __attribute__((packed)); /* - * Each module has a configuration in the FW header. + * Each module has a configuration in the FW header. Used by ROM - Immutable. */ struct sof_man_mod_config { uint32_t par[4]; /* module parameters */ @@ -138,9 +137,9 @@ struct sof_man_mod_config { /* * The firmware has a standard header that is checked by the ROM on firmware - * loading. - * preload_page_count is used by DMA code loader and is entire image size on - * CNL. i.e. CNL: total size of the binary’s .text and .rodata + * loading. preload_page_count is used by DMA code loader and is entire + * image size on CNL. i.e. CNL: total size of the binary’s .text and .rodata + * Used by ROM - Immutable. */ struct sof_man_fw_header { uint8_t header_id[4]; @@ -163,7 +162,7 @@ struct sof_man_fw_header { /* * Firmware manifest descriptor. This can contain N modules and N module - * configs. + * configs. Used by ROM - Immutable. */ struct sof_man_fw_desc { struct sof_man_fw_header header; @@ -181,7 +180,7 @@ struct sof_man_fw_desc { } __attribute__((packed)); /* - * Component Descriptor + * Component Descriptor. Used by ROM - Immutable. */ struct sof_man_component_desc { uint32_t reserved[2]; /* all 0 */ @@ -194,7 +193,7 @@ struct sof_man_component_desc { /* - * Audio DSP extended metadata. + * Audio DSP extended metadata. Used by ROM - Immutable. */ struct sof_man_adsp_meta_file_ext { uint32_t ext_type; /* always 17 for ADSP extension */ @@ -204,6 +203,14 @@ struct sof_man_adsp_meta_file_ext { struct sof_man_component_desc comp_desc[1]; } __attribute__((packed)); +/* + * Module Manifest for rimage module metadata. Not used by ROM. + */ +struct sof_man_module_manifest { + struct sof_man_module module; + uint32_t text_size; +}; + /* utility to get module pointer from position */ static inline struct sof_man_module *sof_man_get_module( struct sof_man_fw_desc *desc, int index) diff --git a/src/platform/apollolake/base_module.c b/src/platform/apollolake/base_module.c index 56633c5b..141d7ba8 100644 --- a/src/platform/apollolake/base_module.c +++ b/src/platform/apollolake/base_module.c @@ -36,16 +36,18 @@ * the SOF executable image but is inserted by object copy as a ELF section * for parsing by rimage (to genrate the manifest). */ -struct sof_man_module apl_manifest = { - .name = "BASEFW", - .uuid = {0x2e, 0x9e, 0x86, 0xfc, 0xf8, 0x45, 0x45, 0x40, - 0xa4, 0x16, 0x89, 0x88, 0x0a, 0xe3, 0x20, 0xa9}, - .entry_point = REEF_TEXT_START, - .type = { - .load_type = SOF_MAN_MOD_TYPE_MODULE, - .domain_ll = 1, +struct sof_man_module_manifest apl_manifest = { + .module = { + .name = "BASEFW", + .uuid = {0x2e, 0x9e, 0x86, 0xfc, 0xf8, 0x45, 0x45, 0x40, + 0xa4, 0x16, 0x89, 0x88, 0x0a, 0xe3, 0x20, 0xa9}, + .entry_point = REEF_TEXT_START, + .type = { + .load_type = SOF_MAN_MOD_TYPE_MODULE, + .domain_ll = 1, + }, + .affinity_mask = 3, }, - .affinity_mask = 3, .text_size = REEF_TEXT_SIZE + L2_VECTOR_SIZE, }; diff --git a/src/platform/cannonlake/base_module.c b/src/platform/cannonlake/base_module.c index dd5d7199..ac1f8737 100644 --- a/src/platform/cannonlake/base_module.c +++ b/src/platform/cannonlake/base_module.c @@ -36,16 +36,18 @@ * the SOF executable image but is inserted by object copy as a ELF section * for parsing by rimage (to genrate the manifest). */ -struct sof_man_module cnl_manifest = { - .name = "BASEFW", - .uuid = {0x32, 0x8c, 0x39, 0x0e, 0xde, 0x5a, 0x4b, 0xba, - 0x93, 0xb1, 0xc5, 0x04, 0x32, 0x28, 0x0e, 0xe4}, - .entry_point = REEF_TEXT_START, - .type = { - .load_type = SOF_MAN_MOD_TYPE_MODULE, - .domain_ll = 1, +struct sof_man_module_manifest cnl_manifest = { + .module = { + .name = "BASEFW", + .uuid = {0x32, 0x8c, 0x39, 0x0e, 0xde, 0x5a, 0x4b, 0xba, + 0x93, 0xb1, 0xc5, 0x04, 0x32, 0x28, 0x0e, 0xe4}, + .entry_point = REEF_TEXT_START, + .type = { + .load_type = SOF_MAN_MOD_TYPE_MODULE, + .domain_ll = 1, + }, + .affinity_mask = 3, }, - .affinity_mask = 3, }; /* not used, but stops linker complaining */ diff --git a/src/platform/cannonlake/boot_module.c b/src/platform/cannonlake/boot_module.c index 7d965f5d..48374933 100644 --- a/src/platform/cannonlake/boot_module.c +++ b/src/platform/cannonlake/boot_module.c @@ -36,16 +36,18 @@ * the SOF executable image but is inserted by object copy as a ELF section * for parsing by rimage (to genrate the manifest). */ -struct sof_man_module cnl_bootldr_manifest = { - .name = "BRNGUP", - .uuid = {0xf3, 0xe4, 0x79, 0x2b, 0x75, 0x46, 0x49, 0xf6, - 0x89, 0xdf, 0x3b, 0xc1, 0x94, 0xa9, 0x1a, 0xeb}, - .entry_point = IMR_BOOT_LDR_TEXT_ENTRY_BASE, - .type = { - .load_type = SOF_MAN_MOD_TYPE_MODULE, - .domain_ll = 1, +struct sof_man_module_manifest cnl_bootldr_manifest = { + .module = { + .name = "BRNGUP", + .uuid = {0xf3, 0xe4, 0x79, 0x2b, 0x75, 0x46, 0x49, 0xf6, + 0x89, 0xdf, 0x3b, 0xc1, 0x94, 0xa9, 0x1a, 0xeb}, + .entry_point = IMR_BOOT_LDR_TEXT_ENTRY_BASE, + .type = { + .load_type = SOF_MAN_MOD_TYPE_MODULE, + .domain_ll = 1, + }, + .affinity_mask = 3, }, - .affinity_mask = 3, }; /* not used, but stops linker complaining */ -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] byt: panic: Set IPCD with panic reason IPCX for trace point.
by Liam Girdwood 17 Mar '18

17 Mar '18

Aligned with driver. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/platform/baytrail/include/platform/platform.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/platform/baytrail/include/platform/platform.h b/src/platform/baytrail/include/platform/platform.h index 8b713dfe..036f5494 100644 --- a/src/platform/baytrail/include/platform/platform.h +++ b/src/platform/baytrail/include/platform/platform.h @@ -99,11 +99,12 @@ struct reef; /* Platform defined panic code */ #define platform_panic(__x) \ - shim_write(SHIM_IPCDH, (0xdead000 | (__x & 0xfff))) + shim_write(SHIM_IPCDL, (0xdead000 | (__x & 0xfff))); \ + shim_write(SHIM_IPCDH, SHIM_IPCDH_BUSY); /* Platform defined trace code */ #define platform_trace_point(__x) \ - shim_write(SHIM_IPCDH, (__x & 0x3fffffff)) + shim_write(SHIM_IPCXL, (__x & 0x3fffffff)) /* * APIs declared here are defined for every platform and IPC mechanism. */ -- 2.14.1

1 0

[Sound-open-firmware] [PATCH] topology: pcm: Fix PCM ID for topologies > 1 PCM
by Liam Girdwood 17 Mar '18

17 Mar '18

PCM number was not being preserved and was always zero. This would overwrite previous PCMs and cause the FW to return invalid PCM error messages. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/m4/pcm.m4 | 36 +++++++++++++++---------------- topology/sof/pipe-low-latency-capture.m4 | 6 +++--- topology/sof/pipe-low-latency-playback.m4 | 6 +++--- topology/sof/pipe-passthrough-capture.m4 | 6 +++--- topology/sof/pipe-passthrough-playback.m4 | 6 +++--- topology/sof/pipe-pcm-media.m4 | 6 +++--- topology/sof/pipe-src-capture.m4 | 6 +++--- topology/sof/pipe-src-playback.m4 | 6 +++--- topology/sof/pipe-volume-capture.m4 | 6 +++--- topology/sof/pipe-volume-playback.m4 | 6 +++--- 10 files changed, 45 insertions(+), 45 deletions(-) diff --git a/topology/m4/pcm.m4 b/topology/m4/pcm.m4 index 596f2fe..f77cb01 100644 --- a/topology/m4/pcm.m4 +++ b/topology/m4/pcm.m4 @@ -3,18 +3,18 @@ divert(-1) dnl Define the macro for PCM playback/capture/capabilities dnl PCM name) -define(`N_PCMP', `PCM'PCM_ID`P') -define(`N_PCMC', `PCM'PCM_ID`C') +define(`N_PCMP', `PCM'$1`P') +define(`N_PCMC', `PCM'$1`C') -dnl W_PCM_PLAYBACK(stream, dmac, dmac_chan, periods_sink, periods_source, preload) +dnl W_PCM_PLAYBACK(pcm, stream, dmac, dmac_chan, periods_sink, periods_source, preload) dnl PCM platform configuration define(`W_PCM_PLAYBACK', `SectionVendorTuples."'N_PCMP($1)`_tuples_w_comp" {' ` tokens "sof_comp_tokens"' ` tuples."word" {' -` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($4) -` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($5) -` SOF_TKN_COMP_PRELOAD_COUNT' STR($6) +` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($5) +` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($6) +` SOF_TKN_COMP_PRELOAD_COUNT' STR($7) ` }' `}' `SectionData."'N_PCMP($1)`_data_w_comp" {' @@ -23,18 +23,18 @@ define(`W_PCM_PLAYBACK', `SectionVendorTuples."'N_PCMP($1)`_tuples" {' ` tokens "sof_pcm_tokens"' ` tuples."word" {' -` SOF_TKN_PCM_DMAC' STR($2) -` SOF_TKN_PCM_DMAC_CHAN' STR($3) +` SOF_TKN_PCM_DMAC' STR($3) +` SOF_TKN_PCM_DMAC_CHAN' STR($4) ` }' `}' `SectionData."'N_PCMP($1)`_data" {' ` tuples "'N_PCMP($1)`_tuples"' `}' -`SectionWidget."'N_PCMP`" {' +`SectionWidget."'N_PCMP($1)`" {' ` index "'PIPELINE_ID`"' ` type "aif_in"' ` no_pm "true"' -` stream_name "'$1`"' +` stream_name "'$2`"' ` data [' ` "'N_PCMP($1)`_data"' ` "'N_PCMP($1)`_data_w_comp"' @@ -42,14 +42,14 @@ define(`W_PCM_PLAYBACK', `}') -dnl W_PCM_CAPTURE(stream, dmac, dmac_chan, periods_sink, periods_source, preload) +dnl W_PCM_CAPTURE(pcm, stream, dmac, dmac_chan, periods_sink, periods_source, preload) define(`W_PCM_CAPTURE', `SectionVendorTuples."'N_PCMC($1)`_tuples_w_comp" {' ` tokens "sof_comp_tokens"' ` tuples."word" {' -` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($4) -` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($5) -` SOF_TKN_COMP_PRELOAD_COUNT' STR($6) +` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($5) +` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($6) +` SOF_TKN_COMP_PRELOAD_COUNT' STR($7) ` }' `}' `SectionData."'N_PCMC($1)`_data_w_comp" {' @@ -58,18 +58,18 @@ define(`W_PCM_CAPTURE', `SectionVendorTuples."'N_PCMC($1)`_tuples" {' ` tokens "sof_pcm_tokens"' ` tuples."word" {' -` SOF_TKN_PCM_DMAC' STR($2) -` SOF_TKN_PCM_DMAC_CHAN' STR($3) +` SOF_TKN_PCM_DMAC' STR($3) +` SOF_TKN_PCM_DMAC_CHAN' STR($4) ` }' `}' `SectionData."'N_PCMC($1)`_data" {' ` tuples "'N_PCMC($1)`_tuples"' `}' -`SectionWidget."'N_PCMC`" {' +`SectionWidget."'N_PCMC($1)`" {' ` index "'PIPELINE_ID`"' ` type "aif_out"' ` no_pm "true"' -` stream_name "'$1`"' +` stream_name "'$2`"' ` data [' ` "'N_PCMC($1)`_data"' ` "'N_PCMC($1)`_data_w_comp"' diff --git a/topology/sof/pipe-low-latency-capture.m4 b/topology/sof/pipe-low-latency-capture.m4 index 5619999..96fa3cc 100644 --- a/topology/sof/pipe-low-latency-capture.m4 +++ b/topology/sof/pipe-low-latency-capture.m4 @@ -29,7 +29,7 @@ C_CONTROLMIXER(PCM PCM_ID Capture Volume, PIPELINE_ID, # Host "Low Latency Capture" PCM uses pipeline DMAC and channel # with 0 sink and 2 source periods -W_PCM_CAPTURE(Low Latency Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 0) +W_PCM_CAPTURE(PCM_ID, Low Latency Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 0) # "Capture Volume" has 2 sink and source periods for host and DAI ping-pong W_PGA(0, PIPELINE_FORMAT, 2, 2, 0, LIST(` ', "PCM PCM_ID Capture Volume")) @@ -49,8 +49,8 @@ W_BUFFER(1, COMP_BUFFER_SIZE(2, P_GRAPH(pipe-ll-capture-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(Low Latency Capture PCM_ID, N_PCMC)', - `dapm(N_PCMC, N_BUFFER(1))', + `dapm(Low Latency Capture PCM_ID, N_PCMC(PCM_ID))', + `dapm(N_PCMC(PCM_ID), N_BUFFER(1))', `dapm(N_BUFFER(1), N_PGA(0))', `dapm(N_PGA(0), N_BUFFER(0))')) diff --git a/topology/sof/pipe-low-latency-playback.m4 b/topology/sof/pipe-low-latency-playback.m4 index 4a4fca9..b7f2d11 100644 --- a/topology/sof/pipe-low-latency-playback.m4 +++ b/topology/sof/pipe-low-latency-playback.m4 @@ -54,7 +54,7 @@ C_CONTROLMIXER(Master Playback Volume, PIPELINE_ID, # Host "Low latency Playback" PCM uses pipeline DMAC and channel # with 2 sink and 0 source periods -W_PCM_PLAYBACK(Low Latency Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) +W_PCM_PLAYBACK(PCM_ID, Low Latency Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) # "Playback Volume" has 1 sink period and 2 source periods for host ping-pong W_PGA(0, PIPELINE_FORMAT, 1, 2, 1, LIST(` ', "PCM PCM_ID Playback Volume")) @@ -93,8 +93,8 @@ W_BUFFER(3, COMP_BUFFER_SIZE(2, P_GRAPH(pipe-ll-playback-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(N_PCMP, Low Latency Playback PCM_ID)', - `dapm(N_BUFFER(0), N_PCMP)', + `dapm(N_PCMP(PCM_ID), Low Latency Playback PCM_ID)', + `dapm(N_BUFFER(0), N_PCMP(PCM_ID))', `dapm(N_PGA(0), N_BUFFER(0))', `dapm(N_BUFFER(1), N_PGA(0))', `dapm(N_MIXER(0), N_BUFFER(1))', diff --git a/topology/sof/pipe-passthrough-capture.m4 b/topology/sof/pipe-passthrough-capture.m4 index 07961b3..ff7c842 100644 --- a/topology/sof/pipe-passthrough-capture.m4 +++ b/topology/sof/pipe-passthrough-capture.m4 @@ -17,7 +17,7 @@ include(`pipeline.m4') # Host "Passthrough Capture" PCM uses pipeline DMAC and channel # with 0 sink and 2 source periods -W_PCM_CAPTURE(Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 2) +W_PCM_CAPTURE(PCM_ID, Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 2) # Capture Buffers W_BUFFER(0, COMP_BUFFER_SIZE(2, @@ -41,8 +41,8 @@ W_PIPELINE(N_DAI_IN, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, SCHE P_GRAPH(pipe-pass-capture-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(Passthrough Capture PCM_ID, N_PCMC)', - `dapm(N_PCMC, N_BUFFER(0))')) + `dapm(Passthrough Capture PCM_ID, N_PCMC(PCM_ID))', + `dapm(N_PCMC(PCM_ID), N_BUFFER(0))')) # # Pipeline Source and Sinks diff --git a/topology/sof/pipe-passthrough-playback.m4 b/topology/sof/pipe-passthrough-playback.m4 index 715fcee..84aa126 100644 --- a/topology/sof/pipe-passthrough-playback.m4 +++ b/topology/sof/pipe-passthrough-playback.m4 @@ -17,7 +17,7 @@ include(`pipeline.m4') # Host "Passthrough Playback" PCM uses pipeline DMAC and channel # with 2 sink and 0 source periods -W_PCM_PLAYBACK(Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) +W_PCM_PLAYBACK(PCM_ID, Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) # Playback Buffers W_BUFFER(0, COMP_BUFFER_SIZE(2, @@ -41,8 +41,8 @@ W_PIPELINE(N_DAI_OUT, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, SCH P_GRAPH(pipe-pass-playback-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(N_PCMP, Passthrough Playback PCM_ID)', - `dapm(N_BUFFER(0), N_PCMP)')) + `dapm(N_PCMP(PCM_ID), Passthrough Playback PCM_ID)', + `dapm(N_BUFFER(0), N_PCMP(PCM_ID))')) # # Pipeline Source and Sinks diff --git a/topology/sof/pipe-pcm-media.m4 b/topology/sof/pipe-pcm-media.m4 index f2053b7..1ca829f 100644 --- a/topology/sof/pipe-pcm-media.m4 +++ b/topology/sof/pipe-pcm-media.m4 @@ -41,7 +41,7 @@ W_DATA(media_src_conf, media_src_tokens) # Host "Low latency Playback" PCM uses pipeline DMAC and channel # with 2 sink and 0 source periods -W_PCM_PLAYBACK(Media Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) +W_PCM_PLAYBACK(PCM_ID, Media Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) # "Playback Volume" has 2 sink period and 2 source periods for host ping-pong W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, LIST(` ', "PCM PCM_ID Playback Volume")) @@ -70,8 +70,8 @@ W_BUFFER(2, COMP_BUFFER_SIZE(3, P_GRAPH(pipe-media-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(N_PCMP, Media Playback PCM_ID)', - `dapm(N_BUFFER(0), N_PCMP)', + `dapm(N_PCMP(PCM_ID), Media Playback PCM_ID)', + `dapm(N_BUFFER(0), N_PCMP(PCM_ID))', `dapm(N_PGA(0), N_BUFFER(0))', `dapm(N_BUFFER(1), N_PGA(0))', `dapm(N_SRC(0), N_BUFFER(1))' diff --git a/topology/sof/pipe-src-capture.m4 b/topology/sof/pipe-src-capture.m4 index 1b1a58d..54eeea3 100644 --- a/topology/sof/pipe-src-capture.m4 +++ b/topology/sof/pipe-src-capture.m4 @@ -18,7 +18,7 @@ include(`pipeline.m4') # Host "Passthrough Capture" PCM uses pipeline DMAC and channel # with 4 sink and 0 source periods -W_PCM_CAPTURE(Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 4, 0, 2) +W_PCM_CAPTURE(PCM_ID, Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 4, 0, 2) # # SRC Configuration @@ -58,8 +58,8 @@ W_PIPELINE(N_DAI_IN, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, P_GRAPH(pipe-pass-src-capture-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(Passthrough Capture PCM_ID, N_PCMC)', - `dapm(N_PCMC, N_BUFFER(0))', + `dapm(Passthrough Capture PCM_ID, N_PCMC(PCM_ID))', + `dapm(N_PCMC(PCM_ID), N_BUFFER(0))', `dapm(N_BUFFER(0), N_SRC(0))', `dapm(N_SRC(0), N_BUFFER(1))')) diff --git a/topology/sof/pipe-src-playback.m4 b/topology/sof/pipe-src-playback.m4 index 9dfdcd8..51237ac 100644 --- a/topology/sof/pipe-src-playback.m4 +++ b/topology/sof/pipe-src-playback.m4 @@ -18,7 +18,7 @@ include(`pipeline.m4') # Host "Passthrough Playback" PCM uses pipeline DMAC and channel # with 4 sink and 0 source periods -W_PCM_PLAYBACK(Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 4, 0, 2) +W_PCM_PLAYBACK(PCM_ID, Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 4, 0, 2) # # SRC Configuration @@ -58,8 +58,8 @@ W_PIPELINE(N_DAI_OUT, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, P_GRAPH(pipe-pass-src-playback-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(N_PCMP, Passthrough Playback PCM_ID)', - `dapm(N_BUFFER(0), N_PCMP)', + `dapm(N_PCMP(PCM_ID), Passthrough Playback PCM_ID)', + `dapm(N_BUFFER(0), N_PCMP(PCM_ID))', `dapm(N_SRC(0), N_BUFFER(0))', `dapm(N_BUFFER(1), N_SRC(0))')) diff --git a/topology/sof/pipe-volume-capture.m4 b/topology/sof/pipe-volume-capture.m4 index 61b70a9..c3917ca 100644 --- a/topology/sof/pipe-volume-capture.m4 +++ b/topology/sof/pipe-volume-capture.m4 @@ -31,7 +31,7 @@ C_CONTROLMIXER(Master Capture Volume, PIPELINE_ID, # Host "Passthrough Capture" PCM uses pipeline DMAC and channel # with 0 sink and 2 source periods -W_PCM_CAPTURE(Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 2) +W_PCM_CAPTURE(PCM_ID, Passthrough Capture, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 0, 2, 2) # "Volume" has 2 source and 2 sink periods W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, LIST(` ', "Master Capture Volume")) @@ -63,8 +63,8 @@ W_PIPELINE(N_DAI_IN, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, P_GRAPH(pipe-pass-vol-capture-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(Passthrough Capture PCM_ID, N_PCMC)', - `dapm(N_PCMC, N_BUFFER(0))', + `dapm(Passthrough Capture PCM_ID, N_PCMC(PCM_ID))', + `dapm(N_PCMC(PCM_ID), N_BUFFER(0))', `dapm(N_BUFFER(0), N_PGA(0))', `dapm(N_PGA(0), N_BUFFER(1))')) diff --git a/topology/sof/pipe-volume-playback.m4 b/topology/sof/pipe-volume-playback.m4 index 5fea0c7..194aad9 100644 --- a/topology/sof/pipe-volume-playback.m4 +++ b/topology/sof/pipe-volume-playback.m4 @@ -31,7 +31,7 @@ C_CONTROLMIXER(Master Playback Volume, PIPELINE_ID, # Host "Passthrough Playback" PCM uses pipeline DMAC and channel # with 2 sink and 0 source periods -W_PCM_PLAYBACK(Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) +W_PCM_PLAYBACK(PCM_ID, Passthrough Playback, PIPELINE_DMAC, PIPELINE_DMAC_CHAN, 2, 0, 2) # "Volume" has 2 source and 2 sink periods W_PGA(0, PIPELINE_FORMAT, 2, 2, 2, LIST(` ', "Master Playback Volume")) @@ -63,8 +63,8 @@ W_PIPELINE(N_DAI_OUT, SCHEDULE_DEADLINE, SCHEDULE_PRIORITY, SCHEDULE_FRAMES, P_GRAPH(pipe-pass-vol-playback-PIPELINE_ID, PIPELINE_ID, LIST(` ', - `dapm(N_PCMP, Passthrough Playback PCM_ID)', - `dapm(N_BUFFER(0), N_PCMP)', + `dapm(N_PCMP(PCM_ID), Passthrough Playback PCM_ID)', + `dapm(N_BUFFER(0), N_PCMP(PCM_ID))', `dapm(N_PGA(0), N_BUFFER(0))', `dapm(N_BUFFER(1), N_PGA(0))')) -- 2.14.1

1 0