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

[alsa-devel] [PATCH] ALSA: firewire-motu: unify common tracepoints for both direction
by Takashi Sakamoto 24 Jun '19

24 Jun '19

In ALSA firewire-motu driver, some tracepoints are supported to probe vendor-specific data fields for SPH and status/control messages in payload of isochronous packet. At present, the events of tracepoints are unique each of direction, however the pair of events has the same structure and print format. It's possible to unify the pair. This commit unifies the pair. From userspace, direction is specified by filtering for src/dst fields in the structure. --- sound/firewire/motu/amdtp-motu-trace.h | 70 ++++++-------------------- sound/firewire/motu/amdtp-motu.c | 8 +-- 2 files changed, 20 insertions(+), 58 deletions(-) diff --git a/sound/firewire/motu/amdtp-motu-trace.h b/sound/firewire/motu/amdtp-motu-trace.h index cd0cbfa9f96f..edc551d4ca50 100644 --- a/sound/firewire/motu/amdtp-motu-trace.h +++ b/sound/firewire/motu/amdtp-motu-trace.h @@ -18,7 +18,7 @@ static void copy_sph(u32 *frame, __be32 *buffer, unsigned int data_blocks, static void copy_message(u64 *frames, __be32 *buffer, unsigned int data_blocks, unsigned int data_block_quadlets); -TRACE_EVENT(in_data_block_sph, +TRACE_EVENT(data_block_sph, TP_PROTO(struct amdtp_stream *s, unsigned int data_blocks, __be32 *buffer), TP_ARGS(s, data_blocks, buffer), TP_STRUCT__entry( @@ -28,8 +28,13 @@ TRACE_EVENT(in_data_block_sph, __dynamic_array(u32, tstamps, data_blocks) ), TP_fast_assign( - __entry->src = fw_parent_device(s->unit)->node_id; - __entry->dst = fw_parent_device(s->unit)->card->node_id; + if (s->direction == AMDTP_IN_STREAM) { + __entry->src = fw_parent_device(s->unit)->node_id; + __entry->dst = fw_parent_device(s->unit)->card->node_id; + } else { + __entry->src = fw_parent_device(s->unit)->card->node_id; + __entry->dst = fw_parent_device(s->unit)->node_id; + } __entry->data_blocks = data_blocks; copy_sph(__get_dynamic_array(tstamps), buffer, data_blocks, s->data_block_quadlets); ), @@ -42,55 +47,7 @@ TRACE_EVENT(in_data_block_sph, ) ); -TRACE_EVENT(out_data_block_sph, - TP_PROTO(struct amdtp_stream *s, unsigned int data_blocks, __be32 *buffer), - TP_ARGS(s, data_blocks, buffer), - TP_STRUCT__entry( - __field(int, src) - __field(int, dst) - __field(unsigned int, data_blocks) - __dynamic_array(u32, tstamps, data_blocks) - ), - TP_fast_assign( - __entry->src = fw_parent_device(s->unit)->card->node_id; - __entry->dst = fw_parent_device(s->unit)->node_id; - __entry->data_blocks = data_blocks; - copy_sph(__get_dynamic_array(tstamps), buffer, data_blocks, s->data_block_quadlets); - ), - TP_printk( - "%04x %04x %u %s", - __entry->src, - __entry->dst, - __entry->data_blocks, - __print_array(__get_dynamic_array(tstamps), __entry->data_blocks, 4) - ) -); - -TRACE_EVENT(in_data_block_message, - TP_PROTO(struct amdtp_stream *s, unsigned int data_blocks, __be32 *buffer), - TP_ARGS(s, data_blocks, buffer), - TP_STRUCT__entry( - __field(int, src) - __field(int, dst) - __field(unsigned int, data_blocks) - __dynamic_array(u64, messages, data_blocks) - ), - TP_fast_assign( - __entry->src = fw_parent_device(s->unit)->node_id; - __entry->dst = fw_parent_device(s->unit)->card->node_id; - __entry->data_blocks = data_blocks; - copy_message(__get_dynamic_array(messages), buffer, data_blocks, s->data_block_quadlets); - ), - TP_printk( - "%04x %04x %u %s", - __entry->src, - __entry->dst, - __entry->data_blocks, - __print_array(__get_dynamic_array(messages), __entry->data_blocks, 8) - ) -); - -TRACE_EVENT(out_data_block_message, +TRACE_EVENT(data_block_message, TP_PROTO(struct amdtp_stream *s, unsigned int data_blocks, __be32 *buffer), TP_ARGS(s, data_blocks, buffer), TP_STRUCT__entry( @@ -100,8 +57,13 @@ TRACE_EVENT(out_data_block_message, __dynamic_array(u64, messages, data_blocks) ), TP_fast_assign( - __entry->src = fw_parent_device(s->unit)->card->node_id; - __entry->dst = fw_parent_device(s->unit)->node_id; + if (s->direction == AMDTP_IN_STREAM) { + __entry->src = fw_parent_device(s->unit)->node_id; + __entry->dst = fw_parent_device(s->unit)->card->node_id; + } else { + __entry->src = fw_parent_device(s->unit)->card->node_id; + __entry->dst = fw_parent_device(s->unit)->node_id; + } __entry->data_blocks = data_blocks; copy_message(__get_dynamic_array(messages), buffer, data_blocks, s->data_block_quadlets); ), diff --git a/sound/firewire/motu/amdtp-motu.c b/sound/firewire/motu/amdtp-motu.c index 62685f2528ce..1c9ce04a2e89 100644 --- a/sound/firewire/motu/amdtp-motu.c +++ b/sound/firewire/motu/amdtp-motu.c @@ -306,8 +306,8 @@ static unsigned int process_tx_data_blocks(struct amdtp_stream *s, struct amdtp_motu *p = s->protocol; struct snd_pcm_substream *pcm; - trace_in_data_block_sph(s, data_blocks, buffer); - trace_in_data_block_message(s, data_blocks, buffer); + trace_data_block_sph(s, data_blocks, buffer); + trace_data_block_message(s, data_blocks, buffer); if (p->midi_ports) read_midi_messages(s, buffer, data_blocks); @@ -384,8 +384,8 @@ static unsigned int process_rx_data_blocks(struct amdtp_stream *s, write_sph(s, buffer, data_blocks); - trace_out_data_block_sph(s, data_blocks, buffer); - trace_out_data_block_message(s, data_blocks, buffer); + trace_data_block_sph(s, data_blocks, buffer); + trace_data_block_message(s, data_blocks, buffer); return data_blocks; } -- 2.20.1

2 2

[alsa-devel] Reminder: 9 open syzbot bugs in sound subsystem
by Eric Biggers 24 Jun '19

24 Jun '19

[This email was generated by a script. Let me know if you have any suggestions to make it better.] Of the currently open syzbot reports against the upstream kernel, I've manually marked 9 of them as possibly being bugs in the sound subsystem. I've listed these reports below, sorted by an algorithm that tries to list first the reports most likely to be still valid, important, and actionable. Of these 9 bugs, 1 was bisected to a commit from the following person: Takashi Iwai <tiwai(a)suse.de> If you believe a bug is no longer valid, please close the syzbot report by sending a '#syz fix', '#syz dup', or '#syz invalid' command in reply to the original thread, as explained at https://goo.gl/tpsmEJ#status If you believe I misattributed a bug to the sound subsystem, please let me know, and if possible forward the report to the correct people or mailing list. Here are the bugs: -------------------------------------------------------------------------------- Title: KASAN: slab-out-of-bounds Write in default_read_copy_kernel Last occurred: 119 days ago Reported: 195 days ago Branches: Mainline Dashboard link: https://syzkaller.appspot.com/bug?id=04933ddeeb1b542edf54b88ceccdac34de747a… Original thread: https://lkml.kernel.org/lkml/0000000000004a6256057ca3b6bd@google.com/T/#u This bug has a C reproducer. This bug was bisected to: commit 65766ee0bf7fe8b3be80e2e1c3ef54ad59b29476 Author: Takashi Iwai <tiwai(a)suse.de> Date: Fri Nov 9 10:59:45 2018 +0000 ALSA: oss: Use kvzalloc() for local buffer allocations The original thread for this bug received 1 reply, 96 days ago. If you fix this bug, please add the following tag to the commit: Reported-by: syzbot+12f17c177de05efea72d(a)syzkaller.appspotmail.com If you send any email or patch for this bug, please consider replying to the original thread. For the git send-email command to use, or tips on how to reply if the thread isn't in your mailbox, see the "Reply instructions" at https://lkml.kernel.org/r/0000000000004a6256057ca3b6bd@google.com -------------------------------------------------------------------------------- Title: WARNING: proc registration bug in snd_info_card_register Last occurred: 27 days ago Reported: 72 days ago Branches: Mainline (with usb-fuzzer patches) Dashboard link: https://syzkaller.appspot.com/bug?id=0cf36d8457554bf03c3cacc44d31ff145a0c1a… Original thread: https://lkml.kernel.org/lkml/0000000000007f693a058653d90c@google.com/T/#u This bug has a C reproducer. No one has replied to the original thread for this bug yet. This looks like a bug in a sound USB driver. If you fix this bug, please add the following tag to the commit: Reported-by: syzbot+2e782bf6a60d0fcb932d(a)syzkaller.appspotmail.com If you send any email or patch for this bug, please consider replying to the original thread. For the git send-email command to use, or tips on how to reply if the thread isn't in your mailbox, see the "Reply instructions" at https://lkml.kernel.org/r/0000000000007f693a058653d90c@google.com -------------------------------------------------------------------------------- Title: WARNING in snd_usb_motu_microbookii_communicate/usb_submit_urb Last occurred: 15 days ago Reported: 12 days ago Branches: Mainline (with usb-fuzzer patches) Dashboard link: https://syzkaller.appspot.com/bug?id=125081d1f7eba4b9b25f53aaae53176cd4abb2… Original thread: https://lkml.kernel.org/lkml/000000000000acb99a058b0d5741@google.com/T/#u This bug has a syzkaller reproducer only. No one has replied to the original thread for this bug yet. This looks like a bug in a sound USB driver. If you fix this bug, please add the following tag to the commit: Reported-by: syzbot+d952e5e28f5fb7718d23(a)syzkaller.appspotmail.com If you send any email or patch for this bug, please reply to the original thread. For the git send-email command to use, or tips on how to reply if the thread isn't in your mailbox, see the "Reply instructions" at https://lkml.kernel.org/r/000000000000acb99a058b0d5741@google.com -------------------------------------------------------------------------------- Title: INFO: rcu detected stall in snd_seq_write Last occurred: 57 days ago Reported: 300 days ago Branches: Mainline and others Dashboard link: https://syzkaller.appspot.com/bug?id=33501520944e11adedf1c454eec4cb818bee16… Original thread: https://lkml.kernel.org/lkml/000000000000e5050205746dcbb0@google.com/T/#u This bug has a syzkaller reproducer only. The original thread for this bug received 1 reply, 300 days ago. If you fix this bug, please add the following tag to the commit: Reported-by: syzbot+97aae04ce27e39cbfca9(a)syzkaller.appspotmail.com If you send any email or patch for this bug, please consider replying to the original thread. For the git send-email command to use, or tips on how to reply if the thread isn't in your mailbox, see the "Reply instructions" at https://lkml.kernel.org/r/000000000000e5050205746dcbb0@google.com -------------------------------------------------------------------------------- Title: KASAN: use-after-free Write in check_and_subscribe_port Last occurred: 54 days ago Reported: 47 days ago Branches: Mainline Dashboard link: https://syzkaller.appspot.com/bug?id=2c039ed96840fcfe469c2c5c5fc0bef92e5c9a… Original thread: https://lkml.kernel.org/lkml/0000000000008af53105884907e9@google.com/T/#u Unfortunately, this bug does not have a reproducer. No one has replied to the original thread for this bug yet. If you fix this bug, please add the following tag to the commit: Reported-by: syzbot+20ab495fadf081e8a2b0(a)syzkaller.appspotmail.com If you send any email or patch for this bug, please consider replying to the original thread. For the git send-email command to use, or tips on how to reply if the thread isn't in your mailbox, see the "Reply instructions" at https://lkml.kernel.org/r/0000000000008af53105884907e9@google.com -------------------------------------------------------------------------------- Title: WARNING: suspicious RCU usage in line6_pcm_acquire Last occurred: 28 days ago Reported: 59 days ago Branches: Mainline (with usb-fuzzer patches) Dashboard link: https://syzkaller.appspot.com/bug?id=a0ea128a37bfe56208042c02d080873dcbdf69… Original thread: https://lkml.kernel.org/lkml/0000000000007cb1ee0587591549@google.com/T/#u Unfortunately, this bug does not have a reproducer. No one has replied to the original thread for this bug yet. This looks like a bug in a sound USB driver. If you fix this bug, please add the following tag to the commit: Reported-by: syzbot+06b7a5a8c4acc0445995(a)syzkaller.appspotmail.com If you send any email or patch for this bug, please consider replying to the original thread. For the git send-email command to use, or tips on how to reply if the thread isn't in your mailbox, see the "Reply instructions" at https://lkml.kernel.org/r/0000000000007cb1ee0587591549@google.com -------------------------------------------------------------------------------- Title: KASAN: use-after-free Read in wake_up_if_idle Last occurred: 101 days ago Reported: 237 days ago Branches: Mainline and others Dashboard link: https://syzkaller.appspot.com/bug?id=b1e300cd7b124fc83dd4199d4d1df26310111b… Original thread: https://lkml.kernel.org/lkml/00000000000066ab7105795f245e@google.com/T/#u Unfortunately, this bug does not have a reproducer. No one replied to the original thread for this bug. If you fix this bug, please add the following tag to the commit: Reported-by: syzbot+2c1253bc508adef78a7f(a)syzkaller.appspotmail.com If you send any email or patch for this bug, please consider replying to the original thread. For the git send-email command to use, or tips on how to reply if the thread isn't in your mailbox, see the "Reply instructions" at https://lkml.kernel.org/r/00000000000066ab7105795f245e@google.com -------------------------------------------------------------------------------- Title: INFO: task hung in snd_seq_write Last occurred: 95 days ago Reported: 300 days ago Branches: Mainline and others Dashboard link: https://syzkaller.appspot.com/bug?id=9366cef8455b032553567ce096a5b31d8307b7… Original thread: https://lkml.kernel.org/lkml/0000000000001f74de0574710d3e@google.com/T/#u Unfortunately, this bug does not have a reproducer. No one replied to the original thread for this bug. If you fix this bug, please add the following tag to the commit: Reported-by: syzbot+4c595632b98bb8ffcc66(a)syzkaller.appspotmail.com If you send any email or patch for this bug, please consider replying to the original thread. For the git send-email command to use, or tips on how to reply if the thread isn't in your mailbox, see the "Reply instructions" at https://lkml.kernel.org/r/0000000000001f74de0574710d3e@google.com -------------------------------------------------------------------------------- Title: KASAN: slab-out-of-bounds Read in linear_transfer (2) Last occurred: 70 days ago Reported: 61 days ago Branches: linux-next Dashboard link: https://syzkaller.appspot.com/bug?id=e76ec5e68d0556a5eed9c0565fd5535ecc6030… Original thread: https://lkml.kernel.org/lkml/0000000000000f7c8105873507b5@google.com/T/#u Unfortunately, this bug does not have a reproducer. No one has replied to the original thread for this bug yet. If you fix this bug, please add the following tag to the commit: Reported-by: syzbot+e28a58bb80f4c67a2b89(a)syzkaller.appspotmail.com If you send any email or patch for this bug, please consider replying to the original thread. For the git send-email command to use, or tips on how to reply if the thread isn't in your mailbox, see the "Reply instructions" at https://lkml.kernel.org/r/0000000000000f7c8105873507b5@google.com

1 0

[alsa-devel] [bug report] ALSA: oxfw: configure packet format in pcm.hw_params callback
by Dan Carpenter 23 Jun '19

23 Jun '19

Hello Takashi Sakamoto, The patch 4f380d007052: "ALSA: oxfw: configure packet format in pcm.hw_params callback" from Jun 12, 2019, leads to the following static checker warning: sound/firewire/oxfw/oxfw-stream.c:357 snd_oxfw_stream_start_duplex() warn: 'oxfw->rx_stream.buffer.packets' double freed sound/firewire/oxfw/oxfw-stream.c 317 int snd_oxfw_stream_start_duplex(struct snd_oxfw *oxfw) 318 { 319 int err; 320 321 if (oxfw->substreams_count == 0) 322 return -EIO; 323 324 if (amdtp_streaming_error(&oxfw->rx_stream) || 325 amdtp_streaming_error(&oxfw->tx_stream)) { 326 amdtp_stream_stop(&oxfw->rx_stream); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 327 cmp_connection_break(&oxfw->in_conn); 328 329 if (oxfw->has_output) { 330 amdtp_stream_stop(&oxfw->tx_stream); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 331 cmp_connection_break(&oxfw->out_conn); 332 } 333 } 334 335 if (!amdtp_stream_running(&oxfw->rx_stream)) { 336 err = start_stream(oxfw, &oxfw->rx_stream); 337 if (err < 0) { 338 dev_err(&oxfw->unit->device, 339 "fail to start rx stream: %d\n", err); 340 goto error; 341 } 342 } 343 344 if (oxfw->has_output) { 345 if (!amdtp_stream_running(&oxfw->tx_stream)) { 346 err = start_stream(oxfw, &oxfw->tx_stream); 347 if (err < 0) { 348 dev_err(&oxfw->unit->device, 349 "fail to start tx stream: %d\n", err); 350 goto error; 351 } 352 } 353 } 354 355 return 0; 356 error: 357 amdtp_stream_stop(&oxfw->rx_stream); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Smatch is basically complaining that we call amdtp_stream_stop() and it's not clear that we necessarily reset things. I don't know this code very well so I have maybe missed something. 358 cmp_connection_break(&oxfw->in_conn); 359 if (oxfw->has_output) { 360 amdtp_stream_stop(&oxfw->tx_stream); ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 361 cmp_connection_break(&oxfw->out_conn); 362 } 363 return err; 364 } regards, dan carpenter

2 2

[alsa-devel] aplay: fix memory leak when setup_chmap() fail
by GitHub pull_request - opened 23 Jun '19

23 Jun '19

alsa-project/alsa-utils pull request #21 was opened from chunxuxiao: setup_chmap() will return with error number if hw_map calloc fail or channels doesn't match with hw_params, but memory free was ignored when error occurs. this summit has been Reviewed-by @takaswie Request URL : https://github.com/alsa-project/alsa-utils/pull/21 Patch URL : https://github.com/alsa-project/alsa-utils/pull/21.patch Repository URL: https://github.com/alsa-project/alsa-utils

1 0

[alsa-devel] [PATCH 1/5] sound: SoC: sof: no need to check return value of debugfs_create functions
by Greg Kroah-Hartman 23 Jun '19

23 Jun '19

When calling debugfs functions, there is no need to ever check the return value. The function can work or not, but the code logic should never do something different based on this. Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Mark Brown <broonie(a)kernel.org> Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> Cc: Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> Cc: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Cc: alsa-devel(a)alsa-project.org Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> --- sound/soc/sof/debug.c | 32 ++++++++++---------------------- sound/soc/sof/sof-priv.h | 1 - sound/soc/sof/trace.c | 9 ++------- 3 files changed, 12 insertions(+), 30 deletions(-) diff --git a/sound/soc/sof/debug.c b/sound/soc/sof/debug.c index 55f1d808dba0..429daa0dc9bf 100644 --- a/sound/soc/sof/debug.c +++ b/sound/soc/sof/debug.c @@ -77,8 +77,7 @@ static ssize_t sof_dfsentry_read(struct file *file, char __user *buffer, if (!pm_runtime_active(sdev->dev) && dfse->access_type == SOF_DEBUGFS_ACCESS_D0_ONLY) { dev_err(sdev->dev, - "error: debugfs entry %s cannot be read in DSP D3\n", - dfse->dfsentry->d_name.name); + "error: debugfs entry cannot be read in DSP D3\n"); kfree(buf); return -EINVAL; } @@ -142,17 +141,11 @@ int snd_sof_debugfs_io_item(struct snd_sof_dev *sdev, } #endif - dfse->dfsentry = debugfs_create_file(name, 0444, sdev->debugfs_root, - dfse, &sof_dfs_fops); - if (!dfse->dfsentry) { - /* can't rely on debugfs, only log error and keep going */ - dev_err(sdev->dev, "error: cannot create debugfs entry %s\n", - name); - } else { - /* add to dfsentry list */ - list_add(&dfse->list, &sdev->dfsentry_list); + debugfs_create_file(name, 0444, sdev->debugfs_root, dfse, + &sof_dfs_fops); - } + /* add to dfsentry list */ + list_add(&dfse->list, &sdev->dfsentry_list); return 0; } @@ -177,16 +170,11 @@ int snd_sof_debugfs_buf_item(struct snd_sof_dev *sdev, dfse->size = size; dfse->sdev = sdev; - dfse->dfsentry = debugfs_create_file(name, 0444, sdev->debugfs_root, - dfse, &sof_dfs_fops); - if (!dfse->dfsentry) { - /* can't rely on debugfs, only log error and keep going */ - dev_err(sdev->dev, "error: cannot create debugfs entry %s\n", - name); - } else { - /* add to dfsentry list */ - list_add(&dfse->list, &sdev->dfsentry_list); - } + debugfs_create_file(name, 0444, sdev->debugfs_root, dfse, + &sof_dfs_fops); + + /* add to dfsentry list */ + list_add(&dfse->list, &sdev->dfsentry_list); return 0; } diff --git a/sound/soc/sof/sof-priv.h b/sound/soc/sof/sof-priv.h index 1e85d6f9c5c3..d0f7cc3ddcbf 100644 --- a/sound/soc/sof/sof-priv.h +++ b/sound/soc/sof/sof-priv.h @@ -217,7 +217,6 @@ enum sof_debugfs_access_type { /* FS entry for debug files that can expose DSP memories, registers */ struct snd_sof_dfsentry { - struct dentry *dfsentry; size_t size; enum sof_dfsentry_type type; /* diff --git a/sound/soc/sof/trace.c b/sound/soc/sof/trace.c index d588e4b70fad..2986d9a563b0 100644 --- a/sound/soc/sof/trace.c +++ b/sound/soc/sof/trace.c @@ -119,13 +119,8 @@ static int trace_debugfs_create(struct snd_sof_dev *sdev) dfse->size = sdev->dmatb.bytes; dfse->sdev = sdev; - dfse->dfsentry = debugfs_create_file("trace", 0444, sdev->debugfs_root, - dfse, &sof_dfs_trace_fops); - if (!dfse->dfsentry) { - /* can't rely on debugfs, only log error and keep going */ - dev_err(sdev->dev, - "error: cannot create debugfs entry for trace\n"); - } + debugfs_create_file("trace", 0444, sdev->debugfs_root, dfse, + &sof_dfs_trace_fops); return 0; } -- 2.22.0

5 20

[alsa-devel] aplay: fix a possible memory leak
by GitHub pull_request - opened 23 Jun '19

23 Jun '19

alsa-project/alsa-utils pull request #20 was opened from chunxuxiao: Fix a possible memory leak in function setup_chmap(void). Memory free was ignored when the function return an error. Request URL : https://github.com/alsa-project/alsa-utils/pull/20 Patch URL : https://github.com/alsa-project/alsa-utils/pull/20.patch Repository URL: https://github.com/alsa-project/alsa-utils

1 0

[alsa-devel] [PATCH 0/8] ALSA: firewire: minor code refactoring and bug
by Takashi Sakamoto 21 Jun '19

21 Jun '19

Hi, During a couple of weeks, I added code refactoring to all of drivers in ALSA firewire stack. But I can find some rooms for additional code refactoring and some bugs. This patchset is for them. Takashi Sakamoto (8): ALSA: firewire-tascam: unify stop and release method for duplex streams ALSA: fireface: unify stop and release method for duplex streams ALSA: firewire-motu: unify stop and release method for duplex streams ALSA: firewire-digi00x: unify stop and release method for duplex streams ALSA: dice: unify stop and release method for duplex streams ALSA: bebob: ensure to release isochronous resources in pcm.hw_params callback ALSA: fireworks: ensure to release isochronous resources in pcm.hw_params callback ALSA: oxfw: ensure to release isochronous resources in pcm.hw_params callback sound/firewire/bebob/bebob_stream.c | 3 +++ sound/firewire/dice/dice-midi.c | 1 - sound/firewire/dice/dice-pcm.c | 1 - sound/firewire/dice/dice-stream.c | 8 ++------ sound/firewire/dice/dice.h | 1 - sound/firewire/digi00x/digi00x-midi.c | 1 - sound/firewire/digi00x/digi00x-pcm.c | 1 - sound/firewire/digi00x/digi00x-stream.c | 14 +++++--------- sound/firewire/digi00x/digi00x.h | 1 - sound/firewire/fireface/ff-pcm.c | 1 - sound/firewire/fireface/ff-stream.c | 14 +++++--------- sound/firewire/fireface/ff.h | 1 - sound/firewire/fireworks/fireworks_stream.c | 3 +++ sound/firewire/motu/motu-midi.c | 1 - sound/firewire/motu/motu-pcm.c | 1 - sound/firewire/motu/motu-stream.c | 14 +++++--------- sound/firewire/motu/motu.h | 1 - sound/firewire/oxfw/oxfw-stream.c | 2 ++ sound/firewire/tascam/tascam-pcm.c | 1 - sound/firewire/tascam/tascam-stream.c | 14 +++++--------- sound/firewire/tascam/tascam.h | 1 - 21 files changed, 30 insertions(+), 55 deletions(-) -- 2.20.1

2 9

[alsa-devel] Question about pinctrl_pm_select_xxx()
by Kuninori Morimoto 21 Jun '19

21 Jun '19

Hi ALSA ML I noticed pinctrl_pm_select_xxx() unbalance. I think these are paired function pinctrl_pm_select_default_state() pinctrl_pm_select_sleep_state() I can find pinctrl_pm_select_sleep_state() for component at snd_soc_suspend(). int snd_soc_suspend(struct device *dev) { ... if (!snd_soc_component_is_suspended(component)) { switch (snd_soc_dapm_get_bias_level(dapm)) { ... case SND_SOC_BIAS_OFF: ... /* deactivate pins to sleep state */ => pinctrl_pm_select_sleep_state(component->dev); break; } ... } ... } But, I can't find its paired pinctrl_pm_select_default_state(). It looks strange for me. Is this really needed ?? And about pinctrl_pm_select_xxx() for CPU/Codec DAI, Many places are calling pinctrl_pm_select_xxx() for both CPU/Codec. snd_soc_suspend() cares only CPU only, but snd_soc_resume() cares both. Is this bug ?? int snd_soc_suspend(struct device *dev) { ... for_each_card_rtds(card, rtd) { /* deactivate pins to sleep state */ => pinctrl_pm_select_sleep_state(cpu_dai->dev); } ... } int snd_soc_resume(struct device *dev) { ... for_each_card_rtds(card, rtd) { ... if (cpu_dai->active) => pinctrl_pm_select_default_state(cpu_dai->dev); for_each_rtd_codec_dai(rtd, i, codec_dai) { if (codec_dai->active) => pinctrl_pm_select_default_state(codec_dai->dev); } } ... } Thank you for your help !! Best regards --- Kuninori Morimoto

2 6

[alsa-devel] [PATCH] ASoC: rk3399_gru_sound: Support 32, 44.1 and 88.2 kHz sample rates
by Enric Balletbo i Serra 20 Jun '19

20 Jun '19

According to the datasheet the max98357a also supports 32, 44.1 and 88.2 kHz sample rate. This support was also introduced recently by commit fdf34366d324 ("ASoC: max98357a: add missing supported rates"). This patch adds support for these rates also for the machine driver so we get rid of the errors like the below and we are able to play files using these sample rates. rk3399-gru-sound sound: rockchip_sound_max98357a_hw_params() doesn't support this sample rate: 44100 rk3399-gru-sound sound: ASoC: machine hw_params failed: -22 Signed-off-by: Enric Balletbo i Serra <enric.balletbo(a)collabora.com> --- sound/soc/rockchip/rk3399_gru_sound.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c index 3d0cc6e90d7b..8dfe1a560e42 100644 --- a/sound/soc/rockchip/rk3399_gru_sound.c +++ b/sound/soc/rockchip/rk3399_gru_sound.c @@ -59,7 +59,10 @@ static int rockchip_sound_max98357a_hw_params(struct snd_pcm_substream *substrea switch (params_rate(params)) { case 8000: case 16000: + case 32000: + case 44100: case 48000: + case 88200: case 96000: mclk = params_rate(params) * SOUND_FS; break; -- 2.20.1

3 2

[alsa-devel] [PATCH] ASoC: stm32: dfsdm: add 16 bits audio record support
by Olivier Moysan 20 Jun '19

20 Jun '19

Add support of audio 16 bits format record to STM32 DFSDM driver. Signed-off-by: Olivier Moysan <olivier.moysan(a)st.com> --- sound/soc/stm/stm32_adfsdm.c | 49 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 10 deletions(-) diff --git a/sound/soc/stm/stm32_adfsdm.c b/sound/soc/stm/stm32_adfsdm.c index cc517e007039..3c9a9deec9af 100644 --- a/sound/soc/stm/stm32_adfsdm.c +++ b/sound/soc/stm/stm32_adfsdm.c @@ -45,7 +45,7 @@ struct stm32_adfsdm_priv { static const struct snd_pcm_hardware stm32_adfsdm_pcm_hw = { .info = SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_BLOCK_TRANSFER | SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_PAUSE, - .formats = SNDRV_PCM_FMTBIT_S32_LE, + .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE, .rate_min = 8000, .rate_max = 32000, @@ -141,7 +141,8 @@ static const struct snd_soc_dai_driver stm32_adfsdm_dai = { .capture = { .channels_min = 1, .channels_max = 1, - .formats = SNDRV_PCM_FMTBIT_S32_LE, + .formats = SNDRV_PCM_FMTBIT_S16_LE | + SNDRV_PCM_FMTBIT_S32_LE, .rates = (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_32000), }, @@ -152,30 +153,58 @@ static const struct snd_soc_component_driver stm32_adfsdm_dai_component = { .name = "stm32_dfsdm_audio", }; +static void memcpy_32to16(void *dest, const void *src, size_t n) +{ + unsigned int i = 0; + u16 *d = (u16 *)dest, *s = (u16 *)src; + + s++; + for (i = n; i > 0; i--) { + *d++ = *s++; + s++; + } +} + static int stm32_afsdm_pcm_cb(const void *data, size_t size, void *private) { struct stm32_adfsdm_priv *priv = private; struct snd_soc_pcm_runtime *rtd = priv->substream->private_data; u8 *pcm_buff = priv->pcm_buff; u8 *src_buff = (u8 *)data; - unsigned int buff_size = snd_pcm_lib_buffer_bytes(priv->substream); - unsigned int period_size = snd_pcm_lib_period_bytes(priv->substream); unsigned int old_pos = priv->pos; - unsigned int cur_size = size; + size_t buff_size = snd_pcm_lib_buffer_bytes(priv->substream); + size_t period_size = snd_pcm_lib_period_bytes(priv->substream); + size_t cur_size, src_size = size; + snd_pcm_format_t format = priv->substream->runtime->format; + + if (format == SNDRV_PCM_FORMAT_S16_LE) + src_size >>= 1; + cur_size = src_size; dev_dbg(rtd->dev, "%s: buff_add :%pK, pos = %d, size = %zu\n", - __func__, &pcm_buff[priv->pos], priv->pos, size); + __func__, &pcm_buff[priv->pos], priv->pos, src_size); - if ((priv->pos + size) > buff_size) { - memcpy(&pcm_buff[priv->pos], src_buff, buff_size - priv->pos); + if ((priv->pos + src_size) > buff_size) { + if (format == SNDRV_PCM_FORMAT_S16_LE) + memcpy_32to16(&pcm_buff[priv->pos], src_buff, + buff_size - priv->pos); + else + memcpy(&pcm_buff[priv->pos], src_buff, + buff_size - priv->pos); cur_size -= buff_size - priv->pos; priv->pos = 0; } - memcpy(&pcm_buff[priv->pos], &src_buff[size - cur_size], cur_size); + if (format == SNDRV_PCM_FORMAT_S16_LE) + memcpy_32to16(&pcm_buff[priv->pos], + &src_buff[src_size - cur_size], cur_size); + else + memcpy(&pcm_buff[priv->pos], &src_buff[src_size - cur_size], + cur_size); + priv->pos = (priv->pos + cur_size) % buff_size; - if (cur_size != size || (old_pos && (old_pos % period_size < size))) + if (cur_size != src_size || (old_pos && (old_pos % period_size < size))) snd_pcm_period_elapsed(priv->substream); return 0; -- 2.7.4

2 1