Skip to contentSkip to conversation

ASoC: Intel: Skylake: Compile when any configuration is selected

PATCH In review Cezary Rojewski 3 participants 13 messages Jan 25, 2021 – Mar 8, 2021

Subsystems (3)
lore
Share & tools
lore

Cezary Rojewski

author maintainer
#0 lore raw

PATCH 1/1 ASoC: Intel: Skylake: Compile when any configuration is selected

Skylake is dependent on SND_SOC_INTEL_SKYLAKE (aka "all SST platforms") whereas selecting specific configuration such as KBL-only will not cause driver code to compile. Switch to SND_SOC_INTEL_SKYLAKE_COMMON dependency so selecting any configuration causes the driver to be built.

Fixes 35bc99aaa1a3 ("ASoC: Intel: Skylake: Add more platform granularity")
---
 sound/soc/intel/Makefile         | 2 +-
 sound/soc/intel/skylake/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
sound/soc/intel/Makefile +1 -1
index 4e0248d2accc..7c5038803be7 100644
@@ -5,7 +5,7 @@ obj-$(CONFIG_SND_SOC) += common/
 # Platform Support
 obj-$(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM) += atom/
 obj-$(CONFIG_SND_SOC_INTEL_CATPT) += catpt/
-obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE) += skylake/
+obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON) += skylake/
 obj-$(CONFIG_SND_SOC_INTEL_KEEMBAY) += keembay/
 
 # Machine support
sound/soc/intel/skylake/Makefile +1 -1
index dd39149b89b1..1c4649bccec5 100644
@@ -7,7 +7,7 @@ ifdef CONFIG_DEBUG_FS
   snd-soc-skl-objs += skl-debug.o
 endif
 
-obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE) += snd-soc-skl.o
+obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON) += snd-soc-skl.o
 
 #Skylake Clock device support
 snd-soc-skl-ssp-clk-objs := skl-ssp-clk.o
Signature · 1 line
2.17.1
#1 lore raw
Quoted 10 lines · Cezary Rojewski

Skylake is dependent on SND_SOC_INTEL_SKYLAKE (aka "all SST platforms") whereas selecting specific configuration such as KBL-only will not cause driver code to compile. Switch to SND_SOC_INTEL_SKYLAKE_COMMON dependency so selecting any configuration causes the driver to be built.

Fixes 35bc99aaa1a3 ("ASoC: Intel: Skylake: Add more platform granularity")

Still not working:
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1902457/comments/66

Kai-Heng

Quoted 34 lines
---
 sound/soc/intel/Makefile         | 2 +-
 sound/soc/intel/skylake/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
sound/soc/intel/Makefile +1 -1
index 4e0248d2accc..7c5038803be7 100644
@@ -5,7 +5,7 @@ obj-$(CONFIG_SND_SOC) += common/
 # Platform Support
 obj-$(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM) += atom/
 obj-$(CONFIG_SND_SOC_INTEL_CATPT) += catpt/
-obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE) += skylake/
+obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON) += skylake/
 obj-$(CONFIG_SND_SOC_INTEL_KEEMBAY) += keembay/
 
 # Machine support
sound/soc/intel/skylake/Makefile +1 -2
index dd39149b89b1..1c4649bccec5 100644
@@ -7,7 +7,7 @@ ifdef CONFIG_DEBUG_FS
   snd-soc-skl-objs += skl-debug.o
 endif
 
-obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE) += snd-soc-skl.o
+obj-$(CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON) += snd-soc-skl.o
 
 #Skylake Clock device support
 snd-soc-skl-ssp-clk-objs := skl-ssp-clk.o
--

2.17.1

author maintainer
#2 lore raw
Quoted 8 lines · Kai-Heng Feng
Quoted 6 lines · Cezary Rojewski

Skylake is dependent on SND_SOC_INTEL_SKYLAKE (aka "all SST platforms") whereas selecting specific configuration such as KBL-only will not cause driver code to compile. Switch to SND_SOC_INTEL_SKYLAKE_COMMON dependency so selecting any configuration causes the driver to be built.

Quoted 8 lines
Quoted 4 lines
Fixes 35bc99aaa1a3 ("ASoC: Intel: Skylake: Add more platform granularity")

Still not working:
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1902457/comments/66

Hello,

Thanks for your reply Kai-Heng.
I believe you're relating to completely different issue than the one this very patch is targeting.

From the logs you've provided one can see that snd_soc_skl did attempt to probe() so the code compiled just fine. Again, compilation issue is the one I've addressed here. While we're here, I'd appreciate kconfig being provided along dmesg file. Logs alone do not show the entire picture, unfortunately.

In regard to missing sound, (looks like we're talking about HDA dsp + DMIC configuration) kconfig mentioned above will be required. Pretty sure HDAudio support for skylake-driver is not enabled on your machine and thus driver exists probe() early without registering any sound card.

Regards,
Czarek

#3 lore raw
Quoted 19 lines · Cezary Rojewski
Quoted 8 lines · Kai-Heng Feng
Quoted 6 lines · Cezary Rojewski

Skylake is dependent on SND_SOC_INTEL_SKYLAKE (aka "all SST platforms") whereas selecting specific configuration such as KBL-only will not cause driver code to compile. Switch to SND_SOC_INTEL_SKYLAKE_COMMON dependency so selecting any configuration causes the driver to be built.

Quoted 8 lines
Quoted 4 lines
Fixes 35bc99aaa1a3 ("ASoC: Intel: Skylake: Add more platform granularity")

Still not working:
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1902457/comments/66

Quoted 5 lines

Hello,

Thanks for your reply Kai-Heng.
I believe you're relating to completely different issue than the one this very patch is targeting.

Understood.

Quoted 6 lines

From the logs you've provided one can see that snd_soc_skl did attempt
to probe() so the code compiled just fine. Again, compilation issue is the one I've addressed here. While we're here, I'd appreciate kconfig being provided along dmesg file. Logs alone do not show the entire picture, unfortunately.

Config file here:
https://pastebin.ubuntu.com/p/kGBv6XgHms/

Quoted 5 lines

In regard to missing sound, (looks like we're talking about HDA dsp + DMIC configuration) kconfig mentioned above will be required. Pretty sure HDAudio support for skylake-driver is not enabled on your machine and thus driver exists probe() early without registering any sound card.

Do you mean CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC needs to be enabled?

Kai-Heng

Quoted 3 lines

Regards,
Czarek

author maintainer
#4 lore raw
Quoted 3 lines · Kai-Heng Feng
Quoted 1 line · Cezary Rojewski

...

Quoted 9 lines
Quoted 6 lines

From the logs you've provided one can see that snd_soc_skl did attempt
to probe() so the code compiled just fine. Again, compilation issue is the one I've addressed here. While we're here, I'd appreciate kconfig being provided along dmesg file. Logs alone do not show the entire picture, unfortunately.

Config file here:
https://pastebin.ubuntu.com/p/kGBv6XgHms/

Thank you for the config, Yang.

Quoted 7 lines
Quoted 5 lines

In regard to missing sound, (looks like we're talking about HDA dsp + DMIC configuration) kconfig mentioned above will be required. Pretty sure HDAudio support for skylake-driver is not enabled on your machine and thus driver exists probe() early without registering any sound card.

Do you mean CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC needs to be enabled?

Indeed.

Below are the options required to enable HDA-dsp + DMIC configuration:
(first navigate to:)
-> Device Drivers -> Sound card support -> ALSA

-> HD-Audio
--> HD Audio PCI
--> Build Realtek HD-audio codec support
--> Build HDMI/DisplayPort HD-audio codec support

-> ASoC
--> Intel ASoC SST drivers
--> Skylake Platforms
--> Kabylake Platforms
--> Broxton/ApolloLake Platforms
--> HDAudio codec support

--> Intel Machine drivers
---> DMIC machine board driver
---> SKL/KBL/BXT/APL with HDA codecs

Let me know how the situation looks with these set.

Regards,
Czarek

author maintainer
#5 lore raw
Quoted 8 lines · Cezary Rojewski
Quoted 3 lines · Kai-Heng Feng

Config file here:
https://pastebin.ubuntu.com/p/kGBv6XgHms/

Thank you for the config, Yang.

Sorry for the typo, meant to say: Kai-Heng. Was writing several emails in short succession.

Regards,
Czarek

#6 lore raw
Quoted 5 lines · Cezary Rojewski
Quoted 3 lines · Cezary Rojewski
Quoted 1 line · Kai-Heng Feng
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

Config file here:
https://pastebin.ubuntu.com/p/kGBv6XgHms/

Thank you for the config, Yang.

Sorry for the typo, meant to say: Kai-Heng. Was writing several emails in short succession.

It's okay :)

Commit cc2d025a81a9 ("ASoC: Intel: Skylake: Update description for HDaudio kconfig") removed "DEPRECATED" from the SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC, does that mean the option is safe and should be enabled in downstream distros?

Kai-Heng

Quoted 3 lines

Regards,
Czarek

author maintainer
#7 lore raw
Quoted 2 lines · Kai-Heng Feng

On Tue, Feb 2, 2021 at 6:56 PM Cezary Rojewski
<[email protected]> wrote:

...

Quoted 4 lines

Commit cc2d025a81a9 ("ASoC: Intel: Skylake: Update description for HDaudio kconfig") removed "DEPRECATED" from the SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC, does that mean the option is safe and should be enabled in downstream distros?

Skylake driver - sound/soc/intel/skylake - is your only option if you want to enable HDA (dsp) + DMIC configuration on SPT platforms (skl/kbl/kbl-r/aml/cml-s).

Several problems that had been troubling it have been address early 2020 [1]. Later, fixes were ported to v5.4 [2] so LTS users can enjoy working hda+dmic configuration. Please note: topology binary is required to make this work, kernel patches alone won't cut it. ASoC topologies are stored in a separate repo (git.alsa-project.org/alsa-topology-conf). These topologies should end up in /lib/firmware/intel, eventually - once converted via alsatplg to their binary form.

Regards,
Czarek

[1]: https://lore.kernel.org/alsa-devel/[email protected]/
[2]: https://www.spinics.net/lists/alsa-devel/msg119230.html

author maintainer
#8 lore raw
Quoted 4 lines · Cezary Rojewski
Quoted 2 lines · Kai-Heng Feng

On Tue, Feb 2, 2021 at 6:56 PM Cezary Rojewski
<[email protected]> wrote:

...

Quoted 6 lines
Quoted 4 lines

Commit cc2d025a81a9 ("ASoC: Intel: Skylake: Update description for HDaudio kconfig") removed "DEPRECATED" from the SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC, does that mean the option is safe and should be enabled in downstream distros?

Skylake driver - sound/soc/intel/skylake - is your only option if you want to enable HDA (dsp) + DMIC configuration on SPT platforms (skl/kbl/kbl-r/aml/cml-s).

Hello Kai-Heng,

I'd like to close the compilation issue which this patch is addressing. Could you confirm that the presented change fixes the issue on your end?

Regards,
Czarek

#9 lore raw

Hi Cezary,

Quoted 14 lines · Cezary Rojewski
Quoted 4 lines · Cezary Rojewski
Quoted 2 lines · Kai-Heng Feng

On Tue, Feb 2, 2021 at 6:56 PM Cezary Rojewski
<[email protected]> wrote:

...

Quoted 5 lines
Quoted 4 lines

Commit cc2d025a81a9 ("ASoC: Intel: Skylake: Update description for HDaudio kconfig") removed "DEPRECATED" from the SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC, does that mean the option is safe and should be enabled in downstream distros?

Quoted 8 lines
Quoted 3 lines

Skylake driver - sound/soc/intel/skylake - is your only option if you want to enable HDA (dsp) + DMIC configuration on SPT platforms (skl/kbl/kbl-r/aml/cml-s).

Hello Kai-Heng,

I'd like to close the compilation issue which this patch is addressing. Could you confirm that the presented change fixes the issue on your end?

No, the SST regression is not fixed.
However, it's not the scope of this patch, which is to fix a different issue.

So please proceed to merge the patch. We can discuss the SST regression in other thread.

Kai-Heng

Quoted 3 lines

Regards,
Czarek

author maintainer
#10 lore raw
Quoted 2 lines · Kai-Heng Feng

Hi Cezary,

...

Quoted 10 lines
Quoted 3 lines

I'd like to close the compilation issue which this patch is addressing. Could you confirm that the presented change fixes the issue on your end?

No, the SST regression is not fixed.
However, it's not the scope of this patch, which is to fix a different issue.

So please proceed to merge the patch. We can discuss the SST regression in other thread.

Thanks for the reply Kai-Heng.
Could you elaborate on the SST regression subject though?

Mark, do you want me to re-send the patch?

Regards,
Czarek

#11 lore raw
Quoted 14 lines · Cezary Rojewski
Quoted 2 lines · Kai-Heng Feng

Hi Cezary,

...

Quoted 7 lines
Quoted 3 lines

I'd like to close the compilation issue which this patch is addressing. Could you confirm that the presented change fixes the issue on your end?

No, the SST regression is not fixed.
However, it's not the scope of this patch, which is to fix a different issue.

Quoted 6 lines
Quoted 3 lines

So please proceed to merge the patch. We can discuss the SST regression in other thread.

Thanks for the reply Kai-Heng.
Could you elaborate on the SST regression subject though?

I think it's easier for us if you can involve in the bug report directly:
https://bugs.launchpad.net/bugs/1902457
https://bugs.launchpad.net/bugs/1915117

Kai-Heng

Quoted 5 lines

Mark, do you want me to re-send the patch?

Regards,
Czarek

maintainer
#12 lore raw
In reply to Cezary Rojewski
Quoted 4 lines · Cezary Rojewski

Skylake is dependent on SND_SOC_INTEL_SKYLAKE (aka "all SST platforms") whereas selecting specific configuration such as KBL-only will not cause driver code to compile. Switch to SND_SOC_INTEL_SKYLAKE_COMMON dependency so selecting any configuration causes the driver to be built.

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: Intel: Skylake: Compile when any configuration is selected

      commit: cfa0faec5fc0544f84b9c599b6cf49cd3cc709f3

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark