March 2020 - Alsa-devel - mailman.alsa-project.org

Re: [patch 09/22] cpufreq: Convert to new X86 CPU match macros
by Andy Shevchenko 21 Mar '20

21 Mar '20

On Fri, Mar 20, 2020 at 3:18 PM Thomas Gleixner <tglx(a)linutronix.de> wrote: > > The new macro set has a consistent namespace and uses C99 initializers > instead of the grufty C89 ones. > > Get rid the of most local macro wrappers for consistency. The ones which > make sense for readability are renamed to X86_MATCH*. > > In the centrino driver this also removes the two extra duplicates of family > 6 model 13 which have no value at all. > + X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, 9, X86_FEATURE_EST, NULL), > + X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, 13, X86_FEATURE_EST, NULL), > + X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 15, 3, X86_FEATURE_EST, NULL), > + X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 15, 4, X86_FEATURE_EST, NULL), > + X86_MATCH_VENDOR_FAM_MODEL(INTEL, 6, 0x8, 0), > + X86_MATCH_VENDOR_FAM_MODEL(INTEL, 6, 0xb, 0), > + X86_MATCH_VENDOR_FAM_MODEL(INTEL, 15, 0x2, 0), > + X86_MATCH_VENDOR_FAM_MODEL(INTEL, 6, 0x8, 0), > + X86_MATCH_VENDOR_FAM_MODEL(INTEL, 6, 0xb, 0), > + X86_MATCH_VENDOR_FAM_MODEL(INTEL, 15, 0x2, 0), Perhaps use names instead of 6 and 15? Also, NULL vs. 0? -- With Best Regards, Andy Shevchenko

2 3

Applied "ASoC: soc-core: Merge CPU/Codec DAIs" to the asoc tree
by Mark Brown 20 Mar '20

20 Mar '20

The patch ASoC: soc-core: Merge CPU/Codec DAIs has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 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 >From 22a2fc81658b3eebcfcc110de97bcbd32f5ee301 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Date: Mon, 16 Mar 2020 15:36:58 +0900 Subject: [PATCH] ASoC: soc-core: Merge CPU/Codec DAIs ALSA SoC is currently categorizing CPU/Codec DAIs, and it works well. But modern devices require more complex connections, for example Codec to Codec, etc, and future devices will enable to more complex connections. Because of these background, CPU/Codec DAIs categorizing is no longer good much to modern device. Currently, rtd has both CPU/Codec DAIs pointer. rtd->cpu_dais = [][][][][][][][][] rtd->codec_dais = [][][][][][][][][] This patch merges these into DAIs pointer. rtd->dais = [][][][][][][][][][][][][][][][][][] ^cpu_dais ^codec_dais |--- num_cpus ---|--- num_codecs --| Then, we can merge for_each_rtd_cpu/codec_dais() from this patch. - for_each_rtd_cpu_dais() { - ... - } - for_each_rtd_codec_dais() { - ... - } + for_each_rtd_dais() { + ... + } Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Link: https://lore.kernel.org/r/87wo7kolfa.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie(a)kernel.org> --- include/sound/soc.h | 7 ++++++- sound/soc/soc-core.c | 18 +++++++++--------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index d97c4aa779a2..539211bd0f94 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1145,6 +1145,7 @@ struct snd_soc_pcm_runtime { struct snd_compr *compr; struct snd_soc_dai *codec_dai; struct snd_soc_dai *cpu_dai; + struct snd_soc_dai **dais; struct snd_soc_dai **codec_dais; unsigned int num_codecs; @@ -1184,7 +1185,11 @@ struct snd_soc_pcm_runtime { (i)++) #define for_each_rtd_codec_dais_rollback(rtd, i, dai) \ for (; (--(i) >= 0) && ((dai) = rtd->codec_dais[i]);) - +#define for_each_rtd_dais(rtd, i, dai) \ + for ((i) = 0; \ + ((i) < (rtd)->num_cpus + (rtd)->num_codecs) && \ + ((dai) = (rtd)->dais[i]); \ + (i)++) void snd_soc_close_delayed_work(struct snd_soc_pcm_runtime *rtd); diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index e7e70b47590a..0fd582c19c03 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -475,22 +475,22 @@ static struct snd_soc_pcm_runtime *soc_new_pcm_runtime( INIT_DELAYED_WORK(&rtd->delayed_work, close_delayed_work); /* - * for rtd->codec_dais + * for rtd->dais */ - rtd->codec_dais = devm_kcalloc(dev, dai_link->num_codecs, + rtd->dais = devm_kcalloc(dev, dai_link->num_cpus + dai_link->num_codecs, sizeof(struct snd_soc_dai *), GFP_KERNEL); - if (!rtd->codec_dais) + if (!rtd->dais) goto free_rtd; /* - * for rtd->cpu_dais + * dais = [][][][][][][][][][][][][][][][][][] + * ^cpu_dais ^codec_dais + * |--- num_cpus ---|--- num_codecs --| */ - rtd->cpu_dais = devm_kcalloc(dev, dai_link->num_cpus, - sizeof(struct snd_soc_dai *), - GFP_KERNEL); - if (!rtd->cpu_dais) - goto free_rtd; + rtd->cpu_dais = &rtd->dais[0]; + rtd->codec_dais = &rtd->dais[dai_link->num_cpus]; + /* * rtd remaining settings */ -- 2.20.1

1 0

Applied "ASoC: soc-core: Merge for_each_rtd_cpu/codec_dais()" to the asoc tree
by Mark Brown 20 Mar '20

20 Mar '20

The patch ASoC: soc-core: Merge for_each_rtd_cpu/codec_dais() has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 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 >From 3af6ff5035ad95ee02728aff271a9b543b912f15 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Date: Mon, 16 Mar 2020 15:37:03 +0900 Subject: [PATCH] ASoC: soc-core: Merge for_each_rtd_cpu/codec_dais() Now we can use for_each_rtd_dais(). Let's use it instead of for_each_rtd_cpu/codec_dais(). Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Link: https://lore.kernel.org/r/87v9n4olf4.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/soc-core.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 0fd582c19c03..246d59966795 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1323,26 +1323,22 @@ static int soc_probe_dai(struct snd_soc_dai *dai, int order) static void soc_remove_link_dais(struct snd_soc_card *card) { int i; - struct snd_soc_dai *codec_dai; - struct snd_soc_dai *cpu_dai; + struct snd_soc_dai *dai; struct snd_soc_pcm_runtime *rtd; int order; for_each_comp_order(order) { for_each_card_rtds(card, rtd) { - /* remove the CODEC DAI */ - for_each_rtd_codec_dais(rtd, i, codec_dai) - soc_remove_dai(codec_dai, order); - - for_each_rtd_cpu_dais(rtd, i, cpu_dai) - soc_remove_dai(cpu_dai, order); + /* remove DAIs */ + for_each_rtd_dais(rtd, i, dai) + soc_remove_dai(dai, order); } } } static int soc_probe_link_dais(struct snd_soc_card *card) { - struct snd_soc_dai *codec_dai, *cpu_dai; + struct snd_soc_dai *dai; struct snd_soc_pcm_runtime *rtd; int i, order, ret; @@ -1354,15 +1350,8 @@ static int soc_probe_link_dais(struct snd_soc_card *card) card->name, rtd->num, order); /* probe the CPU DAI */ - for_each_rtd_cpu_dais(rtd, i, cpu_dai) { - ret = soc_probe_dai(cpu_dai, order); - if (ret) - return ret; - } - - /* probe the CODEC DAI */ - for_each_rtd_codec_dais(rtd, i, codec_dai) { - ret = soc_probe_dai(codec_dai, order); + for_each_rtd_dais(rtd, i, dai) { + ret = soc_probe_dai(dai, order); if (ret) return ret; } -- 2.20.1

1 0

Applied "ASoC: soc-dapm: Merge for_each_rtd_cpu/codec_dais()" to the asoc tree
by Mark Brown 20 Mar '20

20 Mar '20

The patch ASoC: soc-dapm: Merge for_each_rtd_cpu/codec_dais() has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 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 >From e3c3cf71013fd959abf455abc20386051d37c529 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Date: Mon, 16 Mar 2020 15:37:09 +0900 Subject: [PATCH] ASoC: soc-dapm: Merge for_each_rtd_cpu/codec_dais() Now we can use for_each_rtd_dais(). Let's use it instead of for_each_rtd_cpu/codec_dais(). Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Link: https://lore.kernel.org/r/87tv2ooley.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/soc-dapm.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index d5eb52fe115b..04da7928c873 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -4433,14 +4433,11 @@ void snd_soc_dapm_connect_dai_link_widgets(struct snd_soc_card *card) static void soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream, int event) { - struct snd_soc_dai *codec_dai; - struct snd_soc_dai *cpu_dai; + struct snd_soc_dai *dai; int i; - for_each_rtd_cpu_dais(rtd, i, cpu_dai) - soc_dapm_dai_stream_event(cpu_dai, stream, event); - for_each_rtd_codec_dais(rtd, i, codec_dai) - soc_dapm_dai_stream_event(codec_dai, stream, event); + for_each_rtd_dais(rtd, i, dai) + soc_dapm_dai_stream_event(dai, stream, event); dapm_power_widgets(rtd->card, event); } -- 2.20.1

1 0

[PATCH v3 0/6] ASoC: Merge CPU/Codec DAIs
by Kuninori Morimoto 20 Mar '20

20 Mar '20

Hi Mark Previous v2 patch-set can't be applied on top of latest for-5.7 branch. This v3 is rebased version on top of it. Current ALSA SoC has CPU/Codec categorized DAIs. But we want to have non-categorized DAIs in the future. This was indicated by Lars-Peter before at ELCE. But, we *can't* do it right now. Because many drivers are considering CPU and Codec separately. Currently, rtd has both CPU/Codec DAIs array. rtd->cpu_dais = [][][][][][][][][] rtd->codec_dais = [][][][][][][][][] This patch merges these, like below. It still can use rtd->cpu_dais, rtd->codec_dais. Of course for_each_rtd_cpu/codec_dais() macro too. So we can use/keep existing code/method same as before. rtd->dais = [][][][][][][][][][][][][][][][][][] ^cpu_dais ^codec_dais |--- num_cpus ---|--- num_codecs --| rtd->cpu_dais = &rtd->dais[0]; rtd->codec_dais = &rtd->dais[dai_link->num_cpus]; There are some code which is doing something *only* for CPU or Codec. This patch-set do nothing to such code. Maybe it can be updated in the future, maybe not (can't). I hope this patch-set can be 1st step for non-categorized DAIs. But the main purpose so far is that replace the duplicate code for borh CPU and Codec. - for_each_rtd_cpu_dais() { - ... - } - for_each_rtd_codec_dais() { - ... - } + for_each_rtd_dais() { + ... + } Kuninori Morimoto (6): ASoC: soc-core: Merge CPU/Codec DAIs ASoC: soc-core: Merge for_each_rtd_cpu/codec_dais() ASoC: soc-dapm: Merge for_each_rtd_cpu/codec_dais() ASoC: soc-pcm: Merge for_each_rtd_cpu/codec_dais() ASoC: soc-core: Merge CPU/Codec for soc_dai_pcm_new() ASoC: soc-pcm: Merge CPU/Codec MSB at soc_pcm_apply_msb() include/sound/soc.h | 7 +- sound/soc/soc-core.c | 66 ++++----- sound/soc/soc-dapm.c | 9 +- sound/soc/soc-pcm.c | 337 +++++++++++-------------------------------- 4 files changed, 116 insertions(+), 303 deletions(-) -- 2.17.1

5 13

Applied "ASoC: soc-core: Merge CPU/Codec for soc_dai_pcm_new()" to the asoc tree
by Mark Brown 20 Mar '20

20 Mar '20

The patch ASoC: soc-core: Merge CPU/Codec for soc_dai_pcm_new() has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 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 >From d1eb6d116123b2bcebeefce8bcdc828c80b033b8 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Date: Mon, 16 Mar 2020 15:37:20 +0900 Subject: [PATCH] ASoC: soc-core: Merge CPU/Codec for soc_dai_pcm_new() Now CPU/Codec DAIs are alias for dais. Thus, we can directly use for_each_rtd_dais() macro for soc_dai_pcm_new(). This patch merge CPU/Codec for it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Reviewed-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Link: https://lore.kernel.org/r/87r1xsolen.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie(a)kernel.org> --- sound/soc/soc-core.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 246d59966795..843b8b1c89d4 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1037,20 +1037,20 @@ int snd_soc_add_pcm_runtime(struct snd_soc_card *card, } EXPORT_SYMBOL_GPL(snd_soc_add_pcm_runtime); -static int soc_dai_pcm_new(struct snd_soc_dai **dais, int num_dais, - struct snd_soc_pcm_runtime *rtd) +static int soc_dai_pcm_new(struct snd_soc_pcm_runtime *rtd) { + struct snd_soc_dai *dai; int i, ret = 0; - for (i = 0; i < num_dais; ++i) { - struct snd_soc_dai_driver *drv = dais[i]->driver; + for_each_rtd_dais(rtd, i, dai) { + struct snd_soc_dai_driver *drv = dai->driver; if (drv->pcm_new) - ret = drv->pcm_new(rtd, dais[i]); + ret = drv->pcm_new(rtd, dai); if (ret < 0) { - dev_err(dais[i]->dev, + dev_err(dai->dev, "ASoC: Failed to bind %s with pcm device\n", - dais[i]->name); + dai->name); return ret; } } @@ -1121,13 +1121,8 @@ static int soc_init_pcm_runtime(struct snd_soc_card *card, dai_link->stream_name, ret); return ret; } - ret = soc_dai_pcm_new(rtd->cpu_dais, - rtd->num_cpus, rtd); - if (ret < 0) - return ret; - ret = soc_dai_pcm_new(rtd->codec_dais, - rtd->num_codecs, rtd); - return ret; + + return soc_dai_pcm_new(rtd); } static void soc_set_name_prefix(struct snd_soc_card *card, -- 2.20.1

1 0

Re: [patch 02/22] x86/cpu: Add conistent CPU match macros
by Andy Shevchenko 20 Mar '20

20 Mar '20

On Fri, Mar 20, 2020 at 3:18 PM Thomas Gleixner <tglx(a)linutronix.de> wrote: > > Finding all places which build x86_cpu_id match tables is tedious and the > logic is hidden in lots of differently named macro wrappers. > > Most of these initializer macros use plain C89 initializers which rely on > the ordering of the struct members. So new members could only be added at > the end of the struct, but that's ugly as hell and C99 initializers are > really the right thing to use. > > Provide a set of macros which: > > - Have a proper naming scheme, starting with X86_MATCH_ > > - Use C99 initializers > > The set of provided macros are all subsets of the base macro > > X86_MATCH_VENDOR_FAM_MODEL_FEATURE() > > which allows to supply all possible selection criteria: > > vendor, family, model, feature > > The other macros shorten this to avoid typing all arguments when they are > not needed and would require one of the _ANY constants. They have been > created due to the requirements of the existing usage sites. > > Also a add a few model constants for Centaur CPUs and QUARK. I would perhaps made this as a separate change(s). ... > +#define X86_MATCH_VENDOR_FAM_MODEL_FEATURE(_vendor, _family, _model, \ > + _feature, _data) { \ I would leave it on one line despite the length, but it's up to you. > + .vendor = X86_VENDOR_##_vendor, \ > + .family = _family, \ > + .model = _model, \ > + .feature = _feature, \ > + .driver_data = (unsigned long) _data \ For sake of consistency shouldn't be this kernel_ulong_t ? Or we are going to get rid of that type? > } ... > +#define X86_MATCH_VENDOR_FAM_FEATURE(vendor, family, feature, data) \ > + X86_MATCH_VENDOR_FAM_MODEL_FEATURE(vendor, family, \ > + X86_MODEL_ANY, feature, data) I would leave it on one line despite the length, but it's up to you. ... > +#define X86_MATCH_VENDOR_FAM_MODEL(vendor, family, model, data) \ > + X86_MATCH_VENDOR_FAM_MODEL_FEATURE(vendor, family, model, \ > + X86_FEATURE_ANY, data) Ditto. ... > + * X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, INTEL_FAM6_BROADWELL, > + * X86_FEATURE_ANY, NULL); Perhaps one line? -- With Best Regards, Andy Shevchenko

2 1

Re: [patch 01/22] x86/devicetable: Move x86 specific macro out of generic code
by Andy Shevchenko 20 Mar '20

20 Mar '20

On Fri, Mar 20, 2020 at 3:17 PM Thomas Gleixner <tglx(a)linutronix.de> wrote: > > There is no reason that this gunk is in a generic header file. The wildcard > defines need to stay as they are required by file2alias. > > Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de> > --- > arch/x86/include/asm/cpu_device_id.h | 13 ++++++++++++- > arch/x86/kvm/svm.c | 1 + > arch/x86/kvm/vmx/vmx.c | 1 + > drivers/cpufreq/acpi-cpufreq.c | 1 + > drivers/cpufreq/amd_freq_sensitivity.c | 1 + > include/linux/mod_devicetable.h | 4 +--- > 6 files changed, 17 insertions(+), 4 deletions(-) > > --- a/arch/x86/include/asm/cpu_device_id.h > +++ b/arch/x86/include/asm/cpu_device_id.h > @@ -6,10 +6,21 @@ > * Declare drivers belonging to specific x86 CPUs > * Similar in spirit to pci_device_id and related PCI functions > */ > - Seems you are going to remove below anyway in the next patches, so, why not to do this also there? > #include <linux/mod_devicetable.h> -- With Best Regards, Andy Shevchenko

2 1

sof-broadwell-rt286: use symlinks to reuse existing UCM
by GitHub pull_request - opened 20 Mar '20

20 Mar '20

alsa-project/alsa-ucm-conf pull request #18 was opened from plbossart: There are no firmware-specific settings to it's fine to reuse the legacy file as is. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/18 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/18.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH 00/12] ASoC: SOF DSP virtualisation
by Guennadi Liakhovetski 20 Mar '20

20 Mar '20

This patch series extends the SOF driver to add support for DSP virtualisation to ASoC. It is built on top of VirtIO, contains a guest driver and a vhost in-kernel guest driver. This version supports a single playback and a single capture interface on the guest. The specific guest audio topology is supplied by the host from a file, specified on the QEMU command line. This solution is designed to use advanced DSP functionality, available on the host. In case no DSP is available on the host, a fall-back should be provided in the future to the pure audio virtualisation standard, currently developed by OASIS. Extensive documentation is available at [1]. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski at linux.intel.com> v2: one patch merged, one patch resubmitted separately, otherwise no changes. [1] https://thesofproject.github.io/latest/developer_guides/virtualization/virt… Guennadi Liakhovetski (12): ASoC: add function parameters to enable forced path pruning ASoC: SOF: extract firmware-related operation into a function ASoC: SOF: VirtIO: make a function global vhost: convert VHOST_VSOCK_SET_RUNNING to a generic ioctl ASoC: SOF: support IPC with immediate response ASoC: SOF: add a power status IPC ASoC: SOF: add two helper lookup functions ASoC: SOF: add a VirtIO DSP driver ASoC: SOF: add a vhost driver: sound part vhost: add an SOF DSP driver ASoC: SOF: VirtIO: free guest pipelines upon termination ASoC: SOF: VirtIO: enable simultaneous playback and capture drivers/vhost/Kconfig | 7 + drivers/vhost/Makefile | 5 + drivers/vhost/dsp.c | 731 ++++++++++++++++++++++ include/sound/soc-dpcm.h | 28 +- include/sound/soc-topology.h | 3 + include/sound/sof.h | 4 + include/sound/sof/header.h | 3 + include/sound/sof/topology.h | 1 + include/sound/sof/virtio.h | 206 +++++++ include/uapi/linux/vhost.h | 9 +- include/uapi/linux/vhost_types.h | 7 + include/uapi/linux/virtio_ids.h | 1 + sound/soc/soc-compress.c | 2 +- sound/soc/soc-dapm.c | 8 +- sound/soc/soc-pcm.c | 98 ++- sound/soc/sof/Kconfig | 8 + sound/soc/sof/Makefile | 8 + sound/soc/sof/core.c | 114 ++-- sound/soc/sof/ipc.c | 39 +- sound/soc/sof/loader.c | 4 + sound/soc/sof/ops.h | 10 +- sound/soc/sof/pcm.c | 15 +- sound/soc/sof/pm.c | 4 + sound/soc/sof/sof-audio.c | 33 + sound/soc/sof/sof-audio.h | 21 + sound/soc/sof/sof-priv.h | 54 ++ sound/soc/sof/topology.c | 71 ++- sound/soc/sof/vhost-be.c | 1248 ++++++++++++++++++++++++++++++++++++++ sound/soc/sof/virtio-fe.c | 922 ++++++++++++++++++++++++++++ 29 files changed, 3555 insertions(+), 109 deletions(-) create mode 100644 drivers/vhost/dsp.c create mode 100644 include/sound/sof/virtio.h create mode 100644 sound/soc/sof/vhost-be.c create mode 100644 sound/soc/sof/virtio-fe.c -- 1.9.3

1 12

Re: [patch 00/22] x86/treewide: Consolidate CPU match macro maze and get rid of C89 (sic!) initializers
by Greg Kroah-Hartman 20 Mar '20

20 Mar '20

On Fri, Mar 20, 2020 at 02:13:45PM +0100, Thomas Gleixner wrote: > The x86 CPU matching based on struct x86_cpu_id: > > - is using an inconsistent macro mess with pointlessly duplicated and > slightly different local macros. Finding the places is an art as there > is no consistent name space at all. > > - is still mostly based on C89 struct initializers which rely on the > ordering of the struct members. That's proliferated forever as every > new driver just copies the mess from some exising one. > > A recent offlist conversation about adding more match criteria to the CPU > matching logic instead of creating yet another set of horrors, reminded me > of a pile of scripts and patches which I hacked on a few years ago when I > tried to add something to struct x86_cpu_id. > > That stuff was finally not needed and ended up in my ever growing todo list > and collected dust and cobwebs, but (un)surprisingly enough most of it > still worked out of the box. The copy & paste machinery still works as it > did years ago. > > There are a few places which needed extra care due to new creative macros, > new check combinations etc. and surprisingly ONE open coded proper C99 > initializer. > > It was reasonably simple to make it at least compile and pass a quick > binary equivalence check. > > The result is a X86_MATCH prefix based set of macros which are reflecting > the needs of the usage sites and shorten the base macro which takes all > possible parameters (vendor, family, model, feature, data) and uses proper > C99 initializers. > > So extensions of the match logic are trivial after that. > > The patch set is against Linus tree and has trivial conflicts against > linux-next. > > The diffstat is: > 71 files changed, 525 insertions(+), 472 deletions(-) > > but the extra lines are pretty much kernel-doc documentation which I added > to each of the new macros. The usage sites diffstat is: > > 70 files changed, 393 insertions(+), 471 deletions(-) > > Thoughts? Much nicer looking, thanks for cleaning up this mess: Reviewed-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>

1 0

Re: [patch 19/22] ASoC: Intel: Convert to new X86 CPU match macros
by Andy Shevchenko 20 Mar '20

20 Mar '20

On Fri, Mar 20, 2020 at 3:18 PM Thomas Gleixner <tglx(a)linutronix.de> wrote: > > The new macro set has a consistent namespace and uses C99 initializers > instead of the grufty C89 ones. > > Get rid the of the local macro wrappers for consistency. > -#define ICPU(model) { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, } > - > #define SOC_INTEL_IS_CPU(soc, type) \ > static inline bool soc_intel_is_##soc(void) \ > { \ > static const struct x86_cpu_id soc##_cpu_ids[] = { \ > - ICPU(type), \ > + X86_MATCH_INTEL_FAM6_MODEL(type, NULL), \ > {} \ > }; \ > const struct x86_cpu_id *id; \ > @@ -32,11 +30,11 @@ static inline bool soc_intel_is_##soc(vo > return false; \ > } > > +SOC_INTEL_IS_CPU(byt, ATOM_SILVERMONT); > +SOC_INTEL_IS_CPU(cht, ATOM_AIRMONT); > +SOC_INTEL_IS_CPU(apl, ATOM_GOLDMONT); > +SOC_INTEL_IS_CPU(glk, ATOM_GOLDMONT_PLUS); > +SOC_INTEL_IS_CPU(cml, KABYLAKE_L); I'm wondering if driver data can be used in one macro to distinguish which CPU we are run on. Takashi, what do you think? -- With Best Regards, Andy Shevchenko

1 0

Re: [patch 11/22] platform/x86: Convert to new CPU match macros
by Andy Shevchenko 20 Mar '20

20 Mar '20

On Fri, Mar 20, 2020 at 3:18 PM Thomas Gleixner <tglx(a)linutronix.de> wrote: > > The new macro set has a consistent namespace and uses C99 initializers > instead of the grufty C89 ones. > > Get rid the of the local macro wrappers for consistency. > Reviewed-by: Andy Shevchenko <andy.shevchenko(a)gmail.com> > Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de> > Cc: Darren Hart <dvhart(a)infradead.org> > Cc: Andy Shevchenko <andy(a)infradead.org> > Cc: platform-driver-x86(a)vger.kernel.org > --- > drivers/platform/x86/intel-uncore-frequency.c | 14 ++--- > drivers/platform/x86/intel_int0002_vgpio.c | 4 - > drivers/platform/x86/intel_mid_powerbtn.c | 4 - > drivers/platform/x86/intel_pmc_core.c | 24 +++++----- > drivers/platform/x86/intel_pmc_core_pltdrv.c | 16 +++--- > drivers/platform/x86/intel_speed_select_if/isst_if_mbox_msr.c | 4 - > drivers/platform/x86/intel_telemetry_debugfs.c | 5 -- > drivers/platform/x86/intel_telemetry_pltdrv.c | 7 -- > drivers/platform/x86/intel_turbo_max_3.c | 6 -- > 9 files changed, 37 insertions(+), 47 deletions(-) > > --- a/drivers/platform/x86/intel-uncore-frequency.c > +++ b/drivers/platform/x86/intel-uncore-frequency.c > @@ -358,15 +358,13 @@ static struct notifier_block uncore_pm_n > .notifier_call = uncore_pm_notify, > }; > > -#define ICPU(model) { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, } > - > static const struct x86_cpu_id intel_uncore_cpu_ids[] = { > - ICPU(INTEL_FAM6_BROADWELL_G), > - ICPU(INTEL_FAM6_BROADWELL_X), > - ICPU(INTEL_FAM6_BROADWELL_D), > - ICPU(INTEL_FAM6_SKYLAKE_X), > - ICPU(INTEL_FAM6_ICELAKE_X), > - ICPU(INTEL_FAM6_ICELAKE_D), > + X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_G, NULL), > + X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X, NULL), > + X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_D, NULL), > + X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X, NULL), > + X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X, NULL), > + X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D, NULL), > {} > }; > > --- a/drivers/platform/x86/intel_int0002_vgpio.c > +++ b/drivers/platform/x86/intel_int0002_vgpio.c > @@ -148,8 +148,8 @@ static struct irq_chip int0002_cht_irqch > }; > > static const struct x86_cpu_id int0002_cpu_ids[] = { > - INTEL_CPU_FAM6(ATOM_SILVERMONT, int0002_byt_irqchip), /* Valleyview, Bay Trail */ > - INTEL_CPU_FAM6(ATOM_AIRMONT, int0002_cht_irqchip), /* Braswell, Cherry Trail */ > + X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT, &int0002_byt_irqchip), > + X86_MATCH_INTEL_FAM6_MODEL(ATOM_AIRMONT, &int0002_cht_irqchip), > {} > }; > > --- a/drivers/platform/x86/intel_mid_powerbtn.c > +++ b/drivers/platform/x86/intel_mid_powerbtn.c > @@ -113,8 +113,8 @@ static const struct mid_pb_ddata mrfld_d > }; > > static const struct x86_cpu_id mid_pb_cpu_ids[] = { > - INTEL_CPU_FAM6(ATOM_SALTWELL_MID, mfld_ddata), > - INTEL_CPU_FAM6(ATOM_SILVERMONT_MID, mrfld_ddata), > + X86_MATCH_INTEL_FAM6_MODEL(ATOM_SALTWELL_MID, &mfld_ddata), > + X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_MID, &mrfld_ddata), > {} > }; > > --- a/drivers/platform/x86/intel_pmc_core.c > +++ b/drivers/platform/x86/intel_pmc_core.c > @@ -871,18 +871,18 @@ static inline void pmc_core_dbgfs_unregi > #endif /* CONFIG_DEBUG_FS */ > > static const struct x86_cpu_id intel_pmc_core_ids[] = { > - INTEL_CPU_FAM6(SKYLAKE_L, spt_reg_map), > - INTEL_CPU_FAM6(SKYLAKE, spt_reg_map), > - INTEL_CPU_FAM6(KABYLAKE_L, spt_reg_map), > - INTEL_CPU_FAM6(KABYLAKE, spt_reg_map), > - INTEL_CPU_FAM6(CANNONLAKE_L, cnp_reg_map), > - INTEL_CPU_FAM6(ICELAKE_L, icl_reg_map), > - INTEL_CPU_FAM6(ICELAKE_NNPI, icl_reg_map), > - INTEL_CPU_FAM6(COMETLAKE, cnp_reg_map), > - INTEL_CPU_FAM6(COMETLAKE_L, cnp_reg_map), > - INTEL_CPU_FAM6(TIGERLAKE_L, tgl_reg_map), > - INTEL_CPU_FAM6(TIGERLAKE, tgl_reg_map), > - INTEL_CPU_FAM6(ATOM_TREMONT, tgl_reg_map), > + X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L, &spt_reg_map), > + X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE, &spt_reg_map), > + X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L, &spt_reg_map), > + X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE, &spt_reg_map), > + X86_MATCH_INTEL_FAM6_MODEL(CANNONLAKE_L, &cnp_reg_map), > + X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L, &icl_reg_map), > + X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_NNPI, &icl_reg_map), > + X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, &cnp_reg_map), > + X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L, &cnp_reg_map), > + X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L, &tgl_reg_map), > + X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE, &tgl_reg_map), > + X86_MATCH_INTEL_FAM6_MODEL(ATOM_TREMONT, &tgl_reg_map), > {} > }; > > --- a/drivers/platform/x86/intel_pmc_core_pltdrv.c > +++ b/drivers/platform/x86/intel_pmc_core_pltdrv.c > @@ -38,14 +38,14 @@ static struct platform_device pmc_core_d > * other list may grow, but this list should not. > */ > static const struct x86_cpu_id intel_pmc_core_platform_ids[] = { > - INTEL_CPU_FAM6(SKYLAKE_L, pmc_core_device), > - INTEL_CPU_FAM6(SKYLAKE, pmc_core_device), > - INTEL_CPU_FAM6(KABYLAKE_L, pmc_core_device), > - INTEL_CPU_FAM6(KABYLAKE, pmc_core_device), > - INTEL_CPU_FAM6(CANNONLAKE_L, pmc_core_device), > - INTEL_CPU_FAM6(ICELAKE_L, pmc_core_device), > - INTEL_CPU_FAM6(COMETLAKE, pmc_core_device), > - INTEL_CPU_FAM6(COMETLAKE_L, pmc_core_device), > + X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L, &pmc_core_device), > + X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE, &pmc_core_device), > + X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L, &pmc_core_device), > + X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE, &pmc_core_device), > + X86_MATCH_INTEL_FAM6_MODEL(CANNONLAKE_L, &pmc_core_device), > + X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L, &pmc_core_device), > + X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, &pmc_core_device), > + X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE_L, &pmc_core_device), > {} > }; > MODULE_DEVICE_TABLE(x86cpu, intel_pmc_core_platform_ids); > --- a/drivers/platform/x86/intel_speed_select_if/isst_if_mbox_msr.c > +++ b/drivers/platform/x86/intel_speed_select_if/isst_if_mbox_msr.c > @@ -160,10 +160,8 @@ static struct notifier_block isst_pm_nb > .notifier_call = isst_pm_notify, > }; > > -#define ICPU(model) { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, } > - > static const struct x86_cpu_id isst_if_cpu_ids[] = { > - ICPU(INTEL_FAM6_SKYLAKE_X), > + X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X, NULL), > {} > }; > MODULE_DEVICE_TABLE(x86cpu, isst_if_cpu_ids); > --- a/drivers/platform/x86/intel_telemetry_debugfs.c > +++ b/drivers/platform/x86/intel_telemetry_debugfs.c > @@ -308,11 +308,10 @@ static struct telemetry_debugfs_conf tel > }; > > static const struct x86_cpu_id telemetry_debugfs_cpu_ids[] = { > - INTEL_CPU_FAM6(ATOM_GOLDMONT, telem_apl_debugfs_conf), > - INTEL_CPU_FAM6(ATOM_GOLDMONT_PLUS, telem_apl_debugfs_conf), > + X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT, &telem_apl_debugfs_conf), > + X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_PLUS, &telem_apl_debugfs_conf), > {} > }; > - > MODULE_DEVICE_TABLE(x86cpu, telemetry_debugfs_cpu_ids); > > static int telemetry_debugfs_check_evts(void) > --- a/drivers/platform/x86/intel_telemetry_pltdrv.c > +++ b/drivers/platform/x86/intel_telemetry_pltdrv.c > @@ -67,9 +67,6 @@ > #define TELEM_CLEAR_VERBOSITY_BITS(x) ((x) &= ~(BIT(27) | BIT(28))) > #define TELEM_SET_VERBOSITY_BITS(x, y) ((x) |= ((y) << 27)) > > -#define TELEM_CPU(model, data) \ > - { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (unsigned long)&data } > - > enum telemetry_action { > TELEM_UPDATE = 0, > TELEM_ADD, > @@ -183,8 +180,8 @@ static struct telemetry_plt_config telem > }; > > static const struct x86_cpu_id telemetry_cpu_ids[] = { > - TELEM_CPU(INTEL_FAM6_ATOM_GOLDMONT, telem_apl_config), > - TELEM_CPU(INTEL_FAM6_ATOM_GOLDMONT_PLUS, telem_glk_config), > + X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT, &telem_apl_config), > + X86_MATCH_INTEL_FAM6_MODEL(ATOM_GOLDMONT_PLUS, &telem_glk_config), > {} > }; > > --- a/drivers/platform/x86/intel_turbo_max_3.c > +++ b/drivers/platform/x86/intel_turbo_max_3.c > @@ -113,11 +113,9 @@ static int itmt_legacy_cpu_online(unsign > return 0; > } > > -#define ICPU(model) { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, } > - > static const struct x86_cpu_id itmt_legacy_cpu_ids[] = { > - ICPU(INTEL_FAM6_BROADWELL_X), > - ICPU(INTEL_FAM6_SKYLAKE_X), > + X86_MATCH_INTEL_FAM6_MODEL(BROADWELL_X, NULL), > + X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_X, NULL), > {} > }; > > -- With Best Regards, Andy Shevchenko

1 0

Re: [patch 00/22] x86/treewide: Consolidate CPU match macro maze and get rid of C89 (sic!) initializers
by Andy Shevchenko 20 Mar '20

20 Mar '20

On Fri, Mar 20, 2020 at 3:19 PM Thomas Gleixner <tglx(a)linutronix.de> wrote: > > The x86 CPU matching based on struct x86_cpu_id: > > - is using an inconsistent macro mess with pointlessly duplicated and > slightly different local macros. Finding the places is an art as there > is no consistent name space at all. > > - is still mostly based on C89 struct initializers which rely on the > ordering of the struct members. That's proliferated forever as every > new driver just copies the mess from some exising one. > > A recent offlist conversation about adding more match criteria to the CPU > matching logic instead of creating yet another set of horrors, reminded me > of a pile of scripts and patches which I hacked on a few years ago when I > tried to add something to struct x86_cpu_id. > > That stuff was finally not needed and ended up in my ever growing todo list > and collected dust and cobwebs, but (un)surprisingly enough most of it > still worked out of the box. The copy & paste machinery still works as it > did years ago. > > There are a few places which needed extra care due to new creative macros, > new check combinations etc. and surprisingly ONE open coded proper C99 > initializer. > > It was reasonably simple to make it at least compile and pass a quick > binary equivalence check. > > The result is a X86_MATCH prefix based set of macros which are reflecting > the needs of the usage sites and shorten the base macro which takes all > possible parameters (vendor, family, model, feature, data) and uses proper > C99 initializers. > > So extensions of the match logic are trivial after that. > Thank you, Thomas! Briefly looking to the code, I like the idea. I'll do (minor) comments on individual patches. I see it incorporates my previous attempts to extend this, but now it looks better. > The patch set is against Linus tree and has trivial conflicts against > linux-next. > > The diffstat is: > 71 files changed, 525 insertions(+), 472 deletions(-) > > but the extra lines are pretty much kernel-doc documentation which I added > to each of the new macros. The usage sites diffstat is: > > 70 files changed, 393 insertions(+), 471 deletions(-) > > Thoughts? > > Thanks, > > tglx > > -- With Best Regards, Andy Shevchenko

1 0

Re: [patch 17/22] PCI: intel-mid: Convert to new X86 CPU match macros
by Bjorn Helgaas 20 Mar '20

20 Mar '20

On Fri, Mar 20, 2020 at 02:14:02PM +0100, Thomas Gleixner wrote: > The new macro set has a consistent namespace and uses C99 initializers > instead of the grufty C89 ones. > > Get rid the of the local macro wrappers for consistency. > > Signed-off-by: Thomas Gleixner <tglx(a)linutronix.de> > Cc: Bjorn Helgaas <bhelgaas(a)google.com> > Cc: linux-pci(a)vger.kernel.org Acked-by: Bjorn Helgaas <bhelgaas(a)google.com> > --- > drivers/pci/pci-mid.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > --- a/drivers/pci/pci-mid.c > +++ b/drivers/pci/pci-mid.c > @@ -55,15 +55,13 @@ static const struct pci_platform_pm_ops > .need_resume = mid_pci_need_resume, > }; > > -#define ICPU(model) { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, } > - > /* > * This table should be in sync with the one in > * arch/x86/platform/intel-mid/pwr.c. > */ > static const struct x86_cpu_id lpss_cpu_ids[] = { > - ICPU(INTEL_FAM6_ATOM_SALTWELL_MID), > - ICPU(INTEL_FAM6_ATOM_SILVERMONT_MID), > + X86_MATCH_INTEL_FAM6_MODEL(ATOM_SALTWELL_MID, NULL), > + X86_MATCH_INTEL_FAM6_MODEL(ATOM_SILVERMONT_MID, NULL), > {} > }; > >

1 0

Re: [patch 02/22] x86/cpu: Add conistent CPU match macros
by Bjorn Helgaas 20 Mar '20

20 Mar '20

s/conistent/consistent/ in subject On Fri, Mar 20, 2020 at 02:13:47PM +0100, Thomas Gleixner wrote: > Finding all places which build x86_cpu_id match tables is tedious and the > logic is hidden in lots of differently named macro wrappers. > > Most of these initializer macros use plain C89 initializers which rely on > the ordering of the struct members. So new members could only be added at > the end of the struct, but that's ugly as hell and C99 initializers are > really the right thing to use. > > Provide a set of macros which: > > - Have a proper naming scheme, starting with X86_MATCH_ > > - Use C99 initializers > > The set of provided macros are all subsets of the base macro > > X86_MATCH_VENDOR_FAM_MODEL_FEATURE() > > which allows to supply all possible selection criteria: > > vendor, family, model, feature > > The other macros shorten this to avoid typing all arguments when they are > not needed and would require one of the _ANY constants. They have been > created due to the requirements of the existing usage sites. > > Also a add a few model constants for Centaur CPUs and QUARK. s/Also a/Also/

1 0

[alsa-devel] tegra30 tdm audio support
by Ben Dooks 20 Mar '20

20 Mar '20

TDM audio support for tegra30 devices. v2: - moved edge-control and data-offset to the set_fmt callbacks - fixed dev_dbg in set_tdm callback - fixed dev_dbg message contents in set_tdm callback - changed fsync width to be permanently 1 clock v3: - cleanup fsync patch - fix rebase issue with tdm patch v4: - fix comment style issues - change tdm-a to data-offset 1 v5: - fix format on tdm-b

6 90

[PATCH] soundwire: qcom: add support for get_sdw_stream()
by Srinivas Kandagatla 20 Mar '20

20 Mar '20

Adding support to new get_sdw_stream() that can help machine driver to deal with soundwire stream. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- drivers/soundwire/qcom.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index 440effed6df6..ba810fbfa3c7 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -588,6 +588,13 @@ static int qcom_swrm_set_sdw_stream(struct snd_soc_dai *dai, return 0; } +static void * qcom_swrm_get_sdw_stream(struct snd_soc_dai *dai, int direction) +{ + struct qcom_swrm_ctrl *ctrl = dev_get_drvdata(dai->dev); + + return ctrl->sruntime[dai->id]; +} + static int qcom_swrm_startup(struct snd_pcm_substream *substream, struct snd_soc_dai *dai) { @@ -632,6 +639,7 @@ static const struct snd_soc_dai_ops qcom_swrm_pdm_dai_ops = { .startup = qcom_swrm_startup, .shutdown = qcom_swrm_shutdown, .set_sdw_stream = qcom_swrm_set_sdw_stream, + .get_sdw_stream = qcom_swrm_get_sdw_stream, }; static const struct snd_soc_component_driver qcom_swrm_dai_component = { -- 2.21.0

2 1

[PATCH 0/2] soundwire: add read_only_wordlength flag
by Srinivas Kandagatla 20 Mar '20

20 Mar '20

According to SoundWire Specification Version 1.2. "A Data Port number X (in the range 0-14) which supports only one value of WordLength may implement the WordLength field in the DPX_BlockCtrl1 Register as Read-Only, returning the fixed value of WordLength in response to reads." As WSA881x interfaces in PDM mode making the only field "WordLength" in DPX_BlockCtrl1" fixed and read-only. Behaviour of writing to this register on WSA881x soundwire slave with Qualcomm Soundwire Controller is throwing up an error. Not sure how other controllers deal with writing to readonly registers, but this patch provides a way to avoid writes to DPN_BlockCtrl1 register by providing a read_only_wordlength flag in struct sdw_dpn_prop Srinivas Kandagatla (2): soundwire: stream: Add read_only_wordlength flag to port properties ASoC: wsa881x: mark read_only_wordlength flag drivers/soundwire/stream.c | 16 +++++++++------- include/linux/soundwire/sdw.h | 2 ++ sound/soc/codecs/wsa881x.c | 4 ++++ 3 files changed, 15 insertions(+), 7 deletions(-) -- 2.21.0

3 6

[PATCH 0/3] ASoC: ti: Add support for audio on J721e EVM
by Peter Ujfalusi 20 Mar '20

20 Mar '20

Hi, This series adds support for the analog audio setup on the j721e EVM. The audio setup of the EVM is: Common Processor Board (CPB): McASP10 <-> pcm3168a Infotainment Expansion Board (IVI): McASP0 <-> 2x pcm3168a Both CPB and IVI wired in parallel serializer setup. The first patch adds the stream_name for McASP driver as it is needed in multicodec (and would be needed in DPCM) setup for proper DAPM handling. The second patch adds two DT schema, one for the cpb and one for the cpb+ivi card. Regards, Peter --- Peter Ujfalusi (3): ASoC: ti: davinci-mcasp: Specify stream_name for playback/capture bindings: sound: Add documentation for TI j721e EVM (CPB and IVI) ASoC: ti: Add custom machine driver for j721e EVM (CPB and IVI) .../bindings/sound/ti,j721e-cpb-audio.yaml | 93 ++ .../sound/ti,j721e-cpb-ivi-audio.yaml | 145 +++ sound/soc/ti/Kconfig | 8 + sound/soc/ti/Makefile | 2 + sound/soc/ti/davinci-mcasp.c | 3 + sound/soc/ti/j721e-evm.c | 864 ++++++++++++++++++ 6 files changed, 1115 insertions(+) create mode 100644 Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml create mode 100644 Documentation/devicetree/bindings/sound/ti,j721e-cpb-ivi-audio.yaml create mode 100644 sound/soc/ti/j721e-evm.c -- Peter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

2 5

[PATCH v2] ASoC: Intel: boards: add stereo playback by woofer speaker
by "mac.chiang＠intel.com--cc=pierre-louis.bossart"＠linux.intel.com 20 Mar '20

20 Mar '20

From: Mac Chiang <mac.chiang(a)intel.com> support woofer stereo speakers individually Signed-off-by: Mac Chiang <mac.chiang(a)intel.com> --- Changelog: v2: - considering woofer speakers settings as general. - separate out the tweeter speakers and consistency of woofer+tweeter when hardware-specific. - check NULL condition if devm_kzalloc is failed --- sound/soc/intel/boards/cml_rt1011_rt5682.c | 215 +++++++++++++++++++++++------ 1 file changed, 172 insertions(+), 43 deletions(-) diff --git a/sound/soc/intel/boards/cml_rt1011_rt5682.c b/sound/soc/intel/boards/cml_rt1011_rt5682.c index dd80d01..fc822a1 100644 --- a/sound/soc/intel/boards/cml_rt1011_rt5682.c +++ b/sound/soc/intel/boards/cml_rt1011_rt5682.c @@ -30,6 +30,35 @@ #define CML_RT5682_CODEC_DAI "rt5682-aif1" #define NAME_SIZE 32 +#define SOF_RT1011_SPEAKER_WL BIT(0) +#define SOF_RT1011_SPEAKER_WR BIT(1) +#define SOF_RT1011_SPEAKER_TL BIT(2) +#define SOF_RT1011_SPEAKER_TR BIT(3) +#define SPK_CH 4 + +/* Default: Woofer speakers */ +static unsigned long sof_rt1011_quirk = SOF_RT1011_SPEAKER_WL | SOF_RT1011_SPEAKER_WR; + +static int sof_rt1011_quirk_cb(const struct dmi_system_id *id) +{ + sof_rt1011_quirk = (unsigned long)id->driver_data; + return 1; +} + +static const struct dmi_system_id sof_rt1011_quirk_table[] = { + { + .callback = sof_rt1011_quirk_cb, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Google"), + DMI_MATCH(DMI_PRODUCT_NAME, "Helios"), + }, + .driver_data = (void *)(SOF_RT1011_SPEAKER_WL | SOF_RT1011_SPEAKER_WR | + SOF_RT1011_SPEAKER_TL | SOF_RT1011_SPEAKER_TR), + }, + { + } +}; + static struct snd_soc_jack hdmi_jack[3]; struct hdmi_pcm { @@ -48,15 +77,16 @@ struct card_private { static const struct snd_kcontrol_new cml_controls[] = { SOC_DAPM_PIN_SWITCH("Headphone Jack"), SOC_DAPM_PIN_SWITCH("Headset Mic"), - SOC_DAPM_PIN_SWITCH("TL Ext Spk"), - SOC_DAPM_PIN_SWITCH("TR Ext Spk"), SOC_DAPM_PIN_SWITCH("WL Ext Spk"), SOC_DAPM_PIN_SWITCH("WR Ext Spk"), }; +static const struct snd_kcontrol_new cml_rt1011_tt_controls[] = { + SOC_DAPM_PIN_SWITCH("TL Ext Spk"), + SOC_DAPM_PIN_SWITCH("TR Ext Spk"), +}; + static const struct snd_soc_dapm_widget cml_rt1011_rt5682_widgets[] = { - SND_SOC_DAPM_SPK("TL Ext Spk", NULL), - SND_SOC_DAPM_SPK("TR Ext Spk", NULL), SND_SOC_DAPM_SPK("WL Ext Spk", NULL), SND_SOC_DAPM_SPK("WR Ext Spk", NULL), SND_SOC_DAPM_HP("Headphone Jack", NULL), @@ -64,10 +94,13 @@ static const struct snd_soc_dapm_widget cml_rt1011_rt5682_widgets[] = { SND_SOC_DAPM_MIC("SoC DMIC", NULL), }; +static const struct snd_soc_dapm_widget cml_rt1011_tt_widgets[] = { + SND_SOC_DAPM_SPK("TL Ext Spk", NULL), + SND_SOC_DAPM_SPK("TR Ext Spk", NULL), +}; + static const struct snd_soc_dapm_route cml_rt1011_rt5682_map[] = { - /*speaker*/ - {"TL Ext Spk", NULL, "TL SPO"}, - {"TR Ext Spk", NULL, "TR SPO"}, + /*WL/WR speaker*/ {"WL Ext Spk", NULL, "WL SPO"}, {"WR Ext Spk", NULL, "WR SPO"}, @@ -82,6 +115,12 @@ static const struct snd_soc_dapm_route cml_rt1011_rt5682_map[] = { {"DMic", NULL, "SoC DMIC"}, }; +static const struct snd_soc_dapm_route cml_rt1011_tt_map[] = { + /*TL/TR speaker*/ + {"TL Ext Spk", NULL, "TL SPO" }, + {"TR Ext Spk", NULL, "TR SPO" }, +}; + static int cml_rt5682_codec_init(struct snd_soc_pcm_runtime *rtd) { struct card_private *ctx = snd_soc_card_get_drvdata(rtd->card); @@ -121,6 +160,35 @@ static int cml_rt5682_codec_init(struct snd_soc_pcm_runtime *rtd) return ret; }; +static int cml_rt1011_spk_init(struct snd_soc_pcm_runtime *rtd) +{ + int ret = 0; + struct snd_soc_card *card = rtd->card; + + if (sof_rt1011_quirk & (SOF_RT1011_SPEAKER_TL | + SOF_RT1011_SPEAKER_TR)) { + + ret = snd_soc_add_card_controls(card, cml_rt1011_tt_controls, + ARRAY_SIZE(cml_rt1011_tt_controls)); + if (ret) + return ret; + + ret = snd_soc_dapm_new_controls(&card->dapm, + cml_rt1011_tt_widgets, + ARRAY_SIZE(cml_rt1011_tt_widgets)); + if (ret) + return ret; + + ret = snd_soc_dapm_add_routes(&card->dapm, cml_rt1011_tt_map, + ARRAY_SIZE(cml_rt1011_tt_map)); + + if (ret) + return ret; + } + + return ret; +} + static int cml_rt5682_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params) { @@ -192,30 +260,38 @@ static int cml_rt1011_hw_params(struct snd_pcm_substream *substream, * The feedback is captured for each codec individually. * Hence all 4 codecs use 1 Tx slot each for feedback. */ - if (!strcmp(codec_dai->component->name, "i2c-10EC1011:00")) { - ret = snd_soc_dai_set_tdm_slot(codec_dai, - 0x4, 0x1, 4, 24); - if (ret < 0) - break; - } - if (!strcmp(codec_dai->component->name, "i2c-10EC1011:02")) { - ret = snd_soc_dai_set_tdm_slot(codec_dai, - 0x1, 0x1, 4, 24); - if (ret < 0) - break; - } - /* TDM Rx slot 2 is used for Right Woofer & Tweeters pair */ - if (!strcmp(codec_dai->component->name, "i2c-10EC1011:01")) { - ret = snd_soc_dai_set_tdm_slot(codec_dai, - 0x8, 0x2, 4, 24); - if (ret < 0) - break; + if (sof_rt1011_quirk & (SOF_RT1011_SPEAKER_WL | + SOF_RT1011_SPEAKER_WR)) { + if (!strcmp(codec_dai->component->name, "i2c-10EC1011:00")) { + ret = snd_soc_dai_set_tdm_slot(codec_dai, + 0x4, 0x1, 4, 24); + if (ret < 0) + break; + } + + if (!strcmp(codec_dai->component->name, "i2c-10EC1011:01")) { + ret = snd_soc_dai_set_tdm_slot(codec_dai, + 0x8, 0x2, 4, 24); + if (ret < 0) + break; + } } - if (!strcmp(codec_dai->component->name, "i2c-10EC1011:03")) { - ret = snd_soc_dai_set_tdm_slot(codec_dai, - 0x2, 0x2, 4, 24); - if (ret < 0) - break; + + if (sof_rt1011_quirk & (SOF_RT1011_SPEAKER_TL | + SOF_RT1011_SPEAKER_TR)) { + if (!strcmp(codec_dai->component->name, "i2c-10EC1011:02")) { + ret = snd_soc_dai_set_tdm_slot(codec_dai, + 0x1, 0x1, 4, 24); + if (ret < 0) + break; + } + + if (!strcmp(codec_dai->component->name, "i2c-10EC1011:03")) { + ret = snd_soc_dai_set_tdm_slot(codec_dai, + 0x2, 0x2, 4, 24); + if (ret < 0) + break; + } } } if (ret < 0) @@ -302,10 +378,8 @@ SND_SOC_DAILINK_DEF(ssp1_pin, DAILINK_COMP_ARRAY(COMP_CPU("SSP1 Pin"))); SND_SOC_DAILINK_DEF(ssp1_codec, DAILINK_COMP_ARRAY( - /* WL */ COMP_CODEC("i2c-10EC1011:00", CML_RT1011_CODEC_DAI), - /* WR */ COMP_CODEC("i2c-10EC1011:01", CML_RT1011_CODEC_DAI), - /* TL */ COMP_CODEC("i2c-10EC1011:02", CML_RT1011_CODEC_DAI), - /* TR */ COMP_CODEC("i2c-10EC1011:03", CML_RT1011_CODEC_DAI))); + /* WL */ COMP_CODEC("i2c-10EC1011:00", CML_RT1011_CODEC_DAI), + /* WR */ COMP_CODEC("i2c-10EC1011:01", CML_RT1011_CODEC_DAI))); SND_SOC_DAILINK_DEF(dmic_pin, DAILINK_COMP_ARRAY(COMP_CPU("DMIC01 Pin"))); @@ -399,6 +473,7 @@ static struct snd_soc_dai_link cml_rt1011_rt5682_dailink[] = { .dpcm_playback = 1, .dpcm_capture = 1, /* Capture stream provides Feedback */ .no_pcm = 1, + .init = cml_rt1011_spk_init, .ops = &cml_rt1011_ops, SND_SOC_DAILINK_REG(ssp1_pin, ssp1_codec, platform), }, @@ -413,14 +488,6 @@ static struct snd_soc_codec_conf rt1011_conf[] = { .dlc = COMP_CODEC_CONF("i2c-10EC1011:01"), .name_prefix = "WR", }, - { - .dlc = COMP_CODEC_CONF("i2c-10EC1011:02"), - .name_prefix = "TL", - }, - { - .dlc = COMP_CODEC_CONF("i2c-10EC1011:03"), - .name_prefix = "TR", - }, }; /* Cometlake audio machine driver for RT1011 and RT5682 */ @@ -442,10 +509,12 @@ static struct snd_soc_card snd_soc_card_cml = { static int snd_cml_rt1011_probe(struct platform_device *pdev) { + struct snd_soc_dai_link_component *rt1011_dais_components; + struct snd_soc_codec_conf *rt1011_dais_confs; struct card_private *ctx; struct snd_soc_acpi_mach *mach; const char *platform_name; - int ret; + int ret, i; ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_ATOMIC); if (!ctx) @@ -456,6 +525,65 @@ static int snd_cml_rt1011_probe(struct platform_device *pdev) snd_soc_card_cml.dev = &pdev->dev; platform_name = mach->mach_params.platform; + dmi_check_system(sof_rt1011_quirk_table); + + dev_info(&pdev->dev, "sof_rt1011_quirk = %lx\n", sof_rt1011_quirk); + + if (sof_rt1011_quirk & (SOF_RT1011_SPEAKER_TL | + SOF_RT1011_SPEAKER_TR)) { + rt1011_dais_confs = devm_kzalloc(&pdev->dev, + sizeof(struct snd_soc_codec_conf) * + SPK_CH, GFP_KERNEL); + + if (!rt1011_dais_confs) + return -ENOMEM; + + rt1011_dais_components = devm_kzalloc(&pdev->dev, + sizeof(struct snd_soc_dai_link_component) * + SPK_CH, GFP_KERNEL); + + if (!rt1011_dais_components) + return -ENOMEM; + + for (i = 0; i < SPK_CH; i++) { + rt1011_dais_confs[i].dlc.name = devm_kasprintf(&pdev->dev, + GFP_KERNEL, + "i2c-10EC1011:0%d", + i); + switch (i) { + case 0: + rt1011_dais_confs[i].name_prefix = "WL"; + break; + + case 1: + rt1011_dais_confs[i].name_prefix = "WR"; + break; + case 2: + rt1011_dais_confs[i].name_prefix = "TL"; + break; + case 3: + rt1011_dais_confs[i].name_prefix = "TR"; + break; + } + rt1011_dais_components[i].name = devm_kasprintf(&pdev->dev, + GFP_KERNEL, + "i2c-10EC1011:0%d", + i); + rt1011_dais_components[i].dai_name = CML_RT1011_CODEC_DAI; + } + + snd_soc_card_cml.codec_conf = rt1011_dais_confs; + snd_soc_card_cml.num_configs = SPK_CH; + + for (i = 0; i < ARRAY_SIZE(cml_rt1011_rt5682_dailink); i++) { + if (!strcmp(cml_rt1011_rt5682_dailink[i].codecs->dai_name, + CML_RT1011_CODEC_DAI)) { + cml_rt1011_rt5682_dailink[i].codecs = rt1011_dais_components; + cml_rt1011_rt5682_dailink[i].num_codecs = SPK_CH; + } + } + } + /* set platform name for each dailink */ ret = snd_soc_fixup_dai_links_platform_name(&snd_soc_card_cml, platform_name); @@ -483,5 +611,6 @@ MODULE_DESCRIPTION("Cometlake Audio Machine driver - RT1011 and RT5682 in I2S mo MODULE_AUTHOR("Naveen Manohar <naveen.m(a)intel.com>"); MODULE_AUTHOR("Sathya Prakash M R <sathya.prakash.m.r(a)intel.com>"); MODULE_AUTHOR("Shuming Fan <shumingf(a)realtek.com>"); +MODULE_AUTHOR("Mac Chiang <mac.chiang(a)intel.com>"); MODULE_LICENSE("GPL v2"); MODULE_ALIAS("platform:cml_rt1011_rt5682"); -- 2.7.4

3 2

[PATCH] ALSA: hda/ca0132 - Add Recon3Di quirk to handle integrated sound on EVGA X99 Classified motherboard
by Geoffrey Allott 19 Mar '20

19 Mar '20

I have a system which has an EVGA X99 Classified motherboard. The pin assignments for the HD Audio controller are not correct under Linux. Windows 10 works fine and informs me that it's using the Recon3Di driver, and on Linux, `cat /sys/class/sound/card0/device/subsystem_{vendor,device}` yields 0x3842 0x1038 This patch adds a corresponding entry to the quirk list. Signed-off-by: Geoffrey Allott <geoffrey(a)allott.email> --- sound/pci/hda/patch_ca0132.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index ded8bc07d755..10223e080d59 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c @@ -1180,6 +1180,7 @@ static const struct snd_pci_quirk ca0132_quirks[] = { SND_PCI_QUIRK(0x1458, 0xA016, "Recon3Di", QUIRK_R3DI), SND_PCI_QUIRK(0x1458, 0xA026, "Gigabyte G1.Sniper Z97", QUIRK_R3DI), SND_PCI_QUIRK(0x1458, 0xA036, "Gigabyte GA-Z170X-Gaming 7", QUIRK_R3DI), + SND_PCI_QUIRK(0x3842, 0x1038, "EVGA X99 Classified", QUIRK_R3DI), SND_PCI_QUIRK(0x1102, 0x0013, "Recon3D", QUIRK_R3D), SND_PCI_QUIRK(0x1102, 0x0051, "Sound Blaster AE-5", QUIRK_AE5), {} -- 2.25.1

2 1

[PATCH] ASoC: tas2562: Fixed incorrect amp_level setting.
by jonghwan Choi 19 Mar '20

19 Mar '20

>From 9f837d75f16ab18342ac517d5b1e5259ab9b797e Mon Sep 17 00:00:00 2001 From: Jonghwan Choi <charlie.jh(a)kakaocorp.com> Date: Thu, 19 Mar 2020 14:44:14 +0900 Subject: [PATCH] ASoC: tas2562: Fixed incorrect amp_level setting. Signed-off-by: Jonghwan Choi <charlie.jh(a)kakaocorp.com> --- sound/soc/codecs/tas2562.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/tas2562.c b/sound/soc/codecs/tas2562.c index be52886a5edb..fb2233ca9103 100644 --- a/sound/soc/codecs/tas2562.c +++ b/sound/soc/codecs/tas2562.c @@ -409,7 +409,7 @@ static const struct snd_kcontrol_new vsense_switch = 1, 1); static const struct snd_kcontrol_new tas2562_snd_controls[] = { - SOC_SINGLE_TLV("Amp Gain Volume", TAS2562_PB_CFG1, 0, 0x1c, 0, + SOC_SINGLE_TLV("Amp Gain Volume", TAS2562_PB_CFG1, 1, 0x1c, 0, tas2562_dac_tlv), }; -- 2.17.1

2 1

[v2 1/3] ASoC: rt5682: Add a property for DMIC clock rate setting
by Oder Chiou 19 Mar '20

19 Mar '20

The patch adds a property for DMIC clock rate setting and changes the default clock rate to the common optimize DMIC clock rate. Signed-off-by: Oder Chiou <oder_chiou(a)realtek.com> --- include/sound/rt5682.h | 1 + sound/soc/codecs/rt5682.c | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/sound/rt5682.h b/include/sound/rt5682.h index 6bf0e3581056..96b268ac96bd 100644 --- a/include/sound/rt5682.h +++ b/include/sound/rt5682.h @@ -38,6 +38,7 @@ struct rt5682_platform_data { enum rt5682_dmic1_clk_pin dmic1_clk_pin; enum rt5682_jd_src jd_src; unsigned int btndet_delay; + unsigned int dmic_clk_rate; const char *dai_clk_names[RT5682_DAI_NUM_CLKS]; }; diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c index 2ee01e782fe0..c9e6f287424b 100644 --- a/sound/soc/codecs/rt5682.c +++ b/sound/soc/codecs/rt5682.c @@ -1231,10 +1231,13 @@ static int set_dmic_clk(struct snd_soc_dapm_widget *w, struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); struct rt5682_priv *rt5682 = snd_soc_component_get_drvdata(component); - int idx = -EINVAL; + int idx = -EINVAL, dmic_clk_rate = 3072000; static const int div[] = {2, 4, 6, 8, 12, 16, 24, 32, 48, 64, 96, 128}; - idx = rt5682_div_sel(rt5682, 1500000, div, ARRAY_SIZE(div)); + if (rt5682->pdata.dmic_clk_rate) + dmic_clk_rate = rt5682->pdata.dmic_clk_rate; + + idx = rt5682_div_sel(rt5682, dmic_clk_rate, div, ARRAY_SIZE(div)); snd_soc_component_update_bits(component, RT5682_DMIC_CTRL_1, RT5682_DMIC_CLK_MASK, idx << RT5682_DMIC_CLK_SFT); @@ -3231,6 +3234,8 @@ static int rt5682_parse_dt(struct rt5682_priv *rt5682, struct device *dev) &rt5682->pdata.jd_src); device_property_read_u32(dev, "realtek,btndet-delay", &rt5682->pdata.btndet_delay); + device_property_read_u32(dev, "realtek,dmic-clk-rate", + &rt5682->pdata.dmic_clk_rate); rt5682->pdata.ldo1_en = of_get_named_gpio(dev->of_node, "realtek,ldo1-en-gpios", 0); -- 2.25.1

2 3

[PATCH v2 00/17] SoundWire: cadence: add clock stop and fix programming sequences
by Pierre-Louis Bossart 19 Mar '20

19 Mar '20

To make progress with SoundWire support, this patchset provides the missing support for clock stop modes, and revisits all Cadence Master register settings. The current code is for some reason not aligned with internal documentation and hardware recommended flows, specifically for multi-link operation. Changes since v1: Removed log in is_clock_stop(), use the helper in the main clock_stop() and change return 1->return 0. Fixed squash issue in patch5 to remove irrelevant udelay() change Added Patch17 to clear FIFOs and avoid pop noise Pierre-Louis Bossart (12): soundwire: cadence: s/update_config/config_update soundwire: cadence: handle error cases with CONFIG_UPDATE soundwire: cadence: mask Slave interrupt before stopping clock soundwire: cadence: merge routines to clear/set bits soundwire: cadence: move clock/SSP related inits to dedicated function soundwire: cadence: make SSP interval programmable soundwire: cadence: reorder MCP_CONFIG settings soundwire: cadence: enable NORMAL operation in cdns_init() soundwire: cadence: remove PREQ_DELAY assignment soundwire: cadence: remove automatic command retries soundwire: cadence: commit changes in the exit_reset() sequence soundwire: cadence: multi-link support Rander Wang (4): soundwire: cadence: simplifiy cdns_init() soundwire: cadence: add interface to check clock status soundwire: cadence: add clock_stop/restart routines soundwire: cadence: fix a io timeout issue in S3 test randerwang (1): soundwire: cadence: clear FIFO to avoid pop noise issue on playback start drivers/soundwire/cadence_master.c | 282 ++++++++++++++++++++++++----- drivers/soundwire/cadence_master.h | 9 +- drivers/soundwire/intel.c | 2 +- 3 files changed, 249 insertions(+), 44 deletions(-) base-commit: 0b43fef979b4664d51a09dc7e0c430ebb2d18267 -- 2.20.1

2 18