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

[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

[Sound-open-firmware] [PATCH] volume: fix 16_to_24 right channel wrong issue
by Keyon Jie 07 Nov '17

07 Nov '17

The right channel was set duplicated to the left channel, here correct it. Signed-off-by: Keyon Jie <yang.jie(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 f52ab46..e1cbda2 100644 --- a/src/audio/volume.c +++ b/src/audio/volume.c @@ -179,7 +179,7 @@ static void vol_s16_to_s24(struct comp_dev *dev, struct comp_buffer *sink, dest[i] = q_multsr_sat_32x32( src[i], cd->volume[0], Q_SHIFT_BITS_64(15, 16, 23)); dest[i + 1] = q_multsr_sat_32x32( - src[i], cd->volume[0], Q_SHIFT_BITS_64(15, 16, 23)); + src[i + 1], cd->volume[1], Q_SHIFT_BITS_64(15, 16, 23)); } } -- 2.11.0

2 1

[Sound-open-firmware] [PATCH v2] Replace user-defined 32-bit and 16-bit MAX and MIN values
by Ranjani Sridharan 06 Nov '17

06 Nov '17

Replace the user-defined MAX and MIN values for 32-bit and 16-bit with standard INTN_MAX/INTN_MIN macro Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/audio/tone.c | 14 +++++++------- src/include/reef/audio/format.h | 27 ++++++++++++--------------- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/src/audio/tone.c b/src/audio/tone.c index 3eb08e9..2957270 100644 --- a/src/audio/tone.c +++ b/src/audio/tone.c @@ -187,7 +187,7 @@ static void tonegen_control(struct tone_state *sg) return; sg->sample_count = 0; - if (sg->block_count < INT32_MAXVALUE) + if (sg->block_count < INT32_MAX) sg->block_count++; /* Fadein ramp during tone */ @@ -270,13 +270,13 @@ static void tonegen_set_ampl_mult(struct tone_state *sg, int32_t am) /* Tone length in samples, this is the active length of tone */ static void tonegen_set_length(struct tone_state *sg, uint32_t tl) { - sg->tone_length = (tl > 0) ? tl : INT32_MAXVALUE; /* Count rate 125 us */ + sg->tone_length = (tl > 0) ? tl : INT32_MAX; /* Count rate 125 us */ } /* Tone period in samples, this is the length including the pause after beep */ static void tonegen_set_period(struct tone_state *sg, uint32_t tp) { - sg->tone_period = (tp > 0) ? tp : INT32_MAXVALUE; /* Count rate 125 us */ + sg->tone_period = (tp > 0) ? tp : INT32_MAX; /* Count rate 125 us */ } /* Tone ramp parameters: @@ -287,7 +287,7 @@ static void tonegen_set_period(struct tone_state *sg, uint32_t tp) static inline void tonegen_set_linramp(struct tone_state *sg, int32_t step) { - sg->ramp_step = (step > 0) ? step : INT32_MAXVALUE; + sg->ramp_step = (step > 0) ? step : INT32_MAX; } static inline int32_t tonegen_get_f(struct tone_state *sg) @@ -317,7 +317,7 @@ static void tonegen_update_f(struct tone_state *sg, int32_t f) /* Calculate Fs/2, fs is Q32.0, f is Q16.16 */ f_max = Q_SHIFT_LEFT((int64_t) sg->fs, 0, 16 - 1); - f_max = (f_max > INT32_MAXVALUE) ? INT32_MAXVALUE : f_max; + f_max = (f_max > INT32_MAX) ? INT32_MAX : f_max; sg->f = (f > f_max) ? f_max : f; /* Q16 x Q31 -> Q28 */ w_tmp = q_multsr_32x32(sg->f, sg->c, Q_SHIFT_BITS_64(16, 31, 28)); @@ -349,8 +349,8 @@ static void tonegen_reset(struct tone_state *sg) /* Continuous tone */ sg->freq_coef = ONE_Q2_30; /* Set freq multiplier to 1.0 */ sg->ampl_coef = ONE_Q2_30; /* Set ampl multiplier to 1.0 */ - sg->tone_length = INT32_MAXVALUE; - sg->tone_period = INT32_MAXVALUE; + sg->tone_length = INT32_MAX; + sg->tone_period = INT32_MAX; sg->ramp_step = ONE_Q1_31; /* Set lin ramp modification to max */ } diff --git a/src/include/reef/audio/format.h b/src/include/reef/audio/format.h index b9263f1..8964f33 100644 --- a/src/include/reef/audio/format.h +++ b/src/include/reef/audio/format.h @@ -33,13 +33,10 @@ #ifndef AUDIO_FORMAT_H #define AUDIO_FORMAT_H -/* Maximum and minimum values for integer types */ -#define INT16_MAXVALUE 32767 -#define INT16_MINVALUE -32768 +/* Maximum and minimum values for 24 bit */ #define INT24_MAXVALUE 8388607 #define INT24_MINVALUE -8388608 -#define INT32_MAXVALUE 2147483647 -#define INT32_MINVALUE -2147483648 + /* Collection of common fractional numbers */ #define ONE_Q2_30 1073741824 /* Q2.30 1.0 */ @@ -91,8 +88,8 @@ #define Q_MULTSR_32X32(px, py, qx, qy, qp) (((px) * (py) >> (((qx)+(qy)-(qp)-1) +1) >> 1)) /* Saturation */ -#define SATP_INT32(x) (((x) > INT32_MAXVALUE) ? INT32_MAXVALUE : (x)) -#define SATM_INT32(x) (((x) < INT32_MINVALUE) ? INT32_MINVALUE : (x)) +#define SATP_INT32(x) (((x) > INT32_MAX) ? INT32_MAX : (x)) +#define SATM_INT32(x) (((x) < INT32_MIN) ? INT32_MIN : (x)) static inline int64_t q_mults_32x32(int32_t x, int32_t y, const int shift_bits) { @@ -120,10 +117,10 @@ static inline int32_t sat_int32(int64_t x) { #if 1 /* TODO: Is this faster */ - if (x > INT32_MAXVALUE) - return INT32_MAXVALUE; - else if (x < INT32_MINVALUE) - return INT32_MINVALUE; + if (x > INT32_MAX) + return INT32_MAX; + else if (x < INT32_MIN) + return INT32_MIN; else return (int32_t)x; #else @@ -147,10 +144,10 @@ static inline int32_t sat_int24(int32_t x) static inline int16_t sat_int16(int32_t x) { - if (x > INT16_MAXVALUE) - return INT16_MAXVALUE; - else if (x < INT16_MINVALUE) - return INT16_MINVALUE; + if (x > INT16_MAX) + return INT16_MAX; + else if (x < INT16_MIN) + return INT16_MIN; else return (int16_t)x; } -- 2.11.0

2 1