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

[alsa-devel] [PATCH] ASoC: Intel: kbl_da7219_max98927: fix the audio jack button remapping
by Zhuohao Lee 10 Dec '18

10 Dec '18

>From the da7219 spec, the button A, B, C and D are remapped to 0, 1, 2 and 3 respectively where button A is KEY_PLAYPAUSE, B is KEY_VOLUMEUP, C is KEY_VOLUMEDOWN and D is KEY_VOICECOMMAND. Signed-off-by: Zhuohao Lee <zhuohao(a)chromium.org> Signed-off-by: Max Chang <changmax(a)chromium.org> --- sound/soc/intel/boards/kbl_da7219_max98927.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/intel/boards/kbl_da7219_max98927.c b/sound/soc/intel/boards/kbl_da7219_max98927.c index 3fa1c3ca6d37..d3531f0eb357 100644 --- a/sound/soc/intel/boards/kbl_da7219_max98927.c +++ b/sound/soc/intel/boards/kbl_da7219_max98927.c @@ -262,9 +262,9 @@ static int kabylake_da7219_codec_init(struct snd_soc_pcm_runtime *rtd) jack = &ctx->kabylake_headset; snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE); - snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND); - snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); - snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN); + snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOLUMEUP); + snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEDOWN); + snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOICECOMMAND); da7219_aad_jack_det(component, &ctx->kabylake_headset); -- 2.20.0.rc2.403.gdbc3b29805-goog

2 1

[alsa-devel] [PATCH - snd_pcm_extplug_set_param_link() 1/1] pcm: extplug: Keep format and channels the same if requested
by twischer＠de.adit-jv.com 10 Dec '18

10 Dec '18

From: Timo Wischer <twischer(a)de.adit-jv.com> Without this patch it is not possible to link the channel and format parameter if snd_pcm_extplug_set_param_*() or snd_pcm_extplug_set_slave_param_*() is called. Therefore the client and slave parameter can differ. So the extplug has to implement conversion. To avoid this the new snd_pcm_extplug_set_param_link() function can be called. As a reproduction sceanrio the following extplug source code can be used: static snd_pcm_sframes_t my_transfer(snd_pcm_extplug_t *e, const snd_pcm_channel_area_t *da, snd_pcm_uframes_t dof, const snd_pcm_channel_area_t *sa, snd_pcm_uframes_t sof, snd_pcm_uframes_t s) { return s; } static const snd_pcm_extplug_callback_t my_own_callback = { .transfer = my_transfer }; SND_PCM_PLUGIN_DEFINE_FUNC(my_plug) { snd_config_iterator_t i, next; snd_config_t *slave = NULL; snd_pcm_extplug_t *myplug; snd_config_for_each(i, next, conf) { snd_config_t *n = snd_config_iterator_entry(i); const char *id; if (snd_config_get_id(n, &id) < 0) continue; if (strcmp(id, "comment") == 0 || strcmp(id, "type") == 0) continue; if (strcmp(id, "slave") == 0) { slave = n; continue; } return -EINVAL; } myplug = calloc(1, sizeof(*myplug)); myplug->version = SND_PCM_EXTPLUG_VERSION; myplug->callback = &my_own_callback; snd_pcm_extplug_create(myplug, name, root, slave, stream, mode); snd_pcm_extplug_set_param_minmax(myplug, SND_PCM_EXTPLUG_HW_CHANNELS, 1, 16); // snd_pcm_extplug_set_param_link(myplug, SND_PCM_EXTPLUG_HW_CHANNELS, 1); *pcmp = myplug->pcm; return 0; } SND_PCM_PLUGIN_SYMBOL(my_plug); To use this plugin the following ALSA configuration is required: pcm.myplug { type my_plug slave.pcm hw:Dummy } With this configuration without this patch snd_pcm_hw_params_get_channels_max() will always return 16 channels independent of the supported channels of the dummy device. Due to that for example the start up of JACK would fail: $ modprobe snd_dummy $ jackd -d alsa -P myplug ALSA: cannot set channel count to 16 for playback ALSA: cannot configure playback channel Signed-off-by: Timo Wischer <twischer(a)de.adit-jv.com> diff --git a/include/pcm_extplug.h b/include/pcm_extplug.h index ced934f..e5c02d4 100644 --- a/include/pcm_extplug.h +++ b/include/pcm_extplug.h @@ -184,6 +184,8 @@ int snd_pcm_extplug_set_param_list(snd_pcm_extplug_t *extplug, int type, unsigne int snd_pcm_extplug_set_param_minmax(snd_pcm_extplug_t *extplug, int type, unsigned int min, unsigned int max); int snd_pcm_extplug_set_slave_param_list(snd_pcm_extplug_t *extplug, int type, unsigned int num_list, const unsigned int *list); int snd_pcm_extplug_set_slave_param_minmax(snd_pcm_extplug_t *extplug, int type, unsigned int min, unsigned int max); +int snd_pcm_extplug_set_param_link(snd_pcm_extplug_t *extplug, int type, + int keep_link); /** * set the parameter constraint with a single value diff --git a/src/pcm/pcm_ext_parm.h b/src/pcm/pcm_ext_parm.h index d25f2ab..7b99bef 100644 --- a/src/pcm/pcm_ext_parm.h +++ b/src/pcm/pcm_ext_parm.h @@ -5,6 +5,7 @@ struct snd_ext_parm { unsigned int *list; unsigned int active: 1; unsigned int integer: 1; + unsigned int keep_link: 1; }; static inline snd_mask_t *hw_param_mask(snd_pcm_hw_params_t *params, diff --git a/src/pcm/pcm_extplug.c b/src/pcm/pcm_extplug.c index 1f887c5..94002dc 100644 --- a/src/pcm/pcm_extplug.c +++ b/src/pcm/pcm_extplug.c @@ -249,7 +249,7 @@ static unsigned int get_links(struct snd_ext_parm *params) SND_PCM_HW_PARBIT_TICK_TIME); for (i = 0; i < SND_PCM_EXTPLUG_HW_PARAMS; i++) { - if (params[i].active) + if (params[i].active && !params[i].keep_link) links &= ~excl_parbits[i]; } return links; @@ -642,6 +642,17 @@ as former functions. To clear the parameter constraints, call #snd_pcm_extplug_params_reset() function. +When using snd_pcm_extplug_set_param_*() or snd_pcm_extplug_set_slave_param_*() +for any parameter. This parameter is no longer linked between the client and +slave PCM. Therefore it could differ and the extplug has to support conversion +between all valid parameter configurations. To keep the client and slave +parameter linked #snd_pcm_extplug_set_param_link() can be used for the +corresponding parameter. For example if the extplug does not support channel nor +format conversion the supported client parameters can be limited with +snd_pcm_extplug_set_param_*() and afterwards +#snd_pcm_extplug_set_param_link(ext, SND_PCM_EXTPLUG_HW_FORMAT, 1) and +#snd_pcm_extplug_set_param_link(ext, SND_PCM_EXTPLUG_HW_CHANNELS, 1) should be +called to keep the client and slave parameters the same. */ /** @@ -849,3 +860,26 @@ int snd_pcm_extplug_set_param_minmax(snd_pcm_extplug_t *extplug, int type, unsig return snd_ext_parm_set_minmax(&ext->params[type], min, max); } +/** + * @brief Keep the client and slave format/channels the same if requested. This + * is for example useful if this extplug does not support any channel + * conversion. + * @param extplug the extplug handle + * @param type parameter type + * @param keep_link if 1 the parameter identified by type will be kept the same + * for the client and slave PCM of this extplug + * @return 0 if successful, or a negative error code + */ +int snd_pcm_extplug_set_param_link(snd_pcm_extplug_t *extplug, int type, + int keep_link) +{ + extplug_priv_t *ext = extplug->pcm->private_data; + + if (type < 0 || type >= SND_PCM_EXTPLUG_HW_PARAMS) { + SNDERR("EXTPLUG: invalid parameter type %d", type); + return -EINVAL; + } + ext->params[type].keep_link = keep_link ? 1 : 0; + ext->sparams[type].keep_link = keep_link ? 1 : 0; + return 0; +} -- 2.7.4

2 1

Re: [alsa-devel] [PATCH 1/3] ALSA: hda/realtek: ALC294 mic and headset-mode fixups for ASUS X542UN
by Jian-Hong Pan 10 Dec '18

10 Dec '18

> Kailang <kailang(a)realtek.com> 於 2018年12月5日週三下午4:36寫道： > > > > Hi Jian-Hong, > > > > Could you test to change the model to ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC? > > > > .chain_id = ALC256_FIXUP_ASUS_HEADSET_MODE ==> change to ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC We do not have ASUS X542UN in hand right now, but we have ASUS X542UQ which goes with the same quirk as X542UN. I tested with ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC, and it also works. So, I am going to send new patch set using ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC for ALC294. Thanks, Jian-Hong Pan

3 13

[alsa-devel] Patch for ALC294 Realtek soundcard in ASUS Zenbook UX433F?
by Anthony Ettinger 10 Dec '18

10 Dec '18

I saw something come across the mailing list earlier today, that supposedly fixes the no sound issues with this asus zenbook. Does anyone know when it will make it to the kernel master? I tried 4.20-rc6 but sound still doesn't work. -- Anthony Ettingers http://linkedin.com/in/chovy

1 0

[alsa-devel] [RFC PATCH v8 0/4] Media Device Allocator API
by shuah＠kernel.org 09 Dec '18

09 Dec '18

From: Shuah Khan <shuah(a)kernel.org> This patch series has been on the ice for the last couple of years. Mauro asked me to restart the discussion on this and see if we can make progress. I rebased the series to Linux 4.19. It has been surprisingly well preserved with one small merge conflict resolved in 0004. Media Device Allocator API to allows multiple drivers share a media device. Using this API, drivers can allocate a media device with the shared struct device as the key. Once the media device is allocated by a driver, other drivers can get a reference to it. The media device is released when all the references are released. - No changes to 0001,0002 code since the v7 referenced below. - 0003 is a new patch to enable ALSA defines that have been disabled for kernel between 4.9 and 4.19. - Minor merge conflict resolution in 0004. - Added SPDX to new files. References: https://www.mail-archive.com/linux-media@vger.kernel.org/msg105854.html Please review. I am sending this as RFC even though it has been tested several times prior to this non-event rebased v8. I ran sanity tests. Shuah Khan (4): media: Media Device Allocator API media: change au0828 to use Media Device Allocator API media: media.h: Enable ALSA MEDIA_INTF_T* interface types sound/usb: Use Media Controller API to share media resources Documentation/media/kapi/mc-core.rst | 37 +++ drivers/media/Makefile | 3 +- drivers/media/media-dev-allocator.c | 132 ++++++++++ drivers/media/usb/au0828/au0828-core.c | 12 +- drivers/media/usb/au0828/au0828.h | 1 + include/media/media-dev-allocator.h | 53 ++++ include/uapi/linux/media.h | 25 +- sound/usb/Kconfig | 4 + sound/usb/Makefile | 2 + sound/usb/card.c | 14 ++ sound/usb/card.h | 3 + sound/usb/media.c | 320 +++++++++++++++++++++++++ sound/usb/media.h | 73 ++++++ sound/usb/mixer.h | 3 + sound/usb/pcm.c | 29 ++- sound/usb/quirks-table.h | 1 + sound/usb/stream.c | 2 + sound/usb/usbaudio.h | 6 + 18 files changed, 692 insertions(+), 28 deletions(-) create mode 100644 drivers/media/media-dev-allocator.c create mode 100644 include/media/media-dev-allocator.h create mode 100644 sound/usb/media.c create mode 100644 sound/usb/media.h -- 2.17.0

5 15

[alsa-devel] [PATCH] ALSA: fireface: fix reference to wrong register for clock configuration
by Takashi Sakamoto 09 Dec '18

09 Dec '18

In an initial commit, 'SYNC_STATUS' register is referred to get clock configuration, however this is wrong, according to my local note at hand for reverse-engineering about packet dump. It should be 'CLOCK_CONFIG' register. Actually, ff400_dump_clock_config() is correctly programmed. This commit fixes the bug. Cc: <stable(a)vger.kernel.org> # v4.12+ Fixes: 76fdb3a9e13a ('ALSA: fireface: add support for Fireface 400') Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/firewire/fireface/ff-protocol-ff400.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/firewire/fireface/ff-protocol-ff400.c b/sound/firewire/fireface/ff-protocol-ff400.c index 64c3cb0fb926..654a50319198 100644 --- a/sound/firewire/fireface/ff-protocol-ff400.c +++ b/sound/firewire/fireface/ff-protocol-ff400.c @@ -30,7 +30,7 @@ static int ff400_get_clock(struct snd_ff *ff, unsigned int *rate, int err; err = snd_fw_transaction(ff->unit, TCODE_READ_QUADLET_REQUEST, - FF400_SYNC_STATUS, &reg, sizeof(reg), 0); + FF400_CLOCK_CONFIG, &reg, sizeof(reg), 0); if (err < 0) return err; data = le32_to_cpu(reg); -- 2.19.1

2 1

[alsa-devel] [PATCH] ALSA: hda/realtek - Fix the mute LED regresion on Lenovo X1 Carbon
by Hui Wang 09 Dec '18

09 Dec '18

Users reported a mute LED regression on Lenovo X1 Carbon, the root cause is we applied the fixup of ALC285_FIXUP_LENOVO_HEADPHONE_NOISE to this machine, then the machine can't apply the fixup of ALC269_FIXUP_THINKPAD_ACPI anymore. To fix it, we chain two fixup together. Fixes: c4cfcf6f4297 ("ALSA: hda/realtek - fix the pop noise on headphone for lenovo laptops") Cc: <stable(a)vger.kernel.org> Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 56882d9b1e43..5b13d9e8d6c7 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6450,6 +6450,8 @@ static const struct hda_fixup alc269_fixups[] = { [ALC285_FIXUP_LENOVO_HEADPHONE_NOISE] = { .type = HDA_FIXUP_FUNC, .v.func = alc285_fixup_invalidate_dacs, + .chained = true, + .chain_id = ALC269_FIXUP_THINKPAD_ACPI }, [ALC295_FIXUP_HP_AUTO_MUTE] = { .type = HDA_FIXUP_FUNC, -- 2.17.1

2 1

[alsa-devel] [PATCH 0/6] Introduce audio-mute LED trigger (and conversions to it)
by Takashi Iwai 08 Dec '18

08 Dec '18

Hi, this is patch series I've hacked after useful conversation with Pavel. Basically this adds a new LED trigger audio-mute and audio-micmute, and convert the HD-audio driver and the platform drivers to use the LED trigger instead of the ugly direct dynamic symbol binding. The latest version of patches are found in topic/leds-trigger branch in my sound git tree. git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git As these are cross-tree patches, the branch above is based cleanly on v4.20-rc3, so that it can be merged well to multiple trees. Once after getting the ACK's, I'll add tags and fixate for merges. This patch series don't include huawei-wmi stuff; so Huawei patches need rework. I already have some piece of changes for huawei-wmi, so please ping me if needed. I checked briefly on my Dell laptop, and a Thinkpad model. Wider tests are appreciated, of course. thanks, Takashi === Takashi Iwai (6): leds: trigger: Introduce audio mute LED trigger platform/x86: dell-laptop: Add micmute LED trigger support platform/x86: thinkpad_acpi: Add audio mute LED classdev support ALSA: hda - Support led audio trigger platform/x86: dell-laptop: Drop superfluous exported function platform/x86: thinkpad_acpi: Drop superfluous exported function drivers/leds/trigger/Kconfig | 7 +++ drivers/leds/trigger/Makefile | 1 + drivers/leds/trigger/ledtrig-audio.c | 45 +++++++++++++++++++ drivers/platform/x86/Kconfig | 4 ++ drivers/platform/x86/dell-laptop.c | 27 +++++++++--- drivers/platform/x86/thinkpad_acpi.c | 66 +++++++++++++++++++++------- include/linux/dell-led.h | 7 --- include/linux/leds.h | 20 +++++++++ include/linux/thinkpad_acpi.h | 16 ------- sound/pci/hda/dell_wmi_helper.c | 48 -------------------- sound/pci/hda/hda_generic.c | 31 +++++++++++++ sound/pci/hda/hda_generic.h | 2 + sound/pci/hda/patch_realtek.c | 17 +++---- sound/pci/hda/thinkpad_helper.c | 43 +++--------------- 14 files changed, 194 insertions(+), 140 deletions(-) create mode 100644 drivers/leds/trigger/ledtrig-audio.c delete mode 100644 include/linux/dell-led.h delete mode 100644 include/linux/thinkpad_acpi.h delete mode 100644 sound/pci/hda/dell_wmi_helper.c -- 2.19.1

7 36

Re: [alsa-devel] [PATCH v9 2/3] x86: add support for Huawei WMI hotkeys.
by ayman.bagabas＠gmail.com 08 Dec '18

08 Dec '18

On Fri, 2018-12-07 at 00:52 -0500, ayman.bagabas(a)gmail.com wrote: On Mon, 2018-12-03 at 21:17 +0200, Andy Shevchenko wrote: > On Mon, Dec 3, 2018 at 9:04 PM Takashi Iwai <tiwai(a)suse.de> wrote: > > On Mon, 03 Dec 2018 19:53:39 +0100, > > Ayman Bagabas wrote: > > > + if (code == 0x80) { > > > + acpi_status status; > > > + acpi_handle handle; > > > + unsigned long long result; > > > + union acpi_object args[1]; > > > + struct acpi_object_list arg_list = { > > > + .pointer = args, > > > + .count = ARRAY_SIZE(args), > > > + }; > > > + > > > + args[0].type = ACPI_TYPE_INTEGER; > > > + args[0].integer.value = 0; > > > + > > > + status = acpi_get_handle(NULL, "\\WMI0", &handle); > > > + if (ACPI_FAILURE(status)) { > > > + dev_err(&wdev->dev, "Unable to get ACPI > > > handle\n"); > > > + return; > > > + } > > > + > > > + status = acpi_evaluate_integer(NULL, "WQ00", > > > &arg_list, &result); > > > > I guess you need to pass handle here? In the earlier version, you > > passed \\WMI0.WQ00, so it worked with NULL handle. But now it's no > > longer so... > > I think in this case we don't need to have a separate call to get > handle and try to get integer directly. In either we will have an > error case if method / namespace / etc is not found. > > I was digging further into the DSDT table of the laptop that has WQ00 method and it turned out that this method is a ACPI_WMI_EXPENSIVE. It has its own GUID of "39142400-C6A3-40fa-BADB-8A2652834100". I believe wmi_query_block, which is deprecated BTW, can be used to access this method instead of acpi_evaluate. However, I don't have a machine to test it on. Any ideas?

1 0

[alsa-devel] [PATCH - extplug without conversion 0/1] pcm: extplug: Use same format for slave
by twischer＠de.adit-jv.com 07 Dec '18

07 Dec '18

Hi Takashi, I have the following new idea for [PATCH - extplug refinement from hw_params 1/1] pcm: extplug: Update slave PCM if extplug slave params were changed May be you could give a short feedback. I will try to provide a reproduction scenario. Do you have an idea how to handle this additional function parameter without breaking the API. Best regards Timo

2 2