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

[Sound-open-firmware] [PATCH v2] apl-ssp: fix capture double speed issue
by Keyon Jie 15 Mar '18

15 Mar '18

Previously TFT and RFT are set to 0s which means we are using threshold level 1, where interrupt asserts for every valid bits of each slot(e.g. for s16_le capture, interrupts assert for each 16 bits), but DMAC will treat it as notification of one full sample(e.g. 32 bits for s16_le stereo) and read those all bits, this will lead to capture with double speed at format s16_le stereo. Here add handle for FIFO trigger Threshold level, set them to bytes for each full sample(active_slots * valid_bits / 8), and the issue is fixed. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/drivers/apl-ssp.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/src/drivers/apl-ssp.c b/src/drivers/apl-ssp.c index 1ee107c..a863b44 100644 --- a/src/drivers/apl-ssp.c +++ b/src/drivers/apl-ssp.c @@ -43,6 +43,19 @@ #define trace_ssp_error(__e) trace_error(TRACE_CLASS_SSP, __e) #define tracev_ssp(__e) tracev_event(TRACE_CLASS_SSP, __e) +/* FIXME: move this to a helper and optimize */ +static int hweight_32(uint32_t mask) +{ + int i; + int count = 0; + + for (i = 0; i < 32; i++) { + count += mask & 1; + mask >>= 1; + } + return count; +} + /* save SSP context prior to entering D3 */ static int ssp_context_store(struct dai *dai) { @@ -96,6 +109,11 @@ static inline int ssp_set_config(struct dai *dai, uint32_t dummy_stop; uint32_t frame_len = 0; uint32_t bdiv_min; + uint32_t tft; + uint32_t rft; + uint32_t active_tx_slots = 2; + uint32_t active_rx_slots = 2; + bool inverted_frame = false; int ret = 0; @@ -353,6 +371,9 @@ static inline int ssp_set_config(struct dai *dai, sspsp |= SSPSP_SFRMP(!inverted_frame); sspsp |= SSPSP_FSRT; + active_tx_slots = hweight_32(config->tx_slot_mask); + active_rx_slots = hweight_32(config->rx_slot_mask); + break; case SOF_DAI_FMT_DSP_B: @@ -371,6 +392,9 @@ static inline int ssp_set_config(struct dai *dai, */ sspsp |= SSPSP_SFRMP(!inverted_frame); + active_tx_slots = hweight_32(config->tx_slot_mask); + active_rx_slots = hweight_32(config->rx_slot_mask); + break; default: trace_ssp_error("eca"); @@ -408,6 +432,27 @@ static inline int ssp_set_config(struct dai *dai, /* bypass divider for MCLK */ mdivr = 0x00000fff; + /* setting TFT and RFT */ + switch (config->sample_valid_bits) { + case 16: + /* use 2 bytes for each slot */ + tft = active_tx_slots * 2; + rft = active_rx_slots * 2; + break; + case 24: + case 32: + /* use 4 bytes for each slot */ + tft = active_tx_slots * 4; + rft = active_rx_slots * 4; + break; + default: + trace_ssp_error("ecd"); + ret = -EINVAL; + goto out; + } + + sscr3 |= SSCR3_TX(tft) | SSCR3_RX(rft); + trace_ssp("coe"); ssp_write(dai, SSCR0, sscr0); ssp_write(dai, SSCR1, sscr1); -- 2.14.1

3 2

[Sound-open-firmware] [PATCH] volume: remove unnecessary logic for mute/unmute
by Ranjani Sridharan 15 Mar '18

15 Mar '18

This patch removes unnecessary logic for mute/unmute in volume component. Mute is handled by the driver by sending 0 for volume gain and unmute is handled by sending a non-zero value. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/audio/volume.c | 75 ++++++++++++------------------------------------------ 1 file changed, 16 insertions(+), 59 deletions(-) diff --git a/src/audio/volume.c b/src/audio/volume.c index 0620e18..23e801c 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -74,7 +74,6 @@ struct comp_data { uint32_t chan[SOF_IPC_MAX_CHANNELS]; uint32_t volume[SOF_IPC_MAX_CHANNELS]; /* current volume */ uint32_t tvolume[SOF_IPC_MAX_CHANNELS]; /* target volume */ - uint32_t mvolume[SOF_IPC_MAX_CHANNELS]; /* mute volume */ void (*scale_vol)(struct comp_dev *dev, struct comp_buffer *sink, struct comp_buffer *source, uint32_t frames); struct work volwork; @@ -441,25 +440,6 @@ static inline void volume_set_chan(struct comp_dev *dev, int chan, uint32_t vol) cd->tvolume[chan] = v; } -static inline void volume_set_chan_mute(struct comp_dev *dev, int chan) -{ - struct comp_data *cd = comp_get_drvdata(dev); - - /* Check if not muted already */ - if (cd->volume[chan] != 0) - cd->mvolume[chan] = cd->volume[chan]; - cd->tvolume[chan] = 0; -} - -static inline void volume_set_chan_unmute(struct comp_dev *dev, int chan) -{ - struct comp_data *cd = comp_get_drvdata(dev); - - /* Check if muted */ - if (cd->volume[chan] == 0) - cd->tvolume[chan] = cd->mvolume[chan]; -} - static int volume_ctrl_set_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) { struct comp_data *cd = comp_get_drvdata(dev); @@ -472,48 +452,25 @@ static int volume_ctrl_set_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *c return -EINVAL; } - switch (cdata->cmd) { - case SOF_CTRL_CMD_VOLUME: - trace_volume("vst"); - trace_value(cdata->comp_id); - for (j = 0; j < cdata->num_elems; j++) { - trace_value(cdata->chanv[j].channel); - trace_value(cdata->chanv[j].value); - i = cdata->chanv[j].channel; - if ((i >= 0) && (i < SOF_IPC_MAX_CHANNELS)) - volume_set_chan(dev, i, cdata->chanv[j].value); - else { - trace_volume_error("gs2"); - tracev_value(i); - } - } - work_schedule_default(&cd->volwork, VOL_RAMP_US); - break; + if (cdata->cmd != SOF_CTRL_CMD_VOLUME) { + trace_volume_error("ev0"); + return -EINVAL; + } - case SOF_CTRL_CMD_SWITCH: - trace_volume("mst"); - trace_value(cdata->comp_id); - for (j = 0; j < cdata->num_elems; j++) { - trace_value(cdata->chanv[j].channel); - trace_value(cdata->chanv[j].value); - i = cdata->chanv[j].channel; - if ((i >= 0) && (i < SOF_IPC_MAX_CHANNELS)) { - if (cdata->chanv[j].value) - volume_set_chan_unmute(dev, i); - else - volume_set_chan_mute(dev, i); - } else { - trace_volume_error("gs3"); - tracev_value(i); - } + trace_volume("vst"); + trace_value(cdata->comp_id); + for (j = 0; j < cdata->num_elems; j++) { + trace_value(cdata->chanv[j].channel); + trace_value(cdata->chanv[j].value); + i = cdata->chanv[j].channel; + if (i >= 0 && i < SOF_IPC_MAX_CHANNELS) { + volume_set_chan(dev, i, cdata->chanv[j].value); + } else { + trace_volume_error("gs2"); + tracev_value(i); } - work_schedule_default(&cd->volwork, VOL_RAMP_US); - break; - - default: - trace_volume_error("gs1"); - return -EINVAL; } + work_schedule_default(&cd->volwork, VOL_RAMP_US); return 0; } -- 2.14.1

3 3

[Sound-open-firmware] [PATCH] topology: Add stream name to DAI widgets for binding to DAI links
by Liam Girdwood 15 Mar '18

15 Mar '18

DAI Widgets need bound to a DAI link to complete the DAPM graph. This is only working atm as we are only using one DAI. Add stream name to DAI widgets to be used by topology binder. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- topology/m4/dai.m4 | 44 +++++++++++++++++-------------- topology/reef-apl-nocodec.m4 | 4 +-- topology/reef-bdw-rt286.m4 | 4 +-- topology/reef-bdw-rt5640.m4 | 4 +-- topology/reef-bxt-nocodec.m4 | 4 +-- topology/reef-byt-da7212.m4 | 4 +-- topology/reef-byt-nocodec.m4 | 4 +-- topology/reef-byt-rt5640.m4 | 4 +-- topology/reef-byt-rt5645.m4 | 4 +-- topology/reef-byt-rt5651.m4 | 4 +-- topology/reef-cht-max98090.m4 | 4 +-- topology/reef-cht-nocodec.m4 | 4 +-- topology/reef-cnl-rt274.m4 | 4 +-- topology/reef-hsw-rt5640.m4 | 4 +-- topology/sof/pipe-dai-capture.m4 | 2 +- topology/sof/pipe-dai-playback.m4 | 2 +- topology/sof/pipe-passthrough-capture.m4 | 2 +- topology/sof/pipe-passthrough-playback.m4 | 2 +- topology/sof/pipe-src-capture.m4 | 2 +- topology/sof/pipe-src-playback.m4 | 2 +- topology/sof/pipe-volume-capture.m4 | 2 +- topology/sof/pipe-volume-playback.m4 | 2 +- topology/test/test-capture-ssp.m4 | 2 +- topology/test/test-playback-ssp.m4 | 2 +- topology/test/test-ssp.m4 | 4 +-- topology/test/test-tone-playback-ssp.m4 | 2 +- 26 files changed, 63 insertions(+), 59 deletions(-) diff --git a/topology/m4/dai.m4 b/topology/m4/dai.m4 index 163dfab..0b030af 100644 --- a/topology/m4/dai.m4 +++ b/topology/m4/dai.m4 @@ -7,14 +7,14 @@ define(`N_DAI', DAI_NAME) define(`N_DAI_OUT', DAI_NAME`.OUT') define(`N_DAI_IN', DAI_NAME`.IN') -dnl W_DAI_OUT(type, index, format, periods_sink, periods_source, preload, data) +dnl W_DAI_OUT(type, index, dai_link, format, periods_sink, periods_source, preload, data) define(`W_DAI_OUT', `SectionVendorTuples."'N_DAI_OUT($2)`_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_DAI_OUT($2)`_data_w_comp" {' @@ -41,7 +41,7 @@ define(`W_DAI_OUT', `SectionVendorTuples."'N_DAI_OUT($2)`_tuples_comp_str" {' ` tokens "sof_comp_tokens"' ` tuples."string" {' -` SOF_TKN_COMP_FORMAT' STR($3) +` SOF_TKN_COMP_FORMAT' STR($4) ` }' `}' `SectionData."'N_DAI_OUT($2)`_data_comp_str" {' @@ -50,24 +50,25 @@ define(`W_DAI_OUT', `SectionWidget."'N_DAI_OUT`" {' ` index "'PIPELINE_ID`"' ` type "dai_in"' +` stream_name' STR($3) ` no_pm "true"' ` data [' ` "'N_DAI_OUT($2)`_data_w"' ` "'N_DAI_OUT($2)`_data_w_comp"' ` "'N_DAI_OUT($2)`_data_str"' ` "'N_DAI_OUT($2)`_data_comp_str"' -` "'$7`"' +` "'$8`"' ` ]' `}') -dnl W_DAI_IN(type, index, format, periods_sink, periods_source, preload, data) +dnl W_DAI_IN(type, index, dai_link, format, periods_sink, periods_source, preload, data) define(`W_DAI_IN', `SectionVendorTuples."'N_DAI_IN($2)`_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_DAI_IN($2)`_data_w_comp" {' @@ -94,7 +95,7 @@ define(`W_DAI_IN', `SectionVendorTuples."'N_DAI_IN($2)`_tuples_comp_str" {' ` tokens "sof_comp_tokens"' ` tuples."string" {' -` SOF_TKN_COMP_FORMAT' STR($3) +` SOF_TKN_COMP_FORMAT' STR($4) ` }' `}' `SectionData."'N_DAI_IN($2)`_data_comp_str" {' @@ -103,13 +104,14 @@ define(`W_DAI_IN', `SectionWidget."'N_DAI_IN`" {' ` index "'PIPELINE_ID`"' ` type "dai_out"' +` stream_name' STR($3) ` no_pm "true"' ` data [' ` "'N_DAI_IN($2)`_data_w"' ` "'N_DAI_IN($2)`_data_w_comp"' ` "'N_DAI_IN($2)`_data_str"' ` "'N_DAI_IN($2)`_data_comp_str"' -` "'$7`"' +` "'$8`"' ` ]' `}') @@ -183,13 +185,14 @@ define(`DAI_CONFIG', `}') dnl DAI_ADD(pipeline, -dnl pipe id, dai type, dai_index, +dnl pipe id, dai type, dai_index, dai_be, dnl buffer, periods, format, dnl frames, deadline, priority, core) define(`DAI_ADD', `undefine(`PIPELINE_ID')' `undefine(`DAI_TYPE')' `undefine(`DAI_INDEX')' +`undefine(`DAI_BE')' `undefine(`DAI_BUF')' `undefine(`DAI_PERIODS')' `undefine(`DAI_FORMAT')' @@ -200,14 +203,15 @@ define(`DAI_ADD', `define(`PIPELINE_ID', $2)' `define(`DAI_TYPE', STR($3))' `define(`DAI_INDEX', STR($4))' -`define(`DAI_BUF', $5)' +`define(`DAI_BE', $5)' +`define(`DAI_BUF', $6)' `define(`DAI_NAME', $3$4)' -`define(`DAI_PERIODS', $6)' -`define(`DAI_FORMAT', $7)' -`define(`SCHEDULE_FRAMES', $8)' -`define(`SCHEDULE_DEADLINE', $9)' -`define(`SCHEDULE_PRIORITY', $10)' -`define(`SCHEDULE_CORE', $11)' +`define(`DAI_PERIODS', $7)' +`define(`DAI_FORMAT', $8)' +`define(`SCHEDULE_FRAMES', $9)' +`define(`SCHEDULE_DEADLINE', $10)' +`define(`SCHEDULE_PRIORITY', $11)' +`define(`SCHEDULE_CORE', $12)' `include($1)' ) diff --git a/topology/reef-apl-nocodec.m4 b/topology/reef-apl-nocodec.m4 index cf0a20e..78a1a4e 100644 --- a/topology/reef-apl-nocodec.m4 +++ b/topology/reef-apl-nocodec.m4 @@ -76,14 +76,14 @@ SectionGraph."pipe-apl-nocodec" { # playback DAI is SSP2 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, - 1, SSP, 2, + 1, SSP, 2, NoCodec, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP2 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 2, SSP, 2, + 2, SSP, 2, NoCodec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-bdw-rt286.m4 b/topology/reef-bdw-rt286.m4 index fa894f6..a305e7d 100644 --- a/topology/reef-bdw-rt286.m4 +++ b/topology/reef-bdw-rt286.m4 @@ -76,14 +76,14 @@ SectionGraph."pipe-bdw-rt286" { # playback DAI is SSP0 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, - 1, SSP, 0, + 1, SSP, 0, Codec, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP0 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 2, SSP, 0, + 2, SSP, 0, Codec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-bdw-rt5640.m4 b/topology/reef-bdw-rt5640.m4 index ec920a5..3fbb844 100644 --- a/topology/reef-bdw-rt5640.m4 +++ b/topology/reef-bdw-rt5640.m4 @@ -76,14 +76,14 @@ SectionGraph."pipe-bdw-rt5640" { # playback DAI is SSP0 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, - 1, SSP, 0, + 1, SSP, 0, Audio, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP0 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 2, SSP, 0, + 2, SSP, 0, Audio, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-bxt-nocodec.m4 b/topology/reef-bxt-nocodec.m4 index b7717d0..7e2b624 100644 --- a/topology/reef-bxt-nocodec.m4 +++ b/topology/reef-bxt-nocodec.m4 @@ -76,14 +76,14 @@ SectionGraph."pipe-bxt-nocodec" { # playback DAI is SSP2 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, - 1, SSP, 2, + 1, SSP, 2, NoCodec, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP2 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 2, SSP, 2, + 2, SSP, 2, NoCodec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-byt-da7212.m4 b/topology/reef-byt-da7212.m4 index 7515c63..a9789c6 100644 --- a/topology/reef-byt-da7212.m4 +++ b/topology/reef-byt-da7212.m4 @@ -76,14 +76,14 @@ SectionGraph."pipe-byt-da7212" { # playback DAI is SSP2 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, - 1, SSP, 2, + 1, SSP, 2, SSP2-Codec, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP2 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 2, SSP, 2, + 2, SSP, 2, SSP2-Codec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-byt-nocodec.m4 b/topology/reef-byt-nocodec.m4 index b3ca196..3be5d00 100644 --- a/topology/reef-byt-nocodec.m4 +++ b/topology/reef-byt-nocodec.m4 @@ -76,14 +76,14 @@ SectionGraph."pipe-byt-nocodec" { # playback DAI is SSP2 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, - 1, SSP, 2, + 1, SSP, 2, NoCodec, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP2 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 2, SSP, 2, + 2, SSP, 2, NoCodec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-byt-rt5640.m4 b/topology/reef-byt-rt5640.m4 index 9fa15a2..c971d41 100644 --- a/topology/reef-byt-rt5640.m4 +++ b/topology/reef-byt-rt5640.m4 @@ -76,14 +76,14 @@ SectionGraph."pipe-byt-rt5640" { # playback DAI is SSP2 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, - 1, SSP, 2, + 1, SSP, 2, Audio PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP2 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 2, SSP, 2, + 2, SSP, 2, Audio, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-byt-rt5645.m4 b/topology/reef-byt-rt5645.m4 index c81a4db..15cac48 100644 --- a/topology/reef-byt-rt5645.m4 +++ b/topology/reef-byt-rt5645.m4 @@ -76,14 +76,14 @@ SectionGraph."pipe-byt-rt5645" { # playback DAI is SSP2 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, - 1, SSP, 2, + 1, SSP, 2, SSP2-Codec, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP2 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 2, SSP, 2, + 2, SSP, 2, SSP2-Codec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-byt-rt5651.m4 b/topology/reef-byt-rt5651.m4 index ec114d7..656efd2 100644 --- a/topology/reef-byt-rt5651.m4 +++ b/topology/reef-byt-rt5651.m4 @@ -76,14 +76,14 @@ SectionGraph."pipe-byt-rt5651" { # playback DAI is SSP2 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, - 1, SSP, 2, + 1, SSP, 2, SS2-Codec, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP2 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 2, SSP, 2, + 2, SSP, 2, SSP2-Codec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-cht-max98090.m4 b/topology/reef-cht-max98090.m4 index 5690df4..ab1b639 100644 --- a/topology/reef-cht-max98090.m4 +++ b/topology/reef-cht-max98090.m4 @@ -76,14 +76,14 @@ SectionGraph."pipe-cht-max98090" { # playback DAI is SSP2 using 2 periods # Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, - 1, SSP, 2, + 1, SSP, 2, SSP2-Codec, PIPELINE_SOURCE_1, 2, s16le, 48, 1000, 0, 0) # capture DAI is SSP2 using 2 periods # Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 2, SSP, 2, + 2, SSP, 2, SSP2-Codec, PIPELINE_SINK_2, 2, s16le, 48, 1000, 0, 0) diff --git a/topology/reef-cht-nocodec.m4 b/topology/reef-cht-nocodec.m4 index 32acb62..3f61e44 100644 --- a/topology/reef-cht-nocodec.m4 +++ b/topology/reef-cht-nocodec.m4 @@ -76,14 +76,14 @@ SectionGraph."pipe-cht-nocodec" { # playback DAI is SSP2 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, - 1, SSP, 2, + 1, SSP, 2, NoCodec, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP2 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 2, SSP, 2, + 2, SSP, 2, NoCodec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-cnl-rt274.m4 b/topology/reef-cnl-rt274.m4 index e95363b..495fab3 100644 --- a/topology/reef-cnl-rt274.m4 +++ b/topology/reef-cnl-rt274.m4 @@ -47,14 +47,14 @@ PIPELINE_PCM_DAI_ADD(sof/pipe-volume-capture.m4, # playback DAI is SSP0 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, - 1, SSP, 0, + 1, SSP, 0, SSP0-Codec, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP0 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 2, SSP, 0, + 2, SSP, 0, SSP0-Codec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/reef-hsw-rt5640.m4 b/topology/reef-hsw-rt5640.m4 index 1f63820..5ab33ea 100644 --- a/topology/reef-hsw-rt5640.m4 +++ b/topology/reef-hsw-rt5640.m4 @@ -76,14 +76,14 @@ SectionGraph."pipe-hsw-rt5640" { # playback DAI is SSP0 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, - 1, SSP, 0, + 1, SSP, 0, Codec, PIPELINE_SOURCE_1, 2, s24le, 48, 1000, 0, 0) # capture DAI is SSP0 using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 2, SSP, 0, + 2, SSP, 0, Codec, PIPELINE_SINK_2, 2, s24le, 48, 1000, 0, 0) diff --git a/topology/sof/pipe-dai-capture.m4 b/topology/sof/pipe-dai-capture.m4 index a5a72d0..3f16f87 100644 --- a/topology/sof/pipe-dai-capture.m4 +++ b/topology/sof/pipe-dai-capture.m4 @@ -8,7 +8,7 @@ include(`pipeline.m4') # # DAI definitions # -W_DAI_IN(DAI_TYPE, DAI_INDEX, DAI_FORMAT, 2, 0, 0, dai0c_plat_conf) +W_DAI_IN(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 2, 0, 0, dai0c_plat_conf) # # DAI pipeline - always use 0 for DAIs diff --git a/topology/sof/pipe-dai-playback.m4 b/topology/sof/pipe-dai-playback.m4 index e70998b..2397875 100644 --- a/topology/sof/pipe-dai-playback.m4 +++ b/topology/sof/pipe-dai-playback.m4 @@ -8,7 +8,7 @@ include(`pipeline.m4') # # DAI definitions # -W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_FORMAT, 0, 2, 2, dai0p_plat_conf) +W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, 2, 2, dai0p_plat_conf) # # DAI pipeline - always use 0 for DAIs diff --git a/topology/sof/pipe-passthrough-capture.m4 b/topology/sof/pipe-passthrough-capture.m4 index a13887a..07961b3 100644 --- a/topology/sof/pipe-passthrough-capture.m4 +++ b/topology/sof/pipe-passthrough-capture.m4 @@ -27,7 +27,7 @@ W_BUFFER(0, COMP_BUFFER_SIZE(2, # # DAI definitions # -W_DAI_IN(DAI_TYPE, DAI_INDEX, DAI_FORMAT, 0, 2, 2, dai0c_plat_conf) +W_DAI_IN(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, 2, 2, dai0c_plat_conf) # # DAI pipeline - always use 0 for DAIs diff --git a/topology/sof/pipe-passthrough-playback.m4 b/topology/sof/pipe-passthrough-playback.m4 index 8a9e8ff..715fcee 100644 --- a/topology/sof/pipe-passthrough-playback.m4 +++ b/topology/sof/pipe-passthrough-playback.m4 @@ -27,7 +27,7 @@ W_BUFFER(0, COMP_BUFFER_SIZE(2, # # DAI definitions # -W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_FORMAT, 0, 2, 2, dai0p_plat_conf) +W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, 2, 2, dai0p_plat_conf) # # DAI pipeline - always use 0 for DAIs diff --git a/topology/sof/pipe-src-capture.m4 b/topology/sof/pipe-src-capture.m4 index a58eb68..1b1a58d 100644 --- a/topology/sof/pipe-src-capture.m4 +++ b/topology/sof/pipe-src-capture.m4 @@ -42,7 +42,7 @@ W_BUFFER(1, COMP_BUFFER_SIZE(4, # # DAI definitions # -W_DAI_IN(DAI_TYPE, DAI_INDEX, DAI_FORMAT, 0, DAI_PERIODS, +W_DAI_IN(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, DAI_PERIODS, DAI_PERIODS, dai0c_plat_conf) # diff --git a/topology/sof/pipe-src-playback.m4 b/topology/sof/pipe-src-playback.m4 index 7bf8f47..9dfdcd8 100644 --- a/topology/sof/pipe-src-playback.m4 +++ b/topology/sof/pipe-src-playback.m4 @@ -42,7 +42,7 @@ W_BUFFER(1, COMP_BUFFER_SIZE(4, # # DAI definitions # -W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_FORMAT, 0, DAI_PERIODS, +W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, DAI_PERIODS, DAI_PERIODS, dai0p_plat_conf) # diff --git a/topology/sof/pipe-volume-capture.m4 b/topology/sof/pipe-volume-capture.m4 index 5aa0d12..61b70a9 100644 --- a/topology/sof/pipe-volume-capture.m4 +++ b/topology/sof/pipe-volume-capture.m4 @@ -47,7 +47,7 @@ W_BUFFER(1, COMP_BUFFER_SIZE(2, # # DAI definitions # -W_DAI_IN(DAI_TYPE, DAI_INDEX, DAI_FORMAT, 0, DAI_PERIODS, +W_DAI_IN(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, DAI_PERIODS, DAI_PERIODS, dai0c_plat_conf) # diff --git a/topology/sof/pipe-volume-playback.m4 b/topology/sof/pipe-volume-playback.m4 index d6624b0..5fea0c7 100644 --- a/topology/sof/pipe-volume-playback.m4 +++ b/topology/sof/pipe-volume-playback.m4 @@ -47,7 +47,7 @@ W_BUFFER(1, COMP_BUFFER_SIZE(2, # # DAI definitions # -W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_FORMAT, 0, DAI_PERIODS, +W_DAI_OUT(DAI_TYPE, DAI_INDEX, DAI_BE, DAI_FORMAT, 0, DAI_PERIODS, DAI_PERIODS, dai0p_plat_conf) # diff --git a/topology/test/test-capture-ssp.m4 b/topology/test/test-capture-ssp.m4 index 8950222..3d10d7a 100644 --- a/topology/test/test-capture-ssp.m4 +++ b/topology/test/test-capture-ssp.m4 @@ -53,7 +53,7 @@ PIPELINE_PCM_DAI_ADD(sof/pipe-TEST_PIPE_NAME-capture.m4, # capture DAI is SSP TEST_SSP_PORT using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 2, SSP, TEST_SSP_PORT, + 2, SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, PIPELINE_SINK_2, 2, TEST_SSP_FORMAT, 48, 1000, 0, 0) diff --git a/topology/test/test-playback-ssp.m4 b/topology/test/test-playback-ssp.m4 index db6cb6c..ab775a4 100644 --- a/topology/test/test-playback-ssp.m4 +++ b/topology/test/test-playback-ssp.m4 @@ -53,7 +53,7 @@ PIPELINE_PCM_DAI_ADD(sof/pipe-TEST_PIPE_NAME-playback.m4, # playback DAI is SSP TEST_SSP_PORT using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, - 1, SSP, TEST_SSP_PORT, + 1, SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, PIPELINE_SOURCE_1, 2, TEST_SSP_FORMAT, 48, 1000, 0, 0) diff --git a/topology/test/test-ssp.m4 b/topology/test/test-ssp.m4 index 01e3a02..fa5fd29 100644 --- a/topology/test/test-ssp.m4 +++ b/topology/test/test-ssp.m4 @@ -64,14 +64,14 @@ PIPELINE_PCM_DAI_ADD(sof/pipe-TEST_PIPE_NAME-capture.m4, # playback DAI is SSP TEST_SSP_PORT using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, - 1, SSP, TEST_SSP_PORT, + 1, SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, PIPELINE_SOURCE_1, 2, TEST_SSP_FORMAT, 48, 1000, 0, 0) # capture DAI is SSP TEST_SSP_PORT using 2 periods # Buffers use s24le format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-capture.m4, - 2, SSP, TEST_SSP_PORT, + 2, SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, PIPELINE_SINK_2, 2, TEST_SSP_FORMAT, 48, 1000, 0, 0) diff --git a/topology/test/test-tone-playback-ssp.m4 b/topology/test/test-tone-playback-ssp.m4 index 9231316..7cf1ed5 100644 --- a/topology/test/test-tone-playback-ssp.m4 +++ b/topology/test/test-tone-playback-ssp.m4 @@ -45,7 +45,7 @@ PIPELINE_ADD(sof/pipe-tone.m4, # playback DAI is SSP2 using 2 periods # Buffers use TEST_SSP_FORMAT format, with 48 frame per 1000us on core 0 with priority 0 DAI_ADD(sof/pipe-dai-playback.m4, - 5, SSP, TEST_SSP_PORT, + 5, SSP, TEST_SSP_PORT, TEST_DAI_LINK_NAME, PIPELINE_SOURCE_5, 2, TEST_SSP_FORMAT, 48, 1000, 2, 0) -- 2.14.1

2 6

[Sound-open-firmware] [PATCH] host: Stop dma when pause
by Xiuli Pan 15 Mar '18

15 Mar '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> For gw-dma host, we need to stop the dma to make sure status are correct for resume. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- Test with: Mininow max rt5651 and GP-MRB nocodec SOF 1.1-stable: aa09938fd330232b201f5683faf8e32975ffcfac SOF-Tool 1.1-stable: 8d9b8d51f9c60e1c1725e9ccd3da22c0b523d0cf https://github.com/plbossart/sound/tree/topic/sof-v4.14: 84ed2d3ba0220424dd441f3a28ed2fe83967ad3a --- src/audio/host.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/audio/host.c b/src/audio/host.c index 287c886..744ca02 100644 --- a/src/audio/host.c +++ b/src/audio/host.c @@ -465,6 +465,9 @@ static int host_cmd(struct comp_dev *dev, int cmd, void *data) return ret; switch (cmd) { + case COMP_CMD_PAUSE: + dma_stop(hd->dma, hd->chan); + break; case COMP_CMD_STOP: ret = host_stop(dev); break; -- 2.7.4

6 5

[Sound-open-firmware] [PATCH] apl-ssp: fix capture double speed issue
by Keyon Jie 15 Mar '18

15 Mar '18

Previously TFT and RFT are set to 0s which means we are using threshold level 1, where interrupt asserts for every valid bits of each slot(e.g. for s16_le capture, interrupts assert for each 16 bits), but DMAC will treat it as notification of one full sample(e.g. 32 bits for s16_le stereo) and read those all bits, this will lead to capture with double speed at format s16_le stereo. Here add handle for FIFO trigger Threshold level, set them to bytes for each full sample(active_slots * valid_bits / 8), and the issue is fixed. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/drivers/apl-ssp.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/src/drivers/apl-ssp.c b/src/drivers/apl-ssp.c index 1ee107c..ecf70fb 100644 --- a/src/drivers/apl-ssp.c +++ b/src/drivers/apl-ssp.c @@ -43,6 +43,19 @@ #define trace_ssp_error(__e) trace_error(TRACE_CLASS_SSP, __e) #define tracev_ssp(__e) tracev_event(TRACE_CLASS_SSP, __e) +/* FIXME: move this to a helper and optimize */ +static int hweight_32(uint32_t mask) +{ + int i; + int count = 0; + + for (i = 0; i < 32; i++) { + count += mask & 1; + mask >>= 1; + } + return count; +} + /* save SSP context prior to entering D3 */ static int ssp_context_store(struct dai *dai) { @@ -96,6 +109,9 @@ static inline int ssp_set_config(struct dai *dai, uint32_t dummy_stop; uint32_t frame_len = 0; uint32_t bdiv_min; + uint32_t active_tx_slots = 2; + uint32_t active_rx_slots = 2; + bool inverted_frame = false; int ret = 0; @@ -353,6 +369,9 @@ static inline int ssp_set_config(struct dai *dai, sspsp |= SSPSP_SFRMP(!inverted_frame); sspsp |= SSPSP_FSRT; + active_tx_slots = hweight_32(config->tx_slot_mask); + active_rx_slots = hweight_32(config->rx_slot_mask); + break; case SOF_DAI_FMT_DSP_B: @@ -371,6 +390,9 @@ static inline int ssp_set_config(struct dai *dai, */ sspsp |= SSPSP_SFRMP(!inverted_frame); + active_tx_slots = hweight_32(config->tx_slot_mask); + active_rx_slots = hweight_32(config->rx_slot_mask); + break; default: trace_ssp_error("eca"); @@ -408,6 +430,9 @@ static inline int ssp_set_config(struct dai *dai, /* bypass divider for MCLK */ mdivr = 0x00000fff; + sscr3 |= SSCR3_TX(active_tx_slots * config->sample_valid_bits / 8) | + SSCR3_RX(active_rx_slots * config->sample_valid_bits / 8); + trace_ssp("coe"); ssp_write(dai, SSCR0, sscr0); ssp_write(dai, SSCR1, sscr1); -- 2.14.1

3 6

[Sound-open-firmware] [PATCH 1/2] interrupt: apollolake: fix the software interrupt macro num gap
by Keyon Jie 14 Mar '18

14 Mar '18

We add SOFTWARE1 and remove SOFTWARE10 to fix the gap, and change the corresponding calling. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/platform/apollolake/include/platform/interrupt.h | 18 +++++++++--------- src/platform/apollolake/include/platform/platform.h | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/platform/apollolake/include/platform/interrupt.h b/src/platform/apollolake/include/platform/interrupt.h index 2fddea1..7c0208e 100644 --- a/src/platform/apollolake/include/platform/interrupt.h +++ b/src/platform/apollolake/include/platform/interrupt.h @@ -41,23 +41,23 @@ #define IRQ_NUM_SOFTWARE0 0 /* level 1 */ #define IRQ_NUM_TIMER1 1 /* level 1 */ #define IRQ_NUM_EXT_LEVEL1 2 /* level 1 */ -#define IRQ_NUM_SOFTWARE2 3 /* level 1 */ -#define IRQ_NUM_SOFTWARE3 4 /* level 2 */ +#define IRQ_NUM_SOFTWARE1 3 /* level 1 */ +#define IRQ_NUM_SOFTWARE2 4 /* level 2 */ #define IRQ_NUM_TIMER2 5 /* level 2 */ #define IRQ_NUM_EXT_LEVEL2 6 /* level 2 */ -#define IRQ_NUM_SOFTWARE4 7 /* level 2 */ -#define IRQ_NUM_SOFTWARE5 8 /* level 3 */ +#define IRQ_NUM_SOFTWARE3 7 /* level 2 */ +#define IRQ_NUM_SOFTWARE4 8 /* level 3 */ #define IRQ_NUM_TIMER3 9 /* level 3 */ #define IRQ_NUM_EXT_LEVEL3 10 /* level 3 */ -#define IRQ_NUM_SOFTWARE6 11 /* level 3 */ -#define IRQ_NUM_SOFTWARE7 12 /* level 4 */ +#define IRQ_NUM_SOFTWARE5 11 /* level 3 */ +#define IRQ_NUM_SOFTWARE6 12 /* level 4 */ #define IRQ_NUM_EXT_LEVEL4 13 /* level 4 */ -#define IRQ_NUM_SOFTWARE8 14 /* level 4 */ -#define IRQ_NUM_SOFTWARE9 15 /* level 5 */ +#define IRQ_NUM_SOFTWARE7 14 /* level 4 */ +#define IRQ_NUM_SOFTWARE8 15 /* level 5 */ #define IRQ_NUM_EXT_LEVEL5 16 /* level 5 */ #define IRQ_NUM_EXT_LEVEL6 17 /* level 5 */ #define IRQ_NUM_EXT_LEVEL7 18 /* level 5 */ -#define IRQ_NUM_SOFTWARE10 19 /* level 5 */ +#define IRQ_NUM_SOFTWARE9 19 /* level 5 */ #define IRQ_NUM_NMI 20 /* level 7 */ /* IRQ Level 2 bits */ diff --git a/src/platform/apollolake/include/platform/platform.h b/src/platform/apollolake/include/platform/platform.h index 8a84308..c21179c 100644 --- a/src/platform/apollolake/include/platform/platform.h +++ b/src/platform/apollolake/include/platform/platform.h @@ -46,11 +46,11 @@ struct reef; #define PLATFORM_IPC_INTERUPT IRQ_EXT_IPC_LVL2(0) /* pipeline IRQ */ -#define PLATFORM_SCHEDULE_IRQ IRQ_NUM_SOFTWARE5 +#define PLATFORM_SCHEDULE_IRQ IRQ_NUM_SOFTWARE4 -#define PLATFORM_IRQ_TASK_HIGH IRQ_NUM_SOFTWARE4 -#define PLATFORM_IRQ_TASK_MED IRQ_NUM_SOFTWARE3 -#define PLATFORM_IRQ_TASK_LOW IRQ_NUM_SOFTWARE2 +#define PLATFORM_IRQ_TASK_HIGH IRQ_NUM_SOFTWARE3 +#define PLATFORM_IRQ_TASK_MED IRQ_NUM_SOFTWARE2 +#define PLATFORM_IRQ_TASK_LOW IRQ_NUM_SOFTWARE1 #define PLATFORM_SCHEDULE_COST 200 -- 2.14.1

2 2

[Sound-open-firmware] [RFC PATCH v2 0/5] APL/CNL: Enable DMA trace on APL/CNL.
by yan.wang＠linux.intel.com 14 Mar '18

14 Mar '18

From: Yan Wang <yan.wang(a)linux.intel.com> This patch set is only for initial review and trying. It can work fine on my CNL platform. I also tested on BYT MB, It doesn't cause regression. Yan Wang (5): APL/CNL: Add stream_tag variable for saving parameter from kernel driver. APL/CNL: Implement host DMA copy in existed DMA copy API. APL/CNL: Save stream tag and host buffer size from kernel driver. APL/CNL: Implement host DMA setting and position update on APL/CNL. APL/CNL: Initialize DMA trace data structure and definition on APL/CNL. src/include/reef/dma-trace.h | 1 + src/include/reef/dma.h | 2 + src/include/uapi/ipc.h | 1 + src/ipc/dma-copy.c | 44 ++++++++++++- src/ipc/intel-ipc.c | 8 ++- src/lib/dma-trace.c | 77 ++++++++++++++++++++++ .../apollolake/include/platform/platform.h | 2 +- src/platform/apollolake/platform.c | 3 + .../cannonlake/include/platform/platform.h | 2 +- src/platform/cannonlake/platform.c | 3 + 10 files changed, 139 insertions(+), 4 deletions(-) -- 2.14.3

2 6

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

14 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 APL pause resume issues. Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> -- Test with: Mininow max rt5651 and GP-MRB nocodec SOF master: 728f1ff3e32e14e19847ba513f8b0e3af80762c0 SOF-Tool master: 5b5bbe31e6d914079707bfa6c129c2730ea7aeff https://github.com/plbossart/sound/tree/topic/sof-v4.14: fe5e29155127a717ba5ae454b4bdde99afa67723 --- 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 f6f776a..ff0f74a 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -953,6 +953,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

3 3

[Sound-open-firmware] [PATCH 0/5][RFC] APL/CNL: Enable DMA trace on APL/CNL.
by yan.wang＠linux.intel.com 14 Mar '18

14 Mar '18

From: Yan Wang <yan.wang(a)linux.intel.com> This patch set is only for initial review and trying. It can work fine on my CNL platform. I also tested on BYT MB, It doesn't cause regression. Yan Wang (5): SOF: APL/CNL: Add stream_tag variable for saving parameter from kernel driver. Implement host DMA copy in existed DMA copy API. SOF: APL/CNL: Save stream tag and host buffer size from kernel driver. SOF: APL/CNL: Implement host DMA setting and position update on APL/CNL. SOF: APL/CNL: Initialize DMA trace data structure on APL/CNL. src/include/reef/dma-trace.h | 1 + src/include/reef/dma.h | 4 +++ src/include/uapi/ipc.h | 1 + src/ipc/dma-copy.c | 40 ++++++++++++++++++++- src/ipc/intel-ipc.c | 8 ++++- src/lib/dma-trace.c | 73 ++++++++++++++++++++++++++++++++++++++ src/platform/apollolake/platform.c | 3 ++ src/platform/cannonlake/platform.c | 3 ++ 8 files changed, 131 insertions(+), 2 deletions(-) -- 2.14.3

3 9

[Sound-open-firmware] [PATCH_V3 2/2] cnl: dma: refine dma interrupt processing on cnl
by Rander Wang 13 Mar '18

13 Mar '18

On cnl, all the dma share the same interrupt pin, so all the dma controller need to be checked in interrupt function. --- V3:make it work only on CNL Signed-off-by: Rander Wang <rander.wang(a)linux.intel.com> --- src/drivers/dw-dma.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/drivers/dw-dma.c b/src/drivers/dw-dma.c index 7659bec..33b5e5f 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -1138,6 +1138,28 @@ static void dw_dma_irq_handler(void *data) } } +#if defined CONFIG_CANNONLAKE +/*All the dma share the same interrupt on CNL, so check each dma*/ +/*controller when interrupt coming, then do the work */ +static void dw_dma_irq_cnl(void *data) +{ + struct dma *dma; + uint32_t status_intr; + + /*check interrupt status of DMA controller 0*/ + dma = dma_get(DMA_GP_LP_DMAC0); + status_intr = dw_read(dma, DW_INTR_STATUS); + if (status_intr) + dw_dma_irq_handler(dma); + + /*check interrupt status of DMA controller 1*/ + dma = dma_get(DMA_GP_LP_DMAC1); + status_intr = dw_read(dma, DW_INTR_STATUS); + if (status_intr) + dw_dma_irq_handler(dma); +} +#endif + static int dw_dma_probe(struct dma *dma) { struct dma_pdata *dw_pdata; @@ -1160,7 +1182,11 @@ static int dw_dma_probe(struct dma *dma) } /* register our IRQ handler */ +#if defined CONFIG_CANNONLAKE + interrupt_register(dma_irq(dma), dw_dma_irq_cnl, dma); +#else interrupt_register(dma_irq(dma), dw_dma_irq_handler, dma); +#endif interrupt_enable(dma_irq(dma)); return 0; -- 2.14.1

2 2