January 2017 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH RFC] ASoC: rt5663: use msleep() for long delay loop
by Nicholas Mc Guire 19 Jan '17

19 Jan '17

As the overall delay is in range of seconds and the wait granularity is 10ms msleep() seems more reasonable than to put load on the highres timer subsystem. Fixes: commit df7c52168ee1 ("ASoC: add rt5663 codec driver") Signed-off-by: Nicholas Mc Guire <hofrat(a)osadl.org> --- Problem was found by cocinelle script. This does throw a checkpatch warning with: WARNING: msleep < 20ms can sleep for up to 20ms;" but since this is in a loop and the intended granularity is 10ms with up to 2 seconds total delay this seems ok. Patch was compile tested with: x86_64_defconfig + CONFIG_COMPILE_TEST=y SND_SOC=m + SND_SOC_ALL_CODECS=m (implies SND_SOC_RT5663=m) Patch is aginast 4.10-rc3 (localversion-next is next-20170111) sound/soc/codecs/rt5663.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/rt5663.c b/sound/soc/codecs/rt5663.c index a32508d..3bdb62b 100644 --- a/sound/soc/codecs/rt5663.c +++ b/sound/soc/codecs/rt5663.c @@ -2982,7 +2982,8 @@ static void rt5663_v2_calibrate(struct rt5663_priv *rt5663) static void rt5663_calibrate(struct rt5663_priv *rt5663) { - int value, count; + int value; + unsigned long timeout; regmap_write(rt5663->regmap, RT5663_RC_CLK, 0x0280); regmap_write(rt5663->regmap, RT5663_GLB_CLK, 0x8000); @@ -3025,17 +3026,15 @@ static void rt5663_calibrate(struct rt5663_priv *rt5663) regmap_write(rt5663->regmap, RT5663_HP_CALIB_3, 0x06c2); regmap_write(rt5663->regmap, RT5663_HP_CALIB_1_1, 0x7b00); regmap_write(rt5663->regmap, RT5663_HP_CALIB_1_1, 0xfb00); - count = 0; - while (true) { + + /* allow the write completion to take up to 2s */ + timeout = jiffies + msecs_to_jiffies(2000); + while (time_is_after_jiffies(timeout)) { regmap_read(rt5663->regmap, RT5663_HP_CALIB_1_1, &value); if (value & 0x8000) - usleep_range(10000, 10005); + msleep(10); else break; - - if (count > 200) - return; - count++; } } -- 2.1.4

3 2

[alsa-devel] [PATCH v4 0/2] ASoC: Use DMI name in sound card long name
by mengdong.lin＠linux.intel.com 18 Jan '17

18 Jan '17

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> This series is based on Liam's idea to use DMI name as the sound card short name in the audio workshop. Now we add DMI info to the card long name: - Not change the card short name, keep it simple. So the card ID won't change as well. - Use DMI name to make the card long name. Machine drivers can use a new API to get this feature. In user space, when the sound server ask UCM to open a sound card, UCM will try to find the best machine-specific configuration file based on the card long name, and only if not avaiable, fallback to the default configuration file that matches the card short name. Please see patch: ucm: Automatically load the best config file based on the card long name History: v1 from RFC: Give up using a table to map DMI info to a simple string, since we cannot maintain such a table for each machine. Just do verbatim copy of DMI info and let user space decide how to use the DMI info in card long name to find the best UCM config file. If device driver adds a flavor string, just append it after the DMI info fields to the card long name. v2: Exclude card name and only keep DMI name in the long name, to save the space since the long name cannot exceed 80 characters. Trim special characters like SPACE in the long name, because UCM configuration files & directories may use the same long name and Autoconf cannot handle special characters. v3: Also include DMI product version in the long name, since vendors like Lenovo may only put self-explanatory name in this field. v4: Use "-" as the separator between DMI names in the card long name, and replace "-" in the original DMI names with "_". Liam Girdwood (1): ASoC: core: Add API to use DMI name in sound card long name Mengdong Lin (1): ASoC: Intel: Use DMI name for sound card long name in Broadwell machine driver include/sound/soc.h | 4 ++ sound/soc/intel/boards/broadwell.c | 2 + sound/soc/soc-core.c | 134 +++++++++++++++++++++++++++++++++++++ 3 files changed, 140 insertions(+) -- 2.5.0

5 7

[alsa-devel] Problem with alsa-compile.sh script on Linux Mint 18.1
by Nali Waterfall 18 Jan '17

18 Jan '17

Hello! I have a "Cannot install patch for unsupported distribution Linux" error while trying to run alsa-compile.sh script. The script supports Ubuntu which Mint is base on. What can I do to make it support Mint? nwfall@desktop ~/alsa $ ./alsa-compile.sh File environment.base is cached. > cd /tmp/alsa-compile-script Program git found. Program autoconf found. Program aclocal found. Program gcc found. Cannot install patch for unsupported distribution Linux. nwfall@desktop ~/alsa $ ./alsa-compile.sh --help Usage: ./alsa-compile.sh [OPTION]... This is a script version 0.2.9 doing ALSA code compilation and installation. Report any problems to <alsa-devel(a)alsa-project.org> mailing list. ... nwfall@desktop /tmp/alsa-compile-script $ cat environment.base protocol=http distrib="Linux" distribver="18.1" url="http://www.alsa-project.org/snapshot/?package=alsa-driver" package="alsa-driver" depmodbin="/sbin/depmod" modinfobin="/sbin/modinfo" nwfall@desktop ~ $ lsb_release -ds Linux Mint 18.1 Serena

2 1

[alsa-devel] [PATCH 1/2] crecord: Fix some minor coding style problems
by Richard Fitzgerald 18 Jan '17

18 Jan '17

- Incorrect indenting of arguments to capture_samples() - Wrap long line in capture_samples() - Added a blank line in main() for readability - Deleted extra trailing blank line at end of file Signed-off-by: Richard Fitzgerald <rf(a)opensource.wolfsonmicro.com> --- src/utils/crecord.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/utils/crecord.c b/src/utils/crecord.c index 1ba54d7..390fe45 100644 --- a/src/utils/crecord.c +++ b/src/utils/crecord.c @@ -237,9 +237,9 @@ static int finish_record(void) } static void capture_samples(char *name, unsigned int card, unsigned int device, - unsigned long buffer_size, unsigned int frag, - unsigned int length, unsigned int rate, - unsigned int channels, unsigned int format) + unsigned long buffer_size, unsigned int frag, + unsigned int length, unsigned int rate, + unsigned int channels, unsigned int format) { struct compr_config config; struct snd_codec codec; @@ -268,7 +268,8 @@ static void capture_samples(char *name, unsigned int card, unsigned int device, if (!name) { file = STDOUT_FILENO; } else { - file = open(name, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); + file = open(name, O_RDWR | O_CREAT, + S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); if (file == -1) { fprintf(stderr, "Unable to open file '%s'\n", name); exit(EXIT_FAILURE); @@ -466,6 +467,7 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } } + if (optind >= argc) { file = NULL; finfo = fopen("/dev/null", "w"); @@ -483,4 +485,3 @@ int main(int argc, char **argv) exit(EXIT_SUCCESS); } - -- 1.9.1

2 2

[alsa-devel] [PATCH v6 0/3] ucm: Automatically load the best config file based on the card long name
by mengdong.lin＠linux.intel.com 18 Jan '17

18 Jan '17

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> Intel DSP platform drivers are used by many different devices. For user space to differentiate them, now ASoC provide API for machine drivers to include the DMI info (vendor, product and board) in card long name. This series will add UCM support for loading best device-specific configuration based on the card long name. Mengdong Lin (2): ucm: Load device-specific configuration file based on the card long name ucm: Add command 'get _file' to get the config file name of the opened card History: v2: Request the device-specific file name to match the card long name, no long use automatic key word matching and scoring to avoid error and uncertainty. And add command to check the name of actually loaded configuration file. v3: Fix num in strncpy of the long name, which should be MAX_CARD_LONG_NAME - 1, not MAX_CARD_LONG_NAME (80). v4: No code change. Just update on comments because the kernel v4 patches add DMI product version to the card long name, and use "-" as the separator between DMI fields. v5: Revise the comments. Add patch to assure the input card name not to exceed the maximum card long name supported by kernel to avoid use strncpy and strncmp later. v6: No code change. Fix error in comments: use slash to replace backslash in file path. Mengdong Lin (3): ucm: Assure the user input card name not to exceed max size of card long name ucm: Load device-specific configuration file based on the card long name ucm: Add command 'get _file' to get the config file name of the opened card include/use-case.h | 1 + src/ucm/main.c | 14 +++++++ src/ucm/parser.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++-- src/ucm/ucm_local.h | 3 ++ 4 files changed, 119 insertions(+), 4 deletions(-) -- 2.7.4

2 4

[alsa-devel] Add headphone mic support for ALC221 for HP platform
by Kailang 18 Jan '17

18 Jan '17

Hi Takashi, Attach patch is support headphone Mic for ALC221. Many thanks, Kailang

2 1

[alsa-devel] [PATCH v2 0/3] ucm: Add support for component devices
by mengdong.lin＠linux.intel.com 18 Jan '17

18 Jan '17

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> Sound cards are defined by machines. And off-soc codecs and DSPs embedded in DSP can be taken as the components and resued by different machines/ sound cards. This series allows codec and SOC vendors to install UCM configuration files for a specific codec or DSP, and sound card verb files can include these conf files of components. Component devices will not be exposed to applications for backward compatibility. So audio servers like PulseAudio and CRAS still only see the machine devices. History: v2: Use an array to define component directories. Document syntax to enable/disable a component device. Hide cdev defined by the parent device in ucm manager for executing a component sequence. Mengdong Lin (3): ucm: Skip component directories when scanning sound card configuration files ucm: Parse sequence of component devices ucm: Execute sequence of component devices src/ucm/main.c | 88 +++++++++++++++++++++++++++++- src/ucm/parser.c | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++- src/ucm/ucm_local.h | 19 +++++++ src/ucm/utils.c | 1 + 4 files changed, 259 insertions(+), 3 deletions(-) -- 2.7.4

3 6

[alsa-devel] [PATCH v4 0/2] ucm: Automatically load the best config file based on the card long name
by mengdong.lin＠linux.intel.com 18 Jan '17

18 Jan '17

From: Mengdong Lin <mengdong.lin(a)linux.intel.com> Intel DSP platform drivers are used by many different devices. For user space to differentiate them, now ASoC provide API for machine drivers to include the DMI info (vendor, product and board) in card long name. This series will add UCM support for loading best device-specific configuration based on the card long name. Mengdong Lin (2): ucm: Load device-specific configuration file based on the card long name ucm: Add command 'get _file' to get the config file name of the opened card History: v2: Request the device-specific file name to match the card long name, no long use automatic key word matching and scoring to avoid error and uncertainty. And add command to check the name of actually loaded configuration file. v3: Fix num in strncpy of the long name, which should be MAX_CARD_LONG_NAME - 1, not MAX_CARD_LONG_NAME (80). v4: No code change. Just update on comments because the kernel v4 patches add DMI product version to the card long name, and use "-" as the separator between DMI fields. Mengdong Lin (2): ucm: Load device-specific configuration file based on the card long name ucm: Add command 'get _file' to get the config file name of the opened card include/use-case.h | 1 + src/ucm/main.c | 14 ++++++++ src/ucm/parser.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++++--- src/ucm/ucm_local.h | 3 ++ 4 files changed, 115 insertions(+), 4 deletions(-) -- 2.7.4

3 6

[alsa-devel] [PATCH v7] ASoC: omap-mcbsp: Add PM QoS support for McBSP to prevent glitches
by Matt Ranostay 18 Jan '17

18 Jan '17

We can get audio errors if hitting deeper idle states on omaps: [alsa.c:230] error: Fatal problem with alsa output, error -5. [audio.c:614] error: Error in writing audio (Input/output error?)! This seems to happen with off mode idle enabled as power for the whole SoC may get cut off between filling the McBSP fifo using DMA. While active DMA blocks deeper idle states in hardware, McBSP activity does not seem to do so. Basing the QoS latency calculation on the FIFO size, threshold, sample rate, and channels. Based on the original patch by Tony Lindgren Link: https://patchwork.kernel.org/patch/9305867/ Cc: Tony Lindgren <tony(a)atomide.com> Cc: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Acked-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> Signed-off-by: Matt Ranostay <matt(a)ranostay.consulting> --- Changes from v1: * add calculations for latency per number of FIFO locations Changes from v2: * add missing mcbsp.h header change Changes from v3: * base the latency calculations on threshold, buffer size, sample rate, and channels Changes from v4: * using Peter Ujfalusi's suggestions for restoring a higher latency on audio stream completion, or if not applicable remove the QoS request Changes from v5: * clean up latency checking logic * move logic to .prepare and .shutdown to avoid functions that can sleep Changes from v6: * move QoS removal to asoc_mcbsp_remove from omap_mcbsp_cleanup * also remove header include that is unneeded sound/soc/omap/mcbsp.h | 3 +++ sound/soc/omap/omap-mcbsp.c | 47 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/sound/soc/omap/mcbsp.h b/sound/soc/omap/mcbsp.h index 61e93b1c185d..46ae1269a698 100644 --- a/sound/soc/omap/mcbsp.h +++ b/sound/soc/omap/mcbsp.h @@ -323,8 +323,11 @@ struct omap_mcbsp { unsigned int fmt; unsigned int in_freq; + unsigned int latency[2]; int clk_div; int wlen; + + struct pm_qos_request pm_qos_req; }; void omap_mcbsp_config(struct omap_mcbsp *mcbsp, diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index d018e966e533..3b8c9724d496 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c @@ -157,6 +157,16 @@ static void omap_mcbsp_dai_shutdown(struct snd_pcm_substream *substream, struct snd_soc_dai *cpu_dai) { struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai); + int tx = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK); + int stream1 = tx ? SNDRV_PCM_STREAM_PLAYBACK : SNDRV_PCM_STREAM_CAPTURE; + int stream2 = tx ? SNDRV_PCM_STREAM_CAPTURE : SNDRV_PCM_STREAM_PLAYBACK; + + mcbsp->latency[stream1] = 0; + if (mcbsp->latency[stream2]) + pm_qos_update_request(&mcbsp->pm_qos_req, + mcbsp->latency[stream2]); + else + pm_qos_remove_request(&mcbsp->pm_qos_req); if (!cpu_dai->active) { omap_mcbsp_free(mcbsp); @@ -164,6 +174,28 @@ static void omap_mcbsp_dai_shutdown(struct snd_pcm_substream *substream, } } +static int omap_mcbsp_dai_prepare(struct snd_pcm_substream *substream, + struct snd_soc_dai *cpu_dai) +{ + struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai); + struct pm_qos_request *pm_qos_req = &mcbsp->pm_qos_req; + int tx = (substream->stream == SNDRV_PCM_STREAM_PLAYBACK); + int stream1 = tx ? SNDRV_PCM_STREAM_PLAYBACK : SNDRV_PCM_STREAM_CAPTURE; + int stream2 = tx ? SNDRV_PCM_STREAM_CAPTURE : SNDRV_PCM_STREAM_PLAYBACK; + int latency = mcbsp->latency[stream2]; + + /* Prevent omap hardware from hitting off between FIFO fills */ + if (!latency || mcbsp->latency[stream1] < latency) + latency = mcbsp->latency[stream1]; + + if (pm_qos_request_active(pm_qos_req)) + pm_qos_update_request(pm_qos_req, latency); + else if (latency) + pm_qos_add_request(pm_qos_req, PM_QOS_CPU_DMA_LATENCY, latency); + + return 0; +} + static int omap_mcbsp_dai_trigger(struct snd_pcm_substream *substream, int cmd, struct snd_soc_dai *cpu_dai) { @@ -226,6 +258,7 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, int wlen, channels, wpf; int pkt_size = 0; unsigned int format, div, framesize, master; + unsigned int buffer_size = mcbsp->pdata->buffer_size; dma_data = snd_soc_dai_get_dma_data(cpu_dai, substream); channels = params_channels(params); @@ -240,7 +273,9 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, default: return -EINVAL; } - if (mcbsp->pdata->buffer_size) { + if (buffer_size) { + int latency; + if (mcbsp->dma_op_mode == MCBSP_DMA_MODE_THRESHOLD) { int period_words, max_thrsh; int divider = 0; @@ -271,6 +306,12 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, /* Use packet mode for non mono streams */ pkt_size = channels; } + + latency = ((((buffer_size - pkt_size) / channels) * 1000) + / (params->rate_num / params->rate_den)); + + mcbsp->latency[substream->stream] = latency; + omap_mcbsp_set_threshold(substream, pkt_size); } @@ -554,6 +595,7 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai, static const struct snd_soc_dai_ops mcbsp_dai_ops = { .startup = omap_mcbsp_dai_startup, .shutdown = omap_mcbsp_dai_shutdown, + .prepare = omap_mcbsp_dai_prepare, .trigger = omap_mcbsp_dai_trigger, .delay = omap_mcbsp_dai_delay, .hw_params = omap_mcbsp_dai_hw_params, @@ -835,6 +877,9 @@ static int asoc_mcbsp_remove(struct platform_device *pdev) if (mcbsp->pdata->ops && mcbsp->pdata->ops->free) mcbsp->pdata->ops->free(mcbsp->id); + if (pm_qos_request_active(&mcbsp->pm_qos_req)) + pm_qos_remove_request(&mcbsp->pm_qos_req); + omap_mcbsp_cleanup(mcbsp); clk_put(mcbsp->fclk); -- 2.10.2

3 7

Re: [alsa-devel] [PATCH v2 03/10] dt-bindings: sound: Add new reset compatible for sun4i-i2s
by Icenowy Zheng 17 Jan '17

17 Jan '17

2017年1月17日 22:02于 Mylène Josserand <mylene.josserand(a)free-electrons.com>写道： > > Add a new compatible for sun4i-i2s driver to handle some > SoCs that have a reset line that must be asserted/deasserted. > > This new compatible, "allwinner,sun6i-a31-i2s", requires two > properties: > - resets: phandle to the reset line > - reset-names: the name of the reset line ("rst"). > Except these differences, the compatible is identical to previous one > which will not handle a reset line. But I think the IP block is identical, right? Should a new compatible be added only for reset-line? > > Signed-off-by: Mylène Josserand <mylene.josserand(a)free-electrons.com> > --- > .../devicetree/bindings/sound/sun4i-i2s.txt | 23 ++++++++++++++++++++++ > 1 file changed, 23 insertions(+) > > diff --git a/Documentation/devicetree/bindings/sound/sun4i-i2s.txt b/Documentation/devicetree/bindings/sound/sun4i-i2s.txt > index 7a2c0945fd22..f673206e309b 100644 > --- a/Documentation/devicetree/bindings/sound/sun4i-i2s.txt > +++ b/Documentation/devicetree/bindings/sound/sun4i-i2s.txt > @@ -7,6 +7,7 @@ Required properties: > > - compatible: should be one of the following: > - "allwinner,sun4i-a10-i2s" > + - "allwinner,sun6i-a31-i2s" for controller with reset lines > - reg: physical base address of the controller and length of memory mapped > region. > - interrupts: should contain the I2S interrupt. > @@ -19,7 +20,13 @@ Required properties: > - "mod" : module clock for the I2S controller > - #sound-dai-cells : Must be equal to 0 > > +Required properties for the following compatibles: > + - "allwinner,sun6i-a31-i2s" > +- resets: phandle to the reset line for this codec > +- reset-names: Contains the reset signal name "rst" > + > Example: > +For "allwinner,sun4i-a10-i2s": > > i2s0: i2s@01c22400 { > #sound-dai-cells = <0>; > @@ -32,3 +39,19 @@ i2s0: i2s@01c22400 { > <&dma SUN4I_DMA_NORMAL 3>; > dma-names = "rx", "tx"; > }; > + > +For "allwinner,sun6i-a31-i2s": > + > +dai: dai@01c22c00 { > + #sound-dai-cells = <0>; > + compatible = "allwinner,sun6i-a31-i2s"; > + reg = <0x01c22c00 0x200>; > + interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; > + clocks = <&ccu CLK_BUS_CODEC>, <&ccu CLK_AC_DIG>; > + clock-names = "apb", "mod"; > + resets = <&ccu RST_BUS_CODEC>; > + reset-names = "rst"; > + dmas = <&dma 15>, /* AUDIO_CODEC port */ > + <&dma 15>; /* AUDIO_CODEC port */ > + dma-names = "rx", "tx"; > +}; > -- > 2.11.0 > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel(a)lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

2 1