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

[alsa-devel] [PATCH] Revert "ALSA: hda: Add codec on bus address table lately"
by Takashi Iwai 15 Aug '19

15 Aug '19

This reverts commit ee5f85d9290f ("ALSA: hda: Add codec on bus address table lately"). The commit caused several regression since I've overlooked that the function doesn't manage only the caddr_tbl but also the codec linked list that is referred indirectly in the other drivers. Revert for now to make everything back to work. Fixes: ee5f85d9290f ("ALSA: hda: Add codec on bus address table lately") Reported-by: Chris Wilson <chris(a)chris-wilson.co.uk> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/hda/hdac_device.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/sound/hda/hdac_device.c b/sound/hda/hdac_device.c index bf83d7062ef6..9f3e37511408 100644 --- a/sound/hda/hdac_device.c +++ b/sound/hda/hdac_device.c @@ -61,6 +61,10 @@ int snd_hdac_device_init(struct hdac_device *codec, struct hdac_bus *bus, pm_runtime_get_noresume(&codec->dev); atomic_set(&codec->in_pm, 0); + err = snd_hdac_bus_add_device(bus, codec); + if (err < 0) + goto error; + /* fill parameters */ codec->vendor_id = snd_hdac_read_parm(codec, AC_NODE_ROOT, AC_PAR_VENDOR_ID); @@ -139,22 +143,15 @@ int snd_hdac_device_register(struct hdac_device *codec) err = device_add(&codec->dev); if (err < 0) return err; - err = snd_hdac_bus_add_device(codec->bus, codec); - if (err < 0) - goto error; mutex_lock(&codec->widget_lock); err = hda_widget_sysfs_init(codec); mutex_unlock(&codec->widget_lock); - if (err < 0) - goto error_remove; + if (err < 0) { + device_del(&codec->dev); + return err; + } return 0; - - error_remove: - snd_hdac_bus_remove_device(codec->bus, codec); - error: - device_del(&codec->dev); - return err; } EXPORT_SYMBOL_GPL(snd_hdac_device_register); @@ -168,8 +165,8 @@ void snd_hdac_device_unregister(struct hdac_device *codec) mutex_lock(&codec->widget_lock); hda_widget_sysfs_exit(codec); mutex_unlock(&codec->widget_lock); - snd_hdac_bus_remove_device(codec->bus, codec); device_del(&codec->dev); + snd_hdac_bus_remove_device(codec->bus, codec); } } EXPORT_SYMBOL_GPL(snd_hdac_device_unregister); -- 2.16.4

1 0

[alsa-devel] [PATCH 0/4] ASoC: SOF: initial support for Intel ALH/SoundWire DAIs
by Pierre-Louis Bossart 15 Aug '19

15 Aug '19

This patchset adds the basic functionality to extract DAI information from the topology and send the information to firmware. At the moment there is no specific configuration in topology file, all the programming takes place based on the dai index and the related ALH stream ID. The renaming from SoundWire to ALH (Audio Link Hub) is a better representation of the hardware, the ALH acts as a proxy between the DMA transfers and the Cadence IP. Bard liao (1): ASoC: SOF: rename SOUNDWIRE to ALH Pierre-Louis Bossart (3): ASoC: SOF: ipc: add ALH parameters ASoC: SOF: topology: initial support for Intel ALH DAI type ASoC: SOF: pcm: add ALH support include/sound/sof/dai-intel.h | 9 ++++++++ include/sound/sof/dai.h | 3 ++- include/uapi/sound/sof/abi.h | 2 +- sound/soc/sof/pcm.c | 3 +++ sound/soc/sof/topology.c | 42 ++++++++++++++++++++++++++++++++++- 5 files changed, 56 insertions(+), 3 deletions(-) -- 2.20.1

2 8

Re: [alsa-devel] [PATCH] ASoC: intel: cht_bsw_max98090_ti: Add all Chromebooks that need pmc_plt_clk_0 quirk
by Hans de Goede 15 Aug '19

15 Aug '19

Hi, On 15-08-19 19:12, Daniel Stuart wrote: > Every single baytrail chromebook sets PMC to 0, as can be seeing > below by searching through coreboot source code: > $ grep -rl "PMC_PLT_CLK\[0\]" . > ./rambi/variants/glimmer/devicetree.cb > ./rambi/variants/clapper/devicetree.cb > ./rambi/variants/swanky/devicetree.cb > ./rambi/variants/enguarde/devicetree.cb > ./rambi/variants/winky/devicetree.cb > ./rambi/variants/kip/devicetree.cb > ./rambi/variants/squawks/devicetree.cb > ./rambi/variants/orco/devicetree.cb > ./rambi/variants/ninja/devicetree.cb > ./rambi/variants/heli/devicetree.cb > ./rambi/variants/sumo/devicetree.cb > ./rambi/variants/banjo/devicetree.cb > ./rambi/variants/candy/devicetree.cb > ./rambi/variants/gnawty/devicetree.cb > ./rambi/variants/rambi/devicetree.cb > ./rambi/variants/quawks/devicetree.cb > > Plus, Cyan (only non-baytrail chromebook with max98090) also needs > this patch for audio to work. > > Thus, this commit adds all the missing devices to bsw_max98090 quirk > table, implemented by commit a182ecd3809c ("ASoC: intel: > cht_bsw_max98090_ti: Add quirk for boards using pmc_plt_clk_0"). > > Signed-off-by: Daniel Stuart <daniel.stuart14(a)gmail.com> Thank you for catching this, this patch looks good to me: Reviewed-by: Hans de Goede <hdegoede(a)redhat.com> Regards, Hans > --- > sound/soc/intel/boards/cht_bsw_max98090_ti.c | 98 ++++++++++++++++++++ > 1 file changed, 98 insertions(+) > > diff --git a/sound/soc/intel/boards/cht_bsw_max98090_ti.c b/sound/soc/intel/boards/cht_bsw_max98090_ti.c > index 33eb72545be6..83b978e7b4c4 100644 > --- a/sound/soc/intel/boards/cht_bsw_max98090_ti.c > +++ b/sound/soc/intel/boards/cht_bsw_max98090_ti.c > @@ -399,6 +399,20 @@ static struct snd_soc_card snd_soc_card_cht = { > }; > > static const struct dmi_system_id cht_max98090_quirk_table[] = { > + { > + /* Banjo model Chromebook */ > + .matches = { > + DMI_MATCH(DMI_PRODUCT_NAME, "Banjo"), > + }, > + .driver_data = (void *)QUIRK_PMC_PLT_CLK_0, > + }, > + { > + /* Candy model Chromebook */ > + .matches = { > + DMI_MATCH(DMI_PRODUCT_NAME, "Candy"), > + }, > + .driver_data = (void *)QUIRK_PMC_PLT_CLK_0, > + }, > { > /* Clapper model Chromebook */ > .matches = { > @@ -406,6 +420,27 @@ static const struct dmi_system_id cht_max98090_quirk_table[] = { > }, > .driver_data = (void *)QUIRK_PMC_PLT_CLK_0, > }, > + { > + /* Cyan model Chromebook */ > + .matches = { > + DMI_MATCH(DMI_PRODUCT_NAME, "Cyan"), > + }, > + .driver_data = (void *)QUIRK_PMC_PLT_CLK_0, > + }, > + { > + /* Enguarde model Chromebook */ > + .matches = { > + DMI_MATCH(DMI_PRODUCT_NAME, "Enguarde"), > + }, > + .driver_data = (void *)QUIRK_PMC_PLT_CLK_0, > + }, > + { > + /* Glimmer model Chromebook */ > + .matches = { > + DMI_MATCH(DMI_PRODUCT_NAME, "Glimmer"), > + }, > + .driver_data = (void *)QUIRK_PMC_PLT_CLK_0, > + }, > { > /* Gnawty model Chromebook (Acer Chromebook CB3-111) */ > .matches = { > @@ -413,6 +448,62 @@ static const struct dmi_system_id cht_max98090_quirk_table[] = { > }, > .driver_data = (void *)QUIRK_PMC_PLT_CLK_0, > }, > + { > + /* Heli model Chromebook */ > + .matches = { > + DMI_MATCH(DMI_PRODUCT_NAME, "Heli"), > + }, > + .driver_data = (void *)QUIRK_PMC_PLT_CLK_0, > + }, > + { > + /* Kip model Chromebook */ > + .matches = { > + DMI_MATCH(DMI_PRODUCT_NAME, "Kip"), > + }, > + .driver_data = (void *)QUIRK_PMC_PLT_CLK_0, > + }, > + { > + /* Ninja model Chromebook */ > + .matches = { > + DMI_MATCH(DMI_PRODUCT_NAME, "Ninja"), > + }, > + .driver_data = (void *)QUIRK_PMC_PLT_CLK_0, > + }, > + { > + /* Orco model Chromebook */ > + .matches = { > + DMI_MATCH(DMI_PRODUCT_NAME, "Orco"), > + }, > + .driver_data = (void *)QUIRK_PMC_PLT_CLK_0, > + }, > + { > + /* Quawks model Chromebook */ > + .matches = { > + DMI_MATCH(DMI_PRODUCT_NAME, "Quawks"), > + }, > + .driver_data = (void *)QUIRK_PMC_PLT_CLK_0, > + }, > + { > + /* Rambi model Chromebook */ > + .matches = { > + DMI_MATCH(DMI_PRODUCT_NAME, "Rambi"), > + }, > + .driver_data = (void *)QUIRK_PMC_PLT_CLK_0, > + }, > + { > + /* Squawks model Chromebook */ > + .matches = { > + DMI_MATCH(DMI_PRODUCT_NAME, "Squawks"), > + }, > + .driver_data = (void *)QUIRK_PMC_PLT_CLK_0, > + }, > + { > + /* Sumo model Chromebook */ > + .matches = { > + DMI_MATCH(DMI_PRODUCT_NAME, "Sumo"), > + }, > + .driver_data = (void *)QUIRK_PMC_PLT_CLK_0, > + }, > { > /* Swanky model Chromebook (Toshiba Chromebook 2) */ > .matches = { > @@ -420,6 +511,13 @@ static const struct dmi_system_id cht_max98090_quirk_table[] = { > }, > .driver_data = (void *)QUIRK_PMC_PLT_CLK_0, > }, > + { > + /* Winky model Chromebook */ > + .matches = { > + DMI_MATCH(DMI_PRODUCT_NAME, "Winky"), > + }, > + .driver_data = (void *)QUIRK_PMC_PLT_CLK_0, > + }, > {} > }; > >

1 0

[alsa-devel] [PATCH] ASoC: rockchip: rockchip_max98090: Set period size to 240
by Cheng-Yi Chiang 15 Aug '19

15 Aug '19

>From stress testing of arecord, we found that period size greater than ~900 will bring pl330 to DYING state and can not recover within 100 iterations. The result is that arecord will stuck and get I/O error, and issue can not be recovered until reboot. This issue does not happen when period size is small. Set constraint of period size to 240 to prevent such issue. With the constraint, there will be no issue after 2000 iterations. We can revert this patch once the root cause is found in rockchip's pl330 implementation. Signed-off-by: Cheng-Yi Chiang <cychiang(a)chromium.org> --- sound/soc/rockchip/rockchip_max98090.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/sound/soc/rockchip/rockchip_max98090.c b/sound/soc/rockchip/rockchip_max98090.c index 7b0c21fa6dca..0097df1fae66 100644 --- a/sound/soc/rockchip/rockchip_max98090.c +++ b/sound/soc/rockchip/rockchip_max98090.c @@ -137,8 +137,19 @@ static int rk_aif1_hw_params(struct snd_pcm_substream *substream, return ret; } +static int rk_aif1_startup(struct snd_pcm_substream *substream) +{ + /* + * Set period size to 240 because pl330 has issue + * dealing with larger period in stress testing. + */ + return snd_pcm_hw_constraint_minmax(substream->runtime, + SNDRV_PCM_HW_PARAM_PERIOD_SIZE, 240, 240); +} + static const struct snd_soc_ops rk_aif1_ops = { .hw_params = rk_aif1_hw_params, + .startup = rk_aif1_startup, }; SND_SOC_DAILINK_DEFS(hifi, -- 2.23.0.rc1.153.gdeed80330f-goog

2 1

[alsa-devel] [PATCH -next] ASoC: es8328: Fix copy-paste error in es8328_right_line_controls
by YueHaibing 15 Aug '19

15 Aug '19

It seems 'es8328_rline_enum' should be used in es8328_right_line_controls Fixes: 567e4f98922c ("ASoC: add es8328 codec driver") Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> --- sound/soc/codecs/es8328.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/es8328.c b/sound/soc/codecs/es8328.c index 4a3d303..fdf64c2 100644 --- a/sound/soc/codecs/es8328.c +++ b/sound/soc/codecs/es8328.c @@ -227,7 +227,7 @@ static const struct soc_enum es8328_rline_enum = ARRAY_SIZE(es8328_line_texts), es8328_line_texts); static const struct snd_kcontrol_new es8328_right_line_controls = - SOC_DAPM_ENUM("Route", es8328_lline_enum); + SOC_DAPM_ENUM("Route", es8328_rline_enum); /* Left Mixer */ static const struct snd_kcontrol_new es8328_left_mixer_controls[] = { -- 2.7.4

2 2

[alsa-devel] [PATCH] ASoC: ti: Fix typos in ti/Kconfig
by Masanari Iida 15 Aug '19

15 Aug '19

This patch fixes some spelling typo in Kconfig. Signed-off-by: Masanari Iida <standby24x7(a)gmail.com> --- sound/soc/ti/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/ti/Kconfig b/sound/soc/ti/Kconfig index 2197f3e1eaed..87a9b9dd4e98 100644 --- a/sound/soc/ti/Kconfig +++ b/sound/soc/ti/Kconfig @@ -12,7 +12,7 @@ config SND_SOC_TI_SDMA_PCM comment "Texas Instruments DAI support for:" config SND_SOC_DAVINCI_ASP - tristate "daVinci Audio Serial Port (ASP) or McBSP suport" + tristate "daVinci Audio Serial Port (ASP) or McBSP support" depends on ARCH_DAVINCI || COMPILE_TEST select SND_SOC_TI_EDMA_PCM help @@ -33,7 +33,7 @@ config SND_SOC_DAVINCI_MCASP - Keystone devices config SND_SOC_DAVINCI_VCIF - tristate "daVinci Voice Interface (VCIF) suport" + tristate "daVinci Voice Interface (VCIF) support" depends on ARCH_DAVINCI || COMPILE_TEST select SND_SOC_TI_EDMA_PCM help -- 2.23.0.rc2

3 2

[alsa-devel] [PATCH] ASoC: SOF: fix HDA direct MMIO access
by Pierre-Louis Bossart 15 Aug '19

15 Aug '19

The recent change to remove the bus->io_ops callbacks used an older version of the SOF code base, and when merged into Mark's for-next it invalidated changes, resulting in broken compilation identified by kbuild and reproduced during the weekly SOF rebase. Restore SOF code overridden by git merge and apply Takashi's intended change in the 'right' location. Fixes: c2f16a94a8049 ("Merge branch 'topic/hda-bus-ops-cleanup'") Reported-by: kbuild test robot <lkp(a)intel.com> Cc: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/sof/intel/hda-ctrl.c | 2 +- sound/soc/sof/intel/hda-dsp.c | 39 ---------------------------------- 2 files changed, 1 insertion(+), 40 deletions(-) diff --git a/sound/soc/sof/intel/hda-ctrl.c b/sound/soc/sof/intel/hda-ctrl.c index a7fee403cb90..bc41028a7a01 100644 --- a/sound/soc/sof/intel/hda-ctrl.c +++ b/sound/soc/sof/intel/hda-ctrl.c @@ -254,7 +254,7 @@ int hda_dsp_ctrl_init_chip(struct snd_sof_dev *sdev, bool full_reset) #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) /* Reset stream-to-link mapping */ list_for_each_entry(hlink, &bus->hlink_list, list) - bus->io_ops->reg_writel(0, hlink->ml_addr + AZX_REG_ML_LOSIDV); + writel(0, hlink->ml_addr + AZX_REG_ML_LOSIDV); #endif bus->chip_init = true; diff --git a/sound/soc/sof/intel/hda-dsp.c b/sound/soc/sof/intel/hda-dsp.c index 097727cda5cb..fb55a3c5afd0 100644 --- a/sound/soc/sof/intel/hda-dsp.c +++ b/sound/soc/sof/intel/hda-dsp.c @@ -354,45 +354,6 @@ static int hda_resume(struct snd_sof_dev *sdev, bool runtime_resume) return ret; } - hda_dsp_ctrl_misc_clock_gating(sdev, false); - - /* Reset stream-to-link mapping */ - list_for_each_entry(hlink, &bus->hlink_list, list) - writel(0, hlink->ml_addr + AZX_REG_ML_LOSIDV); - - hda_dsp_ctrl_misc_clock_gating(sdev, true); -#else - - hda_dsp_ctrl_misc_clock_gating(sdev, false); - - /* reset controller */ - ret = hda_dsp_ctrl_link_reset(sdev, true); - if (ret < 0) { - dev_err(sdev->dev, - "error: failed to reset controller during resume\n"); - return ret; - } - - /* take controller out of reset */ - ret = hda_dsp_ctrl_link_reset(sdev, false); - if (ret < 0) { - dev_err(sdev->dev, - "error: failed to ready controller during resume\n"); - return ret; - } - - /* enable hda bus irq */ - snd_sof_dsp_update_bits(sdev, HDA_DSP_HDA_BAR, SOF_HDA_INTCTL, - SOF_HDA_INT_CTRL_EN | SOF_HDA_INT_GLOBAL_EN, - SOF_HDA_INT_CTRL_EN | SOF_HDA_INT_GLOBAL_EN); - - hda_dsp_ctrl_misc_clock_gating(sdev, true); -#endif - - /* enable ppcap interrupt */ - hda_dsp_ctrl_ppcap_enable(sdev, true); - hda_dsp_ctrl_ppcap_int_enable(sdev, true); - #if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA) /* check jack status */ if (runtime_resume) -- 2.20.1

2 1

[alsa-devel] [PATCH] ASoC: Intel: hsw: remove i386 build warning w/ size_t argument
by Pierre-Louis Bossart 15 Aug '19

15 Aug '19

Recent changes in the common IPC code introduced a build warning with size_t fields, use the correct %zu format. include/linux/dynamic_debug.h:82:16: warning: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'size_t' [-Wformat=] Fixes: abf31feea26c0 ('ASoC: Intel: Update request-reply IPC model') Reported-by: kbuild test robot <lkp(a)intel.com> Cc: Cezary Rojewski <cezary.rojewski(a)intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- sound/soc/intel/haswell/sst-haswell-ipc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/intel/haswell/sst-haswell-ipc.c b/sound/soc/intel/haswell/sst-haswell-ipc.c index 5c73b11375e3..0ff89ea96ccf 100644 --- a/sound/soc/intel/haswell/sst-haswell-ipc.c +++ b/sound/soc/intel/haswell/sst-haswell-ipc.c @@ -2015,11 +2015,11 @@ int sst_hsw_module_set_param(struct sst_hsw *hsw, if (payload_size <= SST_HSW_IPC_MAX_SHORT_PARAMETER_SIZE) { /* short parameter, mailbox can contain data */ - dev_dbg(dev, "transfer parameter size : %lu\n", + dev_dbg(dev, "transfer parameter size : %zu\n", request.size); request.size = ALIGN(payload_size, 4); - dev_dbg(dev, "transfer parameter aligned size : %lu\n", + dev_dbg(dev, "transfer parameter aligned size : %zu\n", request.size); parameter = kzalloc(request.size, GFP_KERNEL); -- 2.20.1

3 2

[alsa-devel] [PATCH -next] ASoC: wm8737: Fix copy-paste error in wm8737_snd_controls
by YueHaibing 15 Aug '19

15 Aug '19

sound/soc/codecs/wm8737.c:112:29: warning: high_3d defined but not used [-Wunused-const-variable=] 'high_3d' should be used for 3D High Cut-off. Reported-by: Hulk Robot <hulkci(a)huawei.com> Fixes: 2a9ae13a2641 ("ASoC: Add initial WM8737 driver") Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> --- sound/soc/codecs/wm8737.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm8737.c b/sound/soc/codecs/wm8737.c index 0c246fb..7a3f9fb 100644 --- a/sound/soc/codecs/wm8737.c +++ b/sound/soc/codecs/wm8737.c @@ -167,7 +167,7 @@ SOC_DOUBLE("Polarity Invert Switch", WM8737_ADC_CONTROL, 5, 6, 1, 0), SOC_SINGLE("3D Switch", WM8737_3D_ENHANCE, 0, 1, 0), SOC_SINGLE("3D Depth", WM8737_3D_ENHANCE, 1, 15, 0), SOC_ENUM("3D Low Cut-off", low_3d), -SOC_ENUM("3D High Cut-off", low_3d), +SOC_ENUM("3D High Cut-off", high_3d), SOC_SINGLE_TLV("3D ADC Volume", WM8737_3D_ENHANCE, 7, 1, 1, adc_tlv), SOC_SINGLE("Noise Gate Switch", WM8737_NOISE_GATE, 0, 1, 0), -- 2.7.4

3 2

[alsa-devel] [PATCH -next] ASoC: cs4349: Use PM ops 'cs4349_runtime_pm'
by YueHaibing 15 Aug '19

15 Aug '19

sound/soc/codecs/cs4349.c:358:32: warning: cs4349_runtime_pm defined but not used [-Wunused-const-variable=] cs4349_runtime_pm ops already defined, it seems we should enable it. Reported-by: Hulk Robot <hulkci(a)huawei.com> Fixes: e40da86 ("ASoC: cs4349: Add support for Cirrus Logic CS4349") Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> --- sound/soc/codecs/cs4349.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/cs4349.c b/sound/soc/codecs/cs4349.c index 09716fa..e0d44f6 100644 --- a/sound/soc/codecs/cs4349.c +++ b/sound/soc/codecs/cs4349.c @@ -378,6 +378,7 @@ static struct i2c_driver cs4349_i2c_driver = { .driver = { .name = "cs4349", .of_match_table = cs4349_of_match, + .pm = &cs4349_runtime_pm, }, .id_table = cs4349_i2c_id, .probe = cs4349_i2c_probe, -- 2.7.4

2 2