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

[alsa-devel] ALC255 Fixup (help needed)
by Stephan Lachnit 22 Jan '19

22 Jan '19

I have a Xiaomi Mi Air 2018 Laptop with one combined 3.5mm jack at the left side of the keyboard, connected via an ALC255. While audio output with jack detection works fine, alsa doesn't get any mic input. Internal mic and speakers work fine. I tried a bit around with hdajackretask and found that Pin ID 0x19 is wired to the mic input. I uploaded pictures of my config to my stack overflow question: https://stackoverflow.com/questions/54277467/how-to-contribute-to-alsa-inte… I know there should be a patch written for sound/pci/hda/patch_realtek.c which should look somewhat like this: [ALC255_FIXUP_XIAOMI_AIR18] = { .type = HDA_FIXUP_PINS, .v.pins = (const struct hda_pintbl[]) { { 0x19, 0x01a1913c }, /* combinded audio jack */ }, but I really have no idea what the third and fourth line means and just copied from the Dell fixup. Would be nice if someone could help me to write a proper patch (I have some basic C/C++ knowledge, but no idea about alsa internals). System Info: Debian Unstable libasound2 1.1.7-2 i5 8250U w/ Realtek ALC255 This is my first attempt to contribute to open source project, so I hope I didn't miss anything important. Best regards, Stephan Lachnit

1 0

[alsa-devel] [PATCH 00/21] Sound Open Firmware (SOF) - Intel support
by Pierre-Louis Bossart 22 Jan '19

22 Jan '19

This patch series introduces the support for Intel devices (Baytrail, CherryTrail, Broadwell/Haswell, ApolloLake, GeminiLake, CannonLake, IceLake). Support for Skylake and KabyLake is incomplete at the moment but the basic building blocks required are already present. The series starts with the 'legacy' devices, then all the more recent ones and concludes with ACPI/PCI hooks. SKL+ platforms can be compiled without HDaudio link/codec support, in which case the hdac library is not used. When support for HDMI or HDaudio codecs is selected, parts of this library are used. With Takashi's latest patches, it is understood some fixes will be needed before merge, they will be provided as an update when merged by Mark. Patch 19/21 ('ALSA-HDA-export-process_unsol_events') was submitted as a dependency last week but not yet merged. It is provided for completeness should anyone try to compile the code. The machine drivers supported by SOF are not provided as part of this series, mainly because of likely conflicts with other patches in flight to support HDaudio fallback and additional work required for upstream. The build will only work in 'nocodec' mode for now. Support for SPI-based devices, compressed streams is also not provided for now since it's not ready for upstream just yet. Thank you for reviews and comments, we appreciate the time spent commenting on this large patchset. Thanks in particular to Alan Cox and Andy Shevchenko for their comments on an earlier version. Pierre Keyon Jie (3): ASoC: SOF: Intel: Add hda-bus support and initialization ASoC: SOF: Intel: SKL, CNL, APL platform DAIs ALSA: HDA: export process_unsol_events() Liam Girdwood (15): ASoC: SOF: Intel: Add BYT, CHT and BSW DSP HW support. ASoC: SOF: Intel: Add HSW HW DSP support ASoC: SOF: Intel: Add support for BDW HW DSP support ASoC: SOF: Intel: Add APL/CNL HW DSP support ASoC: SOF: Intel: Add HDA controller for Intel DSP ASoC: SOF: Intel: Add Intel specific HDA DSP HW operations ASoC: SOF: Intel: Add Intel specific HDA IPC mechanisms. ASoC: SOF: Intel: Add Intel specific HDA firmware loader ASoC: SOF: Intel: Add Intel specific HDA PCM operations ASoC: SOF: Intel: Add Intel specific HDA stream operations ASoC: SOF: Intel: Add Intel specific HDA trace operations ASoC: SOF: Intel: Add platform differentiation for SKL, APL and CNL ASoC: SOF: Add ACPI device support ASoC: SOF: Add PCI device support ASoC: SOF: Add Build support for SOF core and Intel drivers Pierre-Louis Bossart (3): ASoC: SOF: Intel: Add support for HDAudio codecs ASoC: SOF: Intel: Add SKL-specific code loader ASoC: Intel: Kconfig: expose common option between SST and SOF drivers include/sound/hdaudio.h | 1 + sound/hda/hdac_bus.c | 7 +- sound/soc/Kconfig | 1 + sound/soc/Makefile | 1 + sound/soc/intel/Kconfig | 7 +- sound/soc/sof/Kconfig | 82 +++ sound/soc/sof/Makefile | 17 + sound/soc/sof/intel/Kconfig | 136 +++++ sound/soc/sof/intel/Makefile | 17 + sound/soc/sof/intel/apl.c | 99 ++++ sound/soc/sof/intel/bdw.c | 700 +++++++++++++++++++++++ sound/soc/sof/intel/byt.c | 805 +++++++++++++++++++++++++++ sound/soc/sof/intel/cnl.c | 242 ++++++++ sound/soc/sof/intel/hda-bus.c | 107 ++++ sound/soc/sof/intel/hda-codec.c | 185 ++++++ sound/soc/sof/intel/hda-ctrl.c | 166 ++++++ sound/soc/sof/intel/hda-dai.c | 368 ++++++++++++ sound/soc/sof/intel/hda-dsp.c | 417 ++++++++++++++ sound/soc/sof/intel/hda-ipc.c | 387 +++++++++++++ sound/soc/sof/intel/hda-loader-skl.c | 531 ++++++++++++++++++ sound/soc/sof/intel/hda-loader.c | 369 ++++++++++++ sound/soc/sof/intel/hda-pcm.c | 232 ++++++++ sound/soc/sof/intel/hda-stream.c | 661 ++++++++++++++++++++++ sound/soc/sof/intel/hda-trace.c | 79 +++ sound/soc/sof/intel/hda.c | 704 +++++++++++++++++++++++ sound/soc/sof/intel/hda.h | 537 ++++++++++++++++++ sound/soc/sof/intel/hsw.c | 701 +++++++++++++++++++++++ sound/soc/sof/intel/shim.h | 159 ++++++ sound/soc/sof/intel/skl.c | 92 +++ sound/soc/sof/sof-acpi-dev.c | 269 +++++++++ sound/soc/sof/sof-pci-dev.c | 361 ++++++++++++ 31 files changed, 8435 insertions(+), 5 deletions(-) create mode 100644 sound/soc/sof/Kconfig create mode 100644 sound/soc/sof/Makefile create mode 100644 sound/soc/sof/intel/Kconfig create mode 100644 sound/soc/sof/intel/Makefile create mode 100644 sound/soc/sof/intel/apl.c create mode 100644 sound/soc/sof/intel/bdw.c create mode 100644 sound/soc/sof/intel/byt.c create mode 100644 sound/soc/sof/intel/cnl.c create mode 100644 sound/soc/sof/intel/hda-bus.c create mode 100644 sound/soc/sof/intel/hda-codec.c create mode 100644 sound/soc/sof/intel/hda-ctrl.c create mode 100644 sound/soc/sof/intel/hda-dai.c create mode 100644 sound/soc/sof/intel/hda-dsp.c create mode 100644 sound/soc/sof/intel/hda-ipc.c create mode 100644 sound/soc/sof/intel/hda-loader-skl.c create mode 100644 sound/soc/sof/intel/hda-loader.c create mode 100644 sound/soc/sof/intel/hda-pcm.c create mode 100644 sound/soc/sof/intel/hda-stream.c create mode 100644 sound/soc/sof/intel/hda-trace.c create mode 100644 sound/soc/sof/intel/hda.c create mode 100644 sound/soc/sof/intel/hda.h create mode 100644 sound/soc/sof/intel/hsw.c create mode 100644 sound/soc/sof/intel/shim.h create mode 100644 sound/soc/sof/intel/skl.c create mode 100644 sound/soc/sof/sof-acpi-dev.c create mode 100644 sound/soc/sof/sof-pci-dev.c -- 2.17.1

4 35

[alsa-devel] [PATCH 0/6] ALSA: fireface: support MIDI functionality of Fireface UCX
by Takashi Sakamoto 22 Jan '19

22 Jan '19

Hi, This patchset is a supplement of my previous one and to complete support for Fireface UCX: [alsa-devel] [PATCH 0/9] ALSA: fireface: add support for Fireface UCX http://mailman.alsa-project.org/pipermail/alsa-devel/2019-January/144465.ht… The mechanism to use MIDi functionality of Fireface UCX is different from the other supported devices; Fireface 800 and Fireface 400. This patchset extends abstraction layer of hardware specification and communication protocol. Unfortunately, a bitflag to decide lower part of address to transfer asynchronous transaction for MIDI message is in option register which has the other options. This driver expects userspace applications to configure the option as expected. In detail please refer to third patch. For testers, a remote branch is available to backport a series of patches to Linux kernel v4.17 or later: https://github.com/takaswie/snd-firewire-improve/tree/topic/ff-ucx-midi A userspace tool to configure addressed register is available in another remote branch for hinawa-utils: https://github.com/takaswie/hinawa-utils/tree/topic/ff-ucx As I noted in previous patchset, this work is based on my packet analysis from rent device for a short term (2 weeks). I'm happy to get your response till next weekend. Regards Takashi Sakamoto (6): ALSA: fireface: change prototype of handler for async transaction with MIDI messages ALSA: fireface: add model-dependent parameter for address range to receive async transaction ALSA: fireface: support tx MIDI functionality of Fireface UCX ALSA: fireface: add model-dependent parameter for address to receive async transaction for MIDI messages ALSA: fireface: add protocol-specific operation to fill transaction buffer with MIDI messages ALSA: fireface: support rx MIDI functionality for Fireface UCX sound/firewire/fireface/ff-midi.c | 2 +- sound/firewire/fireface/ff-protocol-former.c | 29 +++- sound/firewire/fireface/ff-protocol-latter.c | 139 +++++++++++++++++++ sound/firewire/fireface/ff-transaction.c | 44 +++--- sound/firewire/fireface/ff.c | 31 +++-- sound/firewire/fireface/ff.h | 10 +- 6 files changed, 210 insertions(+), 45 deletions(-) -- 2.19.1

2 7

[alsa-devel] [PATCH 0/7] ALSA: Refactoring PCM locking code
by Takashi Iwai 22 Jan '19

22 Jan '19

Hi, this is a patch set to refactor the PCM locking code and to reduce the global lock. At least, this gets rid of the global rwlock, while the global rwsem is still needed for some non-atomic ops and for avoiding the deadlock at linking. Takashi === Takashi Iwai (7): ALSA: pcm: Call snd_card_unref() inside in_pcm_file() ALSA: pcm: Unify snd_pcm_group initialization ALSA: pcm: Make PCM linked list consistent while re-grouping ALSA: pcm: Avoid confusing loop in snd_pcm_unlink() ALSA: pcm: More fine-grained PCM link locking ALSA: pcm: Remove down_write() hack for snd_pcm_link_rwsem ALSA: pcm: Cleanup snd_pcm_stream_lock() & co include/sound/pcm.h | 3 +- sound/core/pcm.c | 4 +- sound/core/pcm_local.h | 1 + sound/core/pcm_native.c | 290 ++++++++++++++++++++++++++++-------------------- 4 files changed, 171 insertions(+), 127 deletions(-) -- 2.16.4

1 7

[alsa-devel] [PATCH v2 0/6] Runtime PM support (hda/tegra)
by Sameer Pujar 22 Jan '19

22 Jan '19

Background ========== The device power management operations can be controlled with the help of runtime power management (runtime PM) framework. In this case hda driver can register runtime PM callbacks with the power management core (PM core). Idea is to put the device in low power mode, when it is not getting used. The clocks and power domains can be turned off when no use case is running on the device. Current patch series adds necessary support to manage hda device at runtime. Change log ========== v1: ------ Patch-1: "ALSA: hda/tegra: runtime power management support" * runtime PM enable/disable added in device probe/remove * runtime PM calls are forbidden if AZX_DCAPS_PM_RUNTIME is not enabled in driver flags * worker thread uses pm_runtime_get_sync to invoke ->runtime_resume and pm_runtime_put to invoke ->runtime_suspend. The callbacks are added in subsequent patches Patch-2: "ALSA: hda/tegra: get clock handles early in probe" * Clock handles required for hda are acquired early in the probe. This is done to make use of runtime PM framework to enable/disable clocks in the callbacks. Patch-3: "ALSA: hda/tegra: add runtime PM callbacks" * adds runtime PM callbacks for ->runtime_suspend(), ->runtime_resume() * only skeleton for the callbacks is added, implementation is done in the subsequent patches Patch-4: "ALSA: hda/tegra: remove redundant clock enable API" * As worked thread is calling pm_runtime_get_sync() now, no need to enable the clock explicitly. This can be managed from callback. * Idea is to have clock enable and disable functionalities in runtime PM callbacks and the driver can make use of the above. Any device access should be preceded by ->runtime_resume() call. Patch-5: "ALSA: hda/tegra: implement runtime suspend/resume" * clock enable and controller initialization is moved to ->runtime_reesume() and the reverse is done during ->runtime_suspend() * Also during system wide power transitions, pm_runtime_force_resume() is invoked in system resume() and similarly for suspend case. Patch-6: "ALSA: hda/tegra: fix kernel panic" * kernel panic is happening befoe controller init is done * added a flag "probed" to indicate the completion of device init * this flag is checked before doing any device access. Patch-7: "ALSA: hda/tegra: add driver flag for runtime PM" * driver flag AZX_DCAPS_PM_RUNTIME is added if CONFIG_PM is enabled. * otherwise runtime PM calls will be forbidden and act as dummy calls v1-->v2 ------- Patch-1: "ALSA: hda/tegra: runtime power management support" * no change Patch-2: "ALSA: hda/tegra: get clock handles early in probe" * no change Patch-3: "ALSA: hda/tegra: add runtime PM callbacks" * no change Patch-4: "ALSA: hda/tegra: remove redundant clock enable API" * no change Patch-5: "ALSA: hda/tegra: implement runtime suspend/resume" * Patch-6(v1) commit is melded into this commit * instead of new flag "probed", chip->running status is used to know the completion of probe Patch-6: "ALSA: hda/tegra: add driver flag for runtime PM" * This commit is similar to Patch-7(v1) * AZX_DCAPS_PM_RUNTIME is unconditionally added and CONFIG_PM under which above flag was added is removed ========= Sameer Pujar (6): ALSA: hda/tegra: runtime power management support ALSA: hda/tegra: get clock handles early in probe ALSA: hda/tegra: add runtime PM callbacks ALSA: hda/tegra: remove redundant clock enable API ALSA: hda/tegra: implement runtime suspend/resume ALSA: hda/tegra: add driver flag for runtime PM sound/pci/hda/hda_tegra.c | 120 +++++++++++++++++++++++++++++++++------------- 1 file changed, 88 insertions(+), 32 deletions(-) -- 2.7.4 ----------------------------------------------------------------------------------- This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. -----------------------------------------------------------------------------------

2 7

[alsa-devel] [PATCH 0/7] Runtime PM support (hda/tegra)
by Sameer Pujar 22 Jan '19

22 Jan '19

Background ========== The device power management operations can be controlled with the help of runtime power management (runtime PM) framework. In this case hda driver can register runtime PM callbacks with the power management core (PM core). Idea is to put the device in low power mode, when it is not getting used. The clocks and power domains can be turned off when no use case is running on the device. Current patch series adds necessary support to manage hda device at runtime. Change log ========== v1: ---- Patch-1: "ALSA: hda/tegra: runtime power management support" * runtime PM enable/disable added in device probe/remove * runtime PM calls are forbidden if AZX_DCAPS_PM_RUNTIME is not enabled in driver flags * worker thread uses pm_runtime_get_sync to invoke ->runtime_resume and pm_runtime_put to invoke ->runtime_suspend. The callbacks are added in subsequent patches Patch-2: "ALSA: hda/tegra: get clock handles early in probe" * Clock handles required for hda are acquired early in the probe. This is done to make use of runtime PM framework to enable/disable clocks in the callbacks. Patch-3: "ALSA: hda/tegra: add runtime PM callbacks" * adds runtime PM callbacks for ->runtime_suspend(), ->runtime_resume() * only skeleton for the callbacks is added, implementation is done in the subsequent patches Patch-4: "ALSA: hda/tegra: remove redundant clock enable API" * As worked thread is calling pm_runtime_get_sync() now, no need to enable the clock explicitly. This can be managed from callback. * Idea is to have clock enable and disable functionalities in runtime PM callbacks and the driver can make use of the above. Any device access should be preceded by ->runtime_resume() call. Patch-5: "ALSA: hda/tegra: implement runtime suspend/resume" * clock enable and controller initialization is moved to ->runtime_reesume() and the reverse is done during ->runtime_suspend() * Also during system wide power transitions, pm_runtime_force_resume() is invoked in system resume() and similarly for suspend case. Patch-6: "ALSA: hda/tegra: fix kernel panic" * kernel panic is happening befoe controller init is done * added a flag "probed" to indicate the completion of device init * this flag is checked before doing any device access. Patch-7: "ALSA: hda/tegra: add driver flag for runtime PM" * driver flag AZX_DCAPS_PM_RUNTIME is added if CONFIG_PM is enabled. * otherwise runtime PM calls will be forbidden and act as dummy calls ========= Sameer Pujar (7): ALSA: hda/tegra: runtime power management support ALSA: hda/tegra: get clock handles early in probe ALSA: hda/tegra: add runtime PM callbacks ALSA: hda/tegra: remove redundant clock enable API ALSA: hda/tegra: implement runtime suspend/resume ALSA: hda/tegra: fix kernel panic ALSA: hda/tegra: add driver flag for runtime PM sound/pci/hda/hda_tegra.c | 120 +++++++++++++++++++++++++++++++++------------- 1 file changed, 88 insertions(+), 32 deletions(-) -- 2.7.4 ----------------------------------------------------------------------------------- This email message is for the sole use of the intended recipient(s) and may contain confidential information. Any unauthorized review, use, disclosure or distribution is prohibited. If you are not the intended recipient, please contact the sender by reply email and destroy all copies of the original message. -----------------------------------------------------------------------------------

2 13

[alsa-devel] Noise in begnning of alsa application
by Chakravarthi Pradeep 21 Jan '19

21 Jan '19

I have ALSA driver for capture device which works fine with VLC. when I try to capture and render using own application having some issues. When I start play, it has some noise in beginning and audio is discontinuous in between. Discontinuous means, some audio frame are getting dropped in between. cut cut sound for sine wave. I have tried snd_pcm_drop and snd_pcm_drain but no use. Kindly suggest how to remove the starting noise in ALSA. -- Thanks and Regards Chakravarthi Pradeep.K

3 5

[alsa-devel] [PATCH] ASoC: MAINTAINERS: fsl: Change Fabio's email address
by Fabio Estevam 21 Jan '19

21 Jan '19

I prefer to use my personal email address for kernel related work. Signed-off-by: Fabio Estevam <festevam(a)gmail.com> --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index a3d1222b81ad..f3de979b8e58 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6178,7 +6178,7 @@ FREESCALE SOC SOUND DRIVERS M: Timur Tabi <timur(a)kernel.org> M: Nicolin Chen <nicoleotsuka(a)gmail.com> M: Xiubo Li <Xiubo.Lee(a)gmail.com> -R: Fabio Estevam <fabio.estevam(a)nxp.com> +R: Fabio Estevam <festevam(a)gmail.com> L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) L: linuxppc-dev(a)lists.ozlabs.org S: Maintained @@ -10954,7 +10954,7 @@ F: include/linux/nvmem-consumer.h F: include/linux/nvmem-provider.h NXP SGTL5000 DRIVER -M: Fabio Estevam <fabio.estevam(a)nxp.com> +M: Fabio Estevam <festevam(a)gmail.com> L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) S: Maintained F: Documentation/devicetree/bindings/sound/sgtl5000.txt -- 2.17.1

2 1

[alsa-devel] Applied "ASoC: soc-core: add new snd_soc_flush_all_delayed_work()" to the asoc tree
by Mark Brown 21 Jan '19

21 Jan '19

The patch ASoC: soc-core: add new snd_soc_flush_all_delayed_work() has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 65462e445f78cb2f9378443be7ba8b7e07300694 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Date: Mon, 21 Jan 2019 09:32:37 +0900 Subject: [PATCH] ASoC: soc-core: add new snd_soc_flush_all_delayed_work() soc-core is calling flush_delayed_work() many times for same purpose. Same code in many places makes code un-understandable. This patch adds new snd_soc_flush_all_delayed_work() for it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/soc-core.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 2c63921675d5..eeb794d8a262 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -425,6 +425,14 @@ struct snd_soc_pcm_runtime *snd_soc_get_pcm_runtime(struct snd_soc_card *card, } EXPORT_SYMBOL_GPL(snd_soc_get_pcm_runtime); +static void snd_soc_flush_all_delayed_work(struct snd_soc_card *card) +{ + struct snd_soc_pcm_runtime *rtd; + + for_each_card_rtds(card, rtd) + flush_delayed_work(&rtd->delayed_work); +} + static void codec2codec_close_delayed_work(struct work_struct *work) { /* @@ -494,8 +502,7 @@ int snd_soc_suspend(struct device *dev) } /* close any waiting streams */ - for_each_card_rtds(card, rtd) - flush_delayed_work(&rtd->delayed_work); + snd_soc_flush_all_delayed_work(card); for_each_card_rtds(card, rtd) { @@ -2228,11 +2235,8 @@ static int soc_probe(struct platform_device *pdev) static int soc_cleanup_card_resources(struct snd_soc_card *card) { - struct snd_soc_pcm_runtime *rtd; - /* make sure any delayed work runs */ - for_each_card_rtds(card, rtd) - flush_delayed_work(&rtd->delayed_work); + snd_soc_flush_all_delayed_work(card); /* free the ALSA card at first; this syncs with pending operations */ snd_card_free(card->snd_card); @@ -2275,8 +2279,7 @@ int snd_soc_poweroff(struct device *dev) * Flush out pmdown_time work - we actually do want to run it * now, we're shutting down so no imminent restart. */ - for_each_card_rtds(card, rtd) - flush_delayed_work(&rtd->delayed_work); + snd_soc_flush_all_delayed_work(card); snd_soc_dapm_shutdown(card); -- 2.20.1

1 0

[alsa-devel] Applied "ASoC: soc-core: merge card resources cleanup method" to the asoc tree
by Mark Brown 21 Jan '19

21 Jan '19

The patch ASoC: soc-core: merge card resources cleanup method has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 53e947a0e1f770b9707febb7054b856878945d50 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Date: Mon, 21 Jan 2019 09:32:42 +0900 Subject: [PATCH] ASoC: soc-core: merge card resources cleanup method We need to cleanup card resources when snd_soc_instantiate_card() was failed, or when snd_soc_unbind_card() was called. But they are cleanuping card resources on each way. Same code in many places makes code un-understandable. This patch reuses soc_cleanup_card_resources() for cleanuping code resource. Then, it makes avoiding cleanup order. It will be called from snd_soc_instantiate_card() and snd_soc_unbind_card(). Then, original soc_cleanup_card_resources() included snd_soc_flush_all_delayed_work(), but it is now separated. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/soc-core.c | 103 ++++++++++++++++++------------------------- 1 file changed, 43 insertions(+), 60 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index eeb794d8a262..d59b5ea9fa25 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -2008,6 +2008,29 @@ static void soc_check_tplg_fes(struct snd_soc_card *card) } } +static int soc_cleanup_card_resources(struct snd_soc_card *card) +{ + /* free the ALSA card at first; this syncs with pending operations */ + if (card->snd_card) + snd_card_free(card->snd_card); + + /* remove and free each DAI */ + soc_remove_dai_links(card); + soc_remove_pcm_runtimes(card); + + /* remove auxiliary devices */ + soc_remove_aux_devices(card); + + snd_soc_dapm_free(&card->dapm); + soc_cleanup_card_debugfs(card); + + /* remove the card */ + if (card->remove) + card->remove(card); + + return 0; +} + static int snd_soc_instantiate_card(struct snd_soc_card *card) { struct snd_soc_pcm_runtime *rtd; @@ -2017,6 +2040,11 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) mutex_lock(&client_mutex); mutex_lock_nested(&card->mutex, SND_SOC_CARD_CLASS_INIT); + card->dapm.bias_level = SND_SOC_BIAS_OFF; + card->dapm.dev = card->dev; + card->dapm.card = card; + list_add(&card->dapm.list, &card->dapm_list); + /* check whether any platform is ignore machine FE and using topology */ soc_check_tplg_fes(card); @@ -2024,14 +2052,14 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) for_each_card_prelinks(card, i, dai_link) { ret = soc_bind_dai_link(card, dai_link); if (ret != 0) - goto base_error; + goto probe_end; } /* bind aux_devs too */ for (i = 0; i < card->num_aux_devs; i++) { ret = soc_bind_aux_dev(card, i); if (ret != 0) - goto base_error; + goto probe_end; } /* add predefined DAI links to the list */ @@ -2045,16 +2073,11 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) dev_err(card->dev, "ASoC: can't create sound card for card %s: %d\n", card->name, ret); - goto base_error; + goto probe_end; } soc_init_card_debugfs(card); - card->dapm.bias_level = SND_SOC_BIAS_OFF; - card->dapm.dev = card->dev; - card->dapm.card = card; - list_add(&card->dapm.list, &card->dapm_list); - #ifdef CONFIG_DEBUG_FS snd_soc_dapm_debugfs_init(&card->dapm, card->debugfs_card_root); #endif @@ -2076,7 +2099,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) if (card->probe) { ret = card->probe(card); if (ret < 0) - goto card_probe_error; + goto probe_end; } /* probe all components used by DAI links on this card */ @@ -2087,7 +2110,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) dev_err(card->dev, "ASoC: failed to instantiate card %d\n", ret); - goto probe_dai_err; + goto probe_end; } } } @@ -2095,7 +2118,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) /* probe auxiliary components */ ret = soc_probe_aux_devices(card); if (ret < 0) - goto probe_dai_err; + goto probe_end; /* * Find new DAI links added during probing components and bind them. @@ -2107,10 +2130,10 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) ret = soc_init_dai_link(card, dai_link); if (ret) - goto probe_dai_err; + goto probe_end; ret = soc_bind_dai_link(card, dai_link); if (ret) - goto probe_dai_err; + goto probe_end; } /* probe all DAI links on this card */ @@ -2121,7 +2144,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) dev_err(card->dev, "ASoC: failed to instantiate card %d\n", ret); - goto probe_dai_err; + goto probe_end; } } } @@ -2168,7 +2191,7 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) if (ret < 0) { dev_err(card->dev, "ASoC: %s late_probe() failed: %d\n", card->name, ret); - goto probe_aux_dev_err; + goto probe_end; } } @@ -2178,33 +2201,17 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card) if (ret < 0) { dev_err(card->dev, "ASoC: failed to register soundcard %d\n", ret); - goto probe_aux_dev_err; + goto probe_end; } card->instantiated = 1; dapm_mark_endpoints_dirty(card); snd_soc_dapm_sync(&card->dapm); - mutex_unlock(&card->mutex); - mutex_unlock(&client_mutex); - - return 0; -probe_aux_dev_err: - soc_remove_aux_devices(card); - -probe_dai_err: - soc_remove_dai_links(card); - -card_probe_error: - if (card->remove) - card->remove(card); - - snd_soc_dapm_free(&card->dapm); - soc_cleanup_card_debugfs(card); - snd_card_free(card->snd_card); +probe_end: + if (ret < 0) + soc_cleanup_card_resources(card); -base_error: - soc_remove_pcm_runtimes(card); mutex_unlock(&card->mutex); mutex_unlock(&client_mutex); @@ -2233,31 +2240,6 @@ static int soc_probe(struct platform_device *pdev) return snd_soc_register_card(card); } -static int soc_cleanup_card_resources(struct snd_soc_card *card) -{ - /* make sure any delayed work runs */ - snd_soc_flush_all_delayed_work(card); - - /* free the ALSA card at first; this syncs with pending operations */ - snd_card_free(card->snd_card); - - /* remove and free each DAI */ - soc_remove_dai_links(card); - soc_remove_pcm_runtimes(card); - - /* remove auxiliary devices */ - soc_remove_aux_devices(card); - - snd_soc_dapm_free(&card->dapm); - soc_cleanup_card_debugfs(card); - - /* remove the card */ - if (card->remove) - card->remove(card); - - return 0; -} - /* removes a socdev */ static int soc_remove(struct platform_device *pdev) { @@ -2823,6 +2805,7 @@ static void snd_soc_unbind_card(struct snd_soc_card *card, bool unregister) if (card->instantiated) { card->instantiated = false; snd_soc_dapm_shutdown(card); + snd_soc_flush_all_delayed_work(card); soc_cleanup_card_resources(card); if (!unregister) list_add(&card->list, &unbind_card_list); -- 2.20.1

1 0