August 2011 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 1/2] ASoC: Remove -codec from WM8523 driver name
by Mark Brown 02 Aug '11

02 Aug '11

It's redundant to specify it. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm8523.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/wm8523.c b/sound/soc/codecs/wm8523.c index 4fd4d8d..1312009 100644 --- a/sound/soc/codecs/wm8523.c +++ b/sound/soc/codecs/wm8523.c @@ -551,7 +551,7 @@ MODULE_DEVICE_TABLE(i2c, wm8523_i2c_id); static struct i2c_driver wm8523_i2c_driver = { .driver = { - .name = "wm8523-codec", + .name = "wm8523", .owner = THIS_MODULE, }, .probe = wm8523_i2c_probe, -- 1.7.5.4

2 3

[alsa-devel] [PATCH] ALSA: asihpi - Clarify adapter index validity check.
by linux＠audioscience.com 01 Aug '11

01 Aug '11

From: Eliot Blennerhassett <eblennerhassett(a)audioscience.com> Avoids assigning possibly invalid address to pa, even if it is never dereferenced. Signed-off-by: Eliot Blennerhassett <eblennerhassett(a)audioscience.com> --- sound/pci/asihpi/hpioctl.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/sound/pci/asihpi/hpioctl.c b/sound/pci/asihpi/hpioctl.c index 9683f84..a32502e 100644 --- a/sound/pci/asihpi/hpioctl.c +++ b/sound/pci/asihpi/hpioctl.c @@ -177,16 +177,21 @@ long asihpi_hpi_ioctl(struct file *file, unsigned int cmd, unsigned long arg) } else { u16 __user *ptr = NULL; u32 size = 0; - + u32 adapter_present; /* -1=no data 0=read from user mem, 1=write to user mem */ int wrflag = -1; - u32 adapter = hm->h.adapter_index; - struct hpi_adapter *pa = &adapters[adapter]; + struct hpi_adapter *pa; + + if (hm->h.adapter_index < HPI_MAX_ADAPTERS) { + pa = &adapters[hm->h.adapter_index]; + adapter_present = pa->type; + } else { + adapter_present = 0; + } - if ((adapter >= HPI_MAX_ADAPTERS) || (!pa->type)) { - hpi_init_response(&hr->r0, HPI_OBJ_ADAPTER, - HPI_ADAPTER_OPEN, - HPI_ERROR_BAD_ADAPTER_NUMBER); + if (!adapter_present) { + hpi_init_response(&hr->r0, hm->h.object, + hm->h.function, HPI_ERROR_BAD_ADAPTER_NUMBER); uncopied_bytes = copy_to_user(puhr, hr, sizeof(hr->h)); -- 1.7.0.4

3 4

[alsa-devel] [PATCH 1/1] ASoC: sgtl5000: add one missed cache reg
by Dong Aisheng 01 Aug '11

01 Aug '11

Signed-off-by: Dong Aisheng <b29396(a)freescale.com> Signed-off-by: Zeng Zhaoming <zhaoming.zeng(a)freescale.com> Cc: Mark Brown <broonie(a)opensource.wolfsonmicro.com> Cc: Liam Girdwood <lrg(a)ti.com> Cc: Sascha Hauer <s.hauer(a)pengutronix.de> --- sound/soc/codecs/sgtl5000.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index 76258f2..5a0d8e4 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c @@ -49,6 +49,7 @@ static const u16 sgtl5000_regs[SGTL5000_MAX_REG_OFFSET >> 1] = { 0x0000, /* 0x0016, reserved */ 0x0000, /* 0x0018, reserved */ 0x0000, /* 0x001A, reserved */ + 0x0000, /* 0x001C, reserved */ 0x0000, /* 0x001E, reserved */ 0x0000, /* 0x0020, CHIP_ANA_ADC_CTRL */ 0x1818, /* 0x0022, CHIP_ANA_HP_CTRL */ -- 1.7.0.4

4 3

[alsa-devel] [PATCH 1/2] ASoC: Implement new DC servo readback mode for late WM8994 revisions
by Mark Brown 01 Aug '11

01 Aug '11

Later WM8994 devices implement a new DC servo readback mode with the register used to access the offset moved to register 0x59. Implement support for this and enable it on the appropriate devices. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- include/linux/mfd/wm8994/registers.h | 1 + sound/soc/codecs/wm8994.c | 3 ++- sound/soc/codecs/wm_hubs.c | 19 +++++++++++++++---- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/include/linux/mfd/wm8994/registers.h b/include/linux/mfd/wm8994/registers.h index f3ee842..6152914 100644 --- a/include/linux/mfd/wm8994/registers.h +++ b/include/linux/mfd/wm8994/registers.h @@ -72,6 +72,7 @@ #define WM8994_DC_SERVO_2 0x55 #define WM8994_DC_SERVO_4 0x57 #define WM8994_DC_SERVO_READBACK 0x58 +#define WM8994_DC_SERVO_4E 0x59 #define WM8994_ANALOGUE_HP_1 0x60 #define WM8958_MIC_DETECT_1 0xD0 #define WM8958_MIC_DETECT_2 0xD1 diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index cc8222c..e1e9aca 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -107,6 +107,7 @@ static int wm8994_volatile(struct snd_soc_codec *codec, unsigned int reg) case WM8994_LDO_2: case WM8958_DSP2_EXECCONTROL: case WM8958_MIC_DETECT_3: + case WM8994_DC_SERVO_4E: return 1; default: return 0; @@ -2965,7 +2966,7 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec) wm8994->hubs.series_startup = 1; break; default: - wm8994->hubs.dcs_readback_mode = 1; + wm8994->hubs.dcs_readback_mode = 2; break; } diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c index 4416a76..524bdc6 100644 --- a/sound/soc/codecs/wm_hubs.c +++ b/sound/soc/codecs/wm_hubs.c @@ -18,6 +18,7 @@ #include <linux/pm.h> #include <linux/i2c.h> #include <linux/platform_device.h> +#include <linux/mfd/wm8994/registers.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> @@ -116,14 +117,23 @@ static void calibrate_dc_servo(struct snd_soc_codec *codec) { struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); s8 offset; - u16 reg, reg_l, reg_r, dcs_cfg; + u16 reg, reg_l, reg_r, dcs_cfg, dcs_reg; + + switch (hubs->dcs_readback_mode) { + case 2: + dcs_reg = WM8994_DC_SERVO_4E; + break; + default: + dcs_reg = WM8993_DC_SERVO_3; + break; + } /* If we're using a digital only path and have a previously * callibrated DC servo offset stored then use that. */ if (hubs->class_w && hubs->class_w_dcs) { dev_dbg(codec->dev, "Using cached DC servo offset %x\n", hubs->class_w_dcs); - snd_soc_write(codec, WM8993_DC_SERVO_3, hubs->class_w_dcs); + snd_soc_write(codec, dcs_reg, hubs->class_w_dcs); wait_for_dc_servo(codec, WM8993_DCS_TRIG_DAC_WR_0 | WM8993_DCS_TRIG_DAC_WR_1); @@ -154,8 +164,9 @@ static void calibrate_dc_servo(struct snd_soc_codec *codec) reg_r = snd_soc_read(codec, WM8993_DC_SERVO_READBACK_2) & WM8993_DCS_INTEG_CHAN_1_MASK; break; + case 2: case 1: - reg = snd_soc_read(codec, WM8993_DC_SERVO_3); + reg = snd_soc_read(codec, dcs_reg); reg_r = (reg & WM8993_DCS_DAC_WR_VAL_1_MASK) >> WM8993_DCS_DAC_WR_VAL_1_SHIFT; reg_l = reg & WM8993_DCS_DAC_WR_VAL_0_MASK; @@ -185,7 +196,7 @@ static void calibrate_dc_servo(struct snd_soc_codec *codec) dev_dbg(codec->dev, "DCS result: %x\n", dcs_cfg); /* Do it */ - snd_soc_write(codec, WM8993_DC_SERVO_3, dcs_cfg); + snd_soc_write(codec, dcs_reg, dcs_cfg); wait_for_dc_servo(codec, WM8993_DCS_TRIG_DAC_WR_0 | WM8993_DCS_TRIG_DAC_WR_1); -- 1.7.5.4

2 2

[alsa-devel] [PATCH] ASoC: Trivial formatting fix in soc-core.c
by Mark Brown 01 Aug '11

01 Aug '11

Utterly trivial but it annoys me. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/soc-core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 83ad8ca..e2ce248 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -105,7 +105,7 @@ static int format_register_str(struct snd_soc_codec *codec, if (wordsize + regsize + 2 + 1 != len) return -EINVAL; - ret = snd_soc_read(codec , reg); + ret = snd_soc_read(codec, reg); if (ret < 0) { memset(regbuf, 'X', regsize); regbuf[regsize] = '\0'; -- 1.7.5.4

2 1

[alsa-devel] Some more on MSI GX740 and HDA Intel (bug 5321)
by K900 01 Aug '11

01 Aug '11

Sorry for disappearing last time, I've been quite busy at the time. But I managed to find a bit more on my laptop's sound card and how to make it work. I've found two nodes that actually produce (some) sound when connected to a mixer. 0x1b pin complex is connected to front speakers and 0x16 to the center/LFE thingy. However, I can only get sound from them when I connect them to 0x0c and 0x0e mixers, that both (why?) output the sound from front channels. So, there's no mixer that outputs rear or LFE channels. To be honest, I don't understand anything further than this, so can someone please help me :) I'll try to be around on IRC most of the time. Also, my JID is k900(a)neko.im. // Note: it seems my last mail was lost somewhere. Correct me if I'm wrong.

1 0

Re: [alsa-devel] Copy ALSA buffer to the buffer allocated in my driver.
by Clemens Ladisch 01 Aug '11

01 Aug '11

`/ET!-i1S!-i wrote: > 1. I guess pulse audio inturn calls Alsa and i want to write a Alsa driver. But the sound cards on the networked PCs already have drivers. > The problem i am facing is receiving Alsa buffer to my buffer Your driver's buffer _is_ the ALSA buffer. > and updating the buffer position to middle layer. The hardware position is returned by the pointer callback. The software position should be of no concern to the driver. > 2. Is it substream->runtime->dma_area or substream->dma_buffer.area holds > the audio data? What is the difference between them? These fields are controlled by your driver, although typically they are set by ALSA helper functions. substream->dma_buffer is the preallocated buffer; if your driver doesn't do preallocation, it is not set. The actual buffer, if it exists and is accessible by the CPU from kernel space, is in substream->runtime->dma_area. Regards, Clemens

1 0

Re: [alsa-devel] [PATCH] Sound: AudioScience HPI: Don't leak firmware if mem alloc fails
by Takashi Iwai 01 Aug '11

01 Aug '11

At Sun, 31 Jul 2011 23:16:43 +0200 (CEST), Jesper Juhl wrote: > > On Fri, 29 Jul 2011, Jesper Juhl wrote: > > > On Fri, 29 Jul 2011, Takashi Iwai wrote: > > > > > At Thu, 28 Jul 2011 21:48:27 +0200 (CEST), > > > Jesper Juhl wrote: > > > > > > > > We leak the memory allocated to 'firmware' when we fail to > > > > release_firmware() after a kmalloc() failure in hpi_dsp_code_open(). > > > > This patch should take care of the leak. > > > > > > > > Signed-off-by: Jesper Juhl <jj(a)chaosbits.net> > > > > --- > > > > sound/pci/asihpi/hpidspcd.c | 4 +++- > > > > 1 files changed, 3 insertions(+), 1 deletions(-) > > > > > > > > Build tested only. > > > > > > > > diff --git a/sound/pci/asihpi/hpidspcd.c b/sound/pci/asihpi/hpidspcd.c > > > > index 3a7afa3..8d261ef 100644 > > > > --- a/sound/pci/asihpi/hpidspcd.c > > > > +++ b/sound/pci/asihpi/hpidspcd.c > > > > @@ -85,8 +85,10 @@ short hpi_dsp_code_open(u32 adapter, void *os_data, struct dsp_code *dsp_code, > > > > > > > > HPI_DEBUG_LOG(DEBUG, "dsp code %s opened\n", fw_name); > > > > dsp_code->pvt = kmalloc(sizeof(*dsp_code->pvt), GFP_KERNEL); > > > > - if (!dsp_code->pvt) > > > > + if (!dsp_code->pvt) { > > > > + release_firmware(firmware); > > > > return HPI_ERROR_MEMORY_ALLOC; > > > > + } > > > > > > IMO, it's better to use the same error handling like others, i.e. > > > "goto error2". But you want to pass a different error code, so we'd > > > need to introduce an error code variable there... > > > > > Thank you for the feedback. I'll cook up a better patch tonight. > > > > > > Sorry about the delay - had non-computer things to attend to. > > I hope this is more to your liking :-) > > > From: Jesper Juhl <jj(a)chaosbits.net> > > We leak the memory allocated to 'firmware' when we fail to > release_firmware() after a kmalloc() failure in hpi_dsp_code_open(). > This patch should take care of the leak. > > Signed-off-by: Jesper Juhl <jj(a)chaosbits.net> Applied now. Thanks. Takashi > --- > sound/pci/asihpi/hpidspcd.c | 9 ++++++--- > 1 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/sound/pci/asihpi/hpidspcd.c b/sound/pci/asihpi/hpidspcd.c > index 3a7afa3..71d32c8 100644 > --- a/sound/pci/asihpi/hpidspcd.c > +++ b/sound/pci/asihpi/hpidspcd.c > @@ -43,6 +43,7 @@ short hpi_dsp_code_open(u32 adapter, void *os_data, struct dsp_code *dsp_code, > struct pci_dev *dev = os_data; > struct code_header header; > char fw_name[20]; > + short err_ret = HPI_ERROR_DSP_FILE_NOT_FOUND; > int err; > > sprintf(fw_name, "asihpi/dsp%04x.bin", adapter); > @@ -85,8 +86,10 @@ short hpi_dsp_code_open(u32 adapter, void *os_data, struct dsp_code *dsp_code, > > HPI_DEBUG_LOG(DEBUG, "dsp code %s opened\n", fw_name); > dsp_code->pvt = kmalloc(sizeof(*dsp_code->pvt), GFP_KERNEL); > - if (!dsp_code->pvt) > - return HPI_ERROR_MEMORY_ALLOC; > + if (!dsp_code->pvt) { > + err_ret = HPI_ERROR_MEMORY_ALLOC; > + goto error2; > + } > > dsp_code->pvt->dev = dev; > dsp_code->pvt->firmware = firmware; > @@ -99,7 +102,7 @@ error2: > release_firmware(firmware); > error1: > dsp_code->block_length = 0; > - return HPI_ERROR_DSP_FILE_NOT_FOUND; > + return err_ret; > } > > /*-------------------------------------------------------------------*/ > -- > 1.7.6 > > > -- > Jesper Juhl <jj(a)chaosbits.net> http://www.chaosbits.net/ > Don't top-post http://www.catb.org/jargon/html/T/top-post.html > Plain text mails only, please. >

1 0