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

[Sound-open-firmware] [PATCH] component: fix comp_update_buffer() when buffer full
by Keyon Jie 10 Jan '17

10 Jan '17

It will treat full buffer as empty one at current comp_update_buffer(), as w_ptr is equal to r_ptr, this will make us missing those datas or at least the buffer->avail/free are not correct. Here spit comp_update_buffer() into consuming one and producing one, for consuming, 'r_ptr == w_ptr' update means buffer is becoming empty, and for producing, 'w_ptr == r_ptr' means buffer is becoming full. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/audio/dai.c | 8 +++++--- src/audio/host.c | 4 ++-- src/audio/mixer.c | 4 ++-- src/audio/volume.c | 4 ++-- src/include/reef/audio/component.h | 18 ++++++++++++++++-- 5 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/audio/dai.c b/src/audio/dai.c index 64e4761..ab0164c 100644 --- a/src/audio/dai.c +++ b/src/audio/dai.c @@ -98,6 +98,8 @@ static void dai_dma_cb(void *data, uint32_t type, struct dma_sg_elem *next) *dd->dai_pos = dd->dai_pos_blks + dma_buffer->r_ptr - dma_buffer->addr; + /* recalc available buffer space */ + comp_update_buffer_consume(dma_buffer); } else { dma_buffer = list_first_item(&dev->bsink_list, struct comp_buffer, source_list); @@ -119,10 +121,10 @@ static void dai_dma_cb(void *data, uint32_t type, struct dma_sg_elem *next) if (dd->dai_pos) *dd->dai_pos = dd->dai_pos_blks + dma_buffer->w_ptr - dma_buffer->addr; - } - /* recalc available buffer space */ - comp_update_buffer(dma_buffer); + /* recalc available buffer space */ + comp_update_buffer_produce(dma_buffer); + } /* notify pipeline that DAI needs it's buffer filled */ // if (dev->state == COMP_STATE_RUNNING) diff --git a/src/audio/host.c b/src/audio/host.c index fe43cf8..217ad4f 100644 --- a/src/audio/host.c +++ b/src/audio/host.c @@ -130,7 +130,7 @@ static void host_dma_cb_playback(struct comp_dev *dev, #endif /* recalc available buffer space */ - comp_update_buffer(hd->dma_buffer); + comp_update_buffer_consume(hd->dma_buffer); /* new local period, update host buffer position blks */ hd->host_pos_blks += local_elem->size; @@ -236,7 +236,7 @@ static void host_dma_cb_capture(struct comp_dev *dev, *hd->host_pos = hd->host_pos_blks; /* recalc available buffer space */ - comp_update_buffer(hd->dma_buffer); + comp_update_buffer_produce(hd->dma_buffer); /* send IPC message to driver if needed */ hd->host_period_pos += local_elem->size; diff --git a/src/audio/mixer.c b/src/audio/mixer.c index b996dae..3a8d12f 100644 --- a/src/audio/mixer.c +++ b/src/audio/mixer.c @@ -230,13 +230,13 @@ static int mixer_copy(struct comp_dev *dev) for(; i > 0; i--) { if (sources[i-1]->r_ptr >= sources[i-1]->end_addr) sources[i-1]->r_ptr = sources[i-1]->addr; - comp_update_buffer(sources[i-1]); + comp_update_buffer_consume(sources[i-1]); } if (sink->w_ptr >= sink->end_addr) sink->w_ptr = sink->addr; /* calc new free and available */ - comp_update_buffer(sink); + comp_update_buffer_produce(sink); /* number of frames sent downstream */ return cframes; diff --git a/src/audio/volume.c b/src/audio/volume.c index e2badb8..75a48f9 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -460,8 +460,8 @@ static int volume_copy(struct comp_dev *dev) sink->w_ptr = sink->addr; /* calc new free and available */ - comp_update_buffer(sink); - comp_update_buffer(source); + comp_update_buffer_produce(sink); + comp_update_buffer_consume(source); /* number of frames sent downstream */ return cframes; diff --git a/src/include/reef/audio/component.h b/src/include/reef/audio/component.h index fbd29e4..e521753 100644 --- a/src/include/reef/audio/component.h +++ b/src/include/reef/audio/component.h @@ -311,10 +311,24 @@ void sys_comp_mux_init(void); void sys_comp_switch_init(void); void sys_comp_volume_init(void); -static inline void comp_update_buffer(struct comp_buffer *buffer) +static inline void comp_update_buffer_produce(struct comp_buffer *buffer) { - if (buffer->r_ptr <= buffer->w_ptr) + if (buffer->r_ptr < buffer->w_ptr) buffer->avail = buffer->w_ptr - buffer->r_ptr; + else if (buffer->r_ptr == buffer->w_ptr) + buffer->avail = buffer->end_addr - buffer->addr; /* full */ + else + buffer->avail = buffer->end_addr - buffer->r_ptr + + buffer->w_ptr - buffer->addr; + buffer->free = buffer->desc.size - buffer->avail; +} + +static inline void comp_update_buffer_consume(struct comp_buffer *buffer) +{ + if (buffer->r_ptr < buffer->w_ptr) + buffer->avail = buffer->w_ptr - buffer->r_ptr; + else if (buffer->r_ptr == buffer->w_ptr) + buffer->avail = 0; /* empty */ else buffer->avail = buffer->end_addr - buffer->r_ptr + buffer->w_ptr - buffer->addr; -- 2.7.4

2 1

[Sound-open-firmware] [PATCH] volume: use rzalloc for component new
by Keyon Jie 10 Jan '17

10 Jan '17

Replace rmalloc() with rzalloc() to make sure the new allocated structs are clear to all 0s. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/audio/volume.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/audio/volume.c b/src/audio/volume.c index e2badb8..4b5b2e3 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -306,11 +306,11 @@ static struct comp_dev *volume_new(uint32_t type, uint32_t index, struct comp_data *cd; int i; - dev = rmalloc(RZONE_MODULE, RMOD_SYS, sizeof(*dev)); + dev = rzalloc(RZONE_MODULE, RMOD_SYS, sizeof(*dev)); if (dev == NULL) return NULL; - cd = rmalloc(RZONE_MODULE, RMOD_SYS, sizeof(*cd)); + cd = rzalloc(RZONE_MODULE, RMOD_SYS, sizeof(*cd)); if (cd == NULL) { rfree(RZONE_MODULE, RMOD_SYS, dev); return NULL; -- 2.5.0

2 1

[Sound-open-firmware] [PATCH] dai: rename frame_size in dai_config to sample_size
by Keyon Jie 03 Jan '17

03 Jan '17

The element frame_size in dai_config struct is actually sample size for each channel, e.g. 24 for S24_4LE, so rename it to sample_size to avoid confusion. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/drivers/ssp.c | 12 ++++++------ src/include/reef/dai.h | 2 +- src/ipc/intel-ipc.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/drivers/ssp.c b/src/drivers/ssp.c index c285af3..2b5b89e 100644 --- a/src/drivers/ssp.c +++ b/src/drivers/ssp.c @@ -260,8 +260,8 @@ static inline int ssp_set_config(struct dai *dai, struct dai_config *dai_config) case DAI_FMT_I2S: sscr0 |= SSCR0_PSP; sscr1 |= SSCR1_TRAIL; - sspsp |= SSPSP_SFRMWDTH(dai->config.frame_size + 1); - sspsp |= SSPSP_SFRMDLY((dai->config.frame_size + 1) * 2); + sspsp |= SSPSP_SFRMWDTH(dai->config.sample_size + 1); + sspsp |= SSPSP_SFRMDLY((dai->config.sample_size + 1) * 2); sspsp |= SSPSP_DMYSTRT(1); break; case DAI_FMT_DSP_A: @@ -274,11 +274,11 @@ static inline int ssp_set_config(struct dai *dai, struct dai_config *dai_config) return -EINVAL; } - /* frame size */ - if (dai->config.frame_size > 16) - sscr0 |= (SSCR0_EDSS | SSCR0_DSIZE(dai->config.frame_size - 16)); + /* sample size */ + if (dai->config.sample_size > 16) + sscr0 |= (SSCR0_EDSS | SSCR0_DSIZE(dai->config.sample_size - 16)); else - sscr0 |= SSCR0_DSIZE(dai->config.frame_size); + sscr0 |= SSCR0_DSIZE(dai->config.sample_size); /* watermarks - TODO: do we still need old sscr1 method ?? */ sscr1 |= (SSCR1_TX(4) | SSCR1_RX(4)); diff --git a/src/include/reef/dai.h b/src/include/reef/dai.h index cfcc428..5e301e1 100644 --- a/src/include/reef/dai.h +++ b/src/include/reef/dai.h @@ -100,7 +100,7 @@ struct dai_slot_map { /* DAI runtime hardware configuration */ struct dai_config { uint32_t format; - uint32_t frame_size; /* in BCLKs */ + uint32_t sample_size; /* in BCLKs */ struct dai_slot_map tx_slot_map[DAI_NUM_SLOT_MAPS]; struct dai_slot_map rx_slot_map[DAI_NUM_SLOT_MAPS]; uint32_t bclk; /* BCLK frequency in Hz */ diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index bfffaf6..127541d 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -565,7 +565,7 @@ static uint32_t ipc_device_set_formats(uint32_t header) dai_dev->dai_config.mclk = config_req.clock_frequency; dai_dev->dai_config.format = DAI_FMT_I2S | DAI_FMT_CONT | DAI_FMT_NB_NF | DAI_FMT_CBS_CFS; - dai_dev->dai_config.frame_size = 24; /* really sample size */ + dai_dev->dai_config.sample_size = 24; dai_dev->dai_config.bclk = 2400000; dai_dev->dai_config.mclk = 19200000; dai_dev->dai_config.clk_src = SSP_CLK_EXT; -- 2.7.4

2 1

[Sound-open-firmware] [PATCH 1/3] volume: add 24bit<==>32bit scaler and mapping
by Keyon Jie 03 Jan '17

03 Jan '17

As we are using 32 bits data in internal buffer, we need 24bit<==>32bit volume scaler for host<==>processing<==>dai converting. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/audio/volume.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/src/audio/volume.c b/src/audio/volume.c index d457632..e2badb8 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -191,6 +191,44 @@ static void vol_s24_to_s16(struct comp_dev *dev, struct comp_buffer *sink, sink->w_ptr = dest + i; } +/* copy and scale volume from 32 bit source buffer to 24 bit on 32 bit boundary dest buffer */ +static void vol_s32_to_s24(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source, uint32_t frames) +{ + struct comp_data *cd = comp_get_drvdata(dev); + int32_t *src = (int32_t*) source->r_ptr; + int32_t i, *dest = (int32_t*) sink->w_ptr; + + /* buffer sizes are always divisible by period frames */ + for (i = 0; i < frames * 2; i += 2) { + dest[i] = ((int64_t)src[i] * cd->volume[0]) >> 24; + dest[i + 1] = ((int64_t)src[i + 1] * cd->volume[1]) >> 24; + } + + source->r_ptr = src + i; + sink->w_ptr = dest + i; +} + +/* copy and scale volume from 16 bit source buffer to 24 bit on 32 bit boundary dest buffer */ +static void vol_s24_to_s32(struct comp_dev *dev, struct comp_buffer *sink, + struct comp_buffer *source, uint32_t frames) +{ + struct comp_data *cd = comp_get_drvdata(dev); + int32_t i, *src = (int32_t*) source->r_ptr; + int32_t *dest = (int32_t*) sink->w_ptr; + + /* buffer sizes are always divisible by period frames */ + for (i = 0; i < frames * 2; i += 2) { + dest[i] = (int32_t)(((int64_t)src[i] * + cd->volume[0]) >> 8); + dest[i + 1] = (int32_t)(((int64_t)src[i + 1] * + cd->volume[1]) >> 8); + } + + source->r_ptr = src + i; + sink->w_ptr = dest + i; +} + /* map of source and sink buffer formats to volume function */ static const struct comp_func_map func_map[] = { {STREAM_FORMAT_S16_LE, STREAM_FORMAT_S16_LE, 2, vol_s16_to_s16}, @@ -199,6 +237,8 @@ static const struct comp_func_map func_map[] = { {STREAM_FORMAT_S32_LE, STREAM_FORMAT_S32_LE, 2, vol_s32_to_s32}, {STREAM_FORMAT_S16_LE, STREAM_FORMAT_S24_4LE, 2, vol_s16_to_s24}, {STREAM_FORMAT_S24_4LE, STREAM_FORMAT_S16_LE, 2, vol_s24_to_s16}, + {STREAM_FORMAT_S32_LE, STREAM_FORMAT_S24_4LE, 2, vol_s32_to_s24}, + {STREAM_FORMAT_S24_4LE, STREAM_FORMAT_S32_LE, 2, vol_s24_to_s32}, }; static void vol_update(struct comp_data *cd, uint32_t chan) @@ -447,7 +487,7 @@ static int volume_prepare(struct comp_dev *dev) /* TODO tmp hard coded for 24 bit - need fixed for capture*/ /* is sink a host or DAI ? */ if (sink->sink->is_host || sink->sink->is_dai) - sink_format = STREAM_FORMAT_S24_4LE;//sink->params.pcm.format; + sink_format = sink->params.pcm.format; else sink_format = STREAM_FORMAT_S32_LE; -- 2.7.4

2 3

[Sound-open-firmware] [PATCH 1/2] dai: add stream_format to dai_data for codec stream
by Keyon Jie 29 Dec '16

29 Dec '16

Adding stream_format to indicate the stream format that the dai buffer is using, which will be used for volume copy functions mapping. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/audio/dai.c | 9 +++++++++ src/platform/baytrail/include/platform/platform.h | 3 +++ 2 files changed, 12 insertions(+) diff --git a/src/audio/dai.c b/src/audio/dai.c index 7bbde08..64e4761 100644 --- a/src/audio/dai.c +++ b/src/audio/dai.c @@ -59,6 +59,7 @@ struct dai_data { struct dma_sg_config config; int direction; + uint32_t stream_format; struct dai *ssp; struct dma *dma; @@ -162,6 +163,8 @@ static struct comp_dev *dai_new_ssp(uint32_t type, uint32_t index, if (dd->chan < 0) goto error; + dd->stream_format = PLATFORM_SSP_STREAM_FORMAT; + /* set up callback */ //if (dd->ssp->plat_data.flags & DAI_FLAGS_IRQ_CB) dma_set_cb(dd->dma, dd->chan, DMA_IRQ_TYPE_LLIST, dai_dma_cb, dev); @@ -217,6 +220,9 @@ static int dai_playback_params(struct comp_dev *dev, dma_period_desc = &dma_buffer->desc.sink_period; dma_buffer->params = *params; + /* set it to dai stream format, for volume func correct mapping */ + dma_buffer->params.pcm.format = dd->stream_format; + if (list_is_empty(&config->elem_list)) { /* set up cyclic list of DMA elems */ for (i = 0; i < dma_period_desc->number; i++) { @@ -275,6 +281,9 @@ static int dai_capture_params(struct comp_dev *dev, dma_period_desc = &dma_buffer->desc.source_period; dma_buffer->params = *params; + /* set it to dai stream format, for volume func correct mapping */ + dma_buffer->params.pcm.format = dd->stream_format; + if (list_is_empty(&config->elem_list)) { /* set up cyclic list of DMA elems */ for (i = 0; i < dma_period_desc->number; i++) { diff --git a/src/platform/baytrail/include/platform/platform.h b/src/platform/baytrail/include/platform/platform.h index b1bfbf2..f86019d 100644 --- a/src/platform/baytrail/include/platform/platform.h +++ b/src/platform/baytrail/include/platform/platform.h @@ -38,6 +38,9 @@ /* default static pipeline SSP port - not used for dynamic pipes */ #define PLATFORM_SSP_PORT 2 +/* default SSP stream format - need aligned with codec setting*/ +#define PLATFORM_SSP_STREAM_FORMAT STREAM_FORMAT_S24_4LE + /* IPC Interrupt */ #define PLATFORM_IPC_INTERUPT IRQ_NUM_EXT_IA -- 2.5.0

2 2

[Sound-open-firmware] [PATCH 1/4] pipeline: set up static buffers using platform macros.
by Liam Girdwood 28 Dec '16

28 Dec '16

Use period frames instead of period size in bytes. This makes the pipeline configuration less ambiguous and also allows for host, dai and internal frame sizes to be defined. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/audio/pipeline_static.c | 53 ++++++++++++++++------- src/platform/baytrail/include/platform/platform.h | 19 +++++--- 2 files changed, 51 insertions(+), 21 deletions(-) diff --git a/src/audio/pipeline_static.c b/src/audio/pipeline_static.c index 51ced6c..cc80adf 100644 --- a/src/audio/pipeline_static.c +++ b/src/audio/pipeline_static.c @@ -46,7 +46,7 @@ #include <reef/audio/pipeline.h> /* simple debug pipeline */ -#define DEBUG_PIPE 0 +#define DEBUG_PIPE 1 /* convenience component UUIDs and descriptors */ #define SPIPE_MIXER {COMP_TYPE_MIXER, 0, 0} @@ -63,16 +63,37 @@ .source_period = {.size = xosize, .number = xonum, .no_irq = xoirq},},} /* Host facing buffer */ +#define HOST_PERIOD_SIZE \ + (PLAT_HOST_PERIOD_FRAMES * PLATFORM_HOST_FRAME_SIZE) +#define HOST_BUFFER_SIZE \ + (HOST_PERIOD_SIZE * PLAT_HOST_PERIODS) + #define SPIPE_HOST_BUF \ - SPIPE_BUFFER(PLAT_HOST_PERSIZE * PLAT_HOST_PERIODS, \ - PLAT_HOST_PERSIZE, PLAT_HOST_PERIODS, 0, \ - PLAT_HOST_PERSIZE, PLAT_HOST_PERIODS, 0) + SPIPE_BUFFER(HOST_BUFFER_SIZE, \ + HOST_PERIOD_SIZE, PLAT_HOST_PERIODS, 0, \ + HOST_PERIOD_SIZE, PLAT_HOST_PERIODS, 0) /* Device facing buffer */ +#define DEV_PERIOD_SIZE \ + (PLAT_DAI_PERIOD_FRAMES * PLATFORM_DAI_FRAME_SIZE) +#define DEV_BUFFER_SIZE \ + (DEV_PERIOD_SIZE * PLAT_DAI_PERIODS) + #define SPIPE_DEV_BUF \ - SPIPE_BUFFER(PLAT_DEV_PERSIZE * PLAT_DEV_PERIODS, \ - PLAT_DEV_PERSIZE, PLAT_DEV_PERIODS, 0, \ - PLAT_DEV_PERSIZE, PLAT_DEV_PERIODS, 0) + SPIPE_BUFFER(DEV_BUFFER_SIZE, \ + DEV_PERIOD_SIZE, PLAT_DAI_PERIODS, 0, \ + DEV_PERIOD_SIZE, PLAT_DAI_PERIODS, 0) + +/* Internal buffer */ +#define INT_PERIOD_SIZE \ + (PLAT_INT_PERIOD_FRAMES * PLATFORM_INT_FRAME_SIZE) +#define INT_BUFFER_SIZE \ + (INT_PERIOD_SIZE * PLAT_INT_PERIODS) + +#define SPIPE_INT_BUF \ + SPIPE_BUFFER(INT_BUFFER_SIZE, \ + INT_PERIOD_SIZE, PLAT_INT_PERIODS, 0, \ + INT_PERIOD_SIZE, PLAT_INT_PERIODS, 0) struct spipe_comp { uint32_t type; @@ -114,9 +135,9 @@ static struct spipe_comp pipe_capt_comps[] = { static struct spipe_buffer pipe_buffers[] = { SPIPE_HOST_BUF, /* B0 */ SPIPE_HOST_BUF, /* B1 */ - SPIPE_HOST_BUF, /* B2 */ - SPIPE_HOST_BUF, /* B3 */ - SPIPE_HOST_BUF, /* B4 */ + SPIPE_INT_BUF, /* B2 */ + SPIPE_INT_BUF, /* B3 */ + SPIPE_INT_BUF, /* B4 */ SPIPE_DEV_BUF, /* B5 */ SPIPE_DEV_BUF, /* B6 */ SPIPE_HOST_BUF, /* B7 */ @@ -127,9 +148,9 @@ static struct spipe_buffer pipe_buffers[] = { /* * One PCM to single SSP output. SSP port is set in platform.h * - * host PCM0(0) ---> volume(1) ---> SSPx(6) + * host PCM0(0) --B0--> volume(1) --B5--> SSPx(6) * - * host PCM0(9) <--- volume(8) <--- SSPx(7) + * host PCM0(9) <--B7-- volume(8) <--B6-- SSPx(7) */ static struct spipe_link pipe_play[] = { {&pipe_play_comps[0], &pipe_buffers[0], &pipe_play_comps[1]}, @@ -141,11 +162,11 @@ static struct spipe_link pipe_play[] = { /* * Two PCMs mixed into single SSP output. SSP port is set in platform.h * - * host PCM0(0) ---> volume(1) ---+ - * |mixer(4) --> volume(5) ---> SSPx(6) - * host PCM1(2) ---> volume(3) ---+ + * host PCM0(0) --B0--> volume(1) --B2--+ + * |--mixer(4) --B4--> volume(5) --B5--> SSPx(6) + * host PCM1(2) --B1--> volume(3) --B3--+ * - * host PCM0(9) <--- volume(8) <--- SSPx(7) + * host PCM0(9) <--B7-- volume(8) <--B6-- SSPx(7) */ static struct spipe_link pipe_play[] = { {&pipe_play_comps[0], &pipe_buffers[0], &pipe_play_comps[1]}, diff --git a/src/platform/baytrail/include/platform/platform.h b/src/platform/baytrail/include/platform/platform.h index 5e0c7a6..b1bfbf2 100644 --- a/src/platform/baytrail/include/platform/platform.h +++ b/src/platform/baytrail/include/platform/platform.h @@ -54,16 +54,25 @@ #define PLATFORM_MAX_CHANNELS 4 #define PLATFORM_MAX_STREAMS 5 +/* TODO: get this from IPC - 2 * 32 bit*/ +#define PLATFORM_INT_FRAME_SIZE 8 +/* TODO: get this from IPC - 2 * 16 bit*/ +#define PLATFORM_HOST_FRAME_SIZE 4 +/* TODO: get this from IPC - 2 * 24 (32) bit*/ +#define PLATFORM_DAI_FRAME_SIZE 8 + /* Platform Host DMA buffer config - these should align with DMA engine */ -#define PLAT_HOST_PERSIZE 192 /* must be multiple of DMA burst size */ +#define PLAT_HOST_PERIOD_FRAMES 48 /* must be multiple of DMA burst size */ #define PLAT_HOST_PERIODS 2 /* give enough latency for DMA refill */ /* Platform Dev DMA buffer config - these should align with DMA engine */ -#define PLAT_DEV_PERSIZE 192 /* must be multiple of DMA+DEV burst size */ -#define PLAT_DEV_PERIODS 2 /* give enough latency for DMA refill */ +#define PLAT_DAI_PERIOD_FRAMES 48 /* must be multiple of DMA+DEV burst size */ +#define PLAT_DAI_PERIODS 2 /* give enough latency for DMA refill */ + +/* Platform internal buffer config - these should align with DMA engine */ +#define PLAT_INT_PERIOD_FRAMES 48 /* must be multiple of DMA+DEV burst size */ +#define PLAT_INT_PERIODS 2 /* give enough latency for DMA refill */ -/* Pipeline low latency frames per copy - TODO should come from config */ -#define PIPELINE_LL_FRAMES 48 /* DMA channel drain timeout in microseconds */ #define PLATFORM_DMA_TIMEOUT 1333 -- 2.9.3

1 3

[Sound-open-firmware] [PATCH v2 0/7] SSP: baytrail 24 bits support
by Keyon Jie 23 Dec '16

23 Dec '16

This series is created to change the SSP format setting for both Tx and Rx, and it is verified on MinnowMax + ALC5651 codec with I2S stereo both SSP_CLK_EXT and SSP_CLK_AUDIO mode. Changes including: 1. change ssp clock from 25M to 19.2M; 2. add 16bit <==> 24bit volume converting functions; 3. change to get dai format from host; 4. change to get ssp stream format from host; 5. remove the shim SSP divider and use SSCR0.SCR for BCLK generating. changes from v1: 1. change to make dai format configurable; 2. change to make ssp stream format configurable; 3. clean shim SSP divider code; 4. optimize volume copy functions. Keyon Jie (7): ssp: switch to use SCR for BCLK generation. platform: switch default ssp clock to 19.2M volume: add 16bit<==>24bit volume copy function and mapping ssp: switch dai format form PCM B mode to normal I2S mode intel-ipc: get dai format from ipc dai: add stream_format to dai_data for codec stream intel-ipc: change to get ssp stream format from ipc src/audio/dai.c | 10 ++ src/audio/volume.c | 119 ++++++++++++--------- src/drivers/ssp.c | 5 +- src/include/reef/dai.h | 1 + src/include/reef/stream.h | 20 ++++ src/include/uapi/intel-ipc.h | 2 + src/ipc/intel-ipc.c | 32 +++--- src/platform/baytrail/include/platform/platform.h | 10 +- src/platform/baytrail/platform.c | 120 ---------------------- 9 files changed, 126 insertions(+), 193 deletions(-) -- 2.7.4

3 15

[Sound-open-firmware] [PATCH] version: improve git version for build and IPC
by Liam Girdwood 22 Dec '16

22 Dec '16

Improve the git version and include last commit for IPC version message. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- .gitignore | 3 + Makefile.am | 13 ++-- configure.ac | 6 +- git-version-gen | 170 ---------------------------------------------------- git-version.sh | 10 ++++ src/ipc/intel-ipc.c | 3 +- 6 files changed, 26 insertions(+), 179 deletions(-) delete mode 100755 git-version-gen create mode 100755 git-version.sh diff --git a/.gitignore b/.gitignore index 5cb1d71..9223f60 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ *.rom *.man .version +.tarball-version Makefile Makefile.in @@ -27,9 +28,11 @@ CHANGELOG ltmain.sh m4/* libtool +src/include/version.h autom4te* config.* *.gz *.xz src/arch/xtensa/reef +reef-v* diff --git a/Makefile.am b/Makefile.am index b3dcce6..c47580e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,9 +15,12 @@ export ARCH_INCDIR = \ export PLATFORM_INCDIR = \ -I $(SRC_DIR)/platform/$(PLATFORM)/include -BUILT_SOURCES = $(top_srcdir)/.version -$(top_srcdir)/.version: - echo $(VERSION) > $@-t && mv $@-t $@ +BUILT_SOURCES = $(top_srcdir)/src/include/version.h + +$(top_srcdir)/src/include/version.h: + ./git-version.sh + dist-hook: - echo $(VERSION) > $(distdir)/.tarball-version - echo $(VERSION) > $(distdir)/.version + ./git-version.sh + cat .version > $(distdir)/.tarball-version + cat .version > $(distdir)/.version diff --git a/configure.ac b/configure.ac index 71e7795..7c1acf4 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.69]) -AC_INIT([Reef],[m4_esyscmd(./git-version-gen .tarball-version)],[sound-open-firmware(a)alsa-project.org]) +AC_INIT([Reef],[m4_esyscmd(./git-version.sh)],[sound-open-firmware(a)alsa-project.org]) AC_CONFIG_SRCDIR([src/init/init.c]) AC_CONFIG_HEADERS([src/include/config.h]) AC_CONFIG_MACRO_DIRS([m4]) @@ -10,8 +10,8 @@ AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability subdir-objects silent-rule AM_MAINTAINER_MODE([enable]) # get version info from git -m4_define(reef_major, `echo $VERSION | cut -d. -f1 | cut -d- -f1`) -m4_define(reef_minor, `echo $VERSION | cut -d. -f2 | cut -d- -f1`) +m4_define(reef_major, `cat .version | cut -dv -f2 | cut -d. -f1`) +m4_define(reef_minor, `cat .version | cut -d. -f2 | cut -d- -f1`) AC_DEFINE_UNQUOTED([REEF_MAJOR], reef_major, [Reef major version]) AC_DEFINE_UNQUOTED([REEF_MINOR], reef_minor, [Reef minor version]) diff --git a/git-version-gen b/git-version-gen deleted file mode 100755 index 7546884..0000000 --- a/git-version-gen +++ /dev/null @@ -1,170 +0,0 @@ -#!/bin/sh -# Print a version string. -scriptversion=2012-09-25.20 - -# Copyright (C) 2007-2008 Free Software Foundation -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, see <http://www.gnu.org/licenses/>. - -# This script is derived from GIT-VERSION-GEN from GIT: http://git.or.cz/. -# It may be run two ways: -# - from a git repository in which the "git describe" command below -# produces useful output (thus requiring at least one signed tag) -# - from a non-git-repo directory containing a .tarball-version file, which -# presumes this script is invoked like "./git-version-gen .tarball-version". - -# In order to use intra-version strings in your project, you will need two -# separate generated version string files: -# -# .tarball-version - present only in a distribution tarball, and not in -# a checked-out repository. Created with contents that were learned at -# the last time autoconf was run, and used by git-version-gen. Must not -# be present in either $(srcdir) or $(builddir) for git-version-gen to -# give accurate answers during normal development with a checked out tree, -# but must be present in a tarball when there is no version control system. -# Therefore, it cannot be used in any dependencies. GNUmakefile has -# hooks to force a reconfigure at distribution time to get the value -# correct, without penalizing normal development with extra reconfigures. -# -# .version - present in a checked-out repository and in a distribution -# tarball. Usable in dependencies, particularly for files that don't -# want to depend on config.h but do want to track version changes. -# Delete this file prior to any autoconf run where you want to rebuild -# files to pick up a version string change; and leave it stale to -# minimize rebuild time after unrelated changes to configure sources. -# -# It is probably wise to add these two files to .gitignore, so that you -# don't accidentally commit either generated file. -# -# Use the following line in your configure.ac, so that $(VERSION) will -# automatically be up-to-date each time configure is run (and note that -# since configure.ac no longer includes a version string, Makefile rules -# should not depend on configure.ac for version updates). -# -# AC_INIT([GNU project], -# m4_esyscmd([build-aux/git-version-gen .tarball-version]), -# [bug-project@example]) -# -# Then use the following lines in your Makefile.am, so that .version -# will be present for dependencies, and so that .tarball-version will -# exist in distribution tarballs. -# -# BUILT_SOURCES = $(top_srcdir)/.version -# $(top_srcdir)/.version: -# echo $(VERSION) > $@-t && mv $@-t $@ -# dist-hook: -# echo $(VERSION) > $(distdir)/.tarball-version -# echo $(VERSION) > $(distdir)/.version - -case $# in - 1) ;; - *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version"; exit 1;; -esac - -tarball_version_file=$1 -nl=' -' -v= - -# First see if there is a tarball-only version file. -# then try "git describe", then default. -if test -f $tarball_version_file -then - v=`cat $tarball_version_file` || exit 1 - case $v in - *$nl*) v= ;; # reject multi-line output - [0-9]*) ;; - *) v= ;; - esac - test -z "$v" \ - && echo "$0: WARNING: $tarball_version_file seems to be damaged" 1>&2 -fi - -# This is presently used by the GNOME-OSTree build system; it -# helps support the case where the meta-build system has already -# determined the git revision, but we may not be able to run "git describe" -# because we're inside a chroot. -if test -n "$GIT_DESCRIBE_FOR_BUILD"; -then - v=$GIT_DESCRIBE_FOR_BUILD -fi - -if test -n "$v" -then - : # use $v -elif test -e .git \ - && v=`git describe --abbrev=4 --match='v[0-9]*' HEAD 2>/dev/null` \ - && [ -n "$v" ] -then - # If we are on a "dev" tag, we need to check that it is not the same - # reference as the a previous version tag (this only happens when we are - # working with a release tag). - # NB The below trick relies on the $v being an exact tag to work which - # will only work when HEAD == tag. When further commits have been made on top - # of the tag, the $v will be supplimented with the number of commits since - # that tag and the commit ref of the most recent commit and thus will - # fail the test below (as intended) - v2=`git describe --abbrev=4 --match='v[0-9]\.[0-9]' --contains $v 2>/dev/null | cut -d'^' -f1` - [ -n "$v2" ] && v=$v2 - - # Is this a new git that lists number of commits since the last - # tag or the previous older version that did not? - # Newer: v6.10-77-g0f8faeb - # Older: v6.10-g0f8faeb -# case $v in -# *-*-*) : git describe is okay three part flavor ;; -# *-*) -# : git describe is older two part flavor -# # Recreate the number of commits and rewrite such that the -# # result is the same as if we were using the newer version -# # of git describe. -# vtag=`echo "$v" | sed 's/-.*//'` -# numcommits=`git rev-list "$vtag"..HEAD | wc -l` -# v=`echo "$v" | sed "s/$.*$-$.*$/\1-$numcommits-\2/"`; -# ;; -# esac - - # Change the first '-' to a '.', so version-comparing tools work properly. - # Remove the "g" in git describe's output string, to save a byte. -# v=`echo "$v" | sed 's/-/./;s/$.*$-g/\1-/'`; - : -else - echo 1>&2 "$0: Failed to determine git revision" - exit 1 -fi - -v=`echo "$v" |sed 's/^v//'` - -# Don't declare a version "dirty" merely because a time stamp has changed. -git status > /dev/null 2>&1 - -dirty=`sh -c 'git diff-index --name-only HEAD' 2>/dev/null` || dirty= -case "$dirty" in - '') ;; - *) # Append the suffix only if there isn't one already. - case $v in - *-dirty) ;; - *) v="$v-dirty" ;; - esac ;; -esac - -# Omit the trailing newline, so that m4_esyscmd can use the result directly. -echo "$v" | tr -d '\012' - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" -# End: diff --git a/git-version.sh b/git-version.sh new file mode 100755 index 0000000..f8f1e58 --- /dev/null +++ b/git-version.sh @@ -0,0 +1,10 @@ + +# version for configure +echo -n `git describe --abbrev=4` + +# version for make dist +git describe --abbrev=4 > .version +git describe --abbrev=4 > .tarball-version + +# git commit for IPC +echo "#define REEF_BUILD \"`git describe --abbrev=4 | cut -d- -f3`\"" > src/include/version.h diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index b7ecbba..6f5c54f 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -59,6 +59,7 @@ #include <uapi/intel-ipc.h> #include <reef/intel-ipc.h> #include <config.h> +#include <version.h> /* convert DSP mailbox address to host offset */ #define to_host_offset(_s) \ @@ -123,7 +124,7 @@ static const struct ipc_intel_ipc_fw_version fw_version = { .minor = REEF_MINOR, .major = REEF_MAJOR, .type = 0, - .fw_build_hash = VERSION, + .fw_build_hash = REEF_BUILD, .fw_log_providers_hash = 0, }; -- 2.9.3

1 0

[Sound-open-firmware] [PATCH] dma: Add support for callback DMA reload.
by Liam Girdwood 22 Dec '16

22 Dec '16

Add support to immediately reload the DMA during a DMA transfer completion callback. This allows components to respond quickly to any physical DMA copy updates i.e. period split over two non continuous physical host pages. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/audio/dai.c | 2 +- src/drivers/dw-dma.c | 53 ++++++++++++++++++++++++++++++++------ src/include/reef/audio/component.h | 3 ++- src/include/reef/dma.h | 5 ++-- src/ipc/intel-ipc.c | 2 +- 5 files changed, 52 insertions(+), 13 deletions(-) diff --git a/src/audio/dai.c b/src/audio/dai.c index afa1be1..7bbde08 100644 --- a/src/audio/dai.c +++ b/src/audio/dai.c @@ -68,7 +68,7 @@ struct dai_data { }; /* this is called by DMA driver every time descriptor has completed */ -static void dai_dma_cb(void *data, uint32_t type) +static void dai_dma_cb(void *data, uint32_t type, struct dma_sg_elem *next) { struct comp_dev *dev = (struct comp_dev *)data; struct dai_data *dd = comp_get_drvdata(dev); diff --git a/src/drivers/dw-dma.c b/src/drivers/dw-dma.c index 8834ca3..ecd152d 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -184,7 +184,7 @@ struct dma_chan_data { struct work work; - void (*cb)(void *data, uint32_t type); /* client callback function */ + void (*cb)(void *data, uint32_t type, struct dma_sg_elem *next); /* client callback function */ void *cb_data; /* client callback data */ int cb_type; /* callback type */ }; @@ -195,7 +195,9 @@ struct dma_pdata { uint32_t class; /* channel class - set for controller atm */ }; -static inline void dw_dma_chan_reload(struct dma *dma, int channel); +static inline void dw_dma_chan_reload_lli(struct dma *dma, int channel); +static inline void dw_dma_chan_reload_next(struct dma *dma, int channel, + struct dma_sg_elem *next); static inline void dw_write(struct dma *dma, uint32_t reg, uint32_t value) { @@ -385,6 +387,7 @@ out: static int dw_dma_release(struct dma *dma, int channel) { struct dma_pdata *p = dma_get_drvdata(dma); + struct dma_sg_elem next; uint32_t flags; spin_lock_irq(&dma->lock, flags); @@ -393,8 +396,8 @@ static int dw_dma_release(struct dma *dma, int channel) if (p->chan[channel].status == DMA_STATUS_PAUSED) { if (p->chan[channel].cb && p->chan[channel].cb_type & DMA_IRQ_TYPE_LLIST) - p->chan[channel].cb(p->chan[channel].cb_data, DMA_IRQ_TYPE_LLIST); - dw_dma_chan_reload(dma, channel); + p->chan[channel].cb(p->chan[channel].cb_data, DMA_IRQ_TYPE_LLIST, &next); + dw_dma_chan_reload_lli(dma, channel); } /* resume and reload DMA */ @@ -711,7 +714,8 @@ static int dw_dma_pm_context_store(struct dma *dma) } static void dw_dma_set_cb(struct dma *dma, int channel, int type, - void (*cb)(void *data, uint32_t type), void *data) + void (*cb)(void *data, uint32_t type, struct dma_sg_elem *next), + void *data) { struct dma_pdata *p = dma_get_drvdata(dma); uint32_t flags; @@ -723,7 +727,8 @@ static void dw_dma_set_cb(struct dma *dma, int channel, int type, spin_unlock_irq(&dma->lock, flags); } -static inline void dw_dma_chan_reload(struct dma *dma, int channel) +/* reload using LLI data */ +static inline void dw_dma_chan_reload_lli(struct dma *dma, int channel) { struct dma_pdata *p = dma_get_drvdata(dma); struct dw_lli2 *lli = p->chan[channel].lli_current; @@ -754,11 +759,39 @@ static inline void dw_dma_chan_reload(struct dma *dma, int channel) dw_write(dma, DW_DMA_CHAN_EN, CHAN_ENABLE(channel)); } +/* reload using callback data */ +static inline void dw_dma_chan_reload_next(struct dma *dma, int channel, + struct dma_sg_elem *next) +{ + struct dma_pdata *p = dma_get_drvdata(dma); + struct dw_lli2 *lli = p->chan[channel].lli_current; + + /* channel needs started from scratch, so write SARn, DARn */ + dw_write(dma, DW_SAR(channel), next->src); + dw_write(dma, DW_DAR(channel), next->dest); + + /* set transfer size of element */ + lli->ctrl_hi = DW_CTLH_CLASS(p->class) | + (next->size & DW_CTLH_BLOCK_TS_MASK); + + /* program CTLn */ + dw_write(dma, DW_CTRL_LOW(channel), lli->ctrl_lo); + dw_write(dma, DW_CTRL_HIGH(channel), lli->ctrl_hi); + + /* program CFGn */ + dw_write(dma, DW_CFG_LOW(channel), p->chan[channel].cfg_lo); + dw_write(dma, DW_CFG_HIGH(channel), p->chan[channel].cfg_hi); + + /* enable the channel */ + dw_write(dma, DW_DMA_CHAN_EN, CHAN_ENABLE(channel)); +} + /* this will probably be called at the end of every period copied */ static void dw_dma_irq_handler(void *data) { struct dma *dma = (struct dma *)data; struct dma_pdata *p = dma_get_drvdata(dma); + struct dma_sg_elem next; uint32_t status_tfr = 0, status_block = 0, status_err = 0, status_intr; uint32_t mask, pmask; int i; @@ -806,12 +839,16 @@ static void dw_dma_irq_handler(void *data) continue; } + next.size = 0; if (p->chan[i].cb) p->chan[i].cb(p->chan[i].cb_data, - DMA_IRQ_TYPE_LLIST); + DMA_IRQ_TYPE_LLIST, &next); /* check for reload channel */ - dw_dma_chan_reload(dma, i); + if (next.size > 0) + dw_dma_chan_reload_next(dma, i, &next); + else + dw_dma_chan_reload_lli(dma, i); } #if DW_USE_HW_LLI /* end of a LLI block */ diff --git a/src/include/reef/audio/component.h b/src/include/reef/audio/component.h index 61afa5a..850165b 100644 --- a/src/include/reef/audio/component.h +++ b/src/include/reef/audio/component.h @@ -161,7 +161,8 @@ struct comp_ops { int (*copy)(struct comp_dev *dev); /* host buffer config */ - int (*host_buffer)(struct comp_dev *dev, struct dma_sg_elem *elem); + int (*host_buffer)(struct comp_dev *dev, struct dma_sg_elem *elem, + uint32_t host_size); }; diff --git a/src/include/reef/dma.h b/src/include/reef/dma.h index b9e8a45..6de2ede 100644 --- a/src/include/reef/dma.h +++ b/src/include/reef/dma.h @@ -104,7 +104,8 @@ struct dma_ops { struct dma_sg_config *config); void (*set_cb)(struct dma *dma, int channel, int type, - void (*cb)(void *data, uint32_t type), void *data); + void (*cb)(void *data, uint32_t type, struct dma_sg_elem *next), + void *data); int (*pm_context_restore)(struct dma *dma); int (*pm_context_store)(struct dma *dma); @@ -162,7 +163,7 @@ static inline void dma_channel_put(struct dma *dma, int channel) } static inline void dma_set_cb(struct dma *dma, int channel, int type, - void (*cb)(void *data, uint32_t type), void *data) + void (*cb)(void *data, uint32_t type, struct dma_sg_elem *next), void *data) { dma->ops->set_cb(dma, channel, type, cb, data); } diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index 7aa24f3..d735f26 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -143,7 +143,7 @@ static uint32_t ipc_fw_caps(uint32_t header) return IPC_INTEL_GLB_REPLY_SUCCESS; } -static void dma_complete(void *data, uint32_t type) +static void dma_complete(void *data, uint32_t type, struct dma_sg_elem *next) { struct intel_ipc_data *iipc = (struct intel_ipc_data *)data; -- 2.9.3

1 7

[Sound-open-firmware] [PATCH 0/8] SSP: baytrail 24 bits support
by Keyon Jie 20 Dec '16

20 Dec '16

This series is created to change the SSP format setting for both Tx and Rx, and it is verified on MinnowMax + ALC5651 codec with I2S stereo both SSP_CLK_EXT and SSP_CLK_AUDIO mode. Changes including: 1. change ssp clock from 25M to 19.2M; 2. add 16bit <==> 24bit volume converting functions; 3. switch to use I2S mode(more common on host side); 4. change ssp stream format to 24 bits; 5. remove the usage of shim SSP divider and use SSCR0.SCR for BCLK generating. Keyon Jie (8): platform: ssp divider: read the ssp clock directly platform: switch default ssp clock to 19.2M volume: add 16bit<==>24bit volume copy function and mapping ssp: switch dai format form PCM B mode to normal I2S mode platform: add divider m/n setting for 50 bclk_fs dai: add stream_format to dai_data for codec stream ssp: change stream format to S24_4LE ssp: switch to use SCR for BCLK src/audio/dai.c | 9 +++++ src/audio/volume.c | 43 +++++++++++++++++++++++ src/drivers/ssp.c | 4 +-- src/ipc/intel-ipc.c | 19 +++------- src/platform/baytrail/include/platform/platform.h | 8 +++-- src/platform/baytrail/platform.c | 10 ++---- 6 files changed, 66 insertions(+), 27 deletions(-) -- 2.7.4

5 24