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

[alsa-devel] Releasing IRQs in older kernels
by Risto Suominen 16 Apr '08

16 Apr '08

I'd like to bring up a problem with using alsa-driver on older kernels. I already made a bug report regarding snd-powermac: https://bugtrack.alsa-project.org/alsa-bug/view.php?id=3883. It's possible that other drivers suffer from this, too. If I've understood it right, 1.0.16 should be usable on 2.2 kernels and newer. Well, it woudn't compile on 2.6.15-26-powerpc (Ubuntu 6.06.1 Dapper) without some patching. However, the real problem began, when I tried to unload the module. It seems that something has changed (when?) in the kernel's IRQ interface, and ALSA tries to make old code compatible with it by introducing snd_request/free_irq, to be used with older kernels. The idea is to distuingish between IRQs by the last parameter, usually chip's address. This leads to trouble when several IRQs come from the same chip, as is the case with snd-powermac. My conclusion: the drivers suffering from this should be identified, and some alternative way of handling IRQs correctly on different kernel versions should be developed. Risto

2 3

[alsa-devel] [PATCH 002/003] snd-powermac: AWACS and Screamer mixers for PM7500, Beige, and iMac SL
by Risto Suominen 16 Apr '08

16 Apr '08

From: Risto Suominen <Risto.Suominen at gmail.com> Add mixer controls and correct headphone detection bits for PowerMacs 7300/7500 (AWACS) and G3 Beige (Screamer), and iMac G3 Slot-loading (Screamer). Signed-off-by: Risto Suominen <Risto.Suominen at gmail.com> --- Kernel version 2.6.25-rc8 (probably any 2.6) --- sound/ppc/awacs.c.orig 2008-04-05 17:45:08.000000000 +0300 +++ sound/ppc/awacs.c 2008-04-07 11:24:08.108621048 +0300 @@ -141,7 +141,7 @@ static int snd_pmac_awacs_info_volume(st uinfo->value.integer.max = 15; return 0; } - + static int snd_pmac_awacs_get_volume(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { @@ -267,7 +267,8 @@ static int snd_pmac_awacs_put_switch(str static void awacs_set_cuda(int reg, int val) { struct adb_request req; - cuda_request(&req, NULL, 5, CUDA_PACKET, CUDA_GET_SET_IIC, 0x8a, reg, val); + cuda_request(&req, NULL, 5, CUDA_PACKET, CUDA_GET_SET_IIC, 0x8a, + reg, val); while (! req.complete) cuda_poll(); } @@ -289,11 +290,11 @@ static void awacs_amp_set_tone(struct aw /* * vol = 0 - 31 (attenuation), 32 = mute bit, stereo */ -static int awacs_amp_set_vol(struct awacs_amp *amp, int index, int lvol, int rvol, - int do_check) +static int awacs_amp_set_vol(struct awacs_amp *amp, int index, + int lvol, int rvol, int do_check) { if (do_check && amp->amp_vol[index][0] == lvol && - amp->amp_vol[index][1] == rvol) + amp->amp_vol[index][1] == rvol) return 0; awacs_set_cuda(3 + index, lvol); awacs_set_cuda(5 + index, rvol); @@ -337,7 +338,7 @@ static int snd_pmac_awacs_info_volume_am uinfo->value.integer.max = 31; return 0; } - + static int snd_pmac_awacs_get_volume_amp(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { @@ -361,8 +362,10 @@ static int snd_pmac_awacs_put_volume_amp snd_assert(amp, return -EINVAL); snd_assert(index >= 0 && index <= 1, return -EINVAL); - vol[0] = (31 - (ucontrol->value.integer.value[0] & 31)) | (amp->amp_vol[index][0] & 32); - vol[1] = (31 - (ucontrol->value.integer.value[1] & 31)) | (amp->amp_vol[index][1] & 32); + vol[0] = (31 - (ucontrol->value.integer.value[0] & 31)) + | (amp->amp_vol[index][0] & 32); + vol[1] = (31 - (ucontrol->value.integer.value[1] & 31)) + | (amp->amp_vol[index][1] & 32); return awacs_amp_set_vol(amp, index, vol[0], vol[1], 1); } @@ -374,8 +377,10 @@ static int snd_pmac_awacs_get_switch_amp struct awacs_amp *amp = chip->mixer_data; snd_assert(amp, return -EINVAL); snd_assert(index >= 0 && index <= 1, return -EINVAL); - ucontrol->value.integer.value[0] = (amp->amp_vol[index][0] & 32) ? 0 : 1; - ucontrol->value.integer.value[1] = (amp->amp_vol[index][1] & 32) ? 0 : 1; + ucontrol->value.integer.value[0] = (amp->amp_vol[index][0] & 32) + ? 0 : 1; + ucontrol->value.integer.value[1] = (amp->amp_vol[index][1] & 32) + ? 0 : 1; return 0; } @@ -389,8 +394,10 @@ static int snd_pmac_awacs_put_switch_amp snd_assert(amp, return -EINVAL); snd_assert(index >= 0 && index <= 1, return -EINVAL); - vol[0] = (ucontrol->value.integer.value[0] ? 0 : 32) | (amp->amp_vol[index][0] & 31); - vol[1] = (ucontrol->value.integer.value[1] ? 0 : 32) | (amp->amp_vol[index][1] & 31); + vol[0] = (ucontrol->value.integer.value[0] ? 0 : 32) + | (amp->amp_vol[index][0] & 31); + vol[1] = (ucontrol->value.integer.value[1] ? 0 : 32) + | (amp->amp_vol[index][1] & 31); return awacs_amp_set_vol(amp, index, vol[0], vol[1], 1); } @@ -403,7 +410,7 @@ static int snd_pmac_awacs_info_tone_amp( uinfo->value.integer.max = 14; return 0; } - + static int snd_pmac_awacs_get_tone_amp(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { @@ -445,7 +452,7 @@ static int snd_pmac_awacs_info_master_am uinfo->value.integer.max = 99; return 0; } - + static int snd_pmac_awacs_get_master_amp(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { @@ -493,14 +500,14 @@ static struct snd_kcontrol_new snd_pmac_ .private_value = AMP_CH_HD, }, { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, - .name = "Tone Control - Bass", + .name = "Tone Control - Bass Playback Volume", .info = snd_pmac_awacs_info_tone_amp, .get = snd_pmac_awacs_get_tone_amp, .put = snd_pmac_awacs_put_tone_amp, .private_value = 0, }, { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, - .name = "Tone Control - Treble", + .name = "Tone Control - Treble Playback Volume", .info = snd_pmac_awacs_info_tone_amp, .get = snd_pmac_awacs_get_tone_amp, .put = snd_pmac_awacs_put_tone_amp, @@ -544,7 +551,7 @@ static int snd_pmac_screamer_mic_boost_i uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; uinfo->count = 1; uinfo->value.integer.min = 0; - uinfo->value.integer.max = 2; + uinfo->value.integer.max = 3; return 0; } @@ -552,16 +559,14 @@ static int snd_pmac_screamer_mic_boost_g struct snd_ctl_elem_value *ucontrol) { struct snd_pmac *chip = snd_kcontrol_chip(kcontrol); - int val; + int val = 0; unsigned long flags; spin_lock_irqsave(&chip->reg_lock, flags); if (chip->awacs_reg[6] & MASK_MIC_BOOST) - val = 2; - else if (chip->awacs_reg[0] & MASK_GAINLINE) - val = 1; - else - val = 0; + val |= 2; + if (chip->awacs_reg[0] & MASK_GAINLINE) + val |= 1; spin_unlock_irqrestore(&chip->reg_lock, flags); ucontrol->value.integer.value[0] = val; return 0; @@ -578,11 +583,10 @@ static int snd_pmac_screamer_mic_boost_p spin_lock_irqsave(&chip->reg_lock, flags); val0 = chip->awacs_reg[0] & ~MASK_GAINLINE; val6 = chip->awacs_reg[6] & ~MASK_MIC_BOOST; - if (ucontrol->value.integer.value[0] > 0) { + if (ucontrol->value.integer.value[0] & 1) val0 |= MASK_GAINLINE; - if (ucontrol->value.integer.value[0] > 1) - val6 |= MASK_MIC_BOOST; - } + if (ucontrol->value.integer.value[0] & 2) + val6 |= MASK_MIC_BOOST; if (val0 != chip->awacs_reg[0]) { snd_pmac_awacs_write_reg(chip, 0, val0); changed = 1; @@ -599,9 +603,32 @@ static int snd_pmac_screamer_mic_boost_p * lists of mixer elements */ static struct snd_kcontrol_new snd_pmac_awacs_mixers[] __initdata = { - AWACS_VOLUME("Master Playback Volume", 2, 6, 1), AWACS_SWITCH("Master Capture Switch", 1, SHIFT_LOOPTHRU, 0), - AWACS_VOLUME("Capture Volume", 0, 4, 0), + AWACS_VOLUME("Master Capture Volume", 0, 4, 0), +/* AWACS_SWITCH("Unknown Playback Switch", 6, SHIFT_PAROUT0, 0), */ +}; + +static struct snd_kcontrol_new snd_pmac_screamer_mixers_beige[] __initdata = { + AWACS_VOLUME("Master Playback Volume", 2, 6, 1), + AWACS_VOLUME("Play-through Playback Volume", 5, 6, 1), + AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0), + AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_LINE, 0), +}; + +static struct snd_kcontrol_new snd_pmac_screamer_mixers_imac[] __initdata = { + AWACS_VOLUME("Line out Playback Volume", 2, 6, 1), + AWACS_VOLUME("Master Playback Volume", 5, 6, 1), + AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), +}; + +static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac7500[] __initdata = { + AWACS_VOLUME("Line out Playback Volume", 2, 6, 1), + AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), + AWACS_SWITCH("Line Capture Switch", 0, SHIFT_MUX_MIC, 0), +}; + +static struct snd_kcontrol_new snd_pmac_awacs_mixers_pmac[] __initdata = { + AWACS_VOLUME("Master Playback Volume", 2, 6, 1), AWACS_SWITCH("CD Capture Switch", 0, SHIFT_MUX_CD, 0), }; @@ -621,35 +648,61 @@ static struct snd_kcontrol_new snd_pmac_ static struct snd_kcontrol_new snd_pmac_awacs_master_sw __initdata = AWACS_SWITCH("Master Playback Switch", 1, SHIFT_HDMUTE, 1); +static struct snd_kcontrol_new snd_pmac_awacs_master_sw_imac __initdata = +AWACS_SWITCH("Line out Playback Switch", 1, SHIFT_HDMUTE, 1); + static struct snd_kcontrol_new snd_pmac_awacs_mic_boost[] __initdata = { - AWACS_SWITCH("Mic Boost", 0, SHIFT_GAINLINE, 0), + AWACS_SWITCH("Mic Boost Capture Switch", 0, SHIFT_GAINLINE, 0), }; static struct snd_kcontrol_new snd_pmac_screamer_mic_boost[] __initdata = { { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, - .name = "Mic Boost", + .name = "Mic Boost Capture Volume", .info = snd_pmac_screamer_mic_boost_info, .get = snd_pmac_screamer_mic_boost_get, .put = snd_pmac_screamer_mic_boost_put, }, }; +static struct snd_kcontrol_new snd_pmac_awacs_mic_boost_pmac7500[] __initdata = +{ + AWACS_SWITCH("Line Boost Capture Switch", 0, SHIFT_GAINLINE, 0), +}; + +static struct snd_kcontrol_new snd_pmac_screamer_mic_boost_beige[] __initdata = +{ + AWACS_SWITCH("Line Boost Capture Switch", 0, SHIFT_GAINLINE, 0), + AWACS_SWITCH("CD Boost Capture Switch", 6, SHIFT_MIC_BOOST, 0), +}; + +static struct snd_kcontrol_new snd_pmac_screamer_mic_boost_imac[] __initdata = +{ + AWACS_SWITCH("Line Boost Capture Switch", 0, SHIFT_GAINLINE, 0), + AWACS_SWITCH("Mic Boost Capture Switch", 6, SHIFT_MIC_BOOST, 0), +}; + static struct snd_kcontrol_new snd_pmac_awacs_speaker_vol[] __initdata = { AWACS_VOLUME("PC Speaker Playback Volume", 4, 6, 1), }; + static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw __initdata = AWACS_SWITCH("PC Speaker Playback Switch", 1, SHIFT_SPKMUTE, 1); +static struct snd_kcontrol_new snd_pmac_awacs_speaker_sw_imac __initdata = +AWACS_SWITCH("PC Speaker Playback Switch", 1, SHIFT_PAROUT1, 0); + /* * add new mixer elements to the card */ -static int build_mixers(struct snd_pmac *chip, int nums, struct snd_kcontrol_new *mixers) +static int build_mixers(struct snd_pmac *chip, int nums, + struct snd_kcontrol_new *mixers) { int i, err; for (i = 0; i < nums; i++) { - if ((err = snd_ctl_add(chip->card, snd_ctl_new1(&mixers[i], chip))) < 0) + if ((err = snd_ctl_add(chip->card, + snd_ctl_new1(&mixers[i], chip))) < 0) return err; } return 0; @@ -699,8 +752,10 @@ static void snd_pmac_awacs_resume(struct #ifdef PMAC_AMP_AVAIL if (chip->mixer_data) { struct awacs_amp *amp = chip->mixer_data; - awacs_amp_set_vol(amp, 0, amp->amp_vol[0][0], amp->amp_vol[0][1], 0); - awacs_amp_set_vol(amp, 1, amp->amp_vol[1][0], amp->amp_vol[1][1], 0); + awacs_amp_set_vol(amp, 0, + amp->amp_vol[0][0], amp->amp_vol[0][1], 0); + awacs_amp_set_vol(amp, 1, + amp->amp_vol[1][0], amp->amp_vol[1][1], 0); awacs_amp_set_tone(amp, amp->amp_tone[0], amp->amp_tone[1]); awacs_amp_set_master(amp, amp->amp_master); } @@ -708,6 +763,14 @@ static void snd_pmac_awacs_resume(struct } #endif /* CONFIG_PM */ +#define IS_PM7500 (machine_is_compatible("AAPL,7500")) +#define IS_BEIGE (machine_is_compatible("AAPL,Gossamer")) +#define IS_IMAC (machine_is_compatible("PowerMac2,1") \ + || machine_is_compatible("PowerMac2,2") \ + || machine_is_compatible("PowerMac4,1")) + +static int imac; + #ifdef PMAC_SUPPORT_AUTOMUTE /* * auto-mute stuffs @@ -750,9 +813,16 @@ static void snd_pmac_awacs_update_automu } else #endif { - int reg = chip->awacs_reg[1] | (MASK_HDMUTE|MASK_SPKMUTE); + int reg = chip->awacs_reg[1] + | (MASK_HDMUTE | MASK_SPKMUTE); + if (imac) { + reg &= ~MASK_SPKMUTE; + reg &= ~MASK_PAROUT1; + } if (snd_pmac_awacs_detect_headphone(chip)) reg &= ~MASK_HDMUTE; + else if (imac) + reg |= MASK_PAROUT1; else reg &= ~MASK_SPKMUTE; if (do_notify && reg == chip->awacs_reg[1]) @@ -778,8 +848,11 @@ static void snd_pmac_awacs_update_automu int __init snd_pmac_awacs_init(struct snd_pmac *chip) { + int pm7500 = IS_PM7500; + int beige = IS_BEIGE; int err, vol; + imac = IS_IMAC; /* looks like MASK_GAINLINE triggers something, so we set here * as start-up */ @@ -787,7 +860,7 @@ snd_pmac_awacs_init(struct snd_pmac *chi chip->awacs_reg[1] = MASK_CMUTE | MASK_AMUTE; /* FIXME: Only machines with external SRS module need MASK_PAROUT */ if (chip->has_iic || chip->device_id == 0x5 || - /*chip->_device_id == 0x8 || */ + /* chip->_device_id == 0x8 || */ chip->device_id == 0xb) chip->awacs_reg[1] |= MASK_PAROUT; /* get default volume from nvram */ @@ -798,8 +871,10 @@ snd_pmac_awacs_init(struct snd_pmac *chi chip->awacs_reg[2] = vol; chip->awacs_reg[4] = vol; if (chip->model == PMAC_SCREAMER) { - chip->awacs_reg[5] = vol; /* FIXME: screamer has loopthru vol control */ - chip->awacs_reg[6] = MASK_MIC_BOOST; /* FIXME: maybe should be vol << 3 for PCMCIA speaker */ + /* FIXME: screamer has loopthru vol control */ + chip->awacs_reg[5] = vol; + /* FIXME: maybe should be vol << 3 for PCMCIA speaker */ + chip->awacs_reg[6] = MASK_MIC_BOOST; chip->awacs_reg[7] = 0; } @@ -815,7 +890,8 @@ snd_pmac_awacs_init(struct snd_pmac *chi return -ENOMEM; chip->mixer_data = amp; chip->mixer_free = awacs_amp_free; - awacs_amp_set_vol(amp, 0, 63, 63, 0); /* mute and zero vol */ + /* mute and zero vol */ + awacs_amp_set_vol(amp, 0, 63, 63, 0); awacs_amp_set_vol(amp, 1, 63, 63, 0); awacs_amp_set_tone(amp, 7, 7); /* 0 dB */ awacs_amp_set_master(amp, 79); /* 0 dB */ @@ -826,20 +902,25 @@ snd_pmac_awacs_init(struct snd_pmac *chi /* set headphone-jack detection bit */ switch (chip->model) { case PMAC_AWACS: - chip->hp_stat_mask = 0x04; + chip->hp_stat_mask = pm7500 ? MASK_HDPCONN + : MASK_LOCONN; break; case PMAC_SCREAMER: switch (chip->device_id) { case 0x08: - /* 1 = side jack, 2 = front jack */ - chip->hp_stat_mask = 0x03; + case 0x0B: + chip->hp_stat_mask = imac + ? MASK_LOCONN_IMAC | + MASK_HDPLCONN_IMAC | + MASK_HDPRCONN_IMAC + : MASK_HDPCONN; break; case 0x00: case 0x05: - chip->hp_stat_mask = 0x04; + chip->hp_stat_mask = MASK_LOCONN; break; default: - chip->hp_stat_mask = 0x08; + chip->hp_stat_mask = MASK_HDPCONN; break; } break; @@ -857,15 +938,37 @@ snd_pmac_awacs_init(struct snd_pmac *chi if ((err = build_mixers(chip, ARRAY_SIZE(snd_pmac_awacs_mixers), snd_pmac_awacs_mixers)) < 0) return err; - if (chip->model == PMAC_SCREAMER) + if (beige) + ; + else if (chip->model == PMAC_SCREAMER) err = build_mixers(chip, ARRAY_SIZE(snd_pmac_screamer_mixers2), snd_pmac_screamer_mixers2); - else + else if (!pm7500) err = build_mixers(chip, ARRAY_SIZE(snd_pmac_awacs_mixers2), snd_pmac_awacs_mixers2); if (err < 0) return err; - chip->master_sw_ctl = snd_ctl_new1(&snd_pmac_awacs_master_sw, chip); + if (pm7500) + err = build_mixers(chip, + ARRAY_SIZE(snd_pmac_awacs_mixers_pmac7500), + snd_pmac_awacs_mixers_pmac7500); + else if (beige) + err = build_mixers(chip, + ARRAY_SIZE(snd_pmac_screamer_mixers_beige), + snd_pmac_screamer_mixers_beige); + else if (imac) + err = build_mixers(chip, + ARRAY_SIZE(snd_pmac_screamer_mixers_imac), + snd_pmac_screamer_mixers_imac); + else + err = build_mixers(chip, + ARRAY_SIZE(snd_pmac_awacs_mixers_pmac), + snd_pmac_awacs_mixers_pmac); + if (err < 0) + return err; + chip->master_sw_ctl = snd_ctl_new1((pm7500 || imac) + ? &snd_pmac_awacs_master_sw_imac + : &snd_pmac_awacs_master_sw, chip); if ((err = snd_ctl_add(chip->card, chip->master_sw_ctl)) < 0) return err; #ifdef PMAC_AMP_AVAIL @@ -876,35 +979,58 @@ snd_pmac_awacs_init(struct snd_pmac *chi * screamer registers. * in this case, it seems the route C is not used. */ - if ((err = build_mixers(chip, ARRAY_SIZE(snd_pmac_awacs_amp_vol), + if ((err = build_mixers(chip, + ARRAY_SIZE(snd_pmac_awacs_amp_vol), snd_pmac_awacs_amp_vol)) < 0) return err; /* overwrite */ - chip->master_sw_ctl = snd_ctl_new1(&snd_pmac_awacs_amp_hp_sw, chip); + chip->master_sw_ctl = snd_ctl_new1(&snd_pmac_awacs_amp_hp_sw, + chip); if ((err = snd_ctl_add(chip->card, chip->master_sw_ctl)) < 0) return err; - chip->speaker_sw_ctl = snd_ctl_new1(&snd_pmac_awacs_amp_spk_sw, chip); + chip->speaker_sw_ctl = snd_ctl_new1(&snd_pmac_awacs_amp_spk_sw, + chip); if ((err = snd_ctl_add(chip->card, chip->speaker_sw_ctl)) < 0) return err; } else #endif /* PMAC_AMP_AVAIL */ { /* route A = headphone, route C = speaker */ - if ((err = build_mixers(chip, ARRAY_SIZE(snd_pmac_awacs_speaker_vol), + if ((err = build_mixers(chip, + ARRAY_SIZE(snd_pmac_awacs_speaker_vol), snd_pmac_awacs_speaker_vol)) < 0) return err; - chip->speaker_sw_ctl = snd_ctl_new1(&snd_pmac_awacs_speaker_sw, chip); + chip->speaker_sw_ctl = snd_ctl_new1(imac + ? &snd_pmac_awacs_speaker_sw_imac + : &snd_pmac_awacs_speaker_sw, chip); if ((err = snd_ctl_add(chip->card, chip->speaker_sw_ctl)) < 0) return err; } - if (chip->model == PMAC_SCREAMER) { - if ((err = build_mixers(chip, ARRAY_SIZE(snd_pmac_screamer_mic_boost), - snd_pmac_screamer_mic_boost)) < 0) + if (beige) { + if ((err = build_mixers(chip, + ARRAY_SIZE(snd_pmac_screamer_mic_boost_beige), + snd_pmac_screamer_mic_boost_beige)) < 0) + return err; + } else if (imac) { + if ((err = build_mixers(chip, + ARRAY_SIZE(snd_pmac_screamer_mic_boost_imac), + snd_pmac_screamer_mic_boost_imac)) < 0) + return err; + } else if (chip->model == PMAC_SCREAMER) { + if ((err = build_mixers(chip, + ARRAY_SIZE(snd_pmac_screamer_mic_boost), + snd_pmac_screamer_mic_boost)) < 0) + return err; + } else if (pm7500) { + if ((err = build_mixers(chip, + ARRAY_SIZE(snd_pmac_awacs_mic_boost_pmac7500), + snd_pmac_awacs_mic_boost_pmac7500)) < 0) return err; } else { - if ((err = build_mixers(chip, ARRAY_SIZE(snd_pmac_awacs_mic_boost), - snd_pmac_awacs_mic_boost)) < 0) + if ((err = build_mixers(chip, + ARRAY_SIZE(snd_pmac_awacs_mic_boost), + snd_pmac_awacs_mic_boost)) < 0) return err; } --- sound/ppc/awacs.h.orig 2008-04-05 17:45:08.000000000 +0300 +++ sound/ppc/awacs.h 2008-04-07 11:26:58.198763416 +0300 @@ -116,6 +116,11 @@ struct awacs_regs { #define MASK_HDMUTE MASK_AMUTE #define SHIFT_HDMUTE 9 #define MASK_PAROUT (0x3 << 10) /* Parallel Out (???) */ +#define MASK_PAROUT0 (0x1 << 10) /* Parallel Out (???) */ +#define MASK_PAROUT1 (0x1 << 11) /* Parallel Out (enable speaker) */ +#define SHIFT_PAROUT 10 +#define SHIFT_PAROUT0 10 +#define SHIFT_PAROUT1 11 #define SAMPLERATE_48000 (0x0 << 3) /* 48 or 44.1 kHz */ #define SAMPLERATE_32000 (0x1 << 3) /* 32 or 29.4 kHz */ @@ -152,8 +157,15 @@ struct awacs_regs { #define MASK_REVISION (0xf << 12) /* Revision Number */ #define MASK_MFGID (0xf << 8) /* Mfg. ID */ #define MASK_CODSTATRES (0xf << 4) /* bits 4 - 7 reserved */ -#define MASK_INPPORT (0xf) /* Input Port */ -#define MASK_HDPCONN 8 /* headphone plugged in */ +#define MASK_INSENSE (0xf) /* port sense bits: */ +#define MASK_HDPCONN 8 /* headphone plugged in */ +#define MASK_LOCONN 4 /* line-out plugged in */ +#define MASK_LICONN 2 /* line-in plugged in */ +#define MASK_MICCONN 1 /* microphone plugged in */ +#define MASK_LICONN_IMAC 8 /* line-in plugged in */ +#define MASK_HDPRCONN_IMAC 4 /* headphone right plugged in */ +#define MASK_HDPLCONN_IMAC 2 /* headphone left plugged in */ +#define MASK_LOCONN_IMAC 1 /* line-out plugged in */ /* Clipping Count Reg Bit Masks */ /* -------- ----- --- --- ----- */ @@ -163,7 +175,8 @@ struct awacs_regs { /* DBDMA ChannelStatus Bit Masks */ /* ----- ------------- --- ----- */ #define MASK_CSERR (0x1 << 7) /* Error */ -#define MASK_EOI (0x1 << 6) /* End of Input -- only for Input Channel */ +#define MASK_EOI (0x1 << 6) /* End of Input -- + only for Input Channel */ #define MASK_CSUNUSED (0x1f << 1) /* bits 1-5 not used */ #define MASK_WAIT (0x1) /* Wait */

2 3

[alsa-devel] [PATCH 001b/003] snd-powermac: style pmac.c
by Risto Suominen 16 Apr '08

16 Apr '08

From: Risto Suominen <Risto.Suominen(a)gmail.com> Coding style corrections for pmac.c. Signed-off-by: Risto Suominen <Risto.Suominen(a)gmail.com> --- Kernel version 2.6.25-rc8 (probably any 2.6) --- sound/ppc/pmac.c.orig 2008-04-05 17:45:08.000000000 +0300 +++ sound/ppc/pmac.c 2008-04-07 12:18:47.503077312 +0300 @@ -214,7 +214,7 @@ static int snd_pmac_pcm_prepare(struct s int rate_index; long offset; struct pmac_stream *astr; - + rec->dma_size = snd_pcm_lib_buffer_bytes(subs); rec->period_size = snd_pcm_lib_period_bytes(subs); rec->nperiods = rec->dma_size / rec->period_size; @@ -643,7 +643,7 @@ static int snd_pmac_pcm_close(struct snd /* reset constraints */ astr->cur_freqs = chip->freqs_ok; astr->cur_formats = chip->formats_ok; - + return 0; }

1 0

[alsa-devel] [PATCH 001a/003] snd-powermac: enable headphone detection
by Risto Suominen 16 Apr '08

16 Apr '08

From: Risto Suominen <Risto.Suominen(a)gmail.com> Enable port change interrupt while initialising AWACS, Screamer, and Burgundy chipsets. Signed-off-by: Risto Suominen <Risto.Suominen(a)gmail.com> --- Kernel version 2.6.25-rc8 (probably any 2.6) --- sound/ppc/pmac.c.orig 2008-04-05 17:45:08.000000000 +0300 +++ sound/ppc/pmac.c 2008-04-07 12:18:47.503077312 +0300 @@ -1300,9 +1304,9 @@ int __init snd_pmac_new(struct snd_card snd_pmac_sound_feature(chip, 1); - /* reset */ - if (chip->model == PMAC_AWACS) - out_le32(&chip->awacs->control, 0x11); + /* reset & enable interrupts */ + if (chip->model <= PMAC_BURGUNDY) + out_le32(&chip->awacs->control, chip->control_mask); /* Powerbooks have odd ways of enabling inputs such as an expansion-bay CD or sound from an internal modem

1 0

[alsa-devel] [Fwd: Another unknown bt878]
by John R. 16 Apr '08

16 Apr '08

This card is sold as the PV-981. I tried various digital_rate settings. -------- Original Message -------- Subject: Another unknown bt878 Date: Mon, 14 Apr 2008 23:17:47 -0500 From: John R. <johnr(a)wowway.com> To: alsa-devel(a)alsa-project.org Sound doesn't work on my bt878 based card. Let me know what other information is needed... kernel 2.6.24.2: Apr 14 20:28:38 server kernel: unknown card 0x878-0xaa00:0x1460 Apr 14 20:28:38 server kernel: please mail id, board name, and, if it works, the correct digital_rate option to <alsa-devel(a)alsa-project.org> Apr 14 20:28:38 server kernel: ACPI: PCI Interrupt 0000:05:00.1[A] -> GSI 18 (level, low) -> IRQ 18 Apr 14 20:28:38 server kernel: bt87x0: Using board 0, analog, digital (rate 32000 Hz) Apr 14 20:28:38 server kernel: unknown card 0x878-0xaa01:0x1461 Apr 14 20:28:38 server kernel: please mail id, board name, and, if it works, the correct digital_rate option to <alsa-devel(a)alsa-project.org> Apr 14 20:28:38 server kernel: ACPI: PCI Interrupt 0000:05:01.1[A] -> GSI 19 (level, low) -> IRQ 19 Apr 14 20:28:38 server kernel: bt87x1: Using board 0, analog, digital (rate 32000 Hz) Apr 14 20:28:38 server kernel: unknown card 0x878-0xaa02:0x1462 Apr 14 20:28:38 server kernel: please mail id, board name, and, if it works, the correct digital_rate option to <alsa-devel(a)alsa-project.org> Apr 14 20:28:38 server kernel: ACPI: PCI Interrupt 0000:05:02.1[A] -> GSI 16 (level, low) -> IRQ 16 Apr 14 20:28:38 server kernel: bt87x2: Using board 0, analog, digital (rate 3200 0 Hz) Apr 14 20:28:38 server kernel: unknown card 0x878-0xaa03:0x1463 Apr 14 20:28:38 server kernel: please mail id, board name, and, if it works, the correct digital_rate option to <alsa-devel(a)alsa-project.org> Apr 14 20:28:38 server kernel: ACPI: PCI Interrupt 0000:05:03.1[A] -> GSI 17 (level, low) -> IRQ 17 Apr 14 20:28:38 server kernel: bt87x3: Using board 0, analog, digital (rate 32000 Hz) lspci: 05:00.0 Multimedia video controller: Brooktree Corporation Bt878 Video Capture (rev 11) 05:00.1 Multimedia controller: Brooktree Corporation Bt878 Audio Capture (rev 11) 05:01.0 Multimedia video controller: Brooktree Corporation Bt878 Video Capture (rev 11) 05:01.1 Multimedia controller: Brooktree Corporation Bt878 Audio Capture (rev 11) 05:02.0 Multimedia video controller: Brooktree Corporation Bt878 Video Capture (rev 11) 05:02.1 Multimedia controller: Brooktree Corporation Bt878 Audio Capture (rev 11) 05:03.0 Multimedia video controller: Brooktree Corporation Bt878 Video Capture (rev 11) 05:03.1 Multimedia controller: Brooktree Corporation Bt878 Audio Capture (rev 11) at boot: bttv: driver version 0.9.17 loaded bttv: using 8 buffers with 2080k (520 pages) each for capture bttv: Bt8xx card found (0). ACPI: PCI Interrupt 0000:05:00.0[A] -> GSI 18 (level, low) -> IRQ 18 bttv0: Bt878 (rev 17) at 0000:05:00.0, irq: 18, latency: 64, mmio: 0xdfcfe000 bttv0: detected: Provideo PV150A-1 [card=98], PCI subsystem ID is aa00:1460 bttv0: using: ProVideo PV150 [card=98,autodetected] bttv0: gpio: en=00000000, out=00000000 in=00ffffff [init] bttv0: tuner absent bttv0: registered device video0 bttv0: registered device vbi0 bttv0: PLL: 28636363 => 35468950 .. ok bttv: Bt8xx card found (1). ACPI: PCI Interrupt 0000:05:01.0[A] -> GSI 19 (level, low) -> IRQ 19 bttv1: Bt878 (rev 17) at 0000:05:01.0, irq: 19, latency: 64, mmio: 0xdfcfc000 bttv1: detected: Provideo PV150A-2 [card=98], PCI subsystem ID is aa01:1461 bttv1: using: ProVideo PV150 [card=98,autodetected] bttv1: gpio: en=00000000, out=00000000 in=00ffffff [init] bttv1: tuner absent bttv1: registered device video1 bttv1: registered device vbi1 bttv1: PLL: 28636363 => 35468950 .. ok bttv: Bt8xx card found (2). ACPI: PCI Interrupt 0000:05:02.0[A] -> GSI 16 (level, low) -> IRQ 16 bttv2: Bt878 (rev 17) at 0000:05:02.0, irq: 16, latency: 64, mmio: 0xdfcfa000 bttv2: detected: Provideo PV150A-3 [card=98], PCI subsystem ID is aa02:1462 bttv2: using: ProVideo PV150 [card=98,autodetected] bttv2: gpio: en=00000000, out=00000000 in=00ffffff [init] bttv2: tuner absent bttv2: registered device video2 bttv2: registered device vbi2 bttv2: PLL: 28636363 => 35468950 .. ok bttv: Bt8xx card found (3). ACPI: PCI Interrupt 0000:05:03.0[A] -> GSI 17 (level, low) -> IRQ 17 bttv3: Bt878 (rev 17) at 0000:05:03.0, irq: 17, latency: 64, mmio: 0xdfcf8000 bttv3: detected: Provideo PV150A-4 [card=98], PCI subsystem ID is aa03:1463 bttv3: using: ProVideo PV150 [card=98,autodetected] bttv3: gpio: en=00000000, out=00000000 in=00ffffff [init] bttv3: tuner absent bttv3: registered device video3 bttv3: registered device vbi3 bttv3: PLL: 28636363 => 35468950 .. ok

1 0

[alsa-devel] snd_ctl_elem_write fails -EPERM if snd_pcm is open
by Bouterse, Bob 15 Apr '08

15 Apr '08

I am trying to sent IEC958 status bits on a VT1708A HAD-INTEL codec while audio is being output. snd_ctl_elem_write returns -EPERM from linux-2.6.24.3/sound/core/control.c:769 . Is there some way I can do this? FYI using iecset will also give you an: # iecset copywrite on snd_ctl_elem_write: Operation not permitted I am using alsa-lib-1.0.14a $uname -a Linux vision-vs 2.6.24.3 #1 SMP Fri Mar 28 09:35:45 EDT 2008 i686 unknown $ gcc -v Target: x86_64-linux-gnu Configured with: ../src/configure -v --enable-languages=c,c++,fortran,objc,obj-c++,treelang --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.2 --program-suffix=-4.2 --enable-clocale=gnu --enable-libstdcxx-debug --enable-mpfr --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu Thread model: posix gcc version 4.2.3 20071123 (prerelease) (Debian 4.2.2-4) If it helps, here is the code I am using to set the bits. I modeled this after the iecset.c code. Everything opens fine, it is the final call to "snd_ctl_elem_write(this->ctl_handle, cval))" that fails. static int ao_alsa_set_spdif_status(ao_driver_t *this_gen, snd_aes_iec958_t* iec958) { alsa_driver_t *this = (alsa_driver_t *) this_gen; config_values_t *config = this->class->xine->config; char *pcm_device; snd_ctl_card_info_t *hw_info; int err; snd_pcm_info_t *pcm_info; int card; char card_name[20]; snd_ctl_elem_list_t *clist; snd_ctl_elem_id_t *cid; snd_ctl_elem_value_t *cval; unsigned int controls, cidx; const char *spdif_str = SND_CTL_NAME_IEC958("", PLAYBACK, DEFAULT); int opened_audio=0; llprintf(LOG_TRACE_ENTER, "Entered\n"); if(!this->ctl_handle) { if (!this->audio_fd) { pcm_device = config->lookup_entry(config, "audio.device.alsa_passthrough_device")->str_value; llprintf(LOG_MIXER,"Calling local_snd_pcm_open(%s)\n", pcm_device); err=local_snd_pcm_open(&this->audio_fd, pcm_device, SND_PCM_STREAM_PLAYBACK, 1); /* NON-BLOCK mode */ if ( err <0 ) { xine_log (this->class->xine, XINE_LOG_MSG, _("local_snd_pcm_open() failed:%d:%s\n"), err, snd_strerror(err)); return -1; } opened_audio = 1; } snd_pcm_info_alloca(&pcm_info); snd_pcm_info(this->audio_fd, pcm_info); card = snd_pcm_info_get_card(pcm_info); llprintf(LOG_MIXER,"snd_pcm_info_get_card() returned %d\n", card); if(card < 0){ sprintf(card_name, "default"); } else{ sprintf(card_name, "hw:CARD=%i", card); } if (opened_audio && this->audio_fd) { snd_pcm_close(this->audio_fd); this->audio_fd = NULL; opened_audio = 0; } llprintf(LOG_MIXER,"Calling snd_ctl_open(%s)\n", card_name); if ( (err = snd_ctl_open (&this->ctl_handle, card_name, 0)) < 0 ) { xprintf (this->class->xine, XINE_VERBOSITY_DEBUG, "%s: snd_ctl_open(): %s\n", LOG_MODULE, snd_strerror(err)); return -1; } } snd_ctl_card_info_alloca(&hw_info); if ( (err = snd_ctl_card_info (this->ctl_handle, hw_info)) < 0 ) { xprintf (this->class->xine, XINE_VERBOSITY_DEBUG, "%s: snd_ctl_card_info(): %s\n", LOG_MODULE, snd_strerror(err)); snd_ctl_close(this->ctl_handle); this->ctl_handle = 0; return -1; } /* set the spdif status bits */ snd_ctl_elem_list_alloca(&clist); if ((err = snd_ctl_elem_list(this->ctl_handle, clist)) < 0) { xprintf (this->class->xine, XINE_VERBOSITY_DEBUG, "snd_ctl_elem_list(): %s\n", snd_strerror(err)); snd_ctl_close(this->ctl_handle); this->ctl_handle = 0; return -1; } if ((err = snd_ctl_elem_list_alloc_space(clist, snd_ctl_elem_list_get_count(clist))) < 0) { xprintf (this->class->xine, XINE_VERBOSITY_DEBUG, "snd_ctl_elem_list_alloc_space(): %s\n", snd_strerror(err)); snd_ctl_close(this->ctl_handle); return -1; } if ((err = snd_ctl_elem_list(this->ctl_handle, clist)) < 0) { xprintf (this->class->xine, XINE_VERBOSITY_DEBUG, "snd_ctl_elem_list(): %s\n", snd_strerror(err)); snd_ctl_close(this->ctl_handle); this->ctl_handle = 0; return -1; } controls = snd_ctl_elem_list_get_used(clist); for (cidx = 0; cidx < controls; cidx++) { if (!strcmp(snd_ctl_elem_list_get_name(clist, cidx), spdif_str)) break; } if (cidx >= controls) { fprintf(stderr, "control \"%s\" not found\n", spdif_str); snd_ctl_close(this->ctl_handle); this->ctl_handle = 0; return -1; } snd_ctl_elem_id_alloca(&cid); snd_ctl_elem_list_get_id(clist, cidx, cid); snd_ctl_elem_value_alloca(&cval); snd_ctl_elem_value_set_id(cval, cid); llprintf(LOG_MIXER,"Writing AES0=0x%02x,AES1=0x%02x,AES2=0x%02x,AES3=0x%02x\n", iec958->status[0], iec958->status[1], iec958->status[2], iec958->status[3]); /* store the values */ snd_ctl_elem_value_set_iec958(cval, iec958); if ((err = snd_ctl_elem_write(this->ctl_handle, cval)) < 0) { xprintf (this->class->xine, XINE_VERBOSITY_DEBUG, "snd_ctl_elem_write(): %s\n", snd_strerror(err)); snd_ctl_close(this->ctl_handle); this->ctl_handle = 0; } llprintf(LOG_MIXER,"snd_ctl_elem_write() returrned %d\n",err); /*-------------------------------------------------------*/ /*snd_ctl_close (this->ctl_handle);*/ return 0; } ---------------------------------------------------- Bob Bouterse Sr. Software Engineer D&M Holdings Inc.

2 1

[alsa-devel] [PATCH 001/003] snd-powermac: enable headphone detection
by Risto Suominen 15 Apr '08

15 Apr '08

From: Risto Suominen <Risto.Suominen at gmail.com> Enable port change interrupt while initialising AWACS, Screamer, and Burgundy chipsets. Signed-off-by: Risto Suominen <Risto.Suominen at gmail.com> --- Kernel version 2.6.25-rc8 (probably any 2.6) --- sound/ppc/pmac.c.orig 2008-04-05 17:45:08.000000000 +0300 +++ sound/ppc/pmac.c 2008-04-07 12:18:47.503077312 +0300 @@ -214,7 +214,7 @@ static int snd_pmac_pcm_prepare(struct s int rate_index; long offset; struct pmac_stream *astr; - + rec->dma_size = snd_pcm_lib_buffer_bytes(subs); rec->period_size = snd_pcm_lib_period_bytes(subs); rec->nperiods = rec->dma_size / rec->period_size; @@ -643,7 +643,7 @@ static int snd_pmac_pcm_close(struct snd /* reset constraints */ astr->cur_freqs = chip->freqs_ok; astr->cur_formats = chip->formats_ok; - + return 0; } @@ -1063,6 +1063,10 @@ static int __init snd_pmac_detect(struct else { struct pci_dev *pdev = NULL; +#ifndef for_each_pci_dev +#define for_each_pci_dev(d) \ + while ((d = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, d)) != NULL) +#endif for_each_pci_dev(pdev) { struct device_node *np = pci_device_to_OF_node(pdev); if (np && np == macio->of_node) { @@ -1300,9 +1304,9 @@ int __init snd_pmac_new(struct snd_card snd_pmac_sound_feature(chip, 1); - /* reset */ - if (chip->model == PMAC_AWACS) - out_le32(&chip->awacs->control, 0x11); + /* reset & enable interrupts */ + if (chip->model <= PMAC_BURGUNDY) + out_le32(&chip->awacs->control, chip->control_mask); /* Powerbooks have odd ways of enabling inputs such as an expansion-bay CD or sound from an internal modem

2 2

[alsa-devel] ac97_bus: exports duplicate symbol ac97_bus_type (owned by kernel)
by Vitaly V. Ch 15 Apr '08

15 Apr '08

#modprobe snd_via82xx #dmesg|tail ac97_bus: exports duplicate symbol ac97_bus_type (owned by kernel) snd_ac97_codec: disagrees about version of symbol ac97_bus_type snd_ac97_codec: Unknown symbol ac97_bus_type snd_via82xx: Unknown symbol snd_ac97_resume snd_via82xx: Unknown symbol snd_ac97_set_rate snd_via82xx: Unknown symbol snd_ac97_update_bits snd_via82xx: Unknown symbol snd_ac97_mixer snd_via82xx: Unknown symbol snd_ac97_bus snd_via82xx: Unknown symbol snd_ac97_update_power snd_via82xx: Unknown symbol snd_ac97_suspend snd_via82xx: Unknown symbol snd_ac97_get_short_name snd_via82xx: Unknown symbol snd_ac97_tune_hardware any ideas? \\wbr Vitaly

1 0

[alsa-devel] PXA AC97 updates
by Mark Brown 15 Apr '08

15 Apr '08

This patch series fixes a bug in the currently queued conversion of the PXA AC97 drivers to the clock API and adds support for AC97 on PXA3xx SoCs. Takashi, since these changes build on things currently queued in the ARM tree for 2.6.26, including ARM-specific changes, it's probably best to merge via there if that's OK?

3 10

Re: [alsa-devel] no front speaker sound with ALC262
by Rene Dohmen 15 Apr '08

15 Apr '08

Tobin, Did you receive the unit? I'm wondering if you had some progress already. Greets, Rene Op Mar 31, 2008, om 3:30 PM heeft Tobin Davis het volgende geschreven: > Yes, it would. Hmmm > > Well, I hope they send the unit today. > > Tobin > > On Mon, 2008-03-31 at 13:57 +0200, Rene Dohmen wrote: >> >> with the preinstalled win XP the sound is working OK. >> So that would rule out hardware problems with the soundcard. >> >> >> Rene >> >> >> >> >> >> >> Op Mar 28, 2008, om 7:28 PM heeft Tobin Davis het volgende >> geschreven: >> >>> I'm still waiting for my demo unit from Tangent. Latest update >>> is they think it may be a hardware issue (missing a resistor). I >>> should know more Monday. If this is the case, then the driver >>> should work with very minor modifications (subsystem ID addition). >>> >>> Tobin >>> >>> >>> On Tue, 2008-03-25 at 11:40 +0100, Rene Dohmen wrote: >>>> >>>> Op Mar 22, 2008, om 8:09 PM heeft Tobin Davis het volgende >>>> geschreven: >>>> >>>>> Rene, don't bother bugging Tangent. I have a demo unit on the >>>>> way. My first priority is getting the driver working. >>>>> >>>>> Tangent really won't help much - their a distributor, not the >>>>> OEM. This is an MSI Crystal 945 in a Tangent shell. >>>>> >>>> >>>> >>>> I know that the system is actually a Crystal 945. I got the >>>> touchscreen working via a dev driver from salt (so not tangent) >>>> On the mainboard there is a conenctor: JFP1that goes to the >>>> ms4088 board. The mainboard connects to: >>>> - power led >>>> - hdd led >>>> - speakers >>>> - main power switch >>>> >>>> >>>> I can provide you with some photoos if you like. >>>> >>>> >>>> As stated earlier: the sound is working by with very low volume >>>> levels >>>> >>>> >>>> >>>> >>>>> If you want to try something, see if the bios can be reflashed >>>>> with the Crystal 945 firmware. >>>>> >>>> >>>> >>>> I sound working with the original crystal? I don't think tangent >>>> has flshed their BIOS to another version. >>>> In the crystal 945 specs I found that the're using a Realtek >>>> ALC262 with azalia codec, maybe this helps. >>>> >>>> >>>> Rene >>>> >>>> >>>> >>>>> As to the speaker board, where on the main board is it >>>>> mounted? Is the header labeled? How many pins? It sounds >>>>> like the speakers may be on the front panel header, which would >>>>> make them function like headphones. Or this board is custom >>>>> build for this application and I don't know what I'm talking >>>>> about. >>>>> >>>>> Tobin >>>>> >>>>> >>>>> On Sat, 2008-03-22 at 18:59 +0100, Rene Dohmen wrote: >>>>>> >>>>>> Hi Guys, >>>>>> >>>>>> I'm glad t o read that there are other people with the same >>>>>> problem >>>>>> on the same system. >>>>>> I just opened my Tangent 8000S and it has indeed a MSI mainboard: >>>>>> MS7290. The speakers are connected to a small custom board: >>>>>> MS-4088 >>>>>> There's no extra chip on this customboard and the board is >>>>>> directly >>>>>> connected to the mainboard. So probably the signal leaving the >>>>>> mainboard in amplified already. (or there's a amplifier >>>>>> builtin the >>>>>> speakers) >>>>>> >>>>>> Next week i'll have some time to put tangent under some more >>>>>> pressure >>>>>> for info, so maybe that will speed up things a little bit. >>>>>> >>>>>> Grz Rene >>>>>> >>>>>> _______________________________________________ >>>>>> Alsa-devel mailing list >>>>>> Alsa-devel(a)alsa-project.org >>>>>> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel >>>>> -- Tobin Davis >>>>> >>>>> love, n.: >>>>> When you don't want someone too close--because you're very >>>>> sensitive >>>>> to pleasure. >>>> >>> -- Tobin Davis >>> >>> I can hire one half of the working class to kill the other half. >>> -- Jay Gould >> >> > -- Tobin Davis > > He is no lawyer who cannot take two sides.

2 1