From patchwork Fri Feb 21 07:46:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hui Wang X-Patchwork-Id: 1241946 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 48P3SM47BWz9sSk; Fri, 21 Feb 2020 18:46:41 +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 1j531A-0001kB-FD; Fri, 21 Feb 2020 07:46: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 1j5318-0001jl-OQ for kernel-team@lists.ubuntu.com; Fri, 21 Feb 2020 07:46:34 +0000 Received: from [123.114.54.87] (helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1j5317-0005Gc-OO for kernel-team@lists.ubuntu.com; Fri, 21 Feb 2020 07:46:34 +0000 From: Hui Wang To: kernel-team@lists.ubuntu.com Subject: [SRU][Eoan][PATCH] UBUNTU: [Config] disable SND_SOC_INTEL_SKYLAKE Date: Fri, 21 Feb 2020 15:46:16 +0800 Message-Id: <20200221074617.24784-2-hui.wang@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200221074617.24784-1-hui.wang@canonical.com> References: <20200221074617.24784-1-hui.wang@canonical.com> 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: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1864061 If we don't disable it, this driver will be loaded to the kernel ahead of sof-pci-dev.ko randomly since they all contains the same pciid, this will break the sof driver. To avoid it, we need to blacklist this driver manually. From kernel-5.4, this driver is disabled, and there is no users report issues, so let's disable it in the eoan kernel too. According to Intel's comment, the soc_skl driver is replaced by sof driver. Signed-off-by: Hui Wang Acked-by: Kleber Sacilotto de Souza Acked-by: Stefan Bader --- debian.master/config/annotations | 6 ++++-- debian.master/config/config.common.ubuntu | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index cf19d1d69028..5f8cd45903f8 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -7908,7 +7908,8 @@ CONFIG_SND_SOC_INTEL_SST_TOPLEVEL policy<{'amd64': 'y', 'i386': 'y CONFIG_SND_SOC_INTEL_HASWELL policy<{'amd64': 'm', 'i386': 'm'}> CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI policy<{'amd64': 'm', 'i386': 'm'}> CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI policy<{'amd64': 'm', 'i386': 'm'}> -CONFIG_SND_SOC_INTEL_SKYLAKE policy<{'amd64': 'm', 'i386': 'm'}> +CONFIG_SND_SOC_INTEL_SKYLAKE policy<{'amd64': 'n', 'i386': 'n'}> +CONFIG_SND_SOC_INTEL_SKYLAKE mark note 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'}> @@ -7917,7 +7918,8 @@ 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_SKYLAKE_HDAUDIO_CODEC policy<{'amd64': 'n', 'i386': 'n'}> +CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC mark note 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 mark note diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index db023e6fc676..7cf75deb7a0b 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -9107,10 +9107,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