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

[alsa-devel] [RFC PATCH] theory about CS8247 failed reads
by Brian Bloniarz 18 Jan '11

18 Jan '11

On my M-Audio Delta 66 (rev. E), I see this line: [ 23.248721] invalid CS8427 signature 0x0: let me try again... This is caused by the first request to the CS8427 failing, and this workaround: > commit 4eb4550ab37d351ab0973ccec921a5a2d8560ec7, > Author: Takashi Iwai <tiwai(a)suse.de> > Date: Thu Sep 20 17:34:57 2007 +0200 > > [ALSA] Workaround for invalid signature read of CS8427 > > Reading the signature of CS8427 over SPI/I2C fails on some devices > by mysterious reason. In most cases, however, it succeeds at the > sequential read. So, let's give a second chance to check the signature > again. > > Signed-off-by: Takashi Iwai <tiwai(a)suse.de> > Signed-off-by: Jaroslav Kysela <perex(a)suse.cz> I have a theory, please read the patch and patch description below. With the patch applied, the printk goes away. Does this sound like a reasonable theory? Does anyone recall, did this failed read occur on any cards besides M-Audio Delta? I'm wondering if this is the whole explanation, in which case the previous workaround could be removed. ------------------------ [PATCH] [ALSA] ice1712 delta - initialize SPI clock. The driver was using an initial value for the clock on the SPI bus which was read from ICE1712 EEPROM, ice->eeprom.data[ICE_EEP1_GPIO_STATE] & ICE1712_DELTA_AP_CCLK (0x02) It appears some cards have it default high, some cards have it default low. On my Delta 66 rev. E: $ cat /proc/asound/M66/ice1712 | grep 'GPIO state' GPIO state : 0x70 /* ICE1712_DELTA_AP_CCLK bit is zero */ On my Audiophile 2496: $ cat /proc/asound/M2496/ice1712 | grep 'GPIO state' GPIO state : 0xfe /* ICE1712_DELTA_AP_CCLK bit is one */ It must be raised before the first SPI write happens, or the write will fail, leading to: [ 23.248721] invalid CS8427 signature 0x0: let me try again... I theorize that 4eb4550ab37d351ab0973ccec921a5a2d8560ec7 is no longer needed, it was a different way to workaround the problem. Signed-off-by: Brian Bloniarz <brian.bloniarz(a)gmail.com> --- sound/pci/ice1712/delta.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/sound/pci/ice1712/delta.c b/sound/pci/ice1712/delta.c index 7b62de0..84a6031 100644 --- a/sound/pci/ice1712/delta.c +++ b/sound/pci/ice1712/delta.c @@ -622,6 +622,13 @@ static int __devinit snd_ice1712_delta_init(struct snd_ice1712 *ice) break; } + /* initialize the SPI clock to high */ + unsigned char tmp; + tmp = snd_ice1712_read(ice, ICE1712_IREG_GPIO_DATA); + tmp |= ICE1712_DELTA_AP_CCLK; + snd_ice1712_write(ice, ICE1712_IREG_GPIO_DATA, tmp); + udelay(5); + /* initialize spdif */ switch (ice->eeprom.subvendor) { case ICE1712_SUBDEVICE_AUDIOPHILE: -- 1.7.1

2 2

[alsa-devel] [PATCH 4/4] ASoC: soc core allow machine driver to register the card
by Koul, Vinod 18 Jan '11

18 Jan '11

From: Vinod Koul <vinod.koul(a)intel.com> The machine driver can't register the card directly and need to do this thru soc-audio device creation This patch allows the register and unregister card to be called by machine drivers Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> Signed-off-by: Harsha Priya <harsha.priya(a)intel.com> --- include/sound/soc.h | 2 ++ sound/soc/soc-core.c | 21 +++++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 541ddfa..9952254 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -258,6 +258,8 @@ enum snd_soc_compress_type { SND_SOC_RBTREE_COMPRESSION }; +int snd_soc_register_card(struct snd_soc_card *card); +int snd_soc_unregister_card(struct snd_soc_card *card); int snd_soc_register_platform(struct device *dev, struct snd_soc_platform_driver *platform_drv); void snd_soc_unregister_platform(struct device *dev); diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 8305712..87348ab 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -58,8 +58,6 @@ static LIST_HEAD(dai_list); static LIST_HEAD(platform_list); static LIST_HEAD(codec_list); -static int snd_soc_register_card(struct snd_soc_card *card); -static int snd_soc_unregister_card(struct snd_soc_card *card); static int soc_new_pcm(struct snd_soc_pcm_runtime *rtd, int num); /* @@ -1870,6 +1868,10 @@ static int soc_probe(struct platform_device *pdev) struct snd_soc_card *card = platform_get_drvdata(pdev); int ret = 0; + /* no card, so machine driver is registering card */ + if (!card) + return 0; + /* Bodge while we unpick instantiation */ card->dev = &pdev->dev; snd_soc_initialize_card_lists(card); @@ -1919,6 +1921,9 @@ static int soc_remove(struct platform_device *pdev) { struct snd_soc_card *card = platform_get_drvdata(pdev); + if (!card) + return 0; + snd_soc_unregister_card(card); return 0; } @@ -3105,11 +3110,8 @@ EXPORT_SYMBOL_GPL(snd_soc_dai_digital_mute); * * @card: Card to register * - * Note that currently this is an internal only function: it will be - * exposed to machine drivers after further backporting of ASoC v2 - * registration APIs. */ -static int snd_soc_register_card(struct snd_soc_card *card) +int snd_soc_register_card(struct snd_soc_card *card) { int i; @@ -3141,17 +3143,15 @@ static int snd_soc_register_card(struct snd_soc_card *card) return 0; } +EXPORT_SYMBOL_GPL(snd_soc_register_card); /** * snd_soc_unregister_card - Unregister a card with the ASoC core * * @card: Card to unregister * - * Note that currently this is an internal only function: it will be - * exposed to machine drivers after further backporting of ASoC v2 - * registration APIs. */ -static int snd_soc_unregister_card(struct snd_soc_card *card) +int snd_soc_unregister_card(struct snd_soc_card *card) { if (card->instantiated) soc_cleanup_card_resources(card); @@ -3162,6 +3162,7 @@ static int snd_soc_unregister_card(struct snd_soc_card *card) return 0; } +EXPORT_SYMBOL_GPL(snd_soc_unregister_card); /* * Simplify DAI link configuration by removing ".-1" from device names -- 1.7.2.3

4 9

[alsa-devel] [PATCH] ASoC: Add dependency on X86 for Intel MID drivers
by Mark Brown 18 Jan '11

18 Jan '11

Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- sound/soc/mid-x86/Kconfig | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/sound/soc/mid-x86/Kconfig b/sound/soc/mid-x86/Kconfig index e0123a4..8adbc1e 100644 --- a/sound/soc/mid-x86/Kconfig +++ b/sound/soc/mid-x86/Kconfig @@ -1,5 +1,6 @@ config SND_MFLD_MACHINE tristate "SOC Machine Audio driver for Intel Medfield MID platform" + depends on X86 select SND_SOC_SN95031 select SND_SST_PLATFORM help -- 1.7.2.3

3 6

Re: [alsa-devel] [PATCH] ASoC: dapm: Fix race condition in widgets power list creation
by Mark Brown 18 Jan '11

18 Jan '11

On Tue, Jan 18, 2011 at 01:35:37PM +0200, Peter Ujfalusi wrote: > Hmm, the patch looks quite similar to the patch I've sent back in November: > http://mailman.alsa-project.org/pipermail/alsa-devel/2010-November/033362.h… My thought exactly. > On 01/18/11 12:39, ext Mark Brown wrote: > > This needs a bit more analysis - why are we getting multiple > > simultaneous calls to dapm_power_widgets() and is that itself safe? The > > ASoC locking model has always been to have a big lock around the entire > > card rather than to lock subcomponents, and for example this isn't going > > to make sure we're consistent with register map accesses from other > > parts of the code. > As far as I have traced back than, it was due to the use of dapm_sync in > machine drivers. For me it looked that all other paths were satisfactory > protected. > In my case the use of SOC_DAPM_PIN_SWITCH() instead of the custom call > fixed the race (since this will take a card mutex, AFAIK). I *suspect* that we're in a similar case and either the locking has been broken by the multi-component stuff or there's other cases that need protection, probably the jack detection code. > PS: I might received this mail unintentionally, since I was not on the > TO/CC, and alsa-devel neither. > Should alsa-devel be on the CC? Yes, I bounced on the second copy - Misael had sent two copies of the mail, one omitting the CC, and I'd replied to the first one before I saw the second.

3 7

[alsa-devel] ASoC updates for 2.6.38
by Mark Brown 18 Jan '11

18 Jan '11

The following changes since commit 18b022eb117e7f70c191267551ff865f278a9258: Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc (2011-01-12 12:26:24 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.38 A few small bug fixes, the biggest change is the cleanup after the wl1273 merge. Alexander Sverdlin (1): ASoC: EP93xx: fixed LRCLK rate and DMA oper. in I2S code Dimitris Papastamos (1): ASoC: WM8990: msleep() takes milliseconds not jiffies Matti J. Aaltonen (1): ASoC: WL1273 FM radio: Fix breakage with MFD API changes sound/soc/codecs/Kconfig | 2 +- sound/soc/codecs/wl1273.c | 29 +++++++---------- sound/soc/codecs/wl1273.h | 71 ----------------------------------------- sound/soc/codecs/wm8990.c | 10 +++--- sound/soc/ep93xx/ep93xx-i2s.c | 18 +++++----- 5 files changed, 27 insertions(+), 103 deletions(-)

2 1

[alsa-devel] [PATCH] ALSA: HDA: Remove quirk for Acer Aspire 4930G
by David Henningsson 18 Jan '11

18 Jan '11

BugLink: http://bugs.launchpad.net/bugs/647970 According to the reporter, model=auto works better than the current quirk for Acer Aspire 4930G. Cc: stable(a)kernel.org (2.6.35+) Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> -- David Henningsson, Canonical Ltd. http://launchpad.net/~diwic

1 0

[PATCH] ALSA: HDA: Remove quirk for Acer Aspire 4930G
by David Henningsson 18 Jan '11

18 Jan '11

BugLink: http://bugs.launchpad.net/bugs/647970 According to the reporter, model=auto works better than the current quirk for Acer Aspire 4930G. Cc: stable(a)kernel.org (2.6.35+) Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 4f006ee..9c123d0 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -9842,8 +9842,6 @@ static struct snd_pci_quirk alc882_cfg_tbl[] = { SND_PCI_QUIRK(0x1025, 0x0110, "Acer Aspire", ALC883_ACER_ASPIRE), SND_PCI_QUIRK(0x1025, 0x0112, "Acer Aspire 9303", ALC883_ACER_ASPIRE), SND_PCI_QUIRK(0x1025, 0x0121, "Acer Aspire 5920G", ALC883_ACER_ASPIRE), - SND_PCI_QUIRK(0x1025, 0x013e, "Acer Aspire 4930G", - ALC888_ACER_ASPIRE_4930G), SND_PCI_QUIRK(0x1025, 0x013f, "Acer Aspire 5930G", ALC888_ACER_ASPIRE_4930G), SND_PCI_QUIRK(0x1025, 0x0145, "Acer Aspire 8930G", -- 1.7.1 --------------060800040608070500030208--

1 0

Re: [alsa-devel] [PATCH 0/5] davinci: da850: clean up pinmux arrays in da850.c
by Rajashekhara, Sudhakar 18 Jan '11

18 Jan '11

Hi Sergei, On Tue, Jan 18, 2011 at 17:11:13, Sergei Shtylyov wrote: > Hello. > > On 18-01-2011 7:40, Rajashekhara, Sudhakar wrote: > > > I was testing Audio with 2.6.37 on DA850 from Kevin Hilman Linux tree > > at [1] and found that audio is broken. Below patch fixes the issue. > > > --- > > From: Rajashekhara, Sudhakar<sudhakar.raj(a)ti.com> > > > davinci: fixes for audio on da850/omap-l138/am18x > > > > On DA850/OMAP-L138/AM18x, AIC3x codec is at 0x18 slave address. > > But in sound/soc/davinci/davinci-evm.c file, "struct snd_soc_dai_link" > > has the wrong AIC3x codec slave address. This patch fixes this issue. > > > Also, this patch registers the platform device for davinci-pcm-audio. > > Shouldn't this be 2 patches? I don't see a connection between the changes. > Yes, definitely this should be 2 patches. I just posted the fix as-is to unblock any folks who are facing the issue. As you can see from my e-mail there are still some issues which I am debugging currently. I'll post the proper patch later. Regards, Sudhakar

1 0

[alsa-devel] [PATCH v2] ASoC: Add FreeScale SGTL5000 codec suppor
by Zeng Zhaoming 18 Jan '11

18 Jan '11

v1 url: http://mailman.alsa-project.org/pipermail/alsa-devel/2010-December/034615.h… Changes since v1: - Add DAPM widges as Mark and Arnaud point out. - cleanup regulator code - new implement dai_ops functions - sort configs in Kconfig and Makefile

3 3

Re: [alsa-devel] [PATCH] ASoC: dapm: Fix race condition in widgets power list creation
by Mark Brown 18 Jan '11

18 Jan '11

On Mon, Jan 17, 2011 at 08:35:27PM -0600, Misael Lopez Cruz wrote: > Multiple calls to dapm_power_widgets() can create a race condition > causing power list to be corrupted. Those scenarios can occur in > multistream usecases, stream start/stop along with simultaneous > update power calls (mixer, mux, dapm_sync, stream_event). > A new 'dapm_mutex' is added to soc_card, which is held while power > list is created. This needs a bit more analysis - why are we getting multiple simultaneous calls to dapm_power_widgets() and is that itself safe? The ASoC locking model has always been to have a big lock around the entire card rather than to lock subcomponents, and for example this isn't going to make sure we're consistent with register map accesses from other parts of the code.

1 0