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

[Sound-open-firmware] Reef, Minnowboard Max or Asus T100
by Chun-ta Lin 11 Dec '17

11 Dec '17

Hello SOF Gurus, This is Peter from ChromeOS@Google. I'm interested in the project and is trying to reproduce/ understanding from the main page <https://www.alsa-project.org/main/index.php/Firmware>. I noticed that in the instruction, the topic is reef w/ 4.8 kernel version. Since I'm quite a newbie in this area, wondering from a learning perspective, what would be recommended hardware for this purpose ? Will it be a bit more complicated to build / debug it with Reef (like kernel need to sign after build), or ASUS T100 (an Windows platform). Looking forward for reply, itsPeter

4 8

[Sound-open-firmware] [PATCH] configure: reset build count every time autogen.sh is run.
by Liam Girdwood 30 Nov '17

30 Nov '17

autogen.sh rebuilds the build system so also reset any build count to 0. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- autogen.sh | 1 + configure.ac | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/autogen.sh b/autogen.sh index 3b379b6..e0ce846 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,4 +1,5 @@ #!/bin/bash +rm -f .build libtoolize -c --force aclocal -I m4 --install autoconf -Wall diff --git a/configure.ac b/configure.ac index e8c8edf..f51849b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,5 @@ - AC_PREREQ([2.69]) -AC_INIT([Reef],[m4_esyscmd(./git-version.sh), m4_esyscmd(rm -f .build)],[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]) -- 2.14.1

2 6

[Sound-open-firmware] [PATCH] Add support to replace stale stream/trace position updates.
by yan.wang＠linux.intel.com 23 Nov '17

23 Nov '17

From: Yan Wang <yan.wang(a)linux.intel.com> 1. Add "replace" parameter for ipc_queue_host_message() to indicate whether check duplicate message in host message queue. 2. Add msg_find() to search duplicate message. 3. If replace flag is true, search and replace duplicate message. 4. For the message of host offset of DMA trace, enable replace logic. It will avoid that the host message queue is full because there is too many IPC messages of host offset of DMA trace. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/include/reef/ipc.h | 2 +- src/ipc/intel-ipc.c | 45 ++++++++++++++++++++++++++++++++++----------- 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/src/include/reef/ipc.h b/src/include/reef/ipc.h index fcab45b..bb814be 100644 --- a/src/include/reef/ipc.h +++ b/src/include/reef/ipc.h @@ -125,7 +125,7 @@ int ipc_stream_send_xrun(struct comp_dev *cdev, int ipc_queue_host_message(struct ipc *ipc, uint32_t header, void *tx_data, size_t tx_bytes, void *rx_data, - size_t rx_bytes, void (*cb)(void*, void*), void *cb_data); + size_t rx_bytes, void (*cb)(void*, void*), void *cb_data, uint32_t replace); int ipc_send_short_msg(uint32_t msg); void ipc_platform_do_cmd(struct ipc *ipc); diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index e13b541..391907e 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -367,7 +367,7 @@ int ipc_stream_send_position(struct comp_dev *cdev, posn->comp_id = cdev->comp.id; return ipc_queue_host_message(_ipc, posn->rhdr.hdr.cmd, posn, - sizeof(*posn), NULL, 0, NULL, NULL); + sizeof(*posn), NULL, 0, NULL, NULL, 0); } /* send stream position TODO: send compound message */ @@ -379,7 +379,7 @@ int ipc_stream_send_xrun(struct comp_dev *cdev, posn->comp_id = cdev->comp.id; return ipc_queue_host_message(_ipc, posn->rhdr.hdr.cmd, posn, - sizeof(*posn), NULL, 0, NULL, NULL); + sizeof(*posn), NULL, 0, NULL, NULL, 0); } static int ipc_stream_trigger(uint32_t header) @@ -644,7 +644,7 @@ int ipc_dma_trace_send_position(void) posn.rhdr.hdr.size = sizeof(posn); return ipc_queue_host_message(_ipc, posn.rhdr.hdr.cmd, &posn, - sizeof(posn), NULL, 0, NULL, NULL); + sizeof(posn), NULL, 0, NULL, NULL, 1); } static int ipc_glb_debug_message(uint32_t header) @@ -899,19 +899,40 @@ static inline struct ipc_msg *msg_get_empty(struct ipc *ipc) return msg; } +static inline struct ipc_msg *msg_find(struct ipc *ipc, uint32_t header) +{ + struct list_item *plist; + struct ipc_msg *msg = NULL; + + list_for_item(plist, &ipc->msg_list) { + msg = container_of(plist, struct ipc_msg, list); + if (msg->header == header) + return msg; + } + + return NULL; +} int ipc_queue_host_message(struct ipc *ipc, uint32_t header, void *tx_data, size_t tx_bytes, void *rx_data, - size_t rx_bytes, void (*cb)(void*, void*), void *cb_data) + size_t rx_bytes, void (*cb)(void*, void*), void *cb_data, uint32_t replace) { - struct ipc_msg *msg; - uint32_t flags; + struct ipc_msg *msg = NULL; + uint32_t flags, found = 0; int ret = 0; spin_lock_irq(&ipc->lock, flags); - /* get a free message */ - msg = msg_get_empty(ipc); + /* do we need to replace an existing message? */ + if (replace) + msg = msg_find(ipc, header); + + /* do we need to use a new empty message? */ + if (msg) + found = 1; + else + msg = msg_get_empty(ipc); + if (msg == NULL) { trace_ipc_error("eQb"); ret = -EBUSY; @@ -929,9 +950,11 @@ int ipc_queue_host_message(struct ipc *ipc, uint32_t header, if (tx_bytes > 0 && tx_bytes < SOF_IPC_MSG_MAX_SIZE) rmemcpy(msg->tx_data, tx_data, tx_bytes); - /* now queue the message */ - ipc->dsp_pending = 1; - list_item_append(&msg->list, &ipc->msg_list); + if (!found) { + /* now queue the message */ + ipc->dsp_pending = 1; + list_item_append(&msg->list, &ipc->msg_list); + } out: spin_unlock_irq(&ipc->lock, flags); -- 2.7.4

4 5

[Sound-open-firmware] [PATCH 1/2] SRC: Bug fix for handling a deleted conversion
by Seppo Ingalsuo 21 Nov '17

21 Nov '17

This patch fixes a regression that caused SRC to try to initialize for a mode that has been disabled from in/out rates matrix. The feature exist to save tables RAM with modes those are not required. The bug caused a divide by zero to happen in src_buffer_lengths() function. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> --- src/audio/src_core.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/audio/src_core.c b/src/audio/src_core.c index dc22772..d8b9a3d 100644 --- a/src/audio/src_core.c +++ b/src/audio/src_core.c @@ -133,7 +133,6 @@ int src_buffer_lengths(struct src_param *a, int fs_in, int fs_out, int nch, { struct src_stage *stage1; struct src_stage *stage2; - int k; int q; int den; int num; @@ -149,18 +148,25 @@ int src_buffer_lengths(struct src_param *a, int fs_in, int fs_out, int nch, a->idx_in = src_find_fs(src_in_fs, NUM_IN_FS, fs_in); a->idx_out = src_find_fs(src_out_fs, NUM_OUT_FS, fs_out); - /* Set blk_in, blk_out so that the muted fallback SRC keeps - * just source & sink in sync in pipeline without drift. - */ + /* Check that both in and out rates are supported */ if ((a->idx_in < 0) || (a->idx_out < 0)) { - k = gcd(fs_in, fs_out); - a->blk_in = fs_in / k; - a->blk_out = fs_out / k; + trace_src_error("us1"); + tracev_value(fs_in); + tracev_value(fs_out); return -EINVAL; } stage1 = src_table1[a->idx_out][a->idx_in]; stage2 = src_table2[a->idx_out][a->idx_in]; + + /* Check from stage1 parameter for a deleted in/out rate combination.*/ + if (stage1->filter_length < 1) { + trace_src_error("us2"); + tracev_value(fs_in); + tracev_value(fs_out); + return -EINVAL; + } + a->fir_s1 = nch * src_fir_delay_length(stage1); a->out_s1 = nch * src_out_delay_length(stage1); -- 2.11.0

2 3

[Sound-open-firmware] [PATCH] dma: dw-dma: release spinlock in error path
by Liam Girdwood 17 Nov '17

17 Nov '17

Currently not released on any configuration errors. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/drivers/dw-dma.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/drivers/dw-dma.c b/src/drivers/dw-dma.c index 7b97fb8..4a4a14a 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -438,6 +438,7 @@ static int dw_dma_set_config(struct dma *dma, int channel, struct dw_lli2 *lli_desc_tail; uint32_t desc_count = 0; uint32_t flags; + int ret = 0; spin_lock_irq(&dma->lock, flags); @@ -453,8 +454,9 @@ static int dw_dma_set_config(struct dma *dma, int channel, desc_count++; if (desc_count == 0) { - trace_dma_error("eDC"); - return -EINVAL; + trace_dma_error("eD0"); + ret = -EINVAL; + goto out; } /* do we need to realloc descriptors */ @@ -468,8 +470,9 @@ static int dw_dma_set_config(struct dma *dma, int channel, p->chan[channel].lli = rzalloc(RZONE_RUNTIME, RFLAGS_NONE, sizeof(struct dw_lli2) * p->chan[channel].desc_count); if (p->chan[channel].lli == NULL) { - trace_dma_error("eDm"); - return -ENOMEM; + trace_dma_error("eD1"); + ret = -ENOMEM; + goto out; } } @@ -539,14 +542,17 @@ static int dw_dma_set_config(struct dma *dma, int channel, lli_desc->dar = (uint32_t)sg_elem->dest; break; default: - trace_dma_error("eDD"); - break; + trace_dma_error("eD4"); + ret = -EINVAL; + goto out; } if (sg_elem->size > DW_CTLH_BLOCK_TS_MASK) { - trace_dma_error("eDS"); - return -EINVAL; + trace_dma_error("eD5"); + ret = -EINVAL; + goto out; } + /* set transfer size of element */ #if defined CONFIG_BAYTRAIL || defined CONFIG_CHERRYTRAIL lli_desc->ctrl_hi = DW_CTLH_CLASS(p->class) | @@ -578,9 +584,9 @@ static int dw_dma_set_config(struct dma *dma, int channel, } p->chan[channel].status = COMP_STATE_PREPARE; +out: spin_unlock_irq(&dma->lock, flags); - - return 0; + return ret; } /* restore DMA conext after leaving D3 */ -- 2.11.0

1 3

[Sound-open-firmware] [PATCH] scheduler: Allow tasks to be scheduled when DSP enters idle state
by Liam Girdwood 17 Nov '17

17 Nov '17

Add an API to allow tasks to be added to the scheduler task list but not run until the DSP enters an idle state. i.e. we schedule the task as normal but dont immediately call schedule() to schedule that task for execution and instead wait until schedule() is next called (at the end of some other work). This patch also calls schedule() before entering the idle state in the main processing loop. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/include/reef/schedule.h | 2 ++ src/lib/schedule.c | 49 ++++++++++++++++++++++++++++++++++----------- src/tasks/audio.c | 3 +++ 3 files changed, 42 insertions(+), 12 deletions(-) diff --git a/src/include/reef/schedule.h b/src/include/reef/schedule.h index 6d94788..68aa0ad 100644 --- a/src/include/reef/schedule.h +++ b/src/include/reef/schedule.h @@ -77,6 +77,8 @@ void schedule(void); void schedule_task(struct task *task, uint64_t start, uint64_t deadline); +void schedule_task_idle(struct task *task, uint64_t deadline); + void schedule_task_complete(struct task *task); static inline void schedule_task_init(struct task *task, void (*func)(void *), diff --git a/src/lib/schedule.c b/src/lib/schedule.c index 942067c..1310e83 100644 --- a/src/lib/schedule.c +++ b/src/lib/schedule.c @@ -233,15 +233,8 @@ out: } #endif -/* - * Add a new task to the scheduler to be run and define a scheduling - * window in time for the task to be ran. i.e. task will run between start and - * deadline times. - * - * start is in microseconds relative to last task start time. - * deadline is in microseconds relative to start. - */ -void schedule_task(struct task *task, uint64_t start, uint64_t deadline) + +static int _schedule_task(struct task *task, uint64_t start, uint64_t deadline) { uint32_t flags; uint64_t current; @@ -254,7 +247,7 @@ void schedule_task(struct task *task, uint64_t start, uint64_t deadline) if (task->state == TASK_STATE_RUNNING) { trace_pipe("tsk"); spin_unlock_irq(&sch->lock, flags); - return; + return 0; } /* get the current time */ @@ -275,8 +268,40 @@ void schedule_task(struct task *task, uint64_t start, uint64_t deadline) task->state = TASK_STATE_QUEUED; spin_unlock_irq(&sch->lock, flags); - /* rerun scheduler */ - schedule(); + return 1; +} + +/* + * Add a new task to the scheduler to be run and define a scheduling + * deadline in time for the task to be ran. Do not invoke the scheduler + * immediately to run task, but wait intil schedule is next called. + * + * deadline is in microseconds relative to start. + */ +void schedule_task_idle(struct task *task, uint64_t deadline) +{ + _schedule_task(task, 0, deadline); +} + +/* + * Add a new task to the scheduler to be run and define a scheduling + * window in time for the task to be ran. i.e. task will run between start and + * deadline times. + * + * start is in microseconds relative to last task start time. + * deadline is in microseconds relative to start. + */ +void schedule_task(struct task *task, uint64_t start, uint64_t deadline) +{ + int need_sched; + + need_sched = _schedule_task(task, start, deadline); + + /* need to run scheduler if task not already running */ + if (need_sched) { + /* rerun scheduler */ + schedule(); + } } /* Remove a task from the scheduler when complete */ diff --git a/src/tasks/audio.c b/src/tasks/audio.c index 68f7702..af241d7 100644 --- a/src/tasks/audio.c +++ b/src/tasks/audio.c @@ -85,6 +85,9 @@ int do_task(struct reef *reef) /* now process any IPC messages from host */ ipc_process_msg_queue(); + + /* schedule any idle taks */ + schedule(); } /* something bad happened */ -- 2.11.0

2 9

[Sound-open-firmware] [PATCH] volume: fix copy size incorrect issue
by Keyon Jie 16 Nov '17

16 Nov '17

The copy sizes for src and sink may be different, here add fix to handle it. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/audio/volume.c | 38 +++++++++++++++++++++++++++++--------- src/include/reef/audio/buffer.h | 19 +++++++++++++++++++ 2 files changed, 48 insertions(+), 9 deletions(-) diff --git a/src/audio/volume.c b/src/audio/volume.c index 415a853..9cf766b 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -535,13 +535,27 @@ static int volume_cmd(struct comp_dev *dev, int cmd, void *data) } } +static uint32_t get_frame_bytes(enum sof_ipc_frame frame_fmt, uint32_t chan) +{ + switch (frame_fmt) { + case SOF_IPC_FRAME_S16_LE: + return 2 * chan; + case SOF_IPC_FRAME_S24_4LE: + case SOF_IPC_FRAME_S32_LE: + return 4 * chan; + default: + return 0; + } +} + /* copy and process stream data from source to sink buffers */ static int volume_copy(struct comp_dev *dev) { struct comp_data *cd = comp_get_drvdata(dev); struct comp_buffer *sink; struct comp_buffer *source; - uint32_t copy_bytes; + uint32_t copy_src_bytes, copy_sink_bytes; + uint32_t copy_frames, src_frame_bytes, sink_frame_bytes; tracev_volume("cpy"); @@ -549,16 +563,22 @@ static int volume_copy(struct comp_dev *dev) source = list_first_item(&dev->bsource_list, struct comp_buffer, sink_list); sink = list_first_item(&dev->bsink_list, struct comp_buffer, source_list); + src_frame_bytes = get_frame_bytes(cd->source_format, dev->params.channels); + sink_frame_bytes = get_frame_bytes(cd->sink_format, dev->params.channels); + /* get max number of bytes that can be copied */ - copy_bytes = comp_buffer_get_copy_bytes(dev, source, sink); + copy_frames = comp_buffer_get_copy_frames(source, src_frame_bytes, + sink, sink_frame_bytes); + copy_src_bytes = copy_frames * src_frame_bytes; + copy_sink_bytes = copy_frames * sink_frame_bytes; /* Run volume if buffers have enough room */ - if (copy_bytes < cd->source_period_bytes) { - comp_underrun(dev, source, copy_bytes, cd->source_period_bytes); + if (copy_src_bytes < cd->source_period_bytes) { + comp_underrun(dev, source, copy_src_bytes, cd->source_period_bytes); return 0; } - if (copy_bytes < cd->sink_period_bytes) { - comp_overrun(dev, sink, copy_bytes, cd->sink_period_bytes); + if (copy_sink_bytes < cd->sink_period_bytes) { + comp_overrun(dev, sink, copy_sink_bytes, cd->sink_period_bytes); return 0; } @@ -566,10 +586,10 @@ static int volume_copy(struct comp_dev *dev) cd->scale_vol(dev, sink, source, dev->frames); /* calc new free and available */ - comp_update_buffer_produce(sink, cd->sink_period_bytes); - comp_update_buffer_consume(source, cd->source_period_bytes); + comp_update_buffer_produce(sink, copy_sink_bytes); + comp_update_buffer_consume(source, copy_src_bytes); - return dev->frames; + return copy_frames; } /* diff --git a/src/include/reef/audio/buffer.h b/src/include/reef/audio/buffer.h index d1d0869..45aa3ce 100644 --- a/src/include/reef/audio/buffer.h +++ b/src/include/reef/audio/buffer.h @@ -164,6 +164,25 @@ static inline uint32_t comp_buffer_get_copy_bytes(struct comp_dev *dev, return copy_bytes; } +/* get the max number of frames that can be copied between sink and source */ +static inline uint32_t comp_buffer_get_copy_frames + (struct comp_buffer *source, uint32_t source_frame_bytes, + struct comp_buffer *sink, uint32_t sink_frame_bytes) +{ + uint32_t copy_frames, src_avail_frames, sink_free_frames; + + src_avail_frames = source->avail / source_frame_bytes; + sink_free_frames = sink->free / sink_frame_bytes; + + /* Check that source has enough frames available and sink + * has enough free frames. + */ + copy_frames = src_avail_frames > sink_free_frames ? + sink_free_frames : src_avail_frames; + + return copy_frames; +} + static inline void buffer_reset_pos(struct comp_buffer *buffer) { buffer->r_ptr = buffer->addr; -- 2.11.0

2 1

[Sound-open-firmware] [PATCH] volume: fix frame bytes calculation.
by Liam Girdwood 16 Nov '17

16 Nov '17

Currently frame bytes is calculated as period bytes. Fix. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/audio/volume.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/audio/volume.c b/src/audio/volume.c index fb8d9e7..b6872a7 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -656,7 +656,7 @@ static int volume_prepare(struct comp_dev *dev) break; } - dev->frame_bytes = cd->sink_period_bytes; + dev->frame_bytes = cd->sink_period_bytes / dev->frames; /* set downstream buffer size */ ret = buffer_set_size(sinkb, cd->sink_period_bytes * -- 1.9.1

2 2

[Sound-open-firmware] [PATCH v3] intel-ipc: fix host ring buffer size not page aligned issue
by Keyon Jie 16 Nov '17

16 Nov '17

The host ring buffer size may be not page aligned, but the last page was utilized by host component wrongly, which may introduce beating noise. Here change to correct size for the last element, which will fix the issue. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/ipc/intel-ipc.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index 56bd8ba..e13b541 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -175,6 +175,17 @@ static int parse_page_descriptors(struct intel_ipc_data *iipc, host = (struct sof_ipc_comp_host *)&cd->comp; } + /* the ring size may be not multiple of the page size, the last + * page may be not full used. The used size should be in range + * of (ring->pages - 1, ring->pages] * PAGES. + */ + if ((ring->size <= HOST_PAGE_SIZE * (ring->pages - 1)) || + (ring->size > HOST_PAGE_SIZE * ring->pages)) { + /* error buffer size */ + trace_ipc_error("eBs"); + return -EINVAL; + } + for (i = 0; i < ring->pages; i++) { idx = (((i << 2) + i)) >> 1; @@ -192,6 +203,10 @@ static int parse_page_descriptors(struct intel_ipc_data *iipc, else elem.dest = phy_addr; + /* the last page may be not full used */ + if (i == (ring->pages - 1)) + elem.size = ring->size - HOST_PAGE_SIZE * i; + if (is_trace) err = dma_trace_host_buffer(d, &elem, ring->size); else -- 2.11.0

2 1

[Sound-open-firmware] [PATCH v2] intel-ipc: fix host ring buffer size not page aligned issue
by Keyon Jie 16 Nov '17

16 Nov '17

The host ring buffer size may be not page aligned, but the last page was utilized by host component wrongly, which may introduce beating noise. Here change to correct size for the last element, which will fix the issue. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/ipc/intel-ipc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index 56bd8ba..7de533a 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -175,6 +175,12 @@ static int parse_page_descriptors(struct intel_ipc_data *iipc, host = (struct sof_ipc_comp_host *)&cd->comp; } + if (HOST_PAGE_SIZE * ring->pages < ring->size) { + /* host side passed in error ring buffer size */ + trace_ipc_error("eBs"); + return -EINVAL; + } + for (i = 0; i < ring->pages; i++) { idx = (((i << 2) + i)) >> 1; @@ -192,6 +198,10 @@ static int parse_page_descriptors(struct intel_ipc_data *iipc, else elem.dest = phy_addr; + /* the last page may be not full used */ + if (i == (ring->pages - 1)) + elem.size = ring->size - HOST_PAGE_SIZE * i; + if (is_trace) err = dma_trace_host_buffer(d, &elem, ring->size); else -- 2.11.0

4 4

[Sound-open-firmware] [PATCH] ipc: buffer: Add HDA stream tag to stream parameters.
by Liam Girdwood 15 Nov '17

15 Nov '17

Add the HDA stream tag to the IPC stream parameters. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/include/uapi/ipc.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index 35c87eb..dc35035 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -359,6 +359,7 @@ struct sof_ipc_stream_params { enum sof_ipc_stream_direction direction; enum sof_ipc_frame frame_fmt; enum sof_ipc_buffer_format buffer_fmt; + uint32_t stream_tag; uint32_t rate; uint32_t channels; uint32_t sample_valid_bytes; -- 1.9.1

1 1

[Sound-open-firmware] [PATCH] scheduler: ignore the ignored tasks
by Keyon Jie 15 Nov '17

15 Nov '17

Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/lib/schedule.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/lib/schedule.c b/src/lib/schedule.c index ab0602b..942067c 100644 --- a/src/lib/schedule.c +++ b/src/lib/schedule.c @@ -120,6 +120,10 @@ static inline struct task *edf_get_next(uint64_t current, if (task->state != TASK_STATE_QUEUED) continue; + /* ignore the ignored tasks */ + if (task == ignore) + continue; + /* include the length of task in deadline calc */ deadline = task->deadline - task->max_rtime; -- 2.11.0

2 1

[Sound-open-firmware] [PATCH] Volume: Remove channels mapping via channel map array from volume control
by Seppo Ingalsuo 15 Nov '17

15 Nov '17

This patch removes the channel map table lookup from all volume control since it is not used by the SOF 1.0 driver. Instead of enum channel descriptors the channels are addressed with indices in 0..<number of channels -1> range. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo(a)linux.intel.com> --- src/audio/volume.c | 80 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 50 insertions(+), 30 deletions(-) diff --git a/src/audio/volume.c b/src/audio/volume.c index 415a853..fb8d9e7 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -53,6 +53,7 @@ #define VOL_RAMP_US 2000 #define VOL_RAMP_STEP (1 << 11) #define VOL_MAX (1 << 16) +#define VOL_MIN 0 /* * Simple volume control @@ -282,14 +283,14 @@ static const struct comp_func_map func_map[] = { /* synchronise host mmap() volume with real value */ static void vol_sync_host(struct comp_data *cd, uint32_t chan) { - int i; - if (cd->hvol == NULL) return; - for (i = 0; i < SOF_IPC_MAX_CHANNELS; i++) { - if (cd->hvol[i].channel == cd->chan[chan]) - cd->hvol[i].value = cd->volume[chan]; + if (chan < SOF_IPC_MAX_CHANNELS) + cd->hvol[chan].value = cd->volume[chan]; + else { + trace_volume_error("veh"); + tracev_value(chan); } } @@ -414,10 +415,20 @@ static int volume_params(struct comp_dev *dev) static inline void volume_set_chan(struct comp_dev *dev, int chan, uint32_t vol) { struct comp_data *cd = comp_get_drvdata(dev); + uint32_t v = vol; + + /* Limit received volume gain to MIN..MAX range before applying it. + * MAX is needed for now for the generic C gain arithmetics to prevent + * multiplication overflow with the 32 bit value. Non-zero MIN option + * can be useful to prevent totally muted small volume gain. + */ + if (v < VOL_MIN) + v = VOL_MIN; + + if (v > VOL_MAX) + v = VOL_MAX; - /* TODO: ignore vol of 0 atm - bad IPC */ - if (vol > 0 && vol <= VOL_MAX) - cd->tvolume[chan] = vol; + cd->tvolume[chan] = v; } static inline void volume_set_chan_mute(struct comp_dev *dev, int chan) @@ -450,12 +461,16 @@ static int volume_ctrl_set_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *c switch (cdata->cmd) { case SOF_CTRL_CMD_VOLUME: trace_volume("vst"); - for (i = 0; i < SOF_IPC_MAX_CHANNELS; i++) { - for (j = 0; j < cdata->num_elems; j++) { - tracev_value(cdata->chanv[j].channel); - tracev_value(cdata->chanv[j].value); - if (cdata->chanv[j].channel == cd->chan[i]) - volume_set_chan(dev, i, cdata->chanv[j].value); + 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); @@ -463,16 +478,19 @@ static int volume_ctrl_set_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *c case SOF_CTRL_CMD_SWITCH: trace_volume("mst"); - for (i = 0; i < SOF_IPC_MAX_CHANNELS; i++) { - for (j = 0; j < cdata->num_elems; j++) { - tracev_value(cdata->chanv[j].channel); - tracev_value(cdata->chanv[j].value); - if (cdata->chanv[j].channel == cd->chan[i]) { - if (cdata->chanv[j].value) - volume_set_chan_unmute(dev, i); - else - volume_set_chan_mute(dev, i); - } + 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); } } work_schedule_default(&cd->volwork, VOL_RAMP_US); @@ -489,21 +507,23 @@ static int volume_ctrl_set_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *c static int volume_ctrl_get_cmd(struct comp_dev *dev, struct sof_ipc_ctrl_data *cdata) { struct comp_data *cd = comp_get_drvdata(dev); - int i; int j; /* validate */ if (cdata->num_elems == 0 || cdata->num_elems >= SOF_IPC_MAX_CHANNELS) { trace_volume_error("gc0"); + tracev_value(cdata->num_elems); return -EINVAL; } if (cdata->cmd == SOF_CTRL_CMD_VOLUME) { - for (i = 0; i < cdata->num_elems; i++) { - for (j = 0; j < cdata->num_elems; j++) { - if (cdata->chanv[j].value == cd->chan[i]) - cdata->chanv[j].value = cd->tvolume[i]; - } + trace_volume("vgt"); + trace_value(cdata->comp_id); + for (j = 0; j < cdata->num_elems; j++) { + cdata->chanv[j].channel = j; + cdata->chanv[j].value = cd->tvolume[j]; + trace_value(cdata->chanv[j].channel); + trace_value(cdata->chanv[j].value); } } else { trace_volume_error("ec2"); -- 2.11.0

3 3

[Sound-open-firmware] [PATCH] ssp: clean-up register setup
by Pierre-Louis Bossart 15 Nov '17

15 Nov '17

Clean-up register configurations for SSCR0..5, SSPSP, SFIFOTT The results are ok in I2S and LEFT_J 24 bits Tested with RT5645 and DA7212 TODO: 1. fix 16 bit issue (right channel lost) 2. test DSP modes 3. connect SSP and DMA watermarks Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- src/drivers/ssp.c | 264 ++++++++++++++++++++++++++++++++++++++++++------- src/include/reef/ssp.h | 40 ++++++-- 2 files changed, 259 insertions(+), 45 deletions(-) diff --git a/src/drivers/ssp.c b/src/drivers/ssp.c index 9eb4934..0ed570c 100644 --- a/src/drivers/ssp.c +++ b/src/drivers/ssp.c @@ -30,6 +30,7 @@ */ #include <errno.h> +#include <stdbool.h> #include <reef/stream.h> #include <reef/ssp.h> #include <reef/alloc.h> @@ -40,6 +41,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) { @@ -47,6 +61,8 @@ static int ssp_context_store(struct dai *dai) ssp->sscr0 = ssp_read(dai, SSCR0); ssp->sscr1 = ssp_read(dai, SSCR1); + + /* FIXME: need to store sscr2,3,4,5 */ ssp->psp = ssp_read(dai, SSPSP); return 0; @@ -59,6 +75,7 @@ static int ssp_context_restore(struct dai *dai) ssp_write(dai, SSCR0, ssp->sscr0); ssp_write(dai, SSCR1, ssp->sscr1); + /* FIXME: need to restore sscr2,3,4,5 */ ssp_write(dai, SSPSP, ssp->psp); return 0; @@ -73,12 +90,20 @@ static inline int ssp_set_config(struct dai *dai, uint32_t sscr1; uint32_t sscr2; uint32_t sscr3; + uint32_t sscr4; + uint32_t sscr5; uint32_t sspsp; uint32_t sfifott; uint32_t mdiv; uint32_t bdiv; uint32_t data_size; + uint32_t start_delay; + uint32_t active_tx_slots = 2; + uint32_t active_rx_slots = 2; uint32_t frame_len = 0; + bool inverted_frame = false; + bool cfs = false; + bool cbs = false; int ret = 0; spin_lock(&ssp->lock); @@ -94,34 +119,98 @@ static inline int ssp_set_config(struct dai *dai, trace_ssp("cos"); /* reset SSP settings */ - sscr0 = SSCR0_RIM | SSCR0_TIM; - sscr1 = SSCR1_PINTE | SSCR1_RWOT; - sscr2 = 0x1c1; - sscr3 = 0x2c018; - sspsp = 0; + /* sscr0 dynamic settings are DSS, EDSS, SCR, FRDC, ECS */ + /* + * FIXME: MOD, ACS, NCS are not set, + * no support for network mode for now + */ + sscr0 = SSCR0_PSP | SSCR0_RIM | SSCR0_TIM; + + /* + * FIXME: PINTE and RWOT are not set in sscr1 + * sscr1 = SSCR1_PINTE | SSCR1_RWOT; + */ + + /* sscr1 dynamic settings are TFT, RFT, SFRMDIR, SCLKDIR, SCFR */ + sscr1 = SSCR1_TTE; +#ifdef ENABLE_TIE_RIE /* FIXME: not enabled, difference with SST driver */ + sscr1 |= SSCR1_TIE | SSCR1_RIE; +#endif + + /* sscr2 dynamic setting is SLV_EXT_CLK_RUN_EN */ + sscr2 = SSCR2_URUN_FIX0; + sscr2 |= SSCR2_ASRC_INTR_MASK; +#ifdef ENABLE_SSCR2_FIXES /* FIXME: is this needed ? */ + sscr2 |= SSCR2_UNDRN_FIX_EN | SSCR2_FIFO_EMPTY_FIX_EN; +#endif + + + /* + * sscr3 dynamic settings are FRM_MS_EN, I2S_MODE_EN, I2S_FRM_POL, + * I2S_TX_EN, I2S_RX_EN, I2S_CLK_MST + */ + sscr3 = SSCR3_I2S_TX_SS_FIX_EN | SSCR3_I2S_RX_SS_FIX_EN | + SSCR3_STRETCH_TX | SSCR3_STRETCH_RX | + SSCR3_SYN_FIX_EN; +#ifdef ENABLE_CLK_EDGE_SEL /* FIXME: is this needed ? */ + sscr3 |= SSCR3_CLK_EDGE_SEL; +#endif + + /* sscr4 dynamic settings is TOT_FRAME_PRD */ + sscr4 = 0x0; + + /* sscr4 dynamic settings are FRM_ASRT_CLOCKS and FRM_POLARITY */ + sscr5 = 0x0; + + /* sspsp dynamic settings are SCMODE, SFRMP, DMYSTRT, SFRMWDTH */ + sspsp = SSPSP_ETDS; /* make sure SDO line is tri-stated when inactive */ ssp->config = *config; ssp->params = config->ssp[0]; - /* TODO: allow topology to define SSP clock type */ - config->ssp[0].clk_id = SSP_CLK_EXT; - /* clock masters */ + /* + * On TNG/BYT/CHT, the SSP wrapper generates the fs even in master mode, + * the master/slave choice depends on the clock type + */ + sscr1 |= SSCR1_SFRMDIR; + switch (config->format & SOF_DAI_FMT_MASTER_MASK) { case SOF_DAI_FMT_CBM_CFM: - sscr1 |= SSCR1_SCLKDIR | SSCR1_SFRMDIR; + sscr0 |= SSCR0_ECS; /* external clock used */ + sscr1 |= SSCR1_SCLKDIR; + /* + * FIXME: does SSRC1.SCFR need to be set + * when codec is master ? + */ + sscr2 |= SSCR2_SLV_EXT_CLK_RUN_EN; break; case SOF_DAI_FMT_CBS_CFS: +#ifdef ENABLE_SSRCR1_SCFR /* FIXME: is this needed ? */ sscr1 |= SSCR1_SCFR; - sscr3 |= SSCR3_I2S_FRM_MST | SSCR3_I2S_CLK_MST; +#endif + sscr3 |= SSCR3_FRM_MST_EN; + cfs = true; + cbs = true; break; case SOF_DAI_FMT_CBM_CFS: - sscr1 |= SSCR1_SFRMDIR; + sscr0 |= SSCR0_ECS; /* external clock used */ + sscr1 |= SSCR1_SCLKDIR; + /* + * FIXME: does SSRC1.SCFR need to be set + * when codec is master ? + */ + sscr2 |= SSCR2_SLV_EXT_CLK_RUN_EN; + sscr3 |= SSCR3_FRM_MST_EN; + cfs = true; + /* FIXME: this mode has not been tested */ break; case SOF_DAI_FMT_CBS_CFM: - sscr1 |= SSCR1_SCLKDIR | SSCR1_SFRMDIR | SSCR1_SCFR; - break; - case SSP_CLK_DEFAULT: +#ifdef ENABLE_SSRCR1_SCFR /* FIXME: is this needed ? */ + sscr1 |= SSCR1_SCFR; +#endif + /* FIXME: this mode has not been tested */ + cbs = true; break; default: trace_ssp_error("ec2"); @@ -137,9 +226,11 @@ static inline int ssp_set_config(struct dai *dai, break; case SOF_DAI_FMT_IB_IF: sspsp |= SSPSP_SCMODE(2); + inverted_frame = true; /* handled later with format */ break; case SOF_DAI_FMT_IB_NF: - sspsp |= SSPSP_SCMODE(2) | SSPSP_SFRMP; + sspsp |= SSPSP_SCMODE(2); + inverted_frame = true; /* handled later with format */ break; default: trace_ssp_error("ec3"); @@ -147,6 +238,10 @@ static inline int ssp_set_config(struct dai *dai, goto out; } +#ifdef CLK_TYPE /* not enabled, keep the code for reference */ + /* TODO: allow topology to define SSP clock type */ + config->ssp[0].clk_id = SSP_CLK_EXT; + /* clock source */ switch (config->ssp[0].clk_id) { case SSP_CLK_AUDIO: @@ -166,6 +261,7 @@ static inline int ssp_set_config(struct dai *dai, ret = -EINVAL; goto out; } +#endif /* BCLK is generated from MCLK - must be divisable */ if (config->mclk % config->bclk) { @@ -211,20 +307,118 @@ static inline int ssp_set_config(struct dai *dai, switch (config->format & SOF_DAI_FMT_FORMAT_MASK) { case SOF_DAI_FMT_I2S: + start_delay = 1; + /* enable I2S mode */ - sscr3 |= SSCR3_I2S_ENA | SSCR3_I2S_TX_ENA | SSCR3_I2S_RX_ENA; - sscr0 |= SSCR0_PSP; + sscr3 |= SSCR3_I2S_MODE_EN | SSCR3_I2S_TX_EN | SSCR3_I2S_RX_EN; + + /* set asserted frame length */ + frame_len = config->sample_container_bits; + + /* handle frame polarity, I2S default is falling/active low */ + sspsp |= SSPSP_SFRMP(!inverted_frame); + sscr3 |= SSCR3_I2S_FRM_POL(!inverted_frame); + + if (cbs) { + /* + * keep RX functioning on a TX underflow + * (I2S/LEFT_J master only) + */ + sscr3 |= SSCR3_MST_CLK_EN; + + /* + * total frame period (both asserted and + * deasserted time of frame + */ + sscr4 |= SSCR4_TOT_FRM_PRD(frame_len << 1); + } + + break; + + case SOF_DAI_FMT_LEFT_J: + + start_delay = 0; + + /* apparently we need the same initialization as for I2S */ + sscr3 |= SSCR3_I2S_MODE_EN | SSCR3_I2S_TX_EN | SSCR3_I2S_RX_EN; /* set asserted frame length */ frame_len = config->sample_container_bits; + + /* LEFT_J default is rising/active high, opposite of I2S */ + sspsp |= SSPSP_SFRMP(inverted_frame); + sscr3 |= SSCR3_I2S_FRM_POL(inverted_frame); + + if (cbs) { + /* + * keep RX functioning on a TX underflow + * (I2S/LEFT_J master only) + */ + sscr3 |= SSCR3_MST_CLK_EN; + + /* + * total frame period (both asserted and + * deasserted time of frame + */ + sscr4 |= SSCR4_TOT_FRM_PRD(frame_len << 1); + } + break; case SOF_DAI_FMT_DSP_A: - sscr0 |= SSCR0_PSP | SSCR0_MOD | SSCR0_FRDC(config->num_slots); - sspsp |= SSPSP_SFRMWDTH(1) | SSPSP_SFRMDLY(2); + + start_delay = 1; + + sscr0 |= SSCR0_MOD | SSCR0_FRDC(config->num_slots); + + /* set asserted frame length */ + frame_len = 1; + + /* handle frame polarity, DSP_A default is rising/active high */ + sspsp |= SSPSP_SFRMP(inverted_frame); + if (cfs) { + /* set sscr frame polarity in DSP/master mode only */ + sscr5 |= SSCR5_FRM_POLARITY(inverted_frame); + } + + /* + * total frame period (both asserted and + * deasserted time of frame) + */ + if (cbs) + sscr4 |= SSCR4_TOT_FRM_PRD(config->num_slots * + config->sample_container_bits); + + 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: - sscr0 |= SSCR0_PSP | SSCR0_MOD | SSCR0_FRDC(config->num_slots); - sspsp |= SSPSP_SFRMWDTH(1); + + start_delay = 0; + + sscr0 |= SSCR0_MOD | SSCR0_FRDC(config->num_slots); + + /* set asserted frame length */ + frame_len = 1; + + /* handle frame polarity, DSP_A default is rising/active high */ + sspsp |= SSPSP_SFRMP(inverted_frame); + if (cfs) { + /* set sscr frame polarity in DSP/master mode only */ + sscr5 |= SSCR5_FRM_POLARITY(inverted_frame); + } + + /* + * total frame period (both asserted and + * deasserted time of frame + */ + if (cbs) + sscr4 |= SSCR4_TOT_FRM_PRD(config->num_slots * + config->sample_container_bits); + + active_tx_slots = hweight_32(config->tx_slot_mask); + active_rx_slots = hweight_32(config->rx_slot_mask); + break; default: trace_ssp_error("eca"); @@ -232,35 +426,35 @@ static inline int ssp_set_config(struct dai *dai, goto out; } - /* set frame length and slot mask in I2s & PCM modes */ - ssp_write(dai, SSCR4, - SSCR4_FRM_CLOCKS(config->sample_container_bits << 1)); - ssp_write(dai, SSCR5, SSCR5_FRM_ASRT_CLOCKS(frame_len)); - ssp_write(dai, SSTSA, config->tx_slot_mask); - ssp_write(dai, SSRSA, config->rx_slot_mask); + sspsp |= SSPSP_DMYSTRT(start_delay); + sspsp |= SSPSP_SFRMWDTH(frame_len); + sscr5 |= SSCR5_FRM_ASRT_CLOCKS(frame_len); - /* sample data size on SSP FIFO */ - if (config->sample_valid_bits == 16) - /* 2 * 16bit packed into 32bit FIFO */ - data_size = 32; - else - data_size = config->sample_container_bits; + data_size = config->sample_valid_bits; if (data_size > 16) sscr0 |= (SSCR0_EDSS | SSCR0_DSIZE(data_size - 16)); else sscr0 |= SSCR0_DSIZE(data_size); - /* watermarks - (RFT + 1) should equal DMA SRC_MSIZE */ - sfifott = (SFIFOTT_TX(4) | SFIFOTT_RX(12)); + /* FIXME: + * watermarks - (RFT + 1) should equal DMA SRC_MSIZE + */ + sfifott = (SFIFOTT_TX(2*active_tx_slots) | + SFIFOTT_RX(2*active_rx_slots)); trace_ssp("coe"); + ssp_write(dai, SSCR0, sscr0); ssp_write(dai, SSCR1, sscr1); ssp_write(dai, SSCR2, sscr2); ssp_write(dai, SSCR3, sscr3); + ssp_write(dai, SSCR4, sscr4); + ssp_write(dai, SSCR5, sscr5); ssp_write(dai, SSPSP, sspsp); ssp_write(dai, SFIFOTT, sfifott); + ssp_write(dai, SSTSA, config->tx_slot_mask); + ssp_write(dai, SSRSA, config->rx_slot_mask); ssp->state[DAI_DIR_PLAYBACK] = COMP_STATE_PREPARE; ssp->state[DAI_DIR_CAPTURE] = COMP_STATE_PREPARE; diff --git a/src/include/reef/ssp.h b/src/include/reef/ssp.h index e3da690..c00d14c 100644 --- a/src/include/reef/ssp.h +++ b/src/include/reef/ssp.h @@ -91,9 +91,9 @@ extern const struct dai_ops ssp_ops; #define SSCR1_SPH (1 << 4) #define SSCR1_MWDS (1 << 5) #define SSCR1_TFT_MASK (0x000003c0) -#define SSCR1_TX(x) (((x) - 1) << 6) +#define SSCR1_TFT(x) (((x) - 1) << 6) #define SSCR1_RFT_MASK (0x00003c00) -#define SSCR1_RX(x) (((x) - 1) << 10) +#define SSCR1_RFT(x) (((x) - 1) << 10) #define SSCR1_EFWR (1 << 14) #define SSCR1_STRF (1 << 15) #define SSCR1_IFS (1 << 16) @@ -112,6 +112,18 @@ extern const struct dai_ops ssp_ops; #define SSCR1_TTE (1 << 30) #define SSCR1_TTELP (1 << 31) +/* SSCR2 bits */ +#define SSCR2_URUN_FIX0 (1 << 0) +#define SSCR2_URUN_FIX1 (1 << 1) +#define SSCR2_SLV_EXT_CLK_RUN_EN (1 << 2) +#define SSCR2_CLK_DEL_EN (1 << 3) +#define SSCR2_UNDRN_FIX_EN (1 << 6) +#define SSCR2_FIFO_EMPTY_FIX_EN (1 << 7) +#define SSCR2_ASRC_CNTR_EN (1 << 8) +#define SSCR2_ASRC_CNTR_CLR (1 << 9) +#define SSCR2_ASRC_FRM_CNRT_EN (1 << 10) +#define SSCR2_ASRC_INTR_MASK (1 << 11) + /* SSR bits */ #define SSSR_TNF (1 << 2) #define SSSR_RNE (1 << 3) @@ -122,7 +134,7 @@ extern const struct dai_ops ssp_ops; /* SSPSP bits */ #define SSPSP_SCMODE(x) ((x) << 0) -#define SSPSP_SFRMP (1 << 2) +#define SSPSP_SFRMP(x) ((x) << 2) #define SSPSP_ETDS (1 << 3) #define SSPSP_STRTDLY(x) ((x) << 4) #define SSPSP_DMYSTRT(x) ((x) << 7) @@ -132,18 +144,26 @@ extern const struct dai_ops ssp_ops; #define SSPSP_FSRT (1 << 25) /* SSCR3 bits */ -#define SSCR3_I2S_FRM_MST (1 << 0) -#define SSCR3_I2S_ENA (1 << 1) -#define SSCR3_I2S_FRM_POL (1 << 2) -#define SSCR3_I2S_TX_ENA (1 << 9) -#define SSCR3_I2S_RX_ENA (1 << 10) -#define SSCR3_I2S_CLK_MST (1 << 16) +#define SSCR3_FRM_MST_EN (1 << 0) +#define SSCR3_I2S_MODE_EN (1 << 1) +#define SSCR3_I2S_FRM_POL(x) ((x) << 2) +#define SSCR3_I2S_TX_SS_FIX_EN (1 << 3) +#define SSCR3_I2S_RX_SS_FIX_EN (1 << 4) +#define SSCR3_I2S_TX_EN (1 << 9) +#define SSCR3_I2S_RX_EN (1 << 10) +#define SSCR3_CLK_EDGE_SEL (1 << 12) +#define SSCR3_STRETCH_TX (1 << 14) +#define SSCR3_STRETCH_RX (1 << 15) +#define SSCR3_MST_CLK_EN (1 << 16) +#define SSCR3_SYN_FIX_EN (1 << 17) + /* SSCR4 bits */ -#define SSCR4_FRM_CLOCKS(x) ((x) << 7) +#define SSCR4_TOT_FRM_PRD(x) ((x) << 7) /* SSCR5 bits */ #define SSCR5_FRM_ASRT_CLOCKS(x) (((x) - 1) << 1) +#define SSCR5_FRM_POLARITY(x) ((x) << 0) /* SFIFOTT bits */ #define SFIFOTT_TX(x) ((x) - 1) -- 2.14.1

2 1

[Sound-open-firmware] [PATCH] intel-ipc: fix host ring buffer size not page aligned issue
by Keyon Jie 15 Nov '17

15 Nov '17

The host ring buffer size may be not page aligned, but the last page was ulitlized by host component wrongly, which may introduce beating noise. Here change to correct size for the last element, which will fix the issue. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- src/ipc/intel-ipc.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index 56bd8ba..2e503e1 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -192,6 +192,17 @@ static int parse_page_descriptors(struct intel_ipc_data *iipc, else elem.dest = phy_addr; + if (elem.size * (i + 1) >= ring->size) { + /* the last page may be not full used */ + if (i == (ring->pages - 1)) + elem.size = ring->size - elem.size * i; + else { + trace_ipc_error("eBs"); + /* should not happen*/ + return -EINVAL; + } + } + if (is_trace) err = dma_trace_host_buffer(d, &elem, ring->size); else -- 2.11.0

3 2

[Sound-open-firmware] [PATCH] pipeline: remove preloader.
by Liam Girdwood 11 Nov '17

11 Nov '17

preloader can cause some out of order pipeline periods and timestamps wrt to host so remove. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- src/audio/pipeline.c | 63 ---------------------------------------------------- 1 file changed, 63 deletions(-) diff --git a/src/audio/pipeline.c b/src/audio/pipeline.c index 61d80b4..2b6f59e 100644 --- a/src/audio/pipeline.c +++ b/src/audio/pipeline.c @@ -478,57 +478,11 @@ static int component_op_upstream(struct op_data *op_data, return err; } -/* preload all downstream components - locks held by caller */ -static int preload_downstream(struct comp_dev *start, struct comp_dev *current) -{ - struct sof_ipc_comp_config *config = COMP_GET_CONFIG(current); - struct list_item *clist; - int i; - int total = 0; - int count = 0; - - tracev_pipe("PR-"); - tracev_value(current->comp.id); - - /* reached endpoint ? */ - if (current != start && current->is_endpoint) - return 0; - - /* now preload the buffers */ - for (i = 0; i < config->preload_count; i++) { - count = comp_preload(current); - - if (count < 0) - return count; - total += count; - } - - /* now run this operation downstream */ - list_for_item(clist, &current->bsink_list) { - struct comp_buffer *buffer; - - buffer = container_of(clist, struct comp_buffer, source_list); - - /* don't go downstream if this component is not connected */ - if (!buffer->connected) - continue; - - count = preload_downstream(start, buffer->sink); - if (count < 0) - return count; - - total += count; - } - - return total; -} - /* prepare the pipeline for usage - preload host buffers here */ int pipeline_prepare(struct pipeline *p, struct comp_dev *dev) { struct op_data op_data; int ret = -1; - int i; trace_pipe("pre"); @@ -540,27 +494,10 @@ int pipeline_prepare(struct pipeline *p, struct comp_dev *dev) /* playback pipelines can be preloaded from host before trigger */ if (dev->params.direction == SOF_IPC_STREAM_PLAYBACK) { - /* first of all prepare the pipeline */ ret = component_op_downstream(&op_data, dev, dev, NULL); if (ret < 0) goto out; - /* then preload buffers - the buffers must be moved - * downstream so that every component has full buffers for - * trigger start */ - for (i = 0; i < MAX_PRELOAD_SIZE; i++) { - - ret = preload_downstream(dev, dev); - - /* errors or complete ? */ - if (ret <= 0) - break; - } - if (ret < 0) { - /* failed to preload */ - trace_pipe_error("epl"); - ret = -EIO; - } } else { ret = component_op_upstream(&op_data, dev, dev, NULL); } -- 2.11.0

1 2

[Sound-open-firmware] [PATCH] sof: fix spelling mistakes in comments
by Pierre-Louis Bossart 10 Nov '17

10 Nov '17

M-x ispell-comments-and-strings :set spell spelllang=en_us Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- src/audio/dai.c | 4 ++-- src/audio/eq_iir.c | 4 ++-- src/audio/host.c | 4 ++-- src/audio/mixer.c | 4 ++-- src/audio/mux.c | 2 +- src/audio/pipeline.c | 48 +++++++++++++++++++------------------- src/audio/pipeline_static.c | 2 +- src/audio/src.c | 8 +++---- src/audio/src_core.c | 4 ++-- src/audio/switch.c | 2 +- src/audio/tone.c | 4 ++-- src/audio/volume.c | 2 +- src/include/reef/audio/buffer.h | 2 +- src/include/reef/audio/component.h | 12 +++++----- src/include/reef/debug.h | 2 +- src/include/reef/dma.h | 2 +- src/include/reef/trace.h | 2 +- src/include/reef/wait.h | 2 +- src/ipc/byt-ipc.c | 2 +- src/ipc/dma-copy.c | 2 +- src/ipc/intel-ipc.c | 2 +- src/ipc/ipc.c | 2 +- src/lib/alloc.c | 8 +++---- src/lib/work.c | 2 +- src/platform/baytrail/clk.c | 4 ++-- src/platform/baytrail/platform.c | 2 +- src/platform/baytrail/timer.c | 12 +++++----- 27 files changed, 73 insertions(+), 73 deletions(-) diff --git a/src/audio/dai.c b/src/audio/dai.c index 36671fe..4d3f0b7 100644 --- a/src/audio/dai.c +++ b/src/audio/dai.c @@ -136,7 +136,7 @@ static void dai_dma_cb(void *data, uint32_t type, struct dma_sg_elem *next) } } - /* notify pipeline that DAI needs it's buffer processed */ + /* notify pipeline that DAI needs its buffer processed */ pipeline_schedule_copy(dev->pipeline, 0); return; @@ -455,7 +455,7 @@ static int dai_reset(struct comp_dev *dev) return 0; } -/* used to pass standard and bespoke commandd (with data) to component */ +/* used to pass standard and bespoke command (with data) to component */ static int dai_cmd(struct comp_dev *dev, int cmd, void *data) { struct dai_data *dd = comp_get_drvdata(dev); diff --git a/src/audio/eq_iir.c b/src/audio/eq_iir.c index 88382fe..1c2389c 100644 --- a/src/audio/eq_iir.c +++ b/src/audio/eq_iir.c @@ -175,7 +175,7 @@ static int eq_iir_setup(struct iir_state_df2t iir[], || (config->channels_in_config > PLATFORM_MAX_CHANNELS)) return -EINVAL; - /* Collect index of respose start positions in all_coefficients[] */ + /* Collect index of response start positions in all_coefficients[] */ j = 0; assign_response = &config->data[0]; coef_data = &config->data[config->channels_in_config]; @@ -234,7 +234,7 @@ static int eq_iir_switch_response(struct iir_state_df2t iir[], { int ret; - /* Copy assign response from update and re-initilize EQ */ + /* Copy assign response from update and re-initialize EQ */ if ((config == NULL) || (ch >= PLATFORM_MAX_CHANNELS)) return -EINVAL; diff --git a/src/audio/host.c b/src/audio/host.c index 3c77aca..aa608e7 100644 --- a/src/audio/host.c +++ b/src/audio/host.c @@ -70,10 +70,10 @@ struct host_data { struct hc_buf host; struct hc_buf local; uint32_t host_size; - /* host possition reporting related */ + /* host position reporting related */ volatile uint32_t *host_pos; /* read/write pos, update to mailbox for host side */ uint32_t report_pos; /* position in current report period */ - uint32_t local_pos; /* the host side buffer local read/write possition, in bytes */ + uint32_t local_pos; /* the host side buffer local read/write position, in bytes */ /* pointers set during params to host or local above */ struct hc_buf *source; struct hc_buf *sink; diff --git a/src/audio/mixer.c b/src/audio/mixer.c index 41f1d88..4d50bf1 100644 --- a/src/audio/mixer.c +++ b/src/audio/mixer.c @@ -239,7 +239,7 @@ static int mixer_copy(struct comp_dev *dev) return 0; } - /* dont have any work if all sources are inactive */ + /* don't have any work if all sources are inactive */ if (num_mix_sources == 0) return 0; @@ -255,7 +255,7 @@ static int mixer_copy(struct comp_dev *dev) if (xru) return 0; - /* make sure sink has no overuns */ + /* make sure sink has no overruns */ sink = list_first_item(&dev->bsink_list, struct comp_buffer, source_list); if (sink->free < md->period_bytes) { comp_overrun(dev, sink, sink->free, md->period_bytes); diff --git a/src/audio/mux.c b/src/audio/mux.c index f420bd3..ff6ad7c 100644 --- a/src/audio/mux.c +++ b/src/audio/mux.c @@ -52,7 +52,7 @@ static void mux_free(struct comp_dev *dev) } -/* set component audio stream paramters */ +/* set component audio stream parameters */ static int mux_params(struct comp_dev *dev) { diff --git a/src/audio/pipeline.c b/src/audio/pipeline.c index 0ef971e..61d80b4 100644 --- a/src/audio/pipeline.c +++ b/src/audio/pipeline.c @@ -85,7 +85,7 @@ static void connect_upstream(struct pipeline *p, struct comp_dev *start, buffer = container_of(clist, struct comp_buffer, sink_list); - /* dont go upstream if this source is from another pipeline */ + /* don't go upstream if this source is from another pipeline */ if (buffer->source->comp.pipeline_id != p->ipc_pipe.pipeline_id) continue; @@ -117,7 +117,7 @@ static void connect_downstream(struct pipeline *p, struct comp_dev *start, buffer = container_of(clist, struct comp_buffer, source_list); - /* dont go downstream if this sink is from another pipeline */ + /* don't go downstream if this sink is from another pipeline */ if (buffer->sink->comp.pipeline_id != p->ipc_pipe.pipeline_id) continue; @@ -142,14 +142,14 @@ static void disconnect_upstream(struct pipeline *p, struct comp_dev *start, buffer = container_of(clist, struct comp_buffer, sink_list); - /* dont go upstream if this source is from another pipeline */ + /* don't go upstream if this source is from another pipeline */ if (buffer->source->comp.pipeline_id != p->ipc_pipe.pipeline_id) continue; connect_upstream(p, start, buffer->source); } - /* diconnect source from buffer */ + /* disconnect source from buffer */ spin_lock(&current->lock); list_item_del(&current->bsource_list); spin_unlock(&current->lock); @@ -171,14 +171,14 @@ static void disconnect_downstream(struct pipeline *p, struct comp_dev *start, buffer = container_of(clist, struct comp_buffer, source_list); - /* dont go downstream if this sink is from another pipeline */ + /* don't go downstream if this sink is from another pipeline */ if (buffer->sink->comp.pipeline_id != p->ipc_pipe.pipeline_id) continue; connect_downstream(p, start, buffer->sink); } - /* diconnect source from buffer */ + /* disconnect source from buffer */ spin_lock(&current->lock); list_item_del(&current->bsink_list); spin_unlock(&current->lock); @@ -273,7 +273,7 @@ int pipeline_complete(struct pipeline *p) trace_pipe("com"); trace_value(p->ipc_pipe.pipeline_id); - /* cheeck whether pipeline is already complete */ + /* check whether pipeline is already complete */ if (p->status != COMP_STATE_INIT) { trace_pipe_error("epc"); return -EINVAL; @@ -342,7 +342,7 @@ static int component_op_downstream(struct op_data *op_data, switch (op_data->op) { case COMP_OPS_PARAMS: - /* dont do any params downstream if current is running */ + /* don't do any params downstream if current is running */ if (current->state == COMP_STATE_ACTIVE) return 0; @@ -373,7 +373,7 @@ static int component_op_downstream(struct op_data *op_data, return -EINVAL; } - /* dont walk the graph any further if this component fails */ + /* don't walk the graph any further if this component fails */ if (err < 0) { trace_pipe_error("eOp"); return err; @@ -391,7 +391,7 @@ static int component_op_downstream(struct op_data *op_data, buffer = container_of(clist, struct comp_buffer, source_list); - /* dont go downstream if this component is not connected */ + /* don't go downstream if this component is not connected */ if (!buffer->connected) continue; @@ -419,7 +419,7 @@ static int component_op_upstream(struct op_data *op_data, switch (op_data->op) { case COMP_OPS_PARAMS: - /* dont do any params upstream if current is running */ + /* don't do any params upstream if current is running */ if (current->state == COMP_STATE_ACTIVE) return 0; @@ -450,7 +450,7 @@ static int component_op_upstream(struct op_data *op_data, return -EINVAL; } - /* dont walk the graph any further if this component fails */ + /* don't walk the graph any further if this component fails */ if (err < 0) { trace_pipe_error("eOp"); return err; @@ -465,7 +465,7 @@ static int component_op_upstream(struct op_data *op_data, buffer = container_of(clist, struct comp_buffer, sink_list); - /* dont go upstream if this component is not connected */ + /* don't go upstream if this component is not connected */ if (!buffer->connected) continue; @@ -509,7 +509,7 @@ static int preload_downstream(struct comp_dev *start, struct comp_dev *current) buffer = container_of(clist, struct comp_buffer, source_list); - /* dont go downstream if this component is not connected */ + /* don't go downstream if this component is not connected */ if (!buffer->connected) continue; @@ -707,11 +707,11 @@ static int pipeline_copy_from_upstream(struct comp_dev *start, buffer = container_of(clist, struct comp_buffer, sink_list); - /* dont go upstream if this component is not connected */ + /* don't go upstream if this component is not connected */ if (!buffer->connected || buffer->source->state != COMP_STATE_ACTIVE) continue; - /* dont go upstream if this source is from another pipeline */ + /* don't go upstream if this source is from another pipeline */ if (buffer->source->pipeline != current->pipeline) continue; @@ -765,11 +765,11 @@ static int pipeline_copy_to_downstream(struct comp_dev *start, buffer = container_of(clist, struct comp_buffer, source_list); - /* dont go downstream if this component is not connected */ + /* don't go downstream if this component is not connected */ if (!buffer->connected || buffer->sink->state != COMP_STATE_ACTIVE) continue; - /* dont go downstream if this sink is from another pipeline */ + /* don't go downstream if this sink is from another pipeline */ if (buffer->sink->pipeline != current->pipeline) continue; @@ -813,7 +813,7 @@ downstream: buffer = container_of(clist, struct comp_buffer, source_list); - /* dont go downstream if this component is not connected */ + /* don't go downstream if this component is not connected */ if (!buffer->connected || buffer->sink->state != COMP_STATE_ACTIVE) continue; @@ -856,7 +856,7 @@ upstream: buffer = container_of(clist, struct comp_buffer, sink_list); - /* dont go downstream if this component is not connected */ + /* don't go downstream if this component is not connected */ if (!buffer->connected || buffer->source->state != COMP_STATE_ACTIVE) continue; @@ -913,7 +913,7 @@ static void pipeline_for_each_downstream(struct pipeline *p, buffer = container_of(clist, struct comp_buffer, source_list); - /* dont go downstream if this component is not connected */ + /* don't go downstream if this component is not connected */ if (!buffer->connected) continue; @@ -939,7 +939,7 @@ static void pipeline_for_each_upstream(struct pipeline *p, buffer = container_of(clist, struct comp_buffer, sink_list); - /* dont go downstream if this component is not connected */ + /* don't go downstream if this component is not connected */ if (!buffer->connected) continue; @@ -957,7 +957,7 @@ void pipeline_xrun(struct pipeline *p, struct comp_dev *dev, { struct sof_ipc_stream_posn posn; - /* dont flood host */ + /* don't flood host */ if (p->xrun_bytes) return; @@ -995,7 +995,7 @@ static void pipeline_task(void *arg) tracev_pipe("PWs"); - /* copy data from upstream source enpoints to downstream endpoints */ + /* copy data from upstream source endpoints to downstream endpoints */ pipeline_copy_from_upstream(dev, dev); pipeline_copy_to_downstream(dev, dev); diff --git a/src/audio/pipeline_static.c b/src/audio/pipeline_static.c index 88d52f2..7812dad 100644 --- a/src/audio/pipeline_static.c +++ b/src/audio/pipeline_static.c @@ -382,7 +382,7 @@ int init_static_pipeline(struct ipc *ipc) /* register components for this pipeline */ for (j = 0; j < spipe[i].num_scomps; j++) { - /* all pipeline componnets have same header */ + /* all pipeline components have same header */ c = sc[j].comps; for (k = 0; k < sc[j].num_comps; k++) { diff --git a/src/audio/src.c b/src/audio/src.c index 9fe81d3..d71a27a 100644 --- a/src/audio/src.c +++ b/src/audio/src.c @@ -382,7 +382,7 @@ static int src_params(struct comp_dev *dev) return -EINVAL; } - /* free any existing dalay lines. TODO reuse if same size */ + /* free any existing delay lines. TODO reuse if same size */ if (cd->delay_lines != NULL) rfree(cd->delay_lines); @@ -397,7 +397,7 @@ static int src_params(struct comp_dev *dev) memset(cd->delay_lines, 0, delay_lines_size); buffer_start = cd->delay_lines + cd->param.sbuf_length; - /* Initize SRC for actual sample rate */ + /* Initialize SRC for actual sample rate */ n = src_polyphase_init(&cd->src, &cd->param, buffer_start); /* Reset stage buffer */ @@ -511,8 +511,8 @@ static int src_copy(struct comp_dev *dev) * for one SRC run. The blk_in and blk are minimum condition to * call copy. Copy can consume or produce a slightly larger block * with the rates where block sizes are not constant. E.g. for - * 1 ms schduling the blocks can be under or above 1 ms when the - * SRC interal block size constraint prevents exact 1 ms blocks. + * 1 ms scheduling the blocks can be under or above 1 ms when the + * SRC interval block size constraint prevents exact 1 ms blocks. */ need_source = cd->param.blk_in * dev->frame_bytes; need_sink = cd->param.blk_out * dev->frame_bytes; diff --git a/src/audio/src_core.c b/src/audio/src_core.c index 080256c..dc22772 100644 --- a/src/audio/src_core.c +++ b/src/audio/src_core.c @@ -29,7 +29,7 @@ * */ -/* Non optimised default C implementation guaranteed to work on any +/* Non optimized default C implementation guaranteed to work on any * architecture. */ @@ -55,7 +55,7 @@ int sof_rates[SOF_RATES_LENGTH] = {8000, 11025, 12000, 16000, 18900, 22050, 24000, 32000, 44100, 48000, 64000, 88200, 96000, 176400, 192000}; -/* The FIR maximum lenghts are per channel so need to multiply them */ +/* The FIR maximum lengths are per channel so need to multiply them */ #define MAX_FIR_DELAY_SIZE_XNCH (PLATFORM_MAX_CHANNELS * MAX_FIR_DELAY_SIZE) #define MAX_OUT_DELAY_SIZE_XNCH (PLATFORM_MAX_CHANNELS * MAX_OUT_DELAY_SIZE) diff --git a/src/audio/switch.c b/src/audio/switch.c index 7149b61..5b4a8c8 100644 --- a/src/audio/switch.c +++ b/src/audio/switch.c @@ -52,7 +52,7 @@ static void switch_free(struct comp_dev *dev) } -/* set component audio stream paramters */ +/* set component audio stream parameters */ static int switch_params(struct comp_dev *dev) { diff --git a/src/audio/tone.c b/src/audio/tone.c index 2957270..ef5b7b1 100644 --- a/src/audio/tone.c +++ b/src/audio/tone.c @@ -190,7 +190,7 @@ static void tonegen_control(struct tone_state *sg) if (sg->block_count < INT32_MAX) sg->block_count++; - /* Fadein ramp during tone */ + /* Fade-in ramp during tone */ if (sg->block_count < sg->tone_length) { if (sg->a == 0) sg->w = 0; /* Reset phase to have less clicky ramp */ @@ -208,7 +208,7 @@ static void tonegen_control(struct tone_state *sg) sg->a = (int32_t) a; } - /* Fadeout ramp after tone*/ + /* Fade-out ramp after tone*/ if (sg->block_count > sg->tone_length) { a = (int64_t) sg->a - sg->ramp_step; if (a < 0) diff --git a/src/audio/volume.c b/src/audio/volume.c index e1cbda2..415a853 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -573,7 +573,7 @@ static int volume_copy(struct comp_dev *dev) } /* - * Volume componnet is usually first and last in pipelines so it makes sense + * Volume component is usually first and last in pipelines so it makes sense * to also do some type conversion here too. */ static int volume_prepare(struct comp_dev *dev) diff --git a/src/include/reef/audio/buffer.h b/src/include/reef/audio/buffer.h index ea9bd9c..d1d0869 100644 --- a/src/include/reef/audio/buffer.h +++ b/src/include/reef/audio/buffer.h @@ -77,7 +77,7 @@ struct comp_buffer { struct comp_buffer *buffer_new(struct sof_ipc_buffer *desc); void buffer_free(struct comp_buffer *buffer); -/* called by a component after pruducing data into this buffer */ +/* called by a component after producing data into this buffer */ static inline void comp_update_buffer_produce(struct comp_buffer *buffer, uint32_t bytes) { diff --git a/src/include/reef/audio/component.h b/src/include/reef/audio/component.h index 8f5a508..0b77e87 100644 --- a/src/include/reef/audio/component.h +++ b/src/include/reef/audio/component.h @@ -50,7 +50,7 @@ * States may transform as below:- * * 1) i.e. Initialisation to playback and pause/release - * init --> setup --> preprare --> active <-> paused --+ + * init --> setup --> prepare --> active <-> paused --+ * ^ | * +-----------------------------+ * @@ -125,13 +125,13 @@ struct comp_ops { struct comp_dev *(*new)(struct sof_ipc_comp *comp); void (*free)(struct comp_dev *dev); - /* set component audio stream paramters */ + /* set component audio stream parameters */ int (*params)(struct comp_dev *dev); /* preload buffers */ int (*preload)(struct comp_dev *dev); - /* set component audio stream paramters */ + /* set component audio stream parameters */ int (*dai_config)(struct comp_dev *dev, struct sof_ipc_dai_config *dai_config); @@ -325,7 +325,7 @@ static inline int comp_buffer_reset(struct comp_dev *dev) buffer = container_of(clist, struct comp_buffer, source_list); - /* dont reset buffer if the component is not connected */ + /* don't reset buffer if the component is not connected */ if (!buffer->connected) continue; @@ -341,11 +341,11 @@ static inline int comp_buffer_reset(struct comp_dev *dev) } /* - * Convenince functions to install upstream/downstream common params. Only + * Convenience functions to install upstream/downstream common params. Only * applicable to single upstream source. Components with > 1 source or sink * must do this manually. * - * This allows params to propagate from the host PCM component downstrean on + * This allows params to propagate from the host PCM component downstream on * playback and upstream on capture. */ static inline void comp_install_params(struct comp_dev *dev, diff --git a/src/include/reef/debug.h b/src/include/reef/debug.h index ef64419..70a7802 100644 --- a/src/include/reef/debug.h +++ b/src/include/reef/debug.h @@ -98,7 +98,7 @@ *(__m++) = *(__a++); \ } while (0); -/* dump data area at addr and size count at mailbox ofset or shared memory */ +/* dump data area at addr and size count at mailbox offset or shared memory */ #define dump_at(addr, count, offset) \ do { \ volatile uint32_t *__m = (uint32_t*)mailbox_get_debug_base() + offset; \ diff --git a/src/include/reef/dma.h b/src/include/reef/dma.h index 8dd4adf..697e2c6 100644 --- a/src/include/reef/dma.h +++ b/src/include/reef/dma.h @@ -52,7 +52,7 @@ /* We will use this macro in cb handler to inform dma that - * we need to stop the reload for specail purpose + * we need to stop the reload for special purpose */ #define DMA_RELOAD_END 0 #define DMA_RELOAD_LLI 0xFFFFFFFF diff --git a/src/include/reef/trace.h b/src/include/reef/trace.h index 17dff5c..ef82d75 100644 --- a/src/include/reef/trace.h +++ b/src/include/reef/trace.h @@ -41,7 +41,7 @@ #include <platform/platform.h> #include <platform/timer.h> -/* general trace init codes - only used at boot when main trace is not availble */ +/* general trace init codes - only used at boot when main trace is not available */ #define TRACE_BOOT_START 0x1000 #define TRACE_BOOT_ARCH 0x2000 #define TRACE_BOOT_SYS 0x3000 diff --git a/src/include/reef/wait.h b/src/include/reef/wait.h index c5b370e..3354eb4 100644 --- a/src/include/reef/wait.h +++ b/src/include/reef/wait.h @@ -27,7 +27,7 @@ * * Author: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> * - * Simple wait for event completion and signalling with timeouts. + * Simple wait for event completion and signaling with timeouts. */ #ifndef __INCLUDE_WAIT__ diff --git a/src/ipc/byt-ipc.c b/src/ipc/byt-ipc.c index fd1ad1e..8897bb9 100644 --- a/src/ipc/byt-ipc.c +++ b/src/ipc/byt-ipc.c @@ -179,7 +179,7 @@ void ipc_platform_send_msg(struct ipc *ipc) goto out; } - /* can't send nofication when one is in progress */ + /* can't send notification when one is in progress */ if (shim_read(SHIM_IPCDH) & (SHIM_IPCDH_BUSY | SHIM_IPCDH_DONE)) goto out; diff --git a/src/ipc/dma-copy.c b/src/ipc/dma-copy.c index 5c9ff97..61a919e 100644 --- a/src/ipc/dma-copy.c +++ b/src/ipc/dma-copy.c @@ -81,7 +81,7 @@ static void dma_complete(void *data, uint32_t type, struct dma_sg_elem *next) /* Copy DSP memory to host memory. * copies DSP memory to host in PAGE_SIZE or smaller blocks and waits/sleeps - * between blocks. Cant be used in IRQ context. + * between blocks. Can't be used in IRQ context. */ int dma_copy_to_host(struct dma_copy *dc, struct dma_sg_config *host_sg, int32_t host_offset, void *local_ptr, int32_t size) diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index f6d88ef..ec91499 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -117,7 +117,7 @@ static int get_page_descriptors(struct intel_ipc_data *iipc, config.cyclic = 0; list_init(&config.elem_list); - /* set up DMA desciptor */ + /* set up DMA descriptor */ elem.dest = (uint32_t)iipc->page_table; elem.src = ring->phy_addr; diff --git a/src/ipc/ipc.c b/src/ipc/ipc.c index 6c40d10..61b0cf2 100644 --- a/src/ipc/ipc.c +++ b/src/ipc/ipc.c @@ -46,7 +46,7 @@ /* * Components, buffers and pipelines all use the same set of monotonic ID * numbers passed in by the host. They are stored in different lists, hence - * more than 1 list may need to be searched for the correspodning component. + * more than 1 list may need to be searched for the corresponding component. */ struct ipc_comp_dev *ipc_get_comp(struct ipc *ipc, uint32_t id) diff --git a/src/lib/alloc.c b/src/lib/alloc.c index 63f92de..847cb93 100644 --- a/src/lib/alloc.c +++ b/src/lib/alloc.c @@ -259,7 +259,7 @@ static void *alloc_block(struct mm_heap *heap, int level, int bflags) return ptr; } -/* allocates continious blocks */ +/* allocates continuous blocks */ static void *alloc_cont_blocks(struct mm_heap *heap, int level, int bflags, size_t bytes) { @@ -276,7 +276,7 @@ static void *alloc_cont_blocks(struct mm_heap *heap, int level, int bflags, if (bytes % map->block_size) count++; - /* check for continious blocks from "start" */ + /* check for continuous blocks from "start" */ for (start = map->first_free; start < remaining; start++) { /* check that we have enough free blocks from start pos */ @@ -387,7 +387,7 @@ found: block = ((uint32_t)ptr - block_map->base) / block_map->block_size; hdr = &block_map->block[block]; - /* free block header and continious blocks */ + /* free block header and continuous blocks */ for (i = block; i < block + hdr->size; i++) { hdr = &block_map->block[i]; hdr->size = 0; @@ -608,7 +608,7 @@ int mm_pm_context_save(struct dma_copy *dc, struct dma_sg_config *sg) } /* - * Restore the DSP memories to modules abd the system. This must be called immediately + * Restore the DSP memories to modules and the system. This must be called immediately * after booting before any pipeline work. */ int mm_pm_context_restore(struct dma_copy *dc, struct dma_sg_config *sg) diff --git a/src/lib/work.c b/src/lib/work.c index 587113e..18d743c 100644 --- a/src/lib/work.c +++ b/src/lib/work.c @@ -314,7 +314,7 @@ static void work_notify(int message, void *data, void *event_data) spin_lock_irq(&queue->lock, flags); - /* we need to re-caclulate timer when CPU frequency changes */ + /* we need to re-calculate timer when CPU frequency changes */ if (message == CLOCK_NOTIFY_POST) { /* CPU frequency update complete */ diff --git a/src/platform/baytrail/clk.c b/src/platform/baytrail/clk.c index 28cdb83..eac64c3 100644 --- a/src/platform/baytrail/clk.c +++ b/src/platform/baytrail/clk.c @@ -117,7 +117,7 @@ static inline uint32_t get_freq(const struct freq_table *table, int size, { uint32_t i; - /* find lowest available frequency that is >= requested hz */ + /* find lowest available frequency that is >= requested Hz */ for (i = 0; i < size; i++) { if (hz <= table[i].freq) return i; @@ -159,7 +159,7 @@ uint32_t clock_set_freq(int clock, uint32_t hz) notify_data.old_freq = clk_pdata->clk[clock].freq; notify_data.old_ticks_per_usec = clk_pdata->clk[clock].ticks_per_usec; - /* atomic context for chaning clocks */ + /* atomic context for chaining clocks */ spin_lock_irq(&clk_pdata->clk[clock].lock, flags); switch (clock) { diff --git a/src/platform/baytrail/platform.c b/src/platform/baytrail/platform.c index c175a1b..aba7645 100644 --- a/src/platform/baytrail/platform.c +++ b/src/platform/baytrail/platform.c @@ -56,7 +56,7 @@ static const struct sof_ipc_fw_ready ready = { .cmd = SOF_IPC_FW_READY, .size = sizeof(struct sof_ipc_fw_ready), }, - /* dspbox is for DSP initiated IPC, hostbox is for host iniiated IPC */ + /* dspbox is for DSP initiated IPC, hostbox is for host initiated IPC */ .dspbox_offset = MAILBOX_HOST_OFFSET + MAILBOX_DSPBOX_OFFSET, .hostbox_offset = MAILBOX_HOST_OFFSET + MAILBOX_HOSTBOX_OFFSET, .dspbox_size = MAILBOX_DSPBOX_SIZE, diff --git a/src/platform/baytrail/timer.c b/src/platform/baytrail/timer.c index 3397ef0..8c205bc 100644 --- a/src/platform/baytrail/timer.c +++ b/src/platform/baytrail/timer.c @@ -53,7 +53,7 @@ static void platform_timer_64_handler(void *arg) /* get timeout value - will tell us timeout reason */ timeout = shim_read(SHIM_EXT_TIMER_CNTLL); - /* we dont use the timer clear bit as we only need to clear the ISR */ + /* we don't use the timer clear bit as we only need to clear the ISR */ shim_write(SHIM_PISR, SHIM_PISR_EXT_TIMER); /* is this a 32 bit rollover ? */ @@ -130,7 +130,7 @@ int platform_timer_set(struct timer *timer, uint64_t ticks) void platform_timer_clear(struct timer *timer) { - /* we dont use the timer clear bit as we only need to clear the ISR */ + /* we don't use the timer clear bit as we only need to clear the ISR */ shim_write(SHIM_PISR, SHIM_PISR_EXT_TIMER); } @@ -149,7 +149,7 @@ uint64_t platform_timer_get(struct timer *timer) /* check and see whether 32bit IRQ is pending for timer */ if (arch_interrupt_get_status() & IRQ_MASK_EXT_TIMER && shim_read(SHIM_EXT_TIMER_CNTLL) == 1) { - /* yes, overflow has occured but handler has not run */ + /* yes, overflow has occurred but handler has not run */ high = timer->hitime + 1; } else { /* no overflow */ @@ -169,7 +169,7 @@ void platform_host_timestamp(struct comp_dev *host, { int err; - /* get host postion */ + /* get host position */ err = comp_position(host, posn); if (err == 0) posn->flags |= SOF_TIME_HOST_VALID | SOF_TIME_HOST_64; @@ -181,7 +181,7 @@ void platform_dai_timestamp(struct comp_dev *dai, { int err; - /* get DAI postion */ + /* get DAI position */ err = comp_position(dai, posn); if (err == 0) posn->flags |= SOF_TIME_DAI_VALID; @@ -191,7 +191,7 @@ void platform_dai_timestamp(struct comp_dev *dai, posn->flags |= SOF_TIME_WALL_VALID | SOF_TIME_WALL_64; } -/* get current wallclock for componnent */ +/* get current wallclock for component */ void platform_dai_wallclock(struct comp_dev *dai, uint64_t *wallclock) { /* only 1 wallclock on BYT */ -- 2.14.1

2 1

[Sound-open-firmware] [PATCH 0/2] macros and register cleanups
by Pierre-Louis Bossart 10 Nov '17

10 Nov '17

Found those issues while randomly looking at register configurations No functionality change, just better looking/safer code Pierre-Louis Bossart (2): sof: protect macro parameters dma: dw: reorder register definitions by sequential address src/drivers/dw-dma.c | 24 ++++++++++++------------ src/include/reef/ssp.h | 10 +++++----- src/include/uapi/intel-ipc.h | 20 ++++++++++---------- src/include/uapi/ipc.h | 4 ++-- src/platform/baytrail/include/platform/dma.h | 8 ++++---- 5 files changed, 33 insertions(+), 33 deletions(-) -- 2.11.0

2 3

[Sound-open-firmware] [PATCH v2 4/4] Fix DMA host offset calculation and wrapper condition checking.
by yan.wang＠linux.intel.com 10 Nov '17

10 Nov '17

From: Yan Wang <yan.wang(a)linux.intel.com> 1. "size" should not be considered twice. 2. Change host_offset to uint32_t type. 3. size = min(hsize, lsize), so it is unncessary to check ">" for wrap local and host buffer. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/include/reef/dma-trace.h | 2 +- src/lib/dma-trace.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/include/reef/dma-trace.h b/src/include/reef/dma-trace.h index 12d0956..641a4dc 100644 --- a/src/include/reef/dma-trace.h +++ b/src/include/reef/dma-trace.h @@ -56,7 +56,7 @@ struct dma_trace_data { struct dma_sg_config config; struct dma_trace_buf dmatb; struct dma_copy dc; - int32_t host_offset; + uint32_t host_offset; uint32_t host_size; struct work dmat_work; uint32_t enabled; diff --git a/src/lib/dma-trace.c b/src/lib/dma-trace.c index 5885037..763e955 100644 --- a/src/lib/dma-trace.c +++ b/src/lib/dma-trace.c @@ -90,12 +90,12 @@ static uint64_t trace_work(void *data, uint64_t delay) /* update host pointer and check for wrap */ d->host_offset += size; - if (d->host_offset + size >= d->host_size) + if (d->host_offset == d->host_size) d->host_offset = 0; /* update local pointer and check for wrap */ buffer->r_ptr += size; - if (buffer->r_ptr >= buffer->end_addr) + if (buffer->r_ptr == buffer->end_addr) buffer->r_ptr = buffer->addr; out: -- 2.7.4

2 1

[Sound-open-firmware] [PATCH] dw-dma: fix element might be used uninitialized issue
by Keyon Jie 10 Nov '17

10 Nov '17

The dma_sg_elem might be used uninitialized if the callback function forget to do that. Here adding initialization to fix that. Signed-off-by: Keyon Jie <yang.jie(a)linux.intel.com> --- 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 05791e6..9aeb612 100644 --- a/src/drivers/dw-dma.c +++ b/src/drivers/dw-dma.c @@ -735,6 +735,7 @@ static void dw_dma_irq_handler(void *data) if ((status_tfr & mask) && (p->chan[i].cb_type & DMA_IRQ_TYPE_LLIST)) { + next.src = next.dest = DMA_RELOAD_LLI; next.size = DMA_RELOAD_LLI; /* will reload lli by default */ if (p->chan[i].cb) p->chan[i].cb(p->chan[i].cb_data, -- 2.11.0

2 1

[Sound-open-firmware] [PATCH 4/4] Fix DMA host offset calculation.
by yan.wang＠linux.intel.com 10 Nov '17

10 Nov '17

From: Yan Wang <yan.wang(a)linux.intel.com> 1. "size" should not be considered twice. 2. Change host_offset to uint32_t type. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/include/reef/dma-trace.h | 2 +- src/lib/dma-trace.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/include/reef/dma-trace.h b/src/include/reef/dma-trace.h index 12d0956..641a4dc 100644 --- a/src/include/reef/dma-trace.h +++ b/src/include/reef/dma-trace.h @@ -56,7 +56,7 @@ struct dma_trace_data { struct dma_sg_config config; struct dma_trace_buf dmatb; struct dma_copy dc; - int32_t host_offset; + uint32_t host_offset; uint32_t host_size; struct work dmat_work; uint32_t enabled; diff --git a/src/lib/dma-trace.c b/src/lib/dma-trace.c index 5885037..249e18b 100644 --- a/src/lib/dma-trace.c +++ b/src/lib/dma-trace.c @@ -90,7 +90,7 @@ static uint64_t trace_work(void *data, uint64_t delay) /* update host pointer and check for wrap */ d->host_offset += size; - if (d->host_offset + size >= d->host_size) + if (d->host_offset >= d->host_size) d->host_offset = 0; /* update local pointer and check for wrap */ -- 2.7.4

4 4

[Sound-open-firmware] [PATCH 3/4] Send IPC message of DMA trace host update in DMA complete callback.
by yan.wang＠linux.intel.com 09 Nov '17

09 Nov '17

From: Yan Wang <yan.wang(a)linux.intel.com> It is called every time DMA completes. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/ipc/dma-copy.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/ipc/dma-copy.c b/src/ipc/dma-copy.c index 5c9ff97..6ba8f57 100644 --- a/src/ipc/dma-copy.c +++ b/src/ipc/dma-copy.c @@ -34,6 +34,7 @@ #include <reef/reef.h> #include <reef/debug.h> #include <reef/trace.h> +#include <reef/ipc.h> #include <reef/dma.h> #include <reef/wait.h> #include <platform/dma.h> @@ -76,6 +77,8 @@ static void dma_complete(void *data, uint32_t type, struct dma_sg_elem *next) if (type == DMA_IRQ_TYPE_LLIST) wait_completed(comp); + ipc_dma_trace_send_position(); + next->size = DMA_RELOAD_END; } -- 2.7.4

1 0

[Sound-open-firmware] [PATCH 2/4] Add API to send DMA trace host offset.
by yan.wang＠linux.intel.com 09 Nov '17

09 Nov '17

From: Yan Wang <yan.wang(a)linux.intel.com> Fill IPC strucure by current host offset and send it. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/include/reef/ipc.h | 3 +++ src/ipc/intel-ipc.c | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/src/include/reef/ipc.h b/src/include/reef/ipc.h index 472aca8..fcab45b 100644 --- a/src/include/reef/ipc.h +++ b/src/include/reef/ipc.h @@ -166,4 +166,7 @@ struct ipc_comp_dev *ipc_get_comp(struct ipc *ipc, uint32_t id); */ int ipc_comp_dai_config(struct ipc *ipc, struct sof_ipc_dai_config *config); +/* send DMA trace host buffer position to host */ +int ipc_dma_trace_send_position(void); + #endif diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index 902e5a6..1df88c4 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -619,6 +619,19 @@ error: return -EINVAL; } +/* send DMA trace host buffer position to host */ +int ipc_dma_trace_send_position(void) +{ + struct sof_ipc_dma_trace_posn posn; + + posn.rhdr.hdr.cmd = SOF_IPC_GLB_TRACE_MSG | SOF_IPC_TRACE_DMA_POSITION; + posn.host_offset = _ipc->dmat.host_offset; + posn.rhdr.hdr.size = sizeof(posn); + + return ipc_queue_host_message(_ipc, posn.rhdr.hdr.cmd, &posn, + sizeof(posn), NULL, 0, NULL, NULL); +} + static int ipc_glb_debug_message(uint32_t header) { uint32_t cmd = (header & SOF_CMD_TYPE_MASK) >> SOF_CMD_TYPE_SHIFT; -- 2.7.4

1 0

[Sound-open-firmware] [PATCH 1/4] Add IPC new message type and structure for sending DMA trace host offset.
by yan.wang＠linux.intel.com 09 Nov '17

09 Nov '17

From: Yan Wang <yan.wang(a)linux.intel.com> It is used to update DMA trace host offset to kernel for realtime output DMA trace. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/include/uapi/ipc.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/include/uapi/ipc.h b/src/include/uapi/ipc.h index fc83721..07235e1 100644 --- a/src/include/uapi/ipc.h +++ b/src/include/uapi/ipc.h @@ -118,6 +118,7 @@ /* trace and debug */ #define SOF_IPC_TRACE_DMA_PARAMS SOF_CMD_TYPE(0x001) +#define SOF_IPC_TRACE_DMA_POSITION SOF_CMD_TYPE(0x002) /* Get message component id */ #define SOF_IPC_MESSAGE_ID(x) (x & 0xffff) @@ -810,4 +811,10 @@ struct sof_ipc_dma_trace_params { struct sof_ipc_host_buffer buffer; } __attribute__((packed)); +/* DMA for Trace params info - SOF_IPC_DEBUG_DMA_PARAMS */ +struct sof_ipc_dma_trace_posn { + struct sof_ipc_reply rhdr; + uint32_t host_offset; /* Offset of DMA host buffer */ +} __attribute__((packed)); + #endif -- 2.7.4

1 0

[Sound-open-firmware] [PATCH v2] Move DMA tracing intialization calling.
by yan.wang＠linux.intel.com 08 Nov '17

08 Nov '17

From: Yan Wang <yan.wang(a)linux.intel.com> Move it from ipc handler into platform_init(). It should be placed after IPC and DMAC initialization. Signed-off-by: Yan Wang <yan.wang(a)linux.intel.com> --- src/ipc/intel-ipc.c | 7 ------- src/platform/baytrail/platform.c | 4 ++++ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/ipc/intel-ipc.c b/src/ipc/intel-ipc.c index 63c84df..1df88c4 100644 --- a/src/ipc/intel-ipc.c +++ b/src/ipc/intel-ipc.c @@ -583,13 +583,6 @@ static int ipc_dma_trace_config(uint32_t header) trace_ipc_error("DA1"); - /* Initialize DMA for Trace*/ - err = dma_trace_init(&_ipc->dmat); - if (err < 0) { - trace_ipc_error("eIP"); - goto error; - } - /* use DMA to read in compressed page table ringbuffer from host */ err = get_page_descriptors(iipc, &params->buffer); if (err < 0) { diff --git a/src/platform/baytrail/platform.c b/src/platform/baytrail/platform.c index c175a1b..3517e0b 100644 --- a/src/platform/baytrail/platform.c +++ b/src/platform/baytrail/platform.c @@ -46,6 +46,7 @@ #include <reef/clock.h> #include <reef/ipc.h> #include <reef/trace.h> +#include <reef/dma-trace.h> #include <reef/audio/component.h> #include <config.h> #include <string.h> @@ -357,5 +358,8 @@ int platform_init(struct reef *reef) dai_probe(ssp5); #endif + /* Initialize DMA for Trace*/ + dma_trace_init(&reef->ipc->dmat); + return 0; } -- 2.7.4

2 1