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

[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

[alsa-devel] [PATCH - 1/1] pcm: direct: Round down of slave_hw_ptr when buffer size is two period size
by vanitha.channaiah＠in.bosch.com 06 Feb '20

06 Feb '20

From: Vanitha Channaiah <vanitha.channaiah(a)in.bosch.com> For buffer size equal to two period size, the start position of slave_hw_ptr is rounded down in order to avoid xruns For e.g.: Considering below parameters and its values: Period size = 96 (0x60) Buffer size = 192 (0xC0) Timer ticks = 1 avail_min = 0x60 slave_hw_ptr = unaligned value during dmix_start() Issue: - Initial, app_ptr = hw_ptr = 0 - Application fills buffer size of data. so app_ptr = 0xC0, hw_ptr = 0 - During dmix_start(), current slave_hw_ptr is not rounded down. current slave_hw_ptr would be 0x66 - slave_hw_ptr is keep on updating at the hardware 0x67, 0x68, 0x69 - The diff calculation between old_slave_hw_ptr(0x66) and new_slave_hw_ptr(0x69) results in avail = 0x6 - After 1 snd_pcm_period_elapsed(), slave_hw_ptr = 0xC0 - The result of avail = 0x5A which is less than avail_min(0x60) - Here, xruns will be observed Fix: - Initial, app_ptr = hw_ptr = 0 - Application fills buffer size of data. so app_ptr = 0xC0, hw_ptr = 0 - Round down of slave_hw_ptr during dmix_start() leads to below calculation: - During dmix_start(), slave_hw_ptr rounded to 0x60 (old slave_hw_ptr) - The diff calculation between old_slave_hw_ptr(0x60) and new_slave_hw_ptr(0x69) results in avail = 0x9 - After 1 snd_pcm_period_elapsed(), slave_hw_ptr = 0xC0 - The result of avail = 0x60 which is avail_min(0x60) - Here, xruns can be avoided Signed-off-by: Vanitha Channaiah <vanitha.channaiah(a)in.bosch.com> diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c index 54d9900..a201fa3 100644 --- a/src/pcm/pcm_direct.c +++ b/src/pcm/pcm_direct.c @@ -2043,10 +2043,14 @@ int snd_pcm_direct_parse_open_conf(snd_config_t *root, snd_config_t *conf, void snd_pcm_direct_reset_slave_ptr(snd_pcm_t *pcm, snd_pcm_direct_t *dmix) { + /* + * For buffer size equal to two period size, slave_hw_ptr is rounded down + * to avoid xruns + */ if (dmix->hw_ptr_alignment == SND_PCM_HW_PTR_ALIGNMENT_ROUNDUP || (dmix->hw_ptr_alignment == SND_PCM_HW_PTR_ALIGNMENT_AUTO && - pcm->buffer_size <= pcm->period_size * 2)) + pcm->buffer_size < pcm->period_size * 2)) dmix->slave_appl_ptr = ((dmix->slave_appl_ptr + dmix->slave_period_size - 1) / dmix->slave_period_size) * dmix->slave_period_size; -- 2.7.4

3 3

[alsa-devel] HP ALC671 Platform update (again)
by Kailang 06 Feb '20

06 Feb '20

Hi Takashi, HP want to keep BIOS verb table setting for release platform. So, one of platform need to add 0x19 pin for verb quirk. This patch was verified by Canonical. Many Thanks. BR, Kailang

2 1

[alsa-devel] HP ALC671 Platform update
by Kailang 06 Feb '20

06 Feb '20

Hi Takashi, HP want to keep BIOS verb table setting for release platform. So, one of platform need to add 0x19 pin for verb quirk. This patch was verified by Canonical. Many Thanks. BR, Kailang

1 0

[alsa-devel] [PATCH alsa-utils 1/4] Use __func__ instead of __FUNCTION__
by Michael Forney 06 Feb '20

06 Feb '20

They are equivalent, but __func__ is in C99. __FUNCTION__ exists only for backwards compatibility with old gcc versions. Signed-off-by: Michael Forney <mforney(a)mforney.org> --- alsactl/alsactl.h | 16 ++++++++-------- aplay/aplay.c | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/alsactl/alsactl.h b/alsactl/alsactl.h index 4f969ec..69b539c 100644 --- a/alsactl/alsactl.h +++ b/alsactl/alsactl.h @@ -13,15 +13,15 @@ void cerror_(const char *fcn, long line, int cond, const char *fmt, ...); void dbg_(const char *fcn, long line, const char *fmt, ...); #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) -#define info(...) do { info_(__FUNCTION__, __LINE__, __VA_ARGS__); } while (0) -#define error(...) do { error_(__FUNCTION__, __LINE__, __VA_ARGS__); } while (0) -#define cerror(cond, ...) do { cerror_(__FUNCTION__, __LINE__, (cond) != 0, __VA_ARGS__); } while (0) -#define dbg(...) do { dbg_(__FUNCTION__, __LINE__, __VA_ARGS__); } while (0) +#define info(...) do { info_(__func__, __LINE__, __VA_ARGS__); } while (0) +#define error(...) do { error_(__func__, __LINE__, __VA_ARGS__); } while (0) +#define cerror(cond, ...) do { cerror_(__func__, __LINE__, (cond) != 0, __VA_ARGS__); } while (0) +#define dbg(...) do { dbg_(__func__, __LINE__, __VA_ARGS__); } while (0) #else -#define info(args...) do { info_(__FUNCTION__, __LINE__, ##args); } while (0) -#define error(args...) do { error_(__FUNCTION__, __LINE__, ##args); } while (0) -#define cerror(cond, ...) do { error_(__FUNCTION__, __LINE__, (cond) != 0, ##args); } while (0) -#define dbg(args...) do { dbg_(__FUNCTION__, __LINE__, ##args); } while (0) +#define info(args...) do { info_(__func__, __LINE__, ##args); } while (0) +#define error(args...) do { error_(__func__, __LINE__, ##args); } while (0) +#define cerror(cond, ...) do { error_(__func__, __LINE__, (cond) != 0, ##args); } while (0) +#define dbg(args...) do { dbg_(__func__, __LINE__, ##args); } while (0) #endif int init(const char *file, const char *cardname); diff --git a/aplay/aplay.c b/aplay/aplay.c index 1a887e4..908093c 100644 --- a/aplay/aplay.c +++ b/aplay/aplay.c @@ -186,13 +186,13 @@ static const struct fmt_capture { #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) #define error(...) do {\ - fprintf(stderr, "%s: %s:%d: ", command, __FUNCTION__, __LINE__); \ + fprintf(stderr, "%s: %s:%d: ", command, __func__, __LINE__); \ fprintf(stderr, __VA_ARGS__); \ putc('\n', stderr); \ } while (0) #else #define error(args...) do {\ - fprintf(stderr, "%s: %s:%d: ", command, __FUNCTION__, __LINE__); \ + fprintf(stderr, "%s: %s:%d: ", command, __func__, __LINE__); \ fprintf(stderr, ##args); \ putc('\n', stderr); \ } while (0) -- 2.25.0

3 11