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

[Sound-open-firmware] [PATCH AUTOSEL 5.4 08/19] ASoC: SOF: Intel: hda: Resume codec to do jack detection
by Sasha Levin 29 Jan '21

29 Jan '21

From: Kai-Heng Feng <kai.heng.feng(a)canonical.com> [ Upstream commit bcd7059abc19e6ec5b2260dff6a008fb99c4eef9 ] Instead of queueing jackpoll_work, runtime resume the codec to let it use different jack detection methods based on jackpoll_interval. This partially matches SOF driver's behavior with commit a6e7d0a4bdb0 ("ALSA: hda: fix jack detection with Realtek codecs when in D3"), the difference is SOF unconditionally resumes the codec. Signed-off-by: Kai-Heng Feng <kai.heng.feng(a)canonical.com> Link: https://lore.kernel.org/r/20210112181128.1229827-1-kai.heng.feng@canonical.… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/sof/intel/hda-codec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/sof/intel/hda-codec.c b/sound/soc/sof/intel/hda-codec.c index 9e8233c10d860..df38616c431a6 100644 --- a/sound/soc/sof/intel/hda-codec.c +++ b/sound/soc/sof/intel/hda-codec.c @@ -68,8 +68,7 @@ void hda_codec_jack_check(struct snd_sof_dev *sdev) * has been recorded in STATESTS */ if (codec->jacktbl.used) - schedule_delayed_work(&codec->jackpoll_work, - codec->jackpoll_interval); + pm_request_resume(&codec->core.dev); } #else void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev) {} -- 2.27.0

1 0

[Sound-open-firmware] [PATCH AUTOSEL 5.10 12/41] ASoC: SOF: Intel: hda: Resume codec to do jack detection
by Sasha Levin 29 Jan '21

29 Jan '21

From: Kai-Heng Feng <kai.heng.feng(a)canonical.com> [ Upstream commit bcd7059abc19e6ec5b2260dff6a008fb99c4eef9 ] Instead of queueing jackpoll_work, runtime resume the codec to let it use different jack detection methods based on jackpoll_interval. This partially matches SOF driver's behavior with commit a6e7d0a4bdb0 ("ALSA: hda: fix jack detection with Realtek codecs when in D3"), the difference is SOF unconditionally resumes the codec. Signed-off-by: Kai-Heng Feng <kai.heng.feng(a)canonical.com> Link: https://lore.kernel.org/r/20210112181128.1229827-1-kai.heng.feng@canonical.… Signed-off-by: Mark Brown <broonie(a)kernel.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- sound/soc/sof/intel/hda-codec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/sof/intel/hda-codec.c b/sound/soc/sof/intel/hda-codec.c index 8b0ddc4b8227b..8d65004c917a1 100644 --- a/sound/soc/sof/intel/hda-codec.c +++ b/sound/soc/sof/intel/hda-codec.c @@ -93,8 +93,7 @@ void hda_codec_jack_check(struct snd_sof_dev *sdev) * has been recorded in STATESTS */ if (codec->jacktbl.used) - schedule_delayed_work(&codec->jackpoll_work, - codec->jackpoll_interval); + pm_request_resume(&codec->core.dev); } #else void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev) {} -- 2.27.0

1 0

[Sound-open-firmware] Adding more clients to the KPB draining task
by Cristina Feies (ilie) 26 Jan '21

26 Jan '21

Hi all, I would like to add new client for the draining task in KPB component. I observed there is a register function and init_draining receives a parameter with all the client data. However in init_draining when the draining_task is created the draining sink is fixed to host sink and is not read from the client parameter. Moreover I see that when draining data from history buffer on host sink(kpb_drain_samples function), the read pointer (r_ptr) of the history buffer is advanced. So we consume this buffer from the first client. Is there a patch which addresses multiple clients for the draining task? I would like to add the keyword detection component as client of the KPB draining task but this would be the second customer, after the host. Thank you, Cristina

1 0

[Sound-open-firmware] amixer pipeline issues
by Daniel Baluta 25 Jan '21

25 Jan '21

Hi Pierre, We are experiencing issues using mixer piplines. I think it is the same issue mentioned here: https://github.com/thesofproject/sof/issues/3171 We get the issue for all formats: S{16|24|32}_LE At some point aplay stops with I/O write error. This PR: https://github.com/plbossart/sof/commit/baed1f0283f190e319444d06cdfc7f7c78a… doesn't fix the issues as it seems it does for Intel. We are investigating and suspecting it might be a wild scheduling issue, anyway I have a generic question about this scenario. Looking at sof-cht-max98090.m4 we have 3 pipelines involved in the playback: -> [pipeline 1] -> playback DAI using 2 periods -> [pipeline 3] -> playback pipeline 3 on PCM 0 with 1ms deadline -> [pipeline 4] -> playback pipeline 4 on PCM 1 with 10ms deadline. The question is why pipeline 3 and pipeline 4 are not symmetrical, meaning that they should have the same period size. But one has 1ms and the other one has 10ms. What's the idea behind this?

2 1

[Sound-open-firmware] [PATCH 1/2] [v2] ALSA: hda: fix SND_INTEL_DSP_CONFIG dependency
by Arnd Bergmann 14 Jan '21

14 Jan '21

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> --- v2: fix various build issues in the first version, now passes all randconfig builds I tried --- include/sound/intel-dsp-config.h | 17 ----------------- sound/soc/sof/Kconfig | 2 ++ sound/soc/sof/intel/Kconfig | 4 ++-- sound/soc/sof/intel/byt.c | 2 +- 4 files changed, 5 insertions(+), 20 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 diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig index ff9266413a06..67365ce0d86d 100644 --- a/sound/soc/sof/intel/Kconfig +++ b/sound/soc/sof/intel/Kconfig @@ -53,7 +53,7 @@ config SND_SOC_SOF_INTEL_COMMON if SND_SOC_SOF_ACPI config SND_SOC_SOF_BAYTRAIL - bool "SOF support for Baytrail, Braswell and Cherrytrail" + tristate "SOF support for Baytrail, Braswell and Cherrytrail" select SND_SOC_SOF_INTEL_ATOM_HIFI_EP select SND_INTEL_DSP_CONFIG help @@ -70,7 +70,7 @@ config SND_SOC_SOF_BAYTRAIL If unsure select "N". config SND_SOC_SOF_BROADWELL - bool "SOF support for Broadwell" + tristate "SOF support for Broadwell" select SND_INTEL_DSP_CONFIG select SND_SOC_SOF_INTEL_COMMON select SND_SOC_SOF_INTEL_HIFI_EP_IPC diff --git a/sound/soc/sof/intel/byt.c b/sound/soc/sof/intel/byt.c index 65abcca94521..42dba3da1ca3 100644 --- a/sound/soc/sof/intel/byt.c +++ b/sound/soc/sof/intel/byt.c @@ -660,7 +660,7 @@ EXPORT_SYMBOL_NS(tng_chip_info, SND_SOC_SOF_MERRIFIELD); #endif /* CONFIG_SND_SOC_SOF_MERRIFIELD */ -#ifdef CONFIG_SND_SOC_SOF_BAYTRAIL +#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL) static void byt_reset_dsp_disable_int(struct snd_sof_dev *sdev) { /* Disable Interrupt from both sides */ -- 2.29.2

2 7

[Sound-open-firmware] [PATCH v4 1/3] ASoC: SOF: Intel: hda: Resume codec to do jack detection
by Kai-Heng Feng 13 Jan '21

13 Jan '21

Instead of queueing jackpoll_work, runtime resume the codec to let it use different jack detection methods based on jackpoll_interval. This partially matches SOF driver's behavior with commit a6e7d0a4bdb0 ("ALSA: hda: fix jack detection with Realtek codecs when in D3"), the difference is SOF unconditionally resumes the codec. Signed-off-by: Kai-Heng Feng <kai.heng.feng(a)canonical.com> --- v4: No change. v3: Remove wrong assumption that only Realtek codec is used by SOF. v2: No change. sound/soc/sof/intel/hda-codec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/sof/intel/hda-codec.c b/sound/soc/sof/intel/hda-codec.c index 6875fa570c2c..df59c79cfdfc 100644 --- a/sound/soc/sof/intel/hda-codec.c +++ b/sound/soc/sof/intel/hda-codec.c @@ -93,8 +93,7 @@ void hda_codec_jack_check(struct snd_sof_dev *sdev) * has been recorded in STATESTS */ if (codec->jacktbl.used) - schedule_delayed_work(&codec->jackpoll_work, - codec->jackpoll_interval); + pm_request_resume(&codec->core.dev); } #else void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev) {} -- 2.29.2

3 4

Re: [Sound-open-firmware] SoF support for 8086:9d71?
by Amadeusz Sławiński 13 Jan '21

13 Jan '21

On 1/13/2021 5:48 AM, Kai-Heng Feng wrote: > On Tue, Jan 12, 2021 at 9:25 PM Amadeusz Sławiński > <amadeuszx.slawinski(a)linux.intel.com> wrote: >> >> On 12/17/2020 9:25 AM, Kai-Heng Feng wrote: >> (...) >>>>> >>>>> Can you try this instead, the dependencies are indeed wrong in the Makefile: >>>> >>>> Ok, compiling a kernel for user to test... >>> >>> Well, this happens: >>> ERROR: modpost: "skl_dsp_set_dma_control" >>> [sound/soc/intel/skylake/snd-soc-skl-ssp-clk.ko] undefined! >>> make[1]: *** [scripts/Makefile.modpost:111: sound/Module.symvers] Error 1 >>> make[1]: *** Deleting file 'sound/Module.symvers' >>> make: *** [Makefile:1709: modules] Error 2 >>> >>> Kai-Heng >>> >>>> >>>> Kai-Heng >>>> >>>>> >>>>> diff --git a/sound/soc/intel/Makefile b/sound/soc/intel/Makefile >>>>> index 4e0248d2accc..7c5038803be7 100644 >>>>> --- a/sound/soc/intel/Makefile >>>>> +++ b/sound/soc/intel/Makefile >>>>> @@ -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 >>>>> >>>>> >> >> Hi, >> >> what is the status of this issue? > > Still the same, unresolved. > >> Does it now work with usptream kernel? > > No it doesn't. > Can you try with following patch: diff --git a/sound/soc/intel/Makefile b/sound/soc/intel/Makefile index 4e0248d2accc..7c5038803be7 100644 --- a/sound/soc/intel/Makefile +++ b/sound/soc/intel/Makefile @@ -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 diff --git a/sound/soc/intel/skylake/Makefile b/sound/soc/intel/skylake/Makefile index dd39149b89b1..1c4649bccec5 100644 --- a/sound/soc/intel/skylake/Makefile +++ b/sound/soc/intel/skylake/Makefile @@ -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

1 0

Re: [Sound-open-firmware] [PATCH] ASoC: SOF: Intel: avoid reverse module dependency
by Pierre-Louis Bossart 12 Jan '21

12 Jan '21

On 1/5/21 1:07 PM, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd(a)arndb.de> > > The SOF-ACPI driver is backwards from the normal Linux model, it has a > generic driver that knows about all the specific drivers, as opposed to > having hardware specific drivers that link against a common framework. > > This requires ugly Kconfig magic and leads to missed dependencies as > seen in this link error: > > arm-linux-gnueabi-ld: sound/soc/sof/sof-pci-dev.o: in function `sof_acpi_probe': > sof-pci-dev.c:(.text+0x1c): undefined reference to `snd_intel_dsp_driver_probe' > > Change it to use the normal probe order of starting with a specific > device in a driver, turning the sof-acpi-dev.c driver into a library. Thanks Arnd for reporting all this, much appreciated. The initial design was that we would have one generic platform_driver (ACPI) and one generic PCI driver that would deal with all known IDs, with descriptors that would point ops and callbacks defined in device-specific drivers. It's how all Intel drivers worked so far, from HDaudio to Atom/SST and Skylake. It's not that ugly, but to Arnd's point we do have a lot of #if IS_ENABLED at the top level with a larger and larger table of IDs, along with Kconfig magic indeed to propagate constraints from top-level to device-specific drivers. The error with DSP_CONFIG comes from the fact that this never belonged at the top-level, or should have been conditionally invoked, as noted by Takashi. That said, the initial design which dates from 2017 can be revisited now that we start having quite a few platforms and more coming. What Arnd suggests isn't without merits, it would indeed turn the generic code into generic helpers, and have all the platform IDs maintained in device-specific drivers. It's a more distributed/scalable solution, the only minor drawback I see is that it would require multiple instances of the 'platform_driver' and 'pci_driver' structures. I would also want to keep the top-level selection so that ACPI/PCI/DT modules can be disabled in one shot, that would mean an additional change to the Makefiles since e.g. obj-$(CONFIG_SND_SOC_SOF_ACPI) += snd-sof-acpi.o would need to be set somehow. Since this is going to be a really invasive change, and past experience shows that mucking with Kconfigs will invariably raise a number of broken corner cases, if there is support from Mark/Takashi/Jaroslav on this idea, we should first test it in the SOF tree so that we get a good test coverage and don't break too many eggs in Mark's tree. We would also need to concurrently change our CI scripts which are dependent on module names. Also maybe in a first pass we can remove the compilation error with IS_REACHABLE and in a second pass do more invasive surgery? > Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> > --- > sound/soc/sof/intel/Kconfig | 34 ++-------- > sound/soc/sof/intel/bdw.c | 51 +++++++++++++-- > sound/soc/sof/intel/byt.c | 104 +++++++++++++++++++++++++---- > sound/soc/sof/intel/shim.h | 10 ++- > sound/soc/sof/sof-acpi-dev.c | 122 ++--------------------------------- > 5 files changed, 156 insertions(+), 165 deletions(-) > > diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig > index ae9ba834814e..ff9266413a06 100644 > --- a/sound/soc/sof/intel/Kconfig > +++ b/sound/soc/sof/intel/Kconfig > @@ -9,14 +9,6 @@ config SND_SOC_SOF_INTEL_TOPLEVEL > > if SND_SOC_SOF_INTEL_TOPLEVEL > > -config SND_SOC_SOF_INTEL_ACPI > - def_tristate SND_SOC_SOF_ACPI > - select SND_SOC_SOF_BAYTRAIL if SND_SOC_SOF_BAYTRAIL_SUPPORT > - select SND_SOC_SOF_BROADWELL if SND_SOC_SOF_BROADWELL_SUPPORT > - help > - This option is not user-selectable but automagically handled by > - 'select' statements at a higher level. > - > config SND_SOC_SOF_INTEL_PCI > def_tristate SND_SOC_SOF_PCI > select SND_SOC_SOF_MERRIFIELD if SND_SOC_SOF_MERRIFIELD_SUPPORT > @@ -58,10 +50,12 @@ config SND_SOC_SOF_INTEL_COMMON > This option is not user-selectable but automagically handled by > 'select' statements at a higher level. > > -if SND_SOC_SOF_INTEL_ACPI > +if SND_SOC_SOF_ACPI > > -config SND_SOC_SOF_BAYTRAIL_SUPPORT > +config SND_SOC_SOF_BAYTRAIL > bool "SOF support for Baytrail, Braswell and Cherrytrail" > + select SND_SOC_SOF_INTEL_ATOM_HIFI_EP > + select SND_INTEL_DSP_CONFIG > help > This adds support for Sound Open Firmware for Intel(R) platforms > using the Baytrail, Braswell or Cherrytrail processors. > @@ -75,17 +69,11 @@ config SND_SOC_SOF_BAYTRAIL_SUPPORT > Say Y if you want to enable SOF on Baytrail/Cherrytrail. > If unsure select "N". > > -config SND_SOC_SOF_BAYTRAIL > - tristate > - select SND_SOC_SOF_INTEL_ATOM_HIFI_EP > - select SND_INTEL_DSP_CONFIG > - help > - This option is not user-selectable but automagically handled by > - 'select' statements at a higher level. > - > -config SND_SOC_SOF_BROADWELL_SUPPORT > +config SND_SOC_SOF_BROADWELL > bool "SOF support for Broadwell" > select SND_INTEL_DSP_CONFIG > + select SND_SOC_SOF_INTEL_COMMON > + select SND_SOC_SOF_INTEL_HIFI_EP_IPC > help > This adds support for Sound Open Firmware for Intel(R) platforms > using the Broadwell processors. > @@ -100,14 +88,6 @@ config SND_SOC_SOF_BROADWELL_SUPPORT > Say Y if you want to enable SOF on Broadwell. > If unsure select "N". > > -config SND_SOC_SOF_BROADWELL > - tristate > - select SND_SOC_SOF_INTEL_COMMON > - select SND_SOC_SOF_INTEL_HIFI_EP_IPC > - help > - This option is not user-selectable but automagically handled by > - 'select' statements at a higher level. > - > endif ## SND_SOC_SOF_INTEL_ACPI > > if SND_SOC_SOF_INTEL_PCI > diff --git a/sound/soc/sof/intel/bdw.c b/sound/soc/sof/intel/bdw.c > index 50a4a73e6b9f..542e885733a2 100644 > --- a/sound/soc/sof/intel/bdw.c > +++ b/sound/soc/sof/intel/bdw.c > @@ -15,6 +15,8 @@ > #include <linux/module.h> > #include <sound/sof.h> > #include <sound/sof/xtensa.h> > +#include <sound/soc-acpi.h> > +#include <sound/soc-acpi-intel-match.h> > #include "../ops.h" > #include "shim.h" > #include "../sof-audio.h" > @@ -590,7 +592,7 @@ static struct snd_soc_dai_driver bdw_dai[] = { > }; > > /* broadwell ops */ > -const struct snd_sof_dsp_ops sof_bdw_ops = { > +static const struct snd_sof_dsp_ops sof_bdw_ops = { > /*Device init */ > .probe = bdw_probe, > > @@ -651,13 +653,54 @@ const struct snd_sof_dsp_ops sof_bdw_ops = { > > .arch_ops = &sof_xtensa_arch_ops, > }; > -EXPORT_SYMBOL_NS(sof_bdw_ops, SND_SOC_SOF_BROADWELL); > > -const struct sof_intel_dsp_desc bdw_chip_info = { > +static const struct sof_intel_dsp_desc bdw_chip_info = { > .cores_num = 1, > .host_managed_cores_mask = 1, > }; > -EXPORT_SYMBOL_NS(bdw_chip_info, SND_SOC_SOF_BROADWELL); > + > +static const struct sof_dev_desc sof_acpi_broadwell_desc = { > + .machines = snd_soc_acpi_intel_broadwell_machines, > + .resindex_lpe_base = 0, > + .resindex_pcicfg_base = 1, > + .resindex_imr_base = -1, > + .irqindex_host_ipc = 0, > + .chip_info = &bdw_chip_info, > + .default_fw_path = "intel/sof", > + .default_tplg_path = "intel/sof-tplg", > + .default_fw_filename = "sof-bdw.ri", > + .nocodec_tplg_filename = "sof-bdw-nocodec.tplg", > + .ops = &sof_bdw_ops, > +}; > + > +static const struct acpi_device_id sof_broadwell_match[] = { > + { "INT3438", (unsigned long)&sof_acpi_broadwell_desc }, > + { } > +}; > +MODULE_DEVICE_TABLE(acpi, sof_broadwell_match); > + > +static int sof_broadwell_probe(struct platform_device *dev) > +{ > + int ret = snd_intel_acpi_dsp_driver_probe(dev, "INT3438"); > + if (ret != SND_INTEL_DSP_DRIVER_SOF) { > + dev_dbg(dev, "SOF ACPI driver not selected, aborting probe\n"); > + return -ENODEV; > + } > + > + return sof_acpi_probe(dev, &sof_acpi_broadwell_desc); > +} > + > +/* acpi_driver definition */ > +static struct platform_driver snd_sof_acpi_driver = { > + .probe = sof_broadwell_probe, > + .remove = sof_acpi_remove, > + .driver = { > + .name = "sof-audio-broadwell", > + .pm = &sof_acpi_pm, > + .acpi_match_table = sof_broadwell_match, > + }, > +}; > +module_platform_driver(snd_sof_acpi_driver); > > MODULE_LICENSE("Dual BSD/GPL"); > MODULE_IMPORT_NS(SND_SOC_SOF_INTEL_HIFI_EP_IPC); > diff --git a/sound/soc/sof/intel/byt.c b/sound/soc/sof/intel/byt.c > index 19260dbecac5..9fa688c7711e 100644 > --- a/sound/soc/sof/intel/byt.c > +++ b/sound/soc/sof/intel/byt.c > @@ -15,6 +15,8 @@ > #include <linux/module.h> > #include <sound/sof.h> > #include <sound/sof/xtensa.h> > +#include <sound/soc-acpi.h> > +#include <sound/soc-acpi-intel-match.h> > #include "../ops.h" > #include "shim.h" > #include "../sof-audio.h" > @@ -657,8 +659,6 @@ EXPORT_SYMBOL_NS(tng_chip_info, SND_SOC_SOF_MERRIFIELD); > > #endif /* CONFIG_SND_SOC_SOF_MERRIFIELD */ > > -#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL) > - > static void byt_reset_dsp_disable_int(struct snd_sof_dev *sdev) > { > /* Disable Interrupt from both sides */ > @@ -822,7 +822,7 @@ static int byt_acpi_probe(struct snd_sof_dev *sdev) > } > > /* baytrail ops */ > -const struct snd_sof_dsp_ops sof_byt_ops = { > +static const struct snd_sof_dsp_ops sof_byt_ops = { > /* device init */ > .probe = byt_acpi_probe, > .remove = byt_remove, > @@ -892,16 +892,14 @@ const struct snd_sof_dsp_ops sof_byt_ops = { > > .arch_ops = &sof_xtensa_arch_ops, > }; > -EXPORT_SYMBOL_NS(sof_byt_ops, SND_SOC_SOF_BAYTRAIL); > > -const struct sof_intel_dsp_desc byt_chip_info = { > +static const struct sof_intel_dsp_desc byt_chip_info = { > .cores_num = 1, > .host_managed_cores_mask = 1, > }; > -EXPORT_SYMBOL_NS(byt_chip_info, SND_SOC_SOF_BAYTRAIL); > > /* cherrytrail and braswell ops */ > -const struct snd_sof_dsp_ops sof_cht_ops = { > +static const struct snd_sof_dsp_ops sof_cht_ops = { > /* device init */ > .probe = byt_acpi_probe, > .remove = byt_remove, > @@ -972,15 +970,99 @@ const struct snd_sof_dsp_ops sof_cht_ops = { > > .arch_ops = &sof_xtensa_arch_ops, > }; > -EXPORT_SYMBOL_NS(sof_cht_ops, SND_SOC_SOF_BAYTRAIL); > > -const struct sof_intel_dsp_desc cht_chip_info = { > +static const struct sof_intel_dsp_desc cht_chip_info = { > .cores_num = 1, > .host_managed_cores_mask = 1, > }; > -EXPORT_SYMBOL_NS(cht_chip_info, SND_SOC_SOF_BAYTRAIL); > > -#endif /* CONFIG_SND_SOC_SOF_BAYTRAIL */ > +/* BYTCR uses different IRQ index */ > +static const struct sof_dev_desc sof_acpi_baytrailcr_desc = { > + .machines = snd_soc_acpi_intel_baytrail_machines, > + .resindex_lpe_base = 0, > + .resindex_pcicfg_base = 1, > + .resindex_imr_base = 2, > + .irqindex_host_ipc = 0, > + .chip_info = &byt_chip_info, > + .default_fw_path = "intel/sof", > + .default_tplg_path = "intel/sof-tplg", > + .default_fw_filename = "sof-byt.ri", > + .nocodec_tplg_filename = "sof-byt-nocodec.tplg", > + .ops = &sof_byt_ops, > +}; > + > +static const struct sof_dev_desc sof_acpi_baytrail_desc = { > + .machines = snd_soc_acpi_intel_baytrail_machines, > + .resindex_lpe_base = 0, > + .resindex_pcicfg_base = 1, > + .resindex_imr_base = 2, > + .irqindex_host_ipc = 5, > + .chip_info = &byt_chip_info, > + .default_fw_path = "intel/sof", > + .default_tplg_path = "intel/sof-tplg", > + .default_fw_filename = "sof-byt.ri", > + .nocodec_tplg_filename = "sof-byt-nocodec.tplg", > + .ops = &sof_byt_ops, > +}; > + > +static const struct sof_dev_desc sof_acpi_cherrytrail_desc = { > + .machines = snd_soc_acpi_intel_cherrytrail_machines, > + .resindex_lpe_base = 0, > + .resindex_pcicfg_base = 1, > + .resindex_imr_base = 2, > + .irqindex_host_ipc = 5, > + .chip_info = &cht_chip_info, > + .default_fw_path = "intel/sof", > + .default_tplg_path = "intel/sof-tplg", > + .default_fw_filename = "sof-cht.ri", > + .nocodec_tplg_filename = "sof-cht-nocodec.tplg", > + .ops = &sof_cht_ops, > +}; > + > +static const struct acpi_device_id sof_baytrail_match[] = { > + { "80860F28", (unsigned long)&sof_acpi_baytrail_desc }, > + { "808622A8", (unsigned long)&sof_acpi_cherrytrail_desc }, > + { } > +}; > +MODULE_DEVICE_TABLE(acpi, sof_baytrail_match); > + > +static int sof_baytrail_probe(struct platform_device *pdev) > +{ > + const struct sof_dev_desc *desc = device_get_match_data(&pdev->dev); > + const struct acpi_device_id *id; > + > + id = acpi_match_device(dev->driver->acpi_match_table, dev); > + if (!id) > + return -ENODEV; > + > + ret = snd_intel_acpi_dsp_driver_probe(dev, id->id); > + if (ret != SND_INTEL_DSP_DRIVER_SOF) { > + dev_dbg(dev, "SOF ACPI driver not selected, aborting probe\n"); > + return -ENODEV; > + } > + > + dev_dbg(dev, "ACPI DSP detected"); > + > + if (!desc) > + return -ENODEV; > + > + if (desc == &sof_acpi_baytrail_desc && soc_intel_is_byt_cr(pdev)) > + desc = &sof_acpi_baytrailcr_desc; > + > + return sof_acpi_probe(pdev, desc); > +} > + > +/* acpi_driver definition */ > +static struct platform_driver snd_sof_baytrail_driver = { > + .probe = sof_baytrail_probe, > + .remove = sof_acpi_remove, > + .driver = { > + .name = "sof-audio-baytrail", > + .pm = &sof_acpi_pm, > + .acpi_match_table = sof_baytrail_match, > + }, > +}; > +module_platform_driver(snd_sof_baytrail_driver); > > MODULE_LICENSE("Dual BSD/GPL"); > MODULE_IMPORT_NS(SND_SOC_SOF_INTEL_HIFI_EP_IPC); > diff --git a/sound/soc/sof/intel/shim.h b/sound/soc/sof/intel/shim.h > index 1e0afb5c8720..872116ee622b 100644 > --- a/sound/soc/sof/intel/shim.h > +++ b/sound/soc/sof/intel/shim.h > @@ -166,14 +166,12 @@ struct sof_intel_dsp_desc { > int ssp_base_offset; /* base address of the SSPs */ > }; > > +extern const struct dev_pm_ops sof_acpi_pm; > +extern int sof_acpi_probe(struct platform_device *pdev, const struct sof_dev_desc *desc); > +extern int sof_acpi_remove(struct platform_device *pdev); > + > extern const struct snd_sof_dsp_ops sof_tng_ops; > -extern const struct snd_sof_dsp_ops sof_byt_ops; > -extern const struct snd_sof_dsp_ops sof_cht_ops; > -extern const struct snd_sof_dsp_ops sof_bdw_ops; > > -extern const struct sof_intel_dsp_desc byt_chip_info; > -extern const struct sof_intel_dsp_desc cht_chip_info; > -extern const struct sof_intel_dsp_desc bdw_chip_info; > extern const struct sof_intel_dsp_desc tng_chip_info; > > struct sof_intel_stream { > diff --git a/sound/soc/sof/sof-acpi-dev.c b/sound/soc/sof/sof-acpi-dev.c > index 2a369c2c6551..32654e042ec4 100644 > --- a/sound/soc/sof/sof-acpi-dev.c > +++ b/sound/soc/sof/sof-acpi-dev.c > @@ -36,70 +36,7 @@ MODULE_PARM_DESC(sof_acpi_debug, "SOF ACPI debug options (0x0 all off)"); > > #define SOF_ACPI_DISABLE_PM_RUNTIME BIT(0) > > -#if IS_ENABLED(CONFIG_ACPI) && IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL) > -static const struct sof_dev_desc sof_acpi_broadwell_desc = { > - .machines = snd_soc_acpi_intel_broadwell_machines, > - .resindex_lpe_base = 0, > - .resindex_pcicfg_base = 1, > - .resindex_imr_base = -1, > - .irqindex_host_ipc = 0, > - .chip_info = &bdw_chip_info, > - .default_fw_path = "intel/sof", > - .default_tplg_path = "intel/sof-tplg", > - .default_fw_filename = "sof-bdw.ri", > - .nocodec_tplg_filename = "sof-bdw-nocodec.tplg", > - .ops = &sof_bdw_ops, > -}; > -#endif > - > -#if IS_ENABLED(CONFIG_ACPI) && IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL) > - > -/* BYTCR uses different IRQ index */ > -static const struct sof_dev_desc sof_acpi_baytrailcr_desc = { > - .machines = snd_soc_acpi_intel_baytrail_machines, > - .resindex_lpe_base = 0, > - .resindex_pcicfg_base = 1, > - .resindex_imr_base = 2, > - .irqindex_host_ipc = 0, > - .chip_info = &byt_chip_info, > - .default_fw_path = "intel/sof", > - .default_tplg_path = "intel/sof-tplg", > - .default_fw_filename = "sof-byt.ri", > - .nocodec_tplg_filename = "sof-byt-nocodec.tplg", > - .ops = &sof_byt_ops, > -}; > - > -static const struct sof_dev_desc sof_acpi_baytrail_desc = { > - .machines = snd_soc_acpi_intel_baytrail_machines, > - .resindex_lpe_base = 0, > - .resindex_pcicfg_base = 1, > - .resindex_imr_base = 2, > - .irqindex_host_ipc = 5, > - .chip_info = &byt_chip_info, > - .default_fw_path = "intel/sof", > - .default_tplg_path = "intel/sof-tplg", > - .default_fw_filename = "sof-byt.ri", > - .nocodec_tplg_filename = "sof-byt-nocodec.tplg", > - .ops = &sof_byt_ops, > -}; > - > -static const struct sof_dev_desc sof_acpi_cherrytrail_desc = { > - .machines = snd_soc_acpi_intel_cherrytrail_machines, > - .resindex_lpe_base = 0, > - .resindex_pcicfg_base = 1, > - .resindex_imr_base = 2, > - .irqindex_host_ipc = 5, > - .chip_info = &cht_chip_info, > - .default_fw_path = "intel/sof", > - .default_tplg_path = "intel/sof-tplg", > - .default_fw_filename = "sof-cht.ri", > - .nocodec_tplg_filename = "sof-cht-nocodec.tplg", > - .ops = &sof_cht_ops, > -}; > - > -#endif > - > -static const struct dev_pm_ops sof_acpi_pm = { > +const struct dev_pm_ops sof_acpi_pm = { > SET_SYSTEM_SLEEP_PM_OPS(snd_sof_suspend, snd_sof_resume) > SET_RUNTIME_PM_OPS(snd_sof_runtime_suspend, snd_sof_runtime_resume, > snd_sof_runtime_idle) > @@ -118,40 +55,17 @@ static void sof_acpi_probe_complete(struct device *dev) > pm_runtime_enable(dev); > } > > -static int sof_acpi_probe(struct platform_device *pdev) > +int sof_acpi_probe(struct platform_device *pdev, const struct sof_dev_desc *desc) > { > struct device *dev = &pdev->dev; > - const struct acpi_device_id *id; > - const struct sof_dev_desc *desc; > struct snd_sof_pdata *sof_pdata; > const struct snd_sof_dsp_ops *ops; > int ret; > > - id = acpi_match_device(dev->driver->acpi_match_table, dev); > - if (!id) > - return -ENODEV; > - > - ret = snd_intel_acpi_dsp_driver_probe(dev, id->id); > - if (ret != SND_INTEL_DSP_DRIVER_ANY && ret != SND_INTEL_DSP_DRIVER_SOF) { > - dev_dbg(dev, "SOF ACPI driver not selected, aborting probe\n"); > - return -ENODEV; > - } > - > - dev_dbg(dev, "ACPI DSP detected"); > - > sof_pdata = devm_kzalloc(dev, sizeof(*sof_pdata), GFP_KERNEL); > if (!sof_pdata) > return -ENOMEM; > > - desc = device_get_match_data(dev); > - if (!desc) > - return -ENODEV; > - > -#if IS_ENABLED(CONFIG_ACPI) && IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL) > - if (desc == &sof_acpi_baytrail_desc && soc_intel_is_byt_cr(pdev)) > - desc = &sof_acpi_baytrailcr_desc; > -#endif > - > /* get ops for platform */ > ops = desc->ops; > if (!ops) { > @@ -193,8 +107,9 @@ static int sof_acpi_probe(struct platform_device *pdev) > > return ret; > } > +EXPORT_SYMBOL_GPL(sof_acpi_probe); > > -static int sof_acpi_remove(struct platform_device *pdev) > +int sof_acpi_remove(struct platform_device *pdev) > { > if (!(sof_acpi_debug & SOF_ACPI_DISABLE_PM_RUNTIME)) > pm_runtime_disable(&pdev->dev); > @@ -204,33 +119,6 @@ static int sof_acpi_remove(struct platform_device *pdev) > > return 0; > } > - > -#ifdef CONFIG_ACPI > -static const struct acpi_device_id sof_acpi_match[] = { > -#if IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL) > - { "INT3438", (unsigned long)&sof_acpi_broadwell_desc }, > -#endif > -#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL) > - { "80860F28", (unsigned long)&sof_acpi_baytrail_desc }, > - { "808622A8", (unsigned long)&sof_acpi_cherrytrail_desc }, > -#endif > - { } > -}; > -MODULE_DEVICE_TABLE(acpi, sof_acpi_match); > -#endif > - > -/* acpi_driver definition */ > -static struct platform_driver snd_sof_acpi_driver = { > - .probe = sof_acpi_probe, > - .remove = sof_acpi_remove, > - .driver = { > - .name = "sof-audio-acpi", > - .pm = &sof_acpi_pm, > - .acpi_match_table = ACPI_PTR(sof_acpi_match), > - }, > -}; > -module_platform_driver(snd_sof_acpi_driver); > +EXPORT_SYMBOL_GPL(sof_acpi_remove); > > MODULE_LICENSE("Dual BSD/GPL"); > -MODULE_IMPORT_NS(SND_SOC_SOF_BAYTRAIL); > -MODULE_IMPORT_NS(SND_SOC_SOF_BROADWELL); >

3 3

[Sound-open-firmware] SoF support for 8086:9d71?
by Kai-Heng Feng 12 Jan '21

12 Jan '21

Hi, On more recent kernels legacy HDA stops working for device 8086:9d71: [ 47.211381] snd_hda_intel 0000:00:1f.3: DSP detected with PCI class/subclass/prog-if info 0x040100 [ 47.211383] snd_hda_intel 0000:00:1f.3: Digital mics found on Skylake+ platform, using SST driver However, only legacy HDA supports it: 00:1f.3 Multimedia audio controller [0401]: Intel Corporation Sunrise Point-LP HD Audio [8086:9d71] (rev 21) .. Kernel modules: snd_hda_intel Ubuntu kernel doesn't select SND_SOC_INTEL_SKYLAKE, which builds snd-soc-skl, because based on the Kconfig description SOF should support it. I wonder if SND_SOC_INTEL_SKYLAKE should be select again? BugLink: <https://bugs.launchpad.net/bugs/1902457>

3 9

[Sound-open-firmware] [PATCH v3 4/4] ASoC: SOF: Intel: hda: Avoid checking jack on system suspend
by Kai-Heng Feng 12 Jan '21

12 Jan '21

When runtime resume is for system suspend, hda_codec_jack_check() schedules jackpoll_work which uses snd_hdac_is_power_on() to check whether codec is suspended. If we were to use snd_hdac_is_power_on() in system PM path, pm_runtime_status_suspended() should be used instead of pm_runtime_suspended(), otherwise pm_runtime_{enable,disable}() changes the result of snd_hdac_is_power_on(). Because devices suspend in reverse order (i.e. child first), it doesn't make much sense to resume already suspended codec from audio controller. So instead of using pm_runtime_status_suspended(), the better approach here is to make sure jackpoll isn't used in system PM process. Fixes: 215a22ed31a1 ("ALSA: hda: Refactor codec PM to use direct-complete optimization") --- v3: Clarify the root cause and why it's needed. v2: No change. sound/soc/sof/intel/hda-dsp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/sof/intel/hda-dsp.c b/sound/soc/sof/intel/hda-dsp.c index 7d00107cf3b2..1c5e05b88a90 100644 --- a/sound/soc/sof/intel/hda-dsp.c +++ b/sound/soc/sof/intel/hda-dsp.c @@ -685,7 +685,8 @@ static int hda_resume(struct snd_sof_dev *sdev, bool runtime_resume) /* check jack status */ if (runtime_resume) { hda_codec_jack_wake_enable(sdev, false); - hda_codec_jack_check(sdev); + if (sdev->system_suspend_target == SOF_SUSPEND_NONE) + hda_codec_jack_check(sdev); } /* turn off the links that were off before suspend */ -- 2.29.2

1 0

[Sound-open-firmware] [PATCH v3 3/4] ASoC: SOF: Intel: hda: Modify existing helper to disable WAKEEN
by Kai-Heng Feng 12 Jan '21

12 Jan '21

Modify hda_codec_jack_wake_enable() to also support disable WAKEEN. In addition, this patch also moves the WAKEEN disablement call out of hda_codec_jack_check() into hda_codec_jack_wake_enable(). This is a preparation for next patch. No functional change intended. --- v3: No change. v2: Mention it moves the disabling part into another function. 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 df59c79cfdfc..b7e9931ead57 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 @@ -96,7 +94,7 @@ void hda_codec_jack_check(struct snd_sof_dev *sdev) pm_request_resume(&codec->core.dev); } #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

1 0

[Sound-open-firmware] [PATCH v3 2/4] ASoC: SOF: Intel: hda: Resume codec to do jack detection
by Kai-Heng Feng 12 Jan '21

12 Jan '21

Instead of queueing jackpoll_work, runtime resume the codec to let it use different jack detection methods based on jackpoll_interval. This partially matches SOF driver's behavior with commit a6e7d0a4bdb0 ("ALSA: hda: fix jack detection with Realtek codecs when in D3"), the difference is SOF unconditionally resumes the codec. --- v3: Remove wrong assumption that only Realtek codec is used by SOF. v2: No change. sound/soc/sof/intel/hda-codec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/sof/intel/hda-codec.c b/sound/soc/sof/intel/hda-codec.c index 6875fa570c2c..df59c79cfdfc 100644 --- a/sound/soc/sof/intel/hda-codec.c +++ b/sound/soc/sof/intel/hda-codec.c @@ -93,8 +93,7 @@ void hda_codec_jack_check(struct snd_sof_dev *sdev) * has been recorded in STATESTS */ if (codec->jacktbl.used) - schedule_delayed_work(&codec->jackpoll_work, - codec->jackpoll_interval); + pm_request_resume(&codec->core.dev); } #else void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev) {} -- 2.29.2

1 0

Re: [Sound-open-firmware] [PATCH] ASoC: SOF: Intel: avoid reverse module dependency
by Kai Vehmanen 07 Jan '21

07 Jan '21

Hi Arnd, On Wed, 6 Jan 2021, Arnd Bergmann wrote: > On Tue, Jan 5, 2021 at 8:07 PM Arnd Bergmann <arnd(a)kernel.org> wrote: > > Change it to use the normal probe order of starting with a specific > > device in a driver, turning the sof-acpi-dev.c driver into a library. > > There were a couple of build failures introduced by this version. I have > one that does build now, and can post that if others think this is the > direction they want to go. thanks for the follow-up. We have many SOF maintainers still out on holidays this week, so let's give some time for people to digest. This is certainly a big change. The version you posted is already sufficient to describe the idea for sure. Br, Kai

1 0

[Sound-open-firmware] [PATCH v2 1/3] ASoC: SOF: Intel: hda: Resume codec to do jack detection
by Kai-Heng Feng 07 Jan '21

07 Jan '21

Instead of queueing jackpoll_work, runtime resume the codec to let it use different jack detection methods based on jackpoll_interval. This matches SOF driver's behavior with commit a6e7d0a4bdb0 ("ALSA: hda: fix jack detection with Realtek codecs when in D3"). Since SOF only uses Realtek codec, we don't need any additional check for the resume. Signed-off-by: Kai-Heng Feng <kai.heng.feng(a)canonical.com> --- v2: No change. sound/soc/sof/intel/hda-codec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/sof/intel/hda-codec.c b/sound/soc/sof/intel/hda-codec.c index 6875fa570c2c..df59c79cfdfc 100644 --- a/sound/soc/sof/intel/hda-codec.c +++ b/sound/soc/sof/intel/hda-codec.c @@ -93,8 +93,7 @@ void hda_codec_jack_check(struct snd_sof_dev *sdev) * has been recorded in STATESTS */ if (codec->jacktbl.used) - schedule_delayed_work(&codec->jackpoll_work, - codec->jackpoll_interval); + pm_request_resume(&codec->core.dev); } #else void hda_codec_jack_wake_enable(struct snd_sof_dev *sdev) {} -- 2.29.2

2 7

Re: [Sound-open-firmware] [PATCH] ALSA: hda: fix SND_INTEL_DSP_CONFIG dependency
by Kai Vehmanen 05 Jan '21

05 Jan '21

Hey, On Tue, 5 Jan 2021, Arnd Bergmann wrote: > On Mon, Jan 4, 2021 at 4:05 PM Takashi Iwai <tiwai(a)suse.de> wrote: > > As I wrote in another post, a part of the problem is that SOF PCI and > > ACPI drivers call snd_intel_dsp_driver_probe() unconditionally, even > > if no Intel driver is bound. > > Makes sense. Is there an existing Kconfig that could be used to > decide whether the drivers use SND_INTEL_DSP_CONFIG or not? no, unfortunately not. This is selected per platform in sound/soc/sof/intel/Kconfig. CONFIG_SND_SOC_SOF_INTEL_PCI is close, but there is at least one platform that does not use SND_INTEL_DSP_CONFIG. > According to sof_pci_ids[], all PCI IDs are Intel specific, but I can't > tell which ones need the DSP config. Indeed currently all the ids are Intel ones (and with exception of old Merrifield, all use DSP config). But that's just how it is now. > Could it be part of the device specific driver_data? This would certainly be a clean way and allow to remove the Intel-specific calls from sof_pci_probe(). As a short-term solution, IS_REACHABLE() seems ok as well. Br, Kai

1 0

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