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

[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