May 2016 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH v2] alsabat: add buffer size and period size settings
by vivian.zhang＠intel.com 31 May '16

31 May '16

From: "vivian,zhang" <vivian.zhang(a)intel.com> Add buffer size and period size settings in alsabat. With -E and -B options, alsabat performs the test with specified buffer size and period size Signed-off-by: Zhang Vivian <vivian.zhang(a)intel.com> --- Changes in v2: - Use a micro for min and max values of buffer size and period size - Use a micro for default period size in tinyalsa.c bat/alsa.c | 95 +++++++++++++++++++++++++++++++++++++++----------------- bat/bat.c | 18 +++++++++-- bat/common.h | 8 +++++ bat/tinyalsa.c | 5 ++- 4 files changed, 94 insertions(+), 32 deletions(-) diff --git a/bat/alsa.c b/bat/alsa.c index 75158cb..0a37714 100644 --- a/bat/alsa.c +++ b/bat/alsa.c @@ -74,6 +74,8 @@ static int set_snd_pcm_params(struct bat *bat, struct pcm_container *sndpcm) snd_pcm_format_t format; unsigned int buffer_time = 0; unsigned int period_time = 0; + snd_pcm_uframes_t buffer_size = 0; + snd_pcm_uframes_t period_size = 0; unsigned int rate; int err; const char *device_name = snd_pcm_name(sndpcm->handle); @@ -145,39 +147,71 @@ static int set_snd_pcm_params(struct bat *bat, struct pcm_container *sndpcm) return -EINVAL; } - if (snd_pcm_hw_params_get_buffer_time_max(params, - &buffer_time, 0) < 0) { - fprintf(bat->err, _("Get parameter from device error: ")); - fprintf(bat->err, _("buffer time: %d %s: %s(%d)\n"), - buffer_time, - device_name, snd_strerror(err), err); - return -EINVAL; - } + if (bat->buffer_size > 0 && bat->period_size == 0) + bat->period_size = bat->buffer_size / DIV_BUFFERTIME; - if (buffer_time > MAX_BUFFERTIME) - buffer_time = MAX_BUFFERTIME; + if (bat->buffer_size > 0) { + buffer_size = bat->buffer_size; + period_size = bat->period_size; - period_time = buffer_time / DIV_BUFFERTIME; + fprintf(bat->log, _("Set period size: %d buffer size: %d\n"), + (int) period_size, (int) buffer_size); - /* Set buffer time and period time */ - err = snd_pcm_hw_params_set_buffer_time_near(sndpcm->handle, params, - &buffer_time, 0); - if (err < 0) { - fprintf(bat->err, _("Set parameter to device error: ")); - fprintf(bat->err, _("buffer time: %d %s: %s(%d)\n"), - buffer_time, - device_name, snd_strerror(err), err); - return err; - } + err = snd_pcm_hw_params_set_buffer_size_near(sndpcm->handle, + params, &buffer_size); + if (err < 0) { + fprintf(bat->err, _("Set parameter to device error: ")); + fprintf(bat->err, _("buffer size: %d %s: %s(%d)\n"), + (int) buffer_size, + device_name, snd_strerror(err), err); + return err; + } - err = snd_pcm_hw_params_set_period_time_near(sndpcm->handle, params, - &period_time, 0); - if (err < 0) { - fprintf(bat->err, _("Set parameter to device error: ")); - fprintf(bat->err, _("period time: %d %s: %s(%d)\n"), - period_time, - device_name, snd_strerror(err), err); - return err; + err = snd_pcm_hw_params_set_period_size_near(sndpcm->handle, + params, &period_size, 0); + if (err < 0) { + fprintf(bat->err, _("Set parameter to device error: ")); + fprintf(bat->err, _("period size: %d %s: %s(%d)\n"), + (int) period_size, + device_name, snd_strerror(err), err); + return err; + } + } else { + if (snd_pcm_hw_params_get_buffer_time_max(params, + &buffer_time, 0) < 0) { + fprintf(bat->err, + _("Get parameter from device error: ")); + fprintf(bat->err, _("buffer time: %d %s: %s(%d)\n"), + buffer_time, + device_name, snd_strerror(err), err); + return -EINVAL; + } + + if (buffer_time > MAX_BUFFERTIME) + buffer_time = MAX_BUFFERTIME; + + period_time = buffer_time / DIV_BUFFERTIME; + + /* Set buffer time and period time */ + err = snd_pcm_hw_params_set_buffer_time_near(sndpcm->handle, + params, &buffer_time, 0); + if (err < 0) { + fprintf(bat->err, _("Set parameter to device error: ")); + fprintf(bat->err, _("buffer time: %d %s: %s(%d)\n"), + buffer_time, + device_name, snd_strerror(err), err); + return err; + } + + err = snd_pcm_hw_params_set_period_time_near(sndpcm->handle, + params, &period_time, 0); + if (err < 0) { + fprintf(bat->err, _("Set parameter to device error: ")); + fprintf(bat->err, _("period time: %d %s: %s(%d)\n"), + period_time, + device_name, snd_strerror(err), err); + return err; + } } /* Write the parameters to the driver */ @@ -214,6 +248,9 @@ static int set_snd_pcm_params(struct bat *bat, struct pcm_container *sndpcm) return -EINVAL; } + fprintf(bat->log, _("Get period size: %d buffer size: %d\n"), + (int) sndpcm->period_size, (int) sndpcm->buffer_size); + err = snd_pcm_format_physical_width(format); if (err < 0) { fprintf(bat->err, _("Invalid parameters: ")); diff --git a/bat/bat.c b/bat/bat.c index 1afdcb4..cd4ea2d 100644 --- a/bat/bat.c +++ b/bat/bat.c @@ -292,6 +292,8 @@ _("Usage: alsabat [-options]...\n" " -k parameter for frequency detecting threshold\n" " -F target frequency\n" " -p total number of periods to play/capture\n" +" -B buffer size in frames\n" +" -E period size in frames\n" " --log=# file that both stdout and strerr redirecting to\n" " --file=# file for playback\n" " --saveplay=# file that storing playback content, for debug\n" @@ -324,6 +326,8 @@ static void set_defaults(struct bat *bat) bat->capture.device = NULL; bat->buf = NULL; bat->local = false; + bat->buffer_size = 0; + bat->period_size = 0; #ifdef HAVE_LIBTINYALSA bat->channels = 2; bat->playback.fct = &playback_tinyalsa; @@ -342,8 +346,8 @@ static void set_defaults(struct bat *bat) static void parse_arguments(struct bat *bat, int argc, char *argv[]) { - int c, option_index; - static const char short_options[] = "D:P:C:f:n:F:c:r:s:k:p:lth"; + int c, option_index, err; + static const char short_options[] = "D:P:C:f:n:F:c:r:s:k:p:B:E:lth"; static const struct option long_options[] = { {"help", 0, 0, 'h'}, {"log", 1, 0, OPT_LOG}, @@ -414,6 +418,16 @@ static void parse_arguments(struct bat *bat, int argc, char *argv[]) bat->periods_total = atoi(optarg); bat->period_is_limited = true; break; + case 'B': + err = atoi(optarg); + bat->buffer_size = err >= MIN_BUFFERSIZE + && err < MAX_BUFFERSIZE ? err : 0; + break; + case 'E': + err = atoi(optarg); + bat->period_size = err >= MIN_PERIODSIZE + && err < MAX_PERIODSIZE ? err : 0; + break; case 'h': default: usage(bat); diff --git a/bat/common.h b/bat/common.h index b789af5..ad02a5a 100644 --- a/bat/common.h +++ b/bat/common.h @@ -46,6 +46,12 @@ #define DIV_BUFFERTIME 8 /* margin to avoid sign inversion when generate sine wav */ #define RANGE_FACTOR 0.95 +#define MAX_BUFFERSIZE 200000 +#define MIN_BUFFERSIZE 32 +#define MAX_PERIODSIZE 200000 +#define MIN_PERIODSIZE 32 +/* default period size for tinyalsa */ +#define TINYALSA_PERIODSIZE 1024 #define EBATBASE 1000 #define ENOPEAK (EBATBASE + 1) @@ -152,6 +158,8 @@ struct bat { int frame_size; /* size of frame */ int sample_size; /* size of sample */ enum _bat_pcm_format format; /* PCM format */ + int buffer_size; /* buffer size in frames */ + int period_size; /* period size in frames */ float sigma_k; /* threshold for peak detection */ float target_freq[MAX_CHANNELS]; diff --git a/bat/tinyalsa.c b/bat/tinyalsa.c index ea5f848..a19dd90 100644 --- a/bat/tinyalsa.c +++ b/bat/tinyalsa.c @@ -57,7 +57,10 @@ static int init_config(struct bat *bat, struct pcm_config *config) { config->channels = bat->channels; config->rate = bat->rate; - config->period_size = 1024; + if (bat->period_size > 0) + config->period_size = bat->period_size; + else + config->period_size = TINYALSA_PERIODSIZE; config->period_count = 4; config->start_threshold = 0; config->stop_threshold = 0; -- 1.7.9.5

2 1

[alsa-devel] [PATCH] ASoC: wm8731: Add 32 bit functionality
by Matt Flax 31 May '16

31 May '16

This patch adds 32 bit functionality to the wm8731 codec driver. Enabling this functionality for the Audio Injector sound card. Signed-off-by: Matt Flax <flatmax(a)flatmax.org> --- sound/soc/codecs/wm8731.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 4bcf5f8..a9fc3bc 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -5,6 +5,7 @@ * Copyright 2006-12 Wolfson Microelectronics, plc * * Author: Richard Purdie <richard(a)openedhand.com> + * Author: Matt Flax <flatmax(a)flatmax.com> added 32bit functionality. * * Based on wm8753.c by Liam Girdwood * @@ -358,6 +359,9 @@ static int wm8731_hw_params(struct snd_pcm_substream *substream, case 24: iface |= 0x0008; break; + case 32: + iface |= 0x000c; + break; } wm8731_set_deemph(codec); @@ -541,7 +545,7 @@ static int wm8731_startup(struct snd_pcm_substream *substream, #define WM8731_RATES SNDRV_PCM_RATE_8000_96000 #define WM8731_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ - SNDRV_PCM_FMTBIT_S24_LE) + SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) static const struct snd_soc_dai_ops wm8731_dai_ops = { .startup = wm8731_startup, -- 2.5.0

1 0

[alsa-devel] ALC256 speaker noise issue
by Kailang 31 May '16

31 May '16

Hi Takashi, ALC256 had speaker noise issue. Attach patch will solve it. This issue is cause from LDO output voltage control. This patch is updated the right LDO register value. Many Thanks. Kailang

2 5

[alsa-devel] [PATCH 0/7] ASoC: Intel: Skylake: Manifest parsing support
by Vinod Koul 30 May '16

30 May '16

The firmware file contains the extended manifest which needs to be stripped before downloading of firmware. The firmware manifest also contains manifest which has module information, Driver needs to parse and create module information and use it for sending IPCs. So this series adds common API for stripping manifest and then strips it for SKL and BXT. Also it adds core support to parse and add module information and its use in SKL and BXT. Changes in this series: - modified manifest parse to be generic utility code, added calling patches from SKL n BXTN - fix issues in last rvw - add extended manifest parsing in this series - make manifest series common and use list instead of table and bxtn modules will have manifest parsing and addition later Ramesh Babu (1): ASoC: Intel: Skylake: Add strip extended manifest utility Shreyas NC (1): ASoC: Intel: Skylake: Add DSP firmware manifest parsing Vinod Koul (5): ASoC: Intel: Skylake: Don't use local pointer for firmware ASoC: Intel: Skylake: Strip manifest for Skylake platform ASoC: Intel: Skylake: Strip manifest for Broxton platform ASoC: Intel: Skylake: Find uuids for Skylake ASoC: Intel: Skylake: Find uuids for Broxton sound/soc/intel/skylake/Makefile | 2 +- sound/soc/intel/skylake/bxt-sst.c | 26 +++- sound/soc/intel/skylake/skl-sst-dsp.h | 8 + sound/soc/intel/skylake/skl-sst-ipc.h | 3 + sound/soc/intel/skylake/skl-sst-utils.c | 256 ++++++++++++++++++++++++++++++++ sound/soc/intel/skylake/skl-sst.c | 23 ++- sound/soc/intel/skylake/skl-topology.c | 4 + 7 files changed, 315 insertions(+), 7 deletions(-) create mode 100644 sound/soc/intel/skylake/skl-sst-utils.c -- 1.9.1

2 14

[alsa-devel] [PATCH 1/2 v2] ASoC: nau8825: non-clock jack detection for power saving at standby
by John Hsu 30 May '16

30 May '16

The driver changes jack type detection interruption to non-clock archi- tecture for less 1mW power saving. The architecture is called manual mode jack detection. It has no hardware debounce, no jack type detection, but only detecting jack insertion. After jack insertion, the driver will switch to auto mode jack detection with internal clock which can detect microphone, jack type and do hardware debounce. The manual architecture has these main changes including codec initiation, interruption, clock control, and power management. When codec initiation or system resume, the clock is closed as jack insertion detection at man- ual mode, and bypass debounce circuit. These configurations move to resume setup function when setup bias level after resume. When jack insertion detection happens, the manual mode turns off and make configuration about jack type detection interruption at auto mode in auto irq setup function which can detect microphone and jack type. The inter- ruption will switch to manual mode again with clock free until jack ejec- tion happens. The system clock configuration adds clock disable option which can disable internal VCO clock. Before the system clock change, there is an restric- tion added to make sure clock disabled and not config any clock when no headset connected. In power management, we involve the solution about races and jack detec- tion in resume from Ben Zhang in the following patch and list his comment. [PATCH] ASoC: nau8825: Fix jack detection across suspend "Jack plug status is rechecked at resume to handle plug/unplug in S3 when the chip has no power." "Suspend/resume callbacks are moved from the i2c dev_pm_ops to snd_soc_codec_driver. soc_resume_deferred is a delayed work which may trigger nau8825_set_bias_level. The bias change races against dev_pm_ops, causing jack detection issues. soc_resume_deferred ensures bias change and snd_soc_codec_driver suspend/resume are sequenced correctly." Change SAR widget to supply type which can prevent the codec keeping at SND_SOC_BIAS_ON during suspend. The codec suspend function can just invoke normally. Before the system suspends, the driver turns off all interruptions. Keep the interruption quiet before resume setup completes. The ADC channel will be disabled which is needed for interruptions at audo mode. Signed-off-by: John Hsu <KCHSU0(a)nuvoton.com> Signed-off-by: Ben Zhang <benzh(a)chromium.org> --- sound/soc/codecs/nau8825.c | 295 ++++++++++++++++++++++++++++++++------------- sound/soc/codecs/nau8825.h | 9 +- 2 files changed, 222 insertions(+), 82 deletions(-) diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c index f35019a..e738234 100644 --- a/sound/soc/codecs/nau8825.c +++ b/sound/soc/codecs/nau8825.c @@ -30,10 +30,16 @@ #include "nau8825.h" + +#define NUVOTON_CODEC_DAI "nau8825-hifi" + #define NAU_FREF_MAX 13500000 #define NAU_FVCO_MAX 124000000 #define NAU_FVCO_MIN 90000000 +static int nau8825_configure_sysclk(struct nau8825 *nau8825, + int clk_id, unsigned int freq); + struct nau8825_fll { int mclk_src; int ratio; @@ -368,9 +374,12 @@ static const struct snd_soc_dapm_widget nau8825_dapm_widgets[] = { SND_SOC_DAPM_SUPPLY("ADC Power", NAU8825_REG_ANALOG_ADC_2, 6, 0, NULL, 0), - /* ADC for button press detection */ - SND_SOC_DAPM_ADC("SAR", NULL, NAU8825_REG_SAR_CTRL, - NAU8825_SAR_ADC_EN_SFT, 0), + /* ADC for button press detection. A dapm supply widget is used to + * prevent dapm_power_widgets keeping the codec at SND_SOC_BIAS_ON + * during suspend. + */ + SND_SOC_DAPM_SUPPLY("SAR", NAU8825_REG_SAR_CTRL, + NAU8825_SAR_ADC_EN_SFT, 0, NULL, 0), SND_SOC_DAPM_PGA_S("ADACL", 2, NAU8825_REG_RDAC, 12, 0, NULL, 0), SND_SOC_DAPM_PGA_S("ADACR", 2, NAU8825_REG_RDAC, 13, 0, NULL, 0), @@ -614,9 +623,6 @@ int nau8825_enable_jack_detect(struct snd_soc_codec *codec, NAU8825_HSD_AUTO_MODE | NAU8825_SPKR_DWN1R | NAU8825_SPKR_DWN1L, NAU8825_HSD_AUTO_MODE | NAU8825_SPKR_DWN1R | NAU8825_SPKR_DWN1L); - regmap_update_bits(regmap, NAU8825_REG_INTERRUPT_MASK, - NAU8825_IRQ_HEADSET_COMPLETE_EN | NAU8825_IRQ_EJECT_EN, 0); - return 0; } EXPORT_SYMBOL_GPL(nau8825_enable_jack_detect); @@ -642,6 +648,22 @@ static void nau8825_restart_jack_detection(struct regmap *regmap) NAU8825_JACK_DET_RESTART, 0); } +static void nau8825_int_status_clear_all(struct regmap *regmap) +{ + int active_irq, clear_irq, i; + + /* Reset the intrruption status from rightmost bit if the corres- + * ponding irq event occurs. + */ + regmap_read(regmap, NAU8825_REG_IRQ_STATUS, &active_irq); + for (i = 0; i < NAU8825_REG_DATA_LEN; i++) { + clear_irq = (0x1 << i); + if (active_irq & clear_irq) + regmap_write(regmap, + NAU8825_REG_INT_CLR_KEY_STATUS, clear_irq); + } +} + static void nau8825_eject_jack(struct nau8825 *nau8825) { struct snd_soc_dapm_context *dapm = nau8825->dapm; @@ -656,6 +678,69 @@ static void nau8825_eject_jack(struct nau8825 *nau8825) regmap_update_bits(regmap, NAU8825_REG_HSD_CTRL, 0xf, 0xf); snd_soc_dapm_sync(dapm); + + /* Clear all interruption status */ + nau8825_int_status_clear_all(regmap); + + /* Enable the insertion interruption, disable the ejection inter- + * ruption, and then bypass de-bounce circuit. + */ + regmap_update_bits(regmap, NAU8825_REG_INTERRUPT_DIS_CTRL, + NAU8825_IRQ_EJECT_DIS | NAU8825_IRQ_INSERT_DIS, + NAU8825_IRQ_EJECT_DIS); + regmap_update_bits(regmap, NAU8825_REG_INTERRUPT_MASK, + NAU8825_IRQ_OUTPUT_EN | NAU8825_IRQ_EJECT_EN | + NAU8825_IRQ_HEADSET_COMPLETE_EN | NAU8825_IRQ_INSERT_EN, + NAU8825_IRQ_OUTPUT_EN | NAU8825_IRQ_EJECT_EN | + NAU8825_IRQ_HEADSET_COMPLETE_EN); + regmap_update_bits(regmap, NAU8825_REG_JACK_DET_CTRL, + NAU8825_JACK_DET_DB_BYPASS, NAU8825_JACK_DET_DB_BYPASS); + + /* Disable ADC needed for interruptions at audo mode */ + regmap_update_bits(regmap, NAU8825_REG_ENA_CTRL, + NAU8825_ENABLE_ADC, 0); + + /* Close clock for jack type detection at manual mode */ + nau8825_configure_sysclk(nau8825, NAU8825_CLK_DIS, 0); +} + +/* Enable audo mode interruptions with internal clock. */ +static void nau8825_setup_auto_irq(struct nau8825 *nau8825) +{ + struct regmap *regmap = nau8825->regmap; + + /* Enable headset jack type detection complete interruption and + * jack ejection interruption. + */ + regmap_update_bits(regmap, NAU8825_REG_INTERRUPT_MASK, + NAU8825_IRQ_HEADSET_COMPLETE_EN | NAU8825_IRQ_EJECT_EN, 0); + + /* Enable internal VCO needed for interruptions */ + nau8825_configure_sysclk(nau8825, NAU8825_CLK_INTERNAL, 0); + + /* Enable ADC needed for interruptions */ + regmap_update_bits(regmap, NAU8825_REG_ENA_CTRL, + NAU8825_ENABLE_ADC, NAU8825_ENABLE_ADC); + + /* Chip needs one FSCLK cycle in order to generate interruptions, + * as we cannot guarantee one will be provided by the system. Turning + * master mode on then off enables us to generate that FSCLK cycle + * with a minimum of contention on the clock bus. + */ + regmap_update_bits(regmap, NAU8825_REG_I2S_PCM_CTRL2, + NAU8825_I2S_MS_MASK, NAU8825_I2S_MS_MASTER); + regmap_update_bits(regmap, NAU8825_REG_I2S_PCM_CTRL2, + NAU8825_I2S_MS_MASK, NAU8825_I2S_MS_SLAVE); + + /* Not bypass de-bounce circuit */ + regmap_update_bits(regmap, NAU8825_REG_JACK_DET_CTRL, + NAU8825_JACK_DET_DB_BYPASS, 0); + + /* Unmask all interruptions */ + regmap_write(regmap, NAU8825_REG_INTERRUPT_DIS_CTRL, 0); + + /* Restart the jack detection process at auto mode */ + nau8825_restart_jack_detection(regmap); } static int nau8825_button_decode(int value) @@ -789,6 +874,26 @@ static irqreturn_t nau8825_interrupt(int irq, void *data) event_mask |= SND_JACK_HEADSET; clear_irq = NAU8825_HEADSET_COMPLETION_IRQ; + } else if ((active_irq & NAU8825_JACK_INSERTION_IRQ_MASK) == + NAU8825_JACK_INSERTION_DETECTED) { + /* One more step to check GPIO status directly. Thus, the + * driver can confirm the real insertion interruption because + * the intrruption at manual mode has bypassed debounce + * circuit which can get rid of unstable status. + */ + if (nau8825_is_jack_inserted(regmap)) { + /* Turn off insertion interruption at manual mode */ + regmap_update_bits(regmap, + NAU8825_REG_INTERRUPT_DIS_CTRL, + NAU8825_IRQ_INSERT_DIS, + NAU8825_IRQ_INSERT_DIS); + regmap_update_bits(regmap, NAU8825_REG_INTERRUPT_MASK, + NAU8825_IRQ_INSERT_EN, NAU8825_IRQ_INSERT_EN); + /* Enable interruption for jack type detection at audo + * mode which can detect microphone and jack type. + */ + nau8825_setup_auto_irq(nau8825); + } } if (!clear_irq) @@ -938,8 +1043,8 @@ static void nau8825_init_regs(struct nau8825 *nau8825) } static const struct regmap_config nau8825_regmap_config = { - .val_bits = 16, - .reg_bits = 16, + .val_bits = NAU8825_REG_DATA_LEN, + .reg_bits = NAU8825_REG_ADDR_LEN, .max_register = NAU8825_REG_MAX, .readable_reg = nau8825_readable_reg, @@ -958,12 +1063,6 @@ static int nau8825_codec_probe(struct snd_soc_codec *codec) nau8825->dapm = dapm; - /* Unmask interruptions. Handler uses dapm object so we can enable - * interruptions only after dapm is fully initialized. - */ - regmap_write(nau8825->regmap, NAU8825_REG_INTERRUPT_DIS_CTRL, 0); - nau8825_restart_jack_detection(nau8825->regmap); - return 0; } @@ -1128,6 +1227,14 @@ static int nau8825_mclk_prepare(struct nau8825 *nau8825, unsigned int freq) return 0; } +static void nau8825_configure_mclk_as_sysclk(struct regmap *regmap) +{ + regmap_update_bits(regmap, NAU8825_REG_CLK_DIVIDER, + NAU8825_CLK_SRC_MASK, NAU8825_CLK_SRC_MCLK); + regmap_update_bits(regmap, NAU8825_REG_FLL6, + NAU8825_DCO_EN, 0); +} + static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id, unsigned int freq) { @@ -1135,10 +1242,17 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id, int ret; switch (clk_id) { + case NAU8825_CLK_DIS: + /* Clock provided externally and disable internal VCO clock */ + nau8825_configure_mclk_as_sysclk(regmap); + if (nau8825->mclk_freq) { + clk_disable_unprepare(nau8825->mclk); + nau8825->mclk_freq = 0; + } + + break; case NAU8825_CLK_MCLK: - regmap_update_bits(regmap, NAU8825_REG_CLK_DIVIDER, - NAU8825_CLK_SRC_MASK, NAU8825_CLK_SRC_MCLK); - regmap_update_bits(regmap, NAU8825_REG_FLL6, NAU8825_DCO_EN, 0); + nau8825_configure_mclk_as_sysclk(regmap); /* MCLK not changed by clock tree */ regmap_update_bits(regmap, NAU8825_REG_CLK_DIVIDER, NAU8825_CLK_MCLK_SRC_MASK, 0); @@ -1148,17 +1262,25 @@ static int nau8825_configure_sysclk(struct nau8825 *nau8825, int clk_id, break; case NAU8825_CLK_INTERNAL: - regmap_update_bits(regmap, NAU8825_REG_FLL6, NAU8825_DCO_EN, - NAU8825_DCO_EN); - regmap_update_bits(regmap, NAU8825_REG_CLK_DIVIDER, - NAU8825_CLK_SRC_MASK, NAU8825_CLK_SRC_VCO); - /* Decrease the VCO frequency for power saving */ - regmap_update_bits(regmap, NAU8825_REG_CLK_DIVIDER, - NAU8825_CLK_MCLK_SRC_MASK, 0xf); - regmap_update_bits(regmap, NAU8825_REG_FLL1, - NAU8825_FLL_RATIO_MASK, 0x10); - regmap_update_bits(regmap, NAU8825_REG_FLL6, - NAU8825_SDM_EN, NAU8825_SDM_EN); + if (nau8825_is_jack_inserted(nau8825->regmap)) { + regmap_update_bits(regmap, NAU8825_REG_FLL6, + NAU8825_DCO_EN, NAU8825_DCO_EN); + regmap_update_bits(regmap, NAU8825_REG_CLK_DIVIDER, + NAU8825_CLK_SRC_MASK, NAU8825_CLK_SRC_VCO); + /* Decrease the VCO frequency for power saving */ + regmap_update_bits(regmap, NAU8825_REG_CLK_DIVIDER, + NAU8825_CLK_MCLK_SRC_MASK, 0xf); + regmap_update_bits(regmap, NAU8825_REG_FLL1, + NAU8825_FLL_RATIO_MASK, 0x10); + regmap_update_bits(regmap, NAU8825_REG_FLL6, + NAU8825_SDM_EN, NAU8825_SDM_EN); + } else { + /* The clock turns off intentionally for power saving + * when no headset connected. + */ + nau8825_configure_mclk_as_sysclk(regmap); + dev_warn(nau8825->dev, "Disable clock for power saving when no headset connected\n"); + } if (nau8825->mclk_freq) { clk_disable_unprepare(nau8825->mclk); nau8825->mclk_freq = 0; @@ -1209,6 +1331,31 @@ static int nau8825_set_sysclk(struct snd_soc_codec *codec, int clk_id, return nau8825_configure_sysclk(nau8825, clk_id, freq); } +static int nau8825_resume_setup(struct nau8825 *nau8825) +{ + struct regmap *regmap = nau8825->regmap; + + /* Close clock when jack type detection at manual mode */ + nau8825_configure_sysclk(nau8825, NAU8825_CLK_DIS, 0); + + /* Clear all interruption status */ + nau8825_int_status_clear_all(regmap); + + /* Enable both insertion and ejection interruptions, and then + * bypass de-bounce circuit. + */ + regmap_update_bits(regmap, NAU8825_REG_INTERRUPT_MASK, + NAU8825_IRQ_OUTPUT_EN | NAU8825_IRQ_HEADSET_COMPLETE_EN | + NAU8825_IRQ_EJECT_EN | NAU8825_IRQ_INSERT_EN, + NAU8825_IRQ_OUTPUT_EN | NAU8825_IRQ_HEADSET_COMPLETE_EN); + regmap_update_bits(regmap, NAU8825_REG_JACK_DET_CTRL, + NAU8825_JACK_DET_DB_BYPASS, NAU8825_JACK_DET_DB_BYPASS); + regmap_update_bits(regmap, NAU8825_REG_INTERRUPT_DIS_CTRL, + NAU8825_IRQ_INSERT_DIS | NAU8825_IRQ_EJECT_DIS, 0); + + return 0; +} + static int nau8825_set_bias_level(struct snd_soc_codec *codec, enum snd_soc_bias_level level) { @@ -1238,11 +1385,22 @@ static int nau8825_set_bias_level(struct snd_soc_codec *codec, "Failed to sync cache: %d\n", ret); return ret; } + + /* Setup codec configuration after resume */ + nau8825_resume_setup(nau8825); } break; case SND_SOC_BIAS_OFF: + /* Turn off all interruptions before system shutdown. Keep the + * interruption quiet before resume setup completes. + */ + regmap_write(nau8825->regmap, + NAU8825_REG_INTERRUPT_DIS_CTRL, 0xffff); + /* Disable ADC needed for interruptions at audo mode */ + regmap_update_bits(nau8825->regmap, NAU8825_REG_ENA_CTRL, + NAU8825_ENABLE_ADC, 0); if (nau8825->mclk_freq) clk_disable_unprepare(nau8825->mclk); @@ -1252,12 +1410,40 @@ static int nau8825_set_bias_level(struct snd_soc_codec *codec, return 0; } +#ifdef CONFIG_PM_SLEEP +static int nau8825_codec_suspend(struct snd_soc_codec *codec) +{ + struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec); + + disable_irq(nau8825->irq); + snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_OFF); + regcache_cache_only(nau8825->regmap, true); + + return 0; +} + +static int nau8825_codec_resume(struct snd_soc_codec *codec) +{ + struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec); + + regcache_cache_only(nau8825->regmap, false); + enable_irq(nau8825->irq); + + return 0; +} +#else +#define nau8825_codec_suspend NULL +#define nau8825_codec_resume NULL +#endif + static struct snd_soc_codec_driver nau8825_codec_driver = { .probe = nau8825_codec_probe, .set_sysclk = nau8825_set_sysclk, .set_pll = nau8825_set_pll, .set_bias_level = nau8825_set_bias_level, .suspend_bias_off = true, + .suspend = nau8825_codec_suspend, + .resume = nau8825_codec_resume, .controls = nau8825_controls, .num_controls = ARRAY_SIZE(nau8825_controls), @@ -1351,30 +1537,8 @@ static int nau8825_read_device_properties(struct device *dev, static int nau8825_setup_irq(struct nau8825 *nau8825) { - struct regmap *regmap = nau8825->regmap; int ret; - /* IRQ Output Enable */ - regmap_update_bits(regmap, NAU8825_REG_INTERRUPT_MASK, - NAU8825_IRQ_OUTPUT_EN, NAU8825_IRQ_OUTPUT_EN); - - /* Enable internal VCO needed for interruptions */ - nau8825_configure_sysclk(nau8825, NAU8825_CLK_INTERNAL, 0); - - /* Enable ADC needed for interrupts */ - regmap_update_bits(regmap, NAU8825_REG_ENA_CTRL, - NAU8825_ENABLE_ADC, NAU8825_ENABLE_ADC); - - /* Chip needs one FSCLK cycle in order to generate interrupts, - * as we cannot guarantee one will be provided by the system. Turning - * master mode on then off enables us to generate that FSCLK cycle - * with a minimum of contention on the clock bus. - */ - regmap_update_bits(regmap, NAU8825_REG_I2S_PCM_CTRL2, - NAU8825_I2S_MS_MASK, NAU8825_I2S_MS_MASTER); - regmap_update_bits(regmap, NAU8825_REG_I2S_PCM_CTRL2, - NAU8825_I2S_MS_MASK, NAU8825_I2S_MS_SLAVE); - ret = devm_request_threaded_irq(nau8825->dev, nau8825->irq, NULL, nau8825_interrupt, IRQF_TRIGGER_LOW | IRQF_ONESHOT, "nau8825", nau8825); @@ -1442,36 +1606,6 @@ static int nau8825_i2c_remove(struct i2c_client *client) return 0; } -#ifdef CONFIG_PM_SLEEP -static int nau8825_suspend(struct device *dev) -{ - struct i2c_client *client = to_i2c_client(dev); - struct nau8825 *nau8825 = dev_get_drvdata(dev); - - disable_irq(client->irq); - regcache_cache_only(nau8825->regmap, true); - regcache_mark_dirty(nau8825->regmap); - - return 0; -} - -static int nau8825_resume(struct device *dev) -{ - struct i2c_client *client = to_i2c_client(dev); - struct nau8825 *nau8825 = dev_get_drvdata(dev); - - regcache_cache_only(nau8825->regmap, false); - regcache_sync(nau8825->regmap); - enable_irq(client->irq); - - return 0; -} -#endif - -static const struct dev_pm_ops nau8825_pm = { - SET_SYSTEM_SLEEP_PM_OPS(nau8825_suspend, nau8825_resume) -}; - static const struct i2c_device_id nau8825_i2c_ids[] = { { "nau8825", 0 }, { } @@ -1498,7 +1632,6 @@ static struct i2c_driver nau8825_driver = { .name = "nau8825", .of_match_table = of_match_ptr(nau8825_of_ids), .acpi_match_table = ACPI_PTR(nau8825_acpi_match), - .pm = &nau8825_pm, }, .probe = nau8825_i2c_probe, .remove = nau8825_i2c_remove, diff --git a/sound/soc/codecs/nau8825.h b/sound/soc/codecs/nau8825.h index 9e6cb62..1100385 100644 --- a/sound/soc/codecs/nau8825.h +++ b/sound/soc/codecs/nau8825.h @@ -93,6 +93,9 @@ #define NAU8825_REG_CHARGE_PUMP_INPUT_READ 0x81 #define NAU8825_REG_GENERAL_STATUS 0x82 #define NAU8825_REG_MAX NAU8825_REG_GENERAL_STATUS +/* 16-bit control register address, and 16-bits control register data */ +#define NAU8825_REG_ADDR_LEN 16 +#define NAU8825_REG_DATA_LEN 16 /* ENA_CTRL (0x1) */ #define NAU8825_ENABLE_DACR_SFT 10 @@ -145,6 +148,7 @@ /* JACK_DET_CTRL (0xd) */ #define NAU8825_JACK_DET_RESTART (1 << 9) +#define NAU8825_JACK_DET_DB_BYPASS (1 << 8) #define NAU8825_JACK_INSERT_DEBOUNCE_SFT 5 #define NAU8825_JACK_INSERT_DEBOUNCE_MASK (0x7 << NAU8825_JACK_INSERT_DEBOUNCE_SFT) #define NAU8825_JACK_EJECT_DEBOUNCE_SFT 2 @@ -157,6 +161,7 @@ #define NAU8825_IRQ_KEY_RELEASE_EN (1 << 7) #define NAU8825_IRQ_KEY_SHORT_PRESS_EN (1 << 5) #define NAU8825_IRQ_EJECT_EN (1 << 2) +#define NAU8825_IRQ_INSERT_EN (1 << 0) /* IRQ_STATUS (0x10) */ #define NAU8825_HEADSET_COMPLETION_IRQ (1 << 10) @@ -177,6 +182,7 @@ #define NAU8825_IRQ_KEY_RELEASE_DIS (1 << 7) #define NAU8825_IRQ_KEY_SHORT_PRESS_DIS (1 << 5) #define NAU8825_IRQ_EJECT_DIS (1 << 2) +#define NAU8825_IRQ_INSERT_DIS (1 << 0) /* SAR_CTRL (0x13) */ #define NAU8825_SAR_ADC_EN_SFT 12 @@ -333,7 +339,8 @@ /* System Clock Source */ enum { - NAU8825_CLK_MCLK = 0, + NAU8825_CLK_DIS = 0, + NAU8825_CLK_MCLK, NAU8825_CLK_INTERNAL, NAU8825_CLK_FLL_MCLK, NAU8825_CLK_FLL_BLK, -- 2.6.4

2 13

[alsa-devel] [PATCH] alsabat: add buffer size and period size setup support
by vivian.zhang＠intel.com 30 May '16

30 May '16

From: "vivian,zhang" <vivian.zhang(a)intel.com> Signed-off-by: Zhang Vivian <vivian.zhang(a)intel.com> --- bat/alsa.c | 95 +++++++++++++++++++++++++++++++++++++++----------------- bat/bat.c | 16 ++++++++-- bat/common.h | 2 ++ bat/tinyalsa.c | 5 ++- 4 files changed, 86 insertions(+), 32 deletions(-) diff --git a/bat/alsa.c b/bat/alsa.c index 75158cb..167dbad 100644 --- a/bat/alsa.c +++ b/bat/alsa.c @@ -74,6 +74,8 @@ static int set_snd_pcm_params(struct bat *bat, struct pcm_container *sndpcm) snd_pcm_format_t format; unsigned int buffer_time = 0; unsigned int period_time = 0; + snd_pcm_uframes_t buffer_size = 0; + snd_pcm_uframes_t period_size = 0; unsigned int rate; int err; const char *device_name = snd_pcm_name(sndpcm->handle); @@ -145,39 +147,71 @@ static int set_snd_pcm_params(struct bat *bat, struct pcm_container *sndpcm) return -EINVAL; } - if (snd_pcm_hw_params_get_buffer_time_max(params, - &buffer_time, 0) < 0) { - fprintf(bat->err, _("Get parameter from device error: ")); - fprintf(bat->err, _("buffer time: %d %s: %s(%d)\n"), - buffer_time, - device_name, snd_strerror(err), err); - return -EINVAL; - } + if (bat->buffer_size > 0) { + if (bat->period_size == 0) + bat->period_size = bat->buffer_size / DIV_BUFFERTIME; - if (buffer_time > MAX_BUFFERTIME) - buffer_time = MAX_BUFFERTIME; + buffer_size = bat->buffer_size; + period_size = bat->period_size; - period_time = buffer_time / DIV_BUFFERTIME; + fprintf(bat->log, _("Set period size: %d buffer size: %d\n"), + (int) period_size, (int) buffer_size); - /* Set buffer time and period time */ - err = snd_pcm_hw_params_set_buffer_time_near(sndpcm->handle, params, - &buffer_time, 0); - if (err < 0) { - fprintf(bat->err, _("Set parameter to device error: ")); - fprintf(bat->err, _("buffer time: %d %s: %s(%d)\n"), - buffer_time, - device_name, snd_strerror(err), err); - return err; - } + err = snd_pcm_hw_params_set_buffer_size_near(sndpcm->handle, + params, &buffer_size); + if (err < 0) { + fprintf(bat->err, _("Set parameter to device error: ")); + fprintf(bat->err, _("buffer size: %d %s: %s(%d)\n"), + (int) buffer_size, + device_name, snd_strerror(err), err); + return err; + } - err = snd_pcm_hw_params_set_period_time_near(sndpcm->handle, params, - &period_time, 0); - if (err < 0) { - fprintf(bat->err, _("Set parameter to device error: ")); - fprintf(bat->err, _("period time: %d %s: %s(%d)\n"), - period_time, - device_name, snd_strerror(err), err); - return err; + err = snd_pcm_hw_params_set_period_size_near(sndpcm->handle, + params, &period_size, 0); + if (err < 0) { + fprintf(bat->err, _("Set parameter to device error: ")); + fprintf(bat->err, _("period size: %d %s: %s(%d)\n"), + (int) period_size, + device_name, snd_strerror(err), err); + return err; + } + } else { + if (snd_pcm_hw_params_get_buffer_time_max(params, + &buffer_time, 0) < 0) { + fprintf(bat->err, + _("Get parameter from device error: ")); + fprintf(bat->err, _("buffer time: %d %s: %s(%d)\n"), + buffer_time, + device_name, snd_strerror(err), err); + return -EINVAL; + } + + if (buffer_time > MAX_BUFFERTIME) + buffer_time = MAX_BUFFERTIME; + + period_time = buffer_time / DIV_BUFFERTIME; + + /* Set buffer time and period time */ + err = snd_pcm_hw_params_set_buffer_time_near(sndpcm->handle, + params, &buffer_time, 0); + if (err < 0) { + fprintf(bat->err, _("Set parameter to device error: ")); + fprintf(bat->err, _("buffer time: %d %s: %s(%d)\n"), + buffer_time, + device_name, snd_strerror(err), err); + return err; + } + + err = snd_pcm_hw_params_set_period_time_near(sndpcm->handle, + params, &period_time, 0); + if (err < 0) { + fprintf(bat->err, _("Set parameter to device error: ")); + fprintf(bat->err, _("period time: %d %s: %s(%d)\n"), + period_time, + device_name, snd_strerror(err), err); + return err; + } } /* Write the parameters to the driver */ @@ -214,6 +248,9 @@ static int set_snd_pcm_params(struct bat *bat, struct pcm_container *sndpcm) return -EINVAL; } + fprintf(bat->log, _("Get period size: %d buffer size: %d\n"), + (int) sndpcm->period_size, (int) sndpcm->buffer_size); + err = snd_pcm_format_physical_width(format); if (err < 0) { fprintf(bat->err, _("Invalid parameters: ")); diff --git a/bat/bat.c b/bat/bat.c index 1afdcb4..0d5aaa5 100644 --- a/bat/bat.c +++ b/bat/bat.c @@ -292,6 +292,8 @@ _("Usage: alsabat [-options]...\n" " -k parameter for frequency detecting threshold\n" " -F target frequency\n" " -p total number of periods to play/capture\n" +" -B buffer size in frames\n" +" -E period size in frames\n" " --log=# file that both stdout and strerr redirecting to\n" " --file=# file for playback\n" " --saveplay=# file that storing playback content, for debug\n" @@ -324,6 +326,8 @@ static void set_defaults(struct bat *bat) bat->capture.device = NULL; bat->buf = NULL; bat->local = false; + bat->buffer_size = 0; + bat->period_size = 0; #ifdef HAVE_LIBTINYALSA bat->channels = 2; bat->playback.fct = &playback_tinyalsa; @@ -342,8 +346,8 @@ static void set_defaults(struct bat *bat) static void parse_arguments(struct bat *bat, int argc, char *argv[]) { - int c, option_index; - static const char short_options[] = "D:P:C:f:n:F:c:r:s:k:p:lth"; + int c, option_index, err; + static const char short_options[] = "D:P:C:f:n:F:c:r:s:k:p:B:E:lth"; static const struct option long_options[] = { {"help", 0, 0, 'h'}, {"log", 1, 0, OPT_LOG}, @@ -414,6 +418,14 @@ static void parse_arguments(struct bat *bat, int argc, char *argv[]) bat->periods_total = atoi(optarg); bat->period_is_limited = true; break; + case 'B': + err = atoi(optarg); + bat->buffer_size = err >= 32 && err < 200000 ? err : 0; + break; + case 'E': + err = atoi(optarg); + bat->period_size = err >= 32 && err < 200000 ? err : 0; + break; case 'h': default: usage(bat); diff --git a/bat/common.h b/bat/common.h index b789af5..52c8cb1 100644 --- a/bat/common.h +++ b/bat/common.h @@ -152,6 +152,8 @@ struct bat { int frame_size; /* size of frame */ int sample_size; /* size of sample */ enum _bat_pcm_format format; /* PCM format */ + int buffer_size; /* buffer size in frames */ + int period_size; /* period size in frames */ float sigma_k; /* threshold for peak detection */ float target_freq[MAX_CHANNELS]; diff --git a/bat/tinyalsa.c b/bat/tinyalsa.c index ea5f848..faa1ad0 100644 --- a/bat/tinyalsa.c +++ b/bat/tinyalsa.c @@ -57,7 +57,10 @@ static int init_config(struct bat *bat, struct pcm_config *config) { config->channels = bat->channels; config->rate = bat->rate; - config->period_size = 1024; + if (bat->period_size > 0) + config->period_size = bat->period_size; + else + config->period_size = 1024; config->period_count = 4; config->start_threshold = 0; config->stop_threshold = 0; -- 1.7.9.5

2 1

[alsa-devel] Custom card returns "arecord: main:722: audio open error: Invalid argument"
by Rob Nertney 29 May '16

29 May '16

I've build a card that is registered correctly as far as I can tell. My hardware is: static struct snd_pcm_hardware my_pcm_hw = { .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP_VALID), .formats = SNDRV_PCM_FMTBIT_U8, .rates = SNDRV_PCM_RATE_8000, .rate_min = 8000, .rate_max = 8000, .channels_min = 1, .channels_max = 1, .buffer_bytes_max = DMA_LENGTH, .period_bytes_min = 48, .period_bytes_max = 48, .periods_min = 1, .periods_max = 16, }; When I run "arecord -d 2 foo.wav", I get the error message in the subject. Printks show that I get to my_pcm_open, then immediately jump to my_hw_free, my_pcm_close. I'm in an FPGA embedded system. there are no other cards but mine via arecord -L. Here's my _init function for the module: struct snd_card *card; struct aaw_device *my_dev; struct snd_pcm *pcm; struct device *dev; int ret; printk(KERN_ERR "INIT start\n"); snd_card_new(dev,SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, THIS_MODULE, sizeof(struct my_device), &card); my_dev = card->private_data; my_dev->card = card; sprintf(card->driver, "my_driver"); sprintf(card->shortname, "My First Audio Driver"); snd_card_set_dev(card,dev); ret = snd_device_new(card, SNDRV_DEV_LOWLEVEL, my_dev, &dev_ops); if(ret < 0) printk(KERN_ERR "new device err\n"); ret = snd_pcm_new(card, card->driver, 0, 0, 1, &pcm); if(ret < 0) printk(KERN_ERR "new pcm err\n"); snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &my_pcm_ops); pcm->private_data = my_dev; pcm->info_flags = 0; strcpy(pcm->name, card->shortname); ret = snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_CONTINUOUS, snd_dma_continuous_data(GFP_KERNEL), DMA_LENGTH, DMA_LENGTH); if(ret < 0) printk(KERN_ERR "preallocate page err\n"); ret = snd_card_register(card); if (ret < 0) printk(KERN_ERR "error in register snd\n"); Here's my _open function: static int my_pcm_open(struct snd_pcm_substream *ss) { struct my_device *my_dev = ss->private_data; printk(KERN_ERR "in pcm_open\n"); ss->runtime->hw = my_pcm_hw; my_dev->substream = ss; ss->runtime->private_data = my_dev; return 0; } Any help would be most appreciated. Thanks, Rob

2 1

[alsa-devel] [PATCH] pcm: Fix secondary retry in dsnoop and dshare
by Takashi Iwai 28 May '16

28 May '16

The commit [fdba9e1bad8f: pcm: Fallback open as the first instance for dmix & co] introduced a mechanism to retry the open of slave PCM for the secondary streams, but this also introduced a regression in dsnoop and dshare plugins: since the retry goto-tag was placed at a wrong position, it retries to re-fetch the shm unnecessarily and eventually leads to the fatal error. The bug can be easily reproduced by starting arecord and killing it via SIGKILL, then starting arecord again. The second arecord fails. The fix is obviously to move the wrong retry goto-tags to the right positions. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- src/pcm/pcm_dshare.c | 2 +- src/pcm/pcm_dsnoop.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c index adb3587a2869..05854dedf259 100644 --- a/src/pcm/pcm_dshare.c +++ b/src/pcm/pcm_dshare.c @@ -690,7 +690,6 @@ int snd_pcm_dshare_open(snd_pcm_t **pcmp, const char *name, break; } - retry: first_instance = ret = snd_pcm_direct_shm_create_or_connect(dshare); if (ret < 0) { SNDERR("unable to create IPC shm instance"); @@ -705,6 +704,7 @@ int snd_pcm_dshare_open(snd_pcm_t **pcmp, const char *name, dshare->max_periods = opts->max_periods; dshare->sync_ptr = snd_pcm_dshare_sync_ptr; + retry: if (first_instance) { /* recursion is already checked in snd_pcm_direct_get_slave_ipc_offset() */ diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c index 8ff0ba57cb14..2d45171dda01 100644 --- a/src/pcm/pcm_dsnoop.c +++ b/src/pcm/pcm_dsnoop.c @@ -583,7 +583,6 @@ int snd_pcm_dsnoop_open(snd_pcm_t **pcmp, const char *name, break; } - retry: first_instance = ret = snd_pcm_direct_shm_create_or_connect(dsnoop); if (ret < 0) { SNDERR("unable to create IPC shm instance"); @@ -598,6 +597,7 @@ int snd_pcm_dsnoop_open(snd_pcm_t **pcmp, const char *name, dsnoop->max_periods = opts->max_periods; dsnoop->sync_ptr = snd_pcm_dsnoop_sync_ptr; + retry: if (first_instance) { /* recursion is already checked in snd_pcm_direct_get_slave_ipc_offset() */ -- 2.8.3

1 0

[alsa-devel] [PATCH 0/5] Add support for trigger only voice recognition
by Charles Keepax 27 May '16

27 May '16

In some systems our voice trigger firmwares will be used only to provide an event that indicates the trigger phrase was spoken, this patch chain adds support for this use-case. There are two parts to adding this support firstly, a mechanism is required to get the DSP to power on without the compressed stream being opened, this is done by means of a virtual output for the voice trigger in the DAPM graph. Secondly, the trigger event needs to be handled. Typically this will be used to generate a key press event, but there are numerous options what could be done here, and vendors often have their own rather strong opinions. Rather than dictate the usage at the driver level we we simply provide a notifier that can be caught in the machine driver and appropriate action can be taken there. Thanks, Charles Charles Keepax (5): ASoC: arizona: Tie SYSCLK to DRC signal activity widgets ASoC: arizona: Add voice trigger output widget ASoC: wm_adsp: Specifically propagate voice trigger event to caller ASoC: arizona: Add a notifier chain for CODEC events ASoC: arizona: Add event notification on voice trigger events include/linux/mfd/arizona/core.h | 10 ++++++++++ sound/soc/codecs/arizona.c | 43 ++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/arizona.h | 15 ++++++++++++++ sound/soc/codecs/cs47l24.c | 16 +++++++++++++++ sound/soc/codecs/wm5102.c | 1 + sound/soc/codecs/wm5110.c | 16 +++++++++++++++ sound/soc/codecs/wm8998.c | 1 + sound/soc/codecs/wm_adsp.c | 5 +++++ sound/soc/codecs/wm_adsp.h | 4 ++++ 9 files changed, 111 insertions(+) -- 2.1.4

2 10

[alsa-devel] [GIT PULL] ASoC updates for v4.7
by Mark Brown 27 May '16

27 May '16

The following changes since commit 515511a7920c69aebf7f5fef0cb8e1df6767f34c: Merge remote-tracking branch 'asoc/topic/hdmi' into asoc-next (2016-05-13 14:27:16 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v4.7-2 for you to fetch changes up to bf65921380cd50b87618df550398e06581f4a361: Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next (2016-05-27 13:46:02 +0100) ---------------------------------------------------------------- ASoC: Updates for v4.7 part 2 Really sorry about this late pull request. It looks like at the time I sent my pull request for v4.7 there was some conflict or other issue which caused my script to stop merging the ASoC branches at some point after the HDMI changes. It's all specific driver updates, including: - New drivers for MAX98371 and TAS5720. - SPI support for TLV320AIC32x4. - TDM support for STI Uniperf IPs. This code should all have been in -next prior to the merge window apart from some fixes, it dropped out on the 18th. ---------------------------------------------------------------- Akinobu Mita (1): spi: omap2-mcspi: Undo broken fix for dma transfer of vmalloced buffer Al Viro (6): do_splice_to(): cap the size before passing to ->splice_read() fix the copy vs. map logics in blk_rq_map_user_iov() atomic_open(): fix the handling of create_error ecryptfs: fix handling of directory opening get_rock_ridge_filename(): handle malformed NM entries Merge branch 'ovl-fixes' into for-linus Alex Deucher (2): drm/radeon: fix DP mode validation drm/amdgpu: fix DP mode validation Alexander Shishkin (2): perf/x86/intel/pt: Generate PMI in the STOP region as well perf/core: Disable the event on a truncated AUX record Andrea Adami (1): ASoC: pxa: Fix module autoload for platform drivers Andrea Arcangeli (1): mm: thp: calculate the mapcount correctly for THP pages during WP faults Andreas Dannenberg (2): ASoC: add TA5720 digital amplifier DT bindings ASoC: add support for TAS5720 digital amplifier Andrey Ryabinin (1): perf/x86: Fix undefined shift on 32-bit kernels Andrey Utkin (1): kvmconfig: add more virtio drivers Andrey Vostrikov (1): spi: spi-fsl-dspi: Fix cs_change handling in message transfer Andy Lutomirski (1): perf/core: Change the default paranoia level to 2 Arindam Nath (1): drm/radeon: fix DP link training issue with second 4K monitor Arnaldo Carvalho de Melo (9): perf tools: Use readdir() instead of deprecated readdir_r() perf script: Use readdir() instead of deprecated readdir_r() perf thread_map: Use readdir() instead of deprecated readdir_r() perf tools: Use readdir() instead of deprecated readdir_r() perf dwarf: Guard !x86_64 definitions under #ifdef else clause perf probe: Check if dwarf_getlocations() is available perf evsel: Improve EPERM error handling in open_strerror() perf evsel: Handle EACCESS + perf_event_paranoid=2 in fallback() perf stat: Fallback to user only counters when perf_event_paranoid > 1 Arnd Bergmann (6): regmap: fix documentation to match code Revert "net/mlx5: Kconfig: Fix MLX5_EN/VXLAN build issue" net/mlx5e: make VXLAN support conditional Merge tag 'at91-fixes' of git://git.kernel.org/.../nferre/linux-at91 into fixes Merge tag 'at91-fixes2' of git://git.kernel.org/.../nferre/linux-at91 into fixes net: mvneta: bm: fix dependencies again Axel Lin (2): ASoC: rt5677: Avoid duplicate the same test in each switch case ASoC: max98371 Remove duplicate entry in max98371_reg Bard Liao (2): ASoC: rt298: reset AD dilter is there is no MCLK ASoC: rt298: fix capture doesn't work at some cases Bastien Nocera (1): ASoC: tlv320aix31xx: Add ACPI match for Lenovo 100S Ben Hutchings (2): spi: spi-ti-qspi: Fix FLEN and WLEN settings if bits_per_word is overridden spi: spi-ti-qspi: Handle truncated frames properly Boris Brezillon (1): ARM: dts: at91: sam9x5: Fix the memory range assigned to the PMC Chris Diamand (1): Input: byd - update copyright header Colin Ian King (1): tools: bpf_jit_disasm: check for klogctl failure Dan Carpenter (6): scsi_dh_alua: uninitialized variable in alua_rtpg() netxen: fix error handling in netxen_get_flash_block() netxen: reversed condition in netxen_nic_set_link_parameters() netxen: netxen_rom_fast_read() doesn't return -1 qede: uninitialized variable in qede_start_xmit() qlcnic: potential NULL dereference in qlcnic_83xx_get_minidump_template() Dan Williams (1): libnvdimm, pfn: fix ARCH=alpha allmodconfig build failure Daniel Jurgens (1): net/mlx4_en: Fix endianness bug in IPV6 csum calculation Daniel Vetter (1): drm/i915: Bail out of pipe config compute loop on LPT Dave Airlie (3): Merge tag 'drm-intel-fixes-2016-05-11' of git://anongit.freedesktop.org/drm-intel into drm-fixes Merge branch 'drm-fixes-4.6' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Merge branch 'drm-fixes-4.6' of git://people.freedesktop.org/~agd5f/linux into drm-fixes David Ahern (1): net: ipv6: tcp reset, icmp need to consider L3 domain David Howells (1): KEYS: Fix ASN.1 indefinite length object parsing David S. Miller (9): Merge branch 'master' of git://git.kernel.org/.../klassert/ipsec Merge branch 'bnxt_en-fixes' Merge branch 'mlx5-build-fix' Merge git://git.kernel.org/.../pablo/nf Merge tag 'wireless-drivers-for-davem-2016-05-09' of git://git.kernel.org/.../kvalo/wireless-drivers Merge branch 'nps_enet-fixes' Merge branch 'net-sched-fixes' Merge branch 'bnxt_en-fixes' Merge branch 'xgene-fixes' Dmitry V. Levin (1): x86: Use compat version for preadv2 and pwritev2 Elad Kanfi (2): net: nps_enet: Tx handler synchronization net: nps_enet: bug fix - handle lost tx interrupts Emmanuel Grumbach (1): iwlwifi: mvm: don't override the rate with the AMSDU len Eric Dumazet (2): macvtap: segmented packet is consumed tcp: refresh skb timestamp at retransmit time Fabio Estevam (6): ASoC: wm8960: Provide a menu selection text ASoC: wm8962: Disable clock if wm8962_runtime_resume() fails ASoC: wm8962: Fit error message into a single line ASoC: wm8962: Adjust clk definitions so that simple card can work ASoC: hdac_hdmi: Remove the unused 'timeout' variable spi: spi-ep93xx: Fix the PTR_ERR() argument Felipe Balbi (1): cgroup: fix compile warning Florian Westphal (1): netfilter: conntrack: init all_locks to avoid debug warning Geert Uytterhoeven (2): ravb: Add missing free_irq() call to ravb_close() regulator: da9063: Correct module alias prefix to fix module autoloading Guneshwor Singh (1): ASoC: topology: Set CPU DAI name and enable DPCM by default for FE link H. Nikolaus Schaller (1): Input: twl6040-vibra - fix DT node memory management Hans de Goede (2): regulator: axp20x: Fix axp22x ldo_io voltage ranges regulator: axp20x: Fix axp22x ldo_io registration error on cold boot Herbert Xu (2): crypto: hash - Fix page length clamping in hash walk crypto: testmgr - Use kmalloc memory for RSA input Ian Campbell (1): VSOCK: do not disconnect socket when peer has shutdown SEND only Ido Schimmel (2): mlxsw: spectrum: Fix rollback order in LAG join failure mlxsw: spectrum: Add missing rollback in flood configuration Imre Deak (1): drm/i915/bdw: Add missing delay during L3 SQC credit programming Ingo Molnar (3): MAINTAINERS: Add mmiotrace entry Revert "sched/fair: Fix fairness issue on migration" Merge tag 'perf-urgent-for-mingo-20160512' of git://git.kernel.org/.../acme/linux into perf/urgent Iyappan Subramanian (5): drivers: net: xgene: fix IPv4 forward crash drivers: net: xgene: fix sharing of irqs drivers: net: xgene: fix ununiform latency across queues drivers: net: xgene: fix statistics counters race condition drivers: net: xgene: fix register offset Jack Pham (1): regmap: spmi: Fix regmap_spmi_ext_read in multi-byte case Jamal Hadi Salim (7): export tc ife uapi header net sched: vlan action fix late binding net sched: ipt action fix late binding net sched: mirred action fix late binding net sched: simple action fix late binding net sched: skbedit action fix late binding net sched: ife action fix late binding Jani Nikula (1): drm/i915/lvds: separate border enable readout from panel fitter Jarkko Nikula (1): spi: pxa2xx: Do not detect number of enabled chip selects on Intel SPT Jarno Rajahalme (2): udp_tunnel: Remove redundant udp_tunnel_gro_complete(). udp_offload: Set encapsulation before inner completes. Jeeja KP (1): ASoC: topology: Fix memory leak in widget creation Jeremy McDermond (7): ASoC: tlv320aic32x4: Change name of probe function ASoC: tlv320aic32x4: Break out I2C support into separate module ASoC: tlv320aic32x4: Add SPI support ASoC: tlv320aic32x4: Add 96k sample rate ASoC: tlv320aic32x4: Implement resistors on input pins ASoC: tlv320aic32x4: Add additional input pins ASoC: tlv320aic32x4: Properly implement the positive and negative pins into the mixers Jim Lodes (1): ASoC: omap-pcm: Initialize DMA configuration Jiri Benc (1): gre: do not keep the GRE header around in collect medata mode Joe Stringer (1): openvswitch: Fix cached ct with helper. Johannes Thumshirn (1): qla1280: Don't allocate 512kb of host tags Josh Poimboeuf (2): compiler-gcc: require gcc 4.8 for powerpc __builtin_bswap16() x86/kvm: Add stack frame dependency to fastop() inline asm Junxiao Bi (2): ocfs2: revert using ocfs2_acl_chmod to avoid inode cluster lock hang ocfs2: fix posix_acl_create deadlock Kaho Ng (1): ALSA: hda - Fix white noise on Asus UX501VW headset Kalle Valo (1): Merge tag 'iwlwifi-for-kalle-2016-05-04' of https://git.kernel.org/.../iwlwifi/iwlwifi-fixes Kangjie Lu (3): net: fix infoleak in llc net: fix infoleak in rtnetlink net: fix a kernel infoleak in x25 module Koro Chen (1): ASoC: mediatek: Add HDMI dai-links in the mt8173-rt5650-rt5676 machine driver Krzysztof Kozlowski (1): regulator: s2mps11: Fix invalid selector mask and voltages for buck9 Kuninori Morimoto (3): ASoC: tidyup alphabetical order for SND_SOC_Bxx ASoC: rsnd: count .probe/.remove for rsnd_mod_call() ASoC: rsnd: don't use prohibited number to PDMACHCRn.SRS Linus Lüssing (1): bridge: fix igmp / mld query parsing Linus Torvalds (31): Merge git://git.kernel.org/.../davem/net Merge branch 'linus' of git://git.kernel.org/.../herbert/crypto-2.6 Merge branch 'akpm' (patches from Andrew) Merge branch 'libnvdimm-fixes' of git://git.kernel.org/.../nvdimm/nvdimm Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge tag 'pci-v4.6-fixes-3' of git://git.kernel.org/.../helgaas/pci Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm Merge tag 'spi-fix-v4.6-rc7' of git://git.kernel.org/.../broonie/spi Merge git://git.kernel.org/.../davem/net Merge tag 'scsi-fixes' of git://git.kernel.org/.../jejb/scsi Merge tag 'pinctrl-v4.6-4' of git://git.kernel.org/.../linusw/linux-pinctrl Merge branch 'for-linus' of git://git.kernel.org/.../dtor/input Merge tag 'sound-4.6' of git://git.kernel.org/.../tiwai/sound Merge tag 'keys-fixes-20160512' of git://git.kernel.org/.../dhowells/linux-fs Merge branch 'akpm' (patches from Andrew) Merge branch 'linus' of git://git.kernel.org/.../herbert/crypto-2.6 Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux Merge tag 'media/v4.6-6' of git://git.kernel.org/.../mchehab/linux-media Merge tag 'regmap-fix-v4.6-rc7' of git://git.kernel.org/.../broonie/regmap Merge tag 'regulator-fix-v4.6-rc7' of git://git.kernel.org/.../broonie/regulator Merge tag 'fixes-for-linus' of git://git.kernel.org/.../arm/arm-soc Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/.../tip/tip Merge branch 'for-4.6-fixes' of git://git.kernel.org/.../tj/wq Merge branch 'for-4.6-fixes' of git://git.kernel.org/.../tj/cgroup Merge branch 'for-linus' of git://git.kernel.org/.../viro/vfs nf_conntrack: avoid kernel pointer value leak in slab name Merge git://git.kernel.org/.../davem/net Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/.../tip/tip Linux 4.6 Liping Zhang (1): netfilter: IDLETIMER: fix race condition when destroy the target Lucas Stach (1): drm/radeon: fix PLL sharing on DCE6.1 (v2) Ludovic Desroches (1): pinctrl: at91-pio4: fix pull-up/down logic Lukas Wunner (2): PCI: Fix BUG on device attach failure PCI: Do not treat EPROBE_DEFER as device attach failure Lyude (1): Revert "drm/i915: start adding dp mst audio" Marek Szyprowski (1): Input: max8997-haptic - fix NULL pointer dereference Mark Brown (31): regmap: mmio: Fix value endianness selection regmap: Fix implicit inclusion of device.h regmap: mmio: Parse endianness definitions from DT ASoC: wm8960: Depends on I2C regmap: mmio: Explicitly say little endian is the defualt in the bus config Merge branches 'topic/dai-link' and 'topic/find-dai' of git://git.kernel.org/.../broonie/sound into asoc-topology Merge remote-tracking branches 'spi/fix/fsl-dspi', 'spi/fix/omap2-mcspi', 'spi/fix/pxa2xx' and 'spi/fix/ti-qspi' into spi-linus Merge remote-tracking branch 'regmap/fix/mmio' into regmap-linus Merge remote-tracking branches 'regmap/fix/be', 'regmap/fix/doc' and 'regmap/fix/spmi' into regmap-linus Merge remote-tracking branches 'regulator/fix/axp20x', 'regulator/fix/da9063', 'regulator/fix/gpio' and 'regulator/fix/s2mps11' into regulator-linus ASoC: ak4642: Enable cache usage to fix crashes on resume Merge tag 'asoc-v4.7' into asoc-linus Merge remote-tracking branches 'asoc/fix/ak4642', 'asoc/fix/ep93xx', 'asoc/fix/kirkwood' and 'asoc/fix/twl6040' into asoc-linus Merge remote-tracking branch 'asoc/topic/tlv320aic32x4' into asoc-next Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next Merge remote-tracking branch 'asoc/topic/max98371' into asoc-next Merge remote-tracking branch 'asoc/topic/twl6040' into asoc-next Merge remote-tracking branch 'asoc/topic/simple' into asoc-next Merge remote-tracking branch 'asoc/topic/pxa' into asoc-next Merge remote-tracking branch 'asoc/topic/topology' into asoc-next Merge remote-tracking branch 'asoc/topic/tas5270' into asoc-next Merge remote-tracking branch 'asoc/topic/omap' into asoc-next Merge remote-tracking branch 'asoc/topic/mtk' into asoc-next Merge remote-tracking branch 'asoc/topic/rt298' into asoc-next Merge remote-tracking branch 'asoc/topic/kconfig' into asoc-next Merge remote-tracking branch 'asoc/topic/tlv320aic31xx' into asoc-next Merge remote-tracking branch 'asoc/topic/sti' into asoc-next Merge remote-tracking branch 'asoc/topic/qcom' into asoc-next Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-next Merge remote-tracking branch 'asoc/topic/rt5677' into asoc-next Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next Mathias Krause (1): x86/extable: ensure entries are swapped completely when sorting Matthias Brugger (1): drivers: net: xgene: Fix error handling Mauro Carvalho Chehab (1): Revert "[media] videobuf2-v4l2: Verify planes array in buffer dequeueing" Maxime Ripard (1): regulator: axp20x: Fix LDO4 linear voltage range Mengdong Lin (4): ASoC: topology: ABI - Define types for vendor tuples ASoC: topology: Set the link ID when creating a FE DAI link ASoC: topology: Check failure to create a widget ASoC: topology: Check size mismatch of ABI objects before parsing Michael Chan (4): bnxt_en: Need memory barrier when processing the completion ring. bnxt_en: Setup multicast properly after resetting device. bnxt_en: Add workaround to detect bad opaque in rx completion (part 1) bnxt_en: Add workaround to detect bad opaque in rx completion (part 2) Mihai Mihalache (1): regulator: gpio: check return value of of_get_named_gpio Mikko Rapeli (1): uapi glibc compat: fix compile errors when glibc net/if.h included before linux/if.h Miklos Szeredi (4): vfs: add vfs_select_inode() helper vfs: rename: check backing inode being equal vfs: add lookup_hash() helper ovl: ignore permissions on underlying lookup Moise Gergaud (10): ASoC: sti: correct typo errors ASoC: sti: macro for uniperif tdm regs access ASoC: sti: rename unip player type into common player & reader type ASoC: sti: define tdm type & default tdm hw config ASoC: sti: helper functions for unip tdm slots configuration ASoC: sti: helper functions to fix tdm runtime params ASoC: sti: unip player tdm mode ASoC: sti: unip reader tdm mode ASoC: sti: select player for I2S/TDM TX bus ASoC: sti-asoc-card: update tdm mode Namhyung Kim (1): perf diff: Fix duplicated output column Nikolay Aleksandrov (1): net: bridge: fix old ioctl unlocked net device walk PC Liao (2): ASoC: mediatek: Add second I2S on mt8173-rt5650 machine driver ASoC: mediatek: HDMI audio LR channel swapped Paolo Abeni (1): net/route: enforce hoplimit max value Paul Durrant (1): xen-netback: fix extra_info handling in xenvif_tx_err() Peter Ujfalusi (4): ASoC: omap-mcbsp: Enable/disable sidetone block auto clock gating for omap3 ASoC: simple-card: Add pm callbacks to platform driver ASoC: twl6040: Select LPPLL during standby ASoC: twl6040: Disconnect AUX output pads on digital mute Peter Zijlstra (1): perf/x86/msr: Fix SMI overflow Petr Kulhavy (5): ASoC: tas571x: implemented digital mute ASoC: tas571x: chip type detection via I2C name ASoC: tas571x: added missing register literals ASoC: tas571x: added support for TAS5721 ASoC: tas571x: new chip added into TAS571x binding Phil Turnbull (1): netfilter: nfnetlink_acct: validate NFACCT_QUOTA parameter Rafael J. Wysocki (1): sched/fair: Fix !CONFIG_SMP kernel cpufreq governor breakage Robin Humble (1): Revert "proc/base: make prompt shell start from new line after executing "cat /proc/$pid/wchan"" Sabrina Dubroca (1): macsec: key identifier is 128 bits, not 64 Serge E. Hallyn (2): cgroup, kernfs: make mountinfo show properly scoped path for cgroup namespaces kernfs: kernfs_sop_show_path: don't return 0 after seq_dentry call Serge Hallyn (1): kernfs_path_from_node_locked: don't overwrite nlen Sergei Shtylyov (1): rcar: src: skip disabled-SRC nodes Sergey Senozhatsky (1): zsmalloc: fix zs_can_compact() integer overflow Shaohui Xie (1): net: phylib: fix interrupts re-enablement in phy_start Shmulik Ladkani (1): Documentation/networking: more accurate LCO explanation Srinivas Kandagatla (2): ASoC: qcom: Fix uninitialized symbol warning. ASoC: qcom: remove IS_ERR_VALUE usage on int. Steffen Klassert (3): flowcache: Avoid OOM condition under preasure xfrm: Reset encapsulation field of the skb before transformation vti: Add pmtu handling to vti_xmit. Stephen Boyd (1): ASoC: rsnd: Remove CLK_IS_ROOT Steven Rostedt (1): tools lib traceevent: Do not reassign parg after collapse_tree() Sudarsana Reddy Kalluru (1): qede: prevent chip hang when increasing channels Sudip Mukherjee (1): ASoC: kirkwood: fix build failure Suzuki K Poulose (1): arm64/sunxi: 4.6-rc1: Add dependency on generic irq chip Tadeusz Struk (3): crypto: qat - fix invalid pf2vf_resp_wq logic crypto: qat - fix adf_ctl_drv.c:undefined reference to adf_init_pf_wq crypto: rsa - select crypto mgr dependency Takashi Iwai (4): ALSA: usb-audio: Quirk for yet another Phoenix Audio devices (v2) ALSA: hda - Fix broken reconfig ALSA: hda - Fix regression on ATI HDMI audio ALSA: usb-audio: Yet another Phoneix Audio device quirk Thomas Gleixner (2): x86/topology: Handle CPUID bogosity gracefully x86/topology: Set x86_max_cores to 1 for CONFIG_SMP=n Uwe Kleine-König (1): net: fec: only clear a queue's work bit if the queue was emptied Ville Syrjälä (1): drm/i915: Update CDCLK_FREQ register on BDW after changing cdclk frequency Wanpeng Li (1): workqueue: fix rebind bound workers warning Wenyou Yang (1): ARM: dts: at91: sama5d2: use "atmel,sama5d3-nfc" compatible for nfc Xunlei Pang (1): sched/rt, sched/dl: Don't push if task's scheduling class was changed Yura Pakhuchiy (1): ALSA: hda - Fix subwoofer pin on ASUS N751 and N551 Zhou Chengming (1): ksm: fix conflict between mmput and scan_get_next_rmap_item Zi Shen Lim (1): arm64: bpf: jit JMP_JSET_{X,K} anish kumar (1): ASoC: Add max98371 codec driver hchrzani (1): perf/x86/intel/uncore: Fix CHA registers configuration procedure for Knights Landing platform xypron.glpk(a)gmx.de (1): net: thunderx: avoid exposing kernel stack .../devicetree/bindings/regmap/regmap.txt | 59 +- .../devicetree/bindings/sound/max98371.txt | 17 + .../bindings/sound/mt8173-rt5650-rt5676.txt | 5 +- .../devicetree/bindings/sound/mt8173-rt5650.txt | 10 + .../devicetree/bindings/sound/st,sti-asoc-card.txt | 48 +- .../devicetree/bindings/sound/tas571x.txt | 10 +- .../devicetree/bindings/sound/tas5720.txt | 25 + Documentation/networking/checksum-offloads.txt | 14 +- Documentation/sysctl/kernel.txt | 2 +- MAINTAINERS | 14 + Makefile | 2 +- arch/arm/boot/dts/at91sam9x5.dtsi | 2 +- arch/arm/boot/dts/sama5d2.dtsi | 2 +- arch/arm64/Kconfig.platforms | 1 + arch/arm64/net/bpf_jit_comp.c | 1 + arch/x86/configs/kvm_guest.config | 3 + arch/x86/entry/syscalls/syscall_32.tbl | 4 +- arch/x86/events/intel/core.c | 2 +- arch/x86/events/intel/pt.c | 2 + arch/x86/events/intel/uncore_snbep.c | 7 + arch/x86/events/msr.c | 2 +- arch/x86/include/asm/uaccess.h | 8 + arch/x86/kernel/cpu/intel.c | 2 +- arch/x86/kernel/smpboot.c | 5 + arch/x86/kvm/emulate.c | 6 +- block/blk-map.c | 47 +- crypto/Kconfig | 1 + crypto/ahash.c | 3 +- crypto/testmgr.c | 27 +- drivers/base/regmap/internal.h | 1 + drivers/base/regmap/regmap-mmio.c | 5 +- drivers/base/regmap/regmap-spmi.c | 2 +- drivers/crypto/qat/qat_common/adf_common_drv.h | 11 + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 6 + drivers/crypto/qat/qat_common/adf_sriov.c | 26 +- drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 4 +- drivers/gpu/drm/i915/i915_debugfs.c | 16 - drivers/gpu/drm/i915/i915_reg.h | 2 + drivers/gpu/drm/i915/intel_audio.c | 9 +- drivers/gpu/drm/i915/intel_crt.c | 8 +- drivers/gpu/drm/i915/intel_ddi.c | 24 +- drivers/gpu/drm/i915/intel_display.c | 5 +- drivers/gpu/drm/i915/intel_dp_mst.c | 22 - drivers/gpu/drm/i915/intel_drv.h | 2 - drivers/gpu/drm/i915/intel_lvds.c | 4 + drivers/gpu/drm/i915/intel_pm.c | 6 + drivers/gpu/drm/radeon/atombios_crtc.c | 10 + drivers/gpu/drm/radeon/atombios_dp.c | 4 +- drivers/gpu/drm/radeon/radeon_dp_auxch.c | 2 +- drivers/input/misc/max8997_haptic.c | 6 +- drivers/input/misc/twl6040-vibra.c | 1 + drivers/input/mouse/byd.c | 4 + drivers/media/v4l2-core/videobuf2-v4l2.c | 6 - drivers/net/ethernet/apm/xgene/xgene_enet_cle.c | 11 +- drivers/net/ethernet/apm/xgene/xgene_enet_cle.h | 2 + drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 19 +- drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 8 +- drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 82 ++- drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 18 +- drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.h | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 86 ++- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 2 + drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 4 + drivers/net/ethernet/ezchip/nps_enet.c | 30 +- drivers/net/ethernet/ezchip/nps_enet.h | 2 - drivers/net/ethernet/freescale/fec_main.c | 10 +- drivers/net/ethernet/marvell/Kconfig | 2 +- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 8 +- drivers/net/ethernet/mellanox/mlx5/core/Makefile | 3 +- drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 4 + drivers/net/ethernet/mellanox/mlx5/core/vxlan.h | 11 +- drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 4 +- .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 8 + drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 14 +- .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 3 +- drivers/net/ethernet/qlogic/qede/qede_main.c | 8 +- .../net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 8 +- drivers/net/ethernet/renesas/ravb_main.c | 2 + drivers/net/geneve.c | 5 +- drivers/net/macsec.c | 19 +- drivers/net/macvtap.c | 2 +- drivers/net/phy/phy.c | 8 +- drivers/net/vxlan.c | 5 +- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 83 +-- drivers/net/xen-netback/netback.c | 1 + drivers/nvdimm/pmem.c | 4 +- drivers/pci/bus.c | 6 +- drivers/pinctrl/pinctrl-at91-pio4.c | 2 + drivers/regulator/axp20x-regulator.c | 12 +- drivers/regulator/da9063-regulator.c | 2 +- drivers/regulator/gpio-regulator.c | 2 + drivers/regulator/s2mps11.c | 28 +- drivers/scsi/device_handler/scsi_dh_alua.c | 1 + drivers/scsi/qla1280.c | 2 +- drivers/spi/spi-ep93xx.c | 2 +- drivers/spi/spi-fsl-dspi.c | 4 +- drivers/spi/spi-omap2-mcspi.c | 62 ++- drivers/spi/spi-pxa2xx.c | 2 +- drivers/spi/spi-ti-qspi.c | 45 +- fs/ecryptfs/file.c | 71 ++- fs/isofs/rock.c | 13 +- fs/kernfs/dir.c | 6 +- fs/kernfs/mount.c | 15 + fs/namei.c | 59 +- fs/ocfs2/acl.c | 87 +++ fs/ocfs2/acl.h | 5 + fs/ocfs2/file.c | 4 +- fs/ocfs2/namei.c | 23 +- fs/ocfs2/refcounttree.c | 17 +- fs/ocfs2/xattr.c | 14 +- fs/ocfs2/xattr.h | 4 +- fs/open.c | 12 +- fs/overlayfs/super.c | 4 +- fs/proc/base.c | 2 +- fs/splice.c | 3 + include/linux/compiler-gcc.h | 2 +- include/linux/dcache.h | 12 + include/linux/kernfs.h | 2 + include/linux/mfd/samsung/s2mps11.h | 2 + include/linux/mfd/twl6040.h | 1 + include/linux/mm.h | 9 + include/linux/namei.h | 2 + include/linux/netdevice.h | 3 + include/linux/swap.h | 6 +- include/linux/uio.h | 1 + include/net/netns/xfrm.h | 1 + include/net/udp_tunnel.h | 9 - include/uapi/linux/if.h | 28 + include/uapi/linux/if_macsec.h | 4 +- include/uapi/linux/libc-compat.h | 44 ++ include/uapi/linux/tc_act/Kbuild | 1 + include/uapi/sound/asoc.h | 44 +- kernel/cgroup.c | 63 +++ kernel/events/core.c | 2 +- kernel/events/ring_buffer.c | 10 +- kernel/sched/deadline.c | 1 + kernel/sched/fair.c | 29 +- kernel/sched/rt.c | 1 + kernel/workqueue.c | 11 + lib/asn1_decoder.c | 16 +- lib/iov_iter.c | 19 + mm/huge_memory.c | 71 ++- mm/ksm.c | 15 +- mm/memory.c | 22 +- mm/swapfile.c | 13 +- mm/zsmalloc.c | 7 +- net/bridge/br_ioctl.c | 5 +- net/bridge/br_multicast.c | 12 +- net/core/flow.c | 14 +- net/core/rtnetlink.c | 18 +- net/ipv4/fib_semantics.c | 2 + net/ipv4/fou.c | 6 +- net/ipv4/ip_gre.c | 7 +- net/ipv4/ip_vti.c | 18 + net/ipv4/tcp_output.c | 6 +- net/ipv4/udp_offload.c | 8 +- net/ipv6/icmp.c | 5 +- net/ipv6/route.c | 2 + net/ipv6/tcp_ipv6.c | 7 +- net/llc/af_llc.c | 1 + net/netfilter/nf_conntrack_core.c | 6 +- net/netfilter/nfnetlink_acct.c | 2 + net/netfilter/xt_IDLETIMER.c | 1 + net/openvswitch/conntrack.c | 13 + net/sched/act_ife.c | 14 +- net/sched/act_ipt.c | 19 +- net/sched/act_mirred.c | 19 +- net/sched/act_simple.c | 18 +- net/sched/act_skbedit.c | 18 +- net/sched/act_vlan.c | 22 +- net/vmw_vsock/af_vsock.c | 21 +- net/x25/x25_facilities.c | 1 + net/xfrm/xfrm_output.c | 3 + sound/pci/hda/hda_sysfs.c | 8 - sound/pci/hda/patch_hdmi.c | 7 +- sound/pci/hda/patch_realtek.c | 13 + sound/soc/codecs/Kconfig | 38 +- sound/soc/codecs/Makefile | 11 +- sound/soc/codecs/ak4642.c | 3 + sound/soc/codecs/hdac_hdmi.c | 1 - sound/soc/codecs/max98371.c | 441 +++++++++++++++ sound/soc/codecs/max98371.h | 67 +++ sound/soc/codecs/rt298.c | 51 +- sound/soc/codecs/rt298.h | 2 + sound/soc/codecs/rt5677.c | 24 +- sound/soc/codecs/tas571x.c | 141 ++++- sound/soc/codecs/tas571x.h | 22 + sound/soc/codecs/tas5720.c | 620 +++++++++++++++++++++ sound/soc/codecs/tas5720.h | 90 +++ sound/soc/codecs/tlv320aic31xx.c | 10 + sound/soc/codecs/tlv320aic32x4-i2c.c | 74 +++ sound/soc/codecs/tlv320aic32x4-spi.c | 76 +++ sound/soc/codecs/tlv320aic32x4.c | 279 +++++++--- sound/soc/codecs/tlv320aic32x4.h | 7 + sound/soc/codecs/twl6040.c | 16 +- sound/soc/codecs/wm8962.c | 9 +- sound/soc/codecs/wm8962.h | 6 +- sound/soc/generic/simple-card.c | 1 + sound/soc/kirkwood/Kconfig | 1 + sound/soc/mediatek/Kconfig | 1 + sound/soc/mediatek/mt8173-rt5650-rt5676.c | 27 + sound/soc/mediatek/mt8173-rt5650.c | 50 +- sound/soc/mediatek/mtk-afe-pcm.c | 2 + sound/soc/omap/mcbsp.c | 8 + sound/soc/omap/omap-pcm.c | 2 + sound/soc/pxa/brownstone.c | 1 + sound/soc/pxa/mioa701_wm9713.c | 1 + sound/soc/pxa/mmp-pcm.c | 1 + sound/soc/pxa/mmp-sspa.c | 1 + sound/soc/pxa/palm27x.c | 1 + sound/soc/pxa/pxa-ssp.c | 1 + sound/soc/pxa/pxa2xx-ac97.c | 1 + sound/soc/pxa/pxa2xx-pcm.c | 1 + sound/soc/qcom/lpass-platform.c | 8 +- sound/soc/sh/rcar/adg.c | 8 +- sound/soc/sh/rcar/dma.c | 12 +- sound/soc/sh/rcar/rsnd.h | 13 +- sound/soc/sh/rcar/src.c | 4 + sound/soc/soc-topology.c | 48 +- sound/soc/sti/sti_uniperif.c | 144 ++++- sound/soc/sti/uniperif.h | 220 +++++++- sound/soc/sti/uniperif_player.c | 182 ++++-- sound/soc/sti/uniperif_reader.c | 229 ++++++-- sound/usb/quirks.c | 3 + tools/build/Makefile.feature | 2 + tools/build/feature/Makefile | 4 + tools/build/feature/test-all.c | 5 + tools/build/feature/test-dwarf_getlocations.c | 12 + tools/lib/traceevent/parse-filter.c | 4 +- tools/net/bpf_jit_disasm.c | 3 + tools/perf/arch/x86/util/dwarf-regs.c | 8 +- tools/perf/builtin-script.c | 70 ++- tools/perf/builtin-stat.c | 7 +- tools/perf/config/Makefile | 6 + tools/perf/util/dwarf-aux.c | 9 + tools/perf/util/event.c | 12 +- tools/perf/util/evsel.c | 23 +- tools/perf/util/parse-events.c | 60 +- tools/perf/util/sort.c | 3 + tools/perf/util/thread_map.c | 8 +- 242 files changed, 4385 insertions(+), 1065 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/max98371.txt create mode 100644 Documentation/devicetree/bindings/sound/tas5720.txt create mode 100644 sound/soc/codecs/max98371.c create mode 100644 sound/soc/codecs/max98371.h create mode 100644 sound/soc/codecs/tas5720.c create mode 100644 sound/soc/codecs/tas5720.h create mode 100644 sound/soc/codecs/tlv320aic32x4-i2c.c create mode 100644 sound/soc/codecs/tlv320aic32x4-spi.c create mode 100644 tools/build/feature/test-dwarf_getlocations.c

2 2