From patchwork Wed Oct 23 06:34:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khalid Elmously X-Patchwork-Id: 1181851 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46ygbB1ypyz9sPl; Wed, 23 Oct 2019 17:34:45 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1iNAE8-0007VX-QF; Wed, 23 Oct 2019 06:34:36 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iNAE6-0007VJ-T6 for kernel-team@lists.ubuntu.com; Wed, 23 Oct 2019 06:34:34 +0000 Received: from mail-qk1-f198.google.com ([209.85.222.198]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iNAE6-0001LE-LG for kernel-team@lists.ubuntu.com; Wed, 23 Oct 2019 06:34:34 +0000 Received: by mail-qk1-f198.google.com with SMTP id g62so19166648qkb.20 for ; Tue, 22 Oct 2019 23:34:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=UmALs2zfUd7gcmHA0FEQVzDTVxTN1U2+ds0YqvuB/0Q=; b=npcbhNDstlgbYriUNc9vjPaJk7zNS6YfKOso/gh/haJe759JPujvokPifyx1Lg+eQ+ FXxa7hMDlfy0OU2pOw3JCD+ENNDNLCs92PEYL1peTs8q2BaHGzSeecxDHyZRtXyd+qZL qW4OSJ00Norcy8e5MOF284jiLw/fd2KHwoNMlujPrtDWLLpSjHkPGjAFEwlO581gtin3 cAW/1RddiVMJ7z7NN3NHlXbbY3oKt/mjEszt3RJY8uk9irr+VDLGpeZIfeVJXcLschyp cZjcu7MK2UB2KiKmKLKexzVkuRQD4vdh7ElS6IjUxfcjyw/MTEAehClVUSgsXLQSt3dl GPJQ== X-Gm-Message-State: APjAAAURWiRutfft4SKQk/IGd9vMOlNkt8d8pwzp7EZr+XT3wObTTrwu fvk+urifT3Oa5UaMeYBGKNLoHbLpP5hEmrlxEWZJeDKN+n8l4xAursV5S8dyo8cdliqGK6QaGXX FNbZtSl44LI50+kG4r08H6U4GnaatcnwI9Nbaf3dnGg== X-Received: by 2002:a37:4bc2:: with SMTP id y185mr6948107qka.10.1571812473712; Tue, 22 Oct 2019 23:34:33 -0700 (PDT) X-Google-Smtp-Source: APXvYqzgxvklmcyIqFrRwifUUl0C7Xo35hk1D9GLOMsy8FneM4Ze3EnV/cgYeWEm9rG1R5oKZxwBVA== X-Received: by 2002:a37:4bc2:: with SMTP id y185mr6948086qka.10.1571812473346; Tue, 22 Oct 2019 23:34:33 -0700 (PDT) Received: from kbuntu2 (dhcp-24-53-242-104.cable.user.start.ca. [24.53.242.104]) by smtp.gmail.com with ESMTPSA id t65sm10508819qkh.23.2019.10.22.23.34.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Oct 2019 23:34:32 -0700 (PDT) Date: Wed, 23 Oct 2019 02:34:30 -0400 From: Khaled Elmously To: Seth Forshee Subject: [SRU][EOAN][PATCH v2 1/1] alsa/sof: Enable SOF_HDA link and codec Message-ID: <20191023063428.dgu6gfkamu6esmj2@kbuntu2> References: <20191017122850.23090-1-hui.wang@canonical.com> <20191021210615.GH3768@ubuntu-xps13> <20191022143802.GJ3768@ubuntu-xps13> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20191022143802.GJ3768@ubuntu-xps13> User-Agent: NeoMutt/20171215 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-team@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" On 2019-10-22 09:38:02 , Seth Forshee wrote: > On Mon, Oct 21, 2019 at 04:06:15PM -0500, Seth Forshee wrote: > > On Thu, Oct 17, 2019 at 08:28:49PM +0800, Hui Wang wrote: > > > BugLink: https://bugs.launchpad.net/bugs/1848490 > > > > > > So far, only OEM-B-OSP1, EOAN and later kernels have the alsa/sof driver, > > > and the OEM-B-OSP1 kernel already enabled these CONFIGs. > > > > > > [Impact] > > > We tested the EOAN kernel on the LENOVO or Dell machines which have > > > dmic directly connnected to PCH, the dmic didn't work. > > > > > > [Fix] > > > We need to enable SOF_HDA link and codec, then the sof driver > > > and Legacy HDA driver work together to make the dmic work. > > > > > > [Test Case] > > > Install the latest 19.10 image, build a new kernel with this > > > patch and replace the existing kernel, After installing the blacklist > > > package (blacklist snd_hda_intel and snd_soc_skl) and ucm package, > > > the dmic and all output devices (speaker/hdmi) work. > > > > > > [Regression Risk] > > > Low, these configs are already enabled in the oem-b-osp1 kernel > > > for a long time, and we tested it on many lenovo/dell machines witch > > > have or have no dmic, all worked well. > > > > I got an email separately regarding these config problems, this is a > > needed change. > > > > Acked-by: Seth Forshee > > Oh, also these options should be updated in the annotations file and > enforced. My ack is contigent on this, whether it's done by sending a v2 > or by whoever applies the patch. > Hui, Seth, please see the updated patch that I've come up with. I will assume your +1s unless you tell me otherwise. Patch inlined here: --- debian.master/config/annotations | 22 ++++++++++++++++------ debian.master/config/config.common.ubuntu | 19 +++++++++++-------- 2 files changed, 27 insertions(+), 14 deletions(-) > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 2874f5a68d29..7eb1cfe9f1ff 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -7912,11 +7912,18 @@ CONFIG_SND_SOC_INTEL_SKL policy<{'amd64': 'm', 'i386': 'm CONFIG_SND_SOC_INTEL_APL policy<{'amd64': 'm', 'i386': 'm'}> CONFIG_SND_SOC_INTEL_KBL policy<{'amd64': 'm', 'i386': 'm'}> CONFIG_SND_SOC_INTEL_GLK policy<{'amd64': 'm', 'i386': 'm'}> -CONFIG_SND_SOC_INTEL_CNL policy<{'amd64': 'm', 'i386': 'm'}> -CONFIG_SND_SOC_INTEL_CFL policy<{'amd64': 'm', 'i386': 'm'}> -CONFIG_SND_SOC_INTEL_CML_H policy<{'amd64': 'm', 'i386': 'm'}> -CONFIG_SND_SOC_INTEL_CML_LP policy<{'amd64': 'm', 'i386': 'm'}> -CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC policy<{'amd64': 'y', 'i386': 'y'}> +CONFIG_SND_SOC_INTEL_CNL note +CONFIG_SND_SOC_INTEL_CNL policy<{'amd64': 'n', 'i386': 'n'}> +CONFIG_SND_SOC_INTEL_CFL policy<{'amd64': 'n', 'i386': 'n'}> +CONFIG_SND_SOC_INTEL_CML_H mark note +CONFIG_SND_SOC_INTEL_CML_H policy<{'amd64': 'n', 'i386': 'n'}> +CONFIG_SND_SOC_INTEL_CML_LP mark note +CONFIG_SND_SOC_INTEL_CML_LP policy<{'amd64': 'n', 'i386': 'n'}> +CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC mark note +CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC policy<{'amd64': 'n', 'i386': 'n'}> +CONFIG_SND_SOC_SOF_HDA_LINK mark note +CONFIG_SND_SOC_SOF_HDA_LINK policy<{'amd64': 'y', 'i386': 'y'}> +CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC policy<{'amd64': 'y', 'i386': 'y'}> # Menu: Device Drivers >> Sound card support >> Advanced Linux Sound Architecture >> ALSA for SoC audio support >> Intel ASoC SST drivers >> Intel Machine drivers CONFIG_SND_SOC_INTEL_MACH policy<{'amd64': 'y', 'i386': 'y'}> @@ -8012,7 +8019,10 @@ CONFIG_SND_SOC_RCAR policy<{'arm64': 'm', 'armhf': ' CONFIG_SND_SOC_SOF_TOPLEVEL policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}> CONFIG_SND_SOC_SOF_PCI policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}> CONFIG_SND_SOC_SOF_ACPI policy<{'amd64': 'm', 'arm64': 'm', 'i386': 'm'}> -CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}> +CONFIG_SND_SOC_SOF_NOCODEC note +CONFIG_SND_SOC_SOF_NOCODEC policy<{'amd64': 'n', 'i386': 'n'}> +CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT note +CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT policy<{'amd64': 'n', 'arm64': 'y', 'armhf': 'y', 'i386': 'n', 'ppc64el': 'y'}> CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}> # Menu: Device Drivers >> Sound card support >> Advanced Linux Sound Architecture >> ALSA for SoC audio support >> Sound Open Firmware Support >> SOF debugging features diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index fff3516eeb40..1db9435b96fa 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -9081,14 +9081,14 @@ CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m # CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set -CONFIG_SND_SOC_INTEL_CFL=m +# CONFIG_SND_SOC_INTEL_CFL is not set CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m -CONFIG_SND_SOC_INTEL_CML_H=m -CONFIG_SND_SOC_INTEL_CML_LP=m -CONFIG_SND_SOC_INTEL_CNL=m +# CONFIG_SND_SOC_INTEL_CML_H is not set +# CONFIG_SND_SOC_INTEL_CML_LP is not set +# CONFIG_SND_SOC_INTEL_CNL is not set CONFIG_SND_SOC_INTEL_GLK=m CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_HASWELL=m @@ -9105,10 +9105,10 @@ CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m -CONFIG_SND_SOC_INTEL_SKYLAKE=m +# CONFIG_SND_SOC_INTEL_SKYLAKE is not set CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m -CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y +# CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC is not set CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m CONFIG_SND_SOC_INTEL_SST=m @@ -9248,7 +9248,10 @@ CONFIG_SND_SOC_SOF_COMETLAKE_LP_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG is not set CONFIG_SND_SOC_SOF_GEMINILAKE=m CONFIG_SND_SOC_SOF_GEMINILAKE_SUPPORT=y +CONFIG_SND_SOC_SOF_HDA=m +CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y CONFIG_SND_SOC_SOF_HDA_COMMON=m +CONFIG_SND_SOC_SOF_HDA_LINK=y CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m CONFIG_SND_SOC_SOF_ICELAKE=m CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y @@ -9260,10 +9263,10 @@ CONFIG_SND_SOC_SOF_INTEL_PCI=m CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y CONFIG_SND_SOC_SOF_MERRIFIELD=m CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y -CONFIG_SND_SOC_SOF_NOCODEC=m -CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT=y +# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set CONFIG_SND_SOC_SOF_OPTIONS=m CONFIG_SND_SOC_SOF_PCI=m +CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y # CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SOF_XTENSA=m