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

[alsa-devel] [PATCH 5/5] ASoC: rt1011: some minor changes to improve readability
by shumingf＠realtek.com 31 Oct '19

31 Oct '19

From: Shuming Fan <shumingf(a)realtek.com> There is no other code use the RT1011_INIT_REG_LEN definition, except rt1011_reg_init(). Hence, we remove it and fix the typo. Signed-off-by: Shuming Fan <shumingf(a)realtek.com> --- sound/soc/codecs/rt1011.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/rt1011.c b/sound/soc/codecs/rt1011.c index f2c581b66d32..2552073e54ce 100644 --- a/sound/soc/codecs/rt1011.c +++ b/sound/soc/codecs/rt1011.c @@ -61,7 +61,6 @@ static const struct reg_sequence init_list[] = { { RT1011_DAC_SET_1, 0xe702 }, { RT1011_DAC_SET_3, 0x2004 }, }; -#define RT1011_INIT_REG_LEN ARRAY_SIZE(init_list) static const struct reg_default rt1011_reg[] = { {0x0000, 0x0000}, @@ -684,7 +683,8 @@ static int rt1011_reg_init(struct snd_soc_component *component) { struct rt1011_priv *rt1011 = snd_soc_component_get_drvdata(component); - regmap_multi_reg_write(rt1011->regmap, init_list, RT1011_INIT_REG_LEN); + regmap_multi_reg_write(rt1011->regmap, + init_list, ARRAY_SIZE(init_list)); return 0; } @@ -1773,7 +1773,8 @@ static int rt1011_set_component_pll(struct snd_soc_component *component, ret = rl6231_pll_calc(freq_in, freq_out, &pll_code); if (ret < 0) { - dev_err(component->dev, "Unsupport input clock %d\n", freq_in); + dev_err(component->dev, "Unsupported input clock %d\n", + freq_in); return ret; } @@ -2384,7 +2385,7 @@ static int rt1011_i2c_probe(struct i2c_client *i2c, rt1011 = devm_kzalloc(&i2c->dev, sizeof(struct rt1011_priv), GFP_KERNEL); - if (rt1011 == NULL) + if (!rt1011) return -ENOMEM; i2c_set_clientdata(i2c, rt1011); -- 2.23.0

2 1

[alsa-devel] [PATCH 1/5] ASoC: rt1011: remove redundant code in kcontrol
by shumingf＠realtek.com 31 Oct '19

31 Oct '19

From: Shuming Fan <shumingf(a)realtek.com> The !component->card->instantiated statement should remove in kcontrol. It is no need to check the card->instantiated in kcontrol. Signed-off-by: Shuming Fan <shumingf(a)realtek.com> --- sound/soc/codecs/rt1011.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/sound/soc/codecs/rt1011.c b/sound/soc/codecs/rt1011.c index dcd397a83cb4..8a74f374d779 100644 --- a/sound/soc/codecs/rt1011.c +++ b/sound/soc/codecs/rt1011.c @@ -1163,9 +1163,6 @@ static int rt1011_bq_drc_coeff_put(struct snd_kcontrol *kcontrol, (struct rt1011_bq_drc_params *)ucontrol->value.integer.value; unsigned int i, mode_idx = 0; - if (!component->card->instantiated) - return 0; - if (strstr(ucontrol->id.name, "AdvanceMode Initial Set")) mode_idx = RT1011_ADVMODE_INITIAL_SET; else if (strstr(ucontrol->id.name, "AdvanceMode SEP BQ Coeff")) @@ -1236,9 +1233,6 @@ static int rt1011_r0_cali_put(struct snd_kcontrol *kcontrol, struct snd_soc_component *component = snd_kcontrol_chip(kcontrol); struct rt1011_priv *rt1011 = snd_soc_component_get_drvdata(component); - if (!component->card->instantiated) - return 0; - rt1011->cali_done = 0; if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF && ucontrol->value.integer.value[0]) @@ -1284,9 +1278,6 @@ static int rt1011_r0_load_mode_put(struct snd_kcontrol *kcontrol, if (ucontrol->value.integer.value[0] == rt1011->r0_reg) return 0; - if (!component->card->instantiated) - return 0; - if (ucontrol->value.integer.value[0] == 0) return -EINVAL; -- 2.23.0

2 1

[alsa-devel] [PATCH 4/5] ASoC: rt1011: add the range check for temperature_calib from device property
by shumingf＠realtek.com 31 Oct '19

31 Oct '19

From: Shuming Fan <shumingf(a)realtek.com> The driver will check the range for temperature_calib. It should be from 1 to 255. Signed-off-by: Shuming Fan <shumingf(a)realtek.com> --- sound/soc/codecs/rt1011.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt1011.c b/sound/soc/codecs/rt1011.c index 2f1de933f3ac..f2c581b66d32 100644 --- a/sound/soc/codecs/rt1011.c +++ b/sound/soc/codecs/rt1011.c @@ -2341,7 +2341,8 @@ static void rt1011_calibration_work(struct work_struct *work) rt1011_reg_init(component); /* Apply temperature and calibration data from device property */ - if (rt1011->temperature_calib) { + if (rt1011->temperature_calib <= 0xff && + rt1011->temperature_calib > 0) { snd_soc_component_update_bits(component, RT1011_STP_INITIAL_RESISTANCE_TEMP, 0x3ff, (rt1011->temperature_calib << 2)); -- 2.23.0

2 1

[alsa-devel] [PATCH 3/5] ASoC: rt1011: remove unnecessary tabs using spaces instead
by shumingf＠realtek.com 31 Oct '19

31 Oct '19

From: Shuming Fan <shumingf(a)realtek.com> There are unnecessary tabs inside some statements. It uses sapces instead. Signed-off-by: Shuming Fan <shumingf(a)realtek.com> --- sound/soc/codecs/rt1011.c | 45 +++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/sound/soc/codecs/rt1011.c b/sound/soc/codecs/rt1011.c index 57a3a34b5f18..2f1de933f3ac 100644 --- a/sound/soc/codecs/rt1011.c +++ b/sound/soc/codecs/rt1011.c @@ -989,7 +989,7 @@ static SOC_ENUM_SINGLE_DECL(rt1011_din_source_enum, RT1011_CROSS_BQ_SET_1, 5, static const char * const rt1011_tdm_data_out_select[] = { "TDM_O_LR", "BQ1", "DVOL", "BQ10", "ALC", "DMIX", "ADC_SRC_LR", - "ADC_O_LR", "ADC_MONO", "RSPK_BPF_LR", "DMIX_ADD", "ENVELOPE_FS", + "ADC_O_LR", "ADC_MONO", "RSPK_BPF_LR", "DMIX_ADD", "ENVELOPE_FS", "SEP_O_GAIN", "ALC_BK_GAIN", "STP_V_C", "DMIX_ABST" }; @@ -1002,7 +1002,7 @@ static SOC_ENUM_SINGLE_DECL(rt1011_tdm2_l_dac1_enum, RT1011_TDM2_SET_4, 12, rt1011_tdm_l_ch_data_select); static SOC_ENUM_SINGLE_DECL(rt1011_tdm1_adc1_dat_enum, - RT1011_ADCDAT_OUT_SOURCE, 0, rt1011_tdm_data_out_select); + RT1011_ADCDAT_OUT_SOURCE, 0, rt1011_tdm_data_out_select); static SOC_ENUM_SINGLE_DECL(rt1011_tdm1_adc1_loc_enum, RT1011_TDM1_SET_2, 0, rt1011_tdm_l_ch_data_select); @@ -1024,9 +1024,9 @@ static const char * const rt1011_tdm_adc_swap_select[] = { "L/R", "R/L", "L/L", "R/R" }; -static SOC_ENUM_SINGLE_DECL(rt1011_tdm_adc1_1_enum, RT1011_TDM1_SET_3, 6, +static SOC_ENUM_SINGLE_DECL(rt1011_tdm_adc1_1_enum, RT1011_TDM1_SET_3, 6, rt1011_tdm_adc_swap_select); -static SOC_ENUM_SINGLE_DECL(rt1011_tdm_adc2_1_enum, RT1011_TDM1_SET_3, 4, +static SOC_ENUM_SINGLE_DECL(rt1011_tdm_adc2_1_enum, RT1011_TDM1_SET_3, 4, rt1011_tdm_adc_swap_select); static void rt1011_reset(struct regmap *regmap) @@ -1092,9 +1092,9 @@ static bool rt1011_validate_bq_drc_coeff(unsigned short reg) { if ((reg == RT1011_DAC_SET_1) | (reg >= RT1011_ADC_SET && reg <= RT1011_ADC_SET_1) | - (reg == RT1011_ADC_SET_4) | (reg == RT1011_ADC_SET_5) | + (reg == RT1011_ADC_SET_4) | (reg == RT1011_ADC_SET_5) | (reg == RT1011_MIXER_1) | - (reg == RT1011_A_TIMING_1) | (reg >= RT1011_POWER_7 && + (reg == RT1011_A_TIMING_1) | (reg >= RT1011_POWER_7 && reg <= RT1011_POWER_8) | (reg == RT1011_CLASS_D_POS) | (reg == RT1011_ANALOG_CTRL) | (reg >= RT1011_SPK_TEMP_PROTECT_0 && @@ -1289,7 +1289,7 @@ static int rt1011_r0_load_mode_put(struct snd_kcontrol *kcontrol, r0_integer = format / rt1011->r0_reg / 128; r0_factor = ((format / rt1011->r0_reg * 100) / 128) - (r0_integer * 100); - dev_info(dev, "New r0 resistance about %d.%02d ohm, reg=0x%X\n", + dev_info(dev, "New r0 resistance about %d.%02d ohm, reg=0x%X\n", r0_integer, r0_factor, rt1011->r0_reg); if (rt1011->r0_reg) @@ -1977,14 +1977,14 @@ static int rt1011_set_tdm_slot(struct snd_soc_dai *dai, snd_soc_component_update_bits(component, RT1011_TDM1_SET_1, RT1011_I2S_CH_TX_MASK | RT1011_I2S_CH_RX_MASK | - RT1011_I2S_CH_TX_LEN_MASK | RT1011_I2S_CH_RX_LEN_MASK, val); + RT1011_I2S_CH_TX_LEN_MASK | RT1011_I2S_CH_RX_LEN_MASK, val); snd_soc_component_update_bits(component, RT1011_TDM2_SET_1, RT1011_I2S_CH_TX_MASK | RT1011_I2S_CH_RX_MASK | - RT1011_I2S_CH_TX_LEN_MASK | RT1011_I2S_CH_RX_LEN_MASK, val); + RT1011_I2S_CH_TX_LEN_MASK | RT1011_I2S_CH_RX_LEN_MASK, val); snd_soc_component_update_bits(component, RT1011_TDM1_SET_2, - RT1011_TDM_I2S_DOCK_EN_1_MASK, tdm_en); + RT1011_TDM_I2S_DOCK_EN_1_MASK, tdm_en); snd_soc_component_update_bits(component, RT1011_TDM2_SET_2, - RT1011_TDM_I2S_DOCK_EN_2_MASK, tdm_en); + RT1011_TDM_I2S_DOCK_EN_2_MASK, tdm_en); if (tx_slotnum) snd_soc_component_update_bits(component, RT1011_TDM_TOTAL_SET, RT1011_ADCDAT1_PIN_CONFIG | RT1011_ADCDAT2_PIN_CONFIG, @@ -2109,7 +2109,7 @@ static const struct snd_soc_component_driver soc_component_dev_rt1011 = { .remove = rt1011_remove, .suspend = rt1011_suspend, .resume = rt1011_resume, - .set_bias_level = rt1011_set_bias_level, + .set_bias_level = rt1011_set_bias_level, .controls = rt1011_snd_controls, .num_controls = ARRAY_SIZE(rt1011_snd_controls), .dapm_widgets = rt1011_dapm_widgets, @@ -2118,9 +2118,9 @@ static const struct snd_soc_component_driver soc_component_dev_rt1011 = { .num_dapm_routes = ARRAY_SIZE(rt1011_dapm_routes), .set_sysclk = rt1011_set_component_sysclk, .set_pll = rt1011_set_component_pll, - .use_pmdown_time = 1, - .endianness = 1, - .non_legacy_dai_naming = 1, + .use_pmdown_time = 1, + .endianness = 1, + .non_legacy_dai_naming = 1, }; static const struct regmap_config rt1011_regmap = { @@ -2222,17 +2222,17 @@ static int rt1011_calibrate(struct rt1011_priv *rt1011, unsigned char cali_flag) dc_offset = value << 16; regmap_read(rt1011->regmap, RT1011_EFUSE_ADC_OFFSET_15_0, &value); dc_offset |= (value & 0xffff); - dev_info(dev, "ADC offset=0x%x\n", dc_offset); + dev_info(dev, "ADC offset=0x%x\n", dc_offset); regmap_read(rt1011->regmap, RT1011_EFUSE_DAC_OFFSET_G0_20_16, &value); dc_offset = value << 16; regmap_read(rt1011->regmap, RT1011_EFUSE_DAC_OFFSET_G0_15_0, &value); dc_offset |= (value & 0xffff); - dev_info(dev, "Gain0 offset=0x%x\n", dc_offset); + dev_info(dev, "Gain0 offset=0x%x\n", dc_offset); regmap_read(rt1011->regmap, RT1011_EFUSE_DAC_OFFSET_G1_20_16, &value); dc_offset = value << 16; regmap_read(rt1011->regmap, RT1011_EFUSE_DAC_OFFSET_G1_15_0, &value); dc_offset |= (value & 0xffff); - dev_info(dev, "Gain1 offset=0x%x\n", dc_offset); + dev_info(dev, "Gain1 offset=0x%x\n", dc_offset); if (cali_flag) { @@ -2252,7 +2252,7 @@ static int rt1011_calibrate(struct rt1011_priv *rt1011, unsigned char cali_flag) while (count < chk_cnt) { msleep(100); regmap_read(rt1011->regmap, - RT1011_INIT_RECIPROCAL_SYN_24_16, &value); + RT1011_INIT_RECIPROCAL_SYN_24_16, &value); r0[count%3] = value << 16; regmap_read(rt1011->regmap, RT1011_INIT_RECIPROCAL_SYN_15_0, &value); @@ -2267,7 +2267,7 @@ static int rt1011_calibrate(struct rt1011_priv *rt1011, unsigned char cali_flag) break; } if (count > chk_cnt) { - dev_err(dev, "Calibrate R0 Failure\n"); + dev_err(dev, "Calibrate R0 Failure\n"); ret = -EAGAIN; } else { format = 2147483648U; /* 2^24 * 128 */ @@ -2276,7 +2276,7 @@ static int rt1011_calibrate(struct rt1011_priv *rt1011, unsigned char cali_flag) - (r0_integer * 100); rt1011->r0_reg = r0[0]; rt1011->cali_done = 1; - dev_info(dev, "r0 resistance about %d.%02d ohm, reg=0x%X\n", + dev_info(dev, "r0 resistance about %d.%02d ohm, reg=0x%X\n", r0_integer, r0_factor, r0[0]); } } @@ -2354,7 +2354,7 @@ static void rt1011_calibration_work(struct work_struct *work) r0_integer = format / rt1011->r0_reg / 128; r0_factor = ((format / rt1011->r0_reg * 100) / 128) - (r0_integer * 100); - dev_info(component->dev, "DP r0 resistance about %d.%02d ohm, reg=0x%X\n", + dev_info(component->dev, "DP r0 resistance about %d.%02d ohm, reg=0x%X\n", r0_integer, r0_factor, rt1011->r0_reg); rt1011_r0_load(rt1011); @@ -2420,7 +2420,6 @@ static void rt1011_i2c_shutdown(struct i2c_client *client) rt1011_reset(rt1011->regmap); } - static struct i2c_driver rt1011_i2c_driver = { .driver = { .name = "rt1011", -- 2.23.0

2 1

[alsa-devel] [PATCH 2/5] ASoC: rt1011: improve the rt1011_set_dai_fmt() function
by shumingf＠realtek.com 31 Oct '19

31 Oct '19

From: Shuming Fan <shumingf(a)realtek.com> If there is a wrong format setting, the driver will goto the end of the function directly. Signed-off-by: Shuming Fan <shumingf(a)realtek.com> --- sound/soc/codecs/rt1011.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/codecs/rt1011.c b/sound/soc/codecs/rt1011.c index 8a74f374d779..57a3a34b5f18 100644 --- a/sound/soc/codecs/rt1011.c +++ b/sound/soc/codecs/rt1011.c @@ -1631,6 +1631,7 @@ static int rt1011_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) break; default: ret = -EINVAL; + goto _set_fmt_err_; } switch (fmt & SND_SOC_DAIFMT_INV_MASK) { @@ -1641,6 +1642,7 @@ static int rt1011_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) break; default: ret = -EINVAL; + goto _set_fmt_err_; } switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { @@ -1657,6 +1659,7 @@ static int rt1011_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) break; default: ret = -EINVAL; + goto _set_fmt_err_; } switch (dai->id) { @@ -1674,6 +1677,7 @@ static int rt1011_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt) ret = -EINVAL; } +_set_fmt_err_: snd_soc_dapm_mutex_unlock(dapm); return ret; } -- 2.23.0

2 1

[alsa-devel] [PATCH v9 0/6] Add HDMI jack support on RK3288
by Cheng-Yi Chiang 31 Oct '19

31 Oct '19

This patch series supports HDMI jack reporting on RK3288, which uses DRM dw-hdmi driver and hdmi-codec codec driver. The previous discussion about reporting jack status using hdmi-notifier and drm_audio_component is at https://lore.kernel.org/patchwork/patch/1083027/ The new approach is to use a callback mechanism that is specific to hdmi-codec. The dependent change on hdmi-codec.c commit 6fa5963c37a2 ("ASoC: hdmi-codec: Add an op to set callback function for plug event") has been merged to upstream. Changes from v8 to v9: 1. rockchip_max98090: Use the presence of rockchip,audio-codec to determine the presense of max98090 in sound card. Use the presence of rockchip,hdmi-codec to determine the presence of HDMI in sound card. Remove the compatible strings added in v8. 2. #include <sound/hdmi-codec.h> should be in the patch of adding HDMI jack support. Cheng-Yi Chiang (6): drm: bridge: dw-hdmi: Report connector status using callback ASoC: rockchip-max98090: Support usage with and without HDMI ASoC: rockchip_max98090: Optionally support HDMI use case ASoC: rockchip_max98090: Add HDMI jack support ARM: dts: rockchip: Add HDMI support to rk3288-veyron-analog-audio ARM: dts: rockchip: Add HDMI audio support to rk3288-veyron-mickey.dts .../bindings/sound/rockchip-max98090.txt | 27 +- .../boot/dts/rk3288-veyron-analog-audio.dtsi | 1 + arch/arm/boot/dts/rk3288-veyron-mickey.dts | 7 + .../drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 11 + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 41 ++- include/drm/bridge/dw_hdmi.h | 4 + sound/soc/rockchip/Kconfig | 3 +- sound/soc/rockchip/rockchip_max98090.c | 313 ++++++++++++++---- 8 files changed, 338 insertions(+), 69 deletions(-) -- 2.24.0.rc0.303.g954a862665-goog

4 14

[alsa-devel] sound/core/timer: Deadlock on register_mutex
by Kirill A. Shutemov 30 Oct '19

30 Oct '19

Hi, I've stepped on this after pulling USB sound card: ============================================ WARNING: possible recursive locking detected 5.4.0-rc4-00090-g95b5dc072cc3-dirty #48 Not tainted -------------------------------------------- xdg-screensaver/1321 is trying to acquire lock: ffffffffbaf6b3a0 (register_mutex){+.+.}, at: snd_timer_free.part.0 (/include/linux/compiler.h:199 /include/linux/list.h:268 /sound/core/timer.c:944) but task is already holding lock: ffffffffbaf6b3a0 (register_mutex){+.+.}, at: snd_timer_close (/sound/core/timer.c:416) other info that might help us debug this: Possible unsafe locking scenario: CPU0 ---- lock(register_mutex); lock(register_mutex); *** DEADLOCK *** May be due to missing lock nesting notation 2 locks held by xdg-screensaver/1321: #0: ffff9f74bbf5ef50 (&tu->ioctl_lock){+.+.}, at: snd_timer_user_release (/sound/core/timer.c:1467) #1: ffffffffbaf6b3a0 (register_mutex){+.+.}, at: snd_timer_close (/sound/core/timer.c:416) stack backtrace: CPU: 27 PID: 1321 Comm: xdg-screensaver Not tainted 5.4.0-rc4-00090-g95b5dc072cc3-dirty #48 Hardware name: Gigabyte Technology Co., Ltd. X299 AORUS Gaming 3 Pro/X299 AORUS Gaming 3 Pro-CF, BIOS F3 12/28/2017 Call Trace: dump_stack (/lib/dump_stack.c:115) __lock_acquire.cold (/kernel/locking/lockdep.c:2371 /kernel/locking/lockdep.c:2412 /kernel/locking/lockdep.c:2955 /kernel/locking/lockdep.c:3955) ? __lock_acquire (/kernel/locking/lockdep.c:3962) lock_acquire (/arch/x86/include/asm/current.h:15 /kernel/locking/lockdep.c:4489) ? snd_timer_free.part.0 (/include/linux/compiler.h:199 /include/linux/list.h:268 /sound/core/timer.c:944) __mutex_lock (/include/linux/compiler.h:199 /arch/x86/include/asm/atomic64_64.h:22 /include/asm-generic/atomic-instrumented.h:837 /include/asm-generic/atomic-long.h:28 /kernel/locking/mutex.c:111 /kernel/locking/mutex.c:152 /kernel/locking/mutex.c:958 /kernel/locking/mutex.c:1103) ? snd_timer_free.part.0 (/include/linux/compiler.h:199 /include/linux/list.h:268 /sound/core/timer.c:944) ? __mutex_lock (/include/linux/compiler.h:199 /arch/x86/include/asm/atomic64_64.h:22 /include/asm-generic/atomic-instrumented.h:837 /include/asm-generic/atomic-long.h:28 /kernel/locking/mutex.c:111 /kernel/locking/mutex.c:152 /kernel/locking/mutex.c:958 /kernel/locking/mutex.c:1103) ? __mutex_lock (/arch/x86/include/asm/preempt.h:102 /kernel/locking/mutex.c:964 /kernel/locking/mutex.c:1103) ? snd_timer_free.part.0 (/include/linux/compiler.h:199 /include/linux/list.h:268 /sound/core/timer.c:944) ? snd_timer_free.part.0 (/include/linux/compiler.h:199 /include/linux/list.h:268 /sound/core/timer.c:944) ? lockdep_hardirqs_on (/kernel/locking/lockdep.c:3394 /kernel/locking/lockdep.c:3434) snd_timer_free.part.0 (/include/linux/compiler.h:199 /include/linux/list.h:268 /sound/core/timer.c:944) snd_timer_dev_free (/sound/core/timer.c:967) __snd_device_free (/sound/core/device.c:76) snd_device_free_all (/sound/core/device.c:228) release_card_device (/sound/core/init.c:471 /sound/core/init.c:140) device_release (/drivers/base/core.c:1105) kobject_put (/lib/kobject.c:697 /lib/kobject.c:722 /include/linux/kref.h:65 /lib/kobject.c:739) snd_timer_close_locked (/sound/core/timer.c:398) snd_timer_close (/sound/core/timer.c:417) snd_timer_user_release (/sound/core/timer.c:1469) __fput (/fs/file_table.c:281) task_work_run (/kernel/task_work.c:115 (discriminator 1)) exit_to_usermode_loop (/include/linux/tracehook.h:188 /arch/x86/entry/common.c:163) do_syscall_64 (/arch/x86/entry/common.c:194 /arch/x86/entry/common.c:274 /arch/x86/entry/common.c:300) entry_SYSCALL_64_after_hwframe (/arch/x86/entry/entry_64.S:177) -- Kirill A. Shutemov

2 4

[alsa-devel] wm9713 regression on pxa platforms
by Robert Jarzmik 30 Oct '19

30 Oct '19

Hi Wolfson maintainers, hi Mark, Recently, the wm9713 support broke on my platforms. I'm pretty sure that a previous harmless warning became an error preventing the probe of my driver (sound/soc/pxa/mioa701_wm9713.c) : the error is shown in [1] ("Control not supported"). The warning "ASoC: no dapm match for Mic B Source" has be there as far as I'm aware for ages, and it never prevented the probe before. Now, if I apply the ugly patch in [2], everything works as expected ... but that's definitely not the right fix. Would any of you be able to figure out a fix please ? Cheers. -- Robert [1] Kernel log [ 129.888985] pxa2xx-ac97 pxa2xx-ac97: ASoC: dai register pxa2xx-ac97 #3 [ 129.889052] pxa2xx-ac97 pxa2xx-ac97: ASoC: dynamically register DAI pxa2xx-ac97 [ 129.889102] pxa2xx-ac97 pxa2xx-ac97: ASoC: Registered DAI 'pxa2xx-ac97' [ 129.889135] pxa2xx-ac97 pxa2xx-ac97: ASoC: dynamically register DAI pxa2xx-ac97 [ 129.889176] pxa2xx-ac97 pxa2xx-ac97: ASoC: Registered DAI 'pxa2xx-ac97-aux' [ 129.889207] pxa2xx-ac97 pxa2xx-ac97: ASoC: dynamically register DAI pxa2xx-ac97 [ 129.889249] pxa2xx-ac97 pxa2xx-ac97: ASoC: Registered DAI 'pxa2xx-ac97-mic' [ 135.341942] wm9713-codec wm9713-codec: ASoC: dai register wm9713-codec #3 [ 135.342019] wm9713-codec wm9713-codec: ASoC: dynamically register DAI wm9713-codec [ 135.342077] wm9713-codec wm9713-codec: ASoC: Registered DAI 'wm9713-hifi' [ 135.342109] wm9713-codec wm9713-codec: ASoC: dynamically register DAI wm9713-codec [ 135.342162] wm9713-codec wm9713-codec: ASoC: Registered DAI 'wm9713-aux' [ 135.342193] wm9713-codec wm9713-codec: ASoC: dynamically register DAI wm9713-codec [ 135.342234] wm9713-codec wm9713-codec: ASoC: Registered DAI 'wm9713-voice' [ 139.362113] mioa701-wm9713 mioa701-wm9713: ASoC: binding AC97 [ 139.362302] mioa701-wm9713 mioa701-wm9713: ASoC: binding AC97 Aux [ 139.367170] wm9713-codec wm9713-codec: Control not supported for path Mic B Source -> [MPB] -> Mic B Pre Amp [ 139.375450] wm9713-codec wm9713-codec: ASoC: no dapm match for Mic B Source --> MPB --> Mic B Pre Amp [ 139.383448] wm9713-codec wm9713-codec: ASoC: Failed to add route Mic B Source -> MPB -> Mic B Pre Amp [ 139.393422] mioa701-wm9713 mioa701-wm9713: ASoC: failed to instantiate card -22 [ 139.403089] mioa701-wm9713: probe of mioa701-wm9713 failed with error -22 [2] Ugly test diff --git a/sound/soc/codecs/wm9713.c b/sound/soc/codecs/wm9713.c index 6497c1ea6228..ec140ccbab0b 100644 --- a/sound/soc/codecs/wm9713.c +++ b/sound/soc/codecs/wm9713.c @@ -630,8 +630,8 @@ static const struct snd_soc_dapm_route wm9713_audio_map[] = { {"Mic A Source", "Mic 1", "MIC1"}, {"Mic A Source", "Mic 2 A", "MIC2A"}, {"Mic A Source", "Mic 2 B", "Mic B Source"}, - {"Mic B Pre Amp", "MPB", "Mic B Source"}, - {"Mic B Source", NULL, "MIC2B"}, + /* {"Mic B Pre Amp", "MPB", "Mic B Source"}, */ + /* {"Mic B Source", NULL, "MIC2B"}, */ /* headphone capture */ {"Capture Headphone Mux", "Stereo", "Capture Mixer"},

2 2

[alsa-devel] [PATCH v3 0/2] soundwire: Add support to Qualcomm SoundWire master
by Srinivas Kandagatla 30 Oct '19

30 Oct '19

Thanks for reviewing the v2 patchset. Here is new patchset addressing all the comments from v2 This patchset adds support for Qualcomm SoundWire Master Controller found in most of Qualcomm SoCs and WCD audio codecs. This driver along with WCD934x codec and WSA881x Class-D Smart Speaker Amplifier drivers is tested on on DragonBoard DB845c based of SDM845 SoC and Lenovo YOGA C630 Laptop based on SDM850. SoundWire controller on SDM845 is integrated in WCD934x audio codec via SlimBus interface. Currently this driver is very minimal and only supports PDM. Most of the code in this driver is rework of Qualcomm downstream drivers used in Andriod. Credits to Banajit Goswami and Patrick Lai's Team. TODO: Test and add PCM support. Thanks, srini Changes since v2: - Added support to set_sdw_stream Srinivas Kandagatla (2): dt-bindings: soundwire: add bindings for Qcom controller soundwire: qcom: add support for SoundWire controller .../bindings/soundwire/qcom,sdw.txt | 167 ++++ drivers/soundwire/Kconfig | 9 + drivers/soundwire/Makefile | 4 + drivers/soundwire/qcom.c | 935 ++++++++++++++++++ 4 files changed, 1115 insertions(+) create mode 100644 Documentation/devicetree/bindings/soundwire/qcom,sdw.txt create mode 100644 drivers/soundwire/qcom.c -- 2.21.0

4 14

[alsa-devel] pcm_lock deadlock
by Ville Syrjälä 30 Oct '19

30 Oct '19

Hi Takashi, I just got this deadlock when I tried to modprobe i915 on an ELK: [ 203.716416] ============================================ [ 203.716417] WARNING: possible recursive locking detected [ 203.716418] 5.4.0-rc5-elk+ #206 Not tainted [ 203.716419] -------------------------------------------- [ 203.716420] kworker/0:1/12 is trying to acquire lock: [ 203.716421] efb1c138 (&spec->pcm_lock){+.+.}, at: generic_hdmi_init+0x21/0x140 [snd_hda_codec_hdmi] [ 203.716426] but task is already holding lock: [ 203.716427] efb1c138 (&spec->pcm_lock){+.+.}, at: check_presence_and_report+0x67/0xb0 [snd_hda_codec_hdmi] [ 203.716430] other info that might help us debug this: [ 203.716431] Possible unsafe locking scenario: [ 203.716431] CPU0 [ 203.716432] ---- [ 203.716432] lock(&spec->pcm_lock); [ 203.716433] lock(&spec->pcm_lock); [ 203.716434] *** DEADLOCK *** [ 203.716435] May be due to missing lock nesting notation [ 203.716436] 3 locks held by kworker/0:1/12: [ 203.716436] #0: f14096a0 ((wq_completion)events){+.+.}, at: process_one_work+0x1b8/0x530 [ 203.716442] #1: f14dbf4c ((work_completion)(&bus->unsol_work)){+.+.}, at: process_one_work+0x1b8/0x530 [ 203.716444] #2: efb1c138 (&spec->pcm_lock){+.+.}, at: check_presence_and_report+0x67/0xb0 [snd_hda_codec_hdmi] [ 203.716448] stack backtrace: [ 203.716449] CPU: 0 PID: 12 Comm: kworker/0:1 Not tainted 5.4.0-rc5-elk+ #206 [ 203.716450] Hardware name: System manufacturer P5Q-EM/P5Q-EM, BIOS 2203 07/08/2009 [ 203.716457] Workqueue: events snd_hdac_bus_process_unsol_events [snd_hda_core] [ 203.716459] Call Trace: [ 203.716463] dump_stack+0x66/0x8e [ 203.716466] __lock_acquire.cold.62+0x3bf/0x3c7 [ 203.716468] ? mark_held_locks+0x3f/0x60 [ 203.716470] ? _raw_spin_unlock_irq+0x22/0x30 [ 203.716478] ? azx_rirb_get_response+0xd7/0x220 [snd_hda_codec] [ 203.716479] ? lockdep_hardirqs_on+0xec/0x1a0 [ 203.716480] ? _raw_spin_unlock_irq+0x22/0x30 [ 203.716483] ? trace_hardirqs_on+0x4a/0xf0 [ 203.716484] ? find_held_lock+0x26/0xb0 [ 203.716486] lock_acquire+0x74/0x150 [ 203.716488] ? generic_hdmi_init+0x21/0x140 [snd_hda_codec_hdmi] [ 203.716490] __mutex_lock+0x60/0x810 [ 203.716492] ? generic_hdmi_init+0x21/0x140 [snd_hda_codec_hdmi] [ 203.716496] ? snd_hdac_exec_verb+0x16/0x40 [snd_hda_core] [ 203.716499] ? codec_read+0x29/0x40 [snd_hda_core] [ 203.716501] mutex_lock_nested+0x14/0x20 [ 203.716503] ? generic_hdmi_init+0x21/0x140 [snd_hda_codec_hdmi] [ 203.716505] generic_hdmi_init+0x21/0x140 [snd_hda_codec_hdmi] [ 203.716507] generic_hdmi_resume+0x18/0x60 [snd_hda_codec_hdmi] [ 203.716512] hda_call_codec_resume+0xc2/0x130 [snd_hda_codec] [ 203.716517] hda_codec_runtime_resume+0x2a/0x60 [snd_hda_codec] [ 203.716520] __rpm_callback+0x7a/0x140 [ 203.716524] ? snd_hda_codec_device_new+0x2a0/0x2a0 [snd_hda_codec] [ 203.716529] ? snd_hda_codec_device_new+0x2a0/0x2a0 [snd_hda_codec] [ 203.716531] rpm_callback+0x1a/0x70 [ 203.716535] ? snd_hda_codec_device_new+0x2a0/0x2a0 [snd_hda_codec] [ 203.716537] rpm_resume+0x52c/0x700 [ 203.716538] ? _raw_spin_lock_irqsave+0x32/0x40 [ 203.716540] __pm_runtime_resume+0x43/0x90 [ 203.716543] snd_hdac_power_up_pm+0x4d/0x50 [snd_hda_core] [ 203.716546] hdmi_present_sense+0x34/0x340 [snd_hda_codec_hdmi] [ 203.716548] ? finish_task_switch+0x89/0x210 [ 203.716550] check_presence_and_report+0x7a/0xb0 [snd_hda_codec_hdmi] [ 203.716553] hdmi_unsol_event+0x57/0x60 [snd_hda_codec_hdmi] [ 203.716557] ? hda_codec_match+0x70/0x70 [snd_hda_codec] [ 203.716561] hda_codec_unsol_event+0x12/0x20 [snd_hda_codec] [ 203.716564] snd_hdac_bus_process_unsol_events+0x51/0x60 [snd_hda_core] [ 203.716566] process_one_work+0x230/0x530 [ 203.716567] worker_thread+0x37/0x410 [ 203.716569] kthread+0xf5/0x110 [ 203.716570] ? process_one_work+0x530/0x530 [ 203.716572] ? kthread_create_worker_on_cpu+0x20/0x20 [ 203.716574] ret_from_fork+0x2e/0x38 Looks like commit ade49db337a9 ("ALSA: hda/hdmi - Allow audio component for AMD/ATI and Nvidia HDMI") introduced pcm_lock to generic_hdmi_init(). -- Ville Syrjälä Intel

2 3