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

[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

[alsa-devel] [PATCH 2/3] ASoC: dt-bindings: rt5682: add button delay device property
by shumingf＠realtek.com 30 Oct '19

30 Oct '19

From: Shuming Fan <shumingf(a)realtek.com> The btndet-delay device property could control the HW debounce time. It is easy to adjust the sensitivity of push button. Signed-off-by: Shuming Fan <shumingf(a)realtek.com> --- Documentation/devicetree/bindings/sound/rt5682.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/rt5682.txt b/Documentation/devicetree/bindings/sound/rt5682.txt index 312e9a129530..30e927a28369 100644 --- a/Documentation/devicetree/bindings/sound/rt5682.txt +++ b/Documentation/devicetree/bindings/sound/rt5682.txt @@ -27,6 +27,11 @@ Optional properties: - realtek,ldo1-en-gpios : The GPIO that controls the CODEC's LDO1_EN pin. +- realtek,btndet-delay + The debounce delay for push button. + The delay time is realtek,btndet-delay value multiple of 8.192 ms. + If absent, the default is 16. + Pins on the device (for linking into audio routes) for RT5682: * DMIC L1 @@ -47,4 +52,5 @@ rt5682 { realtek,dmic1-data-pin = <1>; realtek,dmic1-clk-pin = <1>; realtek,jd-src = <1>; + realtek,btndet-delay = <16>; }; -- 2.23.0

2 2

[alsa-devel] [PATCH 1/3] ASoC: rt5682: improve the sensitivity of push button
by shumingf＠realtek.com 30 Oct '19

30 Oct '19

From: Shuming Fan <shumingf(a)realtek.com> The sensitivity could improve by decreasing the HW debounce time and reduce the delay time of workequeue. This patch added a device property for HW debounce time control. We could change this value to tune the sensitivity of push button. Signed-off-by: Shuming Fan <shumingf(a)realtek.com> --- include/sound/rt5682.h | 1 + sound/soc/codecs/rt5682.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/include/sound/rt5682.h b/include/sound/rt5682.h index bf2ee75aabb1..bc2c31734df1 100644 --- a/include/sound/rt5682.h +++ b/include/sound/rt5682.h @@ -31,6 +31,7 @@ struct rt5682_platform_data { enum rt5682_dmic1_data_pin dmic1_data_pin; enum rt5682_dmic1_clk_pin dmic1_clk_pin; enum rt5682_jd_src jd_src; + unsigned int btndet_delay; }; #endif diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c index c50b75ce82e0..35dcec135c8a 100644 --- a/sound/soc/codecs/rt5682.c +++ b/sound/soc/codecs/rt5682.c @@ -44,6 +44,7 @@ static const struct rt5682_platform_data i2s_default_platform_data = { .dmic1_data_pin = RT5682_DMIC1_DATA_GPIO2, .dmic1_clk_pin = RT5682_DMIC1_CLK_GPIO3, .jd_src = RT5682_JD1, + .btndet_delay = 16, }; struct rt5682_priv { @@ -1026,6 +1027,18 @@ static int rt5682_set_jack_detect(struct snd_soc_component *component, regmap_update_bits(rt5682->regmap, RT5682_IRQ_CTRL_2, RT5682_JD1_EN_MASK | RT5682_JD1_POL_MASK, RT5682_JD1_EN | RT5682_JD1_POL_NOR); + regmap_update_bits(rt5682->regmap, RT5682_4BTN_IL_CMD_4, + 0x7f7f, (rt5682->pdata.btndet_delay << 8 | + rt5682->pdata.btndet_delay)); + regmap_update_bits(rt5682->regmap, RT5682_4BTN_IL_CMD_5, + 0x7f7f, (rt5682->pdata.btndet_delay << 8 | + rt5682->pdata.btndet_delay)); + regmap_update_bits(rt5682->regmap, RT5682_4BTN_IL_CMD_6, + 0x7f7f, (rt5682->pdata.btndet_delay << 8 | + rt5682->pdata.btndet_delay)); + regmap_update_bits(rt5682->regmap, RT5682_4BTN_IL_CMD_7, + 0x7f7f, (rt5682->pdata.btndet_delay << 8 | + rt5682->pdata.btndet_delay)); mod_delayed_work(system_power_efficient_wq, &rt5682->jack_detect_work, msecs_to_jiffies(250)); break; @@ -2467,6 +2480,8 @@ static int rt5682_parse_dt(struct rt5682_priv *rt5682, struct device *dev) &rt5682->pdata.dmic1_clk_pin); device_property_read_u32(dev, "realtek,jd-src", &rt5682->pdata.jd_src); + device_property_read_u32(dev, "realtek,btndet-delay", + &rt5682->pdata.btndet_delay); rt5682->pdata.ldo1_en = of_get_named_gpio(dev->of_node, "realtek,ldo1-en-gpios", 0); -- 2.23.0

3 3

[alsa-devel] [PATCH 3/3] ASoC: rt1011: improve readability and remove redundant code
by shumingf＠realtek.com 30 Oct '19

30 Oct '19

From: Shuming Fan <shumingf(a)realtek.com> 1. remove !component->card->instantiated statement in kcontrol 2. goto the end of fucntion if "ret = -EINVAL" in rt1011_set_dai_fmt() 3. fix typo 4. add the range check for temperature_calib from device property 5. remove unnecessary tabs using spaces instead Signed-off-by: Shuming Fan <shumingf(a)realtek.com> --- sound/soc/codecs/rt1011.c | 72 ++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 38 deletions(-) diff --git a/sound/soc/codecs/rt1011.c b/sound/soc/codecs/rt1011.c index dcd397a83cb4..10bbdb37d689 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; } @@ -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 && @@ -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; @@ -1298,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) @@ -1640,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) { @@ -1650,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) { @@ -1666,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) { @@ -1683,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; } @@ -1778,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; } @@ -1982,14 +1978,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, @@ -2114,7 +2110,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, @@ -2123,9 +2119,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 = { @@ -2227,17 +2223,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) { @@ -2257,7 +2253,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); @@ -2272,7 +2268,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 */ @@ -2281,7 +2277,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]); } } @@ -2346,7 +2342,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)); @@ -2359,7 +2356,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); @@ -2380,7 +2377,7 @@ static int rt1011_parse_dp(struct rt1011_priv *rt1011, struct device *dev) } static int rt1011_i2c_probe(struct i2c_client *i2c, - const struct i2c_device_id *id) + const struct i2c_device_id *id) { struct rt1011_priv *rt1011; int ret; @@ -2388,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); @@ -2425,7 +2422,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] ASoC: rt5677-spi: fixup compile warning
by Kuninori Morimoto 30 Oct '19

30 Oct '19

From: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> This patch fixup this warning LINUX/sound/soc/codecs/rt5677-spi.c: In function ‘rt5677_spi_pcm_close’: LINUX/sound/soc/codecs/rt5677-spi.c:114:30: warning: unused variable ‘rtd’ [-Wunused-variable] struct snd_soc_pcm_runtime *rtd = substream->private_data; ^~~ Fixes: a0e0d135427c ("ASoC: rt5677: Add a PCM device for streaming hotword via SPI") Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> --- sound/soc/codecs/rt5677-spi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sound/soc/codecs/rt5677-spi.c b/sound/soc/codecs/rt5677-spi.c index dac1097..3aa3ea7 100644 --- a/sound/soc/codecs/rt5677-spi.c +++ b/sound/soc/codecs/rt5677-spi.c @@ -111,7 +111,6 @@ static int rt5677_spi_pcm_close( struct snd_soc_component *component, struct snd_pcm_substream *substream) { - struct snd_soc_pcm_runtime *rtd = substream->private_data; struct rt5677_dsp *rt5677_dsp = snd_soc_component_get_drvdata(component); -- 2.7.4

2 1

[alsa-devel] [PATCH] ALSA: firewire-motu: Correct a typo in the clock proc string
by Takashi Iwai 30 Oct '19

30 Oct '19

Just fix a typo of "S/PDIF" in the clock name string. Fixes: 4638ec6ede08 ("ALSA: firewire-motu: add proc node to show current statuc of clock and packet formats") Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/firewire/motu/motu-proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/firewire/motu/motu-proc.c b/sound/firewire/motu/motu-proc.c index b47ba818343f..187f6abd878c 100644 --- a/sound/firewire/motu/motu-proc.c +++ b/sound/firewire/motu/motu-proc.c @@ -16,7 +16,7 @@ static const char *const clock_names[] = { [SND_MOTU_CLOCK_SOURCE_SPDIF_ON_OPT] = "S/PDIF on optical interface", [SND_MOTU_CLOCK_SOURCE_SPDIF_ON_OPT_A] = "S/PDIF on optical interface A", [SND_MOTU_CLOCK_SOURCE_SPDIF_ON_OPT_B] = "S/PDIF on optical interface B", - [SND_MOTU_CLOCK_SOURCE_SPDIF_ON_COAX] = "S/PCIF on coaxial interface", + [SND_MOTU_CLOCK_SOURCE_SPDIF_ON_COAX] = "S/PDIF on coaxial interface", [SND_MOTU_CLOCK_SOURCE_AESEBU_ON_XLR] = "AESEBU on XLR interface", [SND_MOTU_CLOCK_SOURCE_WORD_ON_BNC] = "Word clock on BNC interface", [SND_MOTU_CLOCK_SOURCE_SPH] = "Source packet header", -- 2.16.4

2 1

[alsa-devel] [PATCH 0/6] ALSA: firewire-motu: add support for MOTU UltraLite and source packet header clock mode
by Takashi Sakamoto 30 Oct '19

30 Oct '19

Hi, Devices in MOTU FireWire series uses source packet header (SPH) in IEC 61883-1 for each data block in CIP. The devices have a mode to use the series of SPH for generating sampling clock. This patchset supports the above mechanism. Additionally, this patchset also supports MOTU UltraLite which adopts protocol version 2. Takashi Sakamoto (6): ALSA: firewire-motu: fix wrong spelling for macro ALSA: firewire-motu: print for unknown source of sampling clock ALSA: firewire-motu: detect SPH source of sampling clock ALSA: firewire-motu: minor code refactoring for protocol version 2 ALSA: firewire-motu: code refactoring to handle model specific switch for protocol v2 ALSA: firewire-motu: add support for MOTU UltraLite sound/firewire/motu/motu-pcm.c | 3 +- sound/firewire/motu/motu-proc.c | 2 + sound/firewire/motu/motu-protocol-v2.c | 142 ++++++++++++++----------- sound/firewire/motu/motu-protocol-v3.c | 4 +- sound/firewire/motu/motu.c | 34 ++++-- sound/firewire/motu/motu.h | 6 +- 6 files changed, 113 insertions(+), 78 deletions(-) -- 2.20.1

2 7

[alsa-devel] snd-bebob : from kernel 4.13 to 5.3.19 and .20
by Jean-Paul Argudo 30 Oct '19

30 Oct '19

Hi there, I wrote 1st this here: https://github.com/takaswie/snd-firewire-improve/issues/25 But I think it was the bad place, sorry for that. I think this ML is better? My problem in one line: I upgraded my Ubuntu Disco (kernel 4.13) to Ubuntu Eoan (kernel 5.3.19) and I can report my SaffireLE / Firewire doesnt work anymore, snd-bebob reports "discontinuity of CIP" on dmesg... At startup it lights green ok, but no sound is playable, then the lights turn orange (like it is when it's not working), I hear a "relay sound" (a electric clic of a relay), then, the Saffire LE disapears from the sound menu in Ubuntu sound menu. I can see this in dmesg: [ 19.083583] snd-bebob fw1.0: Detect discontinuity of CIP: 10 50 [ 19.746665] snd-bebob fw1.0: Detect discontinuity of CIP: A0 A8 [ 19.846775] snd-bebob fw1.0: Detect discontinuity of CIP: 70 B0 [ 20.335861] snd-bebob fw1.0: Detect discontinuity of CIP: 90 D0 [ 20.856301] snd-bebob fw1.0: Detect discontinuity of CIP: 78 B8 [ 21.312770] snd-bebob fw1.0: Detect discontinuity of CIP: 30 70 [ 21.796716] snd-bebob fw1.0: Detect discontinuity of CIP: 00 40 [ 22.347664] snd-bebob fw1.0: Detect discontinuity of CIP: 00 40 [ 22.818247] snd-bebob fw1.0: Detect discontinuity of CIP: A8 E8 [ 23.306079] snd-bebob fw1.0: Detect discontinuity of CIP: 98 D8 [ 29.544652] snd-bebob fw1.0: Detect discontinuity of CIP: 10 50 [ 30.272090] snd-bebob fw1.0: Detect discontinuity of CIP: A8 E8 [ 30.776168] snd-bebob fw1.0: Detect discontinuity of CIP: 00 40 [ 31.268123] snd-bebob fw1.0: Detect discontinuity of CIP: E0 20 [ 31.766085] snd-bebob fw1.0: Detect discontinuity of CIP: E0 20 [ 32.267903] snd-bebob fw1.0: Detect discontinuity of CIP: 88 C8 [ 32.767989] snd-bebob fw1.0: Detect discontinuity of CIP: F8 38 [ 33.263808] snd-bebob fw1.0: Detect discontinuity of CIP: 78 B8 [ 33.757156] snd-bebob fw1.0: Detect discontinuity of CIP: 08 48 [ 34.258860] snd-bebob fw1.0: Detect discontinuity of CIP: 80 C0 [ 34.755571] snd-bebob fw1.0: Detect discontinuity of CIP: 40 80 [ 35.261252] snd-bebob fw1.0: Detect discontinuity of CIP: 60 A0 [ 35.753980] snd-bebob fw1.0: Detect discontinuity of CIP: 78 B8 [ 36.253547] snd-bebob fw1.0: Detect discontinuity of CIP: C0 00 [ 36.752500] snd-bebob fw1.0: Detect discontinuity of CIP: 08 48 [ 37.255203] snd-bebob fw1.0: Detect discontinuity of CIP: B0 F0 [ 277.760550] snd-bebob fw1.0: Detect discontinuity of CIP: 40 80 [ 278.488972] snd-bebob fw1.0: Detect discontinuity of CIP: C0 00 [ 278.986290] snd-bebob fw1.0: Detect discontinuity of CIP: E0 20 [ 279.485998] snd-bebob fw1.0: Detect discontinuity of CIP: 18 58 [ 279.983838] snd-bebob fw1.0: Detect discontinuity of CIP: D0 10 [ 280.486776] snd-bebob fw1.0: Detect discontinuity of CIP: C0 00 [ 280.979487] snd-bebob fw1.0: Detect discontinuity of CIP: 30 70 [ 281.480952] snd-bebob fw1.0: Detect discontinuity of CIP: 78 B8 [ 281.975413] snd-bebob fw1.0: Detect discontinuity of CIP: 38 78 [ 282.475487] snd-bebob fw1.0: Detect discontinuity of CIP: 60 A0 [ 282.979446] snd-bebob fw1.0: Detect discontinuity of CIP: 88 C8 [ 283.472403] snd-bebob fw1.0: Detect discontinuity of CIP: 88 C8 [ 283.968484] snd-bebob fw1.0: Detect discontinuity of CIP: 68 A8 [ 284.471585] snd-bebob fw1.0: Detect discontinuity of CIP: 30 70 [ 284.562886] usb 3-4.1: reset high-speed USB device number 5 using xhci_hcd [ 284.965508] snd-bebob fw1.0: Detect discontinuity of CIP: D0 10 [ 285.469348] snd-bebob fw1.0: Detect discontinuity of CIP: 68 A8 [ 285.965174] snd-bebob fw1.0: Detect discontinuity of CIP: 20 60 [ 285.981618] firewire_core 0000:05:01.0: phy config: new root=ffc1, gap_count=5 [ 290.103982] firewire_core 0000:05:01.0: phy config: new root=ffc1, gap_count=5 I tried update the kernel with eoan-proposed I know run 5.3.20 and I have the same problem (the trace above is made with 5.3.20. First, I hope I report this the best way, really not sure here. If not, please tell me what to bring (files? logs?) and where (on this list? elsewhere?). I have spare time to investigate anything that could help here. Thanks! -- Jean-Paul Argudo

2 2

Re: [alsa-devel] [PATCH 2/2] ASoC: fsl_asrc: Add support for imx8qm
by S.j. Wang 30 Oct '19

30 Oct '19

Hi > > On Tue, Oct 29, 2019 at 05:17:09PM +0800, Shengjiu Wang wrote: > > There are two asrc module in imx8qm, each module has different clock > > configuration, and the DMA type is EDMA. > > > > So in this patch, we define the new clocks, refine the clock map, and > > include struct fsl_asrc_soc_data for different soc usage. > > > > The EDMA channel is fixed with each dma request, one dma request > > corresponding to one dma channel. So we need to request dma channel > > with dma request of asrc module. > > > > Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> > > --- > > sound/soc/fsl/fsl_asrc.c | 91 +++++++++++++++++++++++++++++------- > > sound/soc/fsl/fsl_asrc.h | 65 +++++++++++++++++++++++++- > > sound/soc/fsl/fsl_asrc_dma.c | 39 ++++++++++++---- > > 3 files changed, 167 insertions(+), 28 deletions(-) > > > diff --git a/sound/soc/fsl/fsl_asrc_dma.c > > b/sound/soc/fsl/fsl_asrc_dma.c index d6146de9acd2..dbb07a486504 > 100644 > > --- a/sound/soc/fsl/fsl_asrc_dma.c > > +++ b/sound/soc/fsl/fsl_asrc_dma.c > > @@ -199,19 +199,40 @@ static int fsl_asrc_dma_hw_params(struct > > snd_soc_component *component, > > > > /* Get DMA request of Back-End */ > > tmp_chan = dma_request_slave_channel(dev_be, tx ? "tx" : "rx"); > > - tmp_data = tmp_chan->private; > > - pair->dma_data.dma_request = tmp_data->dma_request; > > - dma_release_channel(tmp_chan); > > + /* tmp_chan may be NULL for it is already allocated by Back-End */ > > + if (tmp_chan) { > > + tmp_data = tmp_chan->private; > > + if (tmp_data) > > + pair->dma_data.dma_request = > > + tmp_data->dma_request; > > If this patch is supposed to add a !tmp_chan case for EDMA, we probably > shouldn't mute the !tmp_data case because dma_request will be NULL, > although the code previously didn't have a check either. I mean we might > need to error-out for !tmp_chan. Or... > is this intentional? > Yes, intentional. May be we can change to if (!asrc_priv->soc->use_edma) { /* Get DMA request of Back-End */ tmp_chan = dma_request_slave_channel(dev_be, tx ? "tx" : "rx"); tmp_data = tmp_chan->private; pair->dma_data.dma_request = tmp_data->dma_request; dma_release_channel(tmp_chan); /* Get DMA request of Front-End */ tmp_chan = fsl_asrc_get_dma_channel(pair, dir); tmp_data = tmp_chan->private; pair->dma_data.dma_request2 = tmp_data->dma_request; pair->dma_data.peripheral_type = tmp_data->peripheral_type; pair->dma_data.priority = tmp_data->priority; dma_release_channel(tmp_chan); } Best regards Wang shengjiu

2 1