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

[alsa-devel] [RFC PATCH] ALSA: hda - add support for runtime power management
by mengdong.lin＠intel.com 21 Aug '12

21 Aug '12

From: Mengdong Lin <mengdong.lin(a)intel.com> This patch is a basic idea about adding runtime PM support to HD audio. Support for runtime PM is based on current HDA power saving implementation. When both power saving and runtime PM are enabled, and if all codecs are suspended (in D3), the HDA controller can also be suspended to a low power state by decreasing the power usage counter and triggering PCI device runtime suspend. And the user IO operation can resume the controller back to D0. The user can enable runtime PM on HDA controller on platfroms that can provide acceptable latency on transition from D3 to D0. If the runtime PM is disabled, power saving just works as without runtime PM before. And if power saving is disabled, the power usage counter will never be 0 so the HDA controller will not be suspended. I've verified this patch on a platfrom on which the HD-A controller can enter D3hot when suspended. And I plan to allow the controller to suspened only if all codecs support "stop-clock" in D3, for wakeup request. Is this idea doable? Any comments are welcome. Signed-off-by: Mengdong Lin <mengdong.lin(a)intel.com> --- sound/pci/hda/hda_codec.c | 1 + sound/pci/hda/hda_intel.c | 70 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 68 insertions(+), 3 deletions(-) diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index f2f5347..c88a95e 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -4383,6 +4383,7 @@ static void hda_power_work(struct work_struct *work) } spin_unlock(&codec->power_lock); + snd_printd("hda codec %d suspend\n", codec->addr); hda_call_codec_suspend(codec); if (bus->ops.pm_notify) bus->ops.pm_notify(bus); diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index b6a4ea7..543a5c4 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -46,6 +46,7 @@ #include <linux/mutex.h> #include <linux/reboot.h> #include <linux/io.h> +#include <linux/pm_runtime.h> #ifdef CONFIG_X86 /* for snoop control */ #include <asm/pgtable.h> @@ -2402,11 +2403,22 @@ static void azx_power_notify(struct hda_bus *bus) break; } } - if (power_on) + if (power_on) { + if (!chip->initialized) { + snd_printd(SFX "request resume controller\n"); + pm_runtime_get_sync(&chip->pci->dev); + } azx_init_chip(chip, 1); + } else if (chip->running && power_save_controller && - !bus->power_keep_link_on) + !bus->power_keep_link_on) { azx_stop_chip(chip); + + /* TODO: Suspend controller only if all codec support + stop-clock in D3, for wakeup consideration */ + snd_printd(SFX "request suspend controller\n"); + pm_runtime_put_sync(&chip->pci->dev); + } } static DEFINE_MUTEX(card_list_lock); @@ -2511,7 +2523,48 @@ static int azx_resume(struct device *dev) snd_power_change_state(card, SNDRV_CTL_POWER_D0); return 0; } -static SIMPLE_DEV_PM_OPS(azx_pm, azx_suspend, azx_resume); + +static int azx_runtime_suspend(struct device *dev) +{ + struct snd_card *card = dev_get_drvdata(dev); + struct azx *chip = card->private_data; + struct azx_pcm *p; + + snd_printd(SFX "controller runtime suspend\n"); + + snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); + azx_clear_irq_pending(chip); + list_for_each_entry(p, &chip->pcm_list, list) + snd_pcm_suspend_all(p->pcm); + + if (chip->irq >= 0) { + free_irq(chip->irq, chip); + chip->irq = -1; + } + return 0; +} + +static int azx_runtime_resume(struct device *dev) +{ + struct snd_card *card = dev_get_drvdata(dev); + struct azx *chip = card->private_data; + + snd_printd(SFX "controller runtime resume\n"); + + if (azx_acquire_irq(chip, 1) < 0) + return -EIO; + + azx_init_pci(chip); + + snd_power_change_state(card, SNDRV_CTL_POWER_D0); + return 0; +} + +static const struct dev_pm_ops azx_pm = { + SET_SYSTEM_SLEEP_PM_OPS(azx_suspend, azx_resume) + SET_RUNTIME_PM_OPS(azx_runtime_suspend, azx_runtime_resume, NULL) +}; + #define AZX_PM_OPS &azx_pm #else #define azx_suspend(dev) @@ -3238,6 +3291,9 @@ static int __devinit azx_probe(struct pci_dev *pci, pci_set_drvdata(pci, card); + if (pci_dev_run_wake(pci)) + pm_runtime_put_noidle(&pci->dev); + dev++; return 0; @@ -3289,6 +3345,7 @@ static int DELAYED_INIT_MARK azx_probe_continue(struct azx *chip) goto out_free; chip->running = 1; + pm_runtime_get_noresume(&chip->pci->dev); /* active by default */ power_down_all_codecs(chip); azx_notifier_register(chip); azx_add_card_list(chip); @@ -3303,6 +3360,13 @@ out_free: static void __devexit azx_remove(struct pci_dev *pci) { struct snd_card *card = pci_get_drvdata(pci); + + /* undo 'get' in azx_probe_continue() */ + pm_runtime_put_noidle(&pci->dev); + + if (pci_dev_run_wake(pci)) + pm_runtime_get_noresume(&pci->dev); + if (card) snd_card_free(card); pci_set_drvdata(pci, NULL); -- 1.7.9.5

3 7

Re: [alsa-devel] Broken powersave in 3.5.2, codec is always active
by Takashi Iwai 20 Aug '12

20 Aug '12

[Re-added Cc to ML; please don't drop it] At Mon, 20 Aug 2012 22:23:02 +0700, ValdikSS wrote: > > Takashi Iwai <tiwai(a)suse.de> писал(а) в своём письме Mon, 20 Aug 2012 > 16:17:04 +0700: > > > At Sat, 18 Aug 2012 12:44:29 +0700, > > ValdikSS wrote: > >> > >> Hello! > >> I have a Lenovo ThinkPad X220 laptop with a conexant codec and recently > >> (after kernel 3.5.2) it is active all the time after KDE login, as > >> powertop says. This couldn't be fixed by logging of from KDE or playing > >> some music in mplayer from console. The only kernel I tried in 3.5.x is > >> 3.5.2, so I can't say is this bug reproducible in 3.5.0 or 3.5.1, but > >> everything is fine with 3.4.9. This never happens if you don't start KDE > >> after reboot, you can listen to some music in mplayer in console and > >> everything seems to be fine. lsof and fuser /dev/snd/* shows nothing. > > > > Just to be sure, check /sys/module/snd_hda_intel/parameters/power_save > > value after logging into KDE. This value can be changed dynamically. > > > > If the value is still set properly, try to build the kernel with the > > tracing option with the patch below. Then try to trace the power > > up/down sequences in the tracing buffer. Some brief description is > > found in Documentation/sound/alsa/HD-Audio.txt Tracepoints section. > > > > > > thanks, > > > > Takashi > > > > --- > > From: Takashi Iwai <tiwai(a)suse.de> > > Subject: [PATCH] ALSA: hda - Add tracepoints at snd_hda_power_up/down > > entrances. > > > > Signed-off-by: Takashi Iwai <tiwai(a)suse.de> > > --- > > sound/pci/hda/hda_codec.c | 2 ++ > > sound/pci/hda/hda_trace.h | 24 ++++++++++++++++++++++++ > > 2 files changed, 26 insertions(+) > > > > diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c > > index 408babc..ad0101e 100644 > > --- a/sound/pci/hda/hda_codec.c > > +++ b/sound/pci/hda/hda_codec.c > > @@ -4417,6 +4417,7 @@ static void __snd_hda_power_up(struct hda_codec > > *codec, bool wait_power_down) > > spin_lock(&codec->power_lock); > > codec->power_count++; > > + trace_hda_power_count(codec); > > /* Return if power_on or transitioning to power_on, unless currently > > * powering down. */ > > if ((codec->power_on || codec->power_transition > 0) && > > @@ -4496,6 +4497,7 @@ void snd_hda_power_down(struct hda_codec *codec) > > { > > spin_lock(&codec->power_lock); > > --codec->power_count; > > + trace_hda_power_count(codec); > > if (!codec->power_on || codec->power_count || codec->power_transition) > > { > > spin_unlock(&codec->power_lock); > > return; > > diff --git a/sound/pci/hda/hda_trace.h b/sound/pci/hda/hda_trace.h > > index 9884871..9a34b86 100644 > > --- a/sound/pci/hda/hda_trace.h > > +++ b/sound/pci/hda/hda_trace.h > > @@ -87,6 +87,30 @@ DEFINE_EVENT(hda_power, hda_power_up, > > TP_ARGS(codec) > > ); > > +TRACE_EVENT(hda_power_count, > > + TP_PROTO(struct hda_codec *codec), > > + TP_ARGS(codec), > > + TP_STRUCT__entry( > > + __field( unsigned int, card ) > > + __field( unsigned int, addr ) > > + __field( int, power_count ) > > + __field( int, power_on ) > > + __field( int, power_transition ) > > + ), > > + > > + TP_fast_assign( > > + __entry->card = (codec)->bus->card->number; > > + __entry->addr = (codec)->addr; > > + __entry->power_count = (codec)->power_count; > > + __entry->power_on = (codec)->power_on; > > + __entry->power_transition = (codec)->power_transition; > > + ), > > + > > + TP_printk("[%d:%d] power_count=%d, power_on=%d, power_transition=%d", > > + __entry->card, __entry->addr, __entry->power_count, > > + __entry->power_on, __entry->power_transition) > > +); > > + > > TRACE_EVENT(hda_unsol_event, > > TP_PROTO(struct hda_bus *bus, u32 res, u32 res_ex), > > Thanks for the quick reply! I compiled 3.5.2 kernel with this patch, > enabled hda tracing, ran mplayer once in the console and started KDE. Once > KDE is started, card is used 100% of time, which can be seen in powertop. > When I logout from KDE and kill kdm, no events are generated in trace > since KDE start (no sounds are played from KDE start till KDM kill) and > card is still used 100% of time. If you play any sounds in mplayer in > console after kdm kill, the card is still used 100% time. This can be > fixed by laptop suspend. > > The traces are quite huge so I pasted it to pastebin: > 01-trace-just-enabled http://pastebin.com/JNRWXUPy > 02-mplayer-played-and-stopped-card-is-normal http://pastebin.com/r0jZLDey > 03-kde-started-and-stopped-100-percent-card http://pastebin.com/Z7mzbY4c > The last log begins with latest rows from 02 It's still not clear from the log. You can reduce the trace pattern to hda_power_* for reducing the trace log size. In anyway, could you try the patch below? thanks, Takashi --- diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 88a9c20..b94e04d 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -4433,6 +4433,8 @@ static void __snd_hda_power_up(struct hda_codec *codec, bool wait_power_down) * then there is no need to go through power up here. */ if (codec->power_on) { + if (codec->power_transition < 0) + codec->power_transition = 0; spin_unlock(&codec->power_lock); return; }

2 2

[alsa-devel] ASoC updates for 3.6
by Mark Brown 20 Aug '12

20 Aug '12

The following changes since commit 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee: Linux 3.6-rc1 (2012-08-02 16:38:10 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-3.6 for you to fetch changes up to 28c42c28309244d0b15d1b385e33429d59997679: ASoC: wm9712: Fix inverted capture volume (2012-08-17 22:43:18 +0100) ---------------------------------------------------------------- ASoC: Additional updates for 3.6 A batch more bugfixes, all driver-specific and fairly small and unremarkable in a global context. The biggest batch are for the newly added Arizona drivers. ---------------------------------------------------------------- Chris Rattray (1): ASoC: wm8994: Add missing dapm routes for WM8958 rev A Fabio Estevam (2): ASoC: mxs: Fix the name of the SoC family ASoC: imx-ssi: Remove mono support Mark Brown (10): Merge tag 'asoc-3.6' of git://git.kernel.org/.../broonie/sound into for-3.6 ASoC: wm8962: Don't duplicate bias level management in resume ASoC: core: Upgrade the severity of probe deferral errors to dev_err() MAINTAINERS: Add entries for Wolfson Arizona class devices ASoC: wm5102: Add missing input PGA routes ASoC: wm5110: Add missing input PGA routes ASoC: jack: Always notify full jack status ASoC: wm5102: Remove DRC2 ASoC: wm9712: Fix microphone source selection ASoC: wm9712: Fix inverted capture volume Peter Ujfalusi (1): ASoC: omap-mcbsp: Fix 6pin mux configuration Sachin Kamat (1): ASoC: Samsung: Fix build error Scott Jiang (1): ASoC: bfin: fix memory leak in sport3 controller driver Vaibhav Bedia (1): ASoC: Davinci: McASP: Flush the FIFO before enabling MAINTAINERS | 7 ++++++- sound/soc/blackfin/bf6xx-sport.c | 7 +++++++ sound/soc/codecs/ab8500-codec.c | 4 ++++ sound/soc/codecs/ad1980.c | 1 + sound/soc/codecs/mc13783.c | 2 ++ sound/soc/codecs/sgtl5000.c | 3 +-- sound/soc/codecs/stac9766.c | 1 + sound/soc/codecs/wm5102.c | 25 +++++++++---------------- sound/soc/codecs/wm5110.c | 12 ++++++++++++ sound/soc/codecs/wm8962.c | 18 +++--------------- sound/soc/codecs/wm8994.c | 17 ++++++++++++++++- sound/soc/codecs/wm9712.c | 22 +++++++++++++++++++--- sound/soc/codecs/wm9713.c | 1 + sound/soc/davinci/davinci-mcasp.c | 10 ++++++++-- sound/soc/fsl/imx-ssi.c | 5 +++-- sound/soc/mxs/Kconfig | 2 +- sound/soc/mxs/mxs-saif.c | 24 ++++++++++++++++++++++++ sound/soc/omap/mcbsp.c | 2 +- sound/soc/omap/omap-mcbsp.c | 1 + sound/soc/omap/omap-pcm.c | 1 + sound/soc/samsung/pcm.c | 2 +- sound/soc/soc-core.c | 12 +++++++----- sound/soc/soc-jack.c | 2 +- sound/soc/tegra/tegra_alc5632.c | 2 +- sound/soc/tegra/tegra_wm8903.c | 10 +++++----- sound/soc/ux500/ux500_msp_dai.c | 2 +- sound/soc/ux500/ux500_msp_i2s.c | 2 +- sound/soc/ux500/ux500_msp_i2s.h | 2 +- 28 files changed, 139 insertions(+), 60 deletions(-)

2 1

[alsa-devel] [PATCH 0/3] ASoC: add compress stream support
by Vinod Koul 20 Aug '12

20 Aug '12

Here is the much delayed support for compress audio streams in ASoC. The v2 incorprates feedback discussed on v1 patches and this also adds the support in Intel drivers. Namarta Kohli (1): ASoC: add compress stream support Vinod Koul (2): ASoC: add definations for compressed operations ASoC: mid-x86 - add support for compressed streams include/sound/compress_driver.h | 1 + include/sound/soc-dai.h | 3 + include/sound/soc.h | 16 ++- sound/soc/Kconfig | 1 + sound/soc/Makefile | 2 +- sound/soc/mid-x86/mfld_machine.c | 9 ++ sound/soc/mid-x86/sst_dsp.h | 134 +++++++++++++++++ sound/soc/mid-x86/sst_platform.c | 204 ++++++++++++++++++++++++++- sound/soc/mid-x86/sst_platform.h | 26 ++++- sound/soc/soc-compress.c | 295 ++++++++++++++++++++++++++++++++++++++ sound/soc/soc-core.c | 57 +++++--- 11 files changed, 721 insertions(+), 27 deletions(-) create mode 100644 sound/soc/mid-x86/sst_dsp.h create mode 100644 sound/soc/soc-compress.c

2 4

[alsa-devel] [PATCH 0/10] fix error return code
by Julia Lawall 20 Aug '12

20 Aug '12

These patches fix cases where the return code appears to be unintentially nonnegative. The complete semantic match that finds the problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @ok exists@ identifier f,ret,i; expression e; constant c; @@ f(...) { <+... ( return -c@i; | ret = -c@i; ... when != ret = e return ret; | if (ret < 0) { ... return ret; } ) ...+> } @r exists@ identifier ret,l,ok.f; expression e1,e2,e3; statement S; position p1,p2,p3; @@ f(...) { ... when any ( if@p1 ($ret < 0\|ret != 0$) { ... return ret; } | ret@p1 = 0 ) ... when != ret = e1 when != &ret ( if (<+... ret = e3 ...+>) S | if (<+... &ret ...+>) S | if@p2(...) { ... when != ret = e2 when forall return@p3 ret; } ) ... when any } @bad exists@ position r.p1,r.p2; statement S1,S2; identifier r.ret; expression e1; @@ ( if@p1 ($ret < 0\|ret != 0$) S1 | ret@p1 = 0 ) ... when any ret = e1 ... when any if@p2(...) S2 @bad2@ position r.p1,r.p2; identifier r.ret; expression e1; statement S2; @@ ret@p1 = 0 ... when != if (...) { ... ret = e1 ... return ret; } when any if@p2(...) S2 @script:python depends on !bad && !bad2@ p1 << r.p1; p2 << r.p2; p3 << r.p3; @@ cocci.print_main("",p1) cocci.print_secs("",p2) cocci.print_secs("",p3) // </smpl>

4 13

Re: [alsa-devel] [sound:master 88/92] sound/pci/hda/./hda_trace.h:90:1: error: 'struct hda_codec' has no member named 'power_count'
by Takashi Iwai 20 Aug '12

20 Aug '12

At Mon, 20 Aug 2012 23:51:31 +0800, Fengguang Wu wrote: > > Hi Takashi, > > FYI, kernel build failed on > > tree: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git master > head: b9687805cf4e70e08221856b1bbadfa5e37c3342 > commit: b244d335609f9bbf4c0204a365bf03b7ac53c3c8 [88/92] ALSA: hda - Add tracepoints at snd_hda_power_up/down entrances. > config: i386-randconfig-k767 (attached as .config) > > All related error/warning messages: > > make[4]: *** [sound/pci/hda/hda_codec.o] Error 1 > make[4]: Target `__build' not remade because of errors. > -- > In file included from include/trace/ftrace.h:567:0, > from include/trace/define_trace.h:86, > from sound/pci/hda/hda_trace.h:141, > from sound/pci/hda/hda_codec.c:41: > sound/pci/hda/./hda_trace.h: In function 'ftrace_raw_event_hda_power_count': > sound/pci/hda/./hda_trace.h:90:1: error: 'struct hda_codec' has no member named 'power_count' > sound/pci/hda/./hda_trace.h:90:1: error: 'struct hda_codec' has no member named 'power_on' > sound/pci/hda/./hda_trace.h:90:1: error: 'struct hda_codec' has no member named 'power_transition' > In file included from include/trace/ftrace.h:775:0, > from include/trace/define_trace.h:86, > from sound/pci/hda/hda_trace.h:141, > from sound/pci/hda/hda_codec.c:41: > sound/pci/hda/./hda_trace.h: In function 'perf_trace_hda_power_count': > sound/pci/hda/./hda_trace.h:90:1: error: 'struct hda_codec' has no member named 'power_count' > sound/pci/hda/./hda_trace.h:90:1: error: 'struct hda_codec' has no member named 'power_on' > sound/pci/hda/./hda_trace.h:90:1: error: 'struct hda_codec' has no member named 'power_transition' > > vim +90 sound/pci/hda/./hda_trace.h > 87 TP_ARGS(codec) > 88 ); > 89 > > 90 TRACE_EVENT(hda_power_count, > 91 TP_PROTO(struct hda_codec *codec), > 92 TP_ARGS(codec), > 93 TP_STRUCT__entry( Thanks, looks like the missing ifdef. Fixed now. Takashi

1 0

[alsa-devel] Lockups reading from i.MX51 SSI registers
by Mark Brown 20 Aug '12

20 Aug '12

Hi, I'm trying to use -next to test AC'97 register I/O on an i.MX51 board but I'm seeing the CPU hang during probe at: lreg = (reg & 0x7f) << 12 ; writel(lreg, base + SSI_SACADD); in imx_ssi_ac97_read(). I'm somewhat suspicious this might be because the IP block isn't clocked properly, I do notice the recent conversion to the clock API which looks rather involved but it's possible something else broke. Does anyone have any bright ideas what might be going on here? The board doesn't have the reste functions defined so this is the first interaction with the hardware block AFAICT. Thanks, Mark

5 11

[alsa-devel] [alsa-plugins PATCH] pulse: Support 24-bit formats
by Andrew Eikum 20 Aug '12

20 Aug '12

These formats were introduced in PulseAudio 0.9.15. There aren't any new formats supported since then, so this also brings the PulseAudio plugin in sync with current PulseAudio. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- There was a problem once before with a patch I submitted. This is using format-patch and imap-send, so hopefully it goes through better than it did before :) pulse/pcm_pulse.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)

2 4

[alsa-devel] [PATCH 0/2] Two fixes for ca0132
by David Henningsson 20 Aug '12

20 Aug '12

I came across the following codec: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1038651/+attachment/32… ...and the codec wouldn't load due to mixer errors. I don't know more about the codec than the codec proc shows, and looking at that file it seems a bit broken, but maybe Ian would be able to make it work, with the help of some secret verbs? At least now the codec would load correctly, so that the output side could be used. David Henningsson (2): ALSA: hda - Fix "Line" and "Mic" names for CA0132 ALSA: hda - don't create dysfunctional mixer controls for ca0132 sound/pci/hda/patch_ca0132.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) -- 1.7.9.5

2 6

[alsa-devel] Broken powersave in 3.5.2, codec is always active
by ValdikSS 20 Aug '12

20 Aug '12

Hello! I have a Lenovo ThinkPad X220 laptop with a conexant codec and recently (after kernel 3.5.2) it is active all the time after KDE login, as powertop says. This couldn't be fixed by logging of from KDE or playing some music in mplayer from console. The only kernel I tried in 3.5.x is 3.5.2, so I can't say is this bug reproducible in 3.5.0 or 3.5.1, but everything is fine with 3.4.9. This never happens if you don't start KDE after reboot, you can listen to some music in mplayer in console and everything seems to be fine. lsof and fuser /dev/snd/* shows nothing. Thank you! $ cat /etc/modprobe.d/options.conf options snd-hda-intel power_save=1 power_save_controller=1 $ lspci -nn | grep Audio 00:1b.0 Audio device [0403]: Intel Corporation 6 Series/C200 Series Chipset Family High Definition Audio Controller [8086:1c20] (rev 04) $ lsmod | grep snd snd_hda_codec_hdmi 23704 1 snd_hda_codec_conexant 47158 1 snd_hda_intel 25700 2 snd_hda_codec 97400 3 snd_hda_codec_hdmi,snd_hda_codec_conexant,snd_hda_intel snd_hwdep 6300 1 snd_hda_codec snd_pcm 74926 3 snd_hda_codec_hdmi,snd_hda_codec,snd_hda_intel snd_page_alloc 7185 2 snd_pcm,snd_hda_intel snd_timer 18966 1 snd_pcm snd 60021 12 snd_hwdep,snd_timer,snd_hda_codec_hdmi,snd_hda_codec_conexant,snd_pcm,snd_hda_codec,snd_hda_intel,thinkpad_acpi soundcore 5442 1 snd

2 1