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

[alsa-devel] [PATCH] ALSA: dice: add stream format parameters for Mytek devices
by Melvin Vermeeren 19 Jun '18

19 Jun '18

Mytek manufactures some equipment with DICE-based firewire ports. These devices contain old versions of DICE firmware which lacks detailed stream format reporting for all sampling clock modes. Building upon the recent work by Takashi Sakamoto, hard-coded parameters are added for the Stereo 192 DSD-DAC. When the device vendor and model match the coded parameters are copied into the stream format cache. Signed-off-by: Melvin Vermeeren <mail(a)mel.vin> --- sound/firewire/dice/Makefile | 2 +- sound/firewire/dice/dice-mytek.c | 46 ++++++++++++++++++++++++++++++++ sound/firewire/dice/dice.c | 9 +++++++ sound/firewire/dice/dice.h | 1 + 4 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 sound/firewire/dice/dice-mytek.c diff --git a/sound/firewire/dice/Makefile b/sound/firewire/dice/Makefile index 7b7997a5754c..37062a233f6a 100644 --- a/sound/firewire/dice/Makefile +++ b/sound/firewire/dice/Makefile @@ -1,4 +1,4 @@ snd-dice-objs := dice-transaction.o dice-stream.o dice-proc.o dice-midi.o \ dice-pcm.o dice-hwdep.o dice.o dice-tcelectronic.o \ - dice-alesis.o dice-extension.o + dice-alesis.o dice-extension.o dice-mytek.o obj-$(CONFIG_SND_DICE) += snd-dice.o diff --git a/sound/firewire/dice/dice-mytek.c b/sound/firewire/dice/dice-mytek.c new file mode 100644 index 000000000000..eb7d5492d10b --- /dev/null +++ b/sound/firewire/dice/dice-mytek.c @@ -0,0 +1,46 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * dice-mytek.c - a part of driver for DICE based devices + * + * Copyright (c) 2018 Melvin Vermeeren + */ + +#include "dice.h" + +struct dice_mytek_spec { + unsigned int tx_pcm_chs[MAX_STREAMS][SND_DICE_RATE_MODE_COUNT]; + unsigned int rx_pcm_chs[MAX_STREAMS][SND_DICE_RATE_MODE_COUNT]; +}; + +static const struct dice_mytek_spec stereo_192_dsd_dac = { + /* AES, TOSLINK, SPDIF, ADAT inputs on device */ + .tx_pcm_chs = {{8, 8, 8}, {0, 0, 0} }, + /* PCM 44.1-192, native DSD64/DSD128 to device */ + .rx_pcm_chs = {{4, 4, 4}, {0, 0, 0} } +}; + +/* + * Mytek has a few other firewire-capable devices, though newer models appear + * to lack the port more often than not. As I don't have access to any of them + * they are missing here. An example is the Mytek 8x192 ADDA, which is DICE. + */ + +int snd_dice_detect_mytek_formats(struct snd_dice *dice) +{ + int i; + const struct dice_mytek_spec *dev; + + dev = &stereo_192_dsd_dac; + + memcpy(dice->tx_pcm_chs, dev->tx_pcm_chs, + MAX_STREAMS * SND_DICE_RATE_MODE_COUNT * sizeof(unsigned int)); + memcpy(dice->rx_pcm_chs, dev->rx_pcm_chs, + MAX_STREAMS * SND_DICE_RATE_MODE_COUNT * sizeof(unsigned int)); + + for (i = 0; i < MAX_STREAMS; ++i) { + dice->tx_midi_ports[i] = 0; + dice->rx_midi_ports[i] = 0; + } + + return 0; +} diff --git a/sound/firewire/dice/dice.c b/sound/firewire/dice/dice.c index 40f7a32e4893..beeef62581ba 100644 --- a/sound/firewire/dice/dice.c +++ b/sound/firewire/dice/dice.c @@ -17,6 +17,7 @@ MODULE_LICENSE("GPL v2"); #define OUI_TCELECTRONIC 0x000166 #define OUI_ALESIS 0x000595 #define OUI_MAUDIO 0x000d6c +#define OUI_MYTEK 0x001ee8 #define DICE_CATEGORY_ID 0x04 #define WEISS_CATEGORY_ID 0x00 @@ -365,6 +366,14 @@ static const struct ieee1394_device_id dice_id_table[] = { .model_id = MODEL_ALESIS_IO_BOTH, .driver_data = (kernel_ulong_t)snd_dice_detect_alesis_formats, }, + /* Mytek Stereo 192 DSD-DAC. */ + { + .match_flags = IEEE1394_MATCH_VENDOR_ID | + IEEE1394_MATCH_MODEL_ID, + .vendor_id = OUI_MYTEK, + .model_id = 0x000002, + .driver_data = (kernel_ulong_t)snd_dice_detect_mytek_formats, + }, { .match_flags = IEEE1394_MATCH_VERSION, .version = DICE_INTERFACE, diff --git a/sound/firewire/dice/dice.h b/sound/firewire/dice/dice.h index 505b79fea6d9..83353a3559e8 100644 --- a/sound/firewire/dice/dice.h +++ b/sound/firewire/dice/dice.h @@ -226,5 +226,6 @@ int snd_dice_create_midi(struct snd_dice *dice); int snd_dice_detect_tcelectronic_formats(struct snd_dice *dice); int snd_dice_detect_alesis_formats(struct snd_dice *dice); int snd_dice_detect_extension_formats(struct snd_dice *dice); +int snd_dice_detect_mytek_formats(struct snd_dice *dice); #endif -- 2.17.0

3 7

[alsa-devel] [PATCH v4 0/5] slimbus: Add QCOM SLIMBus NGD driver
by Srinivas Kandagatla 19 Jun '18

19 Jun '18

This patchset adds support to basic version of Qualcomm NGD SLIMBus controller driver found SoCs from B family. This controller is light-weight SLIMBus controller driver responsible for communicating with slave HW directly over the bus using messaging interface, and communicating with master component residing on ADSP for bandwidth and data-channel management. Some parts fot the work is derived from Qualcomm downstream kernels and intial work from Karthikeyan Ramasubramanian <kramasub(a)codeaurora.org> and Sagar Dharia <sdharia(a)codeaurora.org> Tested this patchset with v4.18-rc1 on DB820c with WCD9335 codec for playback and Craig tested on msm8974 with wcd9320 codec for register read/writes. I have pushed my working branch to [1] incase someone want to try. [1]:https://git.linaro.org/people/srinivas.kandagatla/linux.git/log/?h=slimb… Changes since v4: - Moved all dependency patches to this patchset. - replaced slim_prepare_txn with slim_alloc/free_txn_tid() - fixed runtime pm issue for ngd device. Srinivas Kandagatla (5): slimbus: core: add of_slim_device_get() helper slimbus: core: rearrange slim_eaddr structure slimbus: messaging: add slim_alloc/free_txn_tid() slimbus: ngd: dt-bindings: Add slim ngd dt bindings slimbus: ngd: Add qcom SLIMBus NGD driver .../bindings/slimbus/slim-ngd-qcom-ctrl.txt | 84 ++ drivers/slimbus/Kconfig | 11 + drivers/slimbus/Makefile | 3 + drivers/slimbus/core.c | 39 + drivers/slimbus/messaging.c | 74 +- drivers/slimbus/qcom-ngd-ctrl.c | 1381 ++++++++++++++++++++ drivers/slimbus/slimbus.h | 10 + include/linux/slimbus.h | 14 +- 8 files changed, 1588 insertions(+), 28 deletions(-) create mode 100644 Documentation/devicetree/bindings/slimbus/slim-ngd-qcom-ctrl.txt create mode 100644 drivers/slimbus/qcom-ngd-ctrl.c -- 2.16.2

1 5

[alsa-devel] [PATCH] ASoC: Intel: kbl_da7219_max98357a: add fe_ops for kbl Audio Capture Port
by mac.chiang＠intel.com 19 Jun '18

19 Jun '18

From: Mac Chiang <mac.chiang(a)intel.com> platform support fixed constraint hw_prams as Stereo, 48KHz, 16 bits. This fixed the headset mic recorded noise due to mono capturing request from some apps. e.g. online Voice Recorder Signed-off-by: Louis Collard <louiscollard(a)google.com> Signed-off-by: Mac Chiang <mac.chiang(a)intel.com> --- sound/soc/intel/boards/kbl_da7219_max98357a.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/intel/boards/kbl_da7219_max98357a.c b/sound/soc/intel/boards/kbl_da7219_max98357a.c index 94294c2..7961f1f 100644 --- a/sound/soc/intel/boards/kbl_da7219_max98357a.c +++ b/sound/soc/intel/boards/kbl_da7219_max98357a.c @@ -380,6 +380,7 @@ static struct snd_soc_dai_link kabylake_dais[] = { .trigger = { SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST}, .dpcm_capture = 1, + .ops = &kabylake_da7219_fe_ops, }, [KBL_DPCM_AUDIO_DMIC_CP] = { .name = "Kbl Audio DMIC cap", -- 2.7.4

3 2

[alsa-devel] [PATCH 0/5] ASoC: Intel: geminilake: Adds da7219+max98537 machine driver support
by Naveen Manohar 19 Jun '18

19 Jun '18

Patch adds required changes in bxt machine & corresponding driver entry in machine to use MAX98357A codec as speaker on SSP1 and DA7219 codec as headset on SSP2 for GLK board. Naveen Manohar (5): ASoC: Intel: broxton: reduce machine name for bxt_da7219_max98357a ASoC: Intel: Headset button support in broxton machine driver ASoC: Intel: Add Geminilake Dialog Maxim machine driver support ASoC: Intel: glk: Add DAI links for Multi-Playback ASoC: Intel: Add Geminilake Dialog+Maxim machine driver entry sound/soc/intel/boards/bxt_da7219_max98357a.c | 308 ++++++++++++++++++++++++-- sound/soc/intel/skylake/skl.c | 9 +- 2 files changed, 297 insertions(+), 20 deletions(-) -- 2.7.4

6 11

[alsa-devel] [PATCH 0/8] ASoC: Intel: common ACPI tables - take2
by Pierre-Louis Bossart 19 Jun '18

19 Jun '18

Last fall we started using common codec-indexed ACPI tables in sound/soc/intel/common for BYT/CHT/HSW/BDW machine drivers. This is a follow-up for all Skylake+ platforms. The first three patches are cleanups and moves, no new functionality, the last 5 add support for GeminiLake machine drivers as well as references to SOF firmware/topology files. Some of the ApolloLake tables map to machine drivers that haven't been submitted yet but will be submitted after the SOF core patches, I thought it was better to just go ahead with a single set of changes. The code was pushed on https://github.com/plbossart/sound/tree/topic/skl-acpi-tables to trigger 0day tests, with no reports received. Naveen also tested the GLK integration with his own machine driver patches submitted earlier today. Comments welcome. Naveen Manohar (3): ASoC: Intel: broxton: reduce machine name for bxt_da7219_max98357a ASoC: Intel: common: Add Geminilake Dialog+Maxim machine driver entry ASoC: Intel: common: add Geminilake Realtek+Maxim machine driver entry Pierre-Louis Bossart (5): ASoC: Intel: Skylake: cleanup before moving ACPI tables ASoC: Intel: move SKL+ codec ACPI tables to common directory ASoC: Intel: common: add firmware/topology information for SOF ASoC: Intel: common: add entries for SOF-based machine drivers ASoC: Intel: common: fix copy/paste issue with SOF/broadwell topology file include/sound/soc-acpi-intel-match.h | 5 + sound/soc/intel/boards/bxt_da7219_max98357a.c | 4 +- sound/soc/intel/common/Makefile | 6 +- sound/soc/intel/common/soc-acpi-intel-bxt-match.c | 59 +++++++ sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 32 ++++ sound/soc/intel/common/soc-acpi-intel-glk-match.c | 51 +++++++ .../intel/common/soc-acpi-intel-hsw-bdw-match.c | 2 +- sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 91 +++++++++++ sound/soc/intel/common/soc-acpi-intel-skl-match.c | 47 ++++++ sound/soc/intel/skylake/skl.c | 170 ++------------------- 10 files changed, 303 insertions(+), 164 deletions(-) create mode 100644 sound/soc/intel/common/soc-acpi-intel-bxt-match.c create mode 100644 sound/soc/intel/common/soc-acpi-intel-cnl-match.c create mode 100644 sound/soc/intel/common/soc-acpi-intel-glk-match.c create mode 100644 sound/soc/intel/common/soc-acpi-intel-kbl-match.c create mode 100644 sound/soc/intel/common/soc-acpi-intel-skl-match.c base-commit: 5544717d416d9a095edc616be789bdab69e284dc -- 2.14.1

2 14

[alsa-devel] [PATCH] ASoC: pcm: Tidy up open/hw_params handling
by Charles Keepax 19 Jun '18

19 Jun '18

Currently, the core will continue processing open/hw_params component callbacks after one has failed even though it will abort immediately afterwards. This is unnecessary and also has the issue that close/hw_free will be called on the component which failed open/hw_params which could result in issues if the driver doesn't expect this behaviour. Update the core to abort processing open/hw_params when an error is hit and only call close/hw_free for those components that were successfully opened. Signed-off-by: Charles Keepax <ckeepax(a)opensource.cirrus.com> --- sound/soc/soc-pcm.c | 116 ++++++++++++++++++++++++++++------------------------ 1 file changed, 62 insertions(+), 54 deletions(-) diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 5e7ae47a9658..45b52f7b9690 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c @@ -448,6 +448,29 @@ static void soc_pcm_init_runtime_hw(struct snd_pcm_substream *substream) hw->rate_max = min_not_zero(hw->rate_max, rate_max); } +static int soc_pcm_components_close(struct snd_pcm_substream *substream, + struct snd_soc_component *last) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_rtdcom_list *rtdcom; + struct snd_soc_component *component; + + for_each_rtdcom(rtd, rtdcom) { + component = rtdcom->component; + + if (component == last) + break; + + if (!component->driver->ops || + !component->driver->ops->close) + continue; + + component->driver->ops->close(substream); + } + + return 0; +} + /* * Called by ALSA when a PCM substream is opened, the runtime->hw record is * then initialized and any private data can be allocated. This also calls @@ -462,7 +485,7 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) struct snd_soc_dai *cpu_dai = rtd->cpu_dai; struct snd_soc_dai *codec_dai; const char *codec_dai_name = "multicodec"; - int i, ret = 0, __ret; + int i, ret = 0; pinctrl_pm_select_default_state(cpu_dai->dev); for (i = 0; i < rtd->num_codecs; i++) @@ -486,7 +509,6 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) } } - ret = 0; for_each_rtdcom(rtd, rtdcom) { component = rtdcom->component; @@ -494,16 +516,15 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) !component->driver->ops->open) continue; - __ret = component->driver->ops->open(substream); - if (__ret < 0) { + ret = component->driver->ops->open(substream); + if (ret < 0) { dev_err(component->dev, "ASoC: can't open component %s: %d\n", - component->name, __ret); - ret = __ret; + component->name, ret); + goto component_err; } } - if (ret < 0) - goto component_err; + component = NULL; for (i = 0; i < rtd->num_codecs; i++) { codec_dai = rtd->codec_dais[i]; @@ -612,15 +633,7 @@ static int soc_pcm_open(struct snd_pcm_substream *substream) } component_err: - for_each_rtdcom(rtd, rtdcom) { - component = rtdcom->component; - - if (!component->driver->ops || - !component->driver->ops->close) - continue; - - component->driver->ops->close(substream); - } + soc_pcm_components_close(substream, component); if (cpu_dai->driver->ops->shutdown) cpu_dai->driver->ops->shutdown(substream, cpu_dai); @@ -714,15 +727,7 @@ static int soc_pcm_close(struct snd_pcm_substream *substream) if (rtd->dai_link->ops->shutdown) rtd->dai_link->ops->shutdown(substream); - for_each_rtdcom(rtd, rtdcom) { - component = rtdcom->component; - - if (!component->driver->ops || - !component->driver->ops->close) - continue; - - component->driver->ops->close(substream); - } + soc_pcm_components_close(substream, NULL); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { if (snd_soc_runtime_ignore_pmdown_time(rtd)) { @@ -874,6 +879,29 @@ int soc_dai_hw_params(struct snd_pcm_substream *substream, return 0; } +static int soc_pcm_components_hw_free(struct snd_pcm_substream *substream, + struct snd_soc_component *last) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_rtdcom_list *rtdcom; + struct snd_soc_component *component; + + for_each_rtdcom(rtd, rtdcom) { + component = rtdcom->component; + + if (component == last) + break; + + if (!component->driver->ops || + !component->driver->ops->hw_free) + continue; + + component->driver->ops->hw_free(substream); + } + + return 0; +} + /* * Called by ALSA when the hardware params are set by application. This * function can also be called multiple times and can allocate buffers @@ -886,7 +914,7 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, struct snd_soc_component *component; struct snd_soc_rtdcom_list *rtdcom; struct snd_soc_dai *cpu_dai = rtd->cpu_dai; - int i, ret = 0, __ret; + int i, ret = 0; mutex_lock_nested(&rtd->pcm_mutex, rtd->pcm_subclass); if (rtd->dai_link->ops->hw_params) { @@ -944,7 +972,6 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, if (ret < 0) goto interface_err; - ret = 0; for_each_rtdcom(rtd, rtdcom) { component = rtdcom->component; @@ -952,16 +979,15 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, !component->driver->ops->hw_params) continue; - __ret = component->driver->ops->hw_params(substream, params); - if (__ret < 0) { + ret = component->driver->ops->hw_params(substream, params); + if (ret < 0) { dev_err(component->dev, "ASoC: %s hw params failed: %d\n", - component->name, __ret); - ret = __ret; + component->name, ret); + goto component_err; } } - if (ret < 0) - goto component_err; + component = NULL; /* store the parameters for each DAIs */ cpu_dai->rate = params_rate(params); @@ -977,15 +1003,7 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, return ret; component_err: - for_each_rtdcom(rtd, rtdcom) { - component = rtdcom->component; - - if (!component->driver->ops || - !component->driver->ops->hw_free) - continue; - - component->driver->ops->hw_free(substream); - } + soc_pcm_components_hw_free(substream, component); if (cpu_dai->driver->ops->hw_free) cpu_dai->driver->ops->hw_free(substream, cpu_dai); @@ -1014,8 +1032,6 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, static int soc_pcm_hw_free(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_component *component; - struct snd_soc_rtdcom_list *rtdcom; struct snd_soc_dai *cpu_dai = rtd->cpu_dai; struct snd_soc_dai *codec_dai; bool playback = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; @@ -1052,15 +1068,7 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream) rtd->dai_link->ops->hw_free(substream); /* free any component resources */ - for_each_rtdcom(rtd, rtdcom) { - component = rtdcom->component; - - if (!component->driver->ops || - !component->driver->ops->hw_free) - continue; - - component->driver->ops->hw_free(substream); - } + soc_pcm_components_hw_free(substream, NULL); /* now free hw params for the DAIs */ for (i = 0; i < rtd->num_codecs; i++) { -- 2.11.0

2 1

[alsa-devel] [PATCH 0/6] ALSA: hda/ca0132: Various cleanups and fixes
by Alastair Bridgewater 19 Jun '18

19 Jun '18

The ca0132 codec support is fairly crufty, and the new R3Di and SBZ support hasn't exactly improved that situation. This patch series tries to clean up a small amount of longstanding cruft, reverse some behavioral changes to other systems made by the recent R3Di/SBZ patches, and make the DMic work properly on the Alienware M17x R4. For two of these patches (the QUIRK_ALIENWARE patch and the DMic patch), it may be that the correct behavior is the exact OPPOSITE of what the patch does as far as quirk testing goes (that is, it should apply globally, rather than limited to some specific quirk or set of quirks), but I have no way to make such a determination at this time, so erring on the side of the status quo ante seems appropriate. Alastair Bridgewater (6): ALSA: hda/ca0132: Delete pointless assignments to struct auto_pin_cfg fields ALSA: hda/ca0132: Delete redundant UNSOL event requests ALSA: hda/ca0132: Restore behavior of QUIRK_ALIENWARE ALSA: hda/ca0132: Don't test for QUIRK_NONE ALSA: hda/ca0132: Restore PCM Analog Mic-In2 ALSA: hda/ca0132: Fix DMic data rate for Alienware M17x R4 sound/pci/hda/patch_ca0132.c | 62 ++++++++++++++++---------------------------- 1 file changed, 22 insertions(+), 40 deletions(-) -- 2.16.1

3 17

[alsa-devel] [PATCH v2 0/7] soc: qcom: Allow COMPILE_TEST of all drivers
by Niklas Cassel 19 Jun '18

19 Jun '18

Since commit cab673583d96 ("soc: Unconditionally include qcom Makefile"), we unconditionally include the soc/qcom/Makefile. This opens up the possibility to compile test the code even when building for other architectures. This patch series prepares and enables all but two Kconfigs to be compile tested even when building for other architectures. Changes since v1: Added two new patches, "ASoC: qdsp6: Add depends on OF" and "soc: qcom: Remove bogus depends on OF". Patch "soc: qcom: Allow COMPILE_TEST of all drivers" now adds "depends on ARCH_QCOM || COMPILE_TEST" to the menu entry. Niklas Cassel (7): rpmsg: smd: Add missing include of sizes.h soc: qcom: smem: Add missing include of sizes.h soc: qcom: smp2p: Add select IRQ_DOMAIN soc: qcom: smsm: Add select IRQ_DOMAIN ASoC: qdsp6: Add depends on OF soc: qcom: Remove bogus depends on OF soc: qcom: Allow COMPILE_TEST of all drivers drivers/rpmsg/qcom_smd.c | 1 + drivers/soc/qcom/Kconfig | 14 +++++--------- drivers/soc/qcom/smem.c | 1 + sound/soc/qcom/Kconfig | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) -- 2.17.1

5 8

[alsa-devel] [PATCH v2] ASoC: topology: Add callback for DAPM route load/unload
by Liam Girdwood 19 Jun '18

19 Jun '18

Add a callback fro clients for notification about DAPM route loading and unloading. Signed-off-by: Liam Girdwood <liam.r.girdwood(a)linux.intel.com> --- Changes since V1: - Fixed merge conflict with recent component model update. --- include/sound/soc-topology.h | 7 +++++++ sound/soc/soc-topology.c | 13 +++++++++++++ 2 files changed, 20 insertions(+) diff --git a/include/sound/soc-topology.h b/include/sound/soc-topology.h index e1f265e21ee1..401ef2c45d6c 100644 --- a/include/sound/soc-topology.h +++ b/include/sound/soc-topology.h @@ -32,6 +32,7 @@ struct snd_kcontrol_new; struct snd_soc_dai_link; struct snd_soc_dai_driver; struct snd_soc_dai; +struct snd_soc_dapm_route; /* object scan be loaded and unloaded in groups with identfying indexes */ #define SND_SOC_TPLG_INDEX_ALL 0 /* ID that matches all FW objects */ @@ -116,6 +117,12 @@ struct snd_soc_tplg_ops { int (*control_unload)(struct snd_soc_component *, struct snd_soc_dobj *); + /* DAPM graph route element loading and unloading */ + int (*dapm_route_load)(struct snd_soc_component *, int index, + struct snd_soc_dapm_route *route); + int (*dapm_route_unload)(struct snd_soc_component *, + struct snd_soc_dobj *); + /* external widget init - used for any driver specific init */ int (*widget_load)(struct snd_soc_component *, int index, struct snd_soc_dapm_widget *, diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index a30bb94fc800..ed8c00b43ef9 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -1105,6 +1105,17 @@ static int soc_tplg_kcontrol_elems_load(struct soc_tplg *tplg, return 0; } +/* optionally pass new dynamic kcontrol to component driver. */ +static int soc_tplg_add_route(struct soc_tplg *tplg, + struct snd_soc_dapm_route *route) +{ + if (tplg->comp && tplg->ops && tplg->ops->dapm_route_load) + return tplg->ops->dapm_route_load(tplg->comp, tplg->index, + route); + + return 0; +} + static int soc_tplg_dapm_graph_elems_load(struct soc_tplg *tplg, struct snd_soc_tplg_hdr *hdr) { @@ -1153,6 +1164,8 @@ static int soc_tplg_dapm_graph_elems_load(struct soc_tplg *tplg, else route.control = elem->control; + soc_tplg_add_route(tplg, &route); + /* add route, but keep going if some fail */ snd_soc_dapm_add_routes(dapm, &route, 1); } -- 2.17.1

2 1

[alsa-devel] [PATCH v2] dmaengine: ti: omap-dma: Fix OMAP1510 incorrect residue_granularity
by Janusz Krzysztofik 19 Jun '18

19 Jun '18

Commit 0198d7bb8a0c ("ASoC: omap-mcbsp: Convert to use the sdma-pcm instead of omap-pcm") resulted in broken audio playback on OMAP1510 (discovered on Amstrad Delta). When running on OMAP1510, omap-pcm used to obtain DMA offset from snd_dmaengine_pcm_pointer_no_residue() based on DMA interrupt triggered software calculations instead of snd_dmaengine_pcm_pointer() which depended on residue value calculated from omap_dma_get_src_pos(). Similar code path is still available in now used sound/soc/soc-generic-dmaengine-pcm.c but it is not triggered. It was verified already before that omap_get_dma_src_pos() from arch/arm/plat-omap/dma.c didn't work correctly for OMAP1510 - see commit 1bdd7419910c ("ASoC: OMAP: fix OMAP1510 broken PCM pointer callback") for details. Apparently the same applies to its successor, omap_dma_get_src_pos() from drivers/dma/ti/omap-dma.c. On the other hand, snd_dmaengine_pcm_pointer_no_residue() is described as depreciated and discouraged for use in new drivers because of its unreliable accuracy. However, it seems the only working option for OPAM1510 now, as long as a software calculated residue is not implemented as OMAP1510 fallback in omap-dma. Using snd_dmaengine_pcm_pointer_no_residue() code path instead of snd_dmaengine_pcm_pointer() in sound/soc/soc-generic-dmaengine-pcm.c can be triggered in two ways: - by passing pcm->flags |= SND_DMAENGINE_PCM_FLAG_NO_RESIDUE from sound/soc/omap/sdma-pcm.c, - by passing dma_caps.residue_granularity = DMA_RESIDUE_GRANULARITY_DESCRIPTOR from DMA engine. Let's do the latter. Created and tested against next-20180531 tag from linux-next tree. Signed-off-by: Janusz Krzysztofik <jmkrzyszt(a)gmail.com> Acked-by: Peter Ujfalusi <peter.ujfalusi(a)ti.com> --- Changelog: v2: fix subject as requested by Peter. drivers/dma/ti/omap-dma.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/dma/ti/omap-dma.c b/drivers/dma/ti/omap-dma.c index b73fb51fbc81..96b5096c26dd 100644 --- a/drivers/dma/ti/omap-dma.c +++ b/drivers/dma/ti/omap-dma.c @@ -1485,7 +1485,11 @@ static int omap_dma_probe(struct platform_device *pdev) od->ddev.src_addr_widths = OMAP_DMA_BUSWIDTHS; od->ddev.dst_addr_widths = OMAP_DMA_BUSWIDTHS; od->ddev.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV); - od->ddev.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST; + if (__dma_omap15xx(od->plat->dma_attr)) + od->ddev.residue_granularity = + DMA_RESIDUE_GRANULARITY_DESCRIPTOR; + else + od->ddev.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST; od->ddev.max_burst = SZ_16M - 1; /* CCEN: 24bit unsigned */ od->ddev.dev = &pdev->dev; INIT_LIST_HEAD(&od->ddev.channels); -- 2.16.1

2 1