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

[Sound-open-firmware] [PATCH] apl: memory: expand number of 256 Bytes block to be 64
by Keyon Jie 08 Jun '18

08 Jun '18

The 256 Bytes block are used frequently for component new, 16 is not enough for GP-MRB multiple SSPs/pipelines support, here expand it to be 64. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- Test with: APL-MRB with tdf8532 codec Linux topic/sof-v4.14: 3ffd39334cb53aced88b8aba17cae3df9ee2736f SOF master: 48a61423f6c2d2bcf5fad854a9b3d37dfb43b546 Tool master: 7ee114d2ed822a0dbfc0dc3a37fd5c4977e00be8 --- src/platform/apollolake/include/platform/memory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/apollolake/include/platform/memory.h b/src/platform/apollolake/include/platform/memory.h index e7f3ee3..652db96 100644 --- a/src/platform/apollolake/include/platform/memory.h +++ b/src/platform/apollolake/include/platform/memory.h @@ -159,7 +159,7 @@ #define HEAP_RT_COUNT32 128 #define HEAP_RT_COUNT64 64 #define HEAP_RT_COUNT128 32 -#define HEAP_RT_COUNT256 16 +#define HEAP_RT_COUNT256 64 #define HEAP_RT_COUNT512 8 #define HEAP_RT_COUNT1024 4 -- 2.14.1

3 6

[Sound-open-firmware] [PTACH RFC 0/5] Add switch widget for loopback
by Xiuli Pan 04 Jun '18

04 Jun '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Have some clean up for the code may used. Add some macros that are needed for the switch widget. TODO: Have the useable get/put function for the kcontrol. Pan Xiuli (5): topology: mixer: Add CONTROLMIXER_MIN topology: utils: Add kdapm macro for route with kcontrol topology: m4: add switch widget topology: sof: add pipeline loopback dai topology: test: add loopback test topology topology/m4/mixercontrol.m4 | 16 ++++-- topology/m4/switch.m4 | 46 +++++++++++++++ topology/m4/utils.m4 | 4 ++ topology/sof/pipe-dai-loopback.m4 | 36 ++++++++++++ topology/sof/pipe-low-latency-capture.m4 | 3 +- topology/sof/pipe-low-latency-playback.m4 | 2 + topology/sof/pipe-pcm-media.m4 | 1 + topology/sof/pipe-tone.m4 | 2 + topology/sof/pipe-volume-capture.m4 | 1 + topology/sof/pipe-volume-playback.m4 | 1 + topology/test/test-loopback-ssp.m4 | 94 +++++++++++++++++++++++++++++++ topology/test/tplg-build.sh | 2 +- 12 files changed, 201 insertions(+), 7 deletions(-) create mode 100644 topology/m4/switch.m4 create mode 100644 topology/sof/pipe-dai-loopback.m4 create mode 100644 topology/test/test-loopback-ssp.m4 -- 2.7.4

7 33

[Sound-open-firmware] [PATCH 1/2] topology: bxt: change to use dmac0 for capture
by Keyon Jie 01 Jun '18

01 Jun '18

Otherwise, the channels may be used up when pipeline number > 8. Todo: remove dmac definition from tplg, just allocate them inside firmware. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- Test with: APL-MRB with tdf8532 codec Linux topic/sof-v4.14: 3ffd39334cb53aced88b8aba17cae3df9ee2736f SOF master: 48a61423f6c2d2bcf5fad854a9b3d37dfb43b546 Tool master: 7ee114d2ed822a0dbfc0dc3a37fd5c4977e00be8 --- topology/dsps/bxt.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/topology/dsps/bxt.m4 b/topology/dsps/bxt.m4 index df61d1a..472fa88 100644 --- a/topology/dsps/bxt.m4 +++ b/topology/dsps/bxt.m4 @@ -34,7 +34,7 @@ W_VENDORTUPLES(dai0p_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC " W_DATA(dai0p_plat_conf, dai0p_plat_tokens) # DAI0 platform capture configuration -W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "1"', `SOF_TKN_DAI_DMAC_CHAN "1"')) +W_VENDORTUPLES(dai0c_plat_tokens, sof_dai_tokens, LIST(` ', `SOF_TKN_DAI_DMAC "0"', `SOF_TKN_DAI_DMAC_CHAN "1"')) W_DATA(dai0c_plat_conf, dai0c_plat_tokens) -- 2.14.1

3 3

[Sound-open-firmware] [PATCH] DMIC: configure DMIC with parameters from ipc instead of hardcoded params
by Ranjani Sridharan 01 Jun '18

01 Jun '18

This patch makes the following changes to configure DMIC from ipc params: 1. remove redundant hdr member item from struct sof_ipc_dai_dmic_params 2. Rename number_of_pdm_controllers member in the above structure to num_pdm_active to be more representative of the active pdm count. 3. Add an "id" member to struct sof_ipc_dai_dmic_pdm_ctrl 4. Remove hardcoded config params from DMIC set_config function and use ipc params instead. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- Notes: Tested with: APL based Up squared board: SOF Kernel: https://github.com/ranj063/sound branch: topic/dmic SOF: master SOFT: https://github.com/ranj063/soft.git branch: topic/dmic src/drivers/dmic.c | 97 +++++++++++++++++++++--------------------- src/include/uapi/ipc.h | 4 +- 2 files changed, 50 insertions(+), 51 deletions(-) diff --git a/src/drivers/dmic.c b/src/drivers/dmic.c index 5c8591c..b66769c 100644 --- a/src/drivers/dmic.c +++ b/src/drivers/dmic.c @@ -49,11 +49,6 @@ */ #define DMIC_FIR_PIPELINE_OVERHEAD 5 -/* Force a 48 kHz config while kernel driver IPC is under construction. Remove - * or undefine when it's available. - */ -#define DMIC_FORCE_CONFIG - struct decim_modes { int16_t clkdiv[DMIC_MAX_MODES]; int16_t mcic[DMIC_MAX_MODES]; @@ -648,7 +643,7 @@ static inline void ipm_helper(int *ipm, int stereo[], int swap[], * left (A) or mono right (B) mode. Mono right mode is setup as channel * swapped mono left. */ - for (i = 0; i < dmic->number_of_pdm_controllers; i++) { + for (i = 0; i < dmic->num_pdm_active; i++) { cnt = 0; if (dmic->pdm[i].enable_mic_a > 0) cnt++; @@ -693,7 +688,7 @@ static inline void source_ipm_helper(int source[], int *ipm, int stereo[], * swapped mono left. The function returns also in array source[] the * indice of enabled pdm controllers to be used for IPM configuration. */ - for (i = 0; i < dmic->number_of_pdm_controllers; i++) { + for (i = 0; i < dmic->num_pdm_active; i++) { if (dmic->pdm[i].enable_mic_a > 0 || dmic->pdm[i].enable_mic_b > 0) { pdm[i] = 1; @@ -719,7 +714,7 @@ static inline void source_ipm_helper(int source[], int *ipm, int stereo[], /* IPM bit field is set to count of active pdm controllers. */ *ipm = pdm[0]; - for (i = 0; i < dmic->number_of_pdm_controllers; i++) + for (i = 0; i < dmic->num_pdm_active; i++) *ipm += pdm[i]; } #endif @@ -782,7 +777,7 @@ static int configure_registers(struct dai *dai, struct dmic_configuration *cfg, } /* Sanity checks */ - if (dmic->number_of_pdm_controllers > DMIC_HW_CONTROLLERS) { + if (dmic->num_pdm_active > DMIC_HW_CONTROLLERS) { trace_dmic_error("num"); return -EINVAL; } @@ -1016,45 +1011,40 @@ static int configure_registers(struct dai *dai, struct dmic_configuration *cfg, static int dmic_set_config(struct dai *dai, struct sof_ipc_dai_config *config) { - struct decim_modes modes_a; - struct decim_modes modes_b; + struct dmic_pdata *dmic = dai_get_drvdata(dai); + struct sof_ipc_dai_dmic_params *prm; struct matched_modes modes_ab; struct dmic_configuration cfg; - int ret; - struct sof_ipc_dai_dmic_params *prm = &config->dmic; - struct dmic_pdata *dmic = dai_get_drvdata(dai); + struct decim_modes modes_a; + struct decim_modes modes_b; + int num_pdm_active = config->dmic.num_pdm_active; + size_t size; + int i, j, ret = 0; trace_dmic("dsc"); -#if defined DMIC_FORCE_CONFIG - /* This is a temporary workaound to set parameters while - * there is no driver and topology scripts support to - * set these. Also the PCM sample format(s) and sample rate(s) - * setting would be better to be common with other DAI types. + /* + * "config" might contain pdm controller params for only + * the active controllers + * "prm" is initialized with default params for all HW controllers */ - prm->driver_ipc_version = 1; - prm->pdmclk_min = 500000; /* Min 500 kHz */ - prm->pdmclk_max = 4800000; /* Max 4.80 MHz */ - prm->fifo_fs_a = 48000; - prm->fifo_fs_b = 0; - prm->fifo_bits_a = 32; - prm->fifo_bits_b = 32; - prm->duty_min = 40; /* Min. 40% */ - prm->duty_max = 60; /* Max. 60% */ - prm->number_of_pdm_controllers = 2; - prm->pdm[0].clk_edge = 0; - prm->pdm[0].enable_mic_a = 1; /* Left */ - prm->pdm[0].enable_mic_b = 1; /* Right */ - prm->pdm[0].polarity_mic_a = 0; - prm->pdm[0].polarity_mic_b = 0; - prm->pdm[0].skew = 0; - prm->pdm[1].clk_edge = 0; - prm->pdm[1].enable_mic_a = 0; /* Left */ - prm->pdm[1].enable_mic_b = 0; /* Right */ - prm->pdm[1].polarity_mic_a = 0; - prm->pdm[1].polarity_mic_b = 0; - prm->pdm[1].skew = 0; -#endif + size = sizeof(*prm) + DMIC_HW_CONTROLLERS + * sizeof(struct sof_ipc_dai_dmic_pdm_ctrl); + prm = rzalloc(RZONE_SYS, SOF_MEM_CAPS_RAM, size); + + /* copy the command DAI config params and DMIC params */ + memcpy(prm, &config->dmic, sizeof(struct sof_ipc_dai_config)); + + /* copy the pdm controller params from ipc */ + for (i = 0; i < DMIC_HW_CONTROLLERS; i++) { + prm->pdm[i].id = i; + for (j = 0; j < num_pdm_active; j++) { + /* copy the pdm controller params id the id's match */ + if (prm->pdm[i].id == config->dmic.pdm[j].id) + memcpy(&prm->pdm[i], &config->dmic.pdm[j], + sizeof(prm->pdm[i])); + } + } trace_value(prm->driver_ipc_version); trace_value(prm->pdmclk_min); @@ -1065,11 +1055,12 @@ static int dmic_set_config(struct dai *dai, struct sof_ipc_dai_config *config) trace_value(prm->fifo_bits_b); trace_value(prm->duty_min); trace_value(prm->duty_max); - trace_value(prm->number_of_pdm_controllers); + trace_value(prm->num_pdm_active); if (prm->driver_ipc_version != DMIC_IPC_VERSION) { trace_dmic_error("ver"); - return -EINVAL; + ret = -EINVAL; + goto finish; } /* Match and select optimal decimators configuration for FIFOs A and B @@ -1081,20 +1072,23 @@ static int dmic_set_config(struct dai *dai, struct sof_ipc_dai_config *config) find_modes(&modes_a, prm, prm->fifo_fs_a); if (modes_a.num_of_modes == 0 && prm->fifo_fs_a > 0) { trace_dmic_error("amo"); - return -EINVAL; + ret = -EINVAL; + goto finish; } find_modes(&modes_b, prm, prm->fifo_fs_b); if (modes_b.num_of_modes == 0 && prm->fifo_fs_b > 0) { trace_dmic_error("bmo"); - return -EINVAL; + ret = -EINVAL; + goto finish; } match_modes(&modes_ab, &modes_a, &modes_b); ret = select_mode(&cfg, &modes_ab); if (ret < 0) { trace_dmic_error("smo"); - return -EINVAL; + ret = -EINVAL; + goto finish; } trace_dmic("cfg"); @@ -1115,12 +1109,17 @@ static int dmic_set_config(struct dai *dai, struct sof_ipc_dai_config *config) ret = configure_registers(dai, &cfg, prm); if (ret < 0) { trace_dmic_error("cor"); - return -EINVAL; + ret = -EINVAL; + goto finish; } dmic->state = COMP_STATE_PREPARE; - return 0; +finish: + /* free config params */ + rfree(prm); + + return ret; } /* start the DMIC for capture */ diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index b32376d..9b1063f 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -292,6 +292,7 @@ struct sof_ipc_dai_hda_params { * data integrity problems. */ struct sof_ipc_dai_dmic_pdm_ctrl { + uint16_t id; /* PDM controller ID */ uint16_t enable_mic_a; /* Use A (left) channel mic (0 or 1)*/ uint16_t enable_mic_b; /* Use B (right) channel mic (0 or 1)*/ uint16_t polarity_mic_a; /* Optionally invert mic A signal (0 or 1) */ @@ -322,7 +323,6 @@ struct sof_ipc_dai_dmic_pdm_ctrl { * somewhat. */ struct sof_ipc_dai_dmic_params { - struct sof_ipc_hdr hdr; uint32_t driver_ipc_version; /* Version (1..N) */ uint32_t pdmclk_min; /* Minimum microphone clock in Hz (100000..N) */ uint32_t pdmclk_max; /* Maximum microphone clock in Hz (min...N) */ @@ -333,7 +333,7 @@ struct sof_ipc_dai_dmic_params { uint16_t fifo_bits_b; /* FIFO B word length (16 or 24) */ uint16_t duty_min; /* Min. mic clock duty cycle in % (20..80) */ uint16_t duty_max; /* Max. mic clock duty cycle in % (min..80) */ - uint32_t number_of_pdm_controllers; /* Number 2ch controllers (2) */ + uint32_t num_pdm_active; /* Number of active controllers */ struct sof_ipc_dai_dmic_pdm_ctrl pdm[]; } __attribute__((packed)); -- 2.17.0

3 4

[Sound-open-firmware] [PATCH v3] topology:scripts: fix tplg build script to compile last topology when using xargs
by Ranjani Sridharan 31 May '18

31 May '18

When using xargs, the last topology file while batch processing alsatplg doesn't get compiled properly. Also remove a stray ; in the script. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- Notes: Sending v3 as v2 was missed. topology/test/tplg-build.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/topology/test/tplg-build.sh b/topology/test/tplg-build.sh index 26c70ad..af23b66 100755 --- a/topology/test/tplg-build.sh +++ b/topology/test/tplg-build.sh @@ -157,12 +157,14 @@ simple_test codec tone "SSP2-Codec" s32le 2 s16le 20 16 1920000 19200000 I2S TON if [ "$USE_XARGS" == "yes" ] then echo "Batch processing m4 files..." - M4_STRINGS=${M4_STRINGS%?}; + M4_STRINGS=${M4_STRINGS%?} #m4 processing echo $M4_STRINGS | tr " " "," | tr '\n' '\0' | xargs -P0 -d ',' -n12 bash -c 'm4 "${@:1:${#}-1}" > ${12}.conf' m4 #execute alsatplg to create topology binary TEST_STRINGS=${TEST_STRINGS%?} - echo $TEST_STRINGS | tr '\n' '\0' | xargs -d ',' -P0 -n1 -I string alsatplg -v 1 -c string".conf" -o string".tplg" + echo $TEST_STRINGS | tr '\n' ',' |\ + xargs -d ',' -P0 -n1 -I string alsatplg -v 1 -c\ + string".conf" -o string".tplg" fi -- 2.17.0

2 1

[Sound-open-firmware] [PATCH v5 0/7] Multiple DAI type support in topology
by Ranjani Sridharan 31 May '18

31 May '18

This patchset adds the changes required for multiple DAI types in topology. The main changes are as follows: 1. The tplg build script was hardwired for SSP DAI type. Make changes to accomodate other types. 2. Changes to DAI_CONFIG to accomodate more than just SSP type DAI. 3. The test m4 files similarly were hardwired for SSP. This patchset makes them DAI type agnostic 4. Add DMIC DAI type config definition 5. Add DMIC specific tokens. This is the preliminary version. More tokens will be added as needed. 6. Add DMIC test topology v3 changes: - Added an extra token for fifo word length v4 changes: - Added PDM controller tokens and the number of active PDM controllers are configurable in topology v5 changes: - rebased on top of latest master Tested with: APL based Up squared board: SOF Kernel: https://github.com/ranj063/sound branch: topic/dmic SOF: https://github.com/ranj063/sof branch: ranjani/topic/dmic SOFT: master Ranjani Sridharan (7): topology: scripts: changes to accommodate different DAI types topology: separate ssp params from dai common params topology: add DMIC tokens topology: make m4 filenames dai type agnostic topology: scripts: add dmic test topology topology: add DMIC config definition to DAI config topology: add DMIC dai support in test capture m4 topology/m4/dai.m4 | 100 ++++++++-- topology/sof-apl-nocodec.m4 | 11 +- topology/sof-apl-tdf8532.m4 | 79 ++++---- topology/sof-bdw-rt286.m4 | 11 +- topology/sof-bdw-rt5640.m4 | 11 +- topology/sof-byt-da7213.m4 | 11 +- topology/sof-byt-nocodec.m4 | 11 +- topology/sof-byt-rt5640.m4 | 11 +- topology/sof-byt-rt5645.m4 | 11 +- topology/sof-byt-rt5651.m4 | 12 +- topology/sof-cht-max98090.m4 | 11 +- topology/sof-cht-nocodec.m4 | 11 +- topology/sof-cnl-rt274.m4 | 11 +- topology/sof-hsw-rt5640.m4 | 11 +- topology/sof/tokens.m4 | 21 ++ topology/test/{test-ssp.m4 => test-all.m4} | 39 ++-- .../{test-capture-ssp.m4 => test-capture.m4} | 41 ++-- ...{test-playback-ssp.m4 => test-playback.m4} | 31 +-- ...-playback-ssp.m4 => test-tone-playback.m4} | 25 +-- topology/test/tplg-build.sh | 181 +++++++++++------- 20 files changed, 413 insertions(+), 237 deletions(-) rename topology/test/{test-ssp.m4 => test-all.m4} (65%) rename topology/test/{test-capture-ssp.m4 => test-capture.m4} (54%) rename topology/test/{test-playback-ssp.m4 => test-playback.m4} (65%) rename topology/test/{test-tone-playback-ssp.m4 => test-tone-playback.m4} (64%) -- 2.17.0

2 8

[Sound-open-firmware] [PATCH v2] topology:scripts: fix tplg build script to compile last topology when using xargs
by Ranjani Sridharan 31 May '18

31 May '18

When using xargs, the last topology file while batch processing alsatplg doesn't get compiled properly. It also removes a stray ; in the script. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- topology/test/tplg-build.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/topology/test/tplg-build.sh b/topology/test/tplg-build.sh index 26c70ad..af23b66 100755 --- a/topology/test/tplg-build.sh +++ b/topology/test/tplg-build.sh @@ -157,12 +157,14 @@ simple_test codec tone "SSP2-Codec" s32le 2 s16le 20 16 1920000 19200000 I2S TON if [ "$USE_XARGS" == "yes" ] then echo "Batch processing m4 files..." - M4_STRINGS=${M4_STRINGS%?}; + M4_STRINGS=${M4_STRINGS%?} #m4 processing echo $M4_STRINGS | tr " " "," | tr '\n' '\0' | xargs -P0 -d ',' -n12 bash -c 'm4 "${@:1:${#}-1}" > ${12}.conf' m4 #execute alsatplg to create topology binary TEST_STRINGS=${TEST_STRINGS%?} - echo $TEST_STRINGS | tr '\n' '\0' | xargs -d ',' -P0 -n1 -I string alsatplg -v 1 -c string".conf" -o string".tplg" + echo $TEST_STRINGS | tr '\n' ',' |\ + xargs -d ',' -P0 -n1 -I string alsatplg -v 1 -c\ + string".conf" -o string".tplg" fi -- 2.17.0

2 3

[Sound-open-firmware] [PATCH] [RFC]Tone: use volume control command instead of switch
by Ranjani Sridharan 31 May '18

31 May '18

This patch makes the following changes to the tone comp: 1. Use SOF_CTRL_CMD_VOLUME instead of the SOF_CTRL_CMD_SWITCH command as the trigger. Tone uses a mixer control with a max value of 1 as the triggering control so change the command accordingly. 2. Add tone_cmd_get_value() function to send the tone state back to the driver 3. Include the current tone state in the ipc reply data when setting the tone state. 4. Compute the sample rate from the pipeline frames and deadline parameters. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/audio/tone.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/src/audio/tone.c b/src/audio/tone.c index eee6091..53cb486 100644 --- a/src/audio/tone.c +++ b/src/audio/tone.c @@ -462,6 +462,25 @@ static int tone_params(struct comp_dev *dev) return 0; } +static int tone_cmd_get_value(struct comp_dev *dev, + struct sof_ipc_ctrl_data *cdata) +{ + struct comp_data *cd = comp_get_drvdata(dev); + int j; + + trace_tone("mgt"); + + if (cdata->cmd == SOF_CTRL_CMD_VOLUME) { + for (j = 0; j < cdata->num_elems; j++) { + cdata->chanv[j].channel = j; + cdata->chanv[j].value = !cd->sg[j].mute; + trace_value(j); + trace_value(cd->sg[j].mute); + } + } + return 0; +} + static int tone_cmd_set_value(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) { struct comp_data *cd = comp_get_drvdata(dev); @@ -469,7 +488,8 @@ static int tone_cmd_set_value(struct comp_dev *dev, struct sof_ipc_ctrl_data *cd uint32_t ch; bool val; - if (cdata->cmd == SOF_CTRL_CMD_SWITCH) { + /* tone uses a mixer control with max of 1 to trigger the pipeline */ + if (cdata->cmd == SOF_CTRL_CMD_VOLUME) { trace_tone("mst"); for (j = 0; j < cdata->num_elems; j++) { ch = cdata->chanv[j].channel; @@ -480,6 +500,10 @@ static int tone_cmd_set_value(struct comp_dev *dev, struct sof_ipc_ctrl_data *cd trace_tone_error("che"); return -EINVAL; } + + /* send current state back to the driver */ + cdata->chanv[j].value = !cd->sg[ch].mute; + if (val) tonegen_unmute(&cd->sg[ch]); else @@ -583,6 +607,9 @@ static int tone_cmd(struct comp_dev *dev, int cmd, void *data) case COMP_CMD_SET_VALUE: ret = tone_cmd_set_value(dev, cdata); break; + case COMP_CMD_GET_VALUE: + ret = tone_cmd_get_value(dev, cdata); + break; } return ret; @@ -641,7 +668,7 @@ static int tone_prepare(struct comp_dev * dev) return ret; cd->channels = dev->params.channels; - cd->rate = dev->params.rate; + cd->rate = dev->frames * dev->pipeline->ipc_pipe.deadline; tracev_value(cd->channels); tracev_value(cd->rate); -- 2.17.0

3 3

[Sound-open-firmware] [RESEND][PATCH] topology: dai: add link_id for dai_link matching in DAI_CONFIG
by Keyon Jie 31 May '18

31 May '18

This is used for the matching with snd_soc_dai_link.id in BE dai_links. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- Test with: APL-MRB with tdf8532 codec Linux topic/sof-v4.14: 3ffd39334cb53aced88b8aba17cae3df9ee2736f SOF master: 48a61423f6c2d2bcf5fad854a9b3d37dfb43b546 Tool master: 7ee114d2ed822a0dbfc0dc3a37fd5c4977e00be8 --- topology/m4/dai.m4 | 11 ++++++----- topology/sof-apl-nocodec.m4 | 2 +- topology/sof-apl-tdf8532.m4 | 4 ++-- topology/sof-bdw-rt286.m4 | 2 +- topology/sof-bdw-rt5640.m4 | 2 +- topology/sof-byt-da7213.m4 | 2 +- topology/sof-byt-nocodec.m4 | 2 +- topology/sof-byt-rt5640.m4 | 2 +- topology/sof-byt-rt5645.m4 | 2 +- topology/sof-byt-rt5651.m4 | 2 +- topology/sof-cht-max98090.m4 | 2 +- topology/sof-cht-nocodec.m4 | 2 +- topology/sof-cnl-rt274.m4 | 2 +- topology/sof-hsw-rt5640.m4 | 2 +- topology/test/test-capture-ssp.m4 | 2 +- topology/test/test-playback-ssp.m4 | 2 +- topology/test/test-ssp.m4 | 2 +- topology/test/test-tone-playback-ssp.m4 | 2 +- 18 files changed, 24 insertions(+), 23 deletions(-) diff --git a/topology/m4/dai.m4 b/topology/m4/dai.m4 index 0b030af..ba6cba4 100644 --- a/topology/m4/dai.m4 +++ b/topology/m4/dai.m4 @@ -140,17 +140,17 @@ define(`DAI_TDM', dnl DAI Config) define(`N_DAI_CONFIG', `DAICONFIG.'$1) -dnl DAI_CONFIG(type, idx, name, format, valid bits, mclk, bclk, fsync, tdm) +dnl DAI_CONFIG(type, idx, link_id, name, format, valid bits, mclk, bclk, fsync, tdm) define(`DAI_CONFIG', `SectionHWConfig."'$1$2`" {' `' ` id "'$2`"' -` format "'$4`"' +` format "'$5`"' `' -` '$6 ` '$7 ` '$8 ` '$9 +` '$10 `}' `SectionVendorTuples."'N_DAI_CONFIG($1$2)`_tuples_str" {' ` tokens "sof_dai_tokens"' @@ -164,14 +164,15 @@ define(`DAI_CONFIG', `SectionVendorTuples."'N_DAI_CONFIG($1$2)`_tuples" {' ` tokens "sof_dai_tokens"' ` tuples."word" {' -` SOF_TKN_DAI_SAMPLE_BITS' STR($5) +` SOF_TKN_DAI_SAMPLE_BITS' STR($6) ` }' `}' `SectionData."'N_DAI_CONFIG($1$2)`_data" {' ` tuples "'N_DAI_CONFIG($1$2)`_tuples"' `}' `' -`SectionBE."'$3`" {' +`SectionBE."'$4`" {' +` id "'$3`"' ` index "0"' ` default_hw_conf_id "'$2`"' `' diff --git a/topology/sof-apl-nocodec.m4 b/topology/sof-apl-nocodec.m4 index 9c4286b..68380e4 100644 --- a/topology/sof-apl-nocodec.m4 +++ b/topology/sof-apl-nocodec.m4 @@ -93,7 +93,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, NoCodec, I2S, 24, +DAI_CONFIG(SSP, 2, 0, NoCodec, I2S, 24, DAI_CLOCK(mclk, 19200000, codec_mclk_in), DAI_CLOCK(bclk, 2400000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/sof-apl-tdf8532.m4 b/topology/sof-apl-tdf8532.m4 index 11299cd..b897346 100644 --- a/topology/sof-apl-tdf8532.m4 +++ b/topology/sof-apl-tdf8532.m4 @@ -76,13 +76,13 @@ PCM_DUPLEX_ADD(Port2, 4, 1, 1, PIPELINE_PCM_2, PIPELINE_PCM_3) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 4, SSP4-Codec, DSP_B, 32, +DAI_CONFIG(SSP, 4, 4, SSP4-Codec, DSP_B, 32, DAI_CLOCK(mclk, 24576000, codec_mclk_in), DAI_CLOCK(bclk, 12288000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), DAI_TDM(8, 32, 15, 15)) -DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 16, +DAI_CONFIG(SSP, 2, 2, SSP2-Codec, I2S, 16, DAI_CLOCK(mclk, 24576000, codec_mclk_in), DAI_CLOCK(bclk, 1536000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/sof-bdw-rt286.m4 b/topology/sof-bdw-rt286.m4 index a13a49c..098d4c8 100644 --- a/topology/sof-bdw-rt286.m4 +++ b/topology/sof-bdw-rt286.m4 @@ -93,7 +93,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 0, Codec, I2S, 24, +DAI_CONFIG(SSP, 0, 0, Codec, I2S, 24, DAI_CLOCK(mclk, 24000000, codec_mclk_in), DAI_CLOCK(bclk, 2400000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/sof-bdw-rt5640.m4 b/topology/sof-bdw-rt5640.m4 index 007944a..bbbbbe4 100644 --- a/topology/sof-bdw-rt5640.m4 +++ b/topology/sof-bdw-rt5640.m4 @@ -93,7 +93,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 0, Codec, I2S, 24, +DAI_CONFIG(SSP, 0, 0, Codec, I2S, 24, DAI_CLOCK(mclk, 24000000, codec_mclk_in), DAI_CLOCK(bclk, 2400000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/sof-byt-da7213.m4 b/topology/sof-byt-da7213.m4 index ecf90c6..e3c7952 100644 --- a/topology/sof-byt-da7213.m4 +++ b/topology/sof-byt-da7213.m4 @@ -93,7 +93,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 24, +DAI_CONFIG(SSP, 2, 0, SSP2-Codec, I2S, 24, DAI_CLOCK(mclk, 19200000, codec_mclk_in), DAI_CLOCK(bclk, 2400000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/sof-byt-nocodec.m4 b/topology/sof-byt-nocodec.m4 index efa321b..5c65fb0 100644 --- a/topology/sof-byt-nocodec.m4 +++ b/topology/sof-byt-nocodec.m4 @@ -93,7 +93,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, NoCodec, I2S, 24, +DAI_CONFIG(SSP, 2, 0, NoCodec, I2S, 24, DAI_CLOCK(mclk, 19200000, codec_mclk_in), DAI_CLOCK(bclk, 2400000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/sof-byt-rt5640.m4 b/topology/sof-byt-rt5640.m4 index ae54969..7fae6f0 100644 --- a/topology/sof-byt-rt5640.m4 +++ b/topology/sof-byt-rt5640.m4 @@ -93,7 +93,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 24, +DAI_CONFIG(SSP, 2, 0, SSP2-Codec, I2S, 24, DAI_CLOCK(mclk, 19200000, codec_mclk_in), DAI_CLOCK(bclk, 2400000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/sof-byt-rt5645.m4 b/topology/sof-byt-rt5645.m4 index 364121f..7b81cbd 100644 --- a/topology/sof-byt-rt5645.m4 +++ b/topology/sof-byt-rt5645.m4 @@ -93,7 +93,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 24, +DAI_CONFIG(SSP, 2, 0, SSP2-Codec, I2S, 24, DAI_CLOCK(mclk, 19200000, codec_mclk_in), DAI_CLOCK(bclk, 2400000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/sof-byt-rt5651.m4 b/topology/sof-byt-rt5651.m4 index be3d994..91324ae 100644 --- a/topology/sof-byt-rt5651.m4 +++ b/topology/sof-byt-rt5651.m4 @@ -93,7 +93,7 @@ PCM_DUPLEX_ADD(Low Latency, 3, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 24, +DAI_CONFIG(SSP, 2, 0, SSP2-Codec, I2S, 24, DAI_CLOCK(mclk, 19200000, codec_mclk_in), DAI_CLOCK(bclk, 2400000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/sof-cht-max98090.m4 b/topology/sof-cht-max98090.m4 index 7ba4df7..5fb7802 100644 --- a/topology/sof-cht-max98090.m4 +++ b/topology/sof-cht-max98090.m4 @@ -93,7 +93,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, SSP2-Codec, I2S, 16, +DAI_CONFIG(SSP, 2, 0, SSP2-Codec, I2S, 16, DAI_CLOCK(mclk, 19200000, codec_mclk_in), DAI_CLOCK(bclk, 1920000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/sof-cht-nocodec.m4 b/topology/sof-cht-nocodec.m4 index a0eb9cd..bd4d969 100644 --- a/topology/sof-cht-nocodec.m4 +++ b/topology/sof-cht-nocodec.m4 @@ -93,7 +93,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 2, NoCodec, I2S, 24, +DAI_CONFIG(SSP, 2, 0, NoCodec, I2S, 24, DAI_CLOCK(mclk, 19200000, codec_mclk_in), DAI_CLOCK(bclk, 2400000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/sof-cnl-rt274.m4 b/topology/sof-cnl-rt274.m4 index 36cd91f..01cd203 100644 --- a/topology/sof-cnl-rt274.m4 +++ b/topology/sof-cnl-rt274.m4 @@ -64,7 +64,7 @@ PCM_DUPLEX_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 0, SSP0-Codec, DSP_B, 24, +DAI_CONFIG(SSP, 0, 0, SSP0-Codec, DSP_B, 24, DAI_CLOCK(mclk, 24000000, codec_mclk_in), DAI_CLOCK(bclk, 4800000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/sof-hsw-rt5640.m4 b/topology/sof-hsw-rt5640.m4 index 85b8209..28d5c6a 100644 --- a/topology/sof-hsw-rt5640.m4 +++ b/topology/sof-hsw-rt5640.m4 @@ -93,7 +93,7 @@ PCM_DUPLEX_ADD(Low Latency, 6, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # BE configurations - overrides config in ACPI if present # -DAI_CONFIG(SSP, 0, Codec, I2S, 24, +DAI_CONFIG(SSP, 0, 0, Codec, I2S, 24, DAI_CLOCK(mclk, 24000000, codec_mclk_in), DAI_CLOCK(bclk, 2400000, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/test/test-capture-ssp.m4 b/topology/test/test-capture-ssp.m4 index 6d666dc..67f0da9 100644 --- a/topology/test/test-capture-ssp.m4 +++ b/topology/test/test-capture-ssp.m4 @@ -68,7 +68,7 @@ PCM_CAPTURE_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_2) # # TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT # -DAI_CONFIG(SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, TEST_SSP_MODE, TEST_SSP_DATA_BITS, +DAI_CONFIG(SSP, TEST_SSP_PORT, 0, TEST_DAI_LINK_NAME, TEST_SSP_MODE, TEST_SSP_DATA_BITS, DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in), DAI_CLOCK(bclk, TEST_SSP_BCLK, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/test/test-playback-ssp.m4 b/topology/test/test-playback-ssp.m4 index 5ee1b53..22943b0 100644 --- a/topology/test/test-playback-ssp.m4 +++ b/topology/test/test-playback-ssp.m4 @@ -68,7 +68,7 @@ PCM_PLAYBACK_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_1) # # TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT # -DAI_CONFIG(SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, TEST_SSP_MODE, TEST_SSP_DATA_BITS, +DAI_CONFIG(SSP, TEST_SSP_PORT, 0, TEST_DAI_LINK_NAME, TEST_SSP_MODE, TEST_SSP_DATA_BITS, DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_slave), DAI_CLOCK(bclk, TEST_SSP_BCLK, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/test/test-ssp.m4 b/topology/test/test-ssp.m4 index 1bdce2f..0b305e1 100644 --- a/topology/test/test-ssp.m4 +++ b/topology/test/test-ssp.m4 @@ -86,7 +86,7 @@ PCM_DUPLEX_ADD(Passthrough, 3, 0, 0, PIPELINE_PCM_1, PIPELINE_PCM_2) # # TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT # -DAI_CONFIG(SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, TEST_SSP_MODE, TEST_SSP_DATA_BITS, +DAI_CONFIG(SSP, TEST_SSP_PORT, 0, TEST_DAI_LINK_NAME, TEST_SSP_MODE, TEST_SSP_DATA_BITS, DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in), DAI_CLOCK(bclk, TEST_SSP_BCLK, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), diff --git a/topology/test/test-tone-playback-ssp.m4 b/topology/test/test-tone-playback-ssp.m4 index 069ad64..b08447a 100644 --- a/topology/test/test-tone-playback-ssp.m4 +++ b/topology/test/test-tone-playback-ssp.m4 @@ -56,7 +56,7 @@ DAI_ADD(sof/pipe-dai-playback.m4, # # TEST_SSP_DATA_BITS bit I2S using TEST_SSP_PHY_BITS bit sample conatiner on SSP TEST_SSP_PORT # -DAI_CONFIG(SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, I2S, TEST_SSP_DATA_BITS, +DAI_CONFIG(SSP, TEST_SSP_PORT, 0, TEST_DAI_LINK_NAME, I2S, TEST_SSP_DATA_BITS, DAI_CLOCK(mclk, TEST_SSP_MCLK, codec_mclk_in), DAI_CLOCK(bclk, TEST_SSP_BCLK, codec_slave), DAI_CLOCK(fsync, 48000, codec_slave), -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] platform: apl: expand max stream number to be 16
by Keyon Jie 31 May '18

31 May '18

On GP-MRB, we may use streams more than 5, here expand it to be 16. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- Test with: APL-MRB with tdf8532 codec Linux topic/sof-v4.14: 3ffd39334cb53aced88b8aba17cae3df9ee2736f SOF master: 48a61423f6c2d2bcf5fad854a9b3d37dfb43b546 Tool master: 7ee114d2ed822a0dbfc0dc3a37fd5c4977e00be8 --- src/platform/apollolake/include/platform/platform.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/platform/apollolake/include/platform/platform.h b/src/platform/apollolake/include/platform/platform.h index c9b2757..aefa9b2 100644 --- a/src/platform/apollolake/include/platform/platform.h +++ b/src/platform/apollolake/include/platform/platform.h @@ -65,7 +65,7 @@ struct sof; /* Platform stream capabilities */ #define PLATFORM_MAX_CHANNELS 4 -#define PLATFORM_MAX_STREAMS 5 +#define PLATFORM_MAX_STREAMS 16 /* clock source used by scheduler for deadline calculations */ #define PLATFORM_SCHED_CLOCK CLK_SSP -- 2.14.1

4 4

2023

2022

2021

2020

2019

2018

2017

2016

Sound-open-firmware May 2018