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

[alsa-devel] [PATCH v2] ASoC: hdac_hdmi: Enable MST audio
by jeeja.kp＠intel.com 17 Feb '17

17 Feb '17

From: Jeeja KP <jeeja.kp(a)intel.com> With the patch series "ASoC: hdmi: Preparatory work to support MST audio", the design is extended from pin to port mapping to handle MST usecases. A pin is MST capable if pipe is valid value (i.e. not -1) in the notify callback. If pipe = -1, default port is 0 else port = pipe. A MST capable pin widget is programmed by first sending a verb to select the device/port and then the actual verb is sent to program the widget. This patch series enables MST Audio by configuring MST capable pins and extended the jack handling to report event for ports. Now the jack events are based on port connect/disconnect. The design is also extended to support mapping of multiple port to a single converter. Now with the introduction of multiple ports with a single pin, a pin widget is created to enable/disable path based on device connection. Required machine driver changes are done to handle this change. Also use the ASoC jack instead of snd_jack framework to creates jacks in the machine driver. Note: This patch series has dependency on the series "ASoC: hdmi: Preparatory work to support MST audio" Change v2: - Fixed the SOB missing in the patch. - Removed already applied patches. Jeeja KP (1): ASoC: Intel: bxt: Add jack port initialize in bxt_rt298 machine sound/soc/intel/boards/bxt_rt298.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.5.0

2 2

[alsa-devel] [PATCH 00/16] ASoC: hdac_hdmi: Enable MST audio
by jeeja.kp＠intel.com 17 Feb '17

17 Feb '17

From: Jeeja KP <jeeja.kp(a)intel.com> With the patch series "ASoC: hdmi: Preparatory work to support MST audio", the design is extended from pin to port mapping to handle MST usecases. A pin is MST capable if pipe is valid value (i.e. not -1) in the notify callback. If pipe = -1, default port is 0 else port = pipe. A MST capable pin widget is programmed by first sending a verb to select the device/port and then the actual verb is sent to program the widget. This patch series enables MST Audio by configuring MST capable pins and extended the jack handling to report event for ports. Now the jack events are based on port connect/disconnect. The design is also extended to support mapping of multiple port to a single converter. Now with the introduction of multiple ports with a single pin, a pin widget is created to enable/disable path based on device connection. Required machine driver changes are done to handle this change. Also use the ASoC jack instead of snd_jack framework to creates jacks in the machine driver. Note: This patch series has dependency on the series "ASoC: hdmi: Preparatory work to support MST audio" Jeeja KP (16): ASoC: hdac_hdmi: Add MST verb support ASoC: hdac_hdmi: Handle MST pin jack detection at boot/resume ASoc: hdac_hdmi: Configure pin verbs for MST ASoC: hdac_hdmi: Add support for multiple ports to a PCM ASoC: hdac_hdmi: Use ASoC jack instead of snd_jack ASoC: Intel: Skylake: Create ASoC jack for hdmi in rt286 machine ASoC: Intel: Skylake: Create ASoC jack for hdmi in skl_nau88l25_max98357a machine ASoC: Intel: Skylake: Create ASoC jack for hdmi in nau88l25_ssm4567 machine ASoC: Intel: bxt: Create ASoC jack for hdmi in bxt_rt298 machine ASoC: Intel: bxt: Create ASoC jack for hdmi in bxt_da7219_max98357 machine ASoC: hdac_hdmi: Add machine pin widget for each port ASoC: Intel: Skylake: Add jack port initialize in rt286 machine ASoC: Intel: Skylake: Add jack port initialize in nau88l25_max98357a machine ASoC: Intel: Skylake: Add jack port initialize in nau88l25_ssm4567 machine ASoC: Intel: bxt: Add jack port initialize in bxt_rt298 machine ASoC: Intel: bxt: Add jack port initialize in da7219_max98357a machine sound/soc/codecs/hdac_hdmi.c | 438 +++++++++++++++++++----- sound/soc/codecs/hdac_hdmi.h | 5 +- sound/soc/intel/boards/bxt_da7219_max98357a.c | 26 +- sound/soc/intel/boards/bxt_rt298.c | 26 +- sound/soc/intel/boards/skl_nau88l25_max98357a.c | 30 +- sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 30 +- sound/soc/intel/boards/skl_rt286.c | 30 +- 7 files changed, 482 insertions(+), 103 deletions(-) -- 2.5.0

4 20

[alsa-devel] [PATCH v3 0/7] Move dell-led to drivers/platform/x86
by Michał Kępień 17 Feb '17

17 Feb '17

This patch series moves the dell-led driver from the LED subsystem to the x86 platform driver subsystem. The original motivation behind this effort was to move all code using the dell-smbios module to the x86 platform driver subsystem. While I was investigating the possibilities to do that, it quickly emerged that dell-led can and in fact should be moved to the x86 platform driver subsystem in its entirety. dell-led consists of two major parts: - the part exposing a microphone mute LED interface, introduced in db6d8cc00773 ("dell-led: add mic mute led interface"); this interface is used by sound/pci/hda/dell_wmi_helper.c; while the original implementation used a WMI interface, it was changed to use dell-smbios in cf0d7ea33596 ("dell-led: use dell_smbios_find_token() for finding mic DMI tokens") and 0c41a08e131d ("dell-led: use dell_smbios_send_request() for performing SMBIOS calls"), - the part handling an activity LED present in Dell Latitude 2100 netbooks, introduced in 72dcd8d08aca ("leds: Add Dell Business Class Netbook LED driver"); it binds to a specific WMI GUID and then registers a LED device which is controlled using WMI (i.e. it is essentially a WMI driver). Patches 1 and 2 clean up the microphone mute LED interface to minimize the amount of code moved around. Patch 3 updates a variable name in sound/pci/hda/dell_wmi_helper.c so that it better matches that variable's role. Patch 4 moves the microphone mute LED interface to drivers/platform/x86/dell-laptop.c, effectively causing sound/pci/hda/dell_wmi_helper.c to depend on CONFIG_DELL_LAPTOP instead of CONFIG_LEDS_DELL_NETBOOKS. Patch 5 reverts dell-led to the state it was in after its initial commit 72dcd8d08aca ("leds: Add Dell Business Class Netbook LED driver") by removing all remnants of the microphone mute LED handling code. Patch 6 moves all that is left of dell-led (i.e. the activity LED part, as originally implemented), to a new module which is placed in drivers/platform/x86/dell-wmi-led.c. Patch 7 fixes coding style issues in drivers/platform/x86/dell-wmi-led.c to make sure it gets a clean start in the x86 platform driver subsystem. As all patches except patch 3 in this series affect the LED subsystem, the series is based on linux-leds/for-next. Changes from v2: - Add patch 7 fixing coding style issues (feedback from Joe and Andy taken into account). - Add leading zero to constants in patch 4. - Move dell-led.h include one line higher in patch 4. Changes from v1: - Squash patches 2-4 from v1 into a single patch (#2 in v2). - Add patch 3. - Fix subject pattern in patch 4. - Slight commit message adjustments, including fixing a typo ("COFIG_LEDS_DELL_NETBOOKS") in patch 6. - Remove the name of the module's source file from the header comment in drivers/platform/x86/dell-wmi-led.c to avoid the need to update it in the future. drivers/leds/Kconfig | 9 -- drivers/leds/Makefile | 1 - drivers/platform/x86/Kconfig | 8 ++ drivers/platform/x86/Makefile | 1 + drivers/platform/x86/dell-laptop.c | 28 ++++ .../dell-led.c => platform/x86/dell-wmi-led.c} | 141 +++++---------------- include/linux/dell-led.h | 6 +- sound/pci/hda/dell_wmi_helper.c | 30 ++--- 8 files changed, 86 insertions(+), 138 deletions(-) rename drivers/{leds/dell-led.c => platform/x86/dell-wmi-led.c} (56%) -- 2.11.1

1 7

[alsa-devel] [asoc:topic/intel 83/98] sound/soc/codecs/hdac_hdmi.c:1884:2-21: iterator with update on line 1885 (fwd)
by Julia Lawall 16 Feb '17

16 Feb '17

I don't think that what is done in lines 1884 and 1885 is the right approach. port is just a local variable that points to the different list elements and allows list_for_each_entry to get from one element to the other. Setting port to NULL doesn't change the list, and it makes it impossible for list_for_each_entry to find the next element. julia ---------- Forwarded message ---------- Date: Fri, 17 Feb 2017 05:00:49 +0800 From: kbuild test robot <fengguang.wu(a)intel.com> To: kbuild(a)01.org Cc: Julia Lawall <julia.lawall(a)lip6.fr> Subject: [asoc:topic/intel 83/98] sound/soc/codecs/hdac_hdmi.c:1884:2-21: iterator with update on line 1885 tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/intel head: e3efb2ad834b50cb9c8625155e3e2674f5bc443b commit: e0e5d3e5a53b3bc354c18030b78b7ebcb33e004b [83/98] ASoC: hdac_hdmi: Add support for multiple ports to a PCM :::::: branch date: 2 hours ago :::::: commit date: 2 hours ago >> sound/soc/codecs/hdac_hdmi.c:1884:2-21: iterator with update on line 1885 git remote add asoc https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git git remote update asoc git checkout e0e5d3e5a53b3bc354c18030b78b7ebcb33e004b vim +1884 sound/soc/codecs/hdac_hdmi.c 18382ead Subhransu S. Prusty 2015-11-10 1878 4a3478de Jeeja KP 2016-02-12 1879 list_for_each_entry_safe(pcm, pcm_next, &hdmi->pcm_list, head) { 4a3478de Jeeja KP 2016-02-12 1880 pcm->cvt = NULL; e0e5d3e5 Jeeja KP 2017-02-07 1881 if (list_empty(&pcm->port_list)) e0e5d3e5 Jeeja KP 2017-02-07 1882 continue; e0e5d3e5 Jeeja KP 2017-02-07 1883 e0e5d3e5 Jeeja KP 2017-02-07 @1884 list_for_each_entry(port, &pcm->port_list, head) e0e5d3e5 Jeeja KP 2017-02-07 @1885 port = NULL; e0e5d3e5 Jeeja KP 2017-02-07 1886 4a3478de Jeeja KP 2016-02-12 1887 list_del(&pcm->head); 4a3478de Jeeja KP 2016-02-12 1888 kfree(pcm); --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [asoc:topic/intel 79/98] sound/soc/codecs/hdac_hdmi.c:1419:5-8: ERROR: invalid reference to the index variable of the iterator on line 1397
by Julia Lawall 16 Feb '17

16 Feb '17

Lists don't end with NULL, They end with a dummy element. So pin in line 1419 is always true. You probably need some other way of detecting how the loop was exited. julia ---------- Forwarded message ---------- Date: Fri, 17 Feb 2017 04:31:06 +0800 From: kbuild test robot <fengguang.wu(a)intel.com> To: kbuild(a)01.org Cc: Julia Lawall <julia.lawall(a)lip6.fr> Subject: [asoc:topic/intel 79/98] sound/soc/codecs/hdac_hdmi.c:1419:5-8: ERROR: invalid reference to the index variable of the iterator on line 1397 tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git topic/intel head: e3efb2ad834b50cb9c8625155e3e2674f5bc443b commit: 2acd8309a3a4e6dc04e72d2db0716825095c02d6 [79/98] ASoC: hdac_hdmi: Add support to handle MST capable pin :::::: branch date: 2 hours ago :::::: commit date: 8 days ago >> sound/soc/codecs/hdac_hdmi.c:1419:5-8: ERROR: invalid reference to the index variable of the iterator on line 1397 git remote add asoc https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git git remote update asoc git checkout 2acd8309a3a4e6dc04e72d2db0716825095c02d6 vim +1419 sound/soc/codecs/hdac_hdmi.c b8a54545 Subhransu S. Prusty 2016-02-12 1391 SNDRV_CTL_POWER_D0) b8a54545 Subhransu S. Prusty 2016-02-12 1392 return; b8a54545 Subhransu S. Prusty 2016-02-12 1393 b8a54545 Subhransu S. Prusty 2016-02-12 1394 if (atomic_read(&edev->hdac.in_pm)) b8a54545 Subhransu S. Prusty 2016-02-12 1395 return; b8a54545 Subhransu S. Prusty 2016-02-12 1396 b8a54545 Subhransu S. Prusty 2016-02-12 @1397 list_for_each_entry(pin, &hdmi->pin_list, head) { 754695f9 Jeeja KP 2017-02-06 1398 if (pin->nid != pin_nid) 754695f9 Jeeja KP 2017-02-06 1399 continue; 754695f9 Jeeja KP 2017-02-06 1400 754695f9 Jeeja KP 2017-02-06 1401 /* In case of non MST pin, pipe is -1 */ 754695f9 Jeeja KP 2017-02-06 1402 if (pipe == -1) { 2acd8309 Jeeja KP 2017-02-06 1403 pin->mst_capable = false; 754695f9 Jeeja KP 2017-02-06 1404 /* if not MST, default is port[0] */ 754695f9 Jeeja KP 2017-02-06 1405 hport = &pin->ports[0]; 2acd8309 Jeeja KP 2017-02-06 1406 goto out; 2acd8309 Jeeja KP 2017-02-06 1407 } else { 2acd8309 Jeeja KP 2017-02-06 1408 for (i = 0; i < pin->num_ports; i++) { 2acd8309 Jeeja KP 2017-02-06 1409 pin->mst_capable = true; 2acd8309 Jeeja KP 2017-02-06 1410 if (pin->ports[i].id == pipe) { 2acd8309 Jeeja KP 2017-02-06 1411 hport = &pin->ports[i]; 2acd8309 Jeeja KP 2017-02-06 1412 goto out; 2acd8309 Jeeja KP 2017-02-06 1413 } 2acd8309 Jeeja KP 2017-02-06 1414 } 754695f9 Jeeja KP 2017-02-06 1415 } b8a54545 Subhransu S. Prusty 2016-02-12 1416 } 754695f9 Jeeja KP 2017-02-06 1417 2acd8309 Jeeja KP 2017-02-06 1418 out: 2acd8309 Jeeja KP 2017-02-06 @1419 if (pin && hport) 754695f9 Jeeja KP 2017-02-06 1420 hdac_hdmi_present_sense(pin, hport); b8a54545 Subhransu S. Prusty 2016-02-12 1421 } b8a54545 Subhransu S. Prusty 2016-02-12 1422 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH 0/2] ASoC: mediatek: add power-domain ctrl for 2701
by Garlic Tseng 16 Feb '17

16 Feb '17

add power-domain get/put ctrl for 2701 and add relative node description in binding doc. Garlic Tseng (2): ASoC: mediatek: add power-domain get/put ctrl for mt2701 ASoC: mediatek: add power-domains for mt2701-afe-pcm.txt Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt | 2 ++ sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 2 ++ 2 files changed, 4 insertions(+) -- 1.9.1

2 5

[alsa-devel] [PATCH 0/4] ASoC: Intel: Skylake: Enable Geminilake support
by Subhransu S. Prusty 16 Feb '17

16 Feb '17

Geminilake is next gen SoC, enable audio for Geminilake. Geminilake has two different devices connected to the same SSP, so use device_type check to get correct device configuration. Senthilnathan Veppur (1): ASoC: Intel: Skylake: Check device type to get endpoint configuration Vinod Koul (3): ASoC: rt298: Add DMI match for Geminilake reference platform ASoC: Intel: Skylake: Add Geminlake IDs ASoC: hdac_hdmi: Add device id for Geminilake sound/soc/codecs/hdac_hdmi.c | 1 + sound/soc/codecs/rt298.c | 7 +++++++ sound/soc/intel/skylake/skl-messages.c | 7 +++++++ sound/soc/intel/skylake/skl-nhlt.c | 16 ++++++++++------ sound/soc/intel/skylake/skl-topology.c | 32 ++++++++++++++++++++++++++++++-- sound/soc/intel/skylake/skl.c | 7 +++++++ sound/soc/intel/skylake/skl.h | 3 ++- 7 files changed, 64 insertions(+), 9 deletions(-) -- 1.9.1

2 8

[alsa-devel] [PATCH] ALSA: x86: Fix spinlock usage in the trigger callback
by ville.syrjala＠linux.intel.com 16 Feb '17

16 Feb '17

From: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Simply doing 'xset dpms force off' while playback is active seems sufficient to anger lockdep [1]. And it's of course correct that it's not safe to use regular spin_lock() outside the irq handler when the irq handler also wants to acquire the same lock. I believe the trigger callback can get called from both irq and non-irq context, so we need to to use spin_lock_irqsave() & co. here. The whole locking here looks somewhat suspicious, but I don't feel like digging into further, so here's just the minimal fix. [1] [ 168.303913] [drm:ilk_audio_codec_disable [i915]] Disable audio codec on port B, pipe B [ 168.306245] ================================= [ 168.311110] [ INFO: inconsistent lock state ] [ 168.315975] 4.10.0-rc8-ffrd+ #698 Tainted: G W [ 168.322198] --------------------------------- [ 168.327062] inconsistent {IN-HARDIRQ-W} -> {HARDIRQ-ON-W} usage. [ 168.333773] kworker/2:1/44 [HC0[0]:SC0[0]:HE1:SE1] takes: [ 168.339802] (&(&ctx->had_spinlock)->rlock){?.-...}, at: [<ffffffffa02c67e0>] had_pcm_trigger+0x60/0x160 [snd_hdmi_lpe_audio] [ 168.352449] {IN-HARDIRQ-W} state was registered at: [ 168.357901] __lock_acquire+0x7b2/0x16c0 [ 168.362378] lock_acquire+0xba/0x220 [ 168.366468] _raw_spin_lock_irqsave+0x47/0x60 [ 168.371431] had_substream_get+0x23/0x50 [snd_hdmi_lpe_audio] [ 168.377950] display_pipe_interrupt_handler+0x78/0x1a0 [snd_hdmi_lpe_audio] [ 168.385828] __handle_irq_event_percpu+0x3f/0x3a0 [ 168.391180] handle_irq_event_percpu+0x24/0x60 [ 168.396239] handle_irq_event+0x3a/0x60 [ 168.400619] handle_simple_irq+0x79/0xa0 [ 168.405096] generic_handle_irq+0x22/0x30 [ 168.409718] intel_lpe_audio_irq_handler+0x24/0x80 [i915] [ 168.415878] valleyview_irq_handler+0x1da/0x230 [i915] [ 168.421715] __handle_irq_event_percpu+0x3f/0x3a0 [ 168.427067] handle_irq_event_percpu+0x24/0x60 [ 168.432126] handle_irq_event+0x3a/0x60 [ 168.436505] handle_edge_irq+0x94/0x150 [ 168.440886] handle_irq+0xb3/0x190 [ 168.444781] do_IRQ+0x69/0x130 [ 168.448287] ret_from_intr+0x0/0x19 [ 168.452280] cpuidle_enter_state+0xdb/0x360 [ 168.457047] cpuidle_enter+0x17/0x20 [ 168.461136] call_cpuidle+0x23/0x40 [ 168.465126] do_idle+0x18a/0x200 [ 168.468826] cpu_startup_entry+0x1d/0x30 [ 168.473303] rest_init+0x12c/0x140 [ 168.477200] start_kernel+0x402/0x40f [ 168.481385] x86_64_start_reservations+0x2a/0x2c [ 168.486640] x86_64_start_kernel+0xea/0xed [ 168.491313] verify_cpu+0x0/0xfc [ 168.495012] irq event stamp: 28481 [ 168.498810] hardirqs last enabled at (28481): [<ffffffff8167feac>] _raw_spin_unlock_irq+0x2c/0x60 [ 168.508824] hardirqs last disabled at (28480): [<ffffffff8167fcc8>] _raw_spin_lock_irq+0x18/0x60 [ 168.518645] softirqs last enabled at (28442): [<ffffffff815d6cf9>] neigh_periodic_work+0x219/0x320 [ 168.528755] softirqs last disabled at (28438): [<ffffffff815d6b19>] neigh_periodic_work+0x39/0x320 [ 168.538767] other info that might help us debug this: [ 168.546052] Possible unsafe locking scenario: [ 168.552664] CPU0 [ 168.555390] ---- [ 168.558116] lock(&(&ctx->had_spinlock)->rlock); [ 168.563371] <Interrupt> [ 168.566291] lock(&(&ctx->had_spinlock)->rlock); [ 168.571741] *** DEADLOCK *** [ 168.578355] 3 locks held by kworker/2:1/44: [ 168.583025] #0: ("events"){.+.+.+}, at: [<ffffffff810a467f>] process_one_work+0x15f/0x6e0 [ 168.592357] #1: ((&ctx->hdmi_audio_wq)){+.+.+.}, at: [<ffffffff810a467f>] process_one_work+0x15f/0x6e0 [ 168.602959] #2: (&ctx->mutex){+.+.+.}, at: [<ffffffffa02c6ee8>] had_audio_wq+0x48/0x6de [snd_hdmi_lpe_audio] [ 168.614145] stack backtrace: [ 168.619011] CPU: 2 PID: 44 Comm: kworker/2:1 Tainted: G W 4.10.0-rc8-ffrd+ #698 [ 168.628441] Hardware name: Intel Corp. VALLEYVIEW C0 PLATFORM/BYT-T FFD8, BIOS BLAKFF81.X64.0088.R10.1403240443 FFD8_X64_R_2014_13_1_00 03/24/2014 [ 168.643111] Workqueue: events had_audio_wq [snd_hdmi_lpe_audio] [ 168.649725] Call Trace: [ 168.652448] dump_stack+0x67/0x90 [ 168.656149] print_usage_bug+0x20b/0x210 [ 168.660530] mark_lock+0x648/0x6c0 [ 168.664328] ? print_shortest_lock_dependencies+0x1d0/0x1d0 [ 168.670553] __lock_acquire+0x638/0x16c0 [ 168.674935] lock_acquire+0xba/0x220 [ 168.678929] ? had_pcm_trigger+0x60/0x160 [snd_hdmi_lpe_audio] [ 168.685447] _raw_spin_lock+0x3f/0x50 [ 168.689536] ? had_pcm_trigger+0x60/0x160 [snd_hdmi_lpe_audio] [ 168.696054] had_pcm_trigger+0x60/0x160 [snd_hdmi_lpe_audio] [ 168.702383] snd_pcm_do_stop+0x45/0x50 [snd_pcm] [ 168.707545] snd_pcm_action_single+0x32/0x80 [snd_pcm] [ 168.713289] snd_pcm_action+0x118/0x120 [snd_pcm] [ 168.718549] snd_pcm_stop+0x1a/0x20 [snd_pcm] [ 168.723415] had_audio_wq+0x35e/0x6de [snd_hdmi_lpe_audio] [ 168.729545] process_one_work+0x1eb/0x6e0 [ 168.734022] ? process_one_work+0x15f/0x6e0 [ 168.738693] worker_thread+0x4f/0x4a0 [ 168.742781] ? schedule+0x4a/0x90 [ 168.746483] ? preempt_count_sub+0xa6/0x110 [ 168.751154] kthread+0x10e/0x150 [ 168.754757] ? apply_wqattrs_commit+0x90/0x90 [ 168.759621] ? kthread_create_on_node+0x40/0x40 [ 168.764681] ? umh_complete+0x30/0x30 [ 168.768770] ? call_usermodehelper_exec_async+0x13a/0x150 [ 168.774802] ret_from_fork+0x2e/0x40 [ 168.779412] [drm:intel_disable_pipe [i915]] disabling pipe B Cc: Takashi Iwai <tiwai(a)suse.de> Cc: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Signed-off-by: Ville Syrjälä <ville.syrjala(a)linux.intel.com> --- sound/x86/intel_hdmi_audio.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c index c0a080e5d1f4..2748766b3f25 100644 --- a/sound/x86/intel_hdmi_audio.c +++ b/sound/x86/intel_hdmi_audio.c @@ -1154,6 +1154,7 @@ static int had_pcm_hw_free(struct snd_pcm_substream *substream) static int had_pcm_trigger(struct snd_pcm_substream *substream, int cmd) { int retval = 0; + unsigned long flags; struct snd_intelhad *intelhaddata; intelhaddata = snd_pcm_substream_chip(substream); @@ -1180,12 +1181,12 @@ static int had_pcm_trigger(struct snd_pcm_substream *substream, int cmd) case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: case SNDRV_PCM_TRIGGER_SUSPEND: - spin_lock(&intelhaddata->had_spinlock); + spin_lock_irqsave(&intelhaddata->had_spinlock, flags); /* Stop reporting BUFFER_DONE/UNDERRUN to above layers */ intelhaddata->stream_info.running = false; - spin_unlock(&intelhaddata->had_spinlock); + spin_unlock_irqrestore(&intelhaddata->had_spinlock, flags); /* Disable Audio */ had_enable_audio(intelhaddata, false); /* Reset buffer pointers */ -- 2.10.2

4 4

[alsa-devel] [PATCH v2 0/6] Move dell-led to drivers/platform/x86
by Michał Kępień 16 Feb '17

16 Feb '17

This patch series moves the dell-led driver from the LED subsystem to the x86 platform driver subsystem. The original motivation behind this effort was to move all code using the dell-smbios module to the x86 platform driver subsystem. While I was investigating the possibilities to do that, it quickly emerged that dell-led can and in fact should be moved to the x86 platform driver subsystem in its entirety. dell-led consists of two major parts: - the part exposing a microphone mute LED interface, introduced in db6d8cc00773 ("dell-led: add mic mute led interface"); this interface is used by sound/pci/hda/dell_wmi_helper.c; while the original implementation used a WMI interface, it was changed to use dell-smbios in cf0d7ea33596 ("dell-led: use dell_smbios_find_token() for finding mic DMI tokens") and 0c41a08e131d ("dell-led: use dell_smbios_send_request() for performing SMBIOS calls"), - the part handling an activity LED present in Dell Latitude 2100 netbooks, introduced in 72dcd8d08aca ("leds: Add Dell Business Class Netbook LED driver"); it binds to a specific WMI GUID and then registers a LED device which is controlled using WMI (i.e. it is essentially a WMI driver). Patches 1 and 2 clean up the microphone mute LED interface to minimize the amount of code moved around. Patch 3 updates a variable name in sound/pci/hda/dell_wmi_helper.c so that it better matches that variable's role. Patch 4 moves the microphone mute LED interface to drivers/platform/x86/dell-laptop.c, effectively causing sound/pci/hda/dell_wmi_helper.c to depend on CONFIG_DELL_LAPTOP instead of CONFIG_LEDS_DELL_NETBOOKS. Patch 5 reverts dell-led to the state it was in after its initial commit 72dcd8d08aca ("leds: Add Dell Business Class Netbook LED driver") by removing all remnants of the microphone mute LED handling code. Patch 6 moves all that is left of dell-led (i.e. the activity LED part, as originally implemented), to a new module which is placed in drivers/platform/x86/dell-wmi-led.c. As all patches except patch 3 in this series affect the LED subsystem, the series is based on linux-leds/for-4.11. Anthony, I would be grateful if you could test this patch series on the Dell machines you have access to that were previously supported by dell-led as Jacek needs a Tested-by from someone to sign off on these changes. Please note the Kconfig option rename done by the last patch. Thanks! Changes from v1: - Squash patches 2-4 from v1 into a single patch (#2 in v2). - Add patch 3. - Fix subject pattern in patch 4. - Slight commit message adjustments, including fixing a typo ("COFIG_LEDS_DELL_NETBOOKS") in patch 6. - Remove the name of the module's source file from the header comment in drivers/platform/x86/dell-wmi-led.c to avoid the need to update it in the future. drivers/leds/Kconfig | 9 --- drivers/leds/Makefile | 1 - drivers/platform/x86/Kconfig | 8 +++ drivers/platform/x86/Makefile | 1 + drivers/platform/x86/dell-laptop.c | 28 ++++++++ .../dell-led.c => platform/x86/dell-wmi-led.c} | 75 ++-------------------- include/linux/dell-led.h | 6 +- sound/pci/hda/dell_wmi_helper.c | 30 ++++----- 8 files changed, 60 insertions(+), 98 deletions(-) rename drivers/{leds/dell-led.c => platform/x86/dell-wmi-led.c} (73%) -- 2.11.0

7 30

[alsa-devel] [PATCH] ASoC: nau8825: automatic BCLK and LRC divde in master mode
by John Hsu 16 Feb '17

16 Feb '17

Provide the automatic configurable LRC and BCLK divide. The driver will make configurations of LRC and BCLK automatically according to BCLK and FS information in master mode. Signed-off-by: John Hsu <KCHSU0(a)nuvoton.com> --- sound/soc/codecs/nau8825.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/nau8825.c b/sound/soc/codecs/nau8825.c index 4576f98..97fbeba 100644 --- a/sound/soc/codecs/nau8825.c +++ b/sound/soc/codecs/nau8825.c @@ -1231,7 +1231,7 @@ static int nau8825_hw_params(struct snd_pcm_substream *substream, { struct snd_soc_codec *codec = dai->codec; struct nau8825 *nau8825 = snd_soc_codec_get_drvdata(codec); - unsigned int val_len = 0, osr; + unsigned int val_len = 0, osr, ctrl_val, bclk_fs, bclk_div; nau8825_sema_acquire(nau8825, 3 * HZ); @@ -1261,6 +1261,24 @@ static int nau8825_hw_params(struct snd_pcm_substream *substream, osr_adc_sel[osr].clk_src << NAU8825_CLK_ADC_SRC_SFT); } + /* make BCLK and LRC divde configuration if the codec as master. */ + regmap_read(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL2, &ctrl_val); + if (ctrl_val & NAU8825_I2S_MS_MASTER) { + /* get the bclk and fs ratio */ + bclk_fs = snd_soc_params_to_bclk(params) / params_rate(params); + if (bclk_fs <= 32) + bclk_div = 2; + else if (bclk_fs <= 64) + bclk_div = 1; + else if (bclk_fs <= 128) + bclk_div = 0; + else + return -EINVAL; + regmap_update_bits(nau8825->regmap, NAU8825_REG_I2S_PCM_CTRL2, + NAU8825_I2S_LRC_DIV_MASK | NAU8825_I2S_BLK_DIV_MASK, + ((bclk_div + 1) << NAU8825_I2S_LRC_DIV_SFT) | bclk_div); + } + switch (params_width(params)) { case 16: val_len |= NAU8825_I2S_DL_16; -- 2.6.4 =========================================================================================== The privileged confidential information contained in this email is intended for use only by the addressees as indicated by the original sender of this email. If you are not the addressee indicated in this email or are not responsible for delivery of the email to such a person, please kindly reply to the sender indicating this fact and delete all copies of it from your computer and network server immediately. Your cooperation is highly appreciated. It is advised that any unauthorized use of confidential information of Nuvoton is strictly prohibited; and any information in this email irrelevant to the official business of Nuvoton shall be deemed as neither given nor endorsed by Nuvoton.

2 3