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

[alsa-devel] [PATCH 1/2] ALSA: usb-audio: Always check descriptor sizes in parser code
by Takashi Iwai 07 Jan '19

07 Jan '19

There are a few places where we access the data without checking the actual object size from the USB audio descriptor. This may result in OOB access, as recently reported. This patch addresses these missing checks. Most of added codes are simple bLength checks in the caller side. For the input and output terminal parsers, we put the length check in the parser functions. For the input terminal, a new argument is added to distinguish between UAC1 and the rest, as they treat different objects. Reported-by: Mathias Payer <mathias.payer(a)nebelwelt.net> Reported-by: Hui Peng <benquike(a)163.com> Tested-by: Hui Peng <benquike(a)163.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/usb/card.c | 2 +- sound/usb/mixer.c | 4 ++++ sound/usb/stream.c | 36 +++++++++++++++++++++++++----------- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/sound/usb/card.c b/sound/usb/card.c index a105947eaf55..746a72e23cf9 100644 --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -246,7 +246,7 @@ static int snd_usb_create_streams(struct snd_usb_audio *chip, int ctrlif) h1 = snd_usb_find_csint_desc(host_iface->extra, host_iface->extralen, NULL, UAC_HEADER); - if (!h1) { + if (!h1 || h1->bLength < sizeof(*h1)) { dev_err(&dev->dev, "cannot find UAC_HEADER\n"); return -EINVAL; } diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index dfd918891e69..e7d441d0e839 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -2075,11 +2075,15 @@ static int parse_audio_input_terminal(struct mixer_build *state, int unitid, if (state->mixer->protocol == UAC_VERSION_2) { struct uac2_input_terminal_descriptor *d_v2 = raw_desc; + if (d_v2->bLength < sizeof(*d_v2)) + return -EINVAL; control = UAC2_TE_CONNECTOR; term_id = d_v2->bTerminalID; bmctls = le16_to_cpu(d_v2->bmControls); } else if (state->mixer->protocol == UAC_VERSION_3) { struct uac3_input_terminal_descriptor *d_v3 = raw_desc; + if (d_v3->bLength < sizeof(*d_v3)) + return -EINVAL; control = UAC3_TE_INSERTION; term_id = d_v3->bTerminalID; bmctls = le32_to_cpu(d_v3->bmControls); diff --git a/sound/usb/stream.c b/sound/usb/stream.c index 67cf849aa16b..d9e3de495c16 100644 --- a/sound/usb/stream.c +++ b/sound/usb/stream.c @@ -596,12 +596,8 @@ static int parse_uac_endpoint_attributes(struct snd_usb_audio *chip, csep = snd_usb_find_desc(alts->extra, alts->extralen, NULL, USB_DT_CS_ENDPOINT); if (!csep || csep->bLength < 7 || - csep->bDescriptorSubtype != UAC_EP_GENERAL) { - usb_audio_warn(chip, - "%u:%d : no or invalid class specific endpoint descriptor\n", - iface_no, altsd->bAlternateSetting); - return 0; - } + csep->bDescriptorSubtype != UAC_EP_GENERAL) + goto error; if (protocol == UAC_VERSION_1) { attributes = csep->bmAttributes; @@ -609,6 +605,8 @@ static int parse_uac_endpoint_attributes(struct snd_usb_audio *chip, struct uac2_iso_endpoint_descriptor *csep2 = (struct uac2_iso_endpoint_descriptor *) csep; + if (csep2->bLength < sizeof(*csep2)) + goto error; attributes = csep->bmAttributes & UAC_EP_CS_ATTR_FILL_MAX; /* emulate the endpoint attributes of a v1 device */ @@ -618,12 +616,20 @@ static int parse_uac_endpoint_attributes(struct snd_usb_audio *chip, struct uac3_iso_endpoint_descriptor *csep3 = (struct uac3_iso_endpoint_descriptor *) csep; + if (csep3->bLength < sizeof(*csep3)) + goto error; /* emulate the endpoint attributes of a v1 device */ if (le32_to_cpu(csep3->bmControls) & UAC2_CONTROL_PITCH) attributes |= UAC_EP_CS_ATTR_PITCH_CONTROL; } return attributes; + + error: + usb_audio_warn(chip, + "%u:%d : no or invalid class specific endpoint descriptor\n", + iface_no, altsd->bAlternateSetting); + return 0; } /* find an input terminal descriptor (either UAC1 or UAC2) with the given @@ -631,13 +637,17 @@ static int parse_uac_endpoint_attributes(struct snd_usb_audio *chip, */ static void * snd_usb_find_input_terminal_descriptor(struct usb_host_interface *ctrl_iface, - int terminal_id) + int terminal_id, bool uac23) { struct uac2_input_terminal_descriptor *term = NULL; + size_t minlen = uac23 ? sizeof(struct uac2_input_terminal_descriptor) : + sizeof(struct uac_input_terminal_descriptor); while ((term = snd_usb_find_csint_desc(ctrl_iface->extra, ctrl_iface->extralen, term, UAC_INPUT_TERMINAL))) { + if (term->bLength < minlen) + continue; if (term->bTerminalID == terminal_id) return term; } @@ -655,7 +665,8 @@ snd_usb_find_output_terminal_descriptor(struct usb_host_interface *ctrl_iface, while ((term = snd_usb_find_csint_desc(ctrl_iface->extra, ctrl_iface->extralen, term, UAC_OUTPUT_TERMINAL))) { - if (term->bTerminalID == terminal_id) + if (term->bLength >= sizeof(*term) && + term->bTerminalID == terminal_id) return term; } @@ -729,7 +740,8 @@ snd_usb_get_audioformat_uac12(struct snd_usb_audio *chip, format = le16_to_cpu(as->wFormatTag); /* remember the format value */ iterm = snd_usb_find_input_terminal_descriptor(chip->ctrl_intf, - as->bTerminalLink); + as->bTerminalLink, + false); if (iterm) { num_channels = iterm->bNrChannels; chconfig = le16_to_cpu(iterm->wChannelConfig); @@ -764,7 +776,8 @@ snd_usb_get_audioformat_uac12(struct snd_usb_audio *chip, * to extract the clock */ input_term = snd_usb_find_input_terminal_descriptor(chip->ctrl_intf, - as->bTerminalLink); + as->bTerminalLink, + true); if (input_term) { clock = input_term->bCSourceID; if (!chconfig && (num_channels == input_term->bNrChannels)) @@ -998,7 +1011,8 @@ snd_usb_get_audioformat_uac3(struct snd_usb_audio *chip, * to extract the clock */ input_term = snd_usb_find_input_terminal_descriptor(chip->ctrl_intf, - as->bTerminalLink); + as->bTerminalLink, + true); if (input_term) { clock = input_term->bCSourceID; goto found_clock; -- 2.19.2

1 1

[alsa-devel] [PATCH] ASoC: AMD: Add delay before starting to capture
by Agrawal, Akshu 07 Jan '19

07 Jan '19

On capture through dmic we observe a glitch at the start of record. This is because we start capturing even before dmic is ready to send out data. The glitch seen last for ~20msec. Signed-off-by: Akshu Agrawal <akshu.agrawal(a)amd.com> Signed-off-by: Daniel Kurtz <djkurtz(a)chromium.org> --- sound/soc/amd/acp-da7219-max98357a.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c index a5daad9..72b1cf4 100644 --- a/sound/soc/amd/acp-da7219-max98357a.c +++ b/sound/soc/amd/acp-da7219-max98357a.c @@ -44,6 +44,8 @@ #define CZ_PLAT_CLK 48000000 #define DUAL_CHANNEL 2 +#define ADAU7002_DELAY_MS 20 + static struct snd_soc_jack cz_jack; static struct clk *da7219_dai_clk; @@ -213,6 +215,7 @@ static int cz_dmic0_startup(struct snd_pcm_substream *substream) struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_card *card = rtd->card; struct acp_platform_info *machine = snd_soc_card_get_drvdata(card); + int ret; /* * On this platform for PCM device we support stereo @@ -225,7 +228,17 @@ static int cz_dmic0_startup(struct snd_pcm_substream *substream) &constraints_rates); machine->cap_i2s_instance = I2S_BT_INSTANCE; - return da7219_clk_enable(substream); + ret = da7219_clk_enable(substream); + if (ret) + return ret; + /* + * On some platforms, it takes ~20 msec for PDM DMICs and ADAU7002 + * to settle and start producing proper audio data. + */ + msleep(ADAU7002_DELAY_MS); + /* Delay in frames for 48Khz, 16bit, 2 channel */ + runtime->delay = ADAU7002_DELAY_MS * 48; + return 0; } static int cz_dmic1_startup(struct snd_pcm_substream *substream) @@ -234,6 +247,7 @@ static int cz_dmic1_startup(struct snd_pcm_substream *substream) struct snd_soc_pcm_runtime *rtd = substream->private_data; struct snd_soc_card *card = rtd->card; struct acp_platform_info *machine = snd_soc_card_get_drvdata(card); + int ret; /* * On this platform for PCM device we support stereo @@ -247,7 +261,17 @@ static int cz_dmic1_startup(struct snd_pcm_substream *substream) machine->cap_i2s_instance = I2S_SP_INSTANCE; machine->capture_channel = CAP_CHANNEL0; - return da7219_clk_enable(substream); + ret = da7219_clk_enable(substream); + if (ret) + return ret; + /* + * On some platforms, it takes ~20 msec for PDM DMICs and ADAU7002 + * to settle and start producing proper audio data. + */ + msleep(ADAU7002_DELAY_MS); + /* Delay in frames for 48Khz, 16bit, 2 channel */ + runtime->delay = ADAU7002_DELAY_MS * 48; + return 0; } static void cz_dmic_shutdown(struct snd_pcm_substream *substream) -- 1.9.1

2 2

[alsa-devel] [PATCH 1/2] ASoC: refine ASoC hdmi audio suspend/resume
by libin.yang＠intel.com 07 Jan '19

07 Jan '19

From: Libin Yang <libin.yang(a)intel.com> hdmi_codec_prepare() will trigger hdmi runtime resume, which will set the bitmask of hdev->addr. And skl_suspend() will clear the bitmask of HDA_CODEC_IDX_CONTROLLER. HDMI codec idx is not the same as HDA_CODEC_IDX_CONTROLLER, which means i915 power will not be released when suspend. On the other hand, hdmi_codec_prepare() don't need to call pm_runtime_get_sync() to wake up the audio subsystem (HDMI auido) for setting the codec registers. Turning display power on with snd_hdac_display_power() is enough. Let's use S3 without playback as an example: hdmi_codec_prepare() invokes the runtime resume of codec => snd_hdac_display_power(bus, hdev->addr, true) skl runtime resume skl_suspend() => snd_hdac_display_power(bus, HDA_CODEC_IDX_CONTROLLER, false); THis means hdev->addr will never release the display power when suspend. The new sequence will be: hdmi_codec_prepare() => snd_hdac_display_power(bus, hdev->addr, true) snd_hdac_display_power(bus, hdev->addr, false) skl runtime resume skl suspned Signed-off-by: Libin Yang <libin.yang(a)intel.com> --- sound/soc/codecs/hdac_hdmi.c | 6 ++++-- sound/soc/intel/skylake/skl.c | 7 ------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/sound/soc/codecs/hdac_hdmi.c b/sound/soc/codecs/hdac_hdmi.c index 3ab2949..782b323 100644 --- a/sound/soc/codecs/hdac_hdmi.c +++ b/sound/soc/codecs/hdac_hdmi.c @@ -1895,7 +1895,7 @@ static int hdmi_codec_prepare(struct device *dev) { struct hdac_device *hdev = dev_to_hdac_dev(dev); - pm_runtime_get_sync(&hdev->dev); + snd_hdac_display_power(hdev->bus, hdev->addr, true); /* * Power down afg. @@ -1906,6 +1906,7 @@ static int hdmi_codec_prepare(struct device *dev) */ snd_hdac_codec_read(hdev, hdev->afg, 0, AC_VERB_SET_POWER_STATE, AC_PWRST_D3); + snd_hdac_display_power(hdev->bus, hdev->addr, false); return 0; } @@ -1915,6 +1916,7 @@ static void hdmi_codec_complete(struct device *dev) struct hdac_device *hdev = dev_to_hdac_dev(dev); struct hdac_hdmi_priv *hdmi = hdev_to_hdmi_priv(hdev); + snd_hdac_display_power(hdev->bus, hdev->addr, true); /* Power up afg */ snd_hdac_codec_read(hdev, hdev->afg, 0, AC_VERB_SET_POWER_STATE, AC_PWRST_D0); @@ -1930,7 +1932,7 @@ static void hdmi_codec_complete(struct device *dev) */ hdac_hdmi_present_sense_all_pins(hdev, hdmi, false); - pm_runtime_put_sync(&hdev->dev); + snd_hdac_display_power(hdev->bus, hdev->addr, false); } #else #define hdmi_codec_prepare NULL diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index 60c9483..89f4d66 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c @@ -336,9 +336,6 @@ static int skl_suspend(struct device *dev) skl->skl_sst->fw_loaded = false; } - if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)) - snd_hdac_display_power(bus, HDA_CODEC_IDX_CONTROLLER, false); - return 0; } @@ -350,10 +347,6 @@ static int skl_resume(struct device *dev) struct hdac_ext_link *hlink = NULL; int ret; - /* Turned OFF in HDMI codec driver after codec reconfiguration */ - if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)) - snd_hdac_display_power(bus, HDA_CODEC_IDX_CONTROLLER, true); - /* * resume only when we are not in suspend active, otherwise need to * restore the device -- 2.7.4

2 2

[alsa-devel] [snd_hda_intel] snd_hda_intel causes high CPU lockup and system instability if mic disabled in BIOS on Lenovo P50
by Alexander Kappner 07 Jan '19

07 Jan '19

My Lenovo P50 laptop has a BIOS option to disable the microphone. When this option gets chosen, the snd_hda_intel driver causes high CPU load on a single kworker thread, spinning on "process_unsol_events", and system instability. This behavior occurs from the time that the snd_hda_intel module is loaded, irrespective of whether anything is attempting to access the mic. The sound output still works. When in this state, the module cannot be removed cleanly; attempting to remove it (even without rmmod -f) triggers an oops. I have attached two exemplary dmesg outputs. Strangely enough, the exact location of the oops varies, but further up the call chain, I always see process_unsol_events. When the mic is not disabled in the BIOS, the module works stable, regardless whether or not the mic is muted in ALSA. I wasn't able to pinpoint the root cause. Any pointers on where to start? Much appreciated. Best regards Alexander First dmesg: [31592.691573] BUG: unable to handle kernel NULL pointer dereference at 000000000000020c [31592.691600] IP: mux_select+0x1d/0x190 [snd_hda_codec_generic] [31592.691601] PGD 0 P4D 0 [31592.691604] Oops: 0000 [#1] PREEMPT SMP [31592.691606] Modules linked in: snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic snd_hda_intel(-) snd_hda_codec snd_hwdep snd_hda_core snd_pcm snd_timer zfs(PO) zunicode(PO) zlua(PO) nvidia_drm(PO) nvidia_modeset(PO) nvidia(PO) iwlmvm mac80211 qmi_wwan iwlwifi cfg80211 thinkpad_acpi rfkill zcommon(PO) znvpair(PO) zavl(PO) icp(PO) spl(O) sdhci_pci cqhci sdhci mmc_block rtsx_pci_sdmmc rtsx_pci mfd_core [31592.691639] CPU: 3 PID: 11044 Comm: kworker/3:1 Tainted: P O 4.16.0-rc7-00206-gf461da3-dirty #33 [31592.691640] Hardware name: LENOVO 20ENCTO1WW/20ENCTO1WW, BIOS N1EET62W (1.35 ) 11/10/2016 [31592.691643] Workqueue: events process_unsol_events [snd_hda_core] [31592.691647] RIP: 0010:mux_select+0x1d/0x190 [snd_hda_codec_generic] [31592.691648] RSP: 0018:ffffc9000f0dfe08 EFLAGS: 00010292 [31592.691650] RAX: 0000000000000001 RBX: ffff880e44737300 RCX: 00000000ffffffff [31592.691651] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff880ee6368800 [31592.691652] RBP: 0000000000000000 R08: 0000000000000f09 R09: 0000000000000000 [31592.691653] R10: 0000000000000018 R11: 0000000000000003 R12: ffff880ee6368800 [31592.691655] R13: 0000000000000000 R14: ffff881053ce6100 R15: 0ffff881053ce610 [31592.691656] FS: 0000000000000000(0000) GS:ffff881053cc0000(0000) knlGS:0000000000000000 [31592.691658] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [31592.691659] CR2: 000000000000020c CR3: 000000000220a004 CR4: 00000000003606e0 [31592.691661] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [31592.691662] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [31592.691662] Call Trace: [31592.691668] ? snd_hda_jack_detect_state+0x4b/0x60 [snd_hda_codec] [31592.691672] call_jack_callback.isra.1+0x20/0xa0 [snd_hda_codec] [31592.691676] snd_hda_jack_unsol_event+0x62/0x70 [snd_hda_codec] [31592.691679] process_unsol_events+0x64/0x80 [snd_hda_core] [31592.691682] process_one_work+0x13e/0x380 [31592.691684] worker_thread+0x62/0x3e0 [31592.691686] ? rescuer_thread+0x2d0/0x2d0 [31592.691689] kthread+0x10d/0x140 [31592.691690] ? kthread_bind+0x10/0x10 [31592.691693] ret_from_fork+0x35/0x40 [31592.691695] Code: e2 01 e9 77 fb ff ff c3 66 0f 1f 44 00 00 0f 1f 44 00 00 41 57 41 56 41 55 41 54 49 89 fc 55 53 48 83 ec 08 48 8b af 08 04 00 00 <8b> 85 0c 02 00 00 85 c0 74 73 89 d3 41 89 f5 8d 50 ff 39 d8 89 [31592.691721] RIP: mux_select+0x1d/0x190 [snd_hda_codec_generic] RSP: ffffc9000f0dfe08 [31592.691723] CR2: 000000000000020c [31592.691725] ---[ end trace dee155e55b20eab8 ]--- Second dmesg: [115121.084841] BUG: unable to handle kernel NULL pointer dereference at 00000000000005f8 [115121.084844] PGD 0 P4D 0 [115121.084847] Oops: 0000 [#1] PREEMPT SMP [115121.084850] CPU: 2 PID: 12228 Comm: kworker/2:1 Tainted: P O 4.18.0-rc2-00223-g1904148-dirty #39 [115121.084851] Hardware name: LENOVO 20ENCTO1WW/20ENCTO1WW, BIOS N1EET62W (1.35 ) 11/10/2016 [115121.084856] Workqueue: events process_unsol_events [snd_hda_core] [115121.084859] RIP: 0010:set_path_power+0x24/0x120 [snd_hda_codec_generic] [115121.084860] Code: 66 0f 1f 44 00 00 0f 1f 44 00 00 41 57 41 89 f7 41 56 41 55 41 54 55 48 89 fd 53 48 83 ec 08 4c 8b b7 08 04 00 00 89 54 24 04 <41> 8b be f8 05 00 00 49 8b b6 08 06 00 00 85 ff 0f 84 ce 00 00 00 [115121.084901] RSP: 0018:ffffc900243e3de8 EFLAGS: 00010296 [115121.084903] RAX: 0000000000000000 RBX: 0000000000000018 RCX: 00000000ffffffff [115121.084904] RDX: 0000000000000000 RSI: 0000000000000018 RDI: ffff880f993a2800 [115121.084906] RBP: ffff880f993a2800 R08: 0000000000000f09 R09: 0000000000000000 [115121.084907] R10: 0000000000000019 R11: 0000000000000000 R12: 0000000000000000 [115121.084908] R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000018 [115121.084910] FS: 0000000000000000(0000) GS:ffff881053c80000(0000) knlGS:0000000000000000 [115121.084911] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [115121.084912] CR2: 00000000000005f8 CR3: 000000000260a004 CR4: 00000000003606e0 [115121.084914] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [115121.084915] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [115121.084916] Call Trace: [115121.084922] pin_power_callback+0x4f/0x80 [snd_hda_codec_generic] [115121.084926] call_jack_callback.isra.1+0x20/0xa0 [snd_hda_codec] [115121.084930] snd_hda_jack_unsol_event+0x62/0x70 [snd_hda_codec] [115121.084933] process_unsol_events+0x64/0x80 [snd_hda_core] [115121.084937] process_one_work+0x157/0x390 [115121.084939] worker_thread+0x64/0x3e0 [115121.084942] ? rescuer_thread+0x2e0/0x2e0 [115121.084944] kthread+0x10d/0x140 [115121.084946] ? kthread_bind+0x10/0x10 [115121.084948] ret_from_fork+0x35/0x40 [115121.084951] Modules linked in: snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic snd_hda_intel(-) snd_hda_codec snd_hwdep snd_hda_core snd_pcm snd_timer tun nvidia_modeset(PO) nvidia(PO) iwlmvm mac80211 iwlwifi btusb btrtl btbcm btintel bluetooth cfg80211 qmi_wwan ecdh_generic thinkpad_acpi rfkill sdhci_pci cqhci sdhci mmc_block rtsx_pci_sdmmc rtsx_pci mfd_core [115121.084969] CR2: 00000000000005f8 [115121.084971] ---[ end trace 010d684599325728 ]--- [115121.084975] RIP: 0010:set_path_power+0x24/0x120 [snd_hda_codec_generic] [115121.084976] Code: 66 0f 1f 44 00 00 0f 1f 44 00 00 41 57 41 89 f7 41 56 41 55 41 54 55 48 89 fd 53 48 83 ec 08 4c 8b b7 08 04 00 00 89 54 24 04 <41> 8b be f8 05 00 00 49 8b b6 08 06 00 00 85 ff 0f 84 ce 00 00 00 [115121.085000] RSP: 0018:ffffc900243e3de8 EFLAGS: 00010296 [115121.085001] RAX: 0000000000000000 RBX: 0000000000000018 RCX: 00000000ffffffff [115121.085002] RDX: 0000000000000000 RSI: 0000000000000018 RDI: ffff880f993a2800 [115121.085003] RBP: ffff880f993a2800 R08: 0000000000000f09 R09: 0000000000000000 [115121.085004] R10: 0000000000000019 R11: 0000000000000000 R12: 0000000000000000 [115121.085005] R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000018 [115121.085006] FS: 0000000000000000(0000) GS:ffff881053c80000(0000) knlGS:0000000000000000 [115121.085007] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [115121.085008] CR2: 00000000000005f8 CR3: 000000000260a004 CR4: 00000000003606e0 [115121.085009] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [115121.085010] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400

2 6

[alsa-devel] ALSA:usb audio Higher sample rates on usb audio no longer working.
by Con Kolivas 06 Jan '19

06 Jan '19

Upon switching from 4.19.0 to 4.20.0, pulseaudio started complaining that sinks that previously worked are no longer supported. On 4.19.0 trying 24 bit 88200, 176400, and 192000 I get the following output from pulse. resampler.c: Forcing resampler 'copy', because of fixed, identical sample rates.sink-input.c: Created input 15 "Playback Stream" on alsa_output.usb-DSPeaker_Anti-Mode_X4-00.iec958-stereo with sample spec float32le 2ch 176400Hz and channel map front-left,front-right Switching to 4.20 gives me: alsa-sink.c: Sink does not support sample rate of 176400 Hz and alsa-sink.c: Sink does not support sample rate of 88200 Hz and alsa-sink.c: Sink does not support sample rate of 192000 Hz Sample rates of 44100, 48000, and 96000 work fine, but 88200, 176400, and 192000 no longer work Switching back to 4.19 immediately fixes the issue. I tried looking through the alsa changelogs but there were too many to give an obvious culprit, and haven't had time to do a git bisect. If there's an obvious choice patch to back out I'd be grateful for the heads up. Regards, Con Output from 4.19 dmesg grep snd: [ 4.941164] snd_hda_intel 0000:02:00.1: Disabling MSI [ 4.957534] snd_hda_codec_realtek hdaudioC0D0: autoconfig for ALC892: line_outs=4 (0x14/0x15/0x16/0x17/0x0) type:line [ 4.957536] snd_hda_codec_realtek hdaudioC0D0: speaker_outs=0 (0x0/0x0/0x0/0x0/0x0) [ 4.957537] snd_hda_codec_realtek hdaudioC0D0: hp_outs=1 (0x1b/0x0/0x0/0x0/0x0) [ 4.957538] snd_hda_codec_realtek hdaudioC0D0: mono: mono_out=0x0 [ 4.957538] snd_hda_codec_realtek hdaudioC0D0: dig-out=0x11/0x1e [ 4.957539] snd_hda_codec_realtek hdaudioC0D0: inputs: [ 4.957540] snd_hda_codec_realtek hdaudioC0D0: Front Mic=0x19 [ 4.957541] snd_hda_codec_realtek hdaudioC0D0: Rear Mic=0x18 [ 4.957542] snd_hda_codec_realtek hdaudioC0D0: Line=0x1a [ 6.215818] usbcore: registered new interface driver snd-usb-audio Output from 4.20 dmesg grep snd (identical): [ 4.960455] snd_hda_intel 0000:02:00.1: Disabling MSI [ 4.986848] snd_hda_codec_realtek hdaudioC0D0: autoconfig for ALC892: line_outs=4 (0x14/0x15/0x16/0x17/0x0) type:line [ 4.986850] snd_hda_codec_realtek hdaudioC0D0: speaker_outs=0 (0x0/0x0/0x0/0x0/0x0) [ 4.986852] snd_hda_codec_realtek hdaudioC0D0: hp_outs=1 (0x1b/0x0/0x0/0x0/0x0) [ 4.986853] snd_hda_codec_realtek hdaudioC0D0: mono: mono_out=0x0 [ 4.986854] snd_hda_codec_realtek hdaudioC0D0: dig-out=0x11/0x1e [ 4.986855] snd_hda_codec_realtek hdaudioC0D0: inputs: [ 4.986856] snd_hda_codec_realtek hdaudioC0D0: Front Mic=0x19 [ 4.986857] snd_hda_codec_realtek hdaudioC0D0: Rear Mic=0x18 [ 4.986858] snd_hda_codec_realtek hdaudioC0D0: Line=0x1a [ 6.211079] usbcore: registered new interface driver snd-usb-audio Output from usb connected audio device 4.19: [ 998.567015] usb 2-1.8.4: new high-speed USB device number 19 using ehci-pci [ 998.682497] usb 2-1.8.4: New USB device found, idVendor=19fb, idProduct=2040, bcdDevice= 2.00 [ 998.682502] usb 2-1.8.4: New USB device strings: Mfr=1, Product=2, SerialNumber=0 [ 998.682505] usb 2-1.8.4: Product: Anti-Mode X4 [ 998.682507] usb 2-1.8.4: Manufacturer: DSPeaker 4.20 (identical): [ 98.428175] usb 2-1.8.4: new high-speed USB device number 19 using ehci-pci [ 98.543175] usb 2-1.8.4: New USB device found, idVendor=19fb, idProduct=2040, bcdDevice= 2.00 [ 98.543177] usb 2-1.8.4: New USB device strings: Mfr=1, Product=2, SerialNumber=0 [ 98.543178] usb 2-1.8.4: Product: Anti-Mode X4 [ 98.543179] usb 2-1.8.4: Manufacturer: DSPeaker lspci output: 00:00.0 Host bridge: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 DMI2 (rev 04) 00:01.0 PCI bridge: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 PCI Express Root Port 1a (rev 04) 00:02.0 PCI bridge: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 PCI Express Root Port 2a (rev 04) 00:03.0 PCI bridge: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 PCI Express Root Port 3a (rev 04) 00:05.0 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 VTd/Memory Map/Misc (rev 04) 00:05.2 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 IIO RAS (rev 04) 00:05.4 PIC: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 IOAPIC (rev 04) 00:11.0 PCI bridge: Intel Corporation C600/X79 series chipset PCI Express Virtual Root Port (rev 06) 00:16.0 Communication controller: Intel Corporation C600/X79 series chipset MEI Controller #1 (rev 05) 00:1a.0 USB controller: Intel Corporation C600/X79 series chipset USB2 Enhanced Host Controller #2 (rev 06) 00:1b.0 Audio device: Intel Corporation C600/X79 series chipset High Definition Audio Controller (rev 06) 00:1c.0 PCI bridge: Intel Corporation C600/X79 series chipset PCI Express Root Port 1 (rev b6) 00:1c.2 PCI bridge: Intel Corporation C600/X79 series chipset PCI Express Root Port 3 (rev b6) 00:1c.3 PCI bridge: Intel Corporation C600/X79 series chipset PCI Express Root Port 4 (rev b6) 00:1c.4 PCI bridge: Intel Corporation C600/X79 series chipset PCI Express Root Port 5 (rev b6) 00:1c.5 PCI bridge: Intel Corporation C600/X79 series chipset PCI Express Root Port 6 (rev b6) 00:1d.0 USB controller: Intel Corporation C600/X79 series chipset USB2 Enhanced Host Controller #1 (rev 06) 00:1e.0 PCI bridge: Intel Corporation 82801 PCI Bridge (rev a6) 00:1f.0 ISA bridge: Intel Corporation C600/X79 series chipset LPC Controller (rev 06) 00:1f.2 SATA controller: Intel Corporation C600/X79 series chipset 6-Port SATA AHCI Controller (rev 06) 00:1f.3 SMBus: Intel Corporation C600/X79 series chipset SMBus Host Controller (rev 06) 02:00.0 VGA compatible controller: NVIDIA Corporation GP106 [GeForce GTX 1060 3GB] (rev a1) 02:00.1 Audio device: NVIDIA Corporation GP106 High Definition Audio Controller (rev a1) 06:00.0 USB controller: ASMedia Technology Inc. ASM1042A USB 3.0 Host Controller 07:00.0 USB controller: ASMedia Technology Inc. ASM1042A USB 3.0 Host Controller 08:00.0 SATA controller: ASMedia Technology Inc. ASM1062 Serial ATA Controller (rev 01) 09:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 PCI Express Gigabit Ethernet Controller (rev 09) ff:08.0 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 QPI Link 0 (rev 04) ff:09.0 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 QPI Link 1 (rev 04) ff:0a.0 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 Power Control Unit 0 (rev 04) ff:0a.1 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 Power Control Unit 1 (rev 04) ff:0a.2 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 Power Control Unit 2 (rev 04) ff:0a.3 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 Power Control Unit 3 (rev 04) ff:0b.0 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 UBOX Registers (rev 04) ff:0b.3 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 UBOX Registers (rev 04) ff:0c.0 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 Unicast Registers (rev 04) ff:0c.1 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 Unicast Registers (rev 04) ff:0c.2 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 Unicast Registers (rev 04) ff:0d.0 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 Unicast Registers (rev 04) ff:0d.1 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 Unicast Registers (rev 04) ff:0d.2 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 Unicast Registers (rev 04) ff:0e.0 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 Home Agent 0 (rev 04) ff:0e.1 Performance counters: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 Home Agent 0 (rev 04) ff:0f.0 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 Integrated Memory Controller 0 Target Address/Thermal Registers (rev 04) ff:0f.1 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 Integrated Memory Controller 0 RAS Registers (rev 04) ff:0f.2 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder Registers (rev 04) ff:0f.3 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder Registers (rev 04) ff:0f.4 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder Registers (rev 04) ff:0f.5 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 Integrated Memory Controller 0 Channel Target Address Decoder Registers (rev 04) ff:10.0 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 Integrated Memory Controller 1 Channel 0-3 Thermal Control 0 (rev 04) ff:10.1 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 Integrated Memory Controller 1 Channel 0-3 Thermal Control 1 (rev 04) ff:10.2 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 Integrated Memory Controller 1 Channel 0-3 ERROR Registers 0 (rev 04) ff:10.3 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 Integrated Memory Controller 1 Channel 0-3 ERROR Registers 1 (rev 04) ff:10.4 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 Integrated Memory Controller 1 Channel 0-3 Thermal Control 2 (rev 04) ff:10.5 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 Integrated Memory Controller 1 Channel 0-3 Thermal Control 3 (rev 04) ff:10.6 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 Integrated Memory Controller 1 Channel 0-3 ERROR Registers 2 (rev 04) ff:10.7 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 Integrated Memory Controller 1 Channel 0-3 ERROR Registers 3 (rev 04) ff:13.0 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 R2PCIe (rev 04) ff:13.1 Performance counters: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 R2PCIe (rev 04) ff:13.4 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 QPI Ring Registers (rev 04) ff:13.5 Performance counters: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 QPI Ring Performance Ring Monitoring (rev 04) ff:16.0 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 System Address Decoder (rev 04) ff:16.1 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 Broadcast Registers (rev 04) ff:16.2 System peripheral: Intel Corporation Xeon E7 v2/Xeon E5 v2/Core i7 Broadcast Registers (rev 04) lsusb: Bus 002 Device 014: ID 19fb:2040 Bus 002 Device 010: ID 05e3:0610 Genesys Logic, Inc. 4-port hub Bus 002 Device 007: ID 1a40:0101 Terminus Technology Inc. Hub Bus 002 Device 016: ID 0627:0001 Adomax Technology Co., Ltd Bus 002 Device 012: ID 04d9:0169 Holtek Semiconductor, Inc. Bus 002 Device 009: ID 046d:09a2 Logitech, Inc. QuickCam Communicate Deluxe/S7500 Bus 002 Device 005: ID 2109:2811 VIA Labs, Inc. Hub Bus 002 Device 013: ID 046d:0a29 Logitech, Inc. H600 [Wireless Headset] Bus 002 Device 017: ID 04d9:0198 Holtek Semiconductor, Inc. Bus 002 Device 015: ID 1235:8202 Focusrite-Novation Bus 002 Device 011: ID 1a40:0201 Terminus Technology Inc. FE 2.1 7-port Hub Bus 002 Device 008: ID 0a12:0001 Cambridge Silicon Radio, Ltd Bluetooth Dongle (HCI mode) Bus 002 Device 006: ID 04b8:012c Seiko Epson Corp. GT-X900 [Perfection V700/V750 Photo] Bus 002 Device 004: ID 1a40:0201 Terminus Technology Inc. FE 2.1 7-port Hub Bus 002 Device 003: ID 1759:5000 LucidPort Technology, Inc. Bus 002 Device 002: ID 8087:0024 Intel Corp. Integrated Rate Matching Hub Bus 002 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub Bus 006 Device 001: ID 1d6b:0003 Linux Foundation 3.0 root hub Bus 005 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub Bus 004 Device 001: ID 1d6b:0003 Linux Foundation 3.0 root hub Bus 003 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub Bus 001 Device 002: ID 8087:0024 Intel Corp. Integrated Rate Matching Hub Bus 001 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub

6 13

[alsa-devel] Need help fixing pop/click artifacts in an ASOC driver
by Dimitris Papavasiliou 05 Jan '19

05 Jan '19

Hi, A (commercial) DAC board, I use with a Raspberry Pi is plagued by clicks and pops and I'm trying to fix it at the driver level. I have mostly fixed it, but I could use some guidance on the problem described below. I apologize in advance for the long read, but the situation is a bit convoluted (or my understanding of it is). The board (a HifiBerry DAC+ Pro) uses a PCM5122 chip which is driven by the pcm512x codec driver, but the Pro version also includes a set of external clocks on the board (one each for 48Khz and 44.1Khz sample rates and multiples thereof). There are two kinds of clicks and pops: on the one hand the board clicks when the device is opened/closed, mostly because the pcm512x codec driver doesn't support the digital_mute operation. These are relatively mild clicks, which are an annoyance at most and I have a separate patch for the pcm512x, that addresses them, which I'm currently testing and will (hopefully) submit soon. A separate case is a pop that's generated when the clock source is changed. This pop is independent of the digital volume setting and very loud. As far as I could determine, when the hw_params callback specified in the snd_soc_dai_link struct is called, it figures out what clock is needed for the giver sample rate and powers the appropriate clock through a GPIO on the PCM5122. This essentially means that the external clock source fed into the 5122 is stopped and restarted at a different rate, potentially while the DAC chip is operating. Later the hw_params callback defined in the pcm512x driver is called and it reconfigure the clock dividers for the new rate. It is at this point that the pop seems to be generated, provided that the card is not powered down or muted. If I comment out either the clock power-up/down in the dai_link hw_params, or the clock divider reconfiguration in the codec's hw_params, no pop is generated. Now, the digital_mute patch described before, also happens to fix this loud pop. I'm not sure whether that's a happy coincidence that might cease to be the case in the future though and was considering fixing the pop problem separately, at its source: the clock change. One way to fix the problem is to switch the 5122 into standby before changing the clock source in the dai_link hw_params callback and switch it back into normal operation afterwards. This seems to work regardless of whether digital_mute is implemented or not, but has the following problem: The register that's used to put the chip into/out of standby, is also used by the pcm512x driver, in the set_bias_level operation. Since the hw_params operation is, as far as I can tell, not atomic, I'm concerned that race conditions may arise, causing the card to be left powered up, when it should be off and vice-versa. Is there some way to synchronize the use of common chip registers in the DAI and codec drivers? Is the digital_mute somehow guaranteed to fix the pop originating at the DAI/machine driver level (whatever the hw_params operation in the dai_link struct is supposed to be)? Am I perhaps missing something entirely? Any help or guidance is welcome. Thanks, Dimitris

5 41

[alsa-devel] am57xx-evm: linux-4.14.y b8b55f8fd937 build Failure
by Naresh Kamboju 05 Jan '19

05 Jan '19

Build failure log of arm - BeagleBoard-X15 board while make modules Git branch: linux-4.14.y Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Git commit: b8b55f8fd937348f867eb0e4098b6d658959d075 In file included from sound/pci/hda/patch_realtek.c:33:0: sound/pci/hda/patch_realtek.c:6381:48: error: 'ALC294_FIXUP_ASUS_SPK' undeclared here (not in a function); did you mean 'ALC256_FIXUP_ASUS_MIC'? SND_PCI_QUIRK(0x1043, 0x10a1, "ASUS UX391UA", ALC294_FIXUP_ASUS_SPK), ^ include/sound/core.h:415:43: note: in definition of macro 'SND_PCI_QUIRK' {_SND_PCI_QUIRK_ID(vend, dev), .value = (val)} ^~~ CC [M] drivers/cpufreq/highbank-cpufreq.o scripts/Makefile.build:326: recipe for target 'sound/pci/hda/patch_realtek.o' failed make[5]: *** [sound/pci/hda/patch_realtek.o] Error 1 - Naresh

2 1

[alsa-devel] [PATCH] ASoC: qdsp6: q6asm: fix typo
by Matteo Croce 04 Jan '19

04 Jan '19

Fix spelling mistake: "lenght" -> "length" Signed-off-by: Matteo Croce <mcroce(a)redhat.com> --- sound/soc/qcom/qdsp6/q6asm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/qcom/qdsp6/q6asm.c b/sound/soc/qcom/qdsp6/q6asm.c index 4f85cb19a309..e8141a33a55e 100644 --- a/sound/soc/qcom/qdsp6/q6asm.c +++ b/sound/soc/qcom/qdsp6/q6asm.c @@ -1194,7 +1194,7 @@ EXPORT_SYMBOL_GPL(q6asm_open_read); * q6asm_write_async() - non blocking write * * @ac: audio client pointer - * @len: lenght in bytes + * @len: length in bytes * @msw_ts: timestamp msw * @lsw_ts: timestamp lsw * @wflags: flags associated with write -- 2.20.1

1 0

Re: [alsa-devel] [PATCH] ASoC: rt5677: use more of the volume range from DACs
by Ross Zwisler 04 Jan '19

04 Jan '19

On Thu, Dec 20, 2018 at 04:25:55PM -0700, Ross Zwisler wrote: > From: Dylan Reid <dgreid(a)chromium.org> > > The DACs volume can go over 0, both according to the data sheet and > real world testing. The control can go up to +30dB. > > This was tested by playing audio at full volume on a samus chromebook. > > Signed-off-by: Dylan Reid <dgreid(a)chromium.org> > Reviewed-by: Hsinyu Chao <hychao(a)chromium.org> > Signed-off-by: Ross Zwisler <zwisler(a)google.com> Ping on this patch.

2 1

[alsa-devel] [PATCH 1/1] conf/ucm: chtrt5650: Add UCM config for chtrt5650
by Russell Parker 04 Jan '19

04 Jan '19

Add a UCM configuration for the rt5650 codec. Tested on a Samsung Chromebook 3. Adapted with minor modifications from GitHub user evan-a-a's gist: https://gist.github.com/evan-a-a/86b2a698708074530e2d0ee7c6498767 Signed-off-by: Russell Parker <russell.parker7(a)gmail.com> diff --git a/configure.ac b/configure.ac index d0cab2d6..d524ff4b 100644 --- a/configure.ac +++ b/configure.ac @@ -737,6 +737,7 @@ AC_OUTPUT(Makefile doc/Makefile doc/pictures/Makefile doc/doxygen.cfg \ src/conf/ucm/chtnau8824/Makefile \ src/conf/ucm/chtrt5645/Makefile \ src/conf/ucm/chtrt5645-mono-speaker-analog-mic/Makefile \ + src/conf/ucm/chtrt5650/Makefile \ src/conf/ucm/cube-i1_TF-Defaultstring-CherryTrailCR/Makefile \ src/conf/ucm/DAISY-I2S/Makefile \ src/conf/ucm/DB410c/Makefile \ diff --git a/src/conf/ucm/Makefile.am b/src/conf/ucm/Makefile.am index 85c15090..985c460c 100644 --- a/src/conf/ucm/Makefile.am +++ b/src/conf/ucm/Makefile.am @@ -21,6 +21,7 @@ bytcr-rt5651-stereo-spk-in12-mic \ chtnau8824 \ chtrt5645 \ chtrt5645-mono-speaker-analog-mic \ +chtrt5650 \ cube-i1_TF-Defaultstring-CherryTrailCR \ DAISY-I2S \ DB410c \ diff --git a/src/conf/ucm/chtrt5650/HiFi.conf b/src/conf/ucm/chtrt5650/HiFi.conf new file mode 100644 index 00000000..cc3d64bf --- /dev/null +++ b/src/conf/ucm/chtrt5650/HiFi.conf @@ -0,0 +1,203 @@ + +SectionVerb { + # ALSA PCM + Value { + TQ "HiFi" + + # ALSA PCM device for HiFi + PlaybackPCM "hw:chtrt5650" + CapturePCM "hw:chtrt5650" + } + + EnableSequence [ + cdev "hw:chtrt5650" + + <platforms/bytcr/PlatformEnableSeq.conf> + + # Output Configuration + cset "name='DAC1 L Mux' IF1 DAC" + cset "name='DAC1 R Mux' IF1 DAC" + cset "name='DAC1 MIXL DAC1 Switch' 1" + cset "name='DAC1 MIXR DAC1 Switch' 1" + cset "name='Stereo DAC MIXL DAC L1 Switch' 1" + cset "name='Stereo DAC MIXR DAC R1 Switch' 1" + cset "name='Speaker HWEQ' 1,164,237,135,1,165,0,0,1,166,237,135,1,167,0,0,1,192,30,196,1,193,0,0,1,194,30,196,1,195,0,0,1,196,31,180,1,197,0,75,1,198,31,180,1,199,31,180,1,200,0,75,1,201,31,180,0,177,51,224" + cset "name='DAC1 Playback Volume' 77,77" + + cset "name='Speaker ClassD Playback Volume' 4" + + cset "name='DAC L2 Mux' IF2 DAC" + cset "name='DAC R2 Mux' IF2 DAC" + cset "name='Mono DAC MIXL DAC L2 Switch' on" + cset "name='Mono DAC MIXR DAC R2 Switch' on" + cset "name='DAC2 Playback Switch' on" + + cset "name='HPOVOL MIXL DAC1 Switch' on" + cset "name='HPOVOL MIXR DAC1 Switch' on" + cset "name='HPOVOL MIXL DAC2 Switch' on" + cset "name='HPOVOL MIXR DAC2 Switch' on" + cset "name='HPO MIX HPVOL Switch' on" + cset "name='HPOVOL L Switch' on" + cset "name='HPOVOL R Switch' on" + + cset "name='SPK MIXL DAC L1 Switch' on" + cset "name='SPK MIXR DAC R1 Switch' on" + cset "name='SPK MIXL DAC L2 Switch' on" + cset "name='SPK MIXR DAC R2 Switch' on" + cset "name='SPOL MIX SPKVOL L Switch' on" + cset "name='SPOR MIX SPKVOL R Switch' on" + cset "name='SPKVOL L Switch' on" + cset "name='SPKVOL R Switch' on" + + # Input Configuration + cset "name='Stereo1 DMIC Mux' 0" + cset "name='Stereo1 ADC2 Mux' 1" + cset "name='ADC Capture Switch' on" + cset "name='ADC Capture Volume' 74" + cset "name='ADC Boost Capture Volume' 3" + cset "name='Mono ADC Capture Volume' 74" + cset "name='Mono ADC Boost Capture Volume' 2" + cset "name='IN Capture Volume' 63" + cset "name='RT5650 IF1 ADC Mux' 0" + cset "name='I2S2 Func Switch' off" + ] + + DisableSequence [ + cdev "hw:chtrt5650" + + # Disable audio output path + cset "name='codec_out1 mix 0 pcm0_in Switch' off" + cset "name='media0_out mix 0 media1_in Switch' off" + + cset "name='media1_in Gain 0 Switch' off" + cset "name='pcm0_in Gain 0 Switch' off" + cset "name='codec_out1 Gain 0 Switch' off" + + # Disable audio input path + cset "name='pcm1_out mix 0 media_loop2_in Switch' off" + cset "name='media_loop2_out mix 0 codec_in0 Switch' off" + + cset "name='media_loop2_out Gain 0 Switch' off" + cset "name='pcm1_out Gain 0 Switch' off" + cset "name='codec_in0 Gain 0 Switch' off" + ] +} + +SectionDevice."Speaker" { + Comment "Speaker" + + Value { + PlaybackChannels "2" + } + + ConflictingDevice [ + "Headphones" + ] + + EnableSequence [ + cdev "hw:chtrt5650" + + cset "name='Headphone Switch' off" + cset "name='Headphone Channel Switch' off" + + cset "name='Ext Spk Switch' on" + cset "name='Speaker Channel Switch' on" + cset "name='Speaker Playback Volume' 31" + ] + + DisableSequence [ + cdev "hw:chtrt5650" + + cset "name='Ext Spk Switch' off" + cset "name='Speaker Channel Switch' off" + ] +} + +SectionDevice."Headphones" { + Comment "Headphones" + + Value { + PlaybackChannels "2" + JackControl "Headphone Jack" + JackHWMute "Speaker" + } + + ConflictingDevice [ + "Speaker" + ] + + EnableSequence [ + cdev "hw:chtrt5650" + + cset "name='Ext Spk Switch' off" + cset "name='Speaker Channel Switch' off" + + cset "name='Headphone Switch' on" + cset "name='Headphone Channel Switch' on" + cset "name='Headphone Playback Volume' 31" + ] + + DisableSequence [ + cdev "hw:chtrt5650" + + cset "name='Headphone Switch' off" + cset "name='Headphone Channel Switch' off" + ] +} + +SectionDevice."Mic".0 { + Comment "Internal Microphone" + + Value { + CaptureChannels "2" + CapturePriority "150" + } + + EnableSequence [ + cdev "hw:chtrt5650" + + cset "name='Int Mic Switch' on" + cset "name='Sto1 ADC MIXL ADC2 Switch' on" + cset "name='Sto1 ADC MIXR ADC2 Switch' on" + ] + + DisableSequence [ + cdev "hw:chtrt5650" + + cset "name='Sto1 ADC MIXL ADC2 Switch' off" + cset "name='Sto1 ADC MIXR ADC2 Switch' off" + cset "name='Int Mic Switch' off" + ] +} + +SectionDevice."HSMic".0 { + Comment "Headset Microphone" + + Value { + CaptureChannels "2" + JackControl "Headset Mic Jack" + JackHWMute "Mic" + } + + EnableSequence [ + cdev "hw:chtrt5650" + + cset "name='Headset Mic Switch' on" + cset "name='RECMIXL BST1 Switch' on" + cset "name='RECMIXR BST1 Switch' on" + cset "name='Sto1 ADC MIXL ADC1 Switch' on" + cset "name='Sto1 ADC MIXR ADC1 Switch' on" + cset "name='IN1 Boost' 1" + ] + + DisableSequence [ + cdev "hw:chtrt5650" + + cset "name='Headset Mic Switch' off" + cset "name='RECMIXL BST1 Switch' off" + cset "name='RECMIXR BST1 Switch' off" + cset "name='Sto1 ADC MIXL ADC1 Switch' off" + cset "name='Sto1 ADC MIXR ADC1 Switch' off" + cset "name='IN1 Boost' 0" + ] +} diff --git a/src/conf/ucm/chtrt5650/Makefile.am b/src/conf/ucm/chtrt5650/Makefile.am new file mode 100644 index 00000000..f506cd77 --- /dev/null +++ b/src/conf/ucm/chtrt5650/Makefile.am @@ -0,0 +1,4 @@ +alsaconfigdir = @ALSA_CONFIG_DIR@ +ucmdir = $(alsaconfigdir)/ucm/chtrt5650 +ucm_DATA = chtrt5650.conf HiFi.conf +EXTRA_DIST = $(ucm_DATA) diff --git a/src/conf/ucm/chtrt5650/chtrt5650.conf b/src/conf/ucm/chtrt5650/chtrt5650.conf new file mode 100644 index 00000000..dfc36c89 --- /dev/null +++ b/src/conf/ucm/chtrt5650/chtrt5650.conf @@ -0,0 +1,5 @@ +Comment "Intel SoC Audio Device" +SectionUseCase."HiFi" { + File "HiFi.conf" + Comment "Default" +} -- 2.17.2 (Apple Git-113)

3 4