APPLIED/cmnt: [SRU][EOAN/unstable][PATCH 1/1] UBUNTU: [Config] Enable SOF_HDA link and codec
diff mbox series

Message ID 8820e8e2-5c15-9530-a692-b2f14cf6725e@canonical.com
State New
Headers show
Series
  • APPLIED/cmnt: [SRU][EOAN/unstable][PATCH 1/1] UBUNTU: [Config] Enable SOF_HDA link and codec
Related show

Commit Message

Kleber Souza Oct. 23, 2019, 3:32 p.m. UTC
On 10/17/19 2:28 PM, Hui Wang wrote:
> https://bugs.launchpad.net/bugs/1848490

BugLink: ...

> 
> The Eoan kernel already has alsa/sof driver, we need to enable SOF_HDA
> link and codec, otherwise the dmic can't work on the Dell and Lenovo
> machines which have the dmic directly connected to PCH.
> 
> Because the SOF_HDA depneds on the NOCODEC=n, we need to disable
> SOF_NOCODEC.
> 
> Signed-off-by: Hui Wang <hui.wang@canonical.com>
> ---
>  debian.master/config/config.common.ubuntu | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index 555862498d8f..0d36f4e1c1bd 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -9250,6 +9250,8 @@ CONFIG_SND_SOC_SOF_GEMINILAKE=m
>  CONFIG_SND_SOC_SOF_GEMINILAKE_SUPPORT=y
>  CONFIG_SND_SOC_SOF_HDA_COMMON=m
>  CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
> +CONFIG_SND_SOC_SOF_HDA_LINK=y
> +CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
>  CONFIG_SND_SOC_SOF_ICELAKE=m
>  CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y
>  CONFIG_SND_SOC_SOF_INTEL_ACPI=m
> @@ -9260,8 +9262,8 @@ 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 is not set
> +# 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_STRICT_ABI_CHECKS is not set
> 

These additional config changes were made after running 'updateconfigs':


So I have committed them as well. Please run 'updateconfigs' when
submitting config changes so we can review all changes needed.

I have also removed the 'snd-sof-nocodec' module from previous ABI
modules list so the packages can be compiled.


Applied to eoan/master-next branch.

Thanks,
Kleber

Comments

Hui Wang Oct. 23, 2019, 10:55 p.m. UTC | #1
On 2019/10/23 下午11:32, Kleber Souza wrote:
> On 10/17/19 2:28 PM, Hui Wang wrote:
>> https://bugs.launchpad.net/bugs/1848490
> BugLink: ...
>
>> The Eoan kernel already has alsa/sof driver, we need to enable SOF_HDA
>> link and codec, otherwise the dmic can't work on the Dell and Lenovo
>> machines which have the dmic directly connected to PCH.
>>
>> Because the SOF_HDA depneds on the NOCODEC=n, we need to disable
>> SOF_NOCODEC.
>>
>> Signed-off-by: Hui Wang <hui.wang@canonical.com>
>> ---
>>   debian.master/config/config.common.ubuntu | 6 ++++--
>>   1 file changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
>> index 555862498d8f..0d36f4e1c1bd 100644
>> --- a/debian.master/config/config.common.ubuntu
>> +++ b/debian.master/config/config.common.ubuntu
>> @@ -9250,6 +9250,8 @@ CONFIG_SND_SOC_SOF_GEMINILAKE=m
>>   CONFIG_SND_SOC_SOF_GEMINILAKE_SUPPORT=y
>>   CONFIG_SND_SOC_SOF_HDA_COMMON=m
>>   CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
>> +CONFIG_SND_SOC_SOF_HDA_LINK=y
>> +CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
>>   CONFIG_SND_SOC_SOF_ICELAKE=m
>>   CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y
>>   CONFIG_SND_SOC_SOF_INTEL_ACPI=m
>> @@ -9260,8 +9262,8 @@ 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 is not set
>> +# 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_STRICT_ABI_CHECKS is not set
>>
> These additional config changes were made after running 'updateconfigs':
>
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index f23e49068940..309f564ca6ef 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -9248,10 +9248,11 @@ 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_BASELINE=m
>   CONFIG_SND_SOC_SOF_HDA_LINK=y
> -CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
> +CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
>   CONFIG_SND_SOC_SOF_ICELAKE=m
>   CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y
>   CONFIG_SND_SOC_SOF_INTEL_ACPI=m
> @@ -9262,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 is not set
>   # 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
>
> So I have committed them as well. Please run 'updateconfigs' when
> submitting config changes so we can review all changes needed.

OK, got it, I never ran updateconfigs before,  and I will run it if 
submitting changes about config in future.

thx.


>
> I have also removed the 'snd-sof-nocodec' module from previous ABI
> modules list so the packages can be compiled.
>
>
> Applied to eoan/master-next branch.
>
> Thanks,
> Kleber
>
>
Kleber Souza Oct. 24, 2019, 10:21 a.m. UTC | #2
On 10/24/19 12:55 AM, Hui Wang wrote:
> 
> On 2019/10/23 下午11:32, Kleber Souza wrote:
>> On 10/17/19 2:28 PM, Hui Wang wrote:
>>> https://bugs.launchpad.net/bugs/1848490
>> BugLink: ...
>>
>>> The Eoan kernel already has alsa/sof driver, we need to enable SOF_HDA
>>> link and codec, otherwise the dmic can't work on the Dell and Lenovo
>>> machines which have the dmic directly connected to PCH.
>>>
>>> Because the SOF_HDA depneds on the NOCODEC=n, we need to disable
>>> SOF_NOCODEC.
>>>
>>> Signed-off-by: Hui Wang <hui.wang@canonical.com>
>>> ---
>>>   debian.master/config/config.common.ubuntu | 6 ++++--
>>>   1 file changed, 4 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
>>> index 555862498d8f..0d36f4e1c1bd 100644
>>> --- a/debian.master/config/config.common.ubuntu
>>> +++ b/debian.master/config/config.common.ubuntu
>>> @@ -9250,6 +9250,8 @@ CONFIG_SND_SOC_SOF_GEMINILAKE=m
>>>   CONFIG_SND_SOC_SOF_GEMINILAKE_SUPPORT=y
>>>   CONFIG_SND_SOC_SOF_HDA_COMMON=m
>>>   CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
>>> +CONFIG_SND_SOC_SOF_HDA_LINK=y
>>> +CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
>>>   CONFIG_SND_SOC_SOF_ICELAKE=m
>>>   CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y
>>>   CONFIG_SND_SOC_SOF_INTEL_ACPI=m
>>> @@ -9260,8 +9262,8 @@ 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 is not set
>>> +# 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_STRICT_ABI_CHECKS is not set
>>>
>> These additional config changes were made after running 'updateconfigs':
>>
>> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
>> index f23e49068940..309f564ca6ef 100644
>> --- a/debian.master/config/config.common.ubuntu
>> +++ b/debian.master/config/config.common.ubuntu
>> @@ -9248,10 +9248,11 @@ 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_BASELINE=m
>>   CONFIG_SND_SOC_SOF_HDA_LINK=y
>> -CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
>> +CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
>>   CONFIG_SND_SOC_SOF_ICELAKE=m
>>   CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y
>>   CONFIG_SND_SOC_SOF_INTEL_ACPI=m
>> @@ -9262,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 is not set
>>   # 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
>>
>> So I have committed them as well. Please run 'updateconfigs' when
>> submitting config changes so we can review all changes needed.
> 
> OK, got it, I never ran updateconfigs before,  and I will run it if 
> submitting changes about config in future.

You can run it by calling 'fakeroot debian/rules updateconfigs', or using
'kteam-tools/cranky/cranky updateconfigs' which takes care of running it
inside a proper chroot (needs prior setup in this case).

This will check all the dependencies involving the config options being
changed, making additional changes if necessary to make them consistent.

Thanks,
Kleber
Hui Wang Oct. 24, 2019, 11:16 a.m. UTC | #3
On 2019/10/24 下午6:21, Kleber Souza wrote:
> On 10/24/19 12:55 AM, Hui Wang wrote:
>> On 2019/10/23 下午11:32, Kleber Souza wrote:
>>> On 10/17/19 2:28 PM, Hui Wang wrote:
>>>
>>> So I have committed them as well. Please run 'updateconfigs' when
>>> submitting config changes so we can review all changes needed.
>> OK, got it, I never ran updateconfigs before,  and I will run it if
>> submitting changes about config in future.
> You can run it by calling 'fakeroot debian/rules updateconfigs', or using
> 'kteam-tools/cranky/cranky updateconfigs' which takes care of running it
> inside a proper chroot (needs prior setup in this case).
>
> This will check all the dependencies involving the config options being
> changed, making additional changes if necessary to make them consistent.

OK, got it.

thanks.

>
> Thanks,
> Kleber
>
>

Patch
diff mbox series

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index f23e49068940..309f564ca6ef 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -9248,10 +9248,11 @@  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_BASELINE=m
 CONFIG_SND_SOC_SOF_HDA_LINK=y
-CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
+CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
 CONFIG_SND_SOC_SOF_ICELAKE=m
 CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y
 CONFIG_SND_SOC_SOF_INTEL_ACPI=m
@@ -9262,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 is not set
 # 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