- Patch - mailman.alsa-project.org

[PATCH] ASoC: Intel: Skylake: Recover BXT FW on DSP boot timeout error
by Pawel Harlozinski 25 Jun '19

25 Jun '19

When DSP boots with timeout error, reinitialize, transfer and boot firmware to recover audio. Signed-off-by: Szymon Mielczarek <szymonx.mielczarek(a)intel.com> --- sound/soc/intel/skylake/bxt-sst.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sound/soc/intel/skylake/bxt-sst.c b/sound/soc/intel/skylake/bxt-sst.c index 440bca7afbf1..a2844bdca1b8 100644 --- a/sound/soc/intel/skylake/bxt-sst.c +++ b/sound/soc/intel/skylake/bxt-sst.c @@ -455,13 +455,18 @@ static int bxt_set_dsp_D0(struct sst_dsp *ctx, unsigned int core_id) /* If core 1 was turned on for booting core 0, turn it off */ skl_dsp_core_power_down(ctx, SKL_DSP_CORE_MASK(1)); if (ret == 0) { - dev_err(ctx->dev, "%s: DSP boot timeout\n", __func__); - dev_err(ctx->dev, "Error code=0x%x: FW status=0x%x\n", + dev_warn(ctx->dev, + "DSP boot timeout: Error code=0x%x: FW status=0x%x\n", sst_dsp_shim_read(ctx, BXT_ADSP_ERROR_CODE), sst_dsp_shim_read(ctx, BXT_ADSP_FW_STATUS)); - dev_err(ctx->dev, "Failed to set core0 to D0 state\n"); - ret = -EIO; - goto err; + + ret = bxt_sst_init_fw(skl->dev, skl); + dev_warn(ctx->dev, "Reload fw status: %d\n", ret); + if (ret < 0) { + dev_err(ctx->dev, "Failed to set core0 to D0 state\n"); + ret = -EIO; + goto err; + } } } -- 2.17.1

1 0

[PATCH] pcm_file: return errno in case of a failed write operation
by Adam Miartus 24 Jun '19

24 Jun '19

allows correct error code propagation for snd_pcm_file_write_bytes caller Signed-off-by: Adam Miartus <amiartus(a)de.adit-jv.com> --- src/pcm/pcm_file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c index 11d0953..ab47da8 100644 --- a/src/pcm/pcm_file.c +++ b/src/pcm/pcm_file.c @@ -402,6 +402,7 @@ static int snd_pcm_file_write_bytes(snd_pcm_t *pcm, size_t bytes) n = cont; err = write(file->fd, file->wbuf + file->file_ptr_bytes, n); if (err < 0) { + err = -errno; SYSERR("%s write failed, file data may be corrupt", file->fname); return err; } -- 2.7.4

1 0

[PATCH 1/2] pcm_file: remove double line
by Adam Miartus 24 Jun '19

24 Jun '19

snd_pcm_file_add_frames called two times by mistake, introduced in 2a800c0c4f259043c9217a4aa6a57afaf9f77477 Signed-off-by: Adam Miartus <amiartus(a)de.adit-jv.com> --- src/pcm/pcm_file.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pcm/pcm_file.c b/src/pcm/pcm_file.c index ca8e0c8..11d0953 100644 --- a/src/pcm/pcm_file.c +++ b/src/pcm/pcm_file.c @@ -613,7 +613,6 @@ static snd_pcm_sframes_t snd_pcm_file_readi(snd_pcm_t *pcm, void *buffer, snd_pc snd_pcm_areas_from_buf(pcm, areas, buffer); snd_pcm_file_areas_read_infile(pcm, areas, 0, frames); __snd_pcm_lock(pcm); - snd_pcm_file_add_frames(pcm, areas, 0, frames); if (snd_pcm_file_add_frames(pcm, areas, 0, frames) < 0) { __snd_pcm_unlock(pcm); return -EPIPE; -- 2.7.4

1 1

[PATCH 0/2] v2 pcm_file propagate write error instead of an assert
by Adam Miartus 12 Jun '19

12 Jun '19

patch possible case whenre file write causes assert in pcm_file plugin, by reporting error to user and printing a message user has a chance to recover error state, or capture correct logs before assert happens, and may have an idea how to recover Adam Miartus (2): pcm_file: do not disrupt playback on output file write fail pcm_file: report write output file error to api user src/pcm/pcm_file.c | 61 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 18 deletions(-) -- 2.7.4

1 2

[PATCH 0/6] alsa-lib: Various portability fixes
by Michael Forney 12 Jun '19

12 Jun '19

Even though alsa-lib doesn't aim for ISO C conformance, hopefully these changes are uncontroversial enough to be considered anyway. Michael Forney (6): Use __func__ instead of __FUNCTION__ List cases in range explicitly Don't return in a void function Make sure parameter qualifiers match between declaration and definition Remove unused empty struct Avoid pointer arithmetic on `void *` aserver/aserver.c | 4 ++-- include/error.h | 8 ++++---- include/local.h | 4 ++-- src/conf.c | 22 ++++++++++++---------- src/pcm/pcm.c | 16 ++++++++-------- src/pcm/pcm_direct.h | 2 -- src/pcm/pcm_hw.c | 2 +- src/pcm/pcm_rate.c | 8 ++++---- src/pcm/pcm_share.c | 4 ++-- 9 files changed, 35 insertions(+), 35 deletions(-) -- 2.20.1

1 6

[PATCH 0/2] pcm_file write file assert case handling
by Adam Miartus 11 Jun '19

11 Jun '19

patched possible case where failed file write can cause assert in pcm_file plugin, by reporting error EPIPE and printing debug message. reporting an error with debug hint message is preferred to assert, user may have a way to recover in upper API level. providing a debug message makes it easier to debug the issue from logs. previously, reaching assert did not provide useful message to API level user. Adam Miartus (2): pcm_file: do not disrupt playback on output file write fail pcm_file: report write output file error to api user src/pcm/pcm_file.c | 63 +++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 46 insertions(+), 17 deletions(-) -- 2.7.4

3 4

[PATCH] ALSA: usb-audio: Enable .product_name override for Emagic, Unitor 8.
by Stefan Sauer 10 Jun '19

10 Jun '19

>From a41303935608e9a98653d4dff1e10baf1ce07e05 Mon Sep 17 00:00:00 2001 From: Stefan Sauer <ensonic(a)google.com> Date: Mon, 10 Jun 2019 11:26:53 +0200 Subject: [PATCH] ALSA: usb-audio: Enable .product_name override for Emagic Unitor 8. The Emagic Unitor 8 does not provide iManufacturer and iProduct fields in its device descriptor. These fields are used by alsa to make build the device name. Thus uncomment the .product-name in the quirks-table. Without this change the device shows up as 'USB Device 0x86a:0x01'. Output of lsusb and amidi: https://gist.github.com/ensonic/7820a102e91f31575be355da2b6b33bc Signed-off-by: Stefan Sauer <ensonic(a)google.com> --- sound/usb/quirks-table.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 9e049f60e80e..e918ce346027 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -2408,7 +2408,7 @@ YAMAHA_DEVICE(0x7010, "UB99"), USB_DEVICE(0x086a, 0x0001), .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { .vendor_name = "Emagic", - /* .product_name = "Unitor8", */ + .product_name = "Unitor8", .ifnum = 2, .type = QUIRK_MIDI_EMAGIC, .data = & (const struct snd_usb_midi_endpoint_info) { -- 2.21.0

1 0

[PATCH 0/2] add pcm_file support in MMAP read access mode
by Adam Miartus 23 May '19

23 May '19

adds support for overwritting input buffer in MMAP access mode for in pcm_file plugin new api pcm_fast_ops callback mmap_begin is introduced to ease the operation needed to overwrite mmaped buffer. this allows to modify only the next continuous part of data in ring buffer. Adam Miartus (2): pcm: add mmap_begin callback to snd_pcm_fast_ops_t api pcm_file: add infile read support for mmap mode src/pcm/pcm.c | 6 ++++++ src/pcm/pcm_file.c | 31 +++++++++++++++++++++++++++++++ src/pcm/pcm_local.h | 1 + 3 files changed, 38 insertions(+) -- 2.7.4

1 2

[PATCH - alsa-lib 0/1] pcm_file add missing unlock
by Adam Miartus 23 May '19

23 May '19

previous patches: pcm: file: add support for infile reading in non interleaved mode pcm: file: use snd_pcm_file_areas_read_infile for readi introduced an issue where pcm would not be unlocked on early return Adam Miartus (1): pcm_file: add missing unlock on early return src/pcm/pcm_file.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- 2.7.4

1 1

[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