- Sound-open-firmware - mailman.alsa-project.org

Re: [Sound-open-firmware] [PATCH] ALSA: hda: fix SND_INTEL_DSP_CONFIG dependency
by Jaroslav Kysela 04 Jan '21

04 Jan '21

Dne 03. 01. 21 v 14:52 Arnd Bergmann napsal(a): > From: Arnd Bergmann <arnd(a)arndb.de> > > The sof-pci-dev driver fails to link when built into the kernel > and CONFIG_SND_INTEL_DSP_CONFIG is set to =m: > > arm-linux-gnueabi-ld: sound/soc/sof/sof-pci-dev.o: in function `sof_pci_probe': > sof-pci-dev.c:(.text+0x1c): undefined reference to `snd_intel_dsp_driver_probe' > > All other drivers using this interface already use a 'select > SND_INTEL_DSP_CONFIG' statement to force the it to be present, so it > seems reasonable to do the same here. > > The stub implementation in the header makes the problem harder to find, > as it avoids the link error when SND_INTEL_DSP_CONFIG is completely > disabled, without any obvious upsides. Remove these stubs to make it > clearer that the driver is in fact needed here. > > Fixes: 82d9d54a6c0e ("ALSA: hda: add Intel DSP configuration / probe code") > Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> > --- > include/sound/intel-dsp-config.h | 17 ----------------- > sound/soc/sof/Kconfig | 2 ++ > 2 files changed, 2 insertions(+), 17 deletions(-) > > diff --git a/include/sound/intel-dsp-config.h b/include/sound/intel-dsp-config.h > index d4609077c258..94667e870029 100644 > --- a/include/sound/intel-dsp-config.h > +++ b/include/sound/intel-dsp-config.h > @@ -18,24 +18,7 @@ enum { > SND_INTEL_DSP_DRIVER_LAST = SND_INTEL_DSP_DRIVER_SOF > }; > > -#if IS_ENABLED(CONFIG_SND_INTEL_DSP_CONFIG) The SOF drivers selects the DSP config code only when required (for specific platforms - see sound/soc/sof/intel/Kconfig). It seems that the above if should be modified as: #if IS_BUILDIN(CONFIG_SND_INTEL_DSP_CONFIG) || (defined(MODULE) && IS_MODULE(CONFIG_SND_INTEL_DSP_CONFIG)) So the buildin drivers which do not require the DSP config probe can be compiled without this dependency. Jaroslav -- Jaroslav Kysela <perex(a)perex.cz> Linux Sound Maintainer; ALSA Project; Red Hat, Inc.

2 1

Re: [Sound-open-firmware] [PATCH] ALSA: hda: fix SND_INTEL_DSP_CONFIG dependency
by Takashi Iwai 04 Jan '21

04 Jan '21

On Sun, 03 Jan 2021 14:52:32 +0100, Arnd Bergmann wrote: > > From: Arnd Bergmann <arnd(a)arndb.de> > > The sof-pci-dev driver fails to link when built into the kernel > and CONFIG_SND_INTEL_DSP_CONFIG is set to =m: > > arm-linux-gnueabi-ld: sound/soc/sof/sof-pci-dev.o: in function `sof_pci_probe': > sof-pci-dev.c:(.text+0x1c): undefined reference to `snd_intel_dsp_driver_probe' > > All other drivers using this interface already use a 'select > SND_INTEL_DSP_CONFIG' statement to force the it to be present, so it > seems reasonable to do the same here. > > The stub implementation in the header makes the problem harder to find, > as it avoids the link error when SND_INTEL_DSP_CONFIG is completely > disabled, without any obvious upsides. Remove these stubs to make it > clearer that the driver is in fact needed here. > > Fixes: 82d9d54a6c0e ("ALSA: hda: add Intel DSP configuration / probe code") > Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> IMO, the problem is rather the unconditional calls of snd_intel_dsp_driver_probe() in snd-soc-sof-pci and snd-soc-sof-acpi drivers. Those calls should be done only if Intel drivers are involved. So, wrapping the call with ifdef CONFIG_SND_SOC_SOF_INTEL_PCI or CONFIG_SND_SOC_SOF_INTEL_ACPI would work better (although those are a bit uglier). thanks, Takashi > --- > include/sound/intel-dsp-config.h | 17 ----------------- > sound/soc/sof/Kconfig | 2 ++ > 2 files changed, 2 insertions(+), 17 deletions(-) > > diff --git a/include/sound/intel-dsp-config.h b/include/sound/intel-dsp-config.h > index d4609077c258..94667e870029 100644 > --- a/include/sound/intel-dsp-config.h > +++ b/include/sound/intel-dsp-config.h > @@ -18,24 +18,7 @@ enum { > SND_INTEL_DSP_DRIVER_LAST = SND_INTEL_DSP_DRIVER_SOF > }; > > -#if IS_ENABLED(CONFIG_SND_INTEL_DSP_CONFIG) > - > int snd_intel_dsp_driver_probe(struct pci_dev *pci); > int snd_intel_acpi_dsp_driver_probe(struct device *dev, const u8 acpi_hid[ACPI_ID_LEN]); > > -#else > - > -static inline int snd_intel_dsp_driver_probe(struct pci_dev *pci) > -{ > - return SND_INTEL_DSP_DRIVER_ANY; > -} > - > -static inline > -int snd_intel_acpi_dsp_driver_probe(struct device *dev, const u8 acpi_hid[ACPI_ID_LEN]) > -{ > - return SND_INTEL_DSP_DRIVER_ANY; > -} > - > -#endif > - > #endif > diff --git a/sound/soc/sof/Kconfig b/sound/soc/sof/Kconfig > index 031dad5fc4c7..051fd3d27047 100644 > --- a/sound/soc/sof/Kconfig > +++ b/sound/soc/sof/Kconfig > @@ -12,6 +12,7 @@ if SND_SOC_SOF_TOPLEVEL > config SND_SOC_SOF_PCI > tristate "SOF PCI enumeration support" > depends on PCI > + select SND_INTEL_DSP_CONFIG > select SND_SOC_SOF > select SND_SOC_ACPI if ACPI > help > @@ -23,6 +24,7 @@ config SND_SOC_SOF_PCI > config SND_SOC_SOF_ACPI > tristate "SOF ACPI enumeration support" > depends on ACPI || COMPILE_TEST > + select SND_INTEL_DSP_CONFIG > select SND_SOC_SOF > select SND_SOC_ACPI if ACPI > select IOSF_MBI if X86 && PCI > -- > 2.29.2 >

1 0

[Sound-open-firmware] [PATCH 1/2] ASoC: SOF: Intel: hda: Modify existing helper to disable WAKEEN
by Kai-Heng Feng 04 Jan '21

04 Jan '21

Modify hda_codec_jack_wake_enable() to also support disable WAKEEN. This is a preparation for next patch. No functional change intended. Signed-off-by: Kai-Heng Feng <kai.heng.feng(a)canonical.com> --- sound/soc/sof/intel/hda-codec.c | 16 +++++++--------- sound/soc/sof/intel/hda-dsp.c | 6 ++++-- sound/soc/sof/intel/hda.h | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sound/soc/sof/intel/hda-codec.c b/sound/soc/sof/intel/hda-codec.c index 6875fa570c2c..bc9ac4abdab5 100644 --- a/sound/soc/sof/intel/hda-codec.c +++ b/sound/soc/sof/intel/hda-codec.c @@ -63,16 +63,18 @@ static int hda_codec_load_module(struct hda_codec *codec) } /* enable controller wake up event for all codecs with jack connectors */ -void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev) +void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev, bool enable) { struct hda_bus *hbus = sof_to_hbus(sdev); struct hdac_bus *bus = sof_to_bus(sdev); struct hda_codec *codec; unsigned int mask = 0; - list_for_each_codec(codec, hbus) - if (codec->jacktbl.used) - mask |= BIT(codec->core.addr); + if (enable) { + list_for_each_codec(codec, hbus) + if (codec->jacktbl.used) + mask |= BIT(codec->core.addr); + } snd_hdac_chip_updatew(bus, WAKEEN, STATESTS_INT_MASK, mask); } @@ -81,12 +83,8 @@ void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev) void hda_codec_jack_check(struct snd_sof_dev *sdev) { struct hda_bus *hbus = sof_to_hbus(sdev); - struct hdac_bus *bus = sof_to_bus(sdev); struct hda_codec *codec; - /* disable controller Wake Up event*/ - snd_hdac_chip_updatew(bus, WAKEEN, STATESTS_INT_MASK, 0); - list_for_each_codec(codec, hbus) /* * Wake up all jack-detecting codecs regardless whether an event @@ -97,7 +95,7 @@ void hda_codec_jack_check(struct snd_sof_dev *sdev) codec->jackpoll_interval); } #else -void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev) {} +void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev, bool enable) {} void hda_codec_jack_check(struct snd_sof_dev *sdev) {} #endif /* CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC */ EXPORT_SYMBOL_NS(hda_codec_jack_wake_enable, SND_SOC_SOF_HDA_AUDIO_CODEC); diff --git a/sound/soc/sof/intel/hda-dsp.c b/sound/soc/sof/intel/hda-dsp.c index 2b001151fe37..7d00107cf3b2 100644 --- a/sound/soc/sof/intel/hda-dsp.c +++ b/sound/soc/sof/intel/hda-dsp.c @@ -617,7 +617,7 @@ static int hda_suspend(struct snd_sof_dev *sdev, bool runtime_suspend) #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) if (runtime_suspend) - hda_codec_jack_wake_enable(sdev); + hda_codec_jack_wake_enable(sdev, true); /* power down all hda link */ snd_hdac_ext_bus_link_power_down_all(bus); @@ -683,8 +683,10 @@ static int hda_resume(struct snd_sof_dev *sdev, bool runtime_resume) #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) /* check jack status */ - if (runtime_resume) + if (runtime_resume) { + hda_codec_jack_wake_enable(sdev, false); hda_codec_jack_check(sdev); + } /* turn off the links that were off before suspend */ list_for_each_entry(hlink, &bus->hlink_list, list) { diff --git a/sound/soc/sof/intel/hda.h b/sound/soc/sof/intel/hda.h index 9ec8ae0fd649..a3b6f3e9121c 100644 --- a/sound/soc/sof/intel/hda.h +++ b/sound/soc/sof/intel/hda.h @@ -650,7 +650,7 @@ void sof_hda_bus_init(struct hdac_bus *bus, struct device *dev); */ void hda_codec_probe_bus(struct snd_sof_dev *sdev, bool hda_codec_use_common_hdmi); -void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev); +void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev, bool enable); void hda_codec_jack_check(struct snd_sof_dev *sdev); #endif /* CONFIG_SND_SOC_SOF_HDA */ -- 2.29.2

2 7

[Sound-open-firmware] Codec Adapters Upstream
by Curtis Malainey 19 Dec '20

19 Dec '20

Hello All I know historically there was push back against codec/processing adapters upstream. Now that we have UUID support and the codec adapter, are we still pushing back on this? Curtis

2 4

[Sound-open-firmware] Output channel left/right swap on various CHT devices with various codecs
by Hans de Goede 18 Dec '20

18 Dec '20

Hi Pierre-Louis, et al., As discussed in other email-threads, because of the plan to drop the old SST Linux driver for BYT/CHT devices, replacing it with the SOF driver, I have been testing the Linux SOF driver on various BYT and CHT devices. As also already discussed things mostly work well, but there is one bug when using the SOF driver which is not present when using the SST driver. Sometimes the left and right playback channels are swapped. This happens with both stereo speakers and headphones (as is to be expected). I just hit this on a CHT SoC + NAU8824 codec device, meaning that I can now confirm the playback channel-swap issue on 2 different devices. So I've gone ahead and filed an issue for this: https://github.com/thesofproject/sof/issues/3699 As mentioned in the issue I would like to file an official Fedora Change proposal for making SOF the default sound driver for BYT/CHT devices in Fedora 34, to help with SOF getting tested on those devices so that we can drop the older SST driver ASAP. This playback channel-swap issue is IHMO a blocker for this plan, as I mentioned in the issue the deadline for filing a change proposal for this is Jan 19th 2021. We can always flip the default back to SST later during the Fedora 34 development-cycle if this issue stay unresolved, but I would like to at least have some indication / expectation of a fix for this being available no later then say February 15th, before moving ahead with the Fedora change plan. Regards, Hans

2 1

[Sound-open-firmware] [PATCH sof] topology: Add sof-cht-nau8824 topology file
by Hans de Goede 17 Dec '20

17 Dec '20

Add a topology file for Cherry Trail boards with a NAU8824 codec. These setups work with the standard settings from sof-byt-codec.m4. This has been tested on the following devices: Medion E2215T: stereo speakers, analog mic Medion E2228T: stereo speakers, stereo digital mics Cube iWork8 Air: mono speaker, analog mic Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- tools/topology/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/topology/CMakeLists.txt b/tools/topology/CMakeLists.txt index 170663aed..a3bfe18ee 100644 --- a/tools/topology/CMakeLists.txt +++ b/tools/topology/CMakeLists.txt @@ -63,6 +63,7 @@ set(TPLGS "sof-byt-codec\;sof-cht-da7213\;-DCODEC=DA7213\;-DPLATFORM=cht-codec\;-DSSP_NUM=2" "sof-byt-codec\;sof-cht-cx2072x\;-DCODEC=CX2072X\;-DPLATFORM=cht-codec\;-DSSP_NUM=2" "sof-byt-codec\;sof-cht-es8316\;-DCODEC=ES8316\;-DPLATFORM=cht-codec\;-DSSP_NUM=2" + "sof-byt-codec\;sof-cht-nau8824\;-DCODEC=NAU8824\;-DPLATFORM=cht-codec\;-DSSP_NUM=2" "sof-cht-max98090\;sof-cht-max98090\;-DCODEC=MAX98090\;-DPLATFORM=cht-codec\;-DSSP_NUM=2" "sof-cnl-rt274\;sof-cnl-rt274" "sof-apl-tdf8532\;sof-apl-tdf8532" -- 2.28.0

3 3

[Sound-open-firmware] [PATCH] ASoC: SOF: Fix spelling mistake in Kconfig "ond" -> "and"
by Colin King 16 Dec '20

16 Dec '20

From: Colin Ian King <colin.king(a)canonical.com> There is a spelling mistake in the Kconfig help text. Fix it. Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/soc/sof/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/Kconfig b/sound/soc/sof/Kconfig index 031dad5fc4c7..3e8b6c035ce3 100644 --- a/sound/soc/sof/Kconfig +++ b/sound/soc/sof/Kconfig @@ -122,7 +122,7 @@ config SND_SOC_SOF_DEBUG_XRUN_STOP bool "SOF stop on XRUN" help This option forces PCMs to stop on any XRUN event. This is useful to - preserve any trace data ond pipeline status prior to the XRUN. + preserve any trace data and pipeline status prior to the XRUN. Say Y if you are debugging SOF FW pipeline XRUNs. If unsure select "N". -- 2.29.2

3 2

[Sound-open-firmware] Design decisions for PM flow
by Daniel Baluta 15 Dec '20

15 Dec '20

Hi Ranjani, I have few questions about PM flow in SOF. 1) Firmware is always loaded at SOF device probe. Why is that? Is this just an early check that DSP is OK? Because after SND_SOF_SUSPEND_DELAY_MS the SOF device is suspended and DSP is turned off. 2) What is the correct behavior when immediately after boot there is a PM suspend/PM resume cycle. Here is what happens on IMX. PM suspend -> will do nothing because DSP is already suspended PM resume -> will reload the firmware. But now the firmware is loaded and DSP is up. And the system stays like this. How does this looks like on Intel platforms. thanks, Daniel.

3 5

[Sound-open-firmware] Sof-audio error
by Marc Green 15 Dec '20

15 Dec '20

Hi all, I have recently got a new Dell G5 laptop for research and have installed Ubuntu 20.04. When the Nvidia graphics card is selected as a device, I get the error: sof-audio-pci 0000:00:1f.3: error: no reply expected, received 0x0 Popping up on screen every time I wake the computer from sleep. Do you have any idea how I might fix this, as it's really annoying! I've contacted Nvidia too. Cheers, Marc

2 1

[Sound-open-firmware] [PATCH AUTOSEL 5.9 04/55] ASoC: SOF: loader: handle all SOF_IPC_EXT types
by Sasha Levin 10 Nov '20

10 Nov '20

From: Bard Liao <yung-chuan.liao(a)linux.intel.com> [ Upstream commit 6e5329c6e6032cd997400b43b8299f607a61883e ] Do not emit a warning for extended firmware header fields that are not used by kernel. This creates unnecessary noise to kernel logs like: sof-audio-pci 0000:00:1f.3: warning: unknown ext header type 3 size 0x1c sof-audio-pci 0000:00:1f.3: warning: unknown ext header type 4 size 0x10 Signed-off-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski(a)linux.intel.com> Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> Link: https://lore.kernel.org/r/20201021182419.1160391-1-kai.vehmanen@linux.intel… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/sof/loader.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/soc/sof/loader.c b/sound/soc/sof/loader.c index b94fa5f5d4808..c90c3f3a3b3ee 100644 --- a/sound/soc/sof/loader.c +++ b/sound/soc/sof/loader.c @@ -118,6 +118,11 @@ int snd_sof_fw_parse_ext_data(struct snd_sof_dev *sdev, u32 bar, u32 offset) case SOF_IPC_EXT_CC_INFO: ret = get_cc_info(sdev, ext_hdr); break; + case SOF_IPC_EXT_UNUSED: + case SOF_IPC_EXT_PROBE_INFO: + case SOF_IPC_EXT_USER_ABI_INFO: + /* They are supported but we don't do anything here */ + break; default: dev_warn(sdev->dev, "warning: unknown ext header type %d size 0x%x\n", ext_hdr->type, ext_hdr->hdr.size); -- 2.27.0

1 0