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

[PATCH v2 0/3] soundwire: add DMI quirks for overridind addr
by Bard Liao 14 Apr '21

14 Apr '21

Platform firmware may have incorrect _ADR values causing the driver probes to fail. Adding the override_ops allows people to override the addr values. v2: - Add the override_adr ops - Move DMI quirks to a new file Pierre-Louis Bossart (2): soundwire: Intel: introduce DMI quirks for HP Spectre x360 Convertible soundwire: Intel: add DMI quirk for Dell SKU 0A3E Vinod Koul (1): soundwire: add override addr ops drivers/soundwire/Makefile | 2 +- drivers/soundwire/bus.h | 2 + drivers/soundwire/dmi-quirks.c | 96 ++++++++++++++++++++++++++++++++++ drivers/soundwire/intel.c | 1 + drivers/soundwire/slave.c | 8 ++- include/linux/soundwire/sdw.h | 4 +- 6 files changed, 110 insertions(+), 3 deletions(-) create mode 100644 drivers/soundwire/dmi-quirks.c -- 2.17.1

4 7

[PATCH] ASoC: codec: remove unused variable
by Jiapeng Chong 14 Apr '21

14 Apr '21

Fix the following gcc warning: sound/soc/codecs/jz4760.c:201:6: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable]. Reported-by: Abaci Robot <abaci(a)linux.alibaba.com> Signed-off-by: Jiapeng Chong <jiapeng.chong(a)linux.alibaba.com> --- sound/soc/codecs/jz4760.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/soc/codecs/jz4760.c b/sound/soc/codecs/jz4760.c index e8f28cc..ad5e859 100644 --- a/sound/soc/codecs/jz4760.c +++ b/sound/soc/codecs/jz4760.c @@ -198,15 +198,13 @@ static int jz4760_codec_startup(struct snd_pcm_substream *substream, { struct snd_soc_component *codec = dai->component; struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(codec); - int ret; - /* * SYSCLK output from the codec to the AIC is required to keep the * DMA transfer going during playback when all audible outputs have * been disabled. */ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) - ret = snd_soc_dapm_force_enable_pin(dapm, "SYSCLK"); + snd_soc_dapm_force_enable_pin(dapm, "SYSCLK"); return 0; } -- 1.8.3.1

2 1

[PATCH] ALSA: control_led - fix the stack usage (control element ops)
by Jaroslav Kysela 14 Apr '21

14 Apr '21

It's a bad idea to allocate big structures on the stack. Mark the variables as static and add a note for the locking. Fixes: 22d8de62f11b ("ALSA: control - add generic LED trigger module as the new control layer") Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> Cc: Nathan Chancellor <nathan(a)kernel.org> Cc: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> --- sound/core/control_led.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/core/control_led.c b/sound/core/control_led.c index 93b201063c7d..25f57c14f294 100644 --- a/sound/core/control_led.c +++ b/sound/core/control_led.c @@ -94,11 +94,15 @@ static struct snd_ctl_led *snd_ctl_led_get_by_access(unsigned int access) return &snd_ctl_leds[group]; } +/* + * A note for callers: + * The two static variables info and value are protected using snd_ctl_led_mutex. + */ static int snd_ctl_led_get(struct snd_ctl_led_ctl *lctl) { + static struct snd_ctl_elem_info info; + static struct snd_ctl_elem_value value; struct snd_kcontrol *kctl = lctl->kctl; - struct snd_ctl_elem_info info; - struct snd_ctl_elem_value value; unsigned int i; int result; -- 2.30.2

2 2

Re: [1/2]ALSA: hda: add Zhaoxin HDAC non-snoop support
by Takashi Iwai 14 Apr '21

14 Apr '21

On Wed, 14 Apr 2021 14:00:19 +0200, Hans Hu(SH-RD) wrote: > > Hi Takashi, > > Recently, our(AZX_DRIVER_ZHAOXIN) HDAC controller has added the feature of non-snoop mode, we have written a draft patch for it and hope to be accepted. The code change looks good. Please go ahead with the proper submission. thanks, Takashi > > diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index b59b0f3..420b728 100644 > --- a/sound/pci/hda/hda_intel.c > +++ b/sound/pci/hda/hda_intel.c > @@ -1702,6 +1702,14 @@ static void azx_check_snoop_available(struct azx *chip) > snoop = false; > } > > +if (azx_get_snoop_type(chip) == AZX_SNOOP_TYPE_NONE && > + chip->driver_type == AZX_DRIVER_ZHAOXIN) { > +u8 val; > +pci_read_config_byte(chip->pci, 0x42, &val); > +if (!(val & 0x80)) > +snoop = false; > +} > + > if (chip->driver_caps & AZX_DCAPS_SNOOP_OFF) > snoop = false; > > > Thanks, > 　Hans Hu :) > > > 保密声明： > 本邮件含有保密或专有信息，仅供指定收件人使用。严禁对本邮件或其内容做任何未经授权的查阅、使用、复制或转发。 > CONFIDENTIAL NOTE: > This email contains confidential or legally privileged information and is for the sole use of its intended recipient. Any unauthorized review, use, copying or forwarding of this email or the content of this email is strictly prohibited.

1 0

[PATCH] ALSA: control_led - fix the stack usage (control element ops)
by Jaroslav Kysela 14 Apr '21

14 Apr '21

It's a bad idea to allocate big structures on the stack. Allocate the required structures on demand and cache them in the led structure. Fixes: 22d8de62f11b ("ALSA: control - add generic LED trigger module as the new control layer") Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> Cc: Nathan Chancellor <nathan(a)kernel.org> Cc: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/core/control_led.c | 52 ++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/sound/core/control_led.c b/sound/core/control_led.c index 93b201063c7d..9d1612b1a6ff 100644 --- a/sound/core/control_led.c +++ b/sound/core/control_led.c @@ -37,6 +37,7 @@ struct snd_ctl_led { unsigned int group; enum led_audio trigger_type; enum snd_ctl_led_mode mode; + void *info_and_value; struct snd_ctl_led_card *cards[SNDRV_CARDS]; }; @@ -94,34 +95,41 @@ static struct snd_ctl_led *snd_ctl_led_get_by_access(unsigned int access) return &snd_ctl_leds[group]; } -static int snd_ctl_led_get(struct snd_ctl_led_ctl *lctl) +static int snd_ctl_led_get(struct snd_ctl_led *led, struct snd_ctl_led_ctl *lctl) { struct snd_kcontrol *kctl = lctl->kctl; - struct snd_ctl_elem_info info; - struct snd_ctl_elem_value value; + struct snd_ctl_elem_info *info = led->info_and_value; + struct snd_ctl_elem_value *value; unsigned int i; int result; - memset(&info, 0, sizeof(info)); - info.id = kctl->id; - info.id.index += lctl->index_offset; - info.id.numid += lctl->index_offset; - result = kctl->info(kctl, &info); + if (info == NULL) { + info = kmalloc(sizeof(*info) + sizeof(*value), GFP_KERNEL); + if (info == NULL) + return -1; + led->info_and_value = info; + } + value = (void *)(info + 1); + memset(info, 0, sizeof(*info)); + info->id = kctl->id; + info->id.index += lctl->index_offset; + info->id.numid += lctl->index_offset; + result = kctl->info(kctl, info); if (result < 0) return -1; - memset(&value, 0, sizeof(value)); - value.id = info.id; - result = kctl->get(kctl, &value); + memset(value, 0, sizeof(*value)); + value->id = info->id; + result = kctl->get(kctl, value); if (result < 0) return -1; - if (info.type == SNDRV_CTL_ELEM_TYPE_BOOLEAN || - info.type == SNDRV_CTL_ELEM_TYPE_INTEGER) { - for (i = 0; i < info.count; i++) - if (value.value.integer.value[i] != info.value.integer.min) + if (info->type == SNDRV_CTL_ELEM_TYPE_BOOLEAN || + info->type == SNDRV_CTL_ELEM_TYPE_INTEGER) { + for (i = 0; i < info->count; i++) + if (value->value.integer.value[i] != info->value.integer.min) return 1; - } else if (info.type == SNDRV_CTL_ELEM_TYPE_INTEGER64) { - for (i = 0; i < info.count; i++) - if (value.value.integer64.value[i] != info.value.integer64.min) + } else if (info->type == SNDRV_CTL_ELEM_TYPE_INTEGER64) { + for (i = 0; i < info->count; i++) + if (value->value.integer64.value[i] != info->value.integer64.min) return 1; } return 0; @@ -149,7 +157,7 @@ static void snd_ctl_led_set_state(struct snd_card *card, unsigned int access, list_for_each_entry(lctl, &led->controls, list) { if (lctl->kctl == kctl && lctl->index_offset == ioff) found = true; - UPDATE_ROUTE(route, snd_ctl_led_get(lctl)); + UPDATE_ROUTE(route, snd_ctl_led_get(led, lctl)); } if (!found && kctl && card) { lctl = kzalloc(sizeof(*lctl), GFP_KERNEL); @@ -159,7 +167,7 @@ static void snd_ctl_led_set_state(struct snd_card *card, unsigned int access, lctl->kctl = kctl; lctl->index_offset = ioff; list_add(&lctl->list, &led->controls); - UPDATE_ROUTE(route, snd_ctl_led_get(lctl)); + UPDATE_ROUTE(route, snd_ctl_led_get(led, lctl)); } } mutex_unlock(&snd_ctl_led_mutex); @@ -300,6 +308,10 @@ static void snd_ctl_led_clean(struct snd_card *card) snd_ctl_led_ctl_destroy(lctl); goto repeat; } + if (!card) { + kfree(led->info_and_value); + led->info_and_value = NULL; + } } } -- 2.30.2

2 4

[PATCH] ALSA: control_led: fix stack frame usage over 1024 bytes in snd_ctl_led_get()
by Takashi Sakamoto 14 Apr '21

14 Apr '21

GCC warns that snd_ctl_led_get() uses stack frame over 1024 bytes. control_led.c: In function ‘snd_ctl_led_get’: control_led.c:128:1: warning: the frame size of 1504 bytes is larger than 1024 bytes [-Wframe-larger-than=] When taking care of convension in Linux kernel development. it's preferable to suppress too large usage of kernel stack, when the function call is not in critical part. This commit fixes the bug, including some minor code refactoring relevant to variable names. Fixes: 22d8de62f11b ("ALSA: control - add generic LED trigger module as the new control layer") Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/core/control_led.c | 68 ++++++++++++++++++++++++++-------------- 1 file changed, 44 insertions(+), 24 deletions(-) diff --git a/sound/core/control_led.c b/sound/core/control_led.c index b97f118cd54e..1be854a861f0 100644 --- a/sound/core/control_led.c +++ b/sound/core/control_led.c @@ -94,34 +94,35 @@ static struct snd_ctl_led *snd_ctl_led_get_by_access(unsigned int access) return &snd_ctl_leds[group]; } -static int snd_ctl_led_get(struct snd_ctl_led_ctl *lctl) +static int snd_ctl_led_get(struct snd_ctl_led_ctl *lctl, struct snd_ctl_elem_info *elem_info, + struct snd_ctl_elem_value *elem_value) { struct snd_kcontrol *kctl = lctl->kctl; - struct snd_ctl_elem_info info; - struct snd_ctl_elem_value value; unsigned int i; - int result; - - memset(&info, 0, sizeof(info)); - info.id = kctl->id; - info.id.index += lctl->index_offset; - info.id.numid += lctl->index_offset; - result = kctl->info(kctl, &info); - if (result < 0) + int err; + + memset(elem_info, 0, sizeof(*elem_info)); + elem_info->id = kctl->id; + elem_info->id.index += lctl->index_offset; + elem_info->id.numid += lctl->index_offset; + err = kctl->info(kctl, elem_info); + if (err < 0) return -1; - memset(&value, 0, sizeof(value)); - value.id = info.id; - result = kctl->get(kctl, &value); - if (result < 0) + + memset(elem_value, 0, sizeof(*elem_value)); + elem_value->id = elem_info->id; + err = kctl->get(kctl, elem_value); + if (err < 0) return -1; - if (info.type == SNDRV_CTL_ELEM_TYPE_BOOLEAN || - info.type == SNDRV_CTL_ELEM_TYPE_INTEGER) { - for (i = 0; i < info.count; i++) - if (value.value.integer.value[i] != info.value.integer.min) + + if (elem_info->type == SNDRV_CTL_ELEM_TYPE_BOOLEAN || + elem_info->type == SNDRV_CTL_ELEM_TYPE_INTEGER) { + for (i = 0; i < elem_info->count; i++) + if (elem_value->value.integer.value[i] != elem_info->value.integer.min) return 1; - } else if (info.type == SNDRV_CTL_ELEM_TYPE_INTEGER64) { - for (i = 0; i < info.count; i++) - if (value.value.integer64.value[i] != info.value.integer64.min) + } else if (elem_info->type == SNDRV_CTL_ELEM_TYPE_INTEGER64) { + for (i = 0; i < elem_info->count; i++) + if (elem_value->value.integer64.value[i] != elem_info->value.integer64.min) return 1; } return 0; @@ -132,6 +133,8 @@ static void snd_ctl_led_set_state(struct snd_card *card, unsigned int access, { struct snd_ctl_led *led; struct snd_ctl_led_ctl *lctl; + struct snd_ctl_elem_info *elem_info; + struct snd_ctl_elem_value *elem_value; int route; bool found; @@ -146,10 +149,24 @@ static void snd_ctl_led_set_state(struct snd_card *card, unsigned int access, mutex_unlock(&snd_ctl_led_mutex); return; } + + elem_info = kmalloc(sizeof(*elem_info), GFP_KERNEL); + if (!elem_info) { + mutex_unlock(&snd_ctl_led_mutex); + return; + } + + elem_value = kmalloc(sizeof(*elem_value), GFP_KERNEL); + if (!elem_value) { + kfree(elem_info); + mutex_unlock(&snd_ctl_led_mutex); + return; + } + list_for_each_entry(lctl, &led->controls, list) { if (lctl->kctl == kctl && lctl->index_offset == ioff) found = true; - UPDATE_ROUTE(route, snd_ctl_led_get(lctl)); + UPDATE_ROUTE(route, snd_ctl_led_get(lctl, elem_info, elem_value)); } if (!found && kctl && card) { lctl = kzalloc(sizeof(*lctl), GFP_KERNEL); @@ -159,10 +176,13 @@ static void snd_ctl_led_set_state(struct snd_card *card, unsigned int access, lctl->kctl = kctl; lctl->index_offset = ioff; list_add(&lctl->list, &led->controls); - UPDATE_ROUTE(route, snd_ctl_led_get(lctl)); + UPDATE_ROUTE(route, snd_ctl_led_get(lctl, elem_info, elem_value)); } kfree(lctl); } + + kfree(elem_value); + kfree(elem_info); mutex_unlock(&snd_ctl_led_mutex); switch (led->mode) { case MODE_OFF: route = 1; break; -- 2.27.0

4 4

utils/alsa.m4: fix the brackets for real
by GitHub pull_request - opened 13 Apr '21

13 Apr '21

alsa-project/alsa-lib pull request #133 was opened from asavah: Even after https://github.com/alsa-project/alsa-lib/commit/f9ace404fde9058baf64d77eed9… building alsa-utils from git fails due to broken alsa.m4. ``` autoreconf: running: aclocal -I m4 --force -I m4 /home/asavah/kross/host/bin/m4:/home/asavah/kross/build/asusb450eg/rootfs/usr/share/aclocal/alsa.m4:20: ERROR: end of file in string autom4te2.71: error: /home/asavah/kross/host/bin/m4 failed with exit status: 1 aclocal: error: /home/asavah/kross/host/bin/autom4te2.71 failed with exit status: 1 autoreconf: error: aclocal failed with exit status: 1 ``` This PR should address missing brackets. Request URL : https://github.com/alsa-project/alsa-lib/pull/133 Patch URL : https://github.com/alsa-project/alsa-lib/pull/133.patch Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[PATCH] ASoC: cs35l35: Fix an error handling path in 'cs35l35_i2c_probe()'
by Christophe JAILLET 13 Apr '21

13 Apr '21

If 'devm_regmap_init_i2c()' fails, there is no need to goto err. We should return directly as already done by the surrounding error handling paths. Signed-off-by: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> --- sound/soc/codecs/cs35l35.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/cs35l35.c b/sound/soc/codecs/cs35l35.c index 55d529aa0011..7b9f5498f8a7 100644 --- a/sound/soc/codecs/cs35l35.c +++ b/sound/soc/codecs/cs35l35.c @@ -1488,7 +1488,7 @@ static int cs35l35_i2c_probe(struct i2c_client *i2c_client, if (IS_ERR(cs35l35->regmap)) { ret = PTR_ERR(cs35l35->regmap); dev_err(dev, "regmap_init() failed: %d\n", ret); - goto err; + return ret; } for (i = 0; i < ARRAY_SIZE(cs35l35_supplies); i++) -- 2.27.0

2 4

[PATCH v4] sound: rawmidi: Add framing mode
by David Henningsson 13 Apr '21

13 Apr '21

This commit adds a new framing mode that frames all MIDI data into 32-byte frames with a timestamp. The main benefit is that we can get accurate timestamps even if userspace wakeup and processing is not immediate. Testing on a Celeron N3150 with this mode has a max jitter of 2.8 ms, compared to the in-kernel seq implementation which has a max jitter of 5 ms during idle and much worse when running scheduler stress tests in parallel. Signed-off-by: David Henningsson <coding(a)diwic.se> --- include/sound/rawmidi.h | 2 ++ include/uapi/sound/asound.h | 26 ++++++++++++++-- sound/core/rawmidi.c | 60 +++++++++++++++++++++++++++++++++++-- 3 files changed, 84 insertions(+), 4 deletions(-) diff --git a/include/sound/rawmidi.h b/include/sound/rawmidi.h index 334842daa904..b0057a193c31 100644 --- a/include/sound/rawmidi.h +++ b/include/sound/rawmidi.h @@ -81,6 +81,8 @@ struct snd_rawmidi_substream { bool opened; /* open flag */ bool append; /* append flag (merge more streams) */ bool active_sensing; /* send active sensing when close */ + u8 framing; /* whether to frame input data */ + clockid_t clock_type; /* clock source to use for input framing */ int use_count; /* use counter (for output) */ size_t bytes; struct snd_rawmidi *rmidi; diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h index 535a7229e1d9..af8e60740218 100644 --- a/include/uapi/sound/asound.h +++ b/include/uapi/sound/asound.h @@ -710,7 +710,7 @@ enum { * Raw MIDI section - /dev/snd/midi?? */ -#define SNDRV_RAWMIDI_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 1) +#define SNDRV_RAWMIDI_VERSION SNDRV_PROTOCOL_VERSION(2, 0, 2) enum { SNDRV_RAWMIDI_STREAM_OUTPUT = 0, @@ -736,12 +736,34 @@ struct snd_rawmidi_info { unsigned char reserved[64]; /* reserved for future use */ }; +enum { + SNDRV_RAWMIDI_FRAMING_NONE = 0, + SNDRV_RAWMIDI_FRAMING_TSTAMP, + SNDRV_RAWMIDI_FRAMING_LAST = SNDRV_RAWMIDI_FRAMING_TSTAMP, +}; + +#define SND_RAWMIDI_FRAMING_DATA_LENGTH 16 + +struct snd_rawmidi_framing_tstamp { + /* For now, frame_type is always 0. Midi 2.0 is expected to add new + * types here. Applications are expected to skip unknown frame types. + */ + unsigned char frame_type; + unsigned char length; /* number of valid bytes in data field */ + unsigned char reserved[2]; + unsigned int tv_nsec; /* nanoseconds */ + unsigned long long tv_sec; /* seconds */ + unsigned char data[SND_RAWMIDI_FRAMING_DATA_LENGTH]; +}; + struct snd_rawmidi_params { int stream; size_t buffer_size; /* queue size in bytes */ size_t avail_min; /* minimum avail bytes for wakeup */ unsigned int no_active_sensing: 1; /* do not send active sensing byte in close() */ - unsigned char reserved[16]; /* reserved for future use */ + unsigned char framing; /* For input data only, frame incoming data */ + unsigned char clock_type; /* Type of clock to use for framing, same as clockid_t */ + unsigned char reserved[14]; /* reserved for future use */ }; #ifndef __KERNEL__ diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c index aca00af93afe..d4b6b9b5c0e4 100644 --- a/sound/core/rawmidi.c +++ b/sound/core/rawmidi.c @@ -683,6 +683,8 @@ static int resize_runtime_buffer(struct snd_rawmidi_runtime *runtime, if (params->buffer_size < 32 || params->buffer_size > 1024L * 1024L) return -EINVAL; + if (params->framing == SNDRV_RAWMIDI_FRAMING_TSTAMP && params->buffer_size & 0x1f) + return -EINVAL; if (params->avail_min < 1 || params->avail_min > params->buffer_size) return -EINVAL; if (params->buffer_size != runtime->buffer_size) { @@ -720,7 +722,16 @@ EXPORT_SYMBOL(snd_rawmidi_output_params); int snd_rawmidi_input_params(struct snd_rawmidi_substream *substream, struct snd_rawmidi_params *params) { + if (params->framing) { + if (params->framing > SNDRV_RAWMIDI_FRAMING_LAST) + return -EINVAL; + /* framing requires a valid clock type */ + if (params->clock_type != CLOCK_MONOTONIC_RAW && params->clock_type != CLOCK_MONOTONIC) + return -EINVAL; + } snd_rawmidi_drain_input(substream); + substream->framing = params->framing; + substream->clock_type = params->clock_type; return resize_runtime_buffer(substream->runtime, params, true); } EXPORT_SYMBOL(snd_rawmidi_input_params); @@ -963,6 +974,42 @@ static int snd_rawmidi_control_ioctl(struct snd_card *card, return -ENOIOCTLCMD; } +static int receive_with_tstamp_framing(struct snd_rawmidi_substream *substream, + const unsigned char *buffer, int src_count, struct timespec64 *tstamp) +{ + struct snd_rawmidi_runtime *runtime = substream->runtime; + struct snd_rawmidi_framing_tstamp *dest_ptr; + struct snd_rawmidi_framing_tstamp frame = { .tv_sec = tstamp->tv_sec, .tv_nsec = tstamp->tv_nsec }; + + int dest_frames = 0; + int frame_size = sizeof(struct snd_rawmidi_framing_tstamp); + + if (snd_BUG_ON(runtime->hw_ptr & 0x1f || runtime->buffer_size & 0x1f || frame_size != 0x20)) + return -EINVAL; + while (src_count > 0) { + if ((int)(runtime->buffer_size - runtime->avail) < frame_size) { + runtime->xruns += src_count; + return dest_frames * frame_size; + } + if (src_count >= SND_RAWMIDI_FRAMING_DATA_LENGTH) + frame.length = SND_RAWMIDI_FRAMING_DATA_LENGTH; + else { + frame.length = src_count; + memset(frame.data, 0, SND_RAWMIDI_FRAMING_DATA_LENGTH); + } + memcpy(frame.data, buffer, frame.length); + buffer += frame.length; + src_count -= frame.length; + dest_ptr = (struct snd_rawmidi_framing_tstamp *) (runtime->buffer + runtime->hw_ptr); + *dest_ptr = frame; + runtime->avail += frame_size; + runtime->hw_ptr += frame_size; + runtime->hw_ptr %= runtime->buffer_size; + dest_frames++; + } + return dest_frames * frame_size; +} + /** * snd_rawmidi_receive - receive the input data from the device * @substream: the rawmidi substream @@ -977,6 +1024,7 @@ int snd_rawmidi_receive(struct snd_rawmidi_substream *substream, const unsigned char *buffer, int count) { unsigned long flags; + struct timespec64 ts64; int result = 0, count1; struct snd_rawmidi_runtime *runtime = substream->runtime; @@ -987,8 +1035,15 @@ int snd_rawmidi_receive(struct snd_rawmidi_substream *substream, "snd_rawmidi_receive: input is not active!!!\n"); return -EINVAL; } - spin_lock_irqsave(&runtime->lock, flags); - if (count == 1) { /* special case, faster code */ + if (substream->framing == SNDRV_RAWMIDI_FRAMING_TSTAMP) { + if (substream->clock_type == CLOCK_MONOTONIC_RAW) + ktime_get_raw_ts64(&ts64); + else + ktime_get_ts64(&ts64); + spin_lock_irqsave(&runtime->lock, flags); + result = receive_with_tstamp_framing(substream, buffer, count, &ts64); + } else if (count == 1) { /* special case, faster code */ + spin_lock_irqsave(&runtime->lock, flags); substream->bytes++; if (runtime->avail < runtime->buffer_size) { runtime->buffer[runtime->hw_ptr++] = buffer[0]; @@ -999,6 +1054,7 @@ int snd_rawmidi_receive(struct snd_rawmidi_substream *substream, runtime->xruns++; } } else { + spin_lock_irqsave(&runtime->lock, flags); substream->bytes += count; count1 = runtime->buffer_size - runtime->hw_ptr; if (count1 > count) -- 2.25.1

3 19

[PATCH v2 00/12] ASoC: simple-card-utils: prepare for multi support
by Kuninori Morimoto 13 Apr '21

13 Apr '21

Hi Mark This patch-set is for v2 of Multi-CPU/Codec support, and some cleanups. v1 had patch-conflict on simple-card / audio-graph with below. v2 was solved it. fa74c223b6fd78a5314b4c61b9abdbed3c2185b4 ("ASoC: simple-card: fix possible uninitialized single_cpu local variable") I want to add new audio-graph-card2 driver which can support not only DPCM, but also Multi-CPU/Codec, and Codec2Codec. And it is also supporting audio-graph-card2 base custom driver. But before supporting such driver, we need to cleanup existing simple-card / audio-graph, because these and new driver are sharing code. Link: https://lore.kernel.org/r/87wntmod33.wl-kuninori.morimoto.gx@renesas.com Link: https://lore.kernel.org/r/20210408141639.GA39604@sirena.org.uk Kuninori Morimoto (12): ASoC: simple-card-utils: setup dai_props cpu_dai/codec_dai at initial timing ASoC: simple-card-utils: remove li->dais/li->conf ASoC: simple-card-utils: use for_each_prop_xxx() ASoC: simple-card-utils: remove asoc_simple_parse_xxx() ASoC: simple-card-utils: care multi DAI at asoc_simple_clean_reference() ASoC: simple-card-utils: indicate dai_fmt if exist ASoC: simple-card-utils: indicate missing CPU/Codec numbers for debug ASoC: simple-card-utils: add simple_props_to_xxx() macro ASoC: simple-card-utils: multi support at asoc_simple_canonicalize_cpu/platform() ASoC: simple-card-utils: tidyup debug info for clock ASoC: simple-card-utils: tidyup dev_dbg() to use 1 line ASoC: simple-card-utils: tidyup asoc_simple_parse_convert() include/sound/simple_card_utils.h | 107 ++++++++++------ sound/soc/generic/audio-graph-card.c | 64 ++++------ sound/soc/generic/simple-card-utils.c | 174 ++++++++++++++++---------- sound/soc/generic/simple-card.c | 70 ++++------- 4 files changed, 226 insertions(+), 189 deletions(-) -- 2.25.1

2 13