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

[alsa-devel] [PATCH -next] ASoC: sprd: Fix to use list_for_each_entry_safe() when delete items
by Wei Yongjun 02 May '19

02 May '19

Since we will remove items off the list using list_del() we need to use a safe version of the list_for_each_entry() macro aptly named list_for_each_entry_safe(). Fixes: d7bff893e04f ("ASoC: sprd: Add Spreadtrum multi-channel data transfer support") Signed-off-by: Wei Yongjun <weiyongjun1(a)huawei.com> --- sound/soc/sprd/sprd-mcdt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/sprd/sprd-mcdt.c b/sound/soc/sprd/sprd-mcdt.c index 28f5e649733d..df250f7f2b6f 100644 --- a/sound/soc/sprd/sprd-mcdt.c +++ b/sound/soc/sprd/sprd-mcdt.c @@ -978,12 +978,12 @@ static int sprd_mcdt_probe(struct platform_device *pdev) static int sprd_mcdt_remove(struct platform_device *pdev) { - struct sprd_mcdt_chan *temp; + struct sprd_mcdt_chan *chan, *temp; mutex_lock(&sprd_mcdt_list_mutex); - list_for_each_entry(temp, &sprd_mcdt_chan_list, list) - list_del(&temp->list); + list_for_each_entry_safe(chan, temp, &sprd_mcdt_chan_list, list) + list_del(&chan->list); mutex_unlock(&sprd_mcdt_list_mutex);

3 2

[alsa-devel] [PATCH -next] ASoC: sprd: Fix return value check in sprd_mcdt_probe()
by Wei Yongjun 02 May '19

02 May '19

In case of error, the function devm_ioremap_resource() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Fixes: d7bff893e04f ("ASoC: sprd: Add Spreadtrum multi-channel data transfer support") Signed-off-by: Wei Yongjun <weiyongjun1(a)huawei.com> --- sound/soc/sprd/sprd-mcdt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/sprd/sprd-mcdt.c b/sound/soc/sprd/sprd-mcdt.c index 28f5e649733d..e9318d7a4810 100644 --- a/sound/soc/sprd/sprd-mcdt.c +++ b/sound/soc/sprd/sprd-mcdt.c @@ -951,8 +951,8 @@ static int sprd_mcdt_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); mcdt->base = devm_ioremap_resource(&pdev->dev, res); - if (!mcdt->base) - return -ENOMEM; + if (IS_ERR(mcdt->base)) + return PTR_ERR(mcdt->base); mcdt->dev = &pdev->dev; spin_lock_init(&mcdt->lock);

3 2

[alsa-devel] [PATCH V6] ASoC: fsl_esai: Fix missing break in switch statement
by S.j. Wang 02 May '19

02 May '19

case ESAI_HCKT_EXTAL and case ESAI_HCKR_EXTAL should be independent of each other, so replace fall-through with break. Fixes: 43d24e76b698 ("ASoC: fsl_esai: Add ESAI CPU DAI driver") Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> Acked-by: Nicolin Chen <nicoleotsuka(a)gmail.com> Cc: <stable(a)vger.kernel.org> --- Changes in V6 - resend base one for-5.2 Changes in v5 - remove new line after Fixes Changes in v4 - Add acked-by Changes in v3 - Update subject line and cc stable Changes in v2 - Fix "Fixes" tag sound/soc/fsl/fsl_esai.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/fsl/fsl_esai.c b/sound/soc/fsl/fsl_esai.c index c7410bbfd2af..bad0dfed6b68 100644 --- a/sound/soc/fsl/fsl_esai.c +++ b/sound/soc/fsl/fsl_esai.c @@ -251,7 +251,7 @@ static int fsl_esai_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id, break; case ESAI_HCKT_EXTAL: ecr |= ESAI_ECR_ETI; - /* fall through */ + break; case ESAI_HCKR_EXTAL: ecr |= esai_priv->synchronous ? ESAI_ECR_ETI : ESAI_ECR_ERI; break; -- 1.9.1

2 1

[alsa-devel] [PATCH v2] ASoC: tlv320aic3x: Add support for high power analog output
by Saravanan Sekar 02 May '19

02 May '19

Add support to output level control for the analog high power output drivers HPOUT and HPCOM. Signed-off-by: Saravanan Sekar <sravanhome(a)gmail.com> --- Notes: Changes in V2: - Removed power control as it is handled by DAPM - Added level control for left channel sound/soc/codecs/tlv320aic3x.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 516d17cb2182..90f53f9b5c2f 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -324,6 +324,9 @@ static DECLARE_TLV_DB_SCALE(adc_tlv, 0, 50, 0); */ static DECLARE_TLV_DB_SCALE(output_stage_tlv, -5900, 50, 1); +/* HP/HPCOM volumes. From 0 to 9 dB in 1 dB steps */ +static DECLARE_TLV_DB_SCALE(hp_tlv, 0, 100, 0); + static const struct snd_kcontrol_new aic3x_snd_controls[] = { /* Output */ SOC_DOUBLE_R_TLV("PCM Playback Volume", @@ -419,6 +422,12 @@ static const struct snd_kcontrol_new aic3x_snd_controls[] = { /* Pop reduction */ SOC_ENUM("Output Driver Power-On time", aic3x_poweron_time_enum), SOC_ENUM("Output Driver Ramp-up step", aic3x_rampup_step_enum), + + /* Analog HPOUT, HPCOM output level controls */ + SOC_DOUBLE_R_TLV("HP Playback Volume", HPLOUT_CTRL, HPROUT_CTRL, + 4, 9, 0, hp_tlv); + SOC_DOUBLE_R_TLV("HPCOM Playback Volume", HPLCOM_CTRL, HPRCOM_CTRL, + 4, 9, 0, hp_tlv); }; /* For other than tlv320aic3104 */ -- 2.17.1

2 1

[alsa-devel] Correct git tree for ALSA development
by Ross Zwisler 02 May '19

02 May '19

Hi, I'm trying to ramp up a bit on ALSA development, and I noticed that many sound-related entries in MAINTAINERS still refer to alsa-kernel.git hosted on alsa-project.org, i.e.: BT87X AUDIO DRIVER M: Clemens Ladisch <clemens(a)ladisch.de> L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) T: git git://git.alsa-project.org/alsa-kernel.git S: Maintained F: Documentation/sound/cards/bt87x.rst F: sound/pci/bt87x.c >From the alsa-project.org pages: https://alsa-project.org/wiki/Download#Developers:_GIT_access https://alsa-project.org/wiki/GIT_Server#For_developers_-_kernel_drivers it seems like current development/maintenance actually happens somewhere else, possibly on Mark Brown's kernel.org tree? https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git/ If so, should we update those stale MAINTAINERS entries? Thanks, - Ross

2 1

[alsa-devel] [PATCH] ASoC: da7219: Use clk_round_rate to handle enabled bclk/wclk case
by Adam Thomson 02 May '19

02 May '19

For some platforms where DA7219 is the DAI clock master, BCLK/WCLK will be set and enabled prior to the codec's hw_params() function being called. It is possible the platform requires a different BCLK/WCLK configuration than would be chosen by hw_params(), for example S16_LE format needed with a 64-bit frame to satisfy certain devices using the clocks. To handle those kinds of scenarios, the use of clk_round_rate() is now employed as part of hw_params(). If BCLK/WCLk are already enabled then this function will just return the currently set rates, so the subsequent calls to clk_set_rate() will succeed and nothing changes with regards to clocking. In addition the specific recalc_rate() implementations needed updating to always give back a real value, as those functions are called as part of the clk init code and a real value is needed for the clk_round_rate() calls to work as expected. Signed-off-by: Adam Thomson <Adam.Thomson.Opensource(a)diasemi.com> --- sound/soc/codecs/da7219.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c index 5f5fa34..72268f5 100644 --- a/sound/soc/codecs/da7219.c +++ b/sound/soc/codecs/da7219.c @@ -1593,6 +1593,13 @@ static int da7219_hw_params(struct snd_pcm_substream *substream, sr = params_rate(params); if (da7219->master && wclk) { + /* + * Rounding the rate here avoids failure trying to set a new + * rate on an already enabled wclk. In that instance this will + * just set the same rate as is currently in use, and so should + * continue without problem. + */ + sr = clk_round_rate(wclk, sr); ret = clk_set_rate(wclk, sr); if (ret) { dev_err(component->dev, @@ -1621,6 +1628,14 @@ static int da7219_hw_params(struct snd_pcm_substream *substream, if (bclk) { bclk_rate = frame_size * sr; + /* + * Rounding the rate here avoids failure trying to set a + * new rate on an already enabled bclk. In that + * instance this will just set the same rate as is + * currently in use, and so should continue without + * problem. + */ + bclk_rate = clk_round_rate(bclk, bclk_rate); ret = clk_set_rate(bclk, bclk_rate); if (ret) { dev_err(component->dev, @@ -1927,9 +1942,6 @@ static unsigned long da7219_wclk_recalc_rate(struct clk_hw *hw, struct snd_soc_component *component = da7219->component; u8 fs = snd_soc_component_read32(component, DA7219_SR); - if (!da7219->master) - return 0; - switch (fs & DA7219_SR_MASK) { case DA7219_SR_8000: return 8000; @@ -2016,9 +2028,6 @@ static unsigned long da7219_bclk_recalc_rate(struct clk_hw *hw, u8 bclks_per_wclk = snd_soc_component_read32(component, DA7219_DAI_CLK_MODE); - if (!da7219->master) - return 0; - switch (bclks_per_wclk & DA7219_DAI_BCLKS_PER_WCLK_MASK) { case DA7219_DAI_BCLKS_PER_WCLK_32: return parent_rate * 32; -- 1.9.1

2 3

[alsa-devel] [PATCH] ACPI / device_sysfs: change _ADR representation to 64 bits
by Pierre-Louis Bossart 01 May '19

01 May '19

Standards such as the MIPI DisCo for SoundWire 1.0 specification assume the _ADR field is 64 bits. _ADR is defined as an "Integer" represented as 64 bits since ACPI 2.0 released in 2002. The low levels already use _ADR as 64 bits, e.g. in struct acpi_device_info. This patch bumps the representation used for sysfs to 64 bits. Example with a SoundWire device, the results show the complete vendorID and linkID which were omitted before: Before: $ more /sys/bus/acpi/devices/device\:38/adr 0x5d070000 After: $ more /sys/bus/acpi/devices/device\:38/adr 0x000010025d070000 Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> --- drivers/acpi/device_sysfs.c | 3 +-- include/acpi/acpi_bus.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/acpi/device_sysfs.c b/drivers/acpi/device_sysfs.c index 8940054d6250..f8d73ae42529 100644 --- a/drivers/acpi/device_sysfs.c +++ b/drivers/acpi/device_sysfs.c @@ -428,8 +428,7 @@ static ssize_t acpi_device_adr_show(struct device *dev, { struct acpi_device *acpi_dev = to_acpi_device(dev); - return sprintf(buf, "0x%08x\n", - (unsigned int)(acpi_dev->pnp.bus_address)); + return sprintf(buf, "0x%016llx\n", acpi_dev->pnp.bus_address); } static DEVICE_ATTR(adr, 0444, acpi_device_adr_show, NULL); diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index f7981751ac77..9075e28ea60a 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -230,7 +230,7 @@ struct acpi_device_dir { /* Plug and Play */ typedef char acpi_bus_id[8]; -typedef unsigned long acpi_bus_address; +typedef u64 acpi_bus_address; typedef char acpi_device_name[40]; typedef char acpi_device_class[20]; -- 2.17.1

3 5

[alsa-devel] [PATCH 00/19] ASoC: SOF: improvements for ABI checks and Intel code
by Pierre-Louis Bossart 01 May '19

01 May '19

This series is a set of relatively small SOF changes after the big batch merged last week (Thanks!). Since we are very close to the merge window and in May where most of the world takes time off, it'd be perfectly understandable if those patches were queued for 5.3, after feedback and corrections as needed. First we added optional stricter ABI checks when the firmware, topology and kernel ABI levels differ, which can happen when patches are merged at different times on Github. This is mainly for developers and the Github CI to track disconnects, should they happen despite our new process to keep evolutions under control. This option has no impact on the usual problem of updating the kernel without updating the firmware files. The Intel changes are mainly a) fixes for the slave mode suppport b) clean-ups such as removal of a static index for HDAudio support or removal of unneeded include file c) use of a workqueue to defer period elapsed events after the IPC completion. d) simplification of the IRQ code e) fixes to deal with resume on HDaudio links. In the previous patchset we removed the RESUME_INFO flag but missed the need to explicitly set the hw_params on resume. f) a set of routines to dump the Intel IPC registers, mainly for early platform enablement. Keyon Jie (7): ASoC: SOF: Intel: cnl: add pointer ops to use DPIB position ASoC: SOF: PCM: add period_elapsed work to fix race condition in interrupt context ASoC: SOF: Intel: use snd_sof_pcm_period_elapsed ASoC: SOF: ipc: use snd_sof_pcm_period_elapsed ASoC: SOF: Intel: hda-ipc: simplify handling of IPC IRQ ASoC: SOF: Intel: hda-stream: store stream capabilities ASoC: SOF: Intel: hda-stream: handle real stream interrupts only Pan Xiuli (3): ASoC: SOF: IPC: add ipc dump function ASoC: SOF: Intel: APL: add ipc dump function ASoC: SOF: Intel: CNL: add ipc dump function Pierre-Louis Bossart (4): ASoC: SOF: add Kconfig option for strict ABI checks ASOC: SOF: ipc: add support for stricter ABI checks ASoC: SOF: topology: add support for stricter ABI checks ASoC: SOF: Intel: hda-pcm: remove useless dependency on hdac_ext Ranjani Sridharan (1): ASoC: SOF: intel: hda: add hw_params_upon_resume flag for hda stream Zhu Yingjiang (4): ASoC: SOF: Intel: hda: add the SSP Host Device memory space ASoC: SOF: Intel: hda: add SSP info to the chip info struct ASoC: SOF: Intel: hda: set I2S slave before enabling DSP ASoC: SOF: Intel: hda: set bus->idx as 0 sound/soc/sof/Kconfig | 15 ++++++++++ sound/soc/sof/intel/apl.c | 4 +++ sound/soc/sof/intel/cnl.c | 27 +++++++++++++++--- sound/soc/sof/intel/hda-bus.c | 9 ++++-- sound/soc/sof/intel/hda-dai.c | 23 +++++++++------ sound/soc/sof/intel/hda-dsp.c | 16 +++++++++++ sound/soc/sof/intel/hda-ipc.c | 13 ++++----- sound/soc/sof/intel/hda-loader.c | 11 ++++++++ sound/soc/sof/intel/hda-pcm.c | 1 - sound/soc/sof/intel/hda-stream.c | 15 ++++++++-- sound/soc/sof/intel/hda.c | 18 ++++++++++++ sound/soc/sof/intel/hda.h | 23 +++++++++++++++ sound/soc/sof/intel/shim.h | 2 ++ sound/soc/sof/ipc.c | 12 +++++++- sound/soc/sof/ops.h | 12 ++++++++ sound/soc/sof/pcm.c | 48 ++++++++++++++++++++++++++++++++ sound/soc/sof/pm.c | 3 ++ sound/soc/sof/sof-priv.h | 5 +++- sound/soc/sof/topology.c | 43 +++++++++++++++++++--------- 19 files changed, 257 insertions(+), 43 deletions(-) -- 2.17.1

1 19

[alsa-devel] [PATCH 0/3] ASoC: Intel: machine drivers for SOF
by Pierre-Louis Bossart 01 May '19

01 May '19

Add support for the two main machine drivers used by SOF (not tested with the Skylake driver due to lack of hardware and/or firmware signature/ missing topology) The DMIC support for HDaudio-based devices is very much needed for a number of WhiskyLake+ platforms designed for Windows. SOF will be the only Intel driver supporting this configuration. A firmware binary signed with the required production key should be available shortly. The rt5682 codec is the main validation vehicle of the Intel SOF team, with eval boards connected to the Baytrail MinnowBoard as well as more recent devices. The main difference with traditional Intel machine drivers is that the dai links are added dynamically at probe time to avoid multiple table copy/pastes. Bard liao (1): ASoC: Intel: add sof-rt5682 machine driver Rander Wang (2): ASoC: Intel: skl_hda_dsp_generic: add DMIC support ASoC: Intel: skl_hda_dsp_generic:refine code style sound/soc/intel/boards/Kconfig | 16 + sound/soc/intel/boards/Makefile | 2 + sound/soc/intel/boards/skl_hda_dsp_common.c | 22 +- sound/soc/intel/boards/skl_hda_dsp_common.h | 2 +- sound/soc/intel/boards/skl_hda_dsp_generic.c | 19 +- sound/soc/intel/boards/sof_rt5682.c | 563 ++++++++++++++++++ .../intel/common/soc-acpi-intel-byt-match.c | 6 + .../intel/common/soc-acpi-intel-cht-match.c | 6 + .../intel/common/soc-acpi-intel-cnl-match.c | 19 + .../intel/common/soc-acpi-intel-icl-match.c | 6 + 10 files changed, 656 insertions(+), 5 deletions(-) create mode 100644 sound/soc/intel/boards/sof_rt5682.c -- 2.17.1

1 3

[alsa-devel] [PATCH v3 0/5] soundwire: code cleanup
by Pierre-Louis Bossart 30 Apr '19

30 Apr '19

SoundWire support will be provided in Linux with the Sound Open Firmware (SOF) on Intel platforms. Before we start adding the missing pieces, there are a number of warnings and style issues reported by checkpatch, cppcheck and Coccinelle that need to be cleaned-up. Changes since v2: fixed inversion of devm_kcalloc parameters, detected while rebasing additional patches. Changes since v1: added missing newlines in new patch (suggested by Joe Perches) Pierre-Louis Bossart (5): soundwire: intel: fix inversion in devm_kcalloc parameters soundwire: fix style issues soundwire: bus: remove useless initializations soundwire: stream: remove useless initialization of local variable soundwire: add missing newlines in dynamic debug logs drivers/soundwire/Kconfig | 2 +- drivers/soundwire/bus.c | 137 ++++++++------- drivers/soundwire/bus.h | 16 +- drivers/soundwire/bus_type.c | 4 +- drivers/soundwire/cadence_master.c | 99 +++++------ drivers/soundwire/cadence_master.h | 22 +-- drivers/soundwire/intel.c | 103 ++++++----- drivers/soundwire/intel.h | 4 +- drivers/soundwire/intel_init.c | 12 +- drivers/soundwire/mipi_disco.c | 116 +++++++------ drivers/soundwire/slave.c | 10 +- drivers/soundwire/stream.c | 267 +++++++++++++++-------------- 12 files changed, 404 insertions(+), 388 deletions(-) -- 2.17.1

6 24