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

Re: [alsa-devel] [FFADO-user] Toneweal / Trigaudio FW66 device
by Takashi Sakamoto 04 Feb '20

04 Feb '20

Hi, I'm an author of ALSA bebob driver (snd-bebob). On Sun, Jan 19, 2020 at 03:01:00PM +0100, Daniel Jozsef wrote: > It's a Toneweal FW66, a 6x6 in/out 24bit 96kHz audio interface with MIDI. I > kinda like it for its build quality and the time I spent with it. :D The > largest chip in the device is labeled Trigaudio MNP-TA110. I searched for > information on this device, and found very little - it's a Taiwanese > company. There seems evidence that a "Trigaudio FW66" also exists, so the > device may have been sold under different brands in different markets. In my opinion, FW66 is an application of ArchWave BeBoB solution for audio and music units on IEEE 1394 bus (ArchWave is formerly known as BridgeCo) since I can find file structure for the solution in driver package shipped by the vendor. I guess that you can see large ASIC labelled with 'BridgeCo' (or 'ArchWave') DM1000/1100/1500 inner the device. If so, the device is possibly handled by implementation of FFADO. But as a quick glance to your log, the implementation of FFADO fails to detect it: > daniel@gibbonmoon:~$ sudo ffado-test Discover > ... > 02878614308: Warning (bebob_avdevice.cpp)[ 228] discover: Using generic BeBoB support for unsupported device 'ToneWeal FW66' > 02878620133: Debug (bebob_avdevice_subunit.cpp)[ 83] discover: Discovering BeBoB::AudioSubunit... > 02878620175: Debug (avc_audiosubunit.cpp)[ 56] discover: Discovering BeBoB::AudioSubunit... > 02878620196: Debug (avc_subunit.cpp)[ 108] discoverPlugs: Discovering plugs... > 02878778208: Error (bebob_avplug.cpp)[ 237] discoverPlugType: Plug does not implement extended plug info plug type info command > 02878778236: Error (bebob_avplug.cpp)[ 120] discover: discover: Could not discover plug type (1,1,0,0,1) > 02878778272: Error (avc_subunit.cpp)[ 189] discoverPlugs: plug discover failed > 02878778283: Error (avc_subunit.cpp)[ 131] discoverPlugs: destination plug discovering failed > 02878778301: Error (avc_subunit.cpp)[ 99] discover: plug discovery failed > 02878778312: Error (avc_unit.cpp)[ 283] enumerateSubUnits: enumerateSubUnits: Could not discover subunit_id = 0, subunit_type = 1 (Audio) > 02878778335: Error (avc_unit.cpp)[ 177] discover: Could not enumerate sub units > 02878778347: Error (bebob_avdevice.cpp)[ 232] discover: Could not discover unit > 02878778376: Error (devicemanager.cpp)[ 628] discover: could not discover device > 02878778419: Debug (devicemanager.cpp)[ 661] discover: Discovery finished... ... The reason is the unit returns NOT_IMPLEMENTED response against vendor specific AV/C command (Extended Plug Information command defined by BridgeCo.) for Audio subunit. I guess that the device has no Audio subunit but the implementation performs to use it without checking available subunits. For my information, would you please clone linux-firewire-utils[1] into your system and build it, then run below command to dump device information: $ ./firewire-request /dev/fw1 read 0xffffc8020000 60 result: 000: 62 72 69 64 67 65 43 6f 03 00 00 00 00 00 00 00 bridgeCo........ result: 010: 00 96 14 00 22 03 00 00 19 00 00 00 00 00 00 00 ...."........... result: 020: 32 30 30 39 30 36 30 39 31 36 32 39 34 30 20 20 20090609162940 result: 030: 00 00 00 19 07 1f 00 00 80 00 0c 40 70 35 14 00 ...........@p5.. result: 040: 32 30 30 39 30 36 30 39 31 36 32 32 31 39 20 20 20090609162219 result: 050: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ The above is a sample of Phonic Firefly 202. I expect the first line includes bytes represent 'bridgeCo'. [1] https://github.com/cladisch/linux-firewire-utils Regards Takashi Sakamoto

2 7

[alsa-devel] [PATCH] ALSA: hda - Fix DP-MST support for NVIDIA codecs
by Nikhil Mahale 04 Feb '20

04 Feb '20

If dyn_pcm_assign is set, different jack objects are being created for pcm and pins. If dyn_pcm_assign is set, generic_hdmi_build_jack() calls into add_hdmi_jack_kctl() to create and track separate jack object for pcm. Like sync_eld_via_acomp(), hdmi_present_sense_via_verbs() also need to report status change of the pcm jack. Rename pin_idx_to_jack() to pin_idx_to_pcm_jack(). Update hdmi_present_sense_via_verbs() to report plug state of pcm jack object. Unlike sync_eld_via_acomp(), for !acomp drivers the pcm jack's plug state must be consistent with plug state of pin's jack. Fixes: 5398e94fb753 ("ALSA: hda - Add DP-MST support for NVIDIA codecs") Signed-off-by: Nikhil Mahale <nmahale(a)nvidia.com> --- sound/pci/hda/patch_hdmi.c | 94 +++++++++++++++++++++++++++++++--------------- 1 file changed, 63 insertions(+), 31 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 48bddc218829..c1d3ce423142 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1550,6 +1550,34 @@ static bool update_eld(struct hda_codec *codec, return eld_changed; } +static struct snd_jack *pin_idx_to_pcm_jack(struct hda_codec *codec, + struct hdmi_spec_per_pin *per_pin) +{ + struct hdmi_spec *spec = codec->spec; + struct snd_jack *jack = NULL; + struct hda_jack_tbl *jack_tbl; + + /* if !dyn_pcm_assign, get jack from hda_jack_tbl + * in !dyn_pcm_assign case, spec->pcm_rec[].jack is not + * NULL even after snd_hda_jack_tbl_clear() is called to + * free snd_jack. This may cause access invalid memory + * when calling snd_jack_report + */ + if (per_pin->pcm_idx >= 0 && spec->dyn_pcm_assign) { + jack = spec->pcm_rec[per_pin->pcm_idx].jack; + } else if (!spec->dyn_pcm_assign) { + /* + * jack tbl doesn't support DP MST + * DP MST will use dyn_pcm_assign, + * so DP MST will never come here + */ + jack_tbl = snd_hda_jack_tbl_get_mst(codec, per_pin->pin_nid, + per_pin->dev_id); + if (jack_tbl) + jack = jack_tbl->jack; + } + return jack; +} /* update ELD and jack state via HD-audio verbs */ static bool hdmi_present_sense_via_verbs(struct hdmi_spec_per_pin *per_pin, int repoll) @@ -1571,6 +1599,7 @@ static bool hdmi_present_sense_via_verbs(struct hdmi_spec_per_pin *per_pin, int present; bool ret; bool do_repoll = false; + struct snd_jack *pcm_jack = NULL; present = snd_hda_jack_pin_sense(codec, pin_nid, dev_id); @@ -1598,10 +1627,19 @@ static bool hdmi_present_sense_via_verbs(struct hdmi_spec_per_pin *per_pin, do_repoll = true; } - if (do_repoll) + if (do_repoll) { schedule_delayed_work(&per_pin->work, msecs_to_jiffies(300)); - else + } else { + /* + * pcm_idx >=0 before update_eld() means it is in monitor + * disconnected event. Jack must be fetched before + * update_eld(). + */ + pcm_jack = pin_idx_to_pcm_jack(codec, per_pin); update_eld(codec, per_pin, eld); + if (!pcm_jack) + pcm_jack = pin_idx_to_pcm_jack(codec, per_pin); + } ret = !repoll || !eld->monitor_present || eld->eld_valid; @@ -1610,38 +1648,32 @@ static bool hdmi_present_sense_via_verbs(struct hdmi_spec_per_pin *per_pin, jack->block_report = !ret; jack->pin_sense = (eld->monitor_present && eld->eld_valid) ? AC_PINSENSE_PRESENCE : 0; - } - mutex_unlock(&per_pin->lock); - return ret; -} -static struct snd_jack *pin_idx_to_jack(struct hda_codec *codec, - struct hdmi_spec_per_pin *per_pin) -{ - struct hdmi_spec *spec = codec->spec; - struct snd_jack *jack = NULL; - struct hda_jack_tbl *jack_tbl; + if (spec->dyn_pcm_assign && pcm_jack && !do_repoll) { + int state = 0; + + if (!!(jack->pin_sense & AC_PINSENSE_PRESENCE)) + state = SND_JACK_AVOUT; + snd_jack_report(pcm_jack, state); + } - /* if !dyn_pcm_assign, get jack from hda_jack_tbl - * in !dyn_pcm_assign case, spec->pcm_rec[].jack is not - * NULL even after snd_hda_jack_tbl_clear() is called to - * free snd_jack. This may cause access invalid memory - * when calling snd_jack_report - */ - if (per_pin->pcm_idx >= 0 && spec->dyn_pcm_assign) - jack = spec->pcm_rec[per_pin->pcm_idx].jack; - else if (!spec->dyn_pcm_assign) { /* - * jack tbl doesn't support DP MST - * DP MST will use dyn_pcm_assign, - * so DP MST will never come here + * snd_hda_jack_pin_sense() call at the beginning of this + * function, updates jack->pins_sense and clears + * jack->jack_dirty, therefore snd_hda_jack_report_sync() will + * not override the jack->pin_sense. + * + * snd_hda_jack_report_sync() is superfluous for dyn_pcm_assign + * case. The jack->pin_sense update was already performed, and + * hda_jack->jack is NULL for dyn_pcm_assign. + * + * Don't call snd_hda_jack_report_sync() for + * dyn_pcm_assign. */ - jack_tbl = snd_hda_jack_tbl_get_mst(codec, per_pin->pin_nid, - per_pin->dev_id); - if (jack_tbl) - jack = jack_tbl->jack; + ret = ret && !spec->dyn_pcm_assign; } - return jack; + mutex_unlock(&per_pin->lock); + return ret; } /* update ELD and jack state via audio component */ @@ -1677,10 +1709,10 @@ static void sync_eld_via_acomp(struct hda_codec *codec, /* pcm_idx >=0 before update_eld() means it is in monitor * disconnected event. Jack must be fetched before update_eld() */ - jack = pin_idx_to_jack(codec, per_pin); + jack = pin_idx_to_pcm_jack(codec, per_pin); changed = update_eld(codec, per_pin, eld); if (jack == NULL) - jack = pin_idx_to_jack(codec, per_pin); + jack = pin_idx_to_pcm_jack(codec, per_pin); if (changed && jack) snd_jack_report(jack, (eld->monitor_present && eld->eld_valid) ? -- 2.16.4

4 4

[alsa-devel] [PATCH] ASoC: wcd934x: Add missing COMMON_CLK dependency
by Srinivas Kandagatla 04 Feb '20

04 Feb '20

Looks like some platforms are not yet using COMMON CLK. PowerPC allyesconfig failed with below error in next ld: sound/soc/codecs/wcd934x.o:(.toc+0x0): undefined reference to `of_clk_src_simple_get' ld: sound/soc/codecs/wcd934x.o: in function `.wcd934x_codec_probe': wcd934x.c:(.text.wcd934x_codec_probe+0x3d4): undefined reference to `.__clk_get_name' ld: wcd934x.c:(.text.wcd934x_codec_probe+0x438): undefined reference to `.clk_hw_register' ld: wcd934x.c:(.text.wcd934x_codec_probe+0x474): undefined reference to `.of_clk_add_provider' Add the missing COMMON_CLK dependency to fix this errors. Reported-by: Stephen Rothwell <sfr(a)canb.auug.org.au> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- sound/soc/codecs/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 4d5b0d5a73d3..3e2396ee727f 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -1280,6 +1280,7 @@ config SND_SOC_WCD9335 config SND_SOC_WCD934X tristate "WCD9340/WCD9341 Codec" depends on SLIMBUS + depends on COMMON_CLK select REGMAP_SLIMBUS select REGMAP_IRQ help -- 2.21.0

2 1

[alsa-devel] [PATCH] ALSA: hda - Fix DP-MST support for NVIDIA codecs
by Nikhil Mahale 04 Feb '20

04 Feb '20

If dyn_pcm_assign is set, different jack objects are being created for pcm and pins. If dyn_pcm_assign is set, generic_hdmi_build_jack() calls into add_hdmi_jack_kctl() to create and track separate jack object for pcm. Like sync_eld_via_acomp(), hdmi_present_sense_via_verbs() also need to report status change of the pcm jack. Rename pin_idx_to_jack() to pin_idx_to_pcm_jack(). The code to report status change of pcm jack, move it to update_eld() which is common for acomp and !acomp code paths. Fixes: 5398e94fb753 ALSA: hda - Add DP-MST support for NVIDIA codecs Signed-off-by: Nikhil Mahale <nmahale(a)nvidia.com> --- sound/pci/hda/patch_hdmi.c | 87 ++++++++++++++++++++++++---------------------- 1 file changed, 45 insertions(+), 42 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 48bddc218829..7b5360037217 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1480,6 +1480,35 @@ static void hdmi_pcm_reset_pin(struct hdmi_spec *spec, per_pin->channels = 0; } +static struct snd_jack *pin_idx_to_pcm_jack(struct hda_codec *codec, + struct hdmi_spec_per_pin *per_pin) +{ + struct hdmi_spec *spec = codec->spec; + struct snd_jack *jack = NULL; + struct hda_jack_tbl *jack_tbl; + + /* if !dyn_pcm_assign, get jack from hda_jack_tbl + * in !dyn_pcm_assign case, spec->pcm_rec[].jack is not + * NULL even after snd_hda_jack_tbl_clear() is called to + * free snd_jack. This may cause access invalid memory + * when calling snd_jack_report + */ + if (per_pin->pcm_idx >= 0 && spec->dyn_pcm_assign) { + jack = spec->pcm_rec[per_pin->pcm_idx].jack; + } else if (!spec->dyn_pcm_assign) { + /* + * jack tbl doesn't support DP MST + * DP MST will use dyn_pcm_assign, + * so DP MST will never come here + */ + jack_tbl = snd_hda_jack_tbl_get_mst(codec, per_pin->pin_nid, + per_pin->dev_id); + if (jack_tbl) + jack = jack_tbl->jack; + } + return jack; +} + /* update per_pin ELD from the given new ELD; * setup info frame and notification accordingly */ @@ -1490,9 +1519,15 @@ static bool update_eld(struct hda_codec *codec, struct hdmi_eld *pin_eld = &per_pin->sink_eld; struct hdmi_spec *spec = codec->spec; bool old_eld_valid = pin_eld->eld_valid; + struct snd_jack *pcm_jack; bool eld_changed; int pcm_idx; + /* pcm_idx >=0 before update_eld() means it is in monitor + * disconnected event. Jack must be fetched before update_eld() + */ + pcm_jack = pin_idx_to_pcm_jack(codec, per_pin); + /* for monitor disconnection, save pcm_idx firstly */ pcm_idx = per_pin->pcm_idx; if (spec->dyn_pcm_assign) { @@ -1547,6 +1582,14 @@ static bool update_eld(struct hda_codec *codec, SNDRV_CTL_EVENT_MASK_VALUE | SNDRV_CTL_EVENT_MASK_INFO, &get_hdmi_pcm(spec, pcm_idx)->eld_ctl->id); + + if (!pcm_jack) + pcm_jack = pin_idx_to_pcm_jack(codec, per_pin); + if (eld_changed && pcm_jack) + snd_jack_report(pcm_jack, + (eld->monitor_present && eld->eld_valid) ? + SND_JACK_AVOUT : 0); + return eld_changed; } @@ -1615,43 +1658,12 @@ static bool hdmi_present_sense_via_verbs(struct hdmi_spec_per_pin *per_pin, return ret; } -static struct snd_jack *pin_idx_to_jack(struct hda_codec *codec, - struct hdmi_spec_per_pin *per_pin) -{ - struct hdmi_spec *spec = codec->spec; - struct snd_jack *jack = NULL; - struct hda_jack_tbl *jack_tbl; - - /* if !dyn_pcm_assign, get jack from hda_jack_tbl - * in !dyn_pcm_assign case, spec->pcm_rec[].jack is not - * NULL even after snd_hda_jack_tbl_clear() is called to - * free snd_jack. This may cause access invalid memory - * when calling snd_jack_report - */ - if (per_pin->pcm_idx >= 0 && spec->dyn_pcm_assign) - jack = spec->pcm_rec[per_pin->pcm_idx].jack; - else if (!spec->dyn_pcm_assign) { - /* - * jack tbl doesn't support DP MST - * DP MST will use dyn_pcm_assign, - * so DP MST will never come here - */ - jack_tbl = snd_hda_jack_tbl_get_mst(codec, per_pin->pin_nid, - per_pin->dev_id); - if (jack_tbl) - jack = jack_tbl->jack; - } - return jack; -} - /* update ELD and jack state via audio component */ static void sync_eld_via_acomp(struct hda_codec *codec, struct hdmi_spec_per_pin *per_pin) { struct hdmi_spec *spec = codec->spec; struct hdmi_eld *eld = &spec->temp_eld; - struct snd_jack *jack = NULL; - bool changed; int size; mutex_lock(&per_pin->lock); @@ -1674,17 +1686,8 @@ static void sync_eld_via_acomp(struct hda_codec *codec, eld->eld_size = 0; } - /* pcm_idx >=0 before update_eld() means it is in monitor - * disconnected event. Jack must be fetched before update_eld() - */ - jack = pin_idx_to_jack(codec, per_pin); - changed = update_eld(codec, per_pin, eld); - if (jack == NULL) - jack = pin_idx_to_jack(codec, per_pin); - if (changed && jack) - snd_jack_report(jack, - (eld->monitor_present && eld->eld_valid) ? - SND_JACK_AVOUT : 0); + update_eld(codec, per_pin, eld); + mutex_unlock(&per_pin->lock); } -- 2.16.4

3 6

[alsa-devel] [PATCH v1 1/4] ALSA: hda - Simplify hdmi_present_sense_via_verbs()
by Nikhil Mahale 04 Feb '20

04 Feb '20

The jack report block, was added by commit 464837a7bc0a ("ALSA: hda - block HDMI jack reports while repolling"), to avoid race condition with repolling. Signed-off-by: Nikhil Mahale <nmahale(a)nvidia.com> --- sound/pci/hda/patch_hdmi.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 48bddc218829..ee084676f625 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c @@ -1569,7 +1569,6 @@ static bool hdmi_present_sense_via_verbs(struct hdmi_spec_per_pin *per_pin, * the unsolicited response to avoid custom WARs. */ int present; - bool ret; bool do_repoll = false; present = snd_hda_jack_pin_sense(codec, pin_nid, dev_id); @@ -1603,16 +1602,15 @@ static bool hdmi_present_sense_via_verbs(struct hdmi_spec_per_pin *per_pin, else update_eld(codec, per_pin, eld); - ret = !repoll || !eld->monitor_present || eld->eld_valid; - jack = snd_hda_jack_tbl_get_mst(codec, pin_nid, per_pin->dev_id); if (jack) { - jack->block_report = !ret; + jack->block_report = do_repoll; jack->pin_sense = (eld->monitor_present && eld->eld_valid) ? AC_PINSENSE_PRESENCE : 0; } mutex_unlock(&per_pin->lock); - return ret; + + return !do_repoll; } static struct snd_jack *pin_idx_to_jack(struct hda_codec *codec, -- 2.16.4

2 7

[alsa-devel] [PATCH 11/17] ASoC: cros_ec_codec: Use cros_ec_send_cmd_msg()
by Prashant Malani 03 Feb '20

03 Feb '20

Replace send_ec_host_command() with cros_ec_send_cmd_msg() which does the same thing, but is defined in a common location in platform/chrome and exposed for other modules to use. This allows us to remove send_ec_host_command() entirely. Signed-off-by: Prashant Malani <pmalani(a)chromium.org> --- sound/soc/codecs/cros_ec_codec.c | 71 ++++++++++---------------------- 1 file changed, 21 insertions(+), 50 deletions(-) diff --git a/sound/soc/codecs/cros_ec_codec.c b/sound/soc/codecs/cros_ec_codec.c index 6a24f570c5e86f..49adb07d766963 100644 --- a/sound/soc/codecs/cros_ec_codec.c +++ b/sound/soc/codecs/cros_ec_codec.c @@ -69,38 +69,6 @@ static int ec_codec_capable(struct cros_ec_codec_priv *priv, uint8_t cap) return priv->ec_capabilities & BIT(cap); } -static int send_ec_host_command(struct cros_ec_device *ec_dev, uint32_t cmd, - uint8_t *out, size_t outsize, - uint8_t *in, size_t insize) -{ - int ret; - struct cros_ec_command *msg; - - msg = kmalloc(sizeof(*msg) + max(outsize, insize), GFP_KERNEL); - if (!msg) - return -ENOMEM; - - msg->version = 0; - msg->command = cmd; - msg->outsize = outsize; - msg->insize = insize; - - if (outsize) - memcpy(msg->data, out, outsize); - - ret = cros_ec_cmd_xfer_status(ec_dev, msg); - if (ret < 0) - goto error; - - if (insize) - memcpy(in, msg->data, insize); - - ret = 0; -error: - kfree(msg); - return ret; -} - static int calculate_sha256(struct cros_ec_codec_priv *priv, uint8_t *buf, uint32_t size, uint8_t *digest) { @@ -149,7 +117,7 @@ static int dmic_get_gain(struct snd_kcontrol *kcontrol, p.cmd = EC_CODEC_DMIC_GET_GAIN_IDX; p.get_gain_idx_param.channel = EC_CODEC_DMIC_CHANNEL_0; - ret = send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_DMIC, + ret = cros_ec_send_cmd_msg(priv->ec_device, 0, EC_CMD_EC_CODEC_DMIC, (uint8_t *)&p, sizeof(p), (uint8_t *)&r, sizeof(r)); if (ret < 0) @@ -158,7 +126,7 @@ static int dmic_get_gain(struct snd_kcontrol *kcontrol, p.cmd = EC_CODEC_DMIC_GET_GAIN_IDX; p.get_gain_idx_param.channel = EC_CODEC_DMIC_CHANNEL_1; - ret = send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_DMIC, + ret = cros_ec_send_cmd_msg(priv->ec_device, 0, EC_CMD_EC_CODEC_DMIC, (uint8_t *)&p, sizeof(p), (uint8_t *)&r, sizeof(r)); if (ret < 0) @@ -191,7 +159,7 @@ static int dmic_put_gain(struct snd_kcontrol *kcontrol, p.cmd = EC_CODEC_DMIC_SET_GAIN_IDX; p.set_gain_idx_param.channel = EC_CODEC_DMIC_CHANNEL_0; p.set_gain_idx_param.gain = left; - ret = send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_DMIC, + ret = cros_ec_send_cmd_msg(priv->ec_device, 0, EC_CMD_EC_CODEC_DMIC, (uint8_t *)&p, sizeof(p), NULL, 0); if (ret < 0) return ret; @@ -199,7 +167,7 @@ static int dmic_put_gain(struct snd_kcontrol *kcontrol, p.cmd = EC_CODEC_DMIC_SET_GAIN_IDX; p.set_gain_idx_param.channel = EC_CODEC_DMIC_CHANNEL_1; p.set_gain_idx_param.gain = right; - return send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_DMIC, + return cros_ec_send_cmd_msg(priv->ec_device, 0, EC_CMD_EC_CODEC_DMIC, (uint8_t *)&p, sizeof(p), NULL, 0); } @@ -231,7 +199,7 @@ static int dmic_probe(struct snd_soc_component *component) p.cmd = EC_CODEC_DMIC_GET_MAX_GAIN; - ret = send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_DMIC, + ret = cros_ec_send_cmd_msg(priv->ec_device, 0, EC_CMD_EC_CODEC_DMIC, (uint8_t *)&p, sizeof(p), (uint8_t *)&r, sizeof(r)); if (ret < 0) { @@ -279,7 +247,7 @@ static int i2s_rx_hw_params(struct snd_pcm_substream *substream, p.cmd = EC_CODEC_I2S_RX_SET_SAMPLE_DEPTH; p.set_sample_depth_param.depth = depth; - ret = send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_I2S_RX, + ret = cros_ec_send_cmd_msg(priv->ec_device, 0, EC_CMD_EC_CODEC_I2S_RX, (uint8_t *)&p, sizeof(p), NULL, 0); if (ret < 0) return ret; @@ -289,7 +257,7 @@ static int i2s_rx_hw_params(struct snd_pcm_substream *substream, p.cmd = EC_CODEC_I2S_RX_SET_BCLK; p.set_bclk_param.bclk = snd_soc_params_to_bclk(params); - return send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_I2S_RX, + return cros_ec_send_cmd_msg(priv->ec_device, 0, EC_CMD_EC_CODEC_I2S_RX, (uint8_t *)&p, sizeof(p), NULL, 0); } @@ -333,7 +301,7 @@ static int i2s_rx_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) p.cmd = EC_CODEC_I2S_RX_SET_DAIFMT; p.set_daifmt_param.daifmt = daifmt; - return send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_I2S_RX, + return cros_ec_send_cmd_msg(priv->ec_device, 0, EC_CMD_EC_CODEC_I2S_RX, (uint8_t *)&p, sizeof(p), NULL, 0); } @@ -364,7 +332,7 @@ static int i2s_rx_event(struct snd_soc_dapm_widget *w, return 0; } - return send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_I2S_RX, + return cros_ec_send_cmd_msg(priv->ec_device, 0, EC_CMD_EC_CODEC_I2S_RX, (uint8_t *)&p, sizeof(p), NULL, 0); } @@ -415,7 +383,7 @@ static void *wov_map_shm(struct cros_ec_codec_priv *priv, p.cmd = EC_CODEC_GET_SHM_ADDR; p.get_shm_addr_param.shm_id = shm_id; - if (send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC, + if (cros_ec_send_cmd_msg(priv->ec_device, 0, EC_CMD_EC_CODEC, (uint8_t *)&p, sizeof(p), (uint8_t *)&r, sizeof(r)) < 0) { dev_err(priv->dev, "failed to EC_CODEC_GET_SHM_ADDR\n"); @@ -453,7 +421,7 @@ static void *wov_map_shm(struct cros_ec_codec_priv *priv, p.set_shm_addr_param.phys_addr = priv->ap_shm_last_alloc; p.set_shm_addr_param.len = req; p.set_shm_addr_param.shm_id = shm_id; - if (send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC, + if (cros_ec_send_cmd_msg(priv->ec_device, 0, EC_CMD_EC_CODEC, (uint8_t *)&p, sizeof(p), NULL, 0) < 0) { dev_err(priv->dev, "failed to EC_CODEC_SET_SHM_ADDR\n"); @@ -571,7 +539,7 @@ static int wov_read_audio_shm(struct cros_ec_codec_priv *priv) int ret; p.cmd = EC_CODEC_WOV_READ_AUDIO_SHM; - ret = send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_WOV, + ret = cros_ec_send_cmd_msg(priv->ec_device, 0, EC_CMD_EC_CODEC_WOV, (uint8_t *)&p, sizeof(p), (uint8_t *)&r, sizeof(r)); if (ret) { @@ -596,7 +564,8 @@ static int wov_read_audio(struct cros_ec_codec_priv *priv) while (remain >= 0) { p.cmd = EC_CODEC_WOV_READ_AUDIO; - ret = send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_WOV, + ret = cros_ec_send_cmd_msg(priv->ec_device, 0, + EC_CMD_EC_CODEC_WOV, (uint8_t *)&p, sizeof(p), (uint8_t *)&r, sizeof(r)); if (ret) { @@ -669,7 +638,8 @@ static int wov_enable_put(struct snd_kcontrol *kcontrol, else p.cmd = EC_CODEC_WOV_DISABLE; - ret = send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_WOV, + ret = cros_ec_send_cmd_msg(priv->ec_device, 0, + EC_CMD_EC_CODEC_WOV, (uint8_t *)&p, sizeof(p), NULL, 0); if (ret) { dev_err(priv->dev, "failed to %s wov\n", @@ -716,7 +686,7 @@ static int wov_set_lang_shm(struct cros_ec_codec_priv *priv, p.cmd = EC_CODEC_WOV_SET_LANG_SHM; memcpy(pp->hash, digest, SHA256_DIGEST_SIZE); pp->total_len = size; - ret = send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_WOV, + ret = cros_ec_send_cmd_msg(priv->ec_device, 0, EC_CMD_EC_CODEC_WOV, (uint8_t *)&p, sizeof(p), NULL, 0); if (ret) { dev_err(priv->dev, "failed to EC_CODEC_WOV_SET_LANG_SHM\n"); @@ -743,7 +713,8 @@ static int wov_set_lang(struct cros_ec_codec_priv *priv, pp->offset = i; memcpy(pp->buf, buf + i, req); pp->len = req; - ret = send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_WOV, + ret = cros_ec_send_cmd_msg(priv->ec_device, 0, + EC_CMD_EC_CODEC_WOV, (uint8_t *)&p, sizeof(p), NULL, 0); if (ret) { dev_err(priv->dev, "failed to EC_CODEC_WOV_SET_LANG\n"); @@ -782,7 +753,7 @@ static int wov_hotword_model_put(struct snd_kcontrol *kcontrol, goto leave; p.cmd = EC_CODEC_WOV_GET_LANG; - ret = send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC_WOV, + ret = cros_ec_send_cmd_msg(priv->ec_device, 0, EC_CMD_EC_CODEC_WOV, (uint8_t *)&p, sizeof(p), (uint8_t *)&r, sizeof(r)); if (ret) @@ -1020,7 +991,7 @@ static int cros_ec_codec_platform_probe(struct platform_device *pdev) atomic_set(&priv->dmic_probed, 0); p.cmd = EC_CODEC_GET_CAPABILITIES; - ret = send_ec_host_command(priv->ec_device, EC_CMD_EC_CODEC, + ret = cros_ec_send_cmd_msg(priv->ec_device, 0, EC_CMD_EC_CODEC, (uint8_t *)&p, sizeof(p), (uint8_t *)&r, sizeof(r)); if (ret) { -- 2.25.0.341.g760bfbb309-goog

2 2

[alsa-devel] [PATCH v5 00/17] soundwire: intel: implement new ASoC interfaces
by Pierre-Louis Bossart 03 Feb '20

03 Feb '20

This patchset applies on top of soundwire/next, now that the interface definitions are merged. The changes are essentially a removal of the platform devices, replaced by explicit device(s)/driver for the SoundWire Master(s), and the implementation of the new interfaces required to scan the ACPI tables, probe the links and start them. The missing prepare, trigger and setup ASoC callbacks are also implemented. The hw_params and free callbacks use the new interfaces as well. While there are quite a few lines of code changed, this is mostly about interface changes. The next series will contain more functional changes and deal with race conditions on probe, enumeration and suspend/resume issues. Thanks to Vinod Kould and GregKH for the reviews on previous versions, much appreciated. Changes since v4: (feedback from GregKH except last point flagged by Intel validation) Clarified error handling with uevents Added better commit messages and rationale behind exposing a Master Device. Used 'master_device' instead of 'md' when possible (kept the shortcut with really long function names) Added namespace check support for Intel code (the Cadence and core stuff should be done in a separate patchset). Fixed GPLv2 license/EXPORT_SYMBOL_GPL error for the Master Device code. Fixed missing error handling in sdw_md_add Added kerneldoc comments for sdw_md_driver structure (with explanation on what 'md' stands for) Fixed NULL pointer assignment leading to issues with driver_unregister Changes since v3: One line change to re-add EXPORT_SYMBOL Add missing driver_registration Changes since v2: moved uevent handling to slave_type (Vinod) Changes since v1: fix typo (Vinod) removed uevent open for Master (Vinod) clarified commit messages (Cezary) no functionality change Bard Liao (1): soundwire: register master device driver Pierre-Louis Bossart (13): soundwire: renames to prepare support for master drivers/devices soundwire: rename dev_to_sdw_dev macro soundwire: rename drv_to_sdw_slave_driver macro soundwire: bus_type: rename sdw_drv_ to sdw_slave_drv soundwire: intel: rename res field as link_res soundwire: add support for sdw_slave_type soundwire: slave: move uevent handling to slave device level soundwire: add initial definitions for sdw_master_device soundwire: intel: remove platform devices and use 'Master Devices' instead soundwire: intel: free all resources on hw_free() soundwire: intel_init: add implementation of sdw_intel_enable_irq() soundwire: intel_init: use EXPORT_SYMBOL_NS soundwire: intel: use EXPORT_SYMBOL_NS Rander Wang (3): soundwire: intel: add prepare support in sdw dai driver soundwire: intel: add trigger support in sdw dai driver soundwire: intel: add sdw_stream_setup helper for .startup callback drivers/base/regmap/regmap-sdw.c | 4 +- drivers/soundwire/Makefile | 2 +- drivers/soundwire/bus.c | 2 +- drivers/soundwire/bus.h | 2 + drivers/soundwire/bus_type.c | 70 ++++--- drivers/soundwire/intel.c | 281 +++++++++++++++++++++----- drivers/soundwire/intel.h | 8 +- drivers/soundwire/intel_init.c | 312 ++++++++++++++++++++++------- drivers/soundwire/master.c | 64 ++++++ drivers/soundwire/slave.c | 10 +- include/linux/soundwire/sdw.h | 42 +++- include/linux/soundwire/sdw_type.h | 34 +++- 12 files changed, 668 insertions(+), 163 deletions(-) create mode 100644 drivers/soundwire/master.c -- 2.20.1

2 46

[alsa-devel] [PATCH v3 0/4] ALSA: hda - Add DP-MST support for NVIDIA codecs
by Nikhil Mahale 03 Feb '20

03 Feb '20

Today, DisplayPort multi-stream transport (DP-MST) audio is not supported on codec drivers which don't use the audio component (acomp) binding. The commit ade49db337a9 (ALSA: hda/hdmi - Allow audio component for AMD/ATI and Nvidia HDMI) added the DRM audio component binding for the NVIDIA codec drivers, but the traditional HD-audio unsolicited event code path is still in use by the proprietary NVIDIA graphics driver. This patch set adds DP-MST audio support for non-acomp codec drivers which use the traditional HD-audio unsolicited event code path. This patch set adds DP-MST support for NVIDIA codecs. The patch set has been tested for HDMI/DP-SST/DP-MST(4 dp-mst audio streams) configurations on NVIDIA Kepler and Maxwell GPUs, using both the nouveau driver and the proprietary NVIDIA graphics driver. Nikhil Mahale (4): ALSA: hda - Rename snd_hda_pin_sense to snd_hda_jack_pin_sense ALSA: hda - Add DP-MST jack support ALSA: hda - Add DP-MST support for non-acomp codecs ALSA: hda - Add DP-MST support for NVIDIA codecs sound/pci/hda/hda_jack.c | 151 ++++++++++++++++++-------- sound/pci/hda/hda_jack.h | 107 ++++++++++++++++-- sound/pci/hda/patch_hdmi.c | 263 +++++++++++++++++++++++++++++++-------------- 3 files changed, 385 insertions(+), 136 deletions(-) -- 2.16.4

5 13

[alsa-devel] [PATCH 0/4] ASoC: mediatek: mt8183-da7219: pick fixes from mt8183-mt6358
by Tzung-Bi Shih 03 Feb '20

03 Feb '20

Cherry-picks fixes from mt8183-mt6358-ts3a227-max98357 machine driver. The 1st patch from commit 1df1e5457cd1 ("ASoC: Mediatek: MT8183: change supported formats of DL2 and UL1"). The 2nd patch from commit 6191cbde5ff0 ("ASoC: mediatek: mt8183: switch tdm pins gpio function when playback on or off"). The 3rd patch from commit 8e58c521bcb8 ("ASoC: mediatek: mt8183: tdm hw support tdm out and 8ch i2s out"). The 4th patch squashes the following: - commit 63ba8e4d04ab ("ASoC: mediatek: mt8183: move card registration to the end of probe") - commit 95d779b4b8e7 ("ASoC: mediatek: mt8183: move headset jack to card-specific storage") - commit e5b3ae3e8c47 ("ASoC: mediatek: mt8183: fix space issues") Tzung-Bi Shih (4): ASoC: mediatek: mt8183-da7219: change supported formats of DL2 and UL1 ASoC: mediatek: mt8183-da7219: pull TDM GPIO pins down when probed ASoC: mediatek: mt8183-da7219: support TDM out and 8ch I2S out ASoC: mediatek: mt8183-da7219: apply some refactors .../mediatek/mt8183/mt8183-da7219-max98357.c | 164 ++++++++++++++++-- 1 file changed, 147 insertions(+), 17 deletions(-) -- 2.25.0.341.g760bfbb309-goog

1 4

[alsa-devel] [PATCH] MAINTAINERS: Remove the Bard Liao from the MAINTAINERS of Realtek CODECs
by Oder Chiou 03 Feb '20

03 Feb '20

Remove the maintainer "Bard Liao" since he had quitted from Realtek. Signed-off-by: Oder Chiou <oder_chiou(a)realtek.com> --- MAINTAINERS | 1 - 1 file changed, 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index cf6ccca6e61c..9316dcf2790f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13947,7 +13947,6 @@ F: include/linux/platform_data/rtc-* F: tools/testing/selftests/rtc/ REALTEK AUDIO CODECS -M: Bard Liao <bardliao(a)realtek.com> M: Oder Chiou <oder_chiou(a)realtek.com> S: Maintained F: sound/soc/codecs/rt* -- 2.24.1

1 0