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

[PATCH] ASoC: SOF: topology: Prevent NULL pointer dereference with no TLV
by Kai Vehmanen 01 Feb '21

01 Feb '21

From: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> When there is no TLV data in topology, extracting the TLV data could result in a NULL pointer exception. Prevent this by making sure that the TLV data exists before extracting it. Signed-off-by: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski(a)linux.intel.com> Reviewed-by: Paul Olaru <paul.olaru(a)oss.nxp.com> Reviewed-by: Bard Liao <bard.liao(a)intel.com> Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> --- sound/soc/sof/topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index b69f493b5faa..46089000524d 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -1073,7 +1073,7 @@ static int sof_control_load_volume(struct snd_soc_component *scomp, scontrol->cmd = SOF_CTRL_CMD_VOLUME; /* extract tlv data */ - if (get_tlv_data(kc->tlv.p, tlv) < 0) { + if (!kc->tlv.p || get_tlv_data(kc->tlv.p, tlv) < 0) { dev_err(scomp->dev, "error: invalid TLV data\n"); ret = -EINVAL; goto out_free; base-commit: 8ac9e476b86851c94e0f33bea758e0a00e3f875e -- 2.29.2

2 1

[PATCH] ASoC: codecs: add missing max_register in regmap config
by Srinivas Kandagatla 01 Feb '21

01 Feb '21

For some reason setting max_register was missed from regmap_config. Without this cat /sys/kernel/debug/regmap/sdw:0:217:2010:0:1/range actually throws below Warning. WARNING: CPU: 7 PID: 540 at drivers/base/regmap/regmap-debugfs.c:160 regmap_debugfs_get_dump_start.part.10+0x1e0/0x220 ... Call trace: regmap_debugfs_get_dump_start.part.10+0x1e0/0x220 regmap_reg_ranges_read_file+0xc0/0x2e0 full_proxy_read+0x64/0x98 vfs_read+0xa8/0x1e0 ksys_read+0x6c/0x100 __arm64_sys_read+0x1c/0x28 el0_svc_common.constprop.3+0x6c/0x190 do_el0_svc+0x24/0x90 el0_svc+0x14/0x20 el0_sync_handler+0x90/0xb8 el0_sync+0x158/0x180 ... Fixes: a0aab9e1404a ("ASoC: codecs: add wsa881x amplifier support") Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> --- sound/soc/codecs/wsa881x.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/wsa881x.c b/sound/soc/codecs/wsa881x.c index 4530b74f5921..db87e07b11c9 100644 --- a/sound/soc/codecs/wsa881x.c +++ b/sound/soc/codecs/wsa881x.c @@ -640,6 +640,7 @@ static struct regmap_config wsa881x_regmap_config = { .val_bits = 8, .cache_type = REGCACHE_RBTREE, .reg_defaults = wsa881x_defaults, + .max_register = WSA881X_SPKR_STATUS3, .num_reg_defaults = ARRAY_SIZE(wsa881x_defaults), .volatile_reg = wsa881x_volatile_register, .readable_reg = wsa881x_readable_register, -- 2.21.0

2 1

[bug report] ALSA: seq: Use no intrruptible mutex_lock
by Dan Carpenter 01 Feb '21

01 Feb '21

Hello Takashi Iwai, The patch 04702e8d0092: "ALSA: seq: Use no intrruptible mutex_lock" from Aug 1, 2018, leads to the following static checker warning: sound/core/seq/seq_clientmgr.c:2194 snd_seq_create_kernel_client() warn: called with lock held. '&register_mutex' sound/core/seq/seq_midi.c 294 if (ports > (256 / SNDRV_RAWMIDI_DEVICES)) 295 ports = 256 / SNDRV_RAWMIDI_DEVICES; 296 297 mutex_lock(&register_mutex); ^^^^^^^^^^^^^^^ Holding lock 298 client = synths[card->number]; 299 if (client == NULL) { 300 newclient = 1; 301 client = kzalloc(sizeof(*client), GFP_KERNEL); 302 if (client == NULL) { 303 mutex_unlock(&register_mutex); 304 kfree(info); 305 return -ENOMEM; 306 } 307 client->seq_client = 308 snd_seq_create_kernel_client( ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Deadlock 309 card, 0, "%s", card->shortname[0] ? 310 (const char *)card->shortname : "External MIDI"); 311 if (client->seq_client < 0) { 312 kfree(client); 313 mutex_unlock(&register_mutex); 314 kfree(info); 315 return -ENOMEM; 316 } 317 } regards, dan carpenter

2 1

[PATCH v2] ASoC: qcom: lpass: Fix i2s ctl register bit map
by Jun Nie 01 Feb '21

01 Feb '21

Fix bitwidth mapping in i2s ctl register per APQ8016 document. Fixes: b5022a36d28f ("ASoC: qcom: lpass: Use regmap_field for i2sctl and dmactl registers") Signed-off-by: Jun Nie <jun.nie(a)linaro.org> --- sound/soc/qcom/lpass-apq8016.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/qcom/lpass-apq8016.c b/sound/soc/qcom/lpass-apq8016.c index 8507ef8f6679..3efa133d1c64 100644 --- a/sound/soc/qcom/lpass-apq8016.c +++ b/sound/soc/qcom/lpass-apq8016.c @@ -250,7 +250,7 @@ static struct lpass_variant apq8016_data = { .micmode = REG_FIELD_ID(0x1000, 4, 7, 4, 0x1000), .micmono = REG_FIELD_ID(0x1000, 3, 3, 4, 0x1000), .wssrc = REG_FIELD_ID(0x1000, 2, 2, 4, 0x1000), - .bitwidth = REG_FIELD_ID(0x1000, 0, 0, 4, 0x1000), + .bitwidth = REG_FIELD_ID(0x1000, 0, 1, 4, 0x1000), .rdma_dyncclk = REG_FIELD_ID(0x8400, 12, 12, 2, 0x1000), .rdma_bursten = REG_FIELD_ID(0x8400, 11, 11, 2, 0x1000), -- 2.25.1

3 3

[PATCH] soundwire: return earlier if no slave is attached
by Bard Liao 01 Feb '21

01 Feb '21

From: Chao Song <chao.song(a)linux.intel.com> If there is no slave attached to soundwire bus, we can return earlier from sdw_bus_prep_clk_stop() and sdw_bus_exit_clk_stop(), this saves a redundant value check. Signed-off-by: Chao Song <chao.song(a)linux.intel.com> Reviewed-by: Rander Wang <rander.wang(a)intel.com> Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski(a)linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Signed-off-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> --- drivers/soundwire/bus.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c index 82df088c9333..d9deafdcf495 100644 --- a/drivers/soundwire/bus.c +++ b/drivers/soundwire/bus.c @@ -951,17 +951,17 @@ int sdw_bus_prep_clk_stop(struct sdw_bus *bus) simple_clk_stop = false; } - if (is_slave && !simple_clk_stop) { + /* Skip remaining clock stop preparation if no Slave is attached */ + if (!is_slave) + return ret; + + if (!simple_clk_stop) { ret = sdw_bus_wait_for_clk_prep_deprep(bus, SDW_BROADCAST_DEV_NUM); if (ret < 0) return ret; } - /* Don't need to inform slaves if there is no slave attached */ - if (!is_slave) - return ret; - /* Inform slaves that prep is done */ list_for_each_entry(slave, &bus->slaves, node) { if (!slave->dev_num) @@ -1075,16 +1075,13 @@ int sdw_bus_exit_clk_stop(struct sdw_bus *bus) "clk stop deprep failed:%d", ret); } - if (is_slave && !simple_clk_stop) + /* Skip remaining clock stop de-preparation if no Slave is attached */ + if (!is_slave) + return 0; + + if (!simple_clk_stop) sdw_bus_wait_for_clk_prep_deprep(bus, SDW_BROADCAST_DEV_NUM); - /* - * Don't need to call slave callback function if there is no slave - * attached - */ - if (!is_slave) - return 0; - list_for_each_entry(slave, &bus->slaves, node) { if (!slave->dev_num) continue; -- 2.17.1

2 1

[PATCH] soundwire: bus: add better dev_dbg to track complete() calls
by Bard Liao 01 Feb '21

01 Feb '21

From: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Add a dev_dbg() log for both enumeration and initialization completion to better track suspend-resume issues. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Reviewed-by: Rander Wang <rander.wang(a)intel.com> Reviewed-by: Chao Song <chao.song(a)intel.com> Signed-off-by: Bard Liao <yung-chuan.liao(a)linux.intel.com> --- drivers/soundwire/bus.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c index 6e1c988f3845..82df088c9333 100644 --- a/drivers/soundwire/bus.c +++ b/drivers/soundwire/bus.c @@ -784,7 +784,7 @@ static void sdw_modify_slave_status(struct sdw_slave *slave, if (status == SDW_SLAVE_UNATTACHED) { dev_dbg(&slave->dev, - "%s: initializing completion for Slave %d\n", + "%s: initializing enumeration and init completion for Slave %d\n", __func__, slave->dev_num); init_completion(&slave->enumeration_complete); @@ -793,7 +793,7 @@ static void sdw_modify_slave_status(struct sdw_slave *slave, } else if ((status == SDW_SLAVE_ATTACHED) && (slave->status == SDW_SLAVE_UNATTACHED)) { dev_dbg(&slave->dev, - "%s: signaling completion for Slave %d\n", + "%s: signaling enumeration completion for Slave %d\n", __func__, slave->dev_num); complete(&slave->enumeration_complete); @@ -1758,8 +1758,13 @@ int sdw_handle_slave_status(struct sdw_bus *bus, if (ret) dev_err(slave->bus->dev, "Update Slave status failed:%d\n", ret); - if (attached_initializing) + if (attached_initializing) { + dev_dbg(&slave->dev, + "%s: signaling initialization completion for Slave %d\n", + __func__, slave->dev_num); + complete(&slave->initialization_complete); + } } return ret; -- 2.17.1

2 1

jack doesn't detected plugged after suspend
by Mert Can Demir 01 Feb '21

01 Feb '21

Hi, I opened an issue on pulseaudio repository at https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/issues/1125 about the problem about the detection of jack output, and I have been forwarded there, that mailing list, at https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/issues/1125#note_784…. The related outputs and logs are baked into the issue, and seems that the outputs tells that alsa driver did not reported jack as plugged after suspend. Thanks for understanding, Sincerely, validatedev

2 1

[PATCH] ALSA: intel8x0: Fix missing check in snd_intel8x0m_create
by Dinghao Liu 01 Feb '21

01 Feb '21

When device_type == DEVICE_ALI, we should also check the return value of pci_iomap() to avoid potential null pointer dereference. Signed-off-by: Dinghao Liu <dinghao.liu(a)zju.edu.cn> --- sound/pci/intel8x0m.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/pci/intel8x0m.c b/sound/pci/intel8x0m.c index 1b7df0c4e57c..19872cecc9d2 100644 --- a/sound/pci/intel8x0m.c +++ b/sound/pci/intel8x0m.c @@ -1129,13 +1129,14 @@ static int snd_intel8x0m_create(struct snd_card *card, chip->bmaddr = pci_iomap(pci, 3, 0); else chip->bmaddr = pci_iomap(pci, 1, 0); + +port_inited: if (!chip->bmaddr) { dev_err(card->dev, "Controller space ioremap problem\n"); snd_intel8x0m_free(chip); return -EIO; } - port_inited: /* initialize offsets */ chip->bdbars_count = 2; tbl = intel_regs; -- 2.17.1

2 1

[PATCH 0/2] ALSA: Constify static attribute_group structs
by Rikard Falkeborn 31 Jan '21

31 Jan '21

Constify two static attribute_group structs that are never modified. These two were the only static non-const ones in sound/. Rikard Falkeborn (2): ALSA: ac97: Constify static struct attribute_group ALSA: hda: Constify static attribute_group sound/ac97/bus.c | 2 +- sound/hda/hdac_sysfs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.30.0

2 4

Extend card search paths
by GitHub pull_request - opened 30 Jan '21

30 Jan '21

alsa-project/alsa-ucm-conf pull request #76 was opened from lumag: On Qualcomm platforms is is typical for a single kernel module to support several sound cards. Add support for using `ucm2/module/${KernelModule}/${CardLongName}.conf` as a use case config file. See https://github.com/alsa-project/alsa-ucm-conf/pull/70 for the reference. Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/76 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/76.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0