September 2014 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 1/1 linux-next] ASoC: cs35l32: remove second linux/slab.h inclusion
by Fabian Frederick 17 Sep '14

17 Sep '14

linux/slab.h was included twice. Signed-off-by: Fabian Frederick <fabf(a)skynet.be> --- sound/soc/codecs/cs35l32.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/codecs/cs35l32.c b/sound/soc/codecs/cs35l32.c index 76f628b..c125925 100644 --- a/sound/soc/codecs/cs35l32.c +++ b/sound/soc/codecs/cs35l32.c @@ -25,7 +25,6 @@ #include <linux/regulator/consumer.h> #include <linux/gpio/consumer.h> #include <linux/of_device.h> -#include <linux/slab.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> -- 2.1.0

3 2

[alsa-devel] [PATCH 0/9] Misc fixes related to rewinds
by Alexander E. Patrakov 16 Sep '14

16 Sep '14

The idea of the series is to fix the two issues that I found [1] for the hw plugin. snd_pcm_rewindable() sometimes returned negative values that are actually negative amounts of samples and not error codes. Also, it bases its calculations on stale hardware position pointer, which is not what PulseAudio wants (alternatively, we can document the need to call snd_pcm_avail() before snd_pcm_rewindable(), but I don't like it). Also, similar issues in other plugins are fixed, except for "share" and "shm" plugins that I could not really test due to unrelated crashes. I also fixed miscelanneous cosmetic issues and bugs that I found along the way. Note: this series touches pcm_dmix.c, but does not make it rewindable. In other words, a variant of the test in [2] now produces a tone instead of failing due to snd_pcm_rewind() returning 0. But it should ideally produce silence. Obviously, there is some bug left that I have not pinpointed yet. Same for dshare: the test produces a tone, and I don't yet know why. [1] http://permalink.gmane.org/gmane.linux.alsa.devel/122843 and http://permalink.gmane.org/gmane.linux.alsa.devel/122848 (modify the test program to set the stop threshold larger than the buffer size) [2] http://permalink.gmane.org/gmane.linux.alsa.devel/122179 Alexander E. Patrakov (9): dmix: actually rewind when running or being drained pcm: express the rewind size limitation logic better pcm: handle negative values from snd_pcm_mmap_hw_avail pcm, rate: use the snd_pcm_mmap_hw_avail function pcm, null: use the snd_pcm_mmap_avail function rate: handle negative values from snd_pcm_mmap_playback_hw_avail dsnoop: rewindable and forwardable logic was swapped pcm: rewindable, forwardable: don't return stale data pcm, file: don't recurse in the rewindable and forwardable callbacks src/pcm/pcm_dmix.c | 20 ++++++++++++++------ src/pcm/pcm_dshare.c | 16 +++++++++------- src/pcm/pcm_dsnoop.c | 18 ++++++++++-------- src/pcm/pcm_file.c | 4 ++-- src/pcm/pcm_hw.c | 8 +++++++- src/pcm/pcm_ioplug.c | 4 +++- src/pcm/pcm_local.h | 18 ++++++++++++++++++ src/pcm/pcm_null.c | 5 +---- src/pcm/pcm_plugin.c | 12 +++++++++--- src/pcm/pcm_rate.c | 9 +++------ 10 files changed, 76 insertions(+), 38 deletions(-) -- 2.1.0

4 25

[alsa-devel] [PATCH v2] ASoC: rt5677: Add the GPIO function
by Oder Chiou 16 Sep '14

16 Sep '14

The patch adds the GPIO function. Signed-off-by: Oder Chiou <oder_chiou(a)realtek.com> --- sound/soc/codecs/rt5677.c | 133 ++++++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/rt5677.h | 112 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 245 insertions(+) diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c index f0b751b..02bc8bd 100644 --- a/sound/soc/codecs/rt5677.c +++ b/sound/soc/codecs/rt5677.c @@ -19,6 +19,7 @@ #include <linux/i2c.h> #include <linux/platform_device.h> #include <linux/spi/spi.h> +#include <linux/gpio.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> @@ -3160,6 +3161,135 @@ static int rt5677_set_bias_level(struct snd_soc_codec *codec, return 0; } +#ifdef CONFIG_GPIOLIB +static inline struct rt5677_priv *gpio_to_rt5677(struct gpio_chip *chip) +{ + return container_of(chip, struct rt5677_priv, gpio_chip); +} + +static void rt5677_gpio_set(struct gpio_chip *chip, unsigned offset, int value) +{ + struct rt5677_priv *rt5677 = gpio_to_rt5677(chip); + + switch (offset) { + case RT5677_GPIO1 ... RT5677_GPIO5: + regmap_update_bits(rt5677->regmap, RT5677_GPIO_CTRL2, + 0x1 << (offset * 3 + 1), !!value << (offset * 3 + 1)); + break; + + case RT5677_GPIO6: + regmap_update_bits(rt5677->regmap, RT5677_GPIO_CTRL3, + RT5677_GPIO6_OUT_MASK, !!value << RT5677_GPIO6_OUT_SFT); + break; + + default: + break; + } +} + +static int rt5677_gpio_direction_out(struct gpio_chip *chip, + unsigned offset, int value) +{ + struct rt5677_priv *rt5677 = gpio_to_rt5677(chip); + + switch (offset) { + case RT5677_GPIO1 ... RT5677_GPIO5: + regmap_update_bits(rt5677->regmap, RT5677_GPIO_CTRL2, + 0x3 << (offset * 3 + 1), + (0x2 | !!value) << (offset * 3 + 1)); + break; + + case RT5677_GPIO6: + regmap_update_bits(rt5677->regmap, RT5677_GPIO_CTRL3, + RT5677_GPIO6_DIR_MASK | RT5677_GPIO6_OUT_MASK, + RT5677_GPIO6_DIR_OUT | !!value << RT5677_GPIO6_OUT_SFT); + break; + + default: + break; + } + + return 0; +} + +static int rt5677_gpio_get(struct gpio_chip *chip, unsigned offset) +{ + struct rt5677_priv *rt5677 = gpio_to_rt5677(chip); + int value, ret; + + ret = regmap_read(rt5677->regmap, RT5677_GPIO_ST, &value); + if (ret < 0) + return ret; + + return (value & (0x1 << offset)) >> offset; +} + +static int rt5677_gpio_direction_in(struct gpio_chip *chip, unsigned offset) +{ + struct rt5677_priv *rt5677 = gpio_to_rt5677(chip); + + switch (offset) { + case RT5677_GPIO1 ... RT5677_GPIO5: + regmap_update_bits(rt5677->regmap, RT5677_GPIO_CTRL2, + 0x1 << (offset * 3 + 2), 0x0); + break; + + case RT5677_GPIO6: + regmap_update_bits(rt5677->regmap, RT5677_GPIO_CTRL3, + RT5677_GPIO6_DIR_MASK, RT5677_GPIO6_DIR_IN); + break; + + default: + break; + } + + return 0; +} + +static struct gpio_chip rt5677_template_chip = { + .label = "rt5677", + .owner = THIS_MODULE, + .direction_output = rt5677_gpio_direction_out, + .set = rt5677_gpio_set, + .direction_input = rt5677_gpio_direction_in, + .get = rt5677_gpio_get, + .can_sleep = 1, +}; + +static void rt5677_init_gpio(struct i2c_client *i2c) +{ + struct rt5677_priv *rt5677 = i2c_get_clientdata(i2c); + int ret; + + rt5677->gpio_chip = rt5677_template_chip; + rt5677->gpio_chip.ngpio = RT5677_GPIO_NUM; + rt5677->gpio_chip.dev = &i2c->dev; + rt5677->gpio_chip.base = -1; + + ret = gpiochip_add(&rt5677->gpio_chip); + if (ret != 0) + dev_err(&i2c->dev, "Failed to add GPIOs: %d\n", ret); +} + +static void rt5677_free_gpio(struct i2c_client *i2c) +{ + struct rt5677_priv *rt5677 = i2c_get_clientdata(i2c); + int ret; + + ret = gpiochip_remove(&rt5677->gpio_chip); + if (ret != 0) + dev_err(&i2c->dev, "Failed to remove GPIOs: %d\n", ret); +} +#else +static void rt5677_init_gpio(struct i2c_client *i2c) +{ +} + +static void rt5677_free_gpio(struct i2c_client *i2c) +{ +} +#endif + static int rt5677_probe(struct snd_soc_codec *codec) { struct rt5677_priv *rt5677 = snd_soc_codec_get_drvdata(codec); @@ -3422,6 +3552,8 @@ static int rt5677_i2c_probe(struct i2c_client *i2c, RT5677_GPIO5_DIR_OUT); } + rt5677_init_gpio(i2c); + return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5677, rt5677_dai, ARRAY_SIZE(rt5677_dai)); } @@ -3429,6 +3561,7 @@ static int rt5677_i2c_probe(struct i2c_client *i2c, static int rt5677_i2c_remove(struct i2c_client *i2c) { snd_soc_unregister_codec(&i2c->dev); + rt5677_free_gpio(i2c); return 0; } diff --git a/sound/soc/codecs/rt5677.h b/sound/soc/codecs/rt5677.h index a334eb6..b61b72c 100644 --- a/sound/soc/codecs/rt5677.h +++ b/sound/soc/codecs/rt5677.h @@ -1363,10 +1363,109 @@ #define RT5677_SEL_SRC_IB01 (0x1 << 0) #define RT5677_SEL_SRC_IB01_SFT 0 +/* GPIO status (0xbf) */ +#define RT5677_GPIO6_STATUS_MASK (0x1 << 5) +#define RT5677_GPIO6_STATUS_SFT 5 +#define RT5677_GPIO5_STATUS_MASK (0x1 << 4) +#define RT5677_GPIO5_STATUS_SFT 4 +#define RT5677_GPIO4_STATUS_MASK (0x1 << 3) +#define RT5677_GPIO4_STATUS_SFT 3 +#define RT5677_GPIO3_STATUS_MASK (0x1 << 2) +#define RT5677_GPIO3_STATUS_SFT 2 +#define RT5677_GPIO2_STATUS_MASK (0x1 << 1) +#define RT5677_GPIO2_STATUS_SFT 1 +#define RT5677_GPIO1_STATUS_MASK (0x1 << 0) +#define RT5677_GPIO1_STATUS_SFT 0 + +/* GPIO Control 1 (0xc0) */ +#define RT5677_GPIO1_PIN_MASK (0x1 << 15) +#define RT5677_GPIO1_PIN_SFT 15 +#define RT5677_GPIO1_PIN_GPIO1 (0x0 << 15) +#define RT5677_GPIO1_PIN_IRQ (0x1 << 15) +#define RT5677_IPTV_MODE_MASK (0x1 << 14) +#define RT5677_IPTV_MODE_SFT 14 +#define RT5677_IPTV_MODE_GPIO (0x0 << 14) +#define RT5677_IPTV_MODE_IPTV (0x1 << 14) +#define RT5677_FUNC_MODE_MASK (0x1 << 13) +#define RT5677_FUNC_MODE_SFT 13 +#define RT5677_FUNC_MODE_DMIC_GPIO (0x0 << 13) +#define RT5677_FUNC_MODE_JTAG (0x1 << 13) + /* GPIO Control 2 (0xc1) */ #define RT5677_GPIO5_DIR_MASK (0x1 << 14) +#define RT5677_GPIO5_DIR_SFT 14 #define RT5677_GPIO5_DIR_IN (0x0 << 14) #define RT5677_GPIO5_DIR_OUT (0x1 << 14) +#define RT5677_GPIO5_OUT_MASK (0x1 << 13) +#define RT5677_GPIO5_OUT_SFT 13 +#define RT5677_GPIO5_OUT_LO (0x0 << 13) +#define RT5677_GPIO5_OUT_HI (0x1 << 13) +#define RT5677_GPIO5_P_MASK (0x1 << 12) +#define RT5677_GPIO5_P_SFT 12 +#define RT5677_GPIO5_P_NOR (0x0 << 12) +#define RT5677_GPIO5_P_INV (0x1 << 12) +#define RT5677_GPIO4_DIR_MASK (0x1 << 11) +#define RT5677_GPIO4_DIR_SFT 11 +#define RT5677_GPIO4_DIR_IN (0x0 << 11) +#define RT5677_GPIO4_DIR_OUT (0x1 << 11) +#define RT5677_GPIO4_OUT_MASK (0x1 << 10) +#define RT5677_GPIO4_OUT_SFT 10 +#define RT5677_GPIO4_OUT_LO (0x0 << 10) +#define RT5677_GPIO4_OUT_HI (0x1 << 10) +#define RT5677_GPIO4_P_MASK (0x1 << 9) +#define RT5677_GPIO4_P_SFT 9 +#define RT5677_GPIO4_P_NOR (0x0 << 9) +#define RT5677_GPIO4_P_INV (0x1 << 9) +#define RT5677_GPIO3_DIR_MASK (0x1 << 8) +#define RT5677_GPIO3_DIR_SFT 8 +#define RT5677_GPIO3_DIR_IN (0x0 << 8) +#define RT5677_GPIO3_DIR_OUT (0x1 << 8) +#define RT5677_GPIO3_OUT_MASK (0x1 << 7) +#define RT5677_GPIO3_OUT_SFT 7 +#define RT5677_GPIO3_OUT_LO (0x0 << 7) +#define RT5677_GPIO3_OUT_HI (0x1 << 7) +#define RT5677_GPIO3_P_MASK (0x1 << 6) +#define RT5677_GPIO3_P_SFT 6 +#define RT5677_GPIO3_P_NOR (0x0 << 6) +#define RT5677_GPIO3_P_INV (0x1 << 6) +#define RT5677_GPIO2_DIR_MASK (0x1 << 5) +#define RT5677_GPIO2_DIR_SFT 5 +#define RT5677_GPIO2_DIR_IN (0x0 << 5) +#define RT5677_GPIO2_DIR_OUT (0x1 << 5) +#define RT5677_GPIO2_OUT_MASK (0x1 << 4) +#define RT5677_GPIO2_OUT_SFT 4 +#define RT5677_GPIO2_OUT_LO (0x0 << 4) +#define RT5677_GPIO2_OUT_HI (0x1 << 4) +#define RT5677_GPIO2_P_MASK (0x1 << 3) +#define RT5677_GPIO2_P_SFT 3 +#define RT5677_GPIO2_P_NOR (0x0 << 3) +#define RT5677_GPIO2_P_INV (0x1 << 3) +#define RT5677_GPIO1_DIR_MASK (0x1 << 2) +#define RT5677_GPIO1_DIR_SFT 2 +#define RT5677_GPIO1_DIR_IN (0x0 << 2) +#define RT5677_GPIO1_DIR_OUT (0x1 << 2) +#define RT5677_GPIO1_OUT_MASK (0x1 << 1) +#define RT5677_GPIO1_OUT_SFT 1 +#define RT5677_GPIO1_OUT_LO (0x0 << 1) +#define RT5677_GPIO1_OUT_HI (0x1 << 1) +#define RT5677_GPIO1_P_MASK (0x1 << 0) +#define RT5677_GPIO1_P_SFT 0 +#define RT5677_GPIO1_P_NOR (0x0 << 0) +#define RT5677_GPIO1_P_INV (0x1 << 0) + +/* GPIO Control 3 (0xc2) */ +#define RT5677_GPIO6_DIR_MASK (0x1 << 2) +#define RT5677_GPIO6_DIR_SFT 2 +#define RT5677_GPIO6_DIR_IN (0x0 << 2) +#define RT5677_GPIO6_DIR_OUT (0x1 << 2) +#define RT5677_GPIO6_OUT_MASK (0x1 << 1) +#define RT5677_GPIO6_OUT_SFT 1 +#define RT5677_GPIO6_OUT_LO (0x0 << 1) +#define RT5677_GPIO6_OUT_HI (0x1 << 1) +#define RT5677_GPIO6_P_MASK (0x1 << 0) +#define RT5677_GPIO6_P_SFT 0 +#define RT5677_GPIO6_P_NOR (0x0 << 0) +#define RT5677_GPIO6_P_INV (0x1 << 0) /* Virtual DSP Mixer Control (0xf7 0xf8 0xf9) */ #define RT5677_DSP_IB_01_H (0x1 << 15) @@ -1428,6 +1527,16 @@ enum { RT5677_AIFS, }; +enum { + RT5677_GPIO1, + RT5677_GPIO2, + RT5677_GPIO3, + RT5677_GPIO4, + RT5677_GPIO5, + RT5677_GPIO6, + RT5677_GPIO_NUM, +}; + struct rt5677_priv { struct snd_soc_codec *codec; struct rt5677_platform_data pdata; @@ -1441,6 +1550,9 @@ struct rt5677_priv { int pll_src; int pll_in; int pll_out; +#ifdef CONFIG_GPIOLIB + struct gpio_chip gpio_chip; +#endif }; #endif /* __RT5677_H__ */ -- 1.8.1.1.439.g50a6b54

2 1

[alsa-devel] [PATCH v2] ASoC: rt286: Set cbj_en for ACPI devices
by bardliao＠realtek.com 16 Sep '14

16 Sep '14

From: Bard Liao <bardliao(a)realtek.com> This patch set cbj_en value for ACPI devices. Signed-off-by: Bard Liao <bardliao(a)realtek.com> --- sound/soc/codecs/rt286.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt286.c b/sound/soc/codecs/rt286.c index e4f6102..7dfca82 100644 --- a/sound/soc/codecs/rt286.c +++ b/sound/soc/codecs/rt286.c @@ -1100,8 +1100,14 @@ static const struct i2c_device_id rt286_i2c_id[] = { }; MODULE_DEVICE_TABLE(i2c, rt286_i2c_id); +/* the default platform data for acpi devices */ +static struct rt286_platform_data rt286_acpi_data = { + .cbj_en = true, + .gpio2_en = false, +}; + static const struct acpi_device_id rt286_acpi_match[] = { - { "INT343A", 0 }, + { "INT343A", (unsigned long)&rt286_acpi_data }, {}, }; MODULE_DEVICE_TABLE(acpi, rt286_acpi_match); @@ -1111,6 +1117,8 @@ static int rt286_i2c_probe(struct i2c_client *i2c, { struct rt286_platform_data *pdata = dev_get_platdata(&i2c->dev); struct rt286_priv *rt286; + struct device *dev = &i2c->dev; + const struct acpi_device_id *acpiid; int i, ret; rt286 = devm_kzalloc(&i2c->dev, sizeof(*rt286), @@ -1141,6 +1149,13 @@ static int rt286_i2c_probe(struct i2c_client *i2c, if (pdata) rt286->pdata = *pdata; + /* enable jack combo mode on supported devices */ + acpiid = acpi_match_device(dev->driver->acpi_match_table, dev); + if (acpiid) { + rt286->pdata = *(struct rt286_platform_data *) + acpiid->driver_data; + } + regmap_write(rt286->regmap, RT286_SET_AUDIO_POWER, AC_PWRST_D3); for (i = 0; i < RT286_POWER_REG_LEN; i++) -- 1.8.1.1.439.g50a6b54

3 3

[alsa-devel] [PATCH] speaker-test: Fix dropped samples at the end of test
by Jarkko Nikula 16 Sep '14

16 Sep '14

Commit 6d1673526b0f ("Avoid unnecessary drain/restart in speaker-test") drains only when buffer is bigger than audio sample. This has a drawback that up to buffer size amount of data may not be heard at the end of audio sample. This was noted with "speaker-test -c 2 -t wav -s 2" test on a hardware that has a buffer size of 24000 samples and 48 kHz sample rate. Instead of playing "front right" it played something like "front ra". Reverse buffer size vs sample size test wouldn't work either since then samples smaller than buffer are dropped. Fix this by removing buffer_size tests from write_loop() and do drain/restart always when not aborting. Signed-off-by: Jarkko Nikula <jarkko.nikula(a)linux.intel.com> Reported-by: Vidal, Guillaume-florianX <guillaume-florianx.vidal(a)intel.com> --- This was originally noted on Baytrail ADSP hw (default buffer size 24000) but can be heard also on Intel HDA (default buffer size 8192) when audio sample is small enough but bigger than buffer. For instance 100 ms sample finishes too shortly (buffer size 8192, sample size 9600) but 50 ms plays ok (buffer size 8192, sample size 4800). I guess some optimization can be done for snd_pcm_prepare() when not looping but that's not necessary for this fix. --- speaker-test/speaker-test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/speaker-test/speaker-test.c b/speaker-test/speaker-test.c index 61396f296c65..836fd26d35b1 100644 --- a/speaker-test/speaker-test.c +++ b/speaker-test/speaker-test.c @@ -942,7 +942,7 @@ static int write_loop(snd_pcm_t *handle, int channel, int periods, uint8_t *fram snd_pcm_bytes_to_frames(handle, err * channels))) < 0) break; } - if (buffer_size > n && !in_aborting) { + if (!in_aborting) { snd_pcm_drain(handle); snd_pcm_prepare(handle); } @@ -964,7 +964,7 @@ static int write_loop(snd_pcm_t *handle, int channel, int periods, uint8_t *fram if ((err = write_buffer(handle, frames, period_size)) < 0) return err; } - if (buffer_size > n * period_size && !in_aborting) { + if (!in_aborting) { snd_pcm_drain(handle); snd_pcm_prepare(handle); } -- 2.1.0

3 4

[alsa-devel] [GIT PULL] ASoC fixes for v3.17
by Mark Brown 16 Sep '14

16 Sep '14

The following changes since commit 9e82bf014195d6f0054982c463575cdce24292be: Linux 3.17-rc5 (2014-09-14 17:50:12 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v3.17-rc4 for you to fetch changes up to f7667af21736eb231e3589d9f91183d325cabfbe: Merge remote-tracking branches 'asoc/fix/cs4265', 'asoc/fix/davinci', 'asoc/fix/rockchip', 'asoc/fix/samsung' and 'asoc/fix/tlv320aic31xx' into asoc-linus (2014-09-15 15:05:34 -0700) ---------------------------------------------------------------- ASoC: Fixes for v3.17 This is mostly driver fixes, the biggest one being the tlv320aic31xx which is relatively large but simple and device specific. There's a small fix in the error handling in DPCM too which is relatively minor error handling fix. ---------------------------------------------------------------- Charles Keepax (1): ASoC: samsung-i2s: Check secondary DAI exists before referencing Jianqun (3): ASoC: rockchip-i2s: fix master mode set bit error ASoC: rockchip-i2s: fix registers' property of rockchip i2s controller ASoC: rockchip-i2s: dt: swap tx and rx channed request number in example Jyri Sarha (1): ASoC: tlv320aic31xx: Fix 24bit samples with I2S format and 12MHz mclk Mark Brown (3): Merge remote-tracking branch 'asoc/fix/core' into asoc-linus Merge remote-tracking branch 'asoc/fix/pcm' into asoc-linus Merge remote-tracking branches 'asoc/fix/cs4265', 'asoc/fix/davinci', 'asoc/fix/rockchip', 'asoc/fix/samsung' and 'asoc/fix/tlv320aic31xx' into asoc-linus Paul Handrigan (1): ASoC: cs4265: Fix register address to set the proper data type. Peter Ujfalusi (1): ASoC: davinci-mcasp: Correct rx format unit configuration Qiao Zhou (1): ASoC: soc-pcm: fix dpcm_path_get error handling Rajeev Kumar (2): ASoC: dwc: Update email id of the author ASoC: Update email id of the author .../devicetree/bindings/sound/rockchip-i2s.txt | 2 +- sound/soc/codecs/cs4265.c | 6 +-- sound/soc/codecs/sta529.c | 4 +- sound/soc/codecs/tlv320aic31xx.c | 51 +++++++++++++++++----- sound/soc/davinci/davinci-mcasp.c | 11 ++++- sound/soc/dwc/designware_i2s.c | 4 +- sound/soc/rockchip/rockchip_i2s.c | 13 +++--- sound/soc/samsung/i2s.c | 5 ++- sound/soc/soc-compress.c | 6 ++- sound/soc/soc-pcm.c | 6 ++- sound/soc/spear/spear_pcm.c | 4 +- 11 files changed, 79 insertions(+), 33 deletions(-)

2 1

Re: [alsa-devel] coverity fix in alsa-libs
by Takashi Iwai 16 Sep '14

16 Sep '14

At Tue, 16 Sep 2014 04:08:48 +0000 (GMT), Renu Tyagi wrote: > > Hi Takashi, > > Here are some more bugs and patches Could you post one patch per mail? This would make it much easier to review. thanks, Takashi > > 1. File in which changes are being made : conf.c > Value of err to be Negative for correct error handling > Patch : 22657.patch > > Community Code: > if (err >= 0) { > snd_config_iterator_t i, next; > if (snd_config_get_type(func_conf) != SND_CONFIG_TYPE_COMPOUND) { > SNDERR("Invalid type for func %s definition", str); > goto _err; > } > > Recommended Code : > if (err >= 0) { > snd_config_iterator_t i, next; > if (snd_config_get_type(func_conf) != SND_CONFIG_TYPE_COMPOUND) { > SNDERR("Invalid type for func %s definition", str); > err = -EINVAL; > goto _err; > } > > ---------------------------------------------------------------------------------------- > > 2.File in which changes are being made : control.c > Value of err to be Negative for correct error handling > Patch : 22658.patch > > Community Code: > if (err >= 0) { > if (snd_config_get_type(type_conf) != SND_CONFIG_TYPE_COMPOUND) { > SNDERR("Invalid type for CTL type %s definition", str); > goto _err; > } > > Recommended Code : > if (err >= 0) { > if (snd_config_get_type(type_conf) != SND_CONFIG_TYPE_COMPOUND) { > SNDERR("Invalid type for CTL type %s definition", str); > err = -EINVAL; > goto _err; > } > ---------------------------------------------------------------------------------------- > > 3.File in which changes are being made : mixer.c > Double free by calling snd_hctl_close(hctl) twice it is called inside snd_mixer_attach_hctl also. > Patch : 22638.patch > > Community Code: > int snd_mixer_attach(snd_mixer_t *mixer, const char *name) > { > snd_hctl_t *hctl; > int err; > > err = snd_hctl_open(&hctl, name, 0); > if (err < 0) > return err; > err = snd_mixer_attach_hctl(mixer, hctl); > if (err < 0) { > snd_hctl_close(hctl); > return err; > } > return 0; > } > > Recommended Code : > int snd_mixer_attach(snd_mixer_t *mixer, const char *name) > { > snd_hctl_t *hctl; > int err; > > err = snd_hctl_open(&hctl, name, 0); > if (err < 0) > return err; > err = snd_mixer_attach_hctl(mixer, hctl); > if (err < 0) { > /* Removed snd_hctl_close(hctl) to avoid double free, already called in snd_mixer_attach_hctl. */ > return err; > } > return 0; > } > ---------------------------------------------------------------------------------------- > > 4.File in which changes are being made : pcm.c > Value of err to be Negative for correct error handling > Patch : 22659.patch > > Community Code: > if (err >= 0) { > if (snd_config_get_type(type_conf) != SND_CONFIG_TYPE_COMPOUND) { > SNDERR("Invalid type for PCM type %s definition", str); > goto _err; > } > snd_config_for_each(i, next, type_conf) { > snd_config_t *n = snd_config_iterator_entry(i); > Recommended Code : > if (err >= 0) { > if (snd_config_get_type(type_conf) != SND_CONFIG_TYPE_COMPOUND) { > SNDERR("Invalid type for PCM type %s definition", str); > err = -EINVAL; > goto _err; > } > snd_config_for_each(i, next, type_conf) { > snd_config_t *n = snd_config_iterator_entry(i); > > ---------------------------------------------------------------------------------------- > > 5.File in which changes are being made : pcm_file.c > Free resources before returning error. > Patch : 22583.patch > Patch : 22584.patch > > Community Code: > if (ifname && (stream == SND_PCM_STREAM_CAPTURE)) { > ifd = open(ifname, O_RDONLY); /* TODO: mind blocking mode */ > if (ifd < 0) { > SYSERR("open %s for reading failed", ifname); > free(file); > return -errno; > } > file->ifname = strdup(ifname); > } > file->fd = fd; > file->ifd = ifd; > file->format = format; > file->gen.slave = slave; > file->gen.close_slave = close_slave; > > err = snd_pcm_new(&pcm, SND_PCM_TYPE_FILE, name, slave->stream, slave->mode); > if (err < 0) { > free(file->fname); > free(file); > return err; > } > > Recommended Code : > if (ifname && (stream == SND_PCM_STREAM_CAPTURE)) { > ifd = open(ifname, O_RDONLY); /* TODO: mind blocking mode */ > if (ifd < 0) { > SYSERR("open %s for reading failed", ifname); > free(file->fname); > free(file); > return -errno; > } > file->ifname = strdup(ifname); > } > file->fd = fd; > file->ifd = ifd; > file->format = format; > file->gen.slave = slave; > file->gen.close_slave = close_slave; > > err = snd_pcm_new(&pcm, SND_PCM_TYPE_FILE, name, slave->stream, slave->mode); > if (err < 0) { > free(file->fname); > free(file->ifname); > free(file); > return err; > } > > ---------------------------------------------------------------------------------------- > > 6.File in which changes are being made : pcm_hooks.c > Null check before closing h > Patch :22665.patch > > Community Code: > if (err >= 0) > err = hook_add_dlobj(pcm, h); > > if (err < 0) { > snd_dlclose(h); > return err; > } > return 0; > } > Recommended Code : > if (err >= 0) > err = hook_add_dlobj(pcm, h); > > if (err < 0) { > if(h) > snd_dlclose(h); > return err; > } > return 0; > } > ---------------------------------------------------------------------------------------- > > 7.File in which changes are being made : pcm_share.c > Mutex unlock before returning > Patch : 22670.patch > > Community Code: > Pthread_mutex_lock(&slave->mutex); > err = pipe(slave->poll); > if (err < 0) { > SYSERR("can't create a pipe"); > return NULL; > } > while (slave->open_count > 0) { > snd_pcm_uframes_t missing; > // printf("begin min_missing\n"); > missing = _snd_pcm_share_slave_missing(slave); > // printf("min_missing=%ld\n", missing); > if (missing < INT_MAX) { > snd_pcm_uframes_t hw_ptr; > snd_pcm_sframes_t avail_min; > hw_ptr = slave->hw_ptr + missing; > hw_ptr += spcm->period_size - 1; > if (hw_ptr >= spcm->boundary) > hw_ptr -= spcm->boundary; > hw_ptr -= hw_ptr % spcm->period_size; > avail_min = hw_ptr - *spcm->appl.ptr; > if (spcm->stream == SND_PCM_STREAM_PLAYBACK) > avail_min += spcm->buffer_size; > if (avail_min < 0) > avail_min += spcm->boundary; > // printf("avail_min=%d\n", avail_min); > if ((snd_pcm_uframes_t)avail_min != spcm->avail_min) { > snd_pcm_sw_params_set_avail_min(spcm, &slave->sw_params, avail_min); > err = snd_pcm_sw_params(spcm, &slave->sw_params); > if (err < 0) { > SYSERR("snd_pcm_sw_params error"); > return NULL; > } > } > > Recommended Code : > Pthread_mutex_lock(&slave->mutex); > err = pipe(slave->poll); > if (err < 0) { > SYSERR("can't create a pipe"); > Pthread_mutex_unlock(&slave->mutex); > return NULL; > } > while (slave->open_count > 0) { > snd_pcm_uframes_t missing; > // printf("begin min_missing\n"); > missing = _snd_pcm_share_slave_missing(slave); > // printf("min_missing=%ld\n", missing); > if (missing < INT_MAX) { > snd_pcm_uframes_t hw_ptr; > snd_pcm_sframes_t avail_min; > hw_ptr = slave->hw_ptr + missing; > hw_ptr += spcm->period_size - 1; > if (hw_ptr >= spcm->boundary) > hw_ptr -= spcm->boundary; > hw_ptr -= hw_ptr % spcm->period_size; > avail_min = hw_ptr - *spcm->appl.ptr; > if (spcm->stream == SND_PCM_STREAM_PLAYBACK) > avail_min += spcm->buffer_size; > if (avail_min < 0) > avail_min += spcm->boundary; > // printf("avail_min=%d\n", avail_min); > if ((snd_pcm_uframes_t)avail_min != spcm->avail_min) { > snd_pcm_sw_params_set_avail_min(spcm, &slave->sw_params, avail_min); > err = snd_pcm_sw_params(spcm, &slave->sw_params); > if (err < 0) { > SYSERR("snd_pcm_sw_params error"); > Pthread_mutex_unlock(&slave->mutex); > return NULL; > } > } > ---------------------------------------------------------------------------------------- > 8.File in which changes are being made : rawmidi.c > Handle h to be closed in case of error before returning > Patch :22578.patch > > Community Code: > if (err >= 0) > err = open_func(inputp, outputp, name, rawmidi_root, rawmidi_conf, mode); > if (err < 0) > return err; > if (inputp) { > (*inputp)->dl_handle = h; h = NULL; > > Recommended Code : > if (err >= 0) > err = open_func(inputp, outputp, name, rawmidi_root, rawmidi_conf, mode); > if (err < 0){ > if (h) > snd_dlclose(h); > return err; > } > if (inputp) { > (*inputp)->dl_handle = h; h = NULL; > ---------------------------------------------------------------------------------------- > > 9.File in which changes are being made : sbase.c > Freeing the resources before returning in case of error > Patch : 22579.patch > > Community Code: > hsimple = calloc(1, sizeof(*hsimple)); > if (hsimple == NULL) { > snd_mixer_selem_id_free(id); > return -ENOMEM; > } > switch (sel->purpose) { > case PURPOSE_SWITCH: > if (ctype != SND_CTL_ELEM_TYPE_BOOLEAN) { > __invalid_type: > snd_mixer_selem_id_free(id); > return -EINVAL; > } > break; > > Recommended Code : > hsimple = calloc(1, sizeof(*hsimple)); > if (hsimple == NULL) { > snd_mixer_selem_id_free(id); > return -ENOMEM; > } > switch (sel->purpose) { > case PURPOSE_SWITCH: > if (ctype != SND_CTL_ELEM_TYPE_BOOLEAN) { > __invalid_type: > snd_mixer_selem_id_free(id); > free(hsimple); > return -EINVAL; > } > break; > --------------------------------------------------------------------------- > > 10.File in which changes are being made : socket.c > Socket not closed before returning when error occurs > Patch :22587.patch > > Community Code: > s = socket(PF_INET, SOCK_STREAM, 0); > if (s < 0) { > SYSERR("socket failed"); > return -errno; > } > > conf.ifc_len = numreqs * sizeof(struct ifreq); > conf.ifc_buf = malloc((unsigned int) conf.ifc_len); > if (! conf.ifc_buf) > return -ENOMEM; > while (1) { > err = ioctl(s, SIOCGIFCONF, &conf); > if (err < 0) { > SYSERR("SIOCGIFCONF failed"); > return -errno; > } > if ((size_t)conf.ifc_len < numreqs * sizeof(struct ifreq)) > break; > numreqs *= 2; > conf.ifc_len = numreqs * sizeof(struct ifreq); > conf.ifc_buf = realloc(conf.ifc_buf, (unsigned int) conf.ifc_len); > if (! conf.ifc_buf) > return -ENOMEM; > } > > Recommended Code : > s = socket(PF_INET, SOCK_STREAM, 0); > if (s < 0) { > SYSERR("socket failed"); > return -errno; > } > > conf.ifc_len = numreqs * sizeof(struct ifreq); > conf.ifc_buf = malloc((unsigned int) conf.ifc_len); > if (! conf.ifc_buf){ > close(s); > return -ENOMEM; > } > while (1) { > err = ioctl(s, SIOCGIFCONF, &conf); > if (err < 0) { > SYSERR("SIOCGIFCONF failed"); > close(s); > return -errno; > } > if ((size_t)conf.ifc_len < numreqs * sizeof(struct ifreq)) > break; > numreqs *= 2; > conf.ifc_len = numreqs * sizeof(struct ifreq); > conf.ifc_buf = realloc(conf.ifc_buf, (unsigned int) conf.ifc_len); > if (! conf.ifc_buf){ > close(s); > return -ENOMEM; > } > } > ---------------------------------------------------------------------- > > 11.File in which changes are being made : simple_abst.c > If lib is NULL return error to avoid strlen of NULL string. > Patch :22667.patch > > Community Code: > path = getenv("ALSA_MIXER_SIMPLE_MODULES"); > if (!path) > path = SO_PATH; > xlib = malloc(strlen(lib) + strlen(path) + 1 + 1); > if (xlib == NULL) > return -ENOMEM; > > Recommended Code : > path = getenv("ALSA_MIXER_SIMPLE_MODULES"); > if (!lib) > return -ENXIO; > if (!path) > path = SO_PATH; > xlib = malloc(strlen(lib) + strlen(path) + 1 + 1); > if (xlib == NULL) > return -ENOMEM; > ------------------------------------------------------------------------------ > > ------- Original Message ------- > Sender : Takashi Iwai<tiwai(a)suse.de> > Date : Sep 15, 2014 17:18 (GMT+05:30) > Title : Re: [alsa-devel] coverity fix in alsa-libs > > At Mon, 15 Sep 2014 17:36:02 +0600, > Alexander E. Patrakov wrote: > > > > 15.09.2014 15:25, Renu Tyagi wrote: > > > Hi, > > > > > > I ran Coverity analysis tool on alsa and found some bugs. > > > > May I suggest that we remove aserver and the shm plugin instead of > > applying the patch? Three days ago I tried to use it for testing my fix > > to the share plugin, but failed. In other words: if even speaker-test > > cannot be made to work on it without crashing and/or hanging or valgrind > > errors, then I'd rather be aggressive here. > > > > And next time please CC: Takashi Iwai on all alsa-lib patches :) > > I'm for removing aserver & co, too, but let's put it as post-1.0.29 > item, since Jaroslav seems preparing 1.0.29 release now. > > > thanks, > > Takashi > > > > > > Bug and Patch description > > > > > > 1. Changed file : aserver.c > > > Socket not closed before returning when bind fails > > > Community Code: > > > > > > if (bind(sock, (struct sockaddr *) addr, size) < 0) { > > > int result = -errno; > > > SYSERROR("bind failed"); > > > return result; > > > } > > > return sock; > > > } > > > > > > Recommended Code : > > > > > > if (bind(sock, (struct sockaddr *) addr, size) < 0) { > > > int result = -errno; > > > SYSERROR("bind failed"); > > > close(sock); > > > return result; > > > } > > > return sock; > > > } > > > > > > 2.Changed file : control_shm.c > > > Socket not closed before returning when connect fails > > > > > > Community Code: > > > if (connect(sock, (struct sockaddr *) addr, size) < 0) > > > return -errno; > > > return sock; > > > } > > > > > > Recommended Code : > > > if (connect(sock, (struct sockaddr *) addr, size) < 0){ > > > SYSERR("connect failed"); > > > close(sock); > > > return -errno; > > > } > > > return sock; > > > } > > > > > > 3.Changed file : pcm_shm.c > > > Socket not closed before returning when connect fails > > > > > > Community Code: > > > if (connect(sock, (struct sockaddr *) addr, size) < 0) { > > > SYSERR("connect failed"); > > > return -errno; > > > } > > > return sock; > > > } > > > Recommended Code : > > > if (connect(sock, (struct sockaddr *) addr, size) < 0) { > > > SYSERR("connect failed"); > > > close(sock); > > > return -errno; > > > } > > > return sock; > > > } > > > > > > PFA patch. > > > > > > > > > > > > > > > > > > Thanks & Regards, > > > > > > Renu Tyagi > > > > > > > > > > > > _______________________________________________ > > > Alsa-devel mailing list > > > Alsa-devel(a)alsa-project.org > > > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel > > > > > > > > > -- > > Alexander E. Patrakov > > > _______________________________________________ > Alsa-devel mailing list > Alsa-devel(a)alsa-project.org > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel > > > Thanks & Regards, > > Renu Tyagi > SRI-Delhi (SW Platform) | Seat Number 3A-157 > Samsung India Electronics Pvt. Ltd., > 2A, Sector 126, Noida -201303 > [2 22657.patch <application/octet-stream (base64)>] > > [3 22658.patch <application/octet-stream (base64)>] > > [4 22638.patch <application/octet-stream (base64)>] > > [5 22659.patch <application/octet-stream (base64)>] > > [6 22583.patch <application/octet-stream (base64)>] > > [7 22584.patch <application/octet-stream (base64)>] > > [8 22665.patch <application/octet-stream (base64)>] > > [9 22670.patch <application/octet-stream (base64)>] > > [10 22578.patch <application/octet-stream (base64)>] > > [11 22579.patch <application/octet-stream (base64)>] > > [12 22587.patch <application/octet-stream (base64)>] > > [13 22667.patch <application/octet-stream (base64)>] >

1 0

[alsa-devel] [PATCH RFC 0/7] Allow multiple callbacks for hda_jack
by Takashi Iwai 16 Sep '14

16 Sep '14

Hi, this is a series of patches I quickly cooked up after the discussion in this morning: the support of multiple callbacks per jack. The series is applied on top of the previous fix patch (ALSA: hda - Fix invalid pin powermap without jack detection). It begins with a couple of cleanups, then introduces the new hda_jack_callback struct and the changes along with it, then ends with another couple of cleanup patches based on the new infrastructure. I've tested only with a small set of devices, so far. Takashi

2 16

[alsa-devel] [PATCH v5 00/15] Rework OMAP4+ HDMI audio support
by Jyri Sarha 16 Sep '14

16 Sep '14

The patches are based on: git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git for-next The base, the patches, and couple of additional not-to-be-merged omap2plus_defconfig patches can be found here: git://git.ti.com/~jyrisarha/ti-linux-kernel/jyrisarhas-audio-video-linux-fe… omap-hdmi-audio Changes since v4: - Turn ASoC parts into a platform device driver - Some cleaning up - reorder the patches to keep bisect working Changes since v3: - Move ASoC parts into library module under sound/soc/omap - Come up with API for the library - Some cleaning up The patch set fixes OMAP4+ HDMI audio. The structure of the implementation looks a bit different than before. Instead of creating a driver specific API for a separate ASoC component driver to connect to, these patches implement a platform device driver under sound/soc/omap for ASoC side implementation. This driver should only be registered from OMAPDSS HDMI code. The ASoC side driver implements cpu-dai component using the callbacks provided by OMAPDSS. Omap-pcm is registered for platform component, dummy hdmi-audio-codec is registered for codec component, and asoc-simple-card is registered for machine driver. Big part of the HDMI audio code is still unchanged and there is a need for a cleanup there. Also there is still probably something wrong with speaker mapping of multi-channel streams. I will get back to cleaning up these issues later. Best regards, Jyri Jyri Sarha (15): OMAPDSS: hdmi.h: Add HDMI_AUDIO_LAYOUT_6CH enum value OMAPDSS: hdmi: Remove most of OMAP[45]_DSS_HDMI_AUDIO ifdefs OMAPDSS: hdmi4_core: Remove unused hdmi4_audio_get_dma_port() OMAPDSS: hdmi_wp: Add function for getting audio dma address OMAPDSS: hdmi: Make hdmi structure public OMAPDSS: hdmi: Add pdev pointer for audio_pdev in HDMI DRV data ASoC: omap-hdmi-audio: Add platfrom device for OMAP HDMI audio support OMAPDSS: Kconfig: Remove HDMI audio booleans from Kconfig OMAPDSS: hdmi: Make hdmi_mode_has_audio() more user friedly OMAPDSS: hdmi4: Register ASoC platfrom device for omap hdmi audio OMAPDSS: hdmi5: Register ASoC platfrom device for omap hdmi audio ASoC: omap: Remove obsolete HDMI audio code and Kconfig options OMAPDSS: hdmi4: Remove callbacks for the old ASoC DAI driver OMAPDSS: hdmi5: Remove callbacks for the old ASoC DAI driver OMAPDSS: Remove all references to obsolete HDMI audio callbacks .../fbdev/omap2/displays-new/connector-hdmi.c | 99 ----- .../fbdev/omap2/displays-new/encoder-tpd12s015.c | 56 --- drivers/video/fbdev/omap2/dss/Kconfig | 7 - drivers/video/fbdev/omap2/dss/hdmi.h | 35 +- drivers/video/fbdev/omap2/dss/hdmi4.c | 247 ++++++------- drivers/video/fbdev/omap2/dss/hdmi4_core.c | 14 - drivers/video/fbdev/omap2/dss/hdmi4_core.h | 4 - drivers/video/fbdev/omap2/dss/hdmi5.c | 230 +++++------- drivers/video/fbdev/omap2/dss/hdmi5_core.c | 6 - drivers/video/fbdev/omap2/dss/hdmi5_core.h | 2 - drivers/video/fbdev/omap2/dss/hdmi_common.c | 2 - drivers/video/fbdev/omap2/dss/hdmi_wp.c | 8 +- include/sound/omap-hdmi-audio.h | 38 ++ include/video/omapdss.h | 31 -- sound/soc/omap/Kconfig | 22 +- sound/soc/omap/Makefile | 6 +- sound/soc/omap/omap-hdmi-audio.c | 379 ++++++++++++++++++++ sound/soc/omap/omap-hdmi-card.c | 87 ----- sound/soc/omap/omap-hdmi.c | 364 ------------------- sound/soc/omap/omap-hdmi.h | 38 -- 20 files changed, 675 insertions(+), 1000 deletions(-) create mode 100644 include/sound/omap-hdmi-audio.h create mode 100644 sound/soc/omap/omap-hdmi-audio.c delete mode 100644 sound/soc/omap/omap-hdmi-card.c delete mode 100644 sound/soc/omap/omap-hdmi.c delete mode 100644 sound/soc/omap/omap-hdmi.h -- 1.7.9.5

1 15

[alsa-devel] [PATCH 0/3] ASoC: simple-card: cleanup simple-card daifmt
by Kuninori Morimoto 16 Sep '14

16 Sep '14

Hi Mark These are cleanup patches for simple-card daifmt. Kuninori Morimoto (3): ASoC: simple-card: tidyup use priv in parameter ASoC: simple-card: tidyup get dai_link/dai_props from priv ASoC: simple-card: add asoc_simple_card_parse_daifmt() sound/soc/generic/simple-card.c | 165 +++++++++++++++++++-------------------- 1 file changed, 82 insertions(+), 83 deletions(-) Best regards --- Kuninori Morimoto

2 7