April 2009 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 1/2] hdspm: metering ioctl fixed
by Florian Faber 15 Apr '09

15 Apr '09

Metering didn't work before. I know of no application that used this ioctl before, so I assume it is safe to modify the structure. diff a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c 10a11,13 > * Modified 2009-04-13 for proper metering by Florian Faber > * <faber(a)faberman.de> > * 82c85,86 < "Remy Bruno <remy.bruno(a)trinnov.com>"); --- > "Remy Bruno <remy.bruno(a)trinnov.com>, " > "Florian Faber <faber(a)faberman.de>"); 136c140,151 < #define HDSPM_MADI_peakrmsbase 4096 /* 4096-8191 2x64x32Bit Meters */ --- > > #define HDSPM_MADI_INPUT_PEAK 4096 > #define HDSPM_MADI_PLAYBACK_PEAK 4352 > #define HDSPM_MADI_OUTPUT_PEAK 4608 > > #define HDSPM_MADI_INPUT_RMS_L 6144 > #define HDSPM_MADI_PLAYBACK_RMS_L 6400 > #define HDSPM_MADI_OUTPUT_RMS_L 6656 > > #define HDSPM_MADI_INPUT_RMS_H 7168 > #define HDSPM_MADI_PLAYBACK_RMS_H 7424 > #define HDSPM_MADI_OUTPUT_RMS_H 7680 707c722 < /* maby a madi input (which is taken if sel sync is madi) */ --- > /* mayby a madi input (which is taken if sel sync is madi) */ 4108a4124,4128 > static inline int copy_u32_le(void __user *dest, void __iomem *src) > { > u32 val = readl(src); > return copy_to_user(dest, &val, 4); > } 4111c4131 < unsigned int cmd, unsigned long arg) --- > unsigned int cmd, unsigned long __user arg) 4113,4136c4133,4172 < struct hdspm *hdspm = hw->private_data; < struct hdspm_mixer_ioctl mixer; < struct hdspm_config_info info; < struct hdspm_version hdspm_version; < struct hdspm_peak_rms_ioctl rms; < < switch (cmd) { < < case SNDRV_HDSPM_IOCTL_GET_PEAK_RMS: < if (copy_from_user(&rms, (void __user *)arg, sizeof(rms))) < return -EFAULT; < /* maybe there is a chance to memorymap in future < * so dont touch just copy < */ < if(copy_to_user_fromio((void __user *)rms.peak, < hdspm->iobase+HDSPM_MADI_peakrmsbase, < sizeof(struct hdspm_peak_rms)) != 0 ) < return -EFAULT; < < break; < < < case SNDRV_HDSPM_IOCTL_GET_CONFIG_INFO: < --- > void __user *argp = (void __user *)arg; > struct hdspm *hdspm = hw->private_data; > struct hdspm_mixer_ioctl mixer; > struct hdspm_config_info info; > struct hdspm_version hdspm_version; > struct hdspm_peak_rms levels; > long unsigned int s; > int i=0; > > switch (cmd) { > > case SNDRV_HDSPM_IOCTL_GET_PEAK_RMS: > for (i=0; i<64; i++) { > levels.input_peaks[i] = readl(hdspm->iobase +HDSPM_MADI_INPUT_PEAK+i*4); > levels.playback_peaks[i] = readl(hdspm->iobase +HDSPM_MADI_PLAYBACK_PEAK+i*4); > levels.output_peaks[i] = readl(hdspm->iobase +HDSPM_MADI_OUTPUT_PEAK+i*4); > levels.input_rms[i] = (readl(hdspm->iobase +HDSPM_MADI_INPUT_RMS_H+i*4) << 32) | readl(hdspm->iobase +HDSPM_MADI_INPUT_RMS_L+i*4); > levels.playback_rms[i] = (readl(hdspm->iobase +HDSPM_MADI_PLAYBACK_RMS_H+i*4) << 32) | readl(hdspm->iobase +HDSPM_MADI_PLAYBACK_RMS_L+i*4); > levels.output_rms[i] = (readl(hdspm->iobase +HDSPM_MADI_OUTPUT_RMS_H+i*4) << 32) | readl(hdspm->iobase +HDSPM_MADI_OUTPUT_RMS_L+i*4); > } > > if (hdspm->system_sample_rate>96000) { > levels.speed = qs; > } else if (hdspm->system_sample_rate>48000) { > levels.speed = ds; > } else { > levels.speed = ss; > } > levels.status2 = hdspm_read(hdspm, HDSPM_statusRegister2); > > s = copy_to_user(argp, &levels, sizeof(struct hdspm_peak_rms)); > if (0 != s) { > snd_printk(KERN_ERR "copy_to_user(.., .., %lu): %lu\n", sizeof(struct hdspm_peak_rms), s); > return -EFAULT; > } > break; > > > case SNDRV_HDSPM_IOCTL_GET_CONFIG_INFO: > Flo -- Machines can do the work, so people have time to think. public key 6C002249 x-hkp://wwwkeys.eu.pgp.net

2 1

[alsa-devel] ASoC updates for 2.6.31
by Mark Brown 15 Apr '09

15 Apr '09

The following changes since commit 34e51ce60a210094bd66cf0a75dd8512247618ca: Takashi Iwai (1): Merge branch 'for-2.6.30' of git://git.kernel.org/.../broonie/sound-2.6 into topic/asoc are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.31 Alexander Beregalov (1): ASoC: n810: replace BUG() with BUG_ON() Daniel Glöckner (3): ASoC: Add driver for s6000 I2S interface ASoC: s6105 IP camera machine specific ASoC code ASoC: correct s6000 I2S clock polarity Daniel Ribeiro (1): ASoC: pxa-ssp.c fix clock/frame invert Mark Brown (11): ASoC: Display return code when failing to add a DAPM kcontrol ASoC: Provide core support for symmetric sample rates ASoC: Add WM8988 CODEC driver Merge branch 's6000' into for-2.6.31 ASoC: WM9713 requires symmetric rates on the voice DAI ASoC: Factor out application of power for generic widgets ASoC: Support DAPM events for DACs and ADCs ASoC: Move the WM9713 voice DAC powerdown to a DAPM event ASoC: Add WM8960 CODEC driver Merge branch 'for-2.6.30' into for-2.6.31 Merge branch 'for-2.6.30' into for-2.6.31 Peter Ujfalusi (1): ASoC: tlv320aic23: add DSP_A format support include/sound/soc-dai.h | 1 + include/sound/soc-dapm.h | 10 + include/sound/soc.h | 6 + sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/codecs/Kconfig | 8 + sound/soc/codecs/Makefile | 4 + sound/soc/codecs/tlv320aic23.c | 2 + sound/soc/codecs/wm8960.c | 969 +++++++++++++++++++++++++++++++++++ sound/soc/codecs/wm8960.h | 127 +++++ sound/soc/codecs/wm8988.c | 1097 ++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/wm8988.h | 60 +++ sound/soc/codecs/wm9713.c | 40 +- sound/soc/omap/n810.c | 7 +- sound/soc/pxa/pxa-ssp.c | 11 +- sound/soc/s6000/Kconfig | 19 + sound/soc/s6000/Makefile | 11 + sound/soc/s6000/s6000-i2s.c | 629 +++++++++++++++++++++++ sound/soc/s6000/s6000-i2s.h | 25 + sound/soc/s6000/s6000-pcm.c | 497 ++++++++++++++++++ sound/soc/s6000/s6000-pcm.h | 35 ++ sound/soc/s6000/s6105-ipcam.c | 244 +++++++++ sound/soc/soc-core.c | 38 ++ sound/soc/soc-dapm.c | 131 +++--- 24 files changed, 3893 insertions(+), 80 deletions(-) create mode 100644 sound/soc/codecs/wm8960.c create mode 100644 sound/soc/codecs/wm8960.h create mode 100644 sound/soc/codecs/wm8988.c create mode 100644 sound/soc/codecs/wm8988.h create mode 100644 sound/soc/s6000/Kconfig create mode 100644 sound/soc/s6000/Makefile create mode 100644 sound/soc/s6000/s6000-i2s.c create mode 100644 sound/soc/s6000/s6000-i2s.h create mode 100644 sound/soc/s6000/s6000-pcm.c create mode 100644 sound/soc/s6000/s6000-pcm.h create mode 100644 sound/soc/s6000/s6105-ipcam.c

3 18

[alsa-devel] [PATCH 1/2] keywest: Convert to new-style i2c driver
by Jean Delvare 15 Apr '09

15 Apr '09

The legacy i2c binding model is going away soon, so convert the ppc keywest sound driver to the new model or it will break. Signed-off-by: Jean Delvare <khali(a)linux-fr.org> Cc: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> --- sound/ppc/keywest.c | 81 +++++++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 41 deletions(-) --- linux-2.6.30-rc1.orig/sound/ppc/keywest.c 2009-04-10 15:22:18.000000000 +0200 +++ linux-2.6.30-rc1/sound/ppc/keywest.c 2009-04-10 16:41:36.000000000 +0200 @@ -33,26 +33,25 @@ static struct pmac_keywest *keywest_ctx; -static int keywest_attach_adapter(struct i2c_adapter *adapter); -static int keywest_detach_client(struct i2c_client *client); - -struct i2c_driver keywest_driver = { - .driver = { - .name = "PMac Keywest Audio", - }, - .attach_adapter = &keywest_attach_adapter, - .detach_client = &keywest_detach_client, -}; - - #ifndef i2c_device_name #define i2c_device_name(x) ((x)->name) #endif +static int keywest_probe(struct i2c_client *client, + const struct i2c_device_id *id) +{ + i2c_set_clientdata(client, keywest_ctx); + return 0; +} + +/* + * This is kind of a hack, best would be to turn powermac to fixed i2c + * bus numbers and declare the sound device as part of platform + * initialization + */ static int keywest_attach_adapter(struct i2c_adapter *adapter) { - int err; - struct i2c_client *new_client; + struct i2c_board_info info; if (! keywest_ctx) return -EINVAL; @@ -60,46 +59,46 @@ static int keywest_attach_adapter(struct if (strncmp(i2c_device_name(adapter), "mac-io", 6)) return 0; /* ignored */ - new_client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL); - if (! new_client) - return -ENOMEM; - - new_client->addr = keywest_ctx->addr; - i2c_set_clientdata(new_client, keywest_ctx); - new_client->adapter = adapter; - new_client->driver = &keywest_driver; - new_client->flags = 0; - - strcpy(i2c_device_name(new_client), keywest_ctx->name); - keywest_ctx->client = new_client; + memset(&info, 0, sizeof(struct i2c_board_info)); + strlcpy(info.type, "keywest", I2C_NAME_SIZE); + info.addr = keywest_ctx->addr; + keywest_ctx->client = i2c_new_device(adapter, &info); - /* Tell the i2c layer a new client has arrived */ - if (i2c_attach_client(new_client)) { - snd_printk(KERN_ERR "tumbler: cannot attach i2c client\n"); - err = -ENODEV; - goto __err; - } - + /* + * Let i2c-core delete that device on driver removal. + * This is safe because i2c-core holds the core_lock mutex for us. + */ + list_add_tail(&keywest_ctx->client->detected, + &keywest_ctx->client->driver->clients); return 0; - - __err: - kfree(new_client); - keywest_ctx->client = NULL; - return err; } -static int keywest_detach_client(struct i2c_client *client) +static int keywest_remove(struct i2c_client *client) { if (! keywest_ctx) return 0; if (client == keywest_ctx->client) keywest_ctx->client = NULL; - i2c_detach_client(client); - kfree(client); return 0; } + +static const struct i2c_device_id keywest_i2c_id[] = { + { "keywest", 0 }, + { } +}; + +struct i2c_driver keywest_driver = { + .driver = { + .name = "PMac Keywest Audio", + }, + .attach_adapter = keywest_attach_adapter, + .probe = keywest_probe, + .remove = keywest_remove, + .id_table = keywest_i2c_id, +}; + /* exported */ void snd_pmac_keywest_cleanup(struct pmac_keywest *i2c) { -- Jean Delvare

2 4

[alsa-devel] Rewrite of hw_ptr updaters makes things worse?
by Chuck Ebbert 14 Apr '09

14 Apr '09

After adding these patches from 2.6.30 to a 2.6.29 kernel, pulseaudio problems are worse: ALSA: pcm - Reset invalid position even without debug option ALSA: pcm - Fix delta calculation at boundary overlap ALSA: pcm - Safer boundary checks ALSA: Rewrite hw_ptr updaters Mar 28 14:28:20 platon pulseaudio[3040]: alsa-sink.c: Increasing wakeup watermark to 60,00 ms Mar 28 14:31:35 platon pulseaudio[3040]: alsa-sink.c: Increasing wakeup watermark to 70,00 ms Mar 28 14:31:35 platon pulseaudio[3040]: alsa-sink.c: Increasing wakeup watermark to 80,00 ms Mar 28 14:31:35 platon pulseaudio[3040]: alsa-util.c: snd_pcm_avail() returned a value that is exceptionally large: 4294952932 bytes (24347805 ms). Mar 28 14:31:35 platon pulseaudio[3040]: alsa-util.c: Most likely this is a bug in the ALSA driver 'snd_intel8x0'. Please report this issue to the ALSA developers. Mar 28 14:31:35 platon pulseaudio[3040]: rtpoll.c: Assertion 'usec <= ((pa_usec_t) 1000000ULL)*60ULL*60ULL' failed at pulsecore/rtpoll.c:548, function pa_rtpoll_set_timer_relative(). Aborting.

2 2

[alsa-devel] HP tx2100er headphone jack problem
by Alex Pyattaev 14 Apr '09

14 Apr '09

Hello! I have this laptop for a year now, and ever since i've been trying to fix the sound. Playback works out-of-the box, but as for specific features... Hope you can help a bit. So, to be exact Hardware: HP tx2100er laptop, AMD64, nforce2 chipset. Audio: see alsa-info output in attachement Soft: 2.6.29-gentoo, alsa-driver either kernel.org or realtek's alsa-driver-1.0.19-5.11. I've tried different model settings, eg: model=hp : playback - ok record - none (either internal and external bus) switching to headphone on jack insert - ok model=3stack: playback-ok record - extremely silent(but works) or noisy switching to headphone on jack insert - no model=toshiba (it is for another chip, however, it waqs reported to wor for tx2500) playback - ok record - ok switching to headphone on jack insert - no So, as you see, the codec seems to work, but for some reason it is never fully functional. I have tried to fix it, but I just do not know how to do it. If you need any additional info - just mail me. Thank you in advance! Alex Pyattaev I just don't know what to do next.

2 2

[alsa-devel] [PATCH 2/2] hdspm: modified include file
by Florian Faber 14 Apr '09

14 Apr '09

Ckeaned up meter structure and modified the PEAK_RMS ioctl to reflect the modifications. diff a/sound/include/sound/hdspm.h b/sound/include/sound/hdspm.h 28,36d27 < /* peam rms level structure like we get from hardware < < maybe in future we can memory map it so I just copy it < to user on ioctl call now an dont change anything < rms are made out of low and high values < where (long) ????_rms = (????_rms_l >> 8) + ((????_rms_h & 0xFFFFFF00)<<24) < (i asume so from the code) < */ < 37a29,35 > uint32_t input_peaks[64]; > uint32_t playback_peaks[64]; > uint32_t output_peaks[64]; > > uint64_t input_rms[64]; > uint64_t playback_rms[64]; > uint64_t output_rms[64]; 39,56c37,38 < unsigned int level_offset[1024]; < < unsigned int input_peak[64]; < unsigned int playback_peak[64]; < unsigned int output_peak[64]; < unsigned int xxx_peak[64]; /* not used */ < < unsigned int reserved[256]; /* not used */ < < unsigned int input_rms_l[64]; < unsigned int playback_rms_l[64]; < unsigned int output_rms_l[64]; < unsigned int xxx_rms_l[64]; /* not used */ < < unsigned int input_rms_h[64]; < unsigned int playback_rms_h[64]; < unsigned int output_rms_h[64]; < unsigned int xxx_rms_h[64]; /* not used */ --- > enum {ss, ds, qs} speed; > int status2; 59,61d40 < struct hdspm_peak_rms_ioctl { < struct hdspm_peak_rms *peak; < }; 63d41 < /* use indirect access due to the limit of ioctl bit size */ 65c43 < _IOR('H', 0x40, struct hdspm_peak_rms_ioctl) --- > _IOR('H', 0x40, struct hdspm_peak_rms) Flo -- Machines can do the work, so people have time to think. public key 6C002249 x-hkp://wwwkeys.eu.pgp.net

1 0

Re: [alsa-devel] Help required. Slax OS, no audio, multiple cards, hdmi
by James Gauld 14 Apr '09

14 Apr '09

Yes, I tried the following Slax module first of all: http://www.slax.org/modules.php?action=detail&id=1063 with no success. any other suggestions? i've enabled iec958 mixer control, but cannot adjst it's volume. the HDMI device does not have the "pvolume" capability. I don't know if that's of any significance, but I'm in dark, uncharted territory here. Lee Revell wrote: > On Mon, Apr 13, 2009 at 11:09 AM, James Gauld <james(a)thundermonkey.net> wrote: >> However, running slax (from usb) I cannot get any sound from either >> device, but I'm only interested in the HDMI card (card #1) which >> delivers output to the integrated speakers (as far as I can tell from >> windows). >> >> I've tried from console and various widgets in KDE with no success. > > Try installing the proprietary ATI video driver. Thanks to DRM the > video driver has veto power over whether you can output audio via > HDMI. > > Lee > _______________________________________________ > Alsa-devel mailing list > Alsa-devel(a)alsa-project.org > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel > >

1 0

Re: [alsa-devel] alsa-driver-unstable not updated since Mar 24th?
by Susan Cragin 14 Apr '09

14 Apr '09

>At Tue, 14 Apr 2009 09:52:42 -0400 (GMT-04:00), >Susan Cragin wrote: >> >> [1 <text/plain; UTF-8 (7bit)>] >> >> I know there were problems on the 25th or 26th, either with the >> >> drivers or between the drivers and changes made to the kernel. >> > >> >It's been broken during my vacation. >> >Now it should be fixed. Let me know if it's still broken. >> > >> > >> >thanks, >> > >> >Takashi >> >> I just downloaded and installed the unstable snapshot 14-April 11:48. Install worked on my Asus G1S running Ubuntu Jaunty with all updates (most recent kernel is only 2.6.28-11-Generic). >> >> But sound is not working correctly on my machine. Neither sound card works. >> Sound cards present: >> hda-intel / Realtek ALC660-VD >> hda-audio-generic / Creative CA0110-IBG (Creative X-fi) > >Is it a regression from older version? > >How about alsa-driver snapshot (stable one)? >It won't work with CA0110, though. > > >Takashi Today's stable snapshot did not compile for me. I have attached the terminal output. My current problems with unstable are indeed a regression. CA0110 (my Creative X-fi) used to work very well with alsa-driver-unstable, as did my hda-intel. I last installed unstable perhaps two weeks ago? and used it at that time to run Audacity and sound programs in wine. I was getting very good sound. Susan

1 0

Re: [alsa-devel] alsa-driver-unstable not updated since Mar 24th?
by Susan Cragin 14 Apr '09

14 Apr '09

>> I know there were problems on the 25th or 26th, either with the >> drivers or between the drivers and changes made to the kernel. > >It's been broken during my vacation. >Now it should be fixed. Let me know if it's still broken. > > >thanks, > >Takashi I just downloaded and installed the unstable snapshot 14-April 11:48. Install worked on my Asus G1S running Ubuntu Jaunty with all updates (most recent kernel is only 2.6.28-11-Generic). But sound is not working correctly on my machine. Neither sound card works. Sound cards present: hda-intel / Realtek ALC660-VD hda-audio-generic / Creative CA0110-IBG (Creative X-fi) Have attached lspci-vv. Anything else, just ask. Any testing, etc. Susan

2 1

Re: [alsa-devel] Sound through HDMI
by Francois Marti 14 Apr '09

14 Apr '09

Hi! I try to change mixer and mute/unmute channel. I upgrade ubuntu from 8.10 to 9.04. I download/compile/install last alsa driver. I add in my modprob.conf this lines : options snd-hda-intel model=3stack-dig alias snd-card-0 snd-hda-intel alias sound-slot-0 snd-hda-intel alias sound-slot-0 snd-card-0 alias sound-service-0-0 snd-mixer-oss alias sound-service-0-1 snd-seq-oss alias sound-service-0-3 snd-pcm-oss alias sound-service-0-8 snd-seq-oss alias sound-service-0-12 snd-pcm-oss that's all. What is the next step ? Regards, On Tue, Apr 14, 2009 at 3:42 PM, Takashi Iwai <tiwai(a)suse.de> wrote: > At Tue, 14 Apr 2009 15:39:18 +0200, > Francois Marti wrote: >> >> Ho ! >> >> I find something : > > Please add alsa-devel ML to Cc so that other people can follow. > > Also, describe what actually you have tried and what didn't work > precisely. "ABC doesn't work" is too ambiguous to investigate. > > > thanks, > > Takashi >

1 0