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

[alsa-devel] [PATCH][next] ASoC: wcd934x: remove redundant null checks on rx_chs and tx_chs
by Colin King 08 Feb '20

08 Feb '20

From: Colin Ian King <colin.king(a)canonical.com> The null checks on wcd->rx_chs and wcd->tx_chs are redundant as these objects are arrays and not pointers and hence can never be null. Remove the redundant null checks. Addresses-Coverity: ("Array compared against 0") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- sound/soc/codecs/wcd934x.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/sound/soc/codecs/wcd934x.c b/sound/soc/codecs/wcd934x.c index 158e878abd6c..e780ecd554d2 100644 --- a/sound/soc/codecs/wcd934x.c +++ b/sound/soc/codecs/wcd934x.c @@ -1883,20 +1883,16 @@ static int wcd934x_set_channel_map(struct snd_soc_dai *dai, return -EINVAL; } - if (wcd->rx_chs) { - wcd->num_rx_port = rx_num; - for (i = 0; i < rx_num; i++) { - wcd->rx_chs[i].ch_num = rx_slot[i]; - INIT_LIST_HEAD(&wcd->rx_chs[i].list); - } + wcd->num_rx_port = rx_num; + for (i = 0; i < rx_num; i++) { + wcd->rx_chs[i].ch_num = rx_slot[i]; + INIT_LIST_HEAD(&wcd->rx_chs[i].list); } - if (wcd->tx_chs) { - wcd->num_tx_port = tx_num; - for (i = 0; i < tx_num; i++) { - wcd->tx_chs[i].ch_num = tx_slot[i]; - INIT_LIST_HEAD(&wcd->tx_chs[i].list); - } + wcd->num_tx_port = tx_num; + for (i = 0; i < tx_num; i++) { + wcd->tx_chs[i].ch_num = tx_slot[i]; + INIT_LIST_HEAD(&wcd->tx_chs[i].list); } return 0; -- 2.24.0

1 0

[alsa-devel] USB Audio Interface / Denon MC7000 and MC8000 controller
by Tobias 07 Feb '20

07 Feb '20

Hello dear ALSA developers. I have purchased a MC7000 controller in order to control MIXXX on Ubuntu 16.04. According to the Denon specification the controller should have been class compliant but there is an issue with the Audio interface to work properly giving following message ... $ dmesg ... |[ 74.522831] usb 1-1.3: new high-speed USB device number 6 using xhci_hcd [ 74.623784] usb 1-1.3: New USB device found, idVendor=15e4, idProduct=8004 [ 74.623789] usb 1-1.3: New USB device strings: Mfr=1, Product=2, SerialNumber=3 [ 74.623793] usb 1-1.3: Product: DENON DJ MC7000 [ 74.623796] usb 1-1.3: Manufacturer: DENON DJ [ 74.623798] usb 1-1.3: SerialNumber: 201603 [ 74.625134] usb 1-1.3: clock source 65 is not valid, cannot use "|||clock source 65 is not valid, cannot use" is repeated uncountable times then |I found a discussion here for the MC8000 Audio interface which was not working and showing the same error message: https://alsa-user.narkive.com/2tDAO87f/troubleshooting-new-usb-audio-device… The solution was to change sound/usb/clock.c and recompile the kernel. This is not practical for daily use case so I would like to ask if the ALSA team could possibly find a permanent fix for ordinary users. To get my outputs for aplay -l aplay -L |||aplay -D plughw:CARD=MC7000,DEV=0 Grimmaldika-MakeBelieve.wav |lsusb -v mixxx --controllerDebug|| JackServer error message| you may have a look at the Mixxx Community Forums here(just on page, you don't need to find and read on multiple pages) https://www.mixxx.org/forums/viewtopic.php?f=7&t=12962&start=10 If you need any more information then please let me know. Thanks a lot for your support on this matter. Cheers! OsZ ||

4 23

[alsa-devel] [PATCH] ALSA: uapi: Replace __packed with __attribute__((packed))
by Amadeusz Sławiński 07 Feb '20

07 Feb '20

Userspace doesn't know what __packed is, change it to __attribute__((packed)), like in the rest of a header. Fixes: 348f48220b97 (ASoC: topology: Move v4 manifest header data structures to uapi) Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski(a)linux.intel.com> --- include/uapi/sound/asoc.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/uapi/sound/asoc.h b/include/uapi/sound/asoc.h index 6048553c119d..1ae8b06691cb 100644 --- a/include/uapi/sound/asoc.h +++ b/include/uapi/sound/asoc.h @@ -586,7 +586,7 @@ struct snd_soc_tplg_manifest_v4 { __le32 pcm_elems; /* number of PCM elements */ __le32 dai_link_elems; /* number of DAI link elements */ struct snd_soc_tplg_private priv; -} __packed; +} __attribute((packed)); /* Stream Capabilities v4 */ struct snd_soc_tplg_stream_caps_v4 { @@ -604,7 +604,7 @@ struct snd_soc_tplg_stream_caps_v4 { __le32 period_size_max; /* max period size bytes */ __le32 buffer_size_min; /* min buffer size bytes */ __le32 buffer_size_max; /* max buffer size bytes */ -} __packed; +} __attribute((packed)); /* PCM v4 */ struct snd_soc_tplg_pcm_v4 { @@ -619,7 +619,7 @@ struct snd_soc_tplg_pcm_v4 { struct snd_soc_tplg_stream stream[SND_SOC_TPLG_STREAM_CONFIG_MAX]; /* for DAI link */ __le32 num_streams; /* number of streams */ struct snd_soc_tplg_stream_caps_v4 caps[2]; /* playback and capture for DAI */ -} __packed; +} __attribute((packed)); /* Physical link config v4 */ struct snd_soc_tplg_link_config_v4 { @@ -627,6 +627,6 @@ struct snd_soc_tplg_link_config_v4 { __le32 id; /* unique ID - used to match */ struct snd_soc_tplg_stream stream[SND_SOC_TPLG_STREAM_CONFIG_MAX]; /* supported configs playback and captrure */ __le32 num_streams; /* number of streams */ -} __packed; +} __attribute((packed)); #endif -- 2.17.1

2 3

[alsa-devel] [PATCH] ASoC: soc-core: fix an uninitialized use
by Jian Cai 07 Feb '20

07 Feb '20

Fixed the uninitialized use of a signed integer variable ret in soc_probe_component when all its definitions are not executed. This caused -ftrivial-auto-var-init=pattern to initialize the variable to repeated 0xAA (i.e. a negative value) and triggered the following code unintentionally. err_probe: if (ret < 0) soc_cleanup_component(component); Signed-off-by: Jian Cai <caij2003(a)gmail.com> --- sound/soc/soc-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 068d809c349a..bfb813ba34f3 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1180,7 +1180,7 @@ static int soc_probe_component(struct snd_soc_card *card, snd_soc_component_get_dapm(component); struct snd_soc_dai *dai; int probed = 0; - int ret; + int ret = 0; if (!strcmp(component->name, "snd-soc-dummy")) return 0; -- 2.25.0.341.g760bfbb309-goog

2 4

[alsa-devel] [PATCH 0/8] ALSA: Another sparse warning fix round
by Takashi Iwai 06 Feb '20

06 Feb '20

Hi, this is another pile of patches to fix sparse warnings, at this time, about the strong-types like snd_pcm_format_t. The patch 2 introduces a new macro for the iteration loop and some other tasks so that the driver doesn't need to use ugly __force cast. Takashi === Takashi Iwai (8): ALSA: aloop: Fix PCM format assignment ALSA: pcm: More helper macros for reducing snd_pcm_format_t cast ALSA: usb-audio: Use pcm_for_each_format() macro for PCM format iterations ALSA: dummy: Use standard macros for fixing PCM format cast ALSA: pcm: Use standard macros for fixing PCM format cast ALSA: pcm: Use a macro for parameter masks to reduce the needed cast ALSA: pcm_dmaengine: Use pcm_for_each_format() macro for PCM format iteration ALSA: pcm: Minor refactoring include/sound/pcm.h | 9 +++++++++ include/sound/pcm_params.h | 7 +++++++ sound/core/oss/pcm_oss.c | 19 ++++++++----------- sound/core/pcm_dmaengine.c | 2 +- sound/core/pcm_misc.c | 17 +++++++++++------ sound/core/pcm_native.c | 47 +++++++++++++++++++++++++--------------------- sound/drivers/aloop.c | 6 +++--- sound/drivers/dummy.c | 6 +++--- sound/usb/proc.c | 2 +- 9 files changed, 69 insertions(+), 46 deletions(-) -- 2.16.4

1 8

[alsa-devel] [PATCH 0/3] ALSA: Minor sparse warning fixes
by Takashi Iwai 06 Feb '20

06 Feb '20

Hi, this is a series of a few trivial fixes mostly for annotations that caused sparse warnings. Takashi === Takashi Iwai (3): ALSA: via82xx: Fix endianness annotations ALSA: emu10k1: Fix endianness annotations ALSA: emu8000: Fix the cast to __user pointer sound/isa/sb/emu8000_pcm.c | 4 ++-- sound/pci/emu10k1/emu10k1_main.c | 4 +++- sound/pci/via82xx.c | 6 ++++-- sound/pci/via82xx_modem.c | 6 ++++-- 4 files changed, 13 insertions(+), 7 deletions(-) -- 2.16.4

1 3

[alsa-devel] [PATCH] ASoC: fsl_sai: Fix exiting path on probing failure
by Oleksandr Suvorov 06 Feb '20

06 Feb '20

If the imx-sdma driver is built as a module, the fsl-sai device doesn't disable on probing failure, which causes the warning in the next probing: ================================================================== fsl-sai 308a0000.sai: Unbalanced pm_runtime_enable! fsl-sai 308a0000.sai: Unbalanced pm_runtime_enable! fsl-sai 308a0000.sai: Unbalanced pm_runtime_enable! fsl-sai 308a0000.sai: Unbalanced pm_runtime_enable! fsl-sai 308a0000.sai: Unbalanced pm_runtime_enable! fsl-sai 308a0000.sai: Unbalanced pm_runtime_enable! ================================================================== Disabling the device properly fixes the issue. Fixes: 812ad463e089 ("ASoC: fsl_sai: Add support for runtime pm") Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov(a)toradex.com> --- sound/soc/fsl/fsl_sai.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index 8c3ea7300972..9d436b0c5718 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -1020,12 +1020,24 @@ static int fsl_sai_probe(struct platform_device *pdev) ret = devm_snd_soc_register_component(&pdev->dev, &fsl_component, &fsl_sai_dai, 1); if (ret) - return ret; + goto err_pm_disable; - if (sai->soc_data->use_imx_pcm) - return imx_pcm_dma_init(pdev, IMX_SAI_DMABUF_SIZE); - else - return devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); + if (sai->soc_data->use_imx_pcm) { + ret = imx_pcm_dma_init(pdev, IMX_SAI_DMABUF_SIZE); + if (ret) + goto err_pm_disable; + } else { + ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); + if (ret) + goto err_pm_disable; + } + + return ret; + +err_pm_disable: + pm_runtime_disable(&pdev->dev); + + return ret; } static int fsl_sai_remove(struct platform_device *pdev) -- 2.24.1

2 1

[alsa-devel] [PATCH v2 00/17] platform/chrome: Replace cros_ec_cmd_xfer_status
by Prashant Malani 06 Feb '20

06 Feb '20

Many callers of cros_ec_cmd_xfer_status() use similar setup and cleanup code, including setting up the cros_ec_command message struct and copying the received buffer. This series introduces a replacement function cros_ec_cmd() that performs this setup and teardown, and then updates all call sites that used xfer_status() to use the new function instead. The final patch in the series drops cros_ec_cmd_xfer_status() altogether. Changes in v2: - Renamed new function to cros_ec_cmd() - Added a "result" pointer argument, for call-sites that are interested in the EC command result. - Updated subsequent patches to new function name and parameter list. - Used C99 element setting to initialize some structs directly rather than zeroing them, then setting them. v1: https://lkml.org/lkml/2020/1/30/802 Prashant Malani (17): platform/chrome: Add EC command msg wrapper platform/chrome: chardev: Use cros_ec_cmd() platform/chrome: proto: Use cros_ec_cmd() platform/chrome: usbpd_logger: Use cros_ec_cmd() platform/chrome: sensorhub: Use cros_ec_cmd() platform/chrome: debugfs: Use cros_ec_cmd() platform/chrome: sysfs: Use cros_ec_cmd() extcon: cros_ec: Use cros_ec_cmd() hid: google-hammer: Use cros_ec_cmd() iio: cros_ec: Use cros_ec_cmd() ASoC: cros_ec_codec: Use cros_ec_cmd() power: supply: cros: Use cros_ec_cmd() pwm: cros-ec: Remove cros_ec_cmd_xfer_status() rtc: cros-ec: Use cros_ec_cmd() media: cros-ec-cec: Use cros_ec_cmd() i2c: cros-ec-tunnel: Use cros_ec_cmd() platform/chrome: Drop cros_ec_cmd_xfer_status() drivers/extcon/extcon-usbc-cros-ec.c | 61 ++------ drivers/hid/hid-google-hammer.c | 23 +-- drivers/i2c/busses/i2c-cros-ec-tunnel.c | 22 ++- .../cros_ec_sensors/cros_ec_sensors_core.c | 25 ++-- .../media/platform/cros-ec-cec/cros-ec-cec.c | 45 +++--- drivers/platform/chrome/cros_ec_chardev.c | 17 +-- drivers/platform/chrome/cros_ec_debugfs.c | 131 ++++++------------ drivers/platform/chrome/cros_ec_proto.c | 76 ++++++---- drivers/platform/chrome/cros_ec_sensorhub.c | 30 ++-- drivers/platform/chrome/cros_ec_sysfs.c | 103 ++++++-------- drivers/platform/chrome/cros_usbpd_logger.c | 12 +- drivers/power/supply/cros_usbpd-charger.c | 58 ++------ drivers/pwm/pwm-cros-ec.c | 59 +++----- drivers/rtc/rtc-cros-ec.c | 27 ++-- include/linux/platform_data/cros_ec_proto.h | 5 +- sound/soc/codecs/cros_ec_codec.c | 119 ++++++---------- 16 files changed, 277 insertions(+), 536 deletions(-) -- 2.25.0.341.g760bfbb309-goog

2 3

[alsa-devel] [GIT PULL] ASoC fix for v5.6
by Mark Brown 06 Feb '20

06 Feb '20

The following changes since commit 42b716359beca10684195fd6e93a74ecd8ca8003: ASoC: wcd934x: Add missing COMMON_CLK dependency (2020-02-04 11:22:30 +0000) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-v5.6-3 for you to fetch changes up to 13426feaf46c48fcddb591e89d35120fcc90527f: ASoC: wcd934x: Add missing COMMON_CLK dependency to SND_SOC_ALL_CODECS (2020-02-05 10:05:19 +0000) ---------------------------------------------------------------- ASoC: Fix for v5.6 An incremental fix for the Qualcomm COMMON_CLK issue. ---------------------------------------------------------------- Geert Uytterhoeven (1): ASoC: wcd934x: Add missing COMMON_CLK dependency to SND_SOC_ALL_CODECS sound/soc/codecs/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[alsa-devel] [PATCH] ALSA: hda: Clear RIRB status before reading WP
by Viswanath L 06 Feb '20

06 Feb '20

From: Mohan Kumar <mkumard(a)nvidia.com> RIRB interrupt status getting cleared after the write pointer is read causes a race condition, where last response(s) into RIRB may remain unserviced by IRQ, eventually causing azx_rirb_get_response to fall back to polling mode. Clearing the RIRB interrupt status ahead of write pointer access ensures that this condition is avoided. Signed-off-by: Mohan Kumar <mkumard(a)nvidia.com> Signed-off-by: Viswanath L <viswanathl(a)nvidia.com> --- sound/pci/hda/hda_controller.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c index 9757667..2609e39 100644 --- a/sound/pci/hda/hda_controller.c +++ b/sound/pci/hda/hda_controller.c @@ -1110,16 +1110,23 @@ irqreturn_t azx_interrupt(int irq, void *dev_id) if (snd_hdac_bus_handle_stream_irq(bus, status, stream_update)) active = true; - /* clear rirb int */ status = azx_readb(chip, RIRBSTS); if (status & RIRB_INT_MASK) { + /* + * Clearing the interrupt status here ensures that no + * interrupt gets masked after the RIRB wp is read in + * snd_hdac_bus_update_rirb. This avoids a possible + * race condition where codec response in RIRB may + * remain unserviced by IRQ, eventually falling back + * to polling mode in azx_rirb_get_response. + */ + azx_writeb(chip, RIRBSTS, RIRB_INT_MASK); active = true; if (status & RIRB_INT_RESPONSE) { if (chip->driver_caps & AZX_DCAPS_CTX_WORKAROUND) udelay(80); snd_hdac_bus_update_rirb(bus); } - azx_writeb(chip, RIRBSTS, RIRB_INT_MASK); } } while (active && ++repeat < 10); -- 2.7.4

2 1