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

[alsa-devel] [RFC] ASoC: Intel: skl_hda_dsp_common: set long name for skl_hda_card
by Rander Wang 21 May '19

21 May '19

skl_hda_generic machine driver is used by many different devices and userspace uses the card long name to differentiate devices. The card long name is figured out by DMI info and is in format of "vendor-product-version-board". Ucm file is searched by this card long name and one problem is different devices can't share one ucm file based on this type of long name. We have three different product devices with the same codecs and audio settings, and these devices can share the same ucm setting, but now we need to provide three ucm files with different long names, because we can't get a same long name from DMI info. The solution is to provide card long name in machine driver like bytcr_rt5640 and ASoC will use this long name to generate final long name. The card long name is composed of codec name, input and output enabled by devices. The long name should be initialized after hda codec is initialized and before sound card checking long name which is done after dai link initialization, so the long name is set in codec dai link initialization function. Possible card long names may be: skl-hda-ALC233-config135440 skl-hda-ALC700-config69649 skl-hda-ALC3204-config135185 Tested on intel hda platform whiskylake with SOF driver and gemilake with intel SST driver Signed-off-by: Rander Wang <rander.wang(a)linux.intel.com> --- sound/soc/intel/boards/skl_hda_dsp_common.c | 54 +++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/sound/soc/intel/boards/skl_hda_dsp_common.c b/sound/soc/intel/boards/skl_hda_dsp_common.c index 8b68f41a5b88..0193d2138e16 100644 --- a/sound/soc/intel/boards/skl_hda_dsp_common.c +++ b/sound/soc/intel/boards/skl_hda_dsp_common.c @@ -11,11 +11,18 @@ #include <sound/pcm.h> #include <sound/pcm_params.h> #include <sound/soc.h> +#include <sound/hda_codec.h> +#include "../../../pci/hda/hda_jack.h" +#include "../../../pci/hda/hda_local.h" +#include "../../../pci/hda/hda_auto_parser.h" +#include "../../../pci/hda/hda_generic.h" #include "../../codecs/hdac_hdmi.h" +#include "../../codecs/hdac_hda.h" #include "../skylake/skl.h" #include "skl_hda_dsp_common.h" #define NAME_SIZE 32 +static char skl_hda_long_name[NAME_SIZE]; int skl_hda_hdmi_add_pcm(struct snd_soc_card *card, int device) { @@ -39,6 +46,52 @@ int skl_hda_hdmi_add_pcm(struct snd_soc_card *card, int device) return 0; } +int skl_hda_long_name_init(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_rtdcom_list *new_rtdcom; + struct snd_soc_component *component; + struct hdac_hda_priv *hda_pvt; + struct auto_pin_cfg *autocfg; + struct hda_gen_spec *spec; + struct snd_soc_card *card; + const char *name; + int config; + + name = rtd->dai_link->codecs->name; + card = rtd->card; + + list_for_each_entry(new_rtdcom, &rtd->component_list, list) { + component = new_rtdcom->component; + if (name && strcmp(component->name, name) == 0) { + hda_pvt = snd_soc_component_get_drvdata(component); + + if (!hda_pvt) + return -EINVAL; + + spec = hda_pvt->codec.spec; + autocfg = &spec->autocfg; + + /* + * config is figured out by combining the number of + * enabled input and output. + */ + config = autocfg->speaker_outs | (autocfg->hp_outs << 4) + | (autocfg->dig_outs << 8) + | (autocfg->line_outs << 12) + | (autocfg->num_inputs << 16); + snprintf(skl_hda_long_name, sizeof(skl_hda_long_name), + "skl-hda-%s-config%d", + hda_pvt->codec.core.chip_name, + config); + + card->long_name = skl_hda_long_name; + break; + } + } + + return 0; +} + /* skl_hda_digital audio interface glue - connects codec <--> CPU */ struct snd_soc_dai_link skl_hda_be_dai_links[HDA_DSP_MAX_BE_DAI_LINKS] = { /* Back End DAI links */ @@ -79,6 +132,7 @@ struct snd_soc_dai_link skl_hda_be_dai_links[HDA_DSP_MAX_BE_DAI_LINKS] = { .dpcm_playback = 1, .dpcm_capture = 1, .no_pcm = 1, + .init = skl_hda_long_name_init, }, { .name = "Digital Playback and Capture", -- 2.14.1

2 1

[alsa-devel] [PATCH - alsa-lib 4/4] pcm_file: add infile read support for mmap mode
by Adam Miartus 21 May '19

21 May '19

mmap_begin callback is used to copy data from input file to mmaped buffer guard for corner use of api (multiple mmap_begin calls by user) is introduced to check if next continuous buffer was already overwritten buffer is overwritten with input file data only in case of stream capture Signed-off-by: Adam Miartus <amiartus(a)de.adit-jv.com> Reviewed-by: Timo Wischer <twischer(a)de.adit-jv.com> diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c index 10d227b..7d3439a 100644 --- a/src/pcm/pcm_file.c +++ b/src/pcm/pcm_file.c @@ -88,6 +88,7 @@ typedef struct { size_t buffer_bytes; struct wav_fmt wav_header; size_t filelen; + char ifmmap_overwritten; } snd_pcm_file_t; #if __BYTE_ORDER == __LITTLE_ENDIAN @@ -626,6 +627,8 @@ static snd_pcm_sframes_t snd_pcm_file_mmap_commit(snd_pcm_t *pcm, const snd_pcm_channel_area_t *areas; snd_pcm_sframes_t result; + file->ifmmap_overwritten = 0; + result = snd_pcm_mmap_begin(file->gen.slave, &areas, &ofs, &siz); if (result >= 0) { assert(ofs == offset && siz == size); @@ -636,6 +639,32 @@ static snd_pcm_sframes_t snd_pcm_file_mmap_commit(snd_pcm_t *pcm, return result; } +static int snd_pcm_file_mmap_begin(snd_pcm_t *pcm, const snd_pcm_channel_area_t **areas, + snd_pcm_uframes_t *offset, snd_pcm_uframes_t *frames) +{ + snd_pcm_file_t *file = pcm->private_data; + snd_pcm_channel_area_t areas_if[pcm->channels]; + snd_pcm_uframes_t frames_if; + void *buffer = NULL; + int result; + + result = snd_pcm_mmap_begin(file->gen.slave, areas, offset, frames); + if (result < 0) + return result; + + if (pcm->stream != SND_PCM_STREAM_CAPTURE) + return result; + + /* user may run mmap_begin without mmap_commit multiple times in row */ + if (file->ifmmap_overwritten) + return result; + file->ifmmap_overwritten = 1; + + snd_pcm_file_areas_read_infile(pcm, *areas, *offset, *frames); + + return result; +} + static int snd_pcm_file_hw_free(snd_pcm_t *pcm) { snd_pcm_file_t *file = pcm->private_data; @@ -662,6 +691,7 @@ static int snd_pcm_file_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t * params) file->wbuf_size = slave->buffer_size * 2; file->wbuf_size_bytes = snd_pcm_frames_to_bytes(slave, file->wbuf_size); file->wbuf_used_bytes = 0; + file->ifmmap_overwritten = 0; assert(!file->wbuf); file->wbuf = malloc(file->wbuf_size_bytes); if (file->wbuf == NULL) { @@ -773,7 +803,7 @@ static const snd_pcm_fast_ops_t snd_pcm_file_fast_ops = { .poll_descriptors = snd_pcm_generic_poll_descriptors, .poll_revents = snd_pcm_generic_poll_revents, .htimestamp = snd_pcm_generic_htimestamp, - .mmap_begin = NULL, + .mmap_begin = snd_pcm_file_mmap_begin, }; /** -- 2.7.4

1 0

[alsa-devel] [PATCH - alsa-lib 3/4] pcm: add mmap_begin callback to snd_pcm_fast_ops_t api
by Adam Miartus 21 May '19

21 May '19

main motivation for adding the callback is to use it to enable operation on mmaped buffer before user access for pcm_file plugin support for MMAP read access with masking by data from input file is not implemented for pcm_file plugin, by adding this callback implementing such feature can be done by rewriting next continuous portion of buffer on each mmap_begin call plugins like softvol use pcm_plugin interface and overwrite the buffer by looping around it in avail_update callback, this patch hopes to simplify the task by adding new api callback, removing the need for rewriting pcm_file (to use pcm_plugin callbacks) and careful checking when looping around whole mmaped buffer Signed-off-by: Adam Miartus <amiartus(a)de.adit-jv.com> Reviewed-by: Timo Wischer <twischer(a)de.adit-jv.com> diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c index 3a71d79..323926e 100644 --- a/src/pcm/pcm.c +++ b/src/pcm/pcm.c @@ -7129,7 +7129,13 @@ int __snd_pcm_mmap_begin(snd_pcm_t *pcm, const snd_pcm_channel_area_t **areas, snd_pcm_uframes_t f; snd_pcm_uframes_t avail; const snd_pcm_channel_area_t *xareas; + assert(pcm && areas && offset && frames); + + if (pcm->fast_ops->mmap_begin) + return pcm->fast_ops->mmap_begin(pcm->fast_op_arg, areas, offset, frames); + + /* fallback for plugins that do not specify new callback */ xareas = snd_pcm_mmap_areas(pcm); if (xareas == NULL) return -EBADFD; diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c index 274726e..96049e0 100644 --- a/src/pcm/pcm_dmix.c +++ b/src/pcm/pcm_dmix.c @@ -990,6 +990,7 @@ static const snd_pcm_fast_ops_t snd_pcm_dmix_fast_ops = { .poll_descriptors = snd_pcm_direct_poll_descriptors, .poll_descriptors_count = NULL, .poll_revents = snd_pcm_dmix_poll_revents, + .mmap_begin = NULL, }; /** diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c index b75809c..328ef83 100644 --- a/src/pcm/pcm_dshare.c +++ b/src/pcm/pcm_dshare.c @@ -667,6 +667,7 @@ static const snd_pcm_fast_ops_t snd_pcm_dshare_fast_ops = { .poll_descriptors = snd_pcm_direct_poll_descriptors, .poll_descriptors_count = NULL, .poll_revents = snd_pcm_direct_poll_revents, + .mmap_begin = NULL, }; /** diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c index 58b1e53..5b9d9f5 100644 --- a/src/pcm/pcm_dsnoop.c +++ b/src/pcm/pcm_dsnoop.c @@ -544,6 +544,7 @@ static const snd_pcm_fast_ops_t snd_pcm_dsnoop_fast_ops = { .poll_descriptors = snd_pcm_direct_poll_descriptors, .poll_descriptors_count = NULL, .poll_revents = snd_pcm_direct_poll_revents, + .mmap_begin = NULL, }; /** diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c index dcaa41d..10d227b 100644 --- a/src/pcm/pcm_file.c +++ b/src/pcm/pcm_file.c @@ -773,6 +773,7 @@ static const snd_pcm_fast_ops_t snd_pcm_file_fast_ops = { .poll_descriptors = snd_pcm_generic_poll_descriptors, .poll_revents = snd_pcm_generic_poll_revents, .htimestamp = snd_pcm_generic_htimestamp, + .mmap_begin = NULL, }; /** diff --git a/src/pcm/pcm_generic.h b/src/pcm/pcm_generic.h index dfbe21a..683e60b 100644 --- a/src/pcm/pcm_generic.h +++ b/src/pcm/pcm_generic.h @@ -161,4 +161,3 @@ snd_pcm_chmap_query_t **snd_pcm_generic_query_chmaps(snd_pcm_t *pcm); snd_pcm_chmap_t *snd_pcm_generic_get_chmap(snd_pcm_t *pcm); int snd_pcm_generic_set_chmap(snd_pcm_t *pcm, const snd_pcm_chmap_t *map); int snd_pcm_generic_may_wait_for_avail_min(snd_pcm_t *pcm, snd_pcm_uframes_t avail); - diff --git a/src/pcm/pcm_hooks.c b/src/pcm/pcm_hooks.c index 4416d36..14396fa 100644 --- a/src/pcm/pcm_hooks.c +++ b/src/pcm/pcm_hooks.c @@ -200,6 +200,7 @@ static const snd_pcm_fast_ops_t snd_pcm_hooks_fast_ops = { .poll_descriptors = snd_pcm_generic_poll_descriptors, .poll_revents = snd_pcm_generic_poll_revents, .may_wait_for_avail_min = snd_pcm_generic_may_wait_for_avail_min, + .mmap_begin = NULL, }; /** diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c index 91370a8..8ee1d69 100644 --- a/src/pcm/pcm_hw.c +++ b/src/pcm/pcm_hw.c @@ -1481,6 +1481,7 @@ static const snd_pcm_fast_ops_t snd_pcm_hw_fast_ops = { .poll_descriptors = NULL, .poll_descriptors_count = NULL, .poll_revents = NULL, + .mmap_begin = NULL, }; static const snd_pcm_fast_ops_t snd_pcm_hw_fast_ops_timer = { @@ -1512,6 +1513,7 @@ static const snd_pcm_fast_ops_t snd_pcm_hw_fast_ops_timer = { .poll_descriptors = snd_pcm_hw_poll_descriptors, .poll_descriptors_count = snd_pcm_hw_poll_descriptors_count, .poll_revents = snd_pcm_hw_poll_revents, + .mmap_begin = NULL, }; /** diff --git a/src/pcm/pcm_ioplug.c b/src/pcm/pcm_ioplug.c index a437ca3..3e19499 100644 --- a/src/pcm/pcm_ioplug.c +++ b/src/pcm/pcm_ioplug.c @@ -940,6 +940,7 @@ static const snd_pcm_fast_ops_t snd_pcm_ioplug_fast_ops = { .poll_descriptors_count = snd_pcm_ioplug_poll_descriptors_count, .poll_descriptors = snd_pcm_ioplug_poll_descriptors, .poll_revents = snd_pcm_ioplug_poll_revents, + .mmap_begin = NULL, }; #endif /* !DOC_HIDDEN */ diff --git a/src/pcm/pcm_local.h b/src/pcm/pcm_local.h index d52229d..d5726eb 100644 --- a/src/pcm/pcm_local.h +++ b/src/pcm/pcm_local.h @@ -184,6 +184,7 @@ typedef struct { int (*poll_descriptors)(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int space); /* locked */ int (*poll_revents)(snd_pcm_t *pcm, struct pollfd *pfds, unsigned int nfds, unsigned short *revents); /* locked */ int (*may_wait_for_avail_min)(snd_pcm_t *pcm, snd_pcm_uframes_t avail); + int (*mmap_begin)(snd_pcm_t *pcm, const snd_pcm_channel_area_t **areas, snd_pcm_uframes_t *offset, snd_pcm_uframes_t *frames); /* locked */ } snd_pcm_fast_ops_t; struct _snd_pcm { diff --git a/src/pcm/pcm_meter.c b/src/pcm/pcm_meter.c index 20b4187..28bb578 100644 --- a/src/pcm/pcm_meter.c +++ b/src/pcm/pcm_meter.c @@ -548,6 +548,7 @@ static const snd_pcm_fast_ops_t snd_pcm_meter_fast_ops = { .poll_descriptors = snd_pcm_generic_poll_descriptors, .poll_revents = snd_pcm_generic_poll_revents, .may_wait_for_avail_min = snd_pcm_generic_may_wait_for_avail_min, + .mmap_begin = NULL, }; /** diff --git a/src/pcm/pcm_mmap_emul.c b/src/pcm/pcm_mmap_emul.c index 009cebb..6fa5fe6 100644 --- a/src/pcm/pcm_mmap_emul.c +++ b/src/pcm/pcm_mmap_emul.c @@ -401,6 +401,7 @@ static const snd_pcm_fast_ops_t snd_pcm_mmap_emul_fast_ops = { .poll_descriptors_count = snd_pcm_generic_poll_descriptors_count, .poll_revents = snd_pcm_generic_poll_revents, .may_wait_for_avail_min = snd_pcm_generic_may_wait_for_avail_min, + .mmap_begin = NULL, }; #ifndef DOC_HIDDEN diff --git a/src/pcm/pcm_multi.c b/src/pcm/pcm_multi.c index 53c414d..069d224 100644 --- a/src/pcm/pcm_multi.c +++ b/src/pcm/pcm_multi.c @@ -1042,6 +1042,7 @@ static const snd_pcm_fast_ops_t snd_pcm_multi_fast_ops = { .poll_descriptors = snd_pcm_multi_poll_descriptors, .poll_revents = snd_pcm_multi_poll_revents, .may_wait_for_avail_min = snd_pcm_multi_may_wait_for_avail_min, + .mmap_begin = NULL, }; /** diff --git a/src/pcm/pcm_null.c b/src/pcm/pcm_null.c index 1d81548..e6fa049 100644 --- a/src/pcm/pcm_null.c +++ b/src/pcm/pcm_null.c @@ -361,6 +361,7 @@ static const snd_pcm_fast_ops_t snd_pcm_null_fast_ops = { .avail_update = snd_pcm_null_avail_update, .mmap_commit = snd_pcm_null_mmap_commit, .htimestamp = snd_pcm_generic_real_htimestamp, + .mmap_begin = NULL, }; /** diff --git a/src/pcm/pcm_plugin.c b/src/pcm/pcm_plugin.c index ea60eb9..0714d2c 100644 --- a/src/pcm/pcm_plugin.c +++ b/src/pcm/pcm_plugin.c @@ -646,6 +646,7 @@ const snd_pcm_fast_ops_t snd_pcm_plugin_fast_ops = { .poll_descriptors = snd_pcm_generic_poll_descriptors, .poll_revents = snd_pcm_generic_poll_revents, .may_wait_for_avail_min = snd_pcm_plugin_may_wait_for_avail_min, + .mmap_begin = NULL, }; #endif diff --git a/src/pcm/pcm_rate.c b/src/pcm/pcm_rate.c index 5dc8a92..f29739b 100644 --- a/src/pcm/pcm_rate.c +++ b/src/pcm/pcm_rate.c @@ -1217,6 +1217,7 @@ static const snd_pcm_fast_ops_t snd_pcm_rate_fast_ops = { .poll_descriptors = snd_pcm_generic_poll_descriptors, .poll_revents = snd_pcm_rate_poll_revents, .may_wait_for_avail_min = snd_pcm_plugin_may_wait_for_avail_min, + .mmap_begin = NULL, }; static const snd_pcm_ops_t snd_pcm_rate_ops = { diff --git a/src/pcm/pcm_share.c b/src/pcm/pcm_share.c index 5a540c4..b803a82 100644 --- a/src/pcm/pcm_share.c +++ b/src/pcm/pcm_share.c @@ -1346,6 +1346,7 @@ static const snd_pcm_fast_ops_t snd_pcm_share_fast_ops = { .avail_update = snd_pcm_share_avail_update, .htimestamp = snd_pcm_share_htimestamp, .mmap_commit = snd_pcm_share_mmap_commit, + .mmap_begin = NULL, }; /** diff --git a/src/pcm/pcm_shm.c b/src/pcm/pcm_shm.c index 26a27a5..a18720f 100644 --- a/src/pcm/pcm_shm.c +++ b/src/pcm/pcm_shm.c @@ -629,6 +629,7 @@ static const snd_pcm_fast_ops_t snd_pcm_shm_fast_ops = { .avail_update = snd_pcm_shm_avail_update, .mmap_commit = snd_pcm_shm_mmap_commit, .htimestamp = snd_pcm_shm_htimestamp, + .mmap_begin = NULL, }; static int make_local_socket(const char *filename) -- 2.7.4

1 0

[alsa-devel] [PATCH - alsa-lib 2/4] pcm_file: use snd_pcm_file_areas_read_infile for readi
by Adam Miartus 21 May '19

21 May '19

use previously introduced helper function, this commit unifies behavior of readi and readn corner case behavior of readi is changed by this commit, previously, in case 0 bytes were red from file (EOF), frames = 0 was returned, signaling api user as if no data was red from slave, after the patch, amount of frames red from slave with data red from slave stored in buffer is returned when EOF is reached Signed-off-by: Adam Miartus <amiartus(a)de.adit-jv.com> Reviewed-by: Timo Wischer <twischer(a)de.adit-jv.com> diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c index 3c68265..dcaa41d 100644 --- a/src/pcm/pcm_file.c +++ b/src/pcm/pcm_file.c @@ -579,22 +579,21 @@ static snd_pcm_sframes_t snd_pcm_file_readi(snd_pcm_t *pcm, void *buffer, snd_pc { snd_pcm_file_t *file = pcm->private_data; snd_pcm_channel_area_t areas[pcm->channels]; - snd_pcm_sframes_t n; + snd_pcm_sframes_t frames; + + __snd_pcm_lock(pcm); + + frames = _snd_pcm_readi(file->gen.slave, buffer, size); + if (frames <= 0) + return frames; - n = _snd_pcm_readi(file->gen.slave, buffer, size); - if (n <= 0) - return n; - if (file->ifd >= 0) { - __snd_pcm_lock(pcm); - n = read(file->ifd, buffer, n * pcm->frame_bits / 8); - __snd_pcm_unlock(pcm); - if (n < 0) - return n; - n = n * 8 / pcm->frame_bits; - } snd_pcm_areas_from_buf(pcm, areas, buffer); - snd_pcm_file_add_frames(pcm, areas, 0, n); - return n; + snd_pcm_file_areas_read_infile(pcm, areas, 0, frames); + snd_pcm_file_add_frames(pcm, areas, 0, frames); + + __snd_pcm_unlock(pcm); + + return frames; } /* locking */ -- 2.7.4

1 0

[alsa-devel] [PATCH - alsa-lib 1/4] pcm_file: add support for infile reading in non interleaved mode
by Adam Miartus 21 May '19

21 May '19

add helper function to copy input file data to buffer mapped by areas, in case of an error, do not fill the areas, allowing device read buffer to be provided to api caller previously unused rbuf variable is reused for this purpose Signed-off-by: Adam Miartus <amiartus(a)de.adit-jv.com> Reviewed-by: Timo Wischer <twischer(a)de.adit-jv.com> diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c index 3a19cef..3c68265 100644 --- a/src/pcm/pcm_file.c +++ b/src/pcm/pcm_file.c @@ -77,6 +77,7 @@ typedef struct { snd_pcm_uframes_t appl_ptr; snd_pcm_uframes_t file_ptr_bytes; snd_pcm_uframes_t wbuf_size; + snd_pcm_uframes_t rbuf_size; size_t wbuf_size_bytes; size_t wbuf_used_bytes; char *wbuf; @@ -266,6 +267,39 @@ static int snd_pcm_file_open_output_file(snd_pcm_file_t *file) return 0; } +/* fill areas with data from input file, return bytes red */ +static int snd_pcm_file_areas_read_infile(snd_pcm_t *pcm, + const snd_pcm_channel_area_t *areas, + snd_pcm_uframes_t offset, + snd_pcm_uframes_t frames) +{ + snd_pcm_file_t *file = pcm->private_data; + snd_pcm_channel_area_t areas_if[pcm->channels]; + ssize_t bytes; + + if (file->ifd < 0) + return -EBADF; + + if (file->rbuf == NULL) + return -ENOMEM; + + if (file->rbuf_size < frames) { + SYSERR("requested more frames than pcm buffer"); + return -ENOMEM; + } + + bytes = read(file->ifd, file->rbuf, snd_pcm_frames_to_bytes(pcm, frames)); + if (bytes < 0) { + SYSERR("read from file failed, error: %d", bytes); + return bytes; + } + + snd_pcm_areas_from_buf(pcm, areas_if, file->rbuf); + snd_pcm_areas_copy(areas, offset, areas_if, 0, pcm->channels, snd_pcm_bytes_to_frames(pcm, bytes), pcm->format); + + return bytes; +} + static void setup_wav_header(snd_pcm_t *pcm, struct wav_fmt *fmt) { fmt->fmt = TO_LE16(0x01); @@ -568,19 +602,19 @@ static snd_pcm_sframes_t snd_pcm_file_readn(snd_pcm_t *pcm, void **bufs, snd_pcm { snd_pcm_file_t *file = pcm->private_data; snd_pcm_channel_area_t areas[pcm->channels]; - snd_pcm_sframes_t n; + snd_pcm_sframes_t frames; - if (file->ifd >= 0) { - SNDERR("DEBUG: Noninterleaved read not yet implemented.\n"); - return 0; /* TODO: Noninterleaved read */ - } + __snd_pcm_lock(pcm); + frames = _snd_pcm_readn(file->gen.slave, bufs, size); + if (frames <= 0) + return frames; - n = _snd_pcm_readn(file->gen.slave, bufs, size); - if (n > 0) { - snd_pcm_areas_from_bufs(pcm, areas, bufs); - snd_pcm_file_add_frames(pcm, areas, 0, n); - } - return n; + snd_pcm_areas_from_bufs(pcm, areas, bufs); + snd_pcm_file_areas_read_infile(pcm, areas, 0, frames); + snd_pcm_file_add_frames(pcm, areas, 0, frames); + + __snd_pcm_unlock(pcm); + return frames; } static snd_pcm_sframes_t snd_pcm_file_mmap_commit(snd_pcm_t *pcm, @@ -609,9 +643,11 @@ static int snd_pcm_file_hw_free(snd_pcm_t *pcm) free(file->wbuf); free(file->wbuf_areas); free(file->final_fname); + free(file->rbuf); file->wbuf = NULL; file->wbuf_areas = NULL; file->final_fname = NULL; + file->rbuf = NULL; return snd_pcm_hw_free(file->gen.slave); } @@ -638,6 +674,15 @@ static int snd_pcm_file_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t * params) snd_pcm_file_hw_free(pcm); return -ENOMEM; } + assert(!file->rbuf); + file->rbuf_size = slave->buffer_size; + file->rbuf_size_bytes = snd_pcm_frames_to_bytes(slave, file->rbuf_size); + file->rbuf_used_bytes = 0; + file->rbuf = malloc(file->rbuf_size_bytes); + if (file->rbuf == NULL) { + snd_pcm_file_hw_free(pcm); + return -ENOMEM; + } file->appl_ptr = file->file_ptr_bytes = 0; for (channel = 0; channel < slave->channels; ++channel) { snd_pcm_channel_area_t *a = &file->wbuf_areas[channel]; -- 2.7.4

1 0

Re: [alsa-devel] [ALSA patch] FW: [PATCH - alsa-lib 1/4] pcm_file: add support for infile reading in non interleaved mode
by Takashi Iwai 21 May '19

21 May '19

On Mon, 20 May 2019 18:49:34 +0200, Miartus, Adam (Arion Recruitment; ADITG/ESM) wrote: > > From: Adam Miartus <amiartus(a)de.adit-jv.com> > > add helper function to copy input file data to buffer mapped by areas, in case of an error, do not fill the areas, allowing device read buffer to be provided to api caller > > previously unused rbuf variable is reused for this purpose > > Signed-off-by: Adam Miartus <amiartus(a)de.adit-jv.com> > Reviewed-by: Timo Wischer <twischer(a)de.adit-jv.com> > > diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c index 3a19cef..7998b64 100644 > --- a/src/pcm/pcm_file.c > +++ b/src/pcm/pcm_file.c > @@ -77,6 +77,7 @@ typedef struct { > snd_pcm_uframes_t appl_ptr; > snd_pcm_uframes_t file_ptr_bytes; > snd_pcm_uframes_t wbuf_size; > + snd_pcm_uframes_t rbuf_size; > size_t wbuf_size_bytes; > size_t wbuf_used_bytes; > char *wbuf; > @@ -266,6 +267,37 @@ static int snd_pcm_file_open_output_file(snd_pcm_file_t *file) > return 0; > } > > +/* fill areas with data from input file, return bytes red */ static int > +snd_pcm_file_areas_read_infile(snd_pcm_t *pcm, const snd_pcm_channel_area_t *areas, > + snd_pcm_uframes_t offset, snd_pcm_uframes_t frames) { Please follow the standard coding style. > + snd_pcm_file_t *file = pcm->private_data; > + snd_pcm_channel_area_t areas_if[pcm->channels]; > + ssize_t bytes; > + > + if (file->ifd < 0) > + return -EBADF; > + > + if (file->rbuf == NULL) > + return -ENOMEM; > + > + if (file->rbuf_size < frames) { > + SYSERR("requested more frames than pcm buffer"); > + return -ENOMEM; > + } > + > + bytes = read(file->ifd, file->rbuf, snd_pcm_frames_to_bytes(pcm, frames)); > + if (bytes < 0) { > + SYSERR("read from file failed, error: %d", bytes); > + return bytes; > + } > + > + snd_pcm_areas_from_buf(pcm, areas_if, file->rbuf); > + snd_pcm_areas_copy(areas, offset, areas_if, 0, pcm->channels, > +snd_pcm_bytes_to_frames(pcm, bytes), pcm->format); Wrong indentation. thanks, Takashi

2 2

[alsa-devel] [PATCH - alsa-lib 1/4] pcm_file: add support for infile reading in non interleaved mode
by Adam Miartus 21 May '19

21 May '19

add helper function to copy input file data to buffer mapped by areas, in case of an error, do not fill the areas, allowing device read buffer to be provided to api caller previously unused rbuf variable is reused for this purpose Signed-off-by: Adam Miartus <amiartus(a)de.adit-jv.com> Reviewed-by: Timo Wischer <twischer(a)de.adit-jv.com> diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c index 3a19cef..3c68265 100644 --- a/src/pcm/pcm_file.c +++ b/src/pcm/pcm_file.c @@ -77,6 +77,7 @@ typedef struct { snd_pcm_uframes_t appl_ptr; snd_pcm_uframes_t file_ptr_bytes; snd_pcm_uframes_t wbuf_size; + snd_pcm_uframes_t rbuf_size; size_t wbuf_size_bytes; size_t wbuf_used_bytes; char *wbuf; @@ -266,6 +267,39 @@ static int snd_pcm_file_open_output_file(snd_pcm_file_t *file) return 0; } +/* fill areas with data from input file, return bytes red */ +static int snd_pcm_file_areas_read_infile(snd_pcm_t *pcm, + const snd_pcm_channel_area_t *areas, + snd_pcm_uframes_t offset, + snd_pcm_uframes_t frames) +{ + snd_pcm_file_t *file = pcm->private_data; + snd_pcm_channel_area_t areas_if[pcm->channels]; + ssize_t bytes; + + if (file->ifd < 0) + return -EBADF; + + if (file->rbuf == NULL) + return -ENOMEM; + + if (file->rbuf_size < frames) { + SYSERR("requested more frames than pcm buffer"); + return -ENOMEM; + } + + bytes = read(file->ifd, file->rbuf, snd_pcm_frames_to_bytes(pcm, frames)); + if (bytes < 0) { + SYSERR("read from file failed, error: %d", bytes); + return bytes; + } + + snd_pcm_areas_from_buf(pcm, areas_if, file->rbuf); + snd_pcm_areas_copy(areas, offset, areas_if, 0, pcm->channels, snd_pcm_bytes_to_frames(pcm, bytes), pcm->format); + + return bytes; +} + static void setup_wav_header(snd_pcm_t *pcm, struct wav_fmt *fmt) { fmt->fmt = TO_LE16(0x01); @@ -568,19 +602,19 @@ static snd_pcm_sframes_t snd_pcm_file_readn(snd_pcm_t *pcm, void **bufs, snd_pcm { snd_pcm_file_t *file = pcm->private_data; snd_pcm_channel_area_t areas[pcm->channels]; - snd_pcm_sframes_t n; + snd_pcm_sframes_t frames; - if (file->ifd >= 0) { - SNDERR("DEBUG: Noninterleaved read not yet implemented.\n"); - return 0; /* TODO: Noninterleaved read */ - } + __snd_pcm_lock(pcm); + frames = _snd_pcm_readn(file->gen.slave, bufs, size); + if (frames <= 0) + return frames; - n = _snd_pcm_readn(file->gen.slave, bufs, size); - if (n > 0) { - snd_pcm_areas_from_bufs(pcm, areas, bufs); - snd_pcm_file_add_frames(pcm, areas, 0, n); - } - return n; + snd_pcm_areas_from_bufs(pcm, areas, bufs); + snd_pcm_file_areas_read_infile(pcm, areas, 0, frames); + snd_pcm_file_add_frames(pcm, areas, 0, frames); + + __snd_pcm_unlock(pcm); + return frames; } static snd_pcm_sframes_t snd_pcm_file_mmap_commit(snd_pcm_t *pcm, @@ -609,9 +643,11 @@ static int snd_pcm_file_hw_free(snd_pcm_t *pcm) free(file->wbuf); free(file->wbuf_areas); free(file->final_fname); + free(file->rbuf); file->wbuf = NULL; file->wbuf_areas = NULL; file->final_fname = NULL; + file->rbuf = NULL; return snd_pcm_hw_free(file->gen.slave); } @@ -638,6 +674,15 @@ static int snd_pcm_file_hw_params(snd_pcm_t *pcm, snd_pcm_hw_params_t * params) snd_pcm_file_hw_free(pcm); return -ENOMEM; } + assert(!file->rbuf); + file->rbuf_size = slave->buffer_size; + file->rbuf_size_bytes = snd_pcm_frames_to_bytes(slave, file->rbuf_size); + file->rbuf_used_bytes = 0; + file->rbuf = malloc(file->rbuf_size_bytes); + if (file->rbuf == NULL) { + snd_pcm_file_hw_free(pcm); + return -ENOMEM; + } file->appl_ptr = file->file_ptr_bytes = 0; for (channel = 0; channel < slave->channels; ++channel) { snd_pcm_channel_area_t *a = &file->wbuf_areas[channel]; -- 2.7.4

1 0

Re: [alsa-devel] [ALSA patch] [PATCH - alsa-lib 4/4] pcm_file: add infile read support for mmap mode
by Takashi Iwai 21 May '19

21 May '19

On Mon, 20 May 2019 18:51:06 +0200, Miartus, Adam (Arion Recruitment; ADITG/ESM) wrote: > > From: Adam Miartus <amiartus(a)de.adit-jv.com> > > mmap_begin callback is used to copy data from input file to mmaped buffer > > guard for corner use of api (multiple mmap_begin calls by user) is introduced to check if next continuous buffer was already overwritten > > buffer is overwritten with input file data only in case of stream capture > > Signed-off-by: Adam Miartus <amiartus(a)de.adit-jv.com> > Reviewed-by: Timo Wischer <twischer(a)de.adit-jv.com> Can't we copy the data in snd_pcm_file_mmap_commit() just like the playback case? thanks, Takashi

3 4

[alsa-devel] [PATCH 0/5] ALSA: firewire-lib: unify tracing events for isoc packet
by Takashi Sakamoto 21 May '19

21 May '19

Hi, This patchset is for Linux kernel v5.3 development. ALSA IEC 61883-1/6 packet streaming engine has four types of tracing events to probe data of handled isochronous packets on IEEE 1394 bus. The most parameters of data are common independent of type of isochronous payload and inbound/outbound direction. This commit unifies the tracing events as 'amdtp_packet'. Instead of named tracing events, filtering functionality of Linux tracing framework is available to filter out target events, like: $ echo 'src == 0xffc0' > /sys/kernel/debug/tracing/events/snd_firewire_lib/amdtp_packet/filter $ echo 1 > /sys/kernel/debug/tracing/events/snd_firewire_lib/amdtp_packet/enable $ cat /sys/kernel/debug/tracing/trace ... ...: amdtp_packet: 00 0594 ffc0 ffc1 00 002 00 240 41 1 09 {0x0,0x2,0x0,0xf0,0x90,0x1,0xff,0xff} ...: amdtp_packet: 00 0595 ffc0 ffc1 00 018 08 240 42 1 10 {0x0,0x2,0x0,0xf0,0x90,0x1,0x4b,0x3d} Takashi Sakamoto (5): firewire-lib: use the same type of argument for CIP header for tracing event firewire-lib: add data_blocks/data_block_counter parameter to in_packet/out_packet tracing events firewire-lib: use the same unit for payload argument in tracing events firewire-lib: use dynamic array for CIP header of tracing events firewire-lib: unify tracing events to 'amdtp_packet' event sound/firewire/amdtp-stream-trace.h | 163 ++++------------------------ sound/firewire/amdtp-stream.c | 16 +-- 2 files changed, 28 insertions(+), 151 deletions(-) -- 2.20.1

2 6

[alsa-devel] [PATCH 07/10] mfd: madera: point to the right pinctrl binding file
by Mauro Carvalho Chehab 20 May '19

20 May '19

The reference to Documentation/pinctrl.txt doesn't exist, but there is an specific binding for the madera driver. So, point to it. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung(a)kernel.org> --- include/linux/mfd/madera/pdata.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/linux/mfd/madera/pdata.h b/include/linux/mfd/madera/pdata.h index 8dc852402dbb..c7e0658eb74b 100644 --- a/include/linux/mfd/madera/pdata.h +++ b/include/linux/mfd/madera/pdata.h @@ -34,7 +34,8 @@ struct madera_codec_pdata; * @micvdd: Substruct of pdata for the MICVDD regulator * @irq_flags: Mode for primary IRQ (defaults to active low) * @gpio_base: Base GPIO number - * @gpio_configs: Array of GPIO configurations (See Documentation/pinctrl.txt) + * @gpio_configs: Array of GPIO configurations + * (See Documentation/devicetree/bindings/pinctrl/cirrus,madera-pinctrl.txt) * @n_gpio_configs: Number of entries in gpio_configs * @gpsw: General purpose switch mode setting. Depends on the external * hardware connected to the switch. (See the SW1_MODE field -- 2.21.0

2 2