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

[Sound-open-firmware] [RFC PATCH v2 00/29] Trace level control based on modules.
by yan.wang＠linux.intel.com 18 May '18

18 May '18

From: Yan Wang <yan.wang(a)linux.intel.com> This patch set is only for review. This patch set is tested on CNL no-codec only currently. User could check current trace level status like the following: cat /sys/kernel/debug/sof/trace_level irq >> 1 ipc >> 1 dma >> 1 ssp >> 1 wait >> 1 lock >> 1 mem >> 1 value >> 1 PIPELINE.2.SSP2.IN >> 1 SSP2.IN >> 1 BUF2.0 >> 1 PCM0C >> 0 PIPELINE.1.SSP2.OUT >> 1 SSP2.OUT >> 1 BUF1.0 >> 1 PCM0P >> 1 It includes trace levels of global trace types and loaded widgets. When level = 0, only error trace will be enabled. When level = 1, error and normal trace will be enabled. When level = 2, all trace including verbose trace will be enabled. Set trace level like the following: echo PCM0C 0 > /sys/kernel/debug/sof/trace_level will disable the trace of capture host component of fw pipeline. In the future, more module information will bind with trace. Yan Wang (29): Define IPC message type and data structure for trace level. Add utility functions and variable for DMA trace level control. Add trace level variable and set function for SOF modules. Add trace level IPC message processing logic. Change trace macro definition and API for trace level checking. Change macro definition and trace calling for dma-trace.c Change macro definition and trace calling for dma-copy.c Change macro definition and trace calling for alloc.c Change macro definition and trace calling for agent.c Change macro definition and trace calling for schdule module. Change macro definition and trace calling for wait.h Change macro definition and trace calling for SSP. Change macro definition and trace calling for dw-dma.c Change macro definition and trace calling for hda-dma.c Change macro definition and trace calling for interrupt.h Change macro definition and trace calling for comp_dev. Change macro definition and trace calling for comp_buffer. Change macro definition and trace calling for pipeline. Change macro definition and trace calling for dai. Change macro definition and trace calling for volume. Change macro definition and trace calling for switch. Change macro definition and trace calling for tone. Change macro definition and trace calling for mixer. Change macro definition and trace calling for host. Change macro definition and trace calling for mux. Change macro definition and trace calling for eq_fir. Change macro definition and trace calling for eq_iir. Change macro definition and trace calling for src. Change macro definition and trace calling for IPC. src/audio/buffer.c | 13 +-- src/audio/component.c | 31 +++--- src/audio/dai.c | 80 +++++++++------- src/audio/eq_fir.c | 63 ++++++------ src/audio/eq_iir.c | 63 ++++++------ src/audio/host.c | 71 ++++++++------ src/audio/mixer.c | 39 +++++--- src/audio/mux.c | 17 +++- src/audio/pipeline.c | 191 +++++++++++++++++++----------------- src/audio/pipeline_static.c | 2 +- src/audio/src.c | 97 ++++++++++--------- src/audio/src.h | 5 +- src/audio/switch.c | 17 +++- src/audio/tone.c | 79 ++++++++------- src/audio/volume.c | 121 ++++++++++++----------- src/drivers/apl-ssp.c | 29 +++--- src/drivers/byt-ssp.c | 7 +- src/drivers/dw-dma.c | 25 +++-- src/drivers/hda-dma.c | 44 +++++---- src/include/sof/audio/buffer.h | 41 +++++--- src/include/sof/audio/component.h | 34 ++++--- src/include/sof/audio/pipeline.h | 18 +++- src/include/sof/dma-trace.h | 7 ++ src/include/sof/interrupt.h | 12 ++- src/include/sof/ipc.h | 18 +++- src/include/sof/schedule.h | 10 ++ src/include/sof/ssp.h | 14 ++- src/include/sof/trace.h | 197 +++++++++++++++++++++++++++++--------- src/include/sof/wait.h | 21 +++- src/include/uapi/ipc.h | 25 +++++ src/ipc/dma-copy.c | 13 ++- src/ipc/handler.c | 54 ++++++++--- src/ipc/ipc.c | 50 ++++++++-- src/lib/agent.c | 12 ++- src/lib/alloc.c | 18 +++- src/lib/dma-trace.c | 83 +++++++++++++++- src/lib/schedule.c | 20 ++-- src/lib/trace.c | 101 +++++++++++++++++++ 38 files changed, 1173 insertions(+), 569 deletions(-) -- 2.14.3

6 36

[Sound-open-firmware] [PATCH v3 0/4] Host based component testing
by Ranjani Sridharan 17 May '18

17 May '18

This set of patches introduces the testbench for audio processing components in SOF. The testbench enables for functional/quality testing of the components. The testbench reads in audio samples from a file and write out the processed samples to the output file. The src and test directories includes routines for topology parsing and setting up sof ipc, scheduler and processing pipelines. It also includes simpler implementations for SOF features such as tracing. It also includes a new file component that allows reading in or writing out samples from/to a file. The test directory also includes the testbench for setting up pipelines based on a test topology. It reads in input samples from a file , schedules pipeline copy and copies the processed sample to the output file. The output file can be used to perform audio quality tests using matlab/octave. Currently it supports only volume pipelines. Support for other components such as src/eq will be added later. v3 modifications: File component supports raw pcm input Fixed checkpatch style issues Fixed errors with 32-bit input samples debug message prints are handled via command line Ranjani Sridharan (4): tune: add testbench common headers and source files tune: new component for file IO tune: add testbench to test topology tune: Add README and a script to configure testbench parameters Makefile.am | 2 +- configure.ac | 4 +- tune/Makefile.am | 1 + tune/README | 13 + tune/scripts/run_testbench.sh | 22 + tune/src/include/test/common_test.h | 65 ++ tune/src/include/test/file.h | 77 +++ tune/src/include/test/topology.h | 202 ++++++ tune/src/include/test/trace.h | 49 ++ tune/test/Makefile.am | 31 + tune/test/alloc.c | 68 ++ tune/test/common_test.c | 206 ++++++ tune/test/file.c | 723 +++++++++++++++++++++ tune/test/ipc.c | 81 +++ tune/test/schedule.c | 99 +++ tune/test/testbench.c | 298 +++++++++ tune/test/topology.c | 955 ++++++++++++++++++++++++++++ tune/test/trace.c | 200 ++++++ 18 files changed, 3094 insertions(+), 2 deletions(-) create mode 100644 tune/Makefile.am create mode 100644 tune/README create mode 100755 tune/scripts/run_testbench.sh create mode 100644 tune/src/include/test/common_test.h create mode 100644 tune/src/include/test/file.h create mode 100644 tune/src/include/test/topology.h create mode 100644 tune/src/include/test/trace.h create mode 100644 tune/test/Makefile.am create mode 100644 tune/test/alloc.c create mode 100644 tune/test/common_test.c create mode 100644 tune/test/file.c create mode 100644 tune/test/ipc.c create mode 100644 tune/test/schedule.c create mode 100644 tune/test/testbench.c create mode 100644 tune/test/topology.c create mode 100644 tune/test/trace.c -- 2.17.0

2 5

[Sound-open-firmware] [PATCH 0/7] [v3]DMIC: Patch series for direct attach microphones
by Seppo Ingalsuo 17 May '18

17 May '18

This v3 patch set completes the missing changes from previous v2 patch set. Only stereo S32_LE 48 kHz capture is supported due to hard wiring of DMIC and DMA parameters. Configurable format will be introduced later. The used SOF kernel driver and topology were test versions. Patches will be upstreamed separately later. This patch version was tested with the UP2 board on top of SOF git master 1e231b9dd297bc88c324502a561be67007604b16. Since there was no DMIC exHAT board connected the capture only produced the DC compensation ramp shape when the HW tries to compensate the max. full scale DC signal caused by the non-toggling PDM data line. Ramp shape looked correct and there were no discontinuities in PCM samples. The CNL version has not been tested on a device. Patch was also tested on a BYT device without DMIC capability where DAI/SSP feature functioned OK. Seppo Ingalsuo (7): [v3]DMIC: Add PDM microphones (DMIC) support to DAI [v3]DMIC: Add configure command switch to disable DMIC [v3]DMIC: DMIC: Add dmic.c to drivers Makefile.am [v3]DMIC: Changes to APL platform [v3]DMIC: Changes to CNL platform [v3]DMIC: Add for format.h conversion from fractional to float [v3]DMIC: Move ceil_divide from numbers.c to numbers.h as static inline configure.ac | 6 + src/drivers/Makefile.am | 6 +- src/drivers/dmic.c | 1361 +++++++++++++++++++++ src/include/sof/audio/format.h | 3 + src/include/sof/math/numbers.h | 15 +- src/math/numbers.c | 14 - src/platform/apollolake/dai.c | 59 + src/platform/apollolake/include/platform/memory.h | 5 + src/platform/apollolake/platform.c | 12 + src/platform/cannonlake/dai.c | 57 + src/platform/cannonlake/include/platform/memory.h | 8 +- src/platform/cannonlake/platform.c | 11 + 12 files changed, 1537 insertions(+), 20 deletions(-) create mode 100644 src/drivers/dmic.c -- 2.14.1

3 14

[Sound-open-firmware] [PATCH] pipeline: fix typo in pipeline disconnect
by Ranjani Sridharan 17 May '18

17 May '18

Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- src/audio/pipeline.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/audio/pipeline.c b/src/audio/pipeline.c index 28243fc..a59e4ea 100644 --- a/src/audio/pipeline.c +++ b/src/audio/pipeline.c @@ -154,7 +154,7 @@ static void disconnect_upstream(struct pipeline *p, struct comp_dev *start, if (buffer->source->comp.pipeline_id != p->ipc_pipe.pipeline_id) continue; - connect_upstream(p, start, buffer->source); + disconnect_upstream(p, start, buffer->source); } /* disconnect source from buffer */ @@ -183,7 +183,7 @@ static void disconnect_downstream(struct pipeline *p, struct comp_dev *start, if (buffer->sink->comp.pipeline_id != p->ipc_pipe.pipeline_id) continue; - connect_downstream(p, start, buffer->sink); + disconnect_downstream(p, start, buffer->sink); } /* disconnect source from buffer */ -- 2.17.0

2 1

[Sound-open-firmware] [PATCH v2 0/3] Host based component testing
by Ranjani Sridharan 17 May '18

17 May '18

This set of patches introduces the testbench for audio processing components in SOF. The testbench enables for functional/quality testing of the components. The testbench reads in audio samples from a file and write out the processed samples to the output file. The src and include directories includes routines for topology parsing and setting up sof ipc, scheduler and processing pipelines. It also includes simpler implementations for SOF features such as tracing. It also includes the fileread/filewrite components that allow reading in or writing out samples from/to a file. The test directory includes the testbench for the volume component. The volume testbench reads in input samples from a file ,schedules pipeline copy and copies the processed sample to the output file. The output file can be used to perform audio quality tests using matlab/octave. Testbench for other components such as src/eq will be added later. Ranjani Sridharan (3): tune: add testbench common header and source files tune: new component for file IO tune: add testbench for volume comp Makefile.am | 2 +- configure.ac | 5 +- tune/Makefile.am | 1 + tune/include/common_test.h | 63 ++++ tune/include/file.h | 71 ++++ tune/include/topology.h | 201 ++++++++++ tune/include/trace.h | 38 ++ tune/src/Makefile.am | 15 + tune/src/alloc.c | 74 ++++ tune/src/common_test.c | 212 +++++++++++ tune/src/file.c | 602 ++++++++++++++++++++++++++++++ tune/src/ipc.c | 81 ++++ tune/src/schedule.c | 98 +++++ tune/src/topology.c | 908 +++++++++++++++++++++++++++++++++++++++++++++ tune/src/trace.c | 150 ++++++++ tune/test/Makefile.am | 16 + tune/test/volume_test.c | 220 +++++++++++ 17 files changed, 2755 insertions(+), 2 deletions(-) create mode 100644 tune/Makefile.am create mode 100644 tune/include/common_test.h create mode 100644 tune/include/file.h create mode 100644 tune/include/topology.h create mode 100644 tune/include/trace.h create mode 100644 tune/src/Makefile.am create mode 100644 tune/src/alloc.c create mode 100644 tune/src/common_test.c create mode 100644 tune/src/file.c create mode 100644 tune/src/ipc.c create mode 100644 tune/src/schedule.c create mode 100644 tune/src/topology.c create mode 100644 tune/src/trace.c create mode 100644 tune/test/Makefile.am create mode 100644 tune/test/volume_test.c -- 2.14.1

3 11

[Sound-open-firmware] [PATCH v2 1/2] ASoC: SOF: set up volume tables with topology tlv data
by Ranjani Sridharan 15 May '18

15 May '18

This patch includes the changes to set up volume gain tables for kcontrols from topology tlv data. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- Notes: V2: fixed check patch error This patch depends on the patch upstreamed to the for-next branch with commit id: 08f9f4485f2158de0fa77506687a073cb869e803 and titled "ALSA: core api: define offsets for TLV items" Tested on: Minnowboard turbot with RT5651 kernel: https://github.com/plbossart/sound branch: topic/sof-v4.14 commit: b433999058d8a8dee5d37c4176d94257ab269b71 SOF: master SOFT: master sound/soc/sof/sof-priv.h | 1 + sound/soc/sof/topology.c | 180 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 180 insertions(+), 1 deletion(-) diff --git a/sound/soc/sof/sof-priv.h b/sound/soc/sof/sof-priv.h index 0f9b659461d9..bde985f6f438 100644 --- a/sound/soc/sof/sof-priv.h +++ b/sound/soc/sof/sof-priv.h @@ -185,6 +185,7 @@ struct snd_sof_control { struct sof_ipc_ctrl_data *control_data; u32 size; /* cdata size */ enum sof_ipc_ctrl_cmd cmd; + u32 *volume_table; /* volume table computed from tlv data*/ struct mutex mutex; struct list_head list; /* list in sdev control list */ diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index 3d0d71af3d37..2b94a2af5253 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -20,11 +20,162 @@ #include <linux/string.h> #include <sound/soc-topology.h> #include <sound/soc.h> +#include <uapi/sound/tlv.h> +#include <sound/tlv.h> #include <uapi/sound/sof-ipc.h> #include <uapi/sound/sof-topology.h> #include "sof-priv.h" #define COMP_ID_UNASSIGNED 0xffffffff +/* Constants used in the computation of linear volume gain from dB gain */ +/* 20th root of 10 in Q1.16 fixed-point notation*/ +#define VOL_TWENTIETH_ROOT_OF_TEN 73533 +/* 40th root of 10 in Q1.16 fixed-point notation*/ +#define VOL_FORTIETH_ROOT_OF_TEN 69419 +/* Volume fractional word length */ +#define VOLUME_FWL 16 +/* 0.5 dB step value in topology TLV */ +#define VOL_HALF_DB_STEP 50 + +/* TLV data items */ +#define TLV_ITEMS 3 +#define TLV_MIN 0 +#define TLV_STEP 1 +#define TLV_MUTE 2 + +static inline int get_tlv_data(const int *p, int tlv[TLV_ITEMS]) +{ + /* we only support dB scale TLV type at the moment */ + if ((int)p[SNDRV_CTL_TLVO_TYPE] != SNDRV_CTL_TLVT_DB_SCALE) + return -EINVAL; + + /* min value in topology tlv data is multiplied by 100 */ + tlv[TLV_MIN] = (int)p[SNDRV_CTL_TLVO_DB_SCALE_MIN] / 100; + + /* volume steps */ + tlv[TLV_STEP] = (int)(p[SNDRV_CTL_TLVO_DB_SCALE_MUTE_AND_STEP] & + TLV_DB_SCALE_MASK); + + /* mute ON/OFF */ + if ((p[SNDRV_CTL_TLVO_DB_SCALE_MUTE_AND_STEP] & + TLV_DB_SCALE_MUTE) == 0) + tlv[TLV_MUTE] = 0; + else + tlv[TLV_MUTE] = 1; + + return 0; +} + +/* Function to truncate an unsigned 64-bit number + * by x bits and return 32-bit unsigned number + * This function also takes care of rounding while truncating + */ +static inline u32 vol_shift_64(u64 i, u32 x) +{ + /* do not truncate more than 32 bits */ + if (x > 32) + x = 32; + + if (x == 0) + return (u32)i; + + return (u32)(((i >> (x - 1)) + 1) >> 1); +} + +/* Function to compute a ^ exp where, + * a is a fractional number represented by a fixed-point integer + * with a fractional world length of "fwl" + * exp is an integer + * fwl is the fractional word length + * Return value is a fractional number represented by a fixed-point + * integer with a fractional word length of "fwl" + */ +static u32 vol_pow32(u32 a, int exp, u32 fwl) +{ + int i, iter; + u32 power = 1 << fwl; + + /* if exponent is 0, return 1 */ + if (exp == 0) + return power; + + /* determine the number of iterations based on the exponent */ + if (exp < 0) + iter = exp * -1; + else + iter = exp; + + /* mutiply a "iter" times to compute power */ + for (i = 0; i < iter; i++) { + /* Product of 2 Qx.fwl fixed-point numbers yields a Q2*x.2*fwl + * Truncate product back to fwl fractional bits with rounding + */ + power = vol_shift_64((u64)power * a, fwl); + } + + if (exp > 0) { + /* if exp is positive, return the result */ + return power; + } + + /* if exp is negative, return the multiplicative inverse */ + return (u32)((u64)(1 << fwl) * (1 << fwl) / power); +} + +/* Function to calculate volume gain from TLV data + * This function can only handle gain steps that are multiples of 0.5 dB + */ +static u32 vol_compute_gain(u32 value, int *tlv) +{ + int dB_gain; + u32 linear_gain; + int f_step; + + /* mute volume */ + if (value == 0 && tlv[TLV_MUTE]) + return 0; + + /* compute dB gain from tlv + * tlv_step in topology is multiplied by 100 + */ + dB_gain = tlv[TLV_MIN] + (value * tlv[TLV_STEP]) / 100; + + /* compute linear gain + * represented by fixed-point int with VOLUME_FWL fractional bits + */ + linear_gain = vol_pow32(VOL_TWENTIETH_ROOT_OF_TEN, dB_gain, VOLUME_FWL); + + /* extract the fractional part of volume step */ + f_step = tlv[TLV_STEP] - (tlv[TLV_STEP] / 100); + + /* if volume step is an odd multiple of 0.5 dB */ + if (f_step == VOL_HALF_DB_STEP && (value & 1)) + linear_gain = vol_shift_64((u64)linear_gain * + VOL_FORTIETH_ROOT_OF_TEN, + VOLUME_FWL); + + return linear_gain; +} + +/* Set up volume table for kcontrols from tlv data + * "size" specifies the number of entries in the table + */ +static int set_up_volume_table(struct snd_sof_control *scontrol, + int tlv[TLV_ITEMS], int size) +{ + int j; + + /* init the volume table */ + scontrol->volume_table = kcalloc(size, sizeof(u32), GFP_KERNEL); + if (!scontrol->volume_table) + return -ENOMEM; + + /* populate the volume table */ + for (j = 0; j < size ; j++) + scontrol->volume_table[j] = vol_compute_gain(j, tlv); + + return 0; +} struct sof_dai_types { const char *name; @@ -790,7 +941,12 @@ static int sof_widget_load_pga(struct snd_soc_component *scomp, int index, struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp); struct snd_soc_tplg_private *private = &tw->priv; struct sof_ipc_comp_volume volume; - int ret; + struct snd_soc_dapm_widget *widget = swidget->widget; + const struct snd_kcontrol_new *kc = NULL; + struct soc_mixer_control *sm; + struct snd_sof_control *scontrol; + const unsigned int *p; + int ret, tlv[TLV_ITEMS]; if (tw->num_kcontrols != 1) { dev_err(sdev->dev, "error: invalid kcontrol count %d for volume\n", @@ -798,6 +954,28 @@ static int sof_widget_load_pga(struct snd_soc_component *scomp, int index, return -EINVAL; } + /* set up volume gain tables for kcontrol */ + kc = &widget->kcontrol_news[0]; + sm = (struct soc_mixer_control *)kc->private_value; + + /* get volume control */ + scontrol = sm->dobj.private; + + /* get topology tlv data */ + p = kc->tlv.p; + + /* extract tlv data */ + if (get_tlv_data(p, tlv) < 0) { + dev_err(sdev->dev, "error: invalid TLV data\n"); + return -EINVAL; + } + + /* set up volume table */ + if (set_up_volume_table(scontrol, tlv, sm->max) < 0) { + dev_err(sdev->dev, "error: setting up volume table\n"); + return -ENOMEM; + } + /* configure dai IPC message */ memset(&volume, 0, sizeof(volume)); volume.comp.hdr.size = sizeof(volume); -- 2.17.0

2 2

[Sound-open-firmware] [PATCH 1/2] ASoC: SOF: set up volume tables with topology tlv data
by Ranjani Sridharan 15 May '18

15 May '18

This patch includes the changes to set up volume gain tables for kcontrols from topology tlv data. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- Notes: This patch depends on the patch upstreamed to the for-next branch with commit id: 08f9f4485f2158de0fa77506687a073cb869e803 and titled "ALSA: core api: define offsets for TLV items" Tested on: Minnowboard turbot with RT5651 kernel: https://github.com/plbossart/sound branch: topic/sof-v4.14 commit: b433999058d8a8dee5d37c4176d94257ab269b71 SOF: master SOFT: master sound/soc/sof/sof-priv.h | 1 + sound/soc/sof/topology.c | 181 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 181 insertions(+), 1 deletion(-) diff --git a/sound/soc/sof/sof-priv.h b/sound/soc/sof/sof-priv.h index 0f9b659461d9..bde985f6f438 100644 --- a/sound/soc/sof/sof-priv.h +++ b/sound/soc/sof/sof-priv.h @@ -185,6 +185,7 @@ struct snd_sof_control { struct sof_ipc_ctrl_data *control_data; u32 size; /* cdata size */ enum sof_ipc_ctrl_cmd cmd; + u32 *volume_table; /* volume table computed from tlv data*/ struct mutex mutex; struct list_head list; /* list in sdev control list */ diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index 3d0d71af3d37..cf5609a52f36 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -20,11 +20,162 @@ #include <linux/string.h> #include <sound/soc-topology.h> #include <sound/soc.h> +#include <uapi/sound/tlv.h> +#include <sound/tlv.h> #include <uapi/sound/sof-ipc.h> #include <uapi/sound/sof-topology.h> #include "sof-priv.h" #define COMP_ID_UNASSIGNED 0xffffffff +/* Constants used in the computation of linear volume gain from dB gain */ +/* 20th root of 10 in Q1.16 fixed-point notation*/ +#define VOL_TWENTIETH_ROOT_OF_TEN 73533 +/* 40th root of 10 in Q1.16 fixed-point notation*/ +#define VOL_FORTIETH_ROOT_OF_TEN 69419 +/* Volume fractional word length */ +#define VOLUME_FWL 16 +/* 0.5 dB step value in topology TLV */ +#define VOL_HALF_DB_STEP 50 + +/* TLV data items */ +#define TLV_ITEMS 3 +#define TLV_MIN 0 +#define TLV_STEP 1 +#define TLV_MUTE 2 + +static inline int get_tlv_data(const int *p, int tlv[TLV_ITEMS]) +{ + /* we only support dB scale TLV type at the moment */ + if ((int)p[SNDRV_CTL_TLVO_TYPE] != SNDRV_CTL_TLVT_DB_SCALE) + return -EINVAL; + + /* min value in topology tlv data is multiplied by 100 */ + tlv[TLV_MIN] = (int)p[SNDRV_CTL_TLVO_DB_SCALE_MIN] / 100; + + /* volume steps */ + tlv[TLV_STEP] = (int)(p[SNDRV_CTL_TLVO_DB_SCALE_MUTE_AND_STEP] & + TLV_DB_SCALE_MASK); + + /* mute ON/OFF */ + if ((p[SNDRV_CTL_TLVO_DB_SCALE_MUTE_AND_STEP] & + TLV_DB_SCALE_MUTE) == 0) + tlv[TLV_MUTE] = 0; + else + tlv[TLV_MUTE] = 1; + + return 0; +} + +/* Function to truncate an unsigned 64-bit number + * by x bits and return 32-bit unsigned number + * This function also takes care of rounding while truncating + */ +static inline u32 vol_shift_64(u64 i, u32 x) +{ + /* do not truncate more than 32 bits */ + if (x > 32) + x = 32; + + if (x == 0) + return (u32)i; + + return (u32)(((i >> (x - 1)) + 1) >> 1); +} + +/* Function to compute a ^ exp where, + * a is a fractional number represented by a fixed-point integer + * with a fractional world length of "fwl" + * exp is an integer + * fwl is the fractional word length + * Return value is a fractional number represented by a fixed-point + * integer with a fractional word length of "fwl" + */ +static u32 vol_pow32(u32 a, int exp, u32 fwl) +{ + int i, iter; + u32 power = 1 << fwl; + + /* if exponent is 0, return 1 */ + if (exp == 0) + return power; + + /* determine the number of iterations based on the exponent */ + if (exp < 0) + iter = exp * -1; + else + iter = exp; + + /* mutiply a "iter" times to compute power */ + for (i = 0; i < iter; i++) { + /* Product of 2 Qx.fwl fixed-point numbers yields a Q2*x.2*fwl + * Truncate product back to fwl fractional bits with rounding + */ + power = vol_shift_64((u64)power * a, fwl); + } + + if (exp > 0) { + /* if exp is positive, return the result */ + return power; + } + + /* if exp is negative, return the multiplicative inverse */ + return (u32)((u64)(1 << fwl) * (1 << fwl) / power); +} + +/* Function to calculate volume gain from TLV data + * This function can only handle gain steps that are multiples of 0.5 dB + */ +static u32 vol_compute_gain(u32 value, int *tlv) +{ + int dB_gain; + u32 linear_gain; + int f_step; + + /* mute volume */ + if (value == 0 && tlv[TLV_MUTE]) + return 0; + + /* compute dB gain from tlv + * tlv_step in topology is multiplied by 100 + */ + dB_gain = tlv[TLV_MIN] + (value * tlv[TLV_STEP]) / 100; + + /* compute linear gain + * represented by fixed-point int with VOLUME_FWL fractional bits + */ + linear_gain = vol_pow32(VOL_TWENTIETH_ROOT_OF_TEN, dB_gain, VOLUME_FWL); + + /* extract the fractional part of volume step */ + f_step = tlv[TLV_STEP] - (tlv[TLV_STEP] / 100); + + /* if volume step is an odd multiple of 0.5 dB */ + if (f_step == VOL_HALF_DB_STEP && (value & 1)) + linear_gain = vol_shift_64((u64)linear_gain * + VOL_FORTIETH_ROOT_OF_TEN, + VOLUME_FWL); + + return linear_gain; +} + +/* Set up volume table for kcontrols from tlv data + * "size" specifies the number of entries in the table + */ +static int set_up_volume_table(struct snd_sof_control *scontrol, + int tlv[TLV_ITEMS], int size) +{ + int j; + + /* init the volume table */ + scontrol->volume_table = kcalloc(size, sizeof(u32), GFP_KERNEL); + if (!scontrol->volume_table) + return -ENOMEM; + + /* populate the volume table */ + for (j = 0; j < size ; j++) + scontrol->volume_table[j] = vol_compute_gain(j, tlv); + + return 0; +} struct sof_dai_types { const char *name; @@ -92,6 +243,7 @@ static int sof_control_load_volume(struct snd_soc_component *scomp, if (mc->num_channels >= SND_SOC_TPLG_MAX_CHAN) return -EINVAL; + /* init the volume get/put data */ scontrol->size = sizeof(struct sof_ipc_ctrl_data) + sizeof(struct sof_ipc_ctrl_value_chan) * mc->num_channels; @@ -790,7 +942,12 @@ static int sof_widget_load_pga(struct snd_soc_component *scomp, int index, struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp); struct snd_soc_tplg_private *private = &tw->priv; struct sof_ipc_comp_volume volume; - int ret; + struct snd_soc_dapm_widget *widget = swidget->widget; + const struct snd_kcontrol_new *kc = NULL; + struct soc_mixer_control *sm; + struct snd_sof_control *scontrol; + const unsigned int *p; + int ret, tlv[TLV_ITEMS]; if (tw->num_kcontrols != 1) { dev_err(sdev->dev, "error: invalid kcontrol count %d for volume\n", @@ -798,6 +955,28 @@ static int sof_widget_load_pga(struct snd_soc_component *scomp, int index, return -EINVAL; } + /* set up volume gain tables for kcontrol */ + kc = &widget->kcontrol_news[0]; + sm = (struct soc_mixer_control *)kc->private_value; + + /* get volume control */ + scontrol = sm->dobj.private; + + /* get topology tlv data */ + p = kc->tlv.p; + + /* extract tlv data */ + if (get_tlv_data(p, tlv) < 0) { + dev_err(sdev->dev, "error: invalid TLV data\n"); + return -EINVAL; + } + + /* set up volume table */ + if (set_up_volume_table(scontrol, tlv, sm->max) < 0) { + dev_err(sdev->dev, "error: setting up volume table\n"); + return -ENOMEM; + } + /* configure dai IPC message */ memset(&volume, 0, sizeof(volume)); volume.comp.hdr.size = sizeof(volume); -- 2.17.0

2 3

[Sound-open-firmware] [PATCH 2/2] ASoC: SOF: use updated volume gain tables in kcontrol IO handlers
by Ranjani Sridharan 14 May '18

14 May '18

Delete hard-coded volume table and update volume kcontrol IO handlers to use the computed tables instead. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> --- Notes: Tested on: Minnowboard turbot with RT5651 kernel: https://github.com/plbossart/sound branch: topic/sof-v4.14 commit: b433999058d8a8dee5d37c4176d94257ab269b71 SOF: master SOFT: master sound/soc/sof/control.c | 54 +++++++---------------------------------- 1 file changed, 9 insertions(+), 45 deletions(-) diff --git a/sound/soc/sof/control.c b/sound/soc/sof/control.c index ed52aac730f3..1eeb80aedd95 100644 --- a/sound/soc/sof/control.c +++ b/sound/soc/sof/control.c @@ -20,57 +20,19 @@ #include <uapi/sound/sof-ipc.h> #include "sof-priv.h" -/* simple volume table TODO: to be replaced by coefficients from topology */ -/* -52 dB to +12 dB in 2 dB steps, 33 values */ -static const u32 volume_map[] = { - 165, - 207, - 261, - 328, - 414, - 521, - 655, - 825, - 1039, - 1308, - 1646, - 2072, - 2609, - 3285, - 4135, - 5206, - 6554, - 8250, - 10387, - 13076, - 16462, - 20724, - 26090, - 32846, - 41350, - 52057, - 65536, /* 0 dB for Qx.16 gain value */ - 82505, - 103868, - 130762, - 164619, - 207243, - 260904 -}; - -static inline u32 mixer_to_ipc(unsigned int value) +static inline u32 mixer_to_ipc(unsigned int value, u32 *volume_map, int size) { - if (value >= ARRAY_SIZE(volume_map)) - return volume_map[0]; + if (value >= size) + return volume_map[size - 1]; else return volume_map[value]; } -static inline u32 ipc_to_mixer(u32 value) +static inline u32 ipc_to_mixer(u32 value, u32 *volume_map, int size) { int i; - for (i = 0; i < ARRAY_SIZE(volume_map); i++) { + for (i = 0; i < size; i++) { if (volume_map[i] >= value) return i; } @@ -98,7 +60,8 @@ int snd_sof_volume_get(struct snd_kcontrol *kcontrol, /* read back each channel */ for (i = 0; i < channels; i++) ucontrol->value.integer.value[i] = - ipc_to_mixer(cdata->chanv[i].value); + ipc_to_mixer(cdata->chanv[i].value, + scontrol->volume_table, sm->max); pm_runtime_mark_last_busy(sdev->dev); pm_runtime_put_autosuspend(sdev->dev); @@ -120,7 +83,8 @@ int snd_sof_volume_put(struct snd_kcontrol *kcontrol, /* update each channel */ for (i = 0; i < channels; i++) { cdata->chanv[i].value = - mixer_to_ipc(ucontrol->value.integer.value[i]); + mixer_to_ipc(ucontrol->value.integer.value[i], + scontrol->volume_table, sm->max); cdata->chanv[i].channel = i; } -- 2.17.0

1 0

[Sound-open-firmware] [PATCH] rimage: openssl: add compatibility for openssl 1.1.0
by Xiuli Pan 14 May '18

14 May '18

From: Pan Xiuli <xiuli.pan(a)linux.intel.com> Add compatibility support for openssl 1.0.2 support alongsid with openssl 1.1.0 References: https://wiki.openssl.org/index.php/OpenSSL_1.1.0_Changes Compatibility Layer Signed-off-by: Pan Xiuli <xiuli.pan(a)linux.intel.com> --- rimage/hash.c | 26 ++++++++++++++++++++++++++ rimage/pkcs1_5.c | 16 ++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/rimage/hash.c b/rimage/hash.c index 2905d89..73b6d72 100644 --- a/rimage/hash.c +++ b/rimage/hash.c @@ -30,6 +30,32 @@ #include "file_format.h" #include "manifest.h" +#if OPENSSL_VERSION_NUMBER < 0x10100000L +void EVP_MD_CTX_free(EVP_MD_CTX *ctx); +EVP_MD_CTX *EVP_MD_CTX_new(void); + +static void *OPENSSL_zalloc(size_t num) +{ + void *ret = OPENSSL_malloc(num); + + if (ret != NULL) + memset(ret, 0, num); + return ret; +} + +EVP_MD_CTX *EVP_MD_CTX_new(void) +{ + return OPENSSL_zalloc(sizeof(EVP_MD_CTX)); +} + +void EVP_MD_CTX_free(EVP_MD_CTX *ctx) +{ + EVP_MD_CTX_cleanup(ctx); + OPENSSL_free(ctx); +} +#endif + + #define DEBUG_HASH 0 void module_sha256_create(struct image *image) diff --git a/rimage/pkcs1_5.c b/rimage/pkcs1_5.c index 0c91df0..d80cf8d 100644 --- a/rimage/pkcs1_5.c +++ b/rimage/pkcs1_5.c @@ -30,6 +30,22 @@ #include "css.h" #include "manifest.h" +#if OPENSSL_VERSION_NUMBER < 0x10100000L +void RSA_get0_key(const RSA *r, + const BIGNUM **n, const BIGNUM **e, const BIGNUM **d); + +void RSA_get0_key(const RSA *r, + const BIGNUM **n, const BIGNUM **e, const BIGNUM **d) +{ + if (n != NULL) + *n = r->n; + if (e != NULL) + *e = r->e; + if (d != NULL) + *d = r->d; +} +#endif + #define DEBUG_PKCS 0 static void bytes_swap(uint8_t *ptr, uint32_t size) -- 2.7.4

2 1

[Sound-open-firmware] [RFC PATCH v2 00/29] Trace level control based on modules.
by yan.wang＠linux.intel.com 12 May '18

12 May '18

From: Yan Wang <yan.wang(a)linux.intel.com> Resend this series because previous mail list issue. I have addressed Liam's comments in cover letter (00/29) and will change it in the next version patch set. I have addressed Ranjani's comments patch 05/29 and will change it in the next version patch set. This patch set is only for review. This patch set is tested on CNL no-codec only currently. User could check current trace level status like the following: cat /sys/kernel/debug/sof/trace_level irq >> 1 ipc >> 1 dma >> 1 ssp >> 1 wait >> 1 lock >> 1 mem >> 1 value >> 1 PIPELINE.2.SSP2.IN >> 1 SSP2.IN >> 1 BUF2.0 >> 1 PCM0C >> 0 PIPELINE.1.SSP2.OUT >> 1 SSP2.OUT >> 1 BUF1.0 >> 1 PCM0P >> 1 It includes trace levels of global trace types and loaded widgets. When level = 0, only error trace will be enabled. When level = 1, error and normal trace will be enabled. When level = 2, all trace including verbose trace will be enabled. Set trace level like the following: echo PCM0C 0 > /sys/kernel/debug/sof/trace_level will disable the trace of capture host component of fw pipeline. In the future, more module information will bind with trace. Yan Wang (29): Define IPC message type and data structure for trace level. Add utility functions and variable for DMA trace level control. Add trace level variable and set function for SOF modules. Add trace level IPC message processing logic. Change trace macro definition and API for trace level checking. Change macro definition and trace calling for dma-trace.c Change macro definition and trace calling for dma-copy.c Change macro definition and trace calling for alloc.c Change macro definition and trace calling for agent.c Change macro definition and trace calling for schdule module. Change macro definition and trace calling for wait.h Change macro definition and trace calling for SSP. Change macro definition and trace calling for dw-dma.c Change macro definition and trace calling for hda-dma.c Change macro definition and trace calling for interrupt.h Change macro definition and trace calling for comp_dev. Change macro definition and trace calling for comp_buffer. Change macro definition and trace calling for pipeline. Change macro definition and trace calling for dai. Change macro definition and trace calling for volume. Change macro definition and trace calling for switch. Change macro definition and trace calling for tone. Change macro definition and trace calling for mixer. Change macro definition and trace calling for host. Change macro definition and trace calling for mux. Change macro definition and trace calling for eq_fir. Change macro definition and trace calling for eq_iir. Change macro definition and trace calling for src. Change macro definition and trace calling for IPC. src/audio/buffer.c | 13 +-- src/audio/component.c | 31 +++--- src/audio/dai.c | 80 +++++++++------- src/audio/eq_fir.c | 63 ++++++------ src/audio/eq_iir.c | 63 ++++++------ src/audio/host.c | 71 ++++++++------ src/audio/mixer.c | 39 +++++--- src/audio/mux.c | 17 +++- src/audio/pipeline.c | 191 +++++++++++++++++++----------------- src/audio/pipeline_static.c | 2 +- src/audio/src.c | 97 ++++++++++--------- src/audio/src.h | 5 +- src/audio/switch.c | 17 +++- src/audio/tone.c | 79 ++++++++------- src/audio/volume.c | 121 ++++++++++++----------- src/drivers/apl-ssp.c | 29 +++--- src/drivers/byt-ssp.c | 7 +- src/drivers/dw-dma.c | 25 +++-- src/drivers/hda-dma.c | 44 +++++---- src/include/sof/audio/buffer.h | 41 +++++--- src/include/sof/audio/component.h | 34 ++++--- src/include/sof/audio/pipeline.h | 18 +++- src/include/sof/dma-trace.h | 7 ++ src/include/sof/interrupt.h | 12 ++- src/include/sof/ipc.h | 18 +++- src/include/sof/schedule.h | 10 ++ src/include/sof/ssp.h | 14 ++- src/include/sof/trace.h | 197 +++++++++++++++++++++++++++++--------- src/include/sof/wait.h | 21 +++- src/include/uapi/ipc.h | 25 +++++ src/ipc/dma-copy.c | 13 ++- src/ipc/handler.c | 54 ++++++++--- src/ipc/ipc.c | 50 ++++++++-- src/lib/agent.c | 12 ++- src/lib/alloc.c | 18 +++- src/lib/dma-trace.c | 83 +++++++++++++++- src/lib/schedule.c | 20 ++-- src/lib/trace.c | 101 +++++++++++++++++++ 38 files changed, 1173 insertions(+), 569 deletions(-) -- 2.14.3

5 33