ACK/Cmnt: [SRU][Eoan][PATCH] UBUNTU: [Config] disable SND_SOC_INTEL_SKYLAKE

[Stefan Bader]

On 21.02.20 08:46, Hui Wang wrote:
> 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 <hui.wang at canonical.com>
Acked-by: Stefan Bader <stefan.bader at canonical.com>
> ---

Disabling a module will certainly require some modification of the ABI modules
list or the compile fails.
Also this appears to be set as fix committed but I cannot find it in todays eoan
master-next.

-Stefan

>  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<ENFORCED> note<LP:#1864061>
>  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<ENFORCED> note<LP:#1864061>
>  CONFIG_SND_SOC_SOF_HDA_LINK                     mark<ENFORCED> note<LP:#1848490>
>  CONFIG_SND_SOC_SOF_HDA_LINK                     policy<{'amd64': 'y', 'i386': 'y'}>
>  CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC              mark<ENFORCED> note<LP:#1848490>
> 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
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20200312/47cfff8a/attachment.sig>