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

[alsa-devel] Trying to write control utility for YAMAHA Cavit DP-U50/AP-U70/RP-U200.
by Tahiro Hashizume 11 Oct '18

11 Oct '18

Hi The devices of my interest is in fact 18yrs old, but just can't stop using them for being too useful. (I own DP-U50 and RP-U200). For these devices: A.)Source selecting as well as alteration of the labels (for each input) to be displayed on the VDF are possible. B.)Internal DSP is highly configurable c.)Tuner presets are editable (RP-U200 only) through the Win32 utility (DP-U50.exe/AP-U70.exe/RP-U200.exe). Most of sound-related details should be at http://www.alsa-project.org/db/?f=9aad4f38c69efd1c6ae90de239063efeb5a61dce. Basically I am stuck with almost no experience in this, but am trying to write some code to implement the Linux-alternative of these utilities to at least enable the source selecting from Linux via USB (mostly intended to be used with shairplay-sync). Thought examples of device-specific utilities as found in alsa-tools may help but I just don't see connections between USB-dump and control signals that may be accepted by those listed in amixer. Side-notes(Findings so far): The device appears as a composite with several Audio interfaces and a HID-Class interface. Knowing this from early days, I first decided to see hexdump outputs on "/dev/hidraw0" and it indicated what looked like the representation of current status of the device while turning knobs and switching inputs. My guess is, the device takes special commands via the control and echos the current status via HID which is visible as "/dev/hidraw0". ("/dev/input/event0" is also present but doesn't really spit anything.) At this point, thought this was a bi-directional communication via HID-Class (by which I was wrong, as I found out later). Thinking collecting several packet captures under controlled conditions would help understand the mechanism, moved onto capturing WindowMessages (of RP-U200.exe) with Spy++ from which I was able to implement the automated operation of RP-U200.exe via Python. See: https://www.youtube.com/watch?v=-Il9vKtnr1A Figured out 1.)messages of "WM_USER + 1" are from "hid_io.dll" to RP-U200.exe 2.)messages of "WM_USER + 201" are the actual inputs to RP-U200.exe About files attached: a.)RP-U200.hexdump.txt shows outputs observed on "/dev/hidraw0" as I turned the volume knob from min to max and down to min. b.)"util_launch.pcapng.json" shows the interactions between host (Win10 x64) and RP-U200 as RP-U200.exe was being launched (Power:Off->Off). c.)"util_power_on.pcapng.json" shows the interactions between host (Win10 x64) and RP-U200 starting shortly before I pressed the Power button on RP-U200.exe, ending with the output relays closed for speaker outputs (Power:Off->On). Any comments should keep me encouraged. Thanks in advance. Tahiro.H

1 0

[alsa-devel] [asoc:for-4.20 333/490] sound/pci//hda/patch_ca0132.c:7650:20: error: implicit declaration of function 'pci_iomap'; did you mean 'pcim_iomap'?
by kbuild test robot 11 Oct '18

11 Oct '18

Hi Rakesh, FYI, the error/warning still remains. tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-4.20 head: 8036dbc490d16dc3d998246e14c9507ec8272ae2 commit: 6bae5ea9498926440ffc883f3dbceb0adc65e492 [333/490] ASoC: hdac_hda: add asoc extension for legacy HDA codec drivers config: sh-allmodconfig (attached as .config) compiler: sh4-linux-gnu-gcc (Debian 7.2.0-11) 7.2.0 reproduce: wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout 6bae5ea9498926440ffc883f3dbceb0adc65e492 # save the attached .config to linux build tree GCC_VERSION=7.2.0 make.cross ARCH=sh All errors (new ones prefixed by >>): sound/pci//hda/patch_ca0132.c: In function 'patch_ca0132': >> sound/pci//hda/patch_ca0132.c:7650:20: error: implicit declaration of function 'pci_iomap'; did you mean 'pcim_iomap'? [-Werror=implicit-function-declaration] spec->mem_base = pci_iomap(codec->bus->pci, 2, 0xC20); ^~~~~~~~~ pcim_iomap sound/pci//hda/patch_ca0132.c:7650:18: warning: assignment makes pointer from integer without a cast [-Wint-conversion] spec->mem_base = pci_iomap(codec->bus->pci, 2, 0xC20); ^ cc1: some warnings being treated as errors vim +7650 sound/pci//hda/patch_ca0132.c d5c016b56 Gabriele Martino 2015-05-18 7581 95c6e9cb7 Ian Minett 2011-06-15 7582 static int patch_ca0132(struct hda_codec *codec) 95c6e9cb7 Ian Minett 2011-06-15 7583 { 95c6e9cb7 Ian Minett 2011-06-15 7584 struct ca0132_spec *spec; a73d511c4 Ian Minett 2012-12-20 7585 int err; d5c016b56 Gabriele Martino 2015-05-18 7586 const struct snd_pci_quirk *quirk; 95c6e9cb7 Ian Minett 2011-06-15 7587 4e76a8833 Takashi Iwai 2014-02-25 7588 codec_dbg(codec, "patch_ca0132\n"); 95c6e9cb7 Ian Minett 2011-06-15 7589 95c6e9cb7 Ian Minett 2011-06-15 7590 spec = kzalloc(sizeof(*spec), GFP_KERNEL); 95c6e9cb7 Ian Minett 2011-06-15 7591 if (!spec) 95c6e9cb7 Ian Minett 2011-06-15 7592 return -ENOMEM; 95c6e9cb7 Ian Minett 2011-06-15 7593 codec->spec = spec; 993884f6a Chih-Chung Chang 2013-03-25 7594 spec->codec = codec; 95c6e9cb7 Ian Minett 2011-06-15 7595 225068ab2 Takashi Iwai 2015-05-29 7596 codec->patch_ops = ca0132_patch_ops; 225068ab2 Takashi Iwai 2015-05-29 7597 codec->pcm_format_first = 1; 225068ab2 Takashi Iwai 2015-05-29 7598 codec->no_sticky_stream = 1; 225068ab2 Takashi Iwai 2015-05-29 7599 d5c016b56 Gabriele Martino 2015-05-18 7600 /* Detect codec quirk */ d5c016b56 Gabriele Martino 2015-05-18 7601 quirk = snd_pci_quirk_lookup(codec->bus->pci, ca0132_quirks); d5c016b56 Gabriele Martino 2015-05-18 7602 if (quirk) d5c016b56 Gabriele Martino 2015-05-18 7603 spec->quirk = quirk->value; d5c016b56 Gabriele Martino 2015-05-18 7604 else d5c016b56 Gabriele Martino 2015-05-18 7605 spec->quirk = QUIRK_NONE; d5c016b56 Gabriele Martino 2015-05-18 7606 e24aa0a4c Takashi Iwai 2014-08-10 7607 spec->dsp_state = DSP_DOWNLOAD_INIT; a7e76271b Ian Minett 2012-12-20 7608 spec->num_mixers = 1; 017310fbe Connor McAdams 2018-05-08 7609 017310fbe Connor McAdams 2018-05-08 7610 /* Set which mixers each quirk uses. */ 017310fbe Connor McAdams 2018-05-08 7611 switch (spec->quirk) { 017310fbe Connor McAdams 2018-05-08 7612 case QUIRK_SBZ: e25e34450 Connor McAdams 2018-08-08 7613 spec->mixers[0] = desktop_mixer; 017310fbe Connor McAdams 2018-05-08 7614 snd_hda_codec_set_name(codec, "Sound Blaster Z"); 017310fbe Connor McAdams 2018-05-08 7615 break; e25e34450 Connor McAdams 2018-08-08 7616 case QUIRK_R3D: e25e34450 Connor McAdams 2018-08-08 7617 spec->mixers[0] = desktop_mixer; e25e34450 Connor McAdams 2018-08-08 7618 snd_hda_codec_set_name(codec, "Recon3D"); e25e34450 Connor McAdams 2018-08-08 7619 break; 017310fbe Connor McAdams 2018-05-08 7620 case QUIRK_R3DI: 017310fbe Connor McAdams 2018-05-08 7621 spec->mixers[0] = r3di_mixer; 017310fbe Connor McAdams 2018-05-08 7622 snd_hda_codec_set_name(codec, "Recon3Di"); 017310fbe Connor McAdams 2018-05-08 7623 break; 017310fbe Connor McAdams 2018-05-08 7624 default: a7e76271b Ian Minett 2012-12-20 7625 spec->mixers[0] = ca0132_mixer; 017310fbe Connor McAdams 2018-05-08 7626 break; 017310fbe Connor McAdams 2018-05-08 7627 } a7e76271b Ian Minett 2012-12-20 7628 08eca6b1f Connor McAdams 2018-08-08 7629 /* Setup whether or not to use alt functions/controls/pci_mmio */ 009b8f979 Connor McAdams 2018-05-08 7630 switch (spec->quirk) { 009b8f979 Connor McAdams 2018-05-08 7631 case QUIRK_SBZ: e42c7c731 Connor McAdams 2018-08-08 7632 case QUIRK_R3D: 08eca6b1f Connor McAdams 2018-08-08 7633 spec->use_alt_controls = true; 08eca6b1f Connor McAdams 2018-08-08 7634 spec->use_alt_functions = true; 08eca6b1f Connor McAdams 2018-08-08 7635 spec->use_pci_mmio = true; 08eca6b1f Connor McAdams 2018-08-08 7636 break; 009b8f979 Connor McAdams 2018-05-08 7637 case QUIRK_R3DI: 47cdf76e4 Connor McAdams 2018-05-08 7638 spec->use_alt_controls = true; 009b8f979 Connor McAdams 2018-05-08 7639 spec->use_alt_functions = true; 08eca6b1f Connor McAdams 2018-08-08 7640 spec->use_pci_mmio = false; 009b8f979 Connor McAdams 2018-05-08 7641 break; 009b8f979 Connor McAdams 2018-05-08 7642 default: 47cdf76e4 Connor McAdams 2018-05-08 7643 spec->use_alt_controls = false; 009b8f979 Connor McAdams 2018-05-08 7644 spec->use_alt_functions = false; 08eca6b1f Connor McAdams 2018-08-08 7645 spec->use_pci_mmio = false; 009b8f979 Connor McAdams 2018-05-08 7646 break; 009b8f979 Connor McAdams 2018-05-08 7647 } 009b8f979 Connor McAdams 2018-05-08 7648 08eca6b1f Connor McAdams 2018-08-08 7649 if (spec->use_pci_mmio) { 08eca6b1f Connor McAdams 2018-08-08 @7650 spec->mem_base = pci_iomap(codec->bus->pci, 2, 0xC20); 08eca6b1f Connor McAdams 2018-08-08 7651 if (spec->mem_base == NULL) { 08eca6b1f Connor McAdams 2018-08-08 7652 codec_warn(codec, "pci_iomap failed! Setting quirk to QUIRK_NONE."); 08eca6b1f Connor McAdams 2018-08-08 7653 spec->quirk = QUIRK_NONE; 08eca6b1f Connor McAdams 2018-08-08 7654 } 08eca6b1f Connor McAdams 2018-08-08 7655 } 08eca6b1f Connor McAdams 2018-08-08 7656 5aaca44d8 Ian Minett 2012-12-20 7657 spec->base_init_verbs = ca0132_base_init_verbs; 5aaca44d8 Ian Minett 2012-12-20 7658 spec->base_exit_verbs = ca0132_base_exit_verbs; 5aaca44d8 Ian Minett 2012-12-20 7659 993884f6a Chih-Chung Chang 2013-03-25 7660 INIT_DELAYED_WORK(&spec->unsol_hp_work, ca0132_unsol_hp_delayed); 993884f6a Chih-Chung Chang 2013-03-25 7661 95c6e9cb7 Ian Minett 2011-06-15 7662 ca0132_init_chip(codec); 95c6e9cb7 Ian Minett 2011-06-15 7663 95c6e9cb7 Ian Minett 2011-06-15 7664 ca0132_config(codec); 95c6e9cb7 Ian Minett 2011-06-15 7665 d5c016b56 Gabriele Martino 2015-05-18 7666 err = ca0132_prepare_verbs(codec); d5c016b56 Gabriele Martino 2015-05-18 7667 if (err < 0) cc91ceaf3 Takashi Iwai 2017-09-04 7668 goto error; d5c016b56 Gabriele Martino 2015-05-18 7669 a73d511c4 Ian Minett 2012-12-20 7670 err = snd_hda_parse_pin_def_config(codec, &spec->autocfg, NULL); a73d511c4 Ian Minett 2012-12-20 7671 if (err < 0) cc91ceaf3 Takashi Iwai 2017-09-04 7672 goto error; a73d511c4 Ian Minett 2012-12-20 7673 95c6e9cb7 Ian Minett 2011-06-15 7674 return 0; cc91ceaf3 Takashi Iwai 2017-09-04 7675 cc91ceaf3 Takashi Iwai 2017-09-04 7676 error: cc91ceaf3 Takashi Iwai 2017-09-04 7677 ca0132_free(codec); cc91ceaf3 Takashi Iwai 2017-09-04 7678 return err; 95c6e9cb7 Ian Minett 2011-06-15 7679 } 95c6e9cb7 Ian Minett 2011-06-15 7680 :::::: The code at line 7650 was first introduced by commit :::::: 08eca6b1f1468a4021bac7b3929fd3eb491e2629 ALSA: hda/ca0132 - Add bool variable to enable/disable pci region2 mmio :::::: TO: Connor McAdams <conmanx360(a)gmail.com> :::::: CC: Takashi Iwai <tiwai(a)suse.de> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] Fixing EAPD for STAC9202 on an embedded platform.
by Andy Davison 11 Oct '18

11 Oct '18

Hi everyone, I’m hoping that somebody here might be able to spot where I’m going wrong; I'm working with a picture-frame-like device manufactured by the late OpenPeak Inc. known as the OpenFrame (or O2 Joggler in the UK). It has an internal speaker and a 3.5mm line out socket; none of the other connections to its STAC9202 codec chip are exposed to the end user. I've been porting Ubuntu Bionic to the device and everything is done, except for the audio driver. Back in kernel 3.18 it was possible to use the following kernel patch and userland ALSA patch to have these two outputs work correctly, with the insertion of a plug into the line out properly muting the internal speaker. https://github.com/andydvsn/OpenFrame-Kernel/blob/master/patches/03-stac920… https://github.com/andydvsn/OpenFrame-Ubuntu/blob/master/overlay-trusty/lib… In kernel 4.14 the same trick no longer works, so I've rewritten the patch to more properly add support for this variant of STAC9202 to ALSA. It now looks like this: https://gist.github.com/andydvsn/7bffa8de0ed691b14508485d75501ffc This seems to line up the pin configurations appropriately, but when a plug is inserted to the line out, although the audio to the internal speaker is muted, the speaker emits a crackling sound whenever the device is processing. It seems that it is not being properly powered down and is amplifying general circuit noise. Disconnecting the plug returns sound to the internal speaker and the crackling ceases. This is reliable across multiple devices. Here is the alsa-info output from both the crackling kernel 4.14 and the working-just-fine kernel 3.18. https://gist.github.com/andydvsn/ccf55e6f7961dd405fc39d41a6ce9ef6 I don't have sufficient knowledge of ALSA drivers and patches and have been working purely from the configurations used by others over the years, so I would really appreciate somebody looking at the alsa-info output and the new patch to determine where I should go from here. I believe this is all to do with EAPD control, but what options I have for controlling that aren't known to me right now. Ideally, I want to end up with the audio muting and switching correctly when the jack is inserted. A bonus would be to lose the unused (or at least inaccessible) audio input and output options in alsamixer and gain individual control of the internal speaker and line out levels (which appear to be paired together at the moment). All the best, A. -- Andrew Davison

2 11

[alsa-devel] [PATCH] pinctrl: madera: Fix uninitialized variable issue in madera_mux_set_mux
by Gustavo A. R. Silva 10 Oct '18

10 Oct '18

There is a potential execution path in which variable *ret* is checked in an IF statement, and then its value is used to report an error at line 659 without being properly initialized previously: 659 if (ret) 660 dev_err(priv->dev, "Failed to write to 0x%x (%d)\n", reg, ret); Fix this by initializing variable *ret* to -1. Addresses-Coverity-ID: 1471969 ("Uninitialized scalar variable") Fixes: 218d72a77b0b ("pinctrl: madera: Add driver for Cirrus Logic Madera codecs") Signed-off-by: Gustavo A. R. Silva <gustavo(a)embeddedor.com> --- drivers/pinctrl/cirrus/pinctrl-madera-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pinctrl/cirrus/pinctrl-madera-core.c b/drivers/pinctrl/cirrus/pinctrl-madera-core.c index 0266302..a99ace8 100644 --- a/drivers/pinctrl/cirrus/pinctrl-madera-core.c +++ b/drivers/pinctrl/cirrus/pinctrl-madera-core.c @@ -608,7 +608,7 @@ static int madera_mux_set_mux(struct pinctrl_dev *pctldev, unsigned int n_chip_groups = priv->chip->n_pin_groups; const char *func_name = madera_mux_funcs[selector].name; unsigned int reg; - int i, ret; + int i, ret = -1; dev_dbg(priv->dev, "%s selecting %u (%s) for group %u (%s)\n", __func__, selector, func_name, group, -- 2.7.4

2 2

[alsa-devel] [PATCH] ASoC: max98988: add I2C dependency
by Arnd Bergmann 10 Oct '18

10 Oct '18

max98988 only builds with I2C support enabled, otherwise we get a build error: sound/soc/codecs/max98088.c:1789:1: error: data definition has no type or storage class [-Werror] module_i2c_driver(max98088_i2c_driver); ^~~~~~~~~~~~~~~~~ sound/soc/codecs/max98088.c:1789:1: error: type defaults to 'int' in declaration of 'module_i2c_driver' [-Werror=implicit-int] sound/soc/codecs/max98088.c:1789:1: error: parameter names (without types) in function declaration [-Werror] sound/soc/codecs/max98088.c:1780:26: error: 'max98088_i2c_driver' defined but not used [-Werror=unused-variable] Fixes: 24ae67c58250 ("ASoC: max98988: make it selectable") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- sound/soc/codecs/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 3c6bd6019b92..774d38310875 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -641,6 +641,7 @@ config SND_SOC_LM49453 config SND_SOC_MAX98088 tristate "Maxim MAX98088/9 Low-Power, Stereo Audio Codec" + depends on I2C config SND_SOC_MAX98090 tristate -- 2.18.0

3 2

[alsa-devel] [PATCH] ASoC: rsnd: use 32bit TDM width as default
by Kuninori Morimoto 10 Oct '18

10 Oct '18

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> commit fb2815f44a9e ("ASoC: rsnd: add support for 16/24 bit slot widths") added TDM width check, and return error if it was not 16/24/32 bit. But it is too strict. This patch uses 32bit same as default. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/sh/rcar/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 40d7dc4..f930f51 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -744,8 +744,8 @@ static int rsnd_soc_set_dai_tdm_slot(struct snd_soc_dai *dai, case 32: break; default: - dev_err(dev, "unsupported slot width value: %d\n", slot_width); - return -EINVAL; + /* use default */ + slot_width = 32; } switch (slots) { -- 2.7.4

2 1

[alsa-devel] [PATCH] ASoC: audio-graph-card: enable mclk-fs on codec node
by Kuninori Morimoto 10 Oct '18

10 Oct '18

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Current audio-graph-card is supporting mclk-fs on CPU node side only. But having Codec node also is good idea. It will be just ignored if not defined. "rcpu_ep" is same as "cpu_ep", This patch tidyup it, too. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/generic/audio-graph-card.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index fb6635f..25c819e 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -182,7 +182,8 @@ static int asoc_graph_card_dai_link_of(struct device_node *cpu_port, if (ret < 0) goto dai_link_of_err; - of_property_read_u32(rcpu_ep, "mclk-fs", &dai_props->mclk_fs); + of_property_read_u32(cpu_ep, "mclk-fs", &dai_props->mclk_fs); + of_property_read_u32(codec_ep, "mclk-fs", &dai_props->mclk_fs); ret = asoc_simple_card_parse_graph_cpu(cpu_ep, dai_link); if (ret < 0) -- 2.7.4

2 1

[alsa-devel] [PATCH 0/4] ALSA: firewire: block .remove callback of bus
by Takashi Sakamoto 10 Oct '18

10 Oct '18

Hi, In a discussion for devres support[1], I realize difference of unbind behaviour of drivers in ALSA firewire stack and in the others. For consistency behaviour inner the same subsystem for users, it's better to imitate the behaviour. Additionally, blocking .remove function simplifies codes to releasing device. This commit uses 'snd_card_free()' instead of 'snd_card_free_when_closed()' in .remove function and performs refactoring for release codes. [1] http://mailman.alsa-project.org/pipermail/alsa-devel/2018-September/140431.… Takashi Sakamoto (4): ALSA: firewire: block .remove callback of bus driver till all of ALSA character devices are released ALSA: firewire: release reference count of firewire unit in .remove callback of bus driver ALSA: bebob/fireworks: simplify handling of local device entry table ALSA: firewire: simplify cleanup process when failing to register sound card sound/firewire/bebob/bebob.c | 43 ++++++--------------- sound/firewire/dice/dice.c | 35 ++++------------- sound/firewire/digi00x/digi00x.c | 28 +++++--------- sound/firewire/fireface/ff.c | 28 +++++--------- sound/firewire/fireworks/fireworks.c | 56 ++++++++-------------------- sound/firewire/isight.c | 8 ++-- sound/firewire/motu/motu.c | 39 +++++-------------- sound/firewire/oxfw/oxfw.c | 39 +++++-------------- sound/firewire/tascam/tascam.c | 32 +++++----------- 9 files changed, 90 insertions(+), 218 deletions(-) -- 2.19.0

2 8

[alsa-devel] [PATCH] ALSA: hda/realtek - Fix the problem of the front MIC on the Lenovo M715
by Hui Wang 10 Oct '18

10 Oct '18

The front MIC on the Lenovo M715 can't record sound, after applying the ALC294_FIXUP_LENOVO_MIC_LOCATION, the problem is fixed. So add the pin configuration of this machine to the pin quirk table. Cc: <stable(a)vger.kernel.org> Signed-off-by: Hui Wang <hui.wang(a)canonical.com> --- sound/pci/hda/patch_realtek.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 6f3c8e888c2a..2871c54f62ab 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6840,6 +6840,12 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { {0x1a, 0x02a11040}, {0x1b, 0x01014020}, {0x21, 0x0221101f}), + SND_HDA_PIN_QUIRK(0x10ec0235, 0x17aa, "Lenovo", ALC294_FIXUP_LENOVO_MIC_LOCATION, + {0x14, 0x90170110}, + {0x19, 0x02a11030}, + {0x1a, 0x02a11040}, + {0x1b, 0x01011020}, + {0x21, 0x0221101f}), SND_HDA_PIN_QUIRK(0x10ec0235, 0x17aa, "Lenovo", ALC294_FIXUP_LENOVO_MIC_LOCATION, {0x14, 0x90170110}, {0x19, 0x02a11020}, -- 2.17.1

2 1

[alsa-devel] [PATCH linux-next v2 9/9] ASoC: rsnd: add busif property to dai stream
by jiada_wang＠mentor.com 10 Oct '18

10 Oct '18

From: Jiada Wang <jiada_wang(a)mentor.com> in GEN3 SSI may use different BUSIF for data transfer, this patch adds busif property to each dai stream, to indicate the BUSIF used by playback/capture stream. Also adds rsnd_ssi_select_busif() to automatically select BUSIF (currently only BUSIF0 is selected) Signed-off-by: Jiada Wang <jiada_wang(a)mentor.com> --- sound/soc/sh/rcar/core.c | 3 +++ sound/soc/sh/rcar/dma.c | 31 +++++++++++++++++++++++++++++++ sound/soc/sh/rcar/rsnd.h | 3 +++ sound/soc/sh/rcar/ssi.c | 30 +++++++++++++++++++++++++++++- 4 files changed, 66 insertions(+), 1 deletion(-) diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c index 40d7dc4f7839..5e3e6e65bcdf 100644 --- a/sound/soc/sh/rcar/core.c +++ b/sound/soc/sh/rcar/core.c @@ -1158,6 +1158,9 @@ static int rsnd_hw_params(struct snd_pcm_substream *substream, struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai); struct rsnd_dai_stream *io = rsnd_rdai_to_io(rdai, substream); int ret; + int chan = rsnd_runtime_channel_for_ssi_with_params(io, hw_params); + + rsnd_ssi_select_busif(io, chan); ret = rsnd_dai_call(hw_params, io, substream, hw_params); if (ret) diff --git a/sound/soc/sh/rcar/dma.c b/sound/soc/sh/rcar/dma.c index 6d1947515dc8..bf87939f79bb 100644 --- a/sound/soc/sh/rcar/dma.c +++ b/sound/soc/sh/rcar/dma.c @@ -792,6 +792,37 @@ int rsnd_dma_attach(struct rsnd_dai_stream *io, struct rsnd_mod *mod, return rsnd_dai_connect(*dma_mod, io, (*dma_mod)->type); } +void rsnd_dma_addr_update(struct rsnd_dai_stream *io) +{ + struct rsnd_mod *ssi_mod = rsnd_io_to_mod_ssi(io); + struct rsnd_mod *mod_from = NULL; + struct rsnd_mod *mod_to = NULL; + struct rsnd_priv *priv = rsnd_io_to_priv(io); + struct rsnd_dma_ctrl *dmac = rsnd_priv_to_dmac(priv); + struct device *dev = rsnd_priv_to_dev(priv); + int is_play = rsnd_io_is_play(io); + struct rsnd_dma *dma = rsnd_mod_to_dma(io->dma); + + if (!dmac) + return; + + rsnd_dma_of_path(ssi_mod, io, is_play, &mod_from, &mod_to); + + dma->src_addr = rsnd_dma_addr(io, mod_from, is_play, 1); + dma->dst_addr = rsnd_dma_addr(io, mod_to, is_play, 0); + + if (mod_from && mod_to) { + struct rsnd_dmapp *dmapp = rsnd_dma_to_dmapp(dma); + + dmapp->chcr = rsnd_dmapp_get_chcr(io, mod_from, mod_to) | + PDMACHCR_DE; + } + + dev_dbg(dev, "%s[%d] %pad -> %pad\n", + rsnd_mod_name(ssi_mod), rsnd_mod_id(ssi_mod), + &dma->src_addr, &dma->dst_addr); +} + int rsnd_dma_probe(struct rsnd_priv *priv) { struct platform_device *pdev = rsnd_priv_to_pdev(priv); diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h index 4464d1d0a042..7ce10267c87b 100644 --- a/sound/soc/sh/rcar/rsnd.h +++ b/sound/soc/sh/rcar/rsnd.h @@ -227,12 +227,14 @@ void rsnd_bset(struct rsnd_priv *priv, struct rsnd_mod *mod, enum rsnd_reg reg, u32 rsnd_get_adinr_bit(struct rsnd_mod *mod, struct rsnd_dai_stream *io); u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io); u32 rsnd_get_busif_shift(struct rsnd_dai_stream *io, struct rsnd_mod *mod); +void rsnd_ssi_select_busif(struct rsnd_dai_stream *io, int chan); /* * R-Car DMA */ int rsnd_dma_attach(struct rsnd_dai_stream *io, struct rsnd_mod *mod, struct rsnd_mod **dma_mod); +void rsnd_dma_addr_update(struct rsnd_dai_stream *io); int rsnd_dma_probe(struct rsnd_priv *priv); struct dma_chan *rsnd_dma_request_channel(struct device_node *of_node, struct rsnd_mod *mod, char *name); @@ -457,6 +459,7 @@ struct rsnd_dai_stream { struct rsnd_dai *rdai; struct device *dmac_dev; /* for IPMMU */ u32 parent_ssi_status; + u32 busif; }; #define rsnd_io_to_mod(io, i) ((i) < RSND_MOD_MAX ? (io)->mod[(i)] : NULL) #define rsnd_io_to_mod_ssi(io) rsnd_io_to_mod((io), RSND_MOD_SSI) diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index 992aeac09e76..d515ee192276 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c @@ -154,7 +154,35 @@ int rsnd_ssi_use_busif(struct rsnd_dai_stream *io) int rsnd_ssi_get_busif(struct rsnd_dai_stream *io) { - return 0; /* BUSIF0 only for now */ + struct rsnd_priv *priv = rsnd_io_to_priv(io); + + if (!rsnd_is_gen3(priv)) + return 0; + + if (!rsnd_ssi_use_busif(io)) + return 0; + + return io->busif; +} + +void rsnd_ssi_select_busif(struct rsnd_dai_stream *io, int chan) +{ + struct rsnd_priv *priv = rsnd_io_to_priv(io); + u32 busif = 0; /* BUSIF0 only for now */ + + if (!rsnd_is_gen3(priv)) + return; + + if (!rsnd_ssi_use_busif(io)) + return; + + /* FIXME: calcuate BUSIF based on SSI mode in future */ + if (io->busif == busif) + return; + + io->busif = busif; + + rsnd_dma_addr_update(io); } static void rsnd_ssi_status_clear(struct rsnd_mod *mod) -- 2.17.0

3 9