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

[alsa-devel] [PATCH v3 0/5] Intel SST driver restructure
by Jie Yang 06 Apr '15

06 Apr '15

In order to prepare for the upstreaming of Skylake drivers and to allow reuse of code between different Intel audio DSP products, this patch series restructures the Intel directory as follows: 1. Create "common" directory. Move common files into this directory. 2. Create "boards" directory. Move all machine drivers into this directory. 3. Create "haswell" directory. Move all remaining hsw/bdw code into this directory. 4. Create "baytrail" directory. Move remaining baytrail driver to this directory. 5. Create "atom" directory. Move all MCG platform drivers(including sst/ folder) to this directory. Changes in v3: Fix ATT43256.config 0day build issue. Changes in v2: Add "Reviewed-by" and "Acked-by" items from each platforms' maintainer. Todo next step: 1. Change and move atom related codes(in atom/sst/) to corresponding and try share as many as possible codes(e.g. sst_acpi.c). 2. Share more common codes about IPC for different platforms, e.g. The methods for queueing and sending/reciving Tx/Rx messages, The methods for mailbox IO, The IPC error return codes, etc. Jie Yang (5): ASoC: Intel: create common folder and move common files in ASoC: Intel: create haswell folder and move haswell platform files in ASoC: Intel: create boards folder and move sst boards files in ASoC: Intel: create baytrail folder and move baytrail platform files in ASoC: Intel: create atom folder and move atom platform files in sound/soc/intel/Makefile | 42 +++------------------- sound/soc/intel/atom/Makefile | 7 ++++ sound/soc/intel/{ => atom}/sst-atom-controls.c | 0 sound/soc/intel/{ => atom}/sst-atom-controls.h | 0 sound/soc/intel/{ => atom}/sst-mfld-dsp.h | 0 .../intel/{ => atom}/sst-mfld-platform-compress.c | 0 sound/soc/intel/{ => atom}/sst-mfld-platform-pcm.c | 0 sound/soc/intel/{ => atom}/sst-mfld-platform.h | 0 sound/soc/intel/{ => atom}/sst/Makefile | 0 sound/soc/intel/{ => atom}/sst/sst.c | 2 +- sound/soc/intel/{ => atom}/sst/sst.h | 0 sound/soc/intel/{ => atom}/sst/sst_acpi.c | 2 +- sound/soc/intel/{ => atom}/sst/sst_drv_interface.c | 2 +- sound/soc/intel/{ => atom}/sst/sst_ipc.c | 2 +- sound/soc/intel/{ => atom}/sst/sst_loader.c | 2 +- sound/soc/intel/{ => atom}/sst/sst_pci.c | 0 sound/soc/intel/{ => atom}/sst/sst_pvt.c | 2 +- sound/soc/intel/{ => atom}/sst/sst_stream.c | 2 +- sound/soc/intel/baytrail/Makefile | 4 +++ sound/soc/intel/{ => baytrail}/sst-baytrail-dsp.c | 4 +-- sound/soc/intel/{ => baytrail}/sst-baytrail-ipc.c | 4 +-- sound/soc/intel/{ => baytrail}/sst-baytrail-ipc.h | 0 sound/soc/intel/{ => baytrail}/sst-baytrail-pcm.c | 4 +-- sound/soc/intel/boards/Makefile | 15 ++++++++ sound/soc/intel/{ => boards}/broadwell.c | 6 ++-- sound/soc/intel/{ => boards}/byt-max98090.c | 2 +- sound/soc/intel/{ => boards}/byt-rt5640.c | 4 +-- .../{bytcr_dpcm_rt5640.c => boards/bytcr_rt5640.c} | 4 +-- sound/soc/intel/{ => boards}/cht_bsw_rt5645.c | 4 +-- sound/soc/intel/{ => boards}/cht_bsw_rt5672.c | 4 +-- sound/soc/intel/{ => boards}/haswell.c | 6 ++-- sound/soc/intel/{ => boards}/mfld_machine.c | 0 sound/soc/intel/common/Makefile | 6 ++++ sound/soc/intel/{ => common}/sst-acpi.c | 0 sound/soc/intel/{ => common}/sst-dsp-priv.h | 0 sound/soc/intel/{ => common}/sst-dsp.c | 0 sound/soc/intel/{ => common}/sst-dsp.h | 0 sound/soc/intel/{ => common}/sst-firmware.c | 0 sound/soc/intel/haswell/Makefile | 4 +++ sound/soc/intel/{ => haswell}/sst-haswell-dsp.c | 6 ++-- sound/soc/intel/{ => haswell}/sst-haswell-ipc.c | 4 +-- sound/soc/intel/{ => haswell}/sst-haswell-ipc.h | 0 sound/soc/intel/{ => haswell}/sst-haswell-pcm.c | 6 ++-- 43 files changed, 77 insertions(+), 73 deletions(-) create mode 100644 sound/soc/intel/atom/Makefile rename sound/soc/intel/{ => atom}/sst-atom-controls.c (100%) rename sound/soc/intel/{ => atom}/sst-atom-controls.h (100%) rename sound/soc/intel/{ => atom}/sst-mfld-dsp.h (100%) rename sound/soc/intel/{ => atom}/sst-mfld-platform-compress.c (100%) rename sound/soc/intel/{ => atom}/sst-mfld-platform-pcm.c (100%) rename sound/soc/intel/{ => atom}/sst-mfld-platform.h (100%) rename sound/soc/intel/{ => atom}/sst/Makefile (100%) rename sound/soc/intel/{ => atom}/sst/sst.c (99%) rename sound/soc/intel/{ => atom}/sst/sst.h (100%) rename sound/soc/intel/{ => atom}/sst/sst_acpi.c (99%) rename sound/soc/intel/{ => atom}/sst/sst_drv_interface.c (99%) rename sound/soc/intel/{ => atom}/sst/sst_ipc.c (99%) rename sound/soc/intel/{ => atom}/sst/sst_loader.c (99%) rename sound/soc/intel/{ => atom}/sst/sst_pci.c (100%) rename sound/soc/intel/{ => atom}/sst/sst_pvt.c (99%) rename sound/soc/intel/{ => atom}/sst/sst_stream.c (99%) create mode 100644 sound/soc/intel/baytrail/Makefile rename sound/soc/intel/{ => baytrail}/sst-baytrail-dsp.c (99%) rename sound/soc/intel/{ => baytrail}/sst-baytrail-ipc.c (99%) rename sound/soc/intel/{ => baytrail}/sst-baytrail-ipc.h (100%) rename sound/soc/intel/{ => baytrail}/sst-baytrail-pcm.c (99%) create mode 100644 sound/soc/intel/boards/Makefile rename sound/soc/intel/{ => boards}/broadwell.c (98%) rename sound/soc/intel/{ => boards}/byt-max98090.c (99%) rename sound/soc/intel/{ => boards}/byt-rt5640.c (98%) rename sound/soc/intel/{bytcr_dpcm_rt5640.c => boards/bytcr_rt5640.c} (98%) rename sound/soc/intel/{ => boards}/cht_bsw_rt5645.c (99%) rename sound/soc/intel/{ => boards}/cht_bsw_rt5672.c (99%) rename sound/soc/intel/{ => boards}/haswell.c (98%) rename sound/soc/intel/{ => boards}/mfld_machine.c (100%) create mode 100644 sound/soc/intel/common/Makefile rename sound/soc/intel/{ => common}/sst-acpi.c (100%) rename sound/soc/intel/{ => common}/sst-dsp-priv.h (100%) rename sound/soc/intel/{ => common}/sst-dsp.c (100%) rename sound/soc/intel/{ => common}/sst-dsp.h (100%) rename sound/soc/intel/{ => common}/sst-firmware.c (100%) create mode 100644 sound/soc/intel/haswell/Makefile rename sound/soc/intel/{ => haswell}/sst-haswell-dsp.c (99%) rename sound/soc/intel/{ => haswell}/sst-haswell-ipc.c (99%) rename sound/soc/intel/{ => haswell}/sst-haswell-ipc.h (100%) rename sound/soc/intel/{ => haswell}/sst-haswell-pcm.c (99%) -- 1.9.1

2 6

[alsa-devel] [PATCH] ASoC: wm5102: Remove set of volume update bits for output 3R
by Charles Keepax 06 Apr '15

06 Apr '15

The earpiece on wm5102 is mono, thus there is no output 3R. Don't toggle the volume update bits for this output, although worth noting that doing so had no negative effects it is just redundant. Signed-off-by: Charles Keepax <ckeepax(a)opensource.wolfsonmicro.com> --- sound/soc/codecs/wm5102.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/sound/soc/codecs/wm5102.c b/sound/soc/codecs/wm5102.c index 6d0fe0a..0c6d1bc 100644 --- a/sound/soc/codecs/wm5102.c +++ b/sound/soc/codecs/wm5102.c @@ -1861,7 +1861,6 @@ static unsigned int wm5102_digital_vu[] = { ARIZONA_DAC_DIGITAL_VOLUME_2L, ARIZONA_DAC_DIGITAL_VOLUME_2R, ARIZONA_DAC_DIGITAL_VOLUME_3L, - ARIZONA_DAC_DIGITAL_VOLUME_3R, ARIZONA_DAC_DIGITAL_VOLUME_4L, ARIZONA_DAC_DIGITAL_VOLUME_4R, ARIZONA_DAC_DIGITAL_VOLUME_5L, -- 1.7.2.5

2 1

[alsa-devel] [PATCH/alsa-lib] amixer: fix 'cset' operation to set several channels
by Takashi Sakamoto 06 Apr '15

06 Apr '15

For an enumerated element with several channels, when given comma-separated string values, 'cset' operation sets these values just to the first channel, instead of corresponding channels. This commit adds missing-increment to fix this bug. Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- amixer/amixer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/amixer/amixer.c b/amixer/amixer.c index 36c92eb..e9fe735 100644 --- a/amixer/amixer.c +++ b/amixer/amixer.c @@ -1290,8 +1290,10 @@ static int sset_enum(snd_mixer_elem_t *elem, unsigned int argc, char **argv) if (snd_mixer_selem_set_enum_item(elem, item++, ival) >= 0) check_flag = 1; /* skip separators */ - while (*ptr == ',' || isspace(*ptr)) + while (*ptr == ',' || isspace(*ptr)) { ptr++; + chn++; + } } } return check_flag; -- 2.1.0

2 3

[alsa-devel] [PATCH] ALSA: emu10k1: add Audigy 5/Rx
by Michael Gernoth 05 Apr '15

05 Apr '15

The Audigy 5/Rx is essentially an Audigy 4 behind a PLX PCIe- bridge with an additional TOSLINK output. Signed-off-by: Michael Gernoth <michael(a)gernoth.net> --- sound/pci/emu10k1/emu10k1_main.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index b4458a6..8e510e9 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@ -1325,6 +1325,22 @@ static int snd_emu10k1_dev_free(struct snd_device *device) } static struct snd_emu_chip_details emu_chip_details[] = { + /* Audigy 5/Rx SB1550 */ + /* Tested by michael(a)gernoth.net 28 Mar 2015 */ + /* DSP: CA10300-IAT LF + * DAC: Cirrus Logic CS4382-KQZ + * ADC: Philips 1361T + * AC97: Sigmatel STAC9750 + * CA0151: None + */ + {.vendor = 0x1102, .device = 0x0008, .subsystem = 0x10241102, + .driver = "Audigy2", .name = "SB Audigy 5/Rx [SB1550]", + .id = "Audigy2", + .emu10k2_chip = 1, + .ca0108_chip = 1, + .spk71 = 1, + .adc_1361t = 1, /* 24 bit capture instead of 16bit */ + .ac97_chip = 1} , /* Audigy4 (Not PRO) SB0610 */ /* Tested by James(a)superbug.co.uk 4th April 2006 */ /* A_IOCFG bits -- 2.1.4

2 1

[alsa-devel] SoundBlaster X-fi HD SPDIF fix
by Richard Körber 05 Apr '15

05 Apr '15

Hi! I own a Creative USB SoundBlaster X-fi HD and tried to use its SPDIF optical output. However it didn't work with ALSA out of the box. The reason is that for SPDIF output device #1 must be used. The fix is: In /usr/share/alsa/cards/USB-Audio.conf, change the iec958_device block like this: USB-Audio.pcm.iec958_device { "USB Sound Blaster HD" 1 } Digital output works fine for me after that. BTW, I tried this line in /etc/asound.conf cards.USB-Audio.pcm.iec958_device."USB Sound Blaster HD" 1 but it didn't have any effect. Why was that? Thank you! Regards Richard Körber

2 8

[alsa-devel] [PATCH 0/16] fix error return code
by Julia Lawall 05 Apr '15

05 Apr '15

The complate semantic patch that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @ok exists@ identifier f,ret,i; expression e; constant c; @@ // identify a function that returns a negative return value at least once. f(...) { ... when any ( return -c@i; | ret = -c@i; ... when != ret = e return ret; | if (ret < 0) { ... return ret; } ) ... when any } @r exists@ identifier ret,ok.f,fn; expression e1,e2,e3,e4,e5,e6,x; statement S,S1; position p1,p2,p3; @@ // identify a case where the return variable is set to a non-negative value // and then returned in error-handling code f(...) { ... when any ( if@p1 (\(ret < 0\|ret != 0\)) { ... return ret; } | ret@p1 = 0 ) ... when != \(ret = e1\|ret++\|ret--\|ret+=e1\|ret-=e1\) when != &ret when any ( if (<+... ret = e5 ...+>) S1 | if (<+... &ret ...+>) S1 | if@p2(<+...x = fn(...)...+>) { ... when != ret = e6 when forall return@p3 ret; } | break; | x = fn(...) ... when != \(ret = e4\|ret++\|ret--\|ret+=e4\|ret-=e4\) when != &ret ( if (<+... ret = e3 ...+>) S | if (<+... &ret ...+>) S | if@p2(<+...\(x != 0\|x < 0\|x == NULL\|IS_ERR(x)\)...+>) { ... when != ret = e2 when forall return@p3 ret; } ) ) ... when any } @printer depends on r@ position p; identifier ok.f,pr; constant char [] c; @@ f(...) { <...pr@p(...,c,...)...> } @bad0 exists@ identifier r.ret,ok.f,g != {ERR_PTR,IS_ERR}; position p != printer.p; @@ f(...) { ... when any g@p(...,ret,...) ... when any } @bad depends on !bad0 exists@ position r.p1,r.p2; statement S1,S2; identifier r.ret; expression e1; @@ // ignore the above if there is some path where the variable is set to // something else ( if@p1 (\(ret < 0\|ret != 0\)) S1 | ret@p1 = 0 ) ... when any \(ret = e1\|ret++\|ret--\|ret+=e1\|ret-=e1\|&ret\) ... when any if@p2(...) S2 @bad1 depends on !bad0 && !bad exists@ position r.p2; statement S2; identifier r.ret; expression e1; constant c; @@ ret = -c ... when != \(ret = e1\|ret++\|ret--\|ret+=e1\|ret-=e1\) when != &ret when any if@p2(...) S2 @bad2 depends on !bad0 && !bad && !bad1 exists@ position r.p1,r.p2; identifier r.ret; expression e1; statement S2; constant c; @@ // likewise ignore it if there has been an intervening return ret@p1 = 0 ... when != if (...) { ... ret = e1 ... return ret; } when != if (...) { ... return -c; } when any if@p2(...) S2 @script:python depends on !bad0 && !bad && !bad1 && !bad2@ p1 << r.p1; p2 << r.p2; p3 << r.p3; @@ cocci.print_main("",p1) cocci.print_secs("",p2) cocci.print_secs("",p3) // </smpl>

2 2

Re: [alsa-devel] [PATCH] ALSA: hda/realtek - Support for microphone in Dell's XPS 13 9343 with ALC288.
by Takashi Iwai 05 Apr '15

05 Apr '15

At Thu, 2 Apr 2015 12:33:40 +0100, me(a)jdiez.me wrote: > > From: Jose Diez <me(a)jdiez.me> > > Original patch by Kailang Yang did not compile on 4.0-rc5. It was > referencing a member field `core` in `struct hda_codec` in order to > access the `vendor_id`. This has always been in the codec structure > itself. > > This patch fixes the build and is verified to work properly on 4.0-rc5, > running actual hardware. > > Signed-off-by: Jose Diez <me(a)jdiez.me> I prefer splitting the Dell-specific part as its own quirk, as mentioned in the review of Kailang's patch. Then it'll be applicable to both 4.1 and older kernels. thanks, Takashi > --- > sound/pci/hda/patch_realtek.c | 122 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 122 insertions(+) > > diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c > index 7438213..a8fc2c8 100644 > --- a/sound/pci/hda/patch_realtek.c > +++ b/sound/pci/hda/patch_realtek.c > @@ -3583,6 +3583,14 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec) > WRITE_COEF(0x32, 0x42a3), > {} > }; > + static struct coef_fw coef0286[] = { > + UPDATE_COEF(0x4f, 0xfcc0, 0xc400), > + UPDATE_COEF(0x50, 0x2000, 0x2000), > + UPDATE_COEF(0x56, 0x0006, 0x0006), > + UPDATE_COEF(0x66, 0x0008, 0), > + UPDATE_COEF(0x67, 0x2000, 0), > + {} > + }; > static struct coef_fw coef0292[] = { > WRITE_COEF(0x76, 0x000e), > WRITE_COEF(0x6c, 0x2400), > @@ -3613,6 +3621,10 @@ static void alc_headset_mode_unplugged(struct hda_codec *codec) > case 0x10ec0283: > alc_process_coef_fw(codec, coef0233); > break; > + case 0x10ec0286: > + case 0x10ec0288: > + alc_process_coef_fw(codec, coef0286); > + break; > case 0x10ec0292: > alc_process_coef_fw(codec, coef0292); > break; > @@ -3642,6 +3654,14 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin, > WRITE_COEF(0x26, 0x008c), > {} > }; > + static struct coef_fw coef0286[] = { > + UPDATE_COEF(0x50, 0x2000, 0), > + UPDATE_COEF(0x56, 0x0006, 0), > + UPDATE_COEF(0x4f, 0xfcc0, 0xc400), > + UPDATE_COEF(0x66, 0x0008, 0x0008), > + UPDATE_COEF(0x67, 0x2000, 0x2000), > + {} > + }; > static struct coef_fw coef0292[] = { > WRITE_COEF(0x19, 0xa208), > WRITE_COEF(0x2e, 0xacf0), > @@ -3674,6 +3694,13 @@ static void alc_headset_mode_mic_in(struct hda_codec *codec, hda_nid_t hp_pin, > alc_process_coef_fw(codec, coef0233); > snd_hda_set_pin_ctl_cache(codec, mic_pin, PIN_VREF50); > break; > + case 0x10ec0286: > + case 0x10ec0288: > + alc_update_coef_idx(codec, 0x4f, 0x000c, 0); > + snd_hda_set_pin_ctl_cache(codec, hp_pin, 0); > + alc_process_coef_fw(codec, coef0286); > + snd_hda_set_pin_ctl_cache(codec, mic_pin, PIN_VREF50); > + break; > case 0x10ec0292: > snd_hda_set_pin_ctl_cache(codec, hp_pin, 0); > alc_process_coef_fw(codec, coef0292); > @@ -3709,6 +3736,14 @@ static void alc_headset_mode_default(struct hda_codec *codec) > WRITE_COEF(0x32, 0x4ea3), > {} > }; > + static struct coef_fw coef0286[] = { > + UPDATE_COEF(0x4f, 0xfcc0, 0xc400), /* Set to TRS type */ > + UPDATE_COEF(0x50, 0x2000, 0x2000), > + UPDATE_COEF(0x56, 0x0006, 0x0006), > + UPDATE_COEF(0x66, 0x0008, 0), > + UPDATE_COEF(0x67, 0x2000, 0), > + {} > + }; > static struct coef_fw coef0292[] = { > WRITE_COEF(0x76, 0x000e), > WRITE_COEF(0x6c, 0x2400), > @@ -3737,6 +3772,11 @@ static void alc_headset_mode_default(struct hda_codec *codec) > case 0x10ec0283: > alc_process_coef_fw(codec, coef0233); > break; > + case 0x10ec0286: > + case 0x10ec0288: > + alc_process_coef_fw(codec, coef0286); > + break; > + break; > case 0x10ec0292: > alc_process_coef_fw(codec, coef0292); > break; > @@ -3765,6 +3805,13 @@ static void alc_headset_mode_ctia(struct hda_codec *codec) > WRITE_COEF(0x32, 0x4ea3), > {} > }; > + static struct coef_fw coef0286[] = { > + UPDATE_COEF(0x50, 0x2000, 0x2000), > + UPDATE_COEF(0x56, 0x0006, 0x0006), > + UPDATE_COEF(0x66, 0x0008, 0), > + UPDATE_COEF(0x67, 0x2000, 0), > + {} > + }; > static struct coef_fw coef0292[] = { > WRITE_COEF(0x6b, 0xd429), > WRITE_COEF(0x76, 0x0008), > @@ -3791,6 +3838,12 @@ static void alc_headset_mode_ctia(struct hda_codec *codec) > case 0x10ec0283: > alc_process_coef_fw(codec, coef0233); > break; > + case 0x10ec0286: > + case 0x10ec0288: > + alc_update_coef_idx(codec, 0x4f, 0xfcc0, 0xd400); > + msleep(300); > + alc_process_coef_fw(codec, coef0286); > + break; > case 0x10ec0292: > alc_process_coef_fw(codec, coef0292); > break; > @@ -3819,6 +3872,13 @@ static void alc_headset_mode_omtp(struct hda_codec *codec) > WRITE_COEF(0x32, 0x4ea3), > {} > }; > + static struct coef_fw coef0286[] = { > + UPDATE_COEF(0x50, 0x2000, 0x2000), > + UPDATE_COEF(0x56, 0x0006, 0x0006), > + UPDATE_COEF(0x66, 0x0008, 0), > + UPDATE_COEF(0x67, 0x2000, 0), > + {} > + }; > static struct coef_fw coef0292[] = { > WRITE_COEF(0x6b, 0xe429), > WRITE_COEF(0x76, 0x0008), > @@ -3845,6 +3905,12 @@ static void alc_headset_mode_omtp(struct hda_codec *codec) > case 0x10ec0283: > alc_process_coef_fw(codec, coef0233); > break; > + case 0x10ec0286: > + case 0x10ec0288: > + alc_update_coef_idx(codec, 0x4f, 0xfcc0, 0xe400); > + msleep(300); > + alc_process_coef_fw(codec, coef0286); > + break; > case 0x10ec0292: > alc_process_coef_fw(codec, coef0292); > break; > @@ -3869,6 +3935,11 @@ static void alc_determine_headset_type(struct hda_codec *codec) > conteol) */ > {} > }; > + static struct coef_fw coef0286[] = { > + //UPDATE_COEF(0x4f, 0xfcc0, 0x5400), /* Combo Jack auto detect */ > + UPDATE_COEF(0x4f, 0xfcc0, 0xd400), > + {} > + }; > static struct coef_fw coef0293[] = { > UPDATE_COEF(0x4a, 0x000f, 0x0008), /* Combo Jack auto detect */ > WRITE_COEF(0x45, 0xD429), /* Set to ctia type */ > @@ -3896,6 +3967,13 @@ static void alc_determine_headset_type(struct hda_codec *codec) > val = alc_read_coef_idx(codec, 0x46); > is_ctia = (val & 0x0070) == 0x0070; > break; > + case 0x10ec0286: > + case 0x10ec0288: > + alc_process_coef_fw(codec, coef0286); > + msleep(350); > + val = alc_read_coef_idx(codec, 0x50); > + is_ctia = (val & 0x0070) == 0x0070; > + break; > case 0x10ec0292: > alc_write_coef_idx(codec, 0x6b, 0xd429); > msleep(300); > @@ -3990,8 +4068,15 @@ static void alc_update_headset_jack_cb(struct hda_codec *codec, > struct hda_jack_callback *jack) > { > struct alc_spec *spec = codec->spec; > + int present; > spec->current_headset_type = ALC_HEADSET_TYPE_UNKNOWN; > snd_hda_gen_hp_automute(codec, jack); > + present = spec->gen.hp_jack_present ? 0x40 : 0; > + if (codec->bus->pci->subsystem_vendor == 0x1028 && > + codec->vendor_id == 0x10ec0288) > + /* Headset Mic enable and disable, ony for Dell Dino */ > + snd_hda_codec_write(codec, 0x01, 0, AC_VERB_SET_GPIO_DATA, > + present); > } > > static void alc_probe_headset_mode(struct hda_codec *codec) > @@ -4418,6 +4503,8 @@ enum { > ALC286_FIXUP_HP_GPIO_LED, > ALC280_FIXUP_HP_GPIO2_MIC_HOTKEY, > ALC280_FIXUP_HP_DOCK_PINS, > + ALC286_FIXUP_DELL1_MIC_NO_PRESENCE, > + ALC286_FIXUP_DELL_XPS_13_GPIO6, > }; > > static const struct hda_fixup alc269_fixups[] = { > @@ -4906,6 +4993,27 @@ static const struct hda_fixup alc269_fixups[] = { > .chained = true, > .chain_id = ALC280_FIXUP_HP_GPIO4 > }, > + [ALC286_FIXUP_DELL1_MIC_NO_PRESENCE] = { > + .type = HDA_FIXUP_PINS, > + .v.pins = (const struct hda_pintbl[]) { > + { 0x18, 0x01a1913c }, /* use as headset mic, without its own jack detect */ > + { 0x1a, 0x01a1913d }, /* use as headphone mic, without its own jack detect */ > + { } > + }, > + .chained = true, > + .chain_id = ALC269_FIXUP_HEADSET_MODE > + }, > + [ALC286_FIXUP_DELL_XPS_13_GPIO6] = { > + .type = HDA_FIXUP_VERBS, > + .v.verbs = (const struct hda_verb[]) { > + {0x01, AC_VERB_SET_GPIO_MASK, 0x40}, > + {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x40}, > + {0x01, AC_VERB_SET_GPIO_DATA, 0x00}, > + { } > + }, > + .chained = true, > + .chain_id = ALC286_FIXUP_DELL1_MIC_NO_PRESENCE > + }, > }; > > static const struct snd_pci_quirk alc269_fixup_tbl[] = { > @@ -5132,6 +5240,13 @@ static const struct hda_model_fixup alc269_fixup_models[] = { > {0x1b, 0x411111f0}, \ > {0x1e, 0x411111f0} > > +#define ALC286_STANDARD_PINS \ > + {0x17, 0x411111f0}, \ > + {0x18, 0x411111f0}, \ > + {0x19, 0x411111f0}, \ > + {0x1a, 0x411111f0}, \ > + {0x1e, 0x411111f0} > + > #define ALC290_STANDARD_PINS \ > {0x12, 0x99a30130}, \ > {0x13, 0x40000000}, \ > @@ -5317,6 +5432,13 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { > {0x19, 0x03a11020}, > {0x1d, 0x40e00001}, > {0x21, 0x0321101f}), > + SND_HDA_PIN_QUIRK(0x10ec0288, 0x1028, "Dell", ALC286_FIXUP_DELL_XPS_13_GPIO6, > + ALC286_STANDARD_PINS, > + {0x12, 0x90a60120}, > + {0x13, 0x40000000}, > + {0x14, 0x90170110}, > + {0x1d, 0x4076832d}, > + {0x21, 0x0321101f}), > SND_HDA_PIN_QUIRK(0x10ec0290, 0x103c, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC1, > ALC290_STANDARD_PINS, > {0x14, 0x411111f0}, > -- > 2.3.5 >

1 0

[alsa-devel] [PATCH 0/10] fix error return code
by Julia Lawall 05 Apr '15

05 Apr '15

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>

2 20

[alsa-devel] [PATCH] sound: Use const struct ac97_quirk
by Joe Perches 05 Apr '15

05 Apr '15

Use const to reduce data by ~3Kb. Signed-off-by: Joe Perches <joe(a)perches.com> --- include/sound/ac97_codec.h | 4 +++- sound/pci/ac97/ac97_codec.c | 3 ++- sound/pci/ad1889.c | 2 +- sound/pci/atiixp.c | 2 +- sound/pci/cs5535audio/cs5535audio.c | 2 +- sound/pci/intel8x0.c | 2 +- sound/pci/via82xx.c | 2 +- 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h index d315a08..0e9d75b 100644 --- a/include/sound/ac97_codec.h +++ b/include/sound/ac97_codec.h @@ -608,7 +608,9 @@ struct ac97_quirk { int type; /* quirk type above */ }; -int snd_ac97_tune_hardware(struct snd_ac97 *ac97, struct ac97_quirk *quirk, const char *override); +int snd_ac97_tune_hardware(struct snd_ac97 *ac97, + const struct ac97_quirk *quirk, + const char *override); int snd_ac97_set_rate(struct snd_ac97 *ac97, int reg, unsigned int rate); /* diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index 5bca1a3..82259ca 100644 --- a/sound/pci/ac97/ac97_codec.c +++ b/sound/pci/ac97/ac97_codec.c @@ -2902,7 +2902,8 @@ static int apply_quirk_str(struct snd_ac97 *ac97, const char *typestr) * Return: Zero if successful, or a negative error code on failure. */ -int snd_ac97_tune_hardware(struct snd_ac97 *ac97, struct ac97_quirk *quirk, const char *override) +int snd_ac97_tune_hardware(struct snd_ac97 *ac97, + const struct ac97_quirk *quirk, const char *override) { int result; diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c index 850a8c9..66ddd98 100644 --- a/sound/pci/ad1889.c +++ b/sound/pci/ad1889.c @@ -747,7 +747,7 @@ snd_ad1889_proc_init(struct snd_ad1889 *chip) snd_info_set_text_ops(entry, chip, snd_ad1889_proc_read); } -static struct ac97_quirk ac97_quirks[] = { +static const struct ac97_quirk ac97_quirks[] = { { .subvendor = 0x11d4, /* AD */ .subdevice = 0x1889, /* AD1889 */ diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c index d5f15c9..42a20c8 100644 --- a/sound/pci/atiixp.c +++ b/sound/pci/atiixp.c @@ -1390,7 +1390,7 @@ static irqreturn_t snd_atiixp_interrupt(int irq, void *dev_id) * ac97 mixer section */ -static struct ac97_quirk ac97_quirks[] = { +static const struct ac97_quirk ac97_quirks[] = { { .subvendor = 0x103c, .subdevice = 0x006b, diff --git a/sound/pci/cs5535audio/cs5535audio.c b/sound/pci/cs5535audio/cs5535audio.c index 802c33f..963b912 100644 --- a/sound/pci/cs5535audio/cs5535audio.c +++ b/sound/pci/cs5535audio/cs5535audio.c @@ -43,7 +43,7 @@ static char *ac97_quirk; module_param(ac97_quirk, charp, 0444); MODULE_PARM_DESC(ac97_quirk, "AC'97 board specific workarounds."); -static struct ac97_quirk ac97_quirks[] = { +static const struct ac97_quirk ac97_quirks[] = { #if 0 /* Not yet confirmed if all 5536 boards are HP only */ { .subvendor = PCI_VENDOR_ID_AMD, diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index 2c5484e..749069a 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c @@ -1795,7 +1795,7 @@ static struct ac97_pcm ac97_pcm_defs[] = { }, }; -static struct ac97_quirk ac97_quirks[] = { +static const struct ac97_quirk ac97_quirks[] = { { .subvendor = 0x0e11, .subdevice = 0x000e, diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c index 8622283..3dd038b 100644 --- a/sound/pci/via82xx.c +++ b/sound/pci/via82xx.c @@ -1812,7 +1812,7 @@ static void snd_via82xx_mixer_free_ac97(struct snd_ac97 *ac97) chip->ac97 = NULL; } -static struct ac97_quirk ac97_quirks[] = { +static const struct ac97_quirk ac97_quirks[] = { { .subvendor = 0x1106, .subdevice = 0x4161,

2 1

[alsa-devel] linux-next - strange audio bug
by Valdis Kletnieks 04 Apr '15

04 Apr '15

Next-20150310 works OK, next-20150324 has the bug. Dell Latitude E6530 laptop, lspci tells me: 01:00.1 Audio device: NVIDIA Corporation GF108 High Definition Audio Controller (rev a1) Subsystem: Dell Device 0535 ... Kernel driver in use: snd_hda_intel Symptoms: Audio works perfectly at boot, and for some amount of time after. But somewhere around 6-8 hours of uptime, it gets into a strange state where I'll get no audio... and then it will cut in for all of 2 seconds or so (fairly consistent, that part), and then cut back out for anywhere from 10 seconds to a minute, then another 2 seconds of sound.. lather rinse repeat. Before I start the thankless task of bisecting this (which means I'll be able to do only 1, *maybe* 2 steps a day), does this ring any bells?

4 3