December 2019 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH 0/7 v2] ASoC: soc-core cleanup step8
by Kuninori Morimoto 19 Dec '19

19 Dec '19

Hi Mark These are v2 of soc-core cleanup step8. There is no relationship between each patches. - [6/7] renamed function name - [7/7] new patch which cares SND_SOC_DAPM_STREAM_STOP Kuninori Morimoto (7): 1) ASoC: soc-core: remove snd_soc_rtdcom_list 2) ASoC: soc-core: care .ignore_suspend for Component suspend 3) ASoC: soc-core: remove duplicate pinctrl operation when suspend 4) ASoC: soc-core: do pinctrl_pm_select_xxx() as component 5) ASoC: soc-core: add snd_soc_close_delayed_work() 6) ASoC: soc-dapm: add snd_soc_dapm_stream_stop() 7) ASoC: use snd_soc_dapm_stream_stop() for SND_SOC_DAPM_STREAM_STOP include/sound/soc-dapm.h | 1 + include/sound/soc.h | 19 +++--- sound/soc/soc-component.c | 33 +++++----- sound/soc/soc-compress.c | 112 +++++++++------------------------ sound/soc/soc-core.c | 157 +++++++++++++++++++++++----------------------- sound/soc/soc-dapm.c | 23 +++++++ sound/soc/soc-pcm.c | 115 ++++++++------------------------- 7 files changed, 181 insertions(+), 279 deletions(-) -- 2.7.4

5 17

[alsa-devel] [PATCH] ASoC: SOF: Intel: add PCI ID for CometLake-S
by Pierre-Louis Bossart 18 Dec '19

18 Dec '19

Mirror ID added for legacy HDaudio Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/sof/intel/Kconfig | 16 ++++++++++++++++ sound/soc/sof/sof-pci-dev.c | 4 ++++ 2 files changed, 20 insertions(+) diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig index cc09bb606f7d..91c8bbcc015a 100644 --- a/sound/soc/sof/intel/Kconfig +++ b/sound/soc/sof/intel/Kconfig @@ -27,6 +27,7 @@ config SND_SOC_SOF_INTEL_PCI select SND_SOC_SOF_ICELAKE if SND_SOC_SOF_ICELAKE_SUPPORT select SND_SOC_SOF_COMETLAKE_LP if SND_SOC_SOF_COMETLAKE_LP_SUPPORT select SND_SOC_SOF_COMETLAKE_H if SND_SOC_SOF_COMETLAKE_H_SUPPORT + select SND_SOC_SOF_COMETLAKE_S if SND_SOC_SOF_COMETLAKE_S_SUPPORT select SND_SOC_SOF_TIGERLAKE if SND_SOC_SOF_TIGERLAKE_SUPPORT select SND_SOC_SOF_ELKHARTLAKE if SND_SOC_SOF_ELKHARTLAKE_SUPPORT select SND_SOC_SOF_JASPERLAKE if SND_SOC_SOF_JASPERLAKE_SUPPORT @@ -231,6 +232,21 @@ config SND_SOC_SOF_COMETLAKE_H_SUPPORT Say Y if you have such a device. If unsure select "N". +config SND_SOC_SOF_COMETLAKE_S + tristate + select SND_SOC_SOF_HDA_COMMON + help + This option is not user-selectable but automagically handled by + 'select' statements at a higher level + +config SND_SOC_SOF_COMETLAKE_S_SUPPORT + bool "SOF support for CometLake-S" + help + This adds support for Sound Open Firmware for Intel(R) platforms + using the Cometlake-H processors. + Say Y if you have such a device. + If unsure select "N". + config SND_SOC_SOF_TIGERLAKE_SUPPORT bool "SOF support for Tigerlake" help diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c index bbeffd932de7..0b39ea6117cf 100644 --- a/sound/soc/sof/sof-pci-dev.c +++ b/sound/soc/sof/sof-pci-dev.c @@ -417,6 +417,10 @@ static const struct pci_device_id sof_pci_ids[] = { { PCI_DEVICE(0x8086, 0x06c8), .driver_data = (unsigned long)&cml_desc}, #endif +#if IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_S) + { PCI_DEVICE(0x8086, 0xa3f0), + .driver_data = (unsigned long)&cml_desc}, +#endif #if IS_ENABLED(CONFIG_SND_SOC_SOF_TIGERLAKE) { PCI_DEVICE(0x8086, 0xa0c8), .driver_data = (unsigned long)&tgl_desc}, -- 2.20.1

3 10

[alsa-devel] [PATCH v2 0/3] More stability fixes for corner cases.
by Pierre-Louis Bossart 18 Dec '19

18 Dec '19

It wasn't straightforward to add a Fixes tag for the two Intel patches, it's likely issues that can be applied to 5.3, possibly earlier. For Dragos' patch Ranjani mentioned this may be due to da704f26ba376 ('ASoC: soc-core: merge snd_soc_remove_dai_link() and soc_unbind_dai_link()'), but Morimoto-san may need to confirm. Changes since v1: Fixed conflict in 3rd patch with Morimoto-san changes (rename of snd_soc_remove_dai_link) Dragos Tarcatu (1): ASoC: topology: Prevent use-after-free in snd_soc_get_pcm_runtime() Kai Vehmanen (1): ASoC: SOF: fix fault at driver unload after failed probe Pierre-Louis Bossart (1): ASoC: SOF: Intel: hda: hda-dai: fix oops on hda_link .hw_free sound/soc/soc-topology.c | 8 ++++---- sound/soc/sof/intel/hda-dai.c | 11 +++++++++-- sound/soc/sof/ipc.c | 3 +++ 3 files changed, 16 insertions(+), 6 deletions(-) -- 2.20.1

3 7

[alsa-devel] [PATCH] ASoC: Intel: cml_rt1011_rt5682: fix codec_conf by removing legacy style
by Pierre-Louis Bossart 18 Dec '19

18 Dec '19

Now that the legacy style is removed, we have to use the new macros for the codec configuration. This change was missed in the initial series. Reported-by: Randy Dunlap <rdunlap(a)infradead.org> Cc: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> Fixes: ee8f537fd8b71c ("ASoC: soc-core: remove legacy style of codec_conf") Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/intel/boards/cml_rt1011_rt5682.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/intel/boards/cml_rt1011_rt5682.c b/sound/soc/intel/boards/cml_rt1011_rt5682.c index a22f97234201..ab1196108d23 100644 --- a/sound/soc/intel/boards/cml_rt1011_rt5682.c +++ b/sound/soc/intel/boards/cml_rt1011_rt5682.c @@ -406,19 +406,19 @@ static struct snd_soc_dai_link cml_rt1011_rt5682_dailink[] = { static struct snd_soc_codec_conf rt1011_conf[] = { { - .dev_name = "i2c-10EC1011:00", + .dlc = COMP_CODEC_CONF("i2c-10EC1011:00"), .name_prefix = "WL", }, { - .dev_name = "i2c-10EC1011:01", + .dlc = COMP_CODEC_CONF("i2c-10EC1011:01"), .name_prefix = "WR", }, { - .dev_name = "i2c-10EC1011:02", + .dlc = COMP_CODEC_CONF("i2c-10EC1011:02"), .name_prefix = "TL", }, { - .dev_name = "i2c-10EC1011:03", + .dlc = COMP_CODEC_CONF("i2c-10EC1011:03"), .name_prefix = "TR", }, }; -- 2.20.1

4 4

[alsa-devel] [PATCH 0/8] ASoC: SOF: Intel: add module namespace support
by Pierre-Louis Bossart 18 Dec '19

18 Dec '19

A lot of the existing SOF/Intel drivers expose ops structures or helpers that should not be visible or loadable by other drivers. During the last round of SoundWire reviews, GregKH suggested the use of module namespaces [1] to avoid exposing symbols that are only meant to be used in a restricted context. This patchset suggests the use of namespaces for the different Intel parts, largely modeled after the existing hiearchical Kconfig options. While several SOF reviewers suggested on GitHub that this use of namespaces was too fine-grained, it can also be argued that this level of detail helps identify cases where the existing structures are not properly defined. We found such a case with the Xtensa architecture abstraction and another code partitioning issue for the SoundWire driver yesterday. Module namespaces are currently not used widely in kernel circles, this is a first attempt to test the water for audio drivers and gather comments from maintainers/reviewers. [1] https://www.kernel.org/doc/html/latest/core-api/symbol-namespaces.html Pierre-Louis Bossart (8): ASoC: SOF: Intel: add module namespace for legacy IPC ASoC: SOF: Intel: add namespaces for BAYTRAIL and MERRIFIELD ASoC: SOF: Intel: add namespace for BROADWELL ASoC: SOF: remove references to Haswell ASoC: SOF: Intel: add namespace for HDA_COMMON ASoC: SOF: Intel: hda: add namespace for hda-codec functionality ASoC: SOF: move arch_ops under ops ASoC: SOF: Intel: add namespace for XTENSA include/sound/sof.h | 1 - sound/soc/sof/Kconfig | 2 +- sound/soc/sof/intel/apl.c | 6 ++++-- sound/soc/sof/intel/bdw.c | 8 ++++++-- sound/soc/sof/intel/byt.c | 20 ++++++++++++++------ sound/soc/sof/intel/cnl.c | 14 ++++++++------ sound/soc/sof/intel/hda-codec.c | 14 +++++++------- sound/soc/sof/intel/hda.c | 3 +++ sound/soc/sof/intel/intel-ipc.c | 8 ++++---- sound/soc/sof/intel/shim.h | 6 ++---- sound/soc/sof/sof-acpi-dev.c | 26 ++------------------------ sound/soc/sof/sof-pci-dev.c | 12 ++---------- sound/soc/sof/sof-priv.h | 4 +++- sound/soc/sof/xtensa/core.c | 2 +- 14 files changed, 57 insertions(+), 69 deletions(-) -- 2.20.1

2 16

[alsa-devel] [PATCH 0/8] ASoC: SOF: last patches for 2019
by Pierre-Louis Bossart 18 Dec '19

18 Dec '19

This patchset adds a set of somewhat independent changes for i.MX, Intel, boards and core. Guido Roncarolo (2): ASoC: SOF: imx: Describe SAI parameters to be sent to DSP ASoC: SOF: imx: Read SAI parameters and send them to DSP Kai Vehmanen (2): ASoC: SOF: Intel: drop HDA codec upon probe failure ASoC: Intel: boards: fix incorrect HDMI Kconfig dependency Karol Trzcinski (2): ASoC: SOF: define struct with compiler name and version ASoC: SOF: log compiler name and version information Ranjani Sridharan (1): ASoC: SOF: Introduce state machine for FW boot Yong Zhi (1): ASoC: Intel: Add machine driver for da7219_max98373 include/sound/sof/dai-imx.h | 20 + include/sound/sof/dai.h | 1 + include/sound/sof/info.h | 15 + include/uapi/sound/sof/tokens.h | 3 +- sound/soc/intel/boards/Kconfig | 28 +- sound/soc/intel/boards/Makefile | 3 + sound/soc/intel/boards/sof_da7219_max98373.c | 371 ++++++++++++++++++ .../intel/common/soc-acpi-intel-jsl-match.c | 7 + sound/soc/sof/core.c | 50 ++- sound/soc/sof/intel/hda-codec.c | 12 +- sound/soc/sof/intel/hda-loader.c | 1 - sound/soc/sof/intel/hda.c | 4 +- sound/soc/sof/intel/hda.h | 4 +- sound/soc/sof/ipc.c | 17 +- sound/soc/sof/loader.c | 58 ++- sound/soc/sof/pcm.c | 8 + sound/soc/sof/pm.c | 21 +- sound/soc/sof/sof-priv.h | 12 +- sound/soc/sof/topology.c | 69 +++- 19 files changed, 662 insertions(+), 42 deletions(-) create mode 100644 sound/soc/intel/boards/sof_da7219_max98373.c -- 2.20.1

2 16

[alsa-devel] [PATCH 0/4] ASoC: meson: axg-fifo: fix depth handling
by Jerome Brunet 18 Dec '19

18 Dec '19

This patchset improves the handling the depth of the different fifos found in amlogic audio subsystems derived from the axg family. Initially, it was reported that, when the period is less than 8kB on sm1 and with TODDR A, several period are coming at once. This is because the field related to the fifo request threshold changed on the sm1 SoC and also because TODDR A instance is significantly larger compared to the other instances. With this initial issue fixed, I used the opportunity to improve the driver and properly deal with the different fifo depth found in these SoCs. Jerome Brunet (4): ASoC: meson: axg-fifo: fix fifo threshold setup ASoC: meson: axg-fifo: add fifo depth to the bindings documentation ASoC: meson: axg-fifo: improve depth handling ASoC: meson: axg-fifo: relax period size constraints .../bindings/sound/amlogic,axg-fifo.txt | 4 ++ sound/soc/meson/axg-fifo.c | 50 ++++++++++++++++--- sound/soc/meson/axg-fifo.h | 9 ++-- sound/soc/meson/axg-frddr.c | 33 ++++++------ sound/soc/meson/axg-toddr.c | 21 ++++---- 5 files changed, 76 insertions(+), 41 deletions(-) -- 2.23.0

2 10

[alsa-devel] [PATCH v4] ASoC: intel: Add Broadwell rt5650 machine driver
by Curtis Malainey 18 Dec '19

18 Dec '19

From: Ben Zhang <benzh(a)chromium.org> Add machine driver for Broadwell + rt5650. Signed-off-by: Bard Liao <bardliao(a)realtek.com> Signed-off-by: Ben Zhang <benzh(a)chromium.org> Signed-off-by: Mac Chiang <mac.chiang(a)intel.com> Signed-off-by: Jon Flatley <jflat(a)chromium.org> Signed-off-by: Curtis Malainey <cujomalainey(a)chromium.org> --- v2: * Addressed Pierre's comments * Added SOF dependencies * Added platform override * Fixed Kconfig * Moved to devm register v3: * Removed THIS_MODULE * Added PM Ops v4: * Fixed sparse warnings sound/soc/intel/boards/Kconfig | 12 + sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/bdw-rt5650.c | 319 ++++++++++++++++++ .../common/soc-acpi-intel-hsw-bdw-match.c | 7 + 4 files changed, 340 insertions(+) create mode 100644 sound/soc/intel/boards/bdw-rt5650.c diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig index 6c9fd9ad566ed..de613ae5052bf 100644 --- a/sound/soc/intel/boards/Kconfig +++ b/sound/soc/intel/boards/Kconfig @@ -31,6 +31,18 @@ endif ## SND_SOC_INTEL_HASWELL if SND_SOC_INTEL_HASWELL || SND_SOC_SOF_BROADWELL +config SND_SOC_INTEL_BDW_RT5650_MACH + tristate "Broadwell with RT5650 codec" + depends on I2C + depends on I2C_DESIGNWARE_PLATFORM || COMPILE_TEST + depends on X86_INTEL_LPSS || COMPILE_TEST + select SND_SOC_RT5645 + help + This adds the ASoC machine driver for Intel Broadwell platforms with + the RT5650 codec. + Say Y if you have such a device. + If unsure select "N". + config SND_SOC_INTEL_BDW_RT5677_MACH tristate "Broadwell with RT5677 codec" depends on I2C diff --git a/sound/soc/intel/boards/Makefile b/sound/soc/intel/boards/Makefile index ba1aa89db09d5..4efb3689503f8 100644 --- a/sound/soc/intel/boards/Makefile +++ b/sound/soc/intel/boards/Makefile @@ -2,6 +2,7 @@ snd-soc-sst-haswell-objs := haswell.o snd-soc-sst-byt-rt5640-mach-objs := byt-rt5640.o snd-soc-sst-byt-max98090-mach-objs := byt-max98090.o +snd-soc-sst-bdw-rt5650-mach-objs := bdw-rt5650.o snd-soc-sst-bdw-rt5677-mach-objs := bdw-rt5677.o snd-soc-sst-broadwell-objs := broadwell.o snd-soc-sst-bxt-da7219_max98357a-objs := bxt_da7219_max98357a.o hda_dsp_common.o @@ -37,6 +38,7 @@ obj-$(CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON) += snd-soc-sst-bxt-da721 obj-$(CONFIG_SND_SOC_INTEL_BXT_RT298_MACH) += snd-soc-sst-bxt-rt298.o obj-$(CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH) += snd-soc-sst-glk-rt5682_max98357a.o obj-$(CONFIG_SND_SOC_INTEL_BROADWELL_MACH) += snd-soc-sst-broadwell.o +obj-$(CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH) += snd-soc-sst-bdw-rt5650-mach.o obj-$(CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH) += snd-soc-sst-bdw-rt5677-mach.o obj-$(CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH) += snd-soc-sst-bytcr-rt5640.o obj-$(CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH) += snd-soc-sst-bytcr-rt5651.o diff --git a/sound/soc/intel/boards/bdw-rt5650.c b/sound/soc/intel/boards/bdw-rt5650.c new file mode 100644 index 0000000000000..ba3fc1ef900ab --- /dev/null +++ b/sound/soc/intel/boards/bdw-rt5650.c @@ -0,0 +1,319 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * ASoC machine driver for Intel Broadwell platforms with RT5650 codec + * + * Copyright 2019, The Chromium OS Authors. All rights reserved. + */ + +#include <linux/delay.h> +#include <linux/gpio/consumer.h> +#include <linux/module.h> +#include <linux/platform_device.h> +#include <sound/core.h> +#include <sound/jack.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include <sound/soc-acpi.h> + +#include "../common/sst-dsp.h" +#include "../haswell/sst-haswell-ipc.h" + +#include "../../codecs/rt5645.h" + +struct bdw_rt5650_priv { + struct gpio_desc *gpio_hp_en; + struct snd_soc_component *component; +}; + +static const struct snd_soc_dapm_widget bdw_rt5650_widgets[] = { + SND_SOC_DAPM_HP("Headphone", NULL), + SND_SOC_DAPM_SPK("Speaker", NULL), + SND_SOC_DAPM_MIC("Headset Mic", NULL), + SND_SOC_DAPM_MIC("DMIC Pair1", NULL), + SND_SOC_DAPM_MIC("DMIC Pair2", NULL), +}; + +static const struct snd_soc_dapm_route bdw_rt5650_map[] = { + /* Speakers */ + {"Speaker", NULL, "SPOL"}, + {"Speaker", NULL, "SPOR"}, + + /* Headset jack connectors */ + {"Headphone", NULL, "HPOL"}, + {"Headphone", NULL, "HPOR"}, + {"IN1P", NULL, "Headset Mic"}, + {"IN1N", NULL, "Headset Mic"}, + + /* Digital MICs + * DMIC Pair1 are the two DMICs connected on the DMICN1 connector. + * DMIC Pair2 are the two DMICs connected on the DMICN2 connector. + * Facing the camera, DMIC Pair1 are on the left side, DMIC Pair2 + * are on the right side. + */ + {"DMIC L1", NULL, "DMIC Pair1"}, + {"DMIC R1", NULL, "DMIC Pair1"}, + {"DMIC L2", NULL, "DMIC Pair2"}, + {"DMIC R2", NULL, "DMIC Pair2"}, + + /* CODEC BE connections */ + {"SSP0 CODEC IN", NULL, "AIF1 Capture"}, + {"AIF1 Playback", NULL, "SSP0 CODEC OUT"}, +}; + +static const struct snd_kcontrol_new bdw_rt5650_controls[] = { + SOC_DAPM_PIN_SWITCH("Speaker"), + SOC_DAPM_PIN_SWITCH("Headphone"), + SOC_DAPM_PIN_SWITCH("Headset Mic"), + SOC_DAPM_PIN_SWITCH("DMIC Pair1"), + SOC_DAPM_PIN_SWITCH("DMIC Pair2"), +}; + + +static struct snd_soc_jack headphone_jack; +static struct snd_soc_jack mic_jack; + +static struct snd_soc_jack_pin headphone_jack_pin = { + .pin = "Headphone", + .mask = SND_JACK_HEADPHONE, +}; + +static struct snd_soc_jack_pin mic_jack_pin = { + .pin = "Headset Mic", + .mask = SND_JACK_MICROPHONE, +}; + +static int broadwell_ssp0_fixup(struct snd_soc_pcm_runtime *rtd, + struct snd_pcm_hw_params *params) +{ + struct snd_interval *rate = hw_param_interval(params, + SNDRV_PCM_HW_PARAM_RATE); + struct snd_interval *channels = hw_param_interval(params, + SNDRV_PCM_HW_PARAM_CHANNELS); + + /* The ADSP will covert the FE rate to 48k, max 4-channels */ + rate->min = rate->max = 48000; + channels->min = 2; + channels->max = 4; + + /* set SSP0 to 24 bit */ + snd_mask_set_format(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT), + SNDRV_PCM_FORMAT_S24_LE); + + return 0; +} + +static int bdw_rt5650_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + int ret; + + /* Workaround: set codec PLL to 19.2MHz that PLL source is + * from MCLK(24MHz) to conform 2.4MHz DMIC clock. + */ + ret = snd_soc_dai_set_pll(codec_dai, 0, RT5645_PLL1_S_MCLK, + 24000000, 19200000); + if (ret < 0) { + dev_err(rtd->dev, "can't set codec pll: %d\n", ret); + return ret; + } + + /* The actual MCLK freq is 24MHz. The codec is told that MCLK is + * 24.576MHz to satisfy the requirement of rl6231_get_clk_info. + * ASRC is enabled on AD and DA filters to ensure good audio quality. + */ + ret = snd_soc_dai_set_sysclk(codec_dai, RT5645_SCLK_S_PLL1, 24576000, + SND_SOC_CLOCK_IN); + if (ret < 0) { + dev_err(rtd->dev, "can't set codec sysclk configuration\n"); + return ret; + } + + return ret; +} + +static struct snd_soc_ops bdw_rt5650_ops = { + .hw_params = bdw_rt5650_hw_params, +}; + +#if !IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL) +static int bdw_rt5650_rtd_init(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_component *component = + snd_soc_rtdcom_lookup(rtd, DRV_NAME); + struct sst_pdata *pdata = dev_get_platdata(component->dev); + struct sst_hsw *broadwell = pdata->dsp; + int ret; + + /* Set ADSP SSP port settings + * clock_divider = 4 means BCLK = MCLK/5 = 24MHz/5 = 4.8MHz + */ + ret = sst_hsw_device_set_config(broadwell, SST_HSW_DEVICE_SSP_0, + SST_HSW_DEVICE_MCLK_FREQ_24_MHZ, + SST_HSW_DEVICE_TDM_CLOCK_MASTER, 4); + if (ret < 0) { + dev_err(rtd->dev, "error: failed to set device config\n"); + return ret; + } + + return 0; +} +#endif + +static int bdw_rt5650_init(struct snd_soc_pcm_runtime *rtd) +{ + struct bdw_rt5650_priv *bdw_rt5650 = + snd_soc_card_get_drvdata(rtd->card); + struct snd_soc_component *component = rtd->codec_dai->component; + struct snd_soc_dai *codec_dai = rtd->codec_dai; + int ret; + + /* Enable codec ASRC function for Stereo DAC/Stereo1 ADC/DMIC/I2S1. + * The ASRC clock source is clk_i2s1_asrc. + */ + rt5645_sel_asrc_clk_src(component, + RT5645_DA_STEREO_FILTER | + RT5645_DA_MONO_L_FILTER | + RT5645_DA_MONO_R_FILTER | + RT5645_AD_STEREO_FILTER | + RT5645_AD_MONO_L_FILTER | + RT5645_AD_MONO_R_FILTER, + RT5645_CLK_SEL_I2S1_ASRC); + + /* TDM 4 slots 24 bit, set Rx & Tx bitmask to 4 active slots */ + ret = snd_soc_dai_set_tdm_slot(codec_dai, 0xF, 0xF, 4, 24); + + if (ret < 0) { + dev_err(rtd->dev, "can't set codec TDM slot %d\n", ret); + return ret; + } + + /* Create and initialize headphone jack */ + if (snd_soc_card_jack_new(rtd->card, "Headphone Jack", + SND_JACK_HEADPHONE, &headphone_jack, + &headphone_jack_pin, 1)) { + dev_err(component->dev, "Can't create headphone jack\n"); + } + + /* Create and initialize mic jack */ + if (snd_soc_card_jack_new(rtd->card, "Mic Jack", SND_JACK_MICROPHONE, + &mic_jack, &mic_jack_pin, 1)) { + dev_err(component->dev, "Can't create mic jack\n"); + } + + rt5645_set_jack_detect(component, &headphone_jack, &mic_jack, NULL); + + bdw_rt5650->component = component; + + return 0; +} + +/* broadwell digital audio interface glue - connects codec <--> CPU */ +SND_SOC_DAILINK_DEF(dummy, + DAILINK_COMP_ARRAY(COMP_DUMMY())); + +SND_SOC_DAILINK_DEF(fe, + DAILINK_COMP_ARRAY(COMP_CPU("System Pin"))); + +SND_SOC_DAILINK_DEF(platform, + DAILINK_COMP_ARRAY(COMP_PLATFORM("haswell-pcm-audio"))); + +SND_SOC_DAILINK_DEF(be, + DAILINK_COMP_ARRAY(COMP_CODEC("i2c-10EC5650:00", "rt5645-aif1"))); + +static struct snd_soc_dai_link bdw_rt5650_dais[] = { + /* Front End DAI links */ + { + .name = "System PCM", + .stream_name = "System Playback", + .dynamic = 1, +#if !IS_ENABLED(CONFIG_SND_SOC_SOF_BROADWELL) + .init = bdw_rt5650_rtd_init, +#endif + .trigger = { + SND_SOC_DPCM_TRIGGER_POST, + SND_SOC_DPCM_TRIGGER_POST + }, + .dpcm_playback = 1, + .dpcm_capture = 1, + SND_SOC_DAILINK_REG(fe, dummy, platform), + }, + + /* Back End DAI links */ + { + /* SSP0 - Codec */ + .name = "Codec", + .id = 0, + .no_pcm = 1, + .dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, + .ignore_suspend = 1, + .ignore_pmdown_time = 1, + .be_hw_params_fixup = broadwell_ssp0_fixup, + .ops = &bdw_rt5650_ops, + .dpcm_playback = 1, + .dpcm_capture = 1, + .init = bdw_rt5650_init, + SND_SOC_DAILINK_REG(dummy, be, dummy), + }, +}; + +/* ASoC machine driver for Broadwell DSP + RT5650 */ +static struct snd_soc_card bdw_rt5650_card = { + .name = "bdw-rt5650", + .owner = THIS_MODULE, + .dai_link = bdw_rt5650_dais, + .num_links = ARRAY_SIZE(bdw_rt5650_dais), + .dapm_widgets = bdw_rt5650_widgets, + .num_dapm_widgets = ARRAY_SIZE(bdw_rt5650_widgets), + .dapm_routes = bdw_rt5650_map, + .num_dapm_routes = ARRAY_SIZE(bdw_rt5650_map), + .controls = bdw_rt5650_controls, + .num_controls = ARRAY_SIZE(bdw_rt5650_controls), + .fully_routed = true, +}; + +static int bdw_rt5650_probe(struct platform_device *pdev) +{ + struct bdw_rt5650_priv *bdw_rt5650; + struct snd_soc_acpi_mach *mach; + int ret; + + bdw_rt5650_card.dev = &pdev->dev; + + /* Allocate driver private struct */ + bdw_rt5650 = devm_kzalloc(&pdev->dev, sizeof(struct bdw_rt5650_priv), + GFP_KERNEL); + if (!bdw_rt5650) + return -ENOMEM; + + /* override plaform name, if required */ + mach = (&pdev->dev)->platform_data; + ret = snd_soc_fixup_dai_links_platform_name(&bdw_rt5650_card, + mach->mach_params.platform); + + if (ret) + return ret; + + snd_soc_card_set_drvdata(&bdw_rt5650_card, bdw_rt5650); + + return devm_snd_soc_register_card(&pdev->dev, &bdw_rt5650_card); +} + +static struct platform_driver bdw_rt5650_audio = { + .probe = bdw_rt5650_probe, + .driver = { + .name = "bdw-rt5650", + .pm = &snd_soc_pm_ops, + }, +}; + +module_platform_driver(bdw_rt5650_audio) + +/* Module information */ +MODULE_AUTHOR("Ben Zhang <benzh(a)chromium.org>"); +MODULE_DESCRIPTION("Intel Broadwell RT5650 machine driver"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:bdw-rt5650"); diff --git a/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c b/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c index 34eb0baaa9517..35958553652ec 100644 --- a/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c +++ b/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c @@ -29,6 +29,13 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_broadwell_machines[] = { .sof_fw_filename = "sof-bdw.ri", .sof_tplg_filename = "sof-bdw-rt286.tplg", }, + { + .id = "10EC5650", + .drv_name = "bdw-rt5650", + .fw_filename = "intel/IntcSST2.bin", + .sof_fw_filename = "sof-bdw.ri", + .sof_tplg_filename = "sof-bdw-rt5650.tplg", + }, { .id = "RT5677CE", .drv_name = "bdw-rt5677", -- 2.24.1.735.g03f4e72817-goog

3 2

[alsa-devel] [PATCH] ALSA: ice1724: Fix sleep-in-atomic in Infrasonic Quartet support code
by Takashi Iwai 18 Dec '19

18 Dec '19

Jia-Ju Bai reported a possible sleep-in-atomic scenario in the ice1724 driver with Infrasonic Quartet support code: namely, ice->set_rate callback gets called inside ice->reg_lock spinlock, while the callback in quartet.c holds ice->gpio_mutex. This patch fixes the invalid call: it simply moves the calls of ice->set_rate and ice->set_mclk callbacks outside the spinlock. Reported-by: Jia-Ju Bai <baijiaju1990(a)gmail.com> Cc: <stable(a)vger.kernel.org> Link: https://lore.kernel.org/r/5d43135e-73b9-a46a-2155-9e91d0dcdf83@gmail.com Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/pci/ice1712/ice1724.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index c80a16ee6e76..242542e23d28 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c @@ -647,6 +647,7 @@ static int snd_vt1724_set_pro_rate(struct snd_ice1712 *ice, unsigned int rate, unsigned long flags; unsigned char mclk_change; unsigned int i, old_rate; + bool call_set_rate = false; if (rate > ice->hw_rates->list[ice->hw_rates->count - 1]) return -EINVAL; @@ -670,7 +671,7 @@ static int snd_vt1724_set_pro_rate(struct snd_ice1712 *ice, unsigned int rate, * setting clock rate for internal clock mode */ old_rate = ice->get_rate(ice); if (force || (old_rate != rate)) - ice->set_rate(ice, rate); + call_set_rate = true; else if (rate == ice->cur_rate) { spin_unlock_irqrestore(&ice->reg_lock, flags); return 0; @@ -678,12 +679,14 @@ static int snd_vt1724_set_pro_rate(struct snd_ice1712 *ice, unsigned int rate, } ice->cur_rate = rate; + spin_unlock_irqrestore(&ice->reg_lock, flags); + + if (call_set_rate) + ice->set_rate(ice, rate); /* setting master clock */ mclk_change = ice->set_mclk(ice, rate); - spin_unlock_irqrestore(&ice->reg_lock, flags); - if (mclk_change && ice->gpio.i2s_mclk_changed) ice->gpio.i2s_mclk_changed(ice); if (ice->gpio.set_pro_rate) -- 2.16.4

1 0

[alsa-devel] [BUG] ALSA: ice1712: a possible sleep-in-atomic-context bug in snd_vt1724_set_pro_rate()
by Jia-Ju Bai 18 Dec '19

18 Dec '19

The driver may sleep while holding a read lock. The function call path (from bottom to top) in Linux 4.19 is: sound/pci/ice1712/quartet.c, 414: mutex_lock in reg_write sound/pci/ice1712/quartet.c, 485: reg_write in set_cpld sound/pci/ice1712/quartet.c, 876: set_cpld in qtet_set_rate sound/pci/ice1712/ice1724.c, 687: (FUNC_PTR) qtet_set_rate in snd_vt1724_set_pro_rate sound/pci/ice1712/ice1724.c, 668: _raw_spin_lock_irqsave in snd_vt1724_set_pro_rate (FUNC_PTR) means a function pointer is called. mutex_lock() can sleep at runtime. I am not sure how to properly fix this possible bug, so I only report it. This bug is found by a static analysis tool STCheck written by myself. Best wishes, Jia-Ju Bai

2 1