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

[alsa-devel] [RFC v4 0/9] Enable HDA Codec support on Intel Platforms (Series2)
by Rakesh Ughreja 22 Dec '17

22 Dec '17

Many Intel platforms (SKL, KBL) etc. in the market supports enhanced audio capabilities which also includes DSP processing. This patch carry forwards the works that is done in the previous series to enable HD Audio codecs on such platforms. This patch series adds ASoC HDA codec driver for Intel platforms. It is written by reusing the legacy HDA ALSA codec driver. Intention is to maximize the reuse and minimize the changes in the legacy HDA codec driver. I would like to receive feedback before proceeding further on this direction. INFO: - This series is tested on KBL based product (Dell XPS 13). - Basic playback is working with headset and speakers. - HDMI playback is working. - Capture operation is not tested. - Playback using legacy drivers is tested. - More platforms and use cases coverage can be added once we have basic agreement in terms of the overall approach. Changes in v4: - new field bus type is added to distinguish bus type allocated by the controller or platform drivers. - extended routines are provided in hdac_bus which are called by legacy codec driver when the bus type is ext. - hdac_hda driver is converted into a passive library. Changes in v3: - snd_hda_codec_new API is split into two, so that it can be used by legacy as well as ASoC codec drivers. API is split into two to avoid bus registration when called by ASoC drivers. - Moved the __hda_codec_driver_register and hda_codec_driver_unregister APIs into generic driver and it performs registration for ASoC codec drivers also. So now there is only one kernel image for ASoC as well as legacy codec drivers. Registration functions had to moved to generic driver to resolve the circular dependency between hdac_hda and hda_codec drivers. - There is a Kconfig entry added to compile the ASoC version of HDA codec driver. For now only the Realtek codec entry is added. Same thing needs to be done for rest of the codec drivers also. Changes in v2: - Using Topology framework to create DAIs and DAI Links - Moved most commonly used functions into a separate file for machine driver. - Implemented separate Realtek ASoC HDA Driver driver for Realtek HDA codecs. It is just a driver registration wrapper which reuses the legacy HDA codec driver. This allows the removes the limitation that was present in v1. Rakesh Ughreja (9): ASoC: Intel: Boards: Machine driver for Intel platforms ASoC: Intel: Skylake: Add entry in sst_acpi_mach for HDA codecs ASoC: Intel: Skylake: add HDA BE DAIs ASoC: Intel: Skylake: use hda_bus instead of hdac_bus ALSA: hda - split snd_hda_codec_new function ALSA: hdac: remove memory allocation from snd_hdac_ext_bus_device_init ALSA: hdac: add bus type and extended ops support in hdac_bus ASoC: hdac_hda: add asoc extension for legacy HDA codec drivers ASoC: Intel: Boards: add support for HDA codecs include/sound/hdaudio.h | 24 ++ include/sound/hdaudio_ext.h | 6 +- sound/hda/ext/hdac_ext_bus.c | 14 +- sound/hda/hdac_bus.c | 1 + sound/pci/hda/hda_bind.c | 15 + sound/pci/hda/hda_codec.c | 67 +++- sound/pci/hda/hda_codec.h | 2 + sound/soc/codecs/Kconfig | 5 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/hdac_hda.c | 517 +++++++++++++++++++++++++++ sound/soc/codecs/hdac_hda.h | 20 ++ sound/soc/intel/boards/Kconfig | 11 + sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/skl_hda_dsp_common.c | 163 +++++++++ sound/soc/intel/boards/skl_hda_dsp_common.h | 34 ++ sound/soc/intel/boards/skl_hda_dsp_generic.c | 132 +++++++ sound/soc/intel/skylake/skl-pcm.c | 32 +- sound/soc/intel/skylake/skl.c | 88 ++++- sound/soc/intel/skylake/skl.h | 10 +- 19 files changed, 1102 insertions(+), 43 deletions(-) create mode 100644 sound/soc/codecs/hdac_hda.c create mode 100644 sound/soc/codecs/hdac_hda.h create mode 100644 sound/soc/intel/boards/skl_hda_dsp_common.c create mode 100644 sound/soc/intel/boards/skl_hda_dsp_common.h create mode 100644 sound/soc/intel/boards/skl_hda_dsp_generic.c -- 2.7.4

1 9

[alsa-devel] [RFC v3 00/11] Enable HDA Codec support on Intel Platforms (Series2)
by Rakesh Ughreja 22 Dec '17

22 Dec '17

Many Intel platforms (SKL, KBL) etc. in the market supports enhanced audio capabilities which also includes DSP processing. This patch carry forwards the works that is done in the previous series to enable HD Audio codecs on such platforms. This patch series adds ASoC HDA codec driver for Intel platforms. It is written by reusing the legacy HDA ALSA codec driver. Intention is to maximize the reuse and minimize the changes in the legacy HDA codec driver. I would like to receive feedback before proceeding further on this direction. INFO: - This series is tested on KBL based product (Dell XPS 13). - Basic playback is working with headset and speakers. - HDMI playback is working. - Capture operation is not tested. - Playback using legacy drivers is tested. - More platforms and use cases coverage can be added once we have basic agreement in terms of the overall approach. Changes in v3: - snd_hda_codec_new API is split into two, so that it can be used by legacy as well as ASoC codec drivers. API is split into two to avoid bus registration when called by ASoC drivers. - Moved the __hda_codec_driver_register and hda_codec_driver_unregister APIs into generic driver and it performs registration for ASoC codec drivers also. So now there is only one kernel image for ASoC as well as legacy codec drivers. Registration functions had to moved to generic driver to resolve the circular dependency between hdac_hda and hda_codec drivers. - There is a Kconfig entry added to compile the ASoC version of HDA codec driver. For now only the Realtek codec entry is added. Same thing needs to be done for rest of the codec drivers also. Changes in v2: - Using Topology framework to create DAIs and DAI Links - Moved most commonly used functions into a separate file for machine driver - Implemented separate Realtek ASoC HDA Driver driver for Realtek HDA codecs. It is just a driver registration wrapper which reuses the legacy HDA codec driver. This allows the removes the limitation that was present in v1. - Implemented the review feedback. Rakesh Ughreja (11): ASoC: Intel: Boards: Machine driver for Intel platforms ASoC: Intel: Skylake: Add entry in sst_acpi_mach for HDA codecs ASoC: Intel: Skylake: add HDA BE DAIs ASoC: Intel: Skylake: use hda_bus instead of hdac_bus ALSA: hda - make some of the functions externally visible ASoC: hdac_hda: add ASoC based HDA codec driver ALSA: hda: split API snd_hda_codec_new for using it from ASoC codec drivers ASoC: hdac_hda: add DAI, widgets and related ops ASoC: hdac_hda: add runtime PM support ASoC: codec: Support for ASoC Realtek HDA codec Driver ASoC: Intel: Boards: add support for HDA codecs include/sound/hdaudio_ext.h | 3 +- sound/hda/ext/hdac_ext_bus.c | 9 +- sound/pci/hda/hda_bind.c | 10 +- sound/pci/hda/hda_codec.c | 88 +++- sound/pci/hda/hda_codec.h | 11 +- sound/pci/hda/hda_generic.c | 38 ++ sound/soc/codecs/Kconfig | 12 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/hdac_hda.c | 629 +++++++++++++++++++++++++++ sound/soc/codecs/hdac_hda.h | 22 + sound/soc/intel/boards/Kconfig | 11 + sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/skl_hda_dsp_common.c | 173 ++++++++ sound/soc/intel/boards/skl_hda_dsp_common.h | 42 ++ sound/soc/intel/boards/skl_hda_dsp_generic.c | 141 ++++++ sound/soc/intel/skylake/skl-pcm.c | 32 +- sound/soc/intel/skylake/skl.c | 79 +++- sound/soc/intel/skylake/skl.h | 10 +- 18 files changed, 1268 insertions(+), 46 deletions(-) create mode 100644 sound/soc/codecs/hdac_hda.c create mode 100644 sound/soc/codecs/hdac_hda.h create mode 100644 sound/soc/intel/boards/skl_hda_dsp_common.c create mode 100644 sound/soc/intel/boards/skl_hda_dsp_common.h create mode 100644 sound/soc/intel/boards/skl_hda_dsp_generic.c -- 2.7.4

4 33

[alsa-devel] [PATCH][next] soundwire: intel: fix missing assignment to ret
by Colin King 22 Dec '17

22 Dec '17

From: Colin Ian King <colin.king(a)canonical.com> Currently the return status ret is being checked but it has not been updated since the previous check on ret. It appears that assignment of ret from return status of the call to sdw_cdns_enable_interrupt was accidentally ommited. Fix this. Detected by CoverityScan, CID#1463148 ("Logically dead code") Fixes: 71bb8a1b059e ("soundwire: intel: Add Intel Master driver") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- drivers/soundwire/intel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c index 6a9177ea6eb9..86a7bd1fc912 100644 --- a/drivers/soundwire/intel.c +++ b/drivers/soundwire/intel.c @@ -295,7 +295,7 @@ static int intel_probe(struct platform_device *pdev) if (ret) goto err_init; - sdw_cdns_enable_interrupt(&sdw->cdns); + ret = sdw_cdns_enable_interrupt(&sdw->cdns); if (ret) goto err_init; -- 2.14.1

3 4

[alsa-devel] [PATCH][next] soundwire: fix sign extension when shifting buf[2] 24 places
by Colin King 22 Dec '17

22 Dec '17

From: Colin Ian King <colin.king(a)canonical.com> The buf[2] left shift by 24 bits is promoted to int (32 bit signed) and then signed-extended to unsigned long long. Hence if the upper bit to buf[2] is set then all the upper bits of addr end up as 1. Fix this by casting it to u64 before shifting it. Also replace the unsigned long long casts to u64 casts to match the same type of addr. Detected by CoverityScan, CID#1463147 ("Unintended sign extension") Fixes: d52d7a1be02c ("soundwire: Add Slave status handling helpers") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- drivers/soundwire/bus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c index 4c345197eb55..7211ecc62015 100644 --- a/drivers/soundwire/bus.c +++ b/drivers/soundwire/bus.c @@ -522,8 +522,8 @@ static int sdw_program_device_num(struct sdw_bus *bus) * bits to avoid truncation due to size limit. */ addr = buf[5] | (buf[4] << 8) | (buf[3] << 16) | - (buf[2] << 24) | ((unsigned long long)buf[1] << 32) | - ((unsigned long long)buf[0] << 40); + ((u64)buf[2] << 24) | ((u64)buf[1] << 32) | + ((u64)buf[0] << 40); sdw_extract_slave_id(bus, addr, &id); -- 2.14.1

2 1

[alsa-devel] [PATCH] ALSA: hda: Drop useless WARN_ON()
by Takashi Iwai 22 Dec '17

22 Dec '17

Since the commit 97cc2ed27e5a ("ALSA: hda - Fix yet another i915 pointer leftover in error path") cleared hdac_acomp pointer, the WARN_ON() non-NULL check in snd_hdac_i915_register_notifier() may give a false-positive warning, as the function gets called no matter whether the component is registered or not. For fixing it, let's get rid of the spurious WARN_ON(). Fixes: 97cc2ed27e5a ("ALSA: hda - Fix yet another i915 pointer leftover in error path") Cc: <stable(a)vger.kernel.org> Reported-by: Kouta Okamoto <kouta.okamoto(a)toshiba.co.jp> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/hda/hdac_i915.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/hda/hdac_i915.c b/sound/hda/hdac_i915.c index 038a180d3f81..cbe818eda336 100644 --- a/sound/hda/hdac_i915.c +++ b/sound/hda/hdac_i915.c @@ -325,7 +325,7 @@ static int hdac_component_master_match(struct device *dev, void *data) */ int snd_hdac_i915_register_notifier(const struct i915_audio_component_audio_ops *aops) { - if (WARN_ON(!hdac_acomp)) + if (!hdac_acomp) return -ENODEV; hdac_acomp->audio_ops = aops; -- 2.15.1

1 0

[alsa-devel] [PATCH 1/3] ALSA: hda - Add MIC_NO_PRESENCE fixup for 2 HP machines
by Hui Wang 22 Dec '17

22 Dec '17

There is a headset jack on the front panel, when we plug a headset into it, the headset mic can't trigger unsol events, and read_pin_sense() can't detect its presence too. So add this fixup to fix this issue. Cc: <stable(a)vger.kernel.org> Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- sound/pci/hda/patch_conexant.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index a81aacf..37e1cf8 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -271,6 +271,8 @@ enum { CXT_FIXUP_HP_SPECTRE, CXT_FIXUP_HP_GATE_MIC, CXT_FIXUP_MUTE_LED_GPIO, + CXT_FIXUP_HEADSET_MIC, + CXT_FIXUP_HP_MIC_NO_PRESENCE, }; /* for hda_fixup_thinkpad_acpi() */ @@ -350,6 +352,18 @@ static void cxt_fixup_headphone_mic(struct hda_codec *codec, } } +static void cxt_fixup_headset_mic(struct hda_codec *codec, + const struct hda_fixup *fix, int action) +{ + struct conexant_spec *spec = codec->spec; + + switch (action) { + case HDA_FIXUP_ACT_PRE_PROBE: + spec->parse_flags |= HDA_PINCFG_HEADSET_MIC; + break; + } +} + /* OPLC XO 1.5 fixup */ /* OLPC XO-1.5 supports DC input mode (e.g. for use with analog sensors) @@ -880,6 +894,19 @@ static const struct hda_fixup cxt_fixups[] = { .type = HDA_FIXUP_FUNC, .v.func = cxt_fixup_mute_led_gpio, }, + [CXT_FIXUP_HEADSET_MIC] = { + .type = HDA_FIXUP_FUNC, + .v.func = cxt_fixup_headset_mic, + }, + [CXT_FIXUP_HP_MIC_NO_PRESENCE] = { + .type = HDA_FIXUP_PINS, + .v.pins = (const struct hda_pintbl[]) { + { 0x1a, 0x02a1113c }, + { } + }, + .chained = true, + .chain_id = CXT_FIXUP_HEADSET_MIC, + }, }; static const struct snd_pci_quirk cxt5045_fixups[] = { @@ -934,6 +961,8 @@ static const struct snd_pci_quirk cxt5066_fixups[] = { SND_PCI_QUIRK(0x103c, 0x8115, "HP Z1 Gen3", CXT_FIXUP_HP_GATE_MIC), SND_PCI_QUIRK(0x103c, 0x814f, "HP ZBook 15u G3", CXT_FIXUP_MUTE_LED_GPIO), SND_PCI_QUIRK(0x103c, 0x822e, "HP ProBook 440 G4", CXT_FIXUP_MUTE_LED_GPIO), + SND_PCI_QUIRK(0x103c, 0x8299, "HP 800 G3 SFF", CXT_FIXUP_HP_MIC_NO_PRESENCE), + SND_PCI_QUIRK(0x103c, 0x829a, "HP 800 G3 DM", CXT_FIXUP_HP_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1043, 0x138d, "Asus", CXT_FIXUP_HEADPHONE_MIC_PIN), SND_PCI_QUIRK(0x152d, 0x0833, "OLPC XO-1.5", CXT_FIXUP_OLPC_XO), SND_PCI_QUIRK(0x17aa, 0x20f2, "Lenovo T400", CXT_PINCFG_LENOVO_TP410), -- 2.7.4

2 5

[alsa-devel] ALSA: hda - Fix pointer leftover issues in hdac_acomp
by 岡本幸大 22 Dec '17

22 Dec '17

Hello I run into an Oops while executing "cat /proc/iomem" on the latest 4.4 kernel. See the log below: [ 55.945264] BUG: unable to handle kernel NULL pointer dereference at 0000000000000020 [ 55.945292] IP: [<ffffffff8f10d00e>] r_show+0x34/0xb4 [ 55.945324] PGD d7a39067 PUD cb3e9067 PMD 0 [ 55.945342] Oops: 0000 [#1] PREEMPT SMP [ 55.945358] Modules linked in: snd_hda_codec_hdmi(E) dell_led(E) input_leds(E) joydev(E) snd_hda_codec_realtek(E) snd_hda_codec_generic(E) i915(E) snd_hda_intel(E) snd_hda_codec(E) snd_hda_core(E) snd_hwdep(E) snd_pcm(E) snd_seq_midi(E) snd_seq_midi_event(E) drm_kms_helper(E) snd_rawmidi(E) snd_seq(E) acpi_als(E) kfifo_buf(E) intel_rapl(E) snd_seq_device(E) snd_timer(E) drm(E) snd(E) industrialio(E) x86_pkg_temp_thermal(E) dell_wmi(E) sparse_keymap(E) dcdbas(E) intel_powerclamp(E) coretemp(E) serio_raw(E) wmi(E) mei_me(E) i2c_algo_bit(E) parport_pc(E) soundcore(E) fb_sys_fops(E) syscopyarea(E) intel_lpss_acpi(E) sysfillrect(E) mei(E) ppdev(E) intel_lpss(E) sysimgblt(E) mac_hid(E) 8250_fintek(E) i2c_hid(E) lp(E) parport(E) hid_generic(E) usbhid(E) hid(E) psmouse(E) r8169(E) mii(E) ahci(E) libahci(E) fjes(E) [ 55.945630] CPU: 0 PID: 1781 Comm: cat Tainted: G E 4.4.92-cip11-pc-platform #1 [ 55.945655] Hardware name: Dell Inc. OptiPlex 3050/0W0CHX, BIOS 1.5.4 07/14/2017 [ 55.945679] task: ffff8800cb060400 ti: ffff8800c9910000 task.ti: ffff8800c9910000 [ 55.945701] RIP: 0010:[<ffffffff8f10d00e>] [<ffffffff8f10d00e>] r_show+0x34/0xb4 [ 55.945726] RSP: 0018:ffff8800c9913da8 EFLAGS: 00010297 [ 55.945743] RAX: 0000000000000000 RBX: 0000000000000001 RCX: 0000000000001000 [ 55.945765] RDX: ffffffff8fe42130 RSI: ffff8800d89844a8 RDI: ffff8800d9250dc0 [ 55.945786] RBP: ffff8800c9913dc8 R08: 0000000000000008 R09: 0000000000000001 [ 55.945807] R10: 0000000000000000 R11: 0000000000000201 R12: ffff8800d89844a8 [ 55.945828] R13: ffff8800d9250dc0 R14: ffff8800d9250dc0 R15: ffff880118719500 [ 55.945851] FS: 00007f12f3dce740(0000) GS:ffff88011dc00000(0000) knlGS:0000000000000000 [ 55.945876] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 55.945894] CR2: 0000000000000020 CR3: 000000003f7e9000 CR4: 00000000003406f0 [ 55.945916] Stack: [ 55.945923] ffffffff8fa2ffa0 0000000000000000 0000000000010000 ffff8800c9913f28 [ 55.945950] ffff8800c9913e30 ffffffff8f22e009 ffff8800d89844a8 000000000000063c [ 55.945976] ffff8800d9250e00 0000000001ae0000 000000000000002d 000000000000002e [ 55.946013] Call Trace: [ 55.946025] [<ffffffff8f22e009>] seq_read+0x24b/0x317 [ 55.946043] [<ffffffff8f263c1a>] proc_reg_read+0x48/0x67 [ 55.946061] [<ffffffff8f263bd2>] ? proc_reg_write+0x67/0x67 [ 55.946080] [<ffffffff8f21011a>] __vfs_read+0x26/0xba [ 55.946097] [<ffffffff8f37cb49>] ? security_file_permission+0x96/0xa3 [ 55.946118] [<ffffffff8f21070c>] ? rw_verify_area+0x7e/0xd2 [ 55.946135] [<ffffffff8f2107f8>] vfs_read+0x98/0x123 [ 55.946151] [<ffffffff8f21131d>] SyS_read+0x4e/0x89 [ 55.946169] [<ffffffff8f84dbae>] entry_SYSCALL_64_fastpath+0x12/0x71 [ 55.946188] Code: 41 55 41 54 53 50 49 89 fd 48 8b 97 80 00 00 00 49 89 f4 48 89 f0 48 81 7a 08 00 00 01 00 45 19 c0 31 db 41 83 e0 fc 41 83 c0 08 <48> 8b 40 20 48 39 d0 74 07 ff c3 83 fb 05 75 f0 49 8b 7d 78 ba [ 55.946310] RIP [<ffffffff8f10d00e>] r_show+0x34/0xb4 [ 55.946328] RSP <ffff8800c9913da8> [ 55.946339] CR2: 0000000000000020 I found out that the problem is in sound/hda/hdac_i915.c. When the i915 component binding failed in snd_hdac_i915_init(), the memory used for "acomp" was released and "bus->audio_component" was cleared. However "hadc_acomp" was not. "hdac_acomp" is later used in snd_hdac_i915_register_notifier(), which leads to the Oops. In my case, the pointer left over in "hdac_acomp" is re-used for the iomem control structure, causing the above Oops. The following commits, already upstream, fix the above issue by clearing "hdac_acomp". faafd03d23c913633d2ef7e6ffebdce01b164409 (ALSA: hda - Clear the leftover component assignment at snd_hdac_i915_exit()) 97cc2ed27e5a168cf423f67c3bc7c6cc41d12f82 (ALSA: hda - Fix yet another i915 pointer leftover in error path) The commit 97cc2ed27e5a168cf423f67c3bc7c6cc41d12f82 depends on the following commit, just a change in log message. bed2e98e1f4db8b827df507abc30be7b11b0613d (ALSA: hda - Degrade i915 binding failure message) With the patches above applied, a WARNING still occurrs if "hdac_acomp" has a NULL pointer in snd_hdac_i915_register_notifier(). int snd_hdac_i915_register_notifier(const struct i915_audio_component_audio_ops *aops) { if (WARN_ON(!hdac_acomp)) <-- return -ENODEV; This WARNING is also fixed upstream with the following commit, whose main purpose is to support old Intel PCH devices, but it also suppress the WARNING. 6603249dcdbb6aab0b726bdf372d6f20c0d2d611 (ALSA: hda - Enable audio component for old Intel PCH devices) Please consider applying the above 4 patches to the kernel 4.4 [ LTS ]. Thanks, Kouta

3 6

[alsa-devel] [PATCH v1 1/1] ASoC: rsnd: ssi: Fix issue in dma data address assignment
by jiada_wang＠mentor.com 22 Dec '17

22 Dec '17

From: Jiada Wang <jiada_wang(a)mentor.com> Same SSI device may be used in different dai links, by only having one dma struct in rsnd_ssi, after the first instance's dma config be initilized, the following instances can no longer configure dma, this causes issue, when their dma data address are different from the first instance. This patch by introduces two dma struct in rdai, each SSI instance in a dai link is assigned with two dma struct, to store dma configuration for playback and capture. Signed-off-by: Jiada Wang <jiada_wang(a)mentor.com> --- sound/soc/sh/rcar/rsnd.h | 2 ++ sound/soc/sh/rcar/ssi.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 57cd2bc..a26156c 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -459,6 +459,8 @@ struct rsnd_dai { unsigned int frm_clk_inv:1; unsigned int sys_delay:1; unsigned int data_alignment:1; + + struct rsnd_mod *dma[2]; }; #define rsnd_rdai_nr(priv) ((priv)->rdai_nr) diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index fece1e5f..4e97065 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -66,7 +66,6 @@ struct rsnd_ssi { struct rsnd_mod mod; - struct rsnd_mod *dma; u32 flags; u32 cr_own; @@ -861,7 +860,8 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod, struct rsnd_dai_stream *io, struct rsnd_priv *priv) { - struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod); + struct rsnd_dai *rdai = rsnd_io_to_rdai(io); + int is_play = rsnd_io_is_play(io); int ret; /* @@ -876,7 +876,7 @@ static int rsnd_ssi_dma_probe(struct rsnd_mod *mod, return ret; /* SSI probe might be called many times in MUX multi path */ - ret = rsnd_dma_attach(io, mod, &ssi->dma); + ret = rsnd_dma_attach(io, mod, &rdai->dma[is_play]); return ret; } -- 1.7.9.5

3 6

[alsa-devel] [alsa-lib][PATCH 0/4] pcm: minor code cleanup
by Takashi Sakamoto 22 Dec '17

22 Dec '17

Hi, When reviewing Maciej's patches[1], I found that alsa-lib includes some unused codes in linear interpolation functionality. Furthermore, some code comments includes 'copy & paste' mistakes. This patchset improves them. [1] http://mailman.alsa-project.org/pipermail/alsa-devel/2017-December/129370.h… Takashi Sakamoto (4): pcm: remove unused macros of COPY_LABELS/COPY_END pcm: remove unused macros of GETU_LABELS/GETU_END pcm: remove unused macros of NORMS_LABELS/NORMS_END pcm: fix wrong comments for some cases of linear interpolation of PCM samples src/pcm/plugin_ops.h | 341 ++------------------------------------------------- 1 file changed, 8 insertions(+), 333 deletions(-) -- 2.14.1

2 7

[alsa-devel] About ASoC DAIs cleanup
by Kuninori Morimoto 22 Dec '17

22 Dec '17

Hi Mark, Lars-Peter Cc Vinod About current CPU/Codec DAIs, it is unbalance now I guess. Codec supports multi DAIs, but CPU is only single DAI. Because of this unbalanced DAIs support, Each DAIs code are not readable. In perfect world, I guess no categorized DAI is nice, but in reality, it is difficult. Because many drivers are directly using rtd->codec_dai / rtd->cpu_dai, and it is difficult to lookup CPU/Codec DAI from non categorize DAIs. Thus, we can't support non-categorized DAI at this point. Now Vinod want to use Multi CPU DAI. If we can support Multi CPU DAI / Multi Codec DAI, we can cleanup current DAI code more. But what do you think ? Best regards --- Kuninori Morimoto

3 11