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

[PATCH 00/15] ASoC: SOF: Abstractions for top-level IPC ops
by Ranjani Sridharan 12 Apr '22

12 Apr '22

This series is continuation of the IPC abstraction in the SOF driver in preparation for supporting the new IPC supported by the SOF firmware. It introduces abstraction for top-level IPC ops for sending/receiving regular and large IPC's. Peter Ujfalusi (15): ASoC: SOF: Add helper function to prepare and send an IPC message ASoC: SOF: Add high level IPC IO callback definitions to ipc_ops ASoC: SOF: ipc3: Implement the tx_msg IPC ops ASoC: SOF: ipc3: Use sof_ipc3_tx_msg() internally for message sending ASoC: SOF: ipc3: Implement the set_get_data IPC ops ASoC: SOF: ipc3: Implement the get_reply IPC ops ASoC: SOF: ipc3: Implement rx_msg IPC ops ASoC: SOF: ipc: Separate the ops checks by functions/topics ASoC: SOF: ipc: Add check for mandatory IPC message handling ops ASoC: SOF: ipc: Use the get_reply ops in snd_sof_ipc_get_reply() ASoC: SOF: ipc: Switch over to use the tx_msg and set_get_data ops ASoC: SOF: ipc: Switch over to use the rx_msg ops ASoC: SOF: Add widget_kcontrol_setup control ops for IPC3 ASoC: SOF: sof-audio: Use the widget_kcontrol_setup ops for kcontrol set up ASoC: SOF: ipc: Move the ipc_set_get_comp_data() local to ipc3-control sound/soc/sof/ipc.c | 858 ++--------------------------------- sound/soc/sof/ipc3-control.c | 131 +++++- sound/soc/sof/ipc3.c | 682 +++++++++++++++++++++++++++- sound/soc/sof/sof-audio.c | 54 +-- sound/soc/sof/sof-audio.h | 7 +- sound/soc/sof/sof-priv.h | 28 +- 6 files changed, 880 insertions(+), 880 deletions(-) -- 2.25.1

2 16

[PATCH 00/39] ALSA: Fix error handling order at probe error
by Takashi Iwai 12 Apr '22

12 Apr '22

Hi, this is a bunch of additional fixes that are similar like the previous patch set for echoaudio but applied to other drivers that suffer from the very same issue -- the incorrect error handling order at the probe error. Most of patches just follow the same strategy, the use of the new snd_card_free_on_error() helper while some few took just the manual snd_card_free() call and some with shuffling the private_free setup for avoiding the problem. Takashi === Takashi Iwai (39): ALSA: galaxy: Fix the missing snd_card_free() call at probe error ALSA: sc6000: Fix the missing snd_card_free() call at probe error ALSA: ad1889: Fix the missing snd_card_free() call at probe error ALSA: ali5451: Fix the missing snd_card_free() call at probe error ALSA: als4000: Fix the missing snd_card_free() call at probe error ALSA: atiixp: Fix the missing snd_card_free() call at probe error ALSA: au88x0: Fix the missing snd_card_free() call at probe error ALSA: azt3328: Fix the missing snd_card_free() call at probe error ALSA: ca0106: Fix the missing snd_card_free() call at probe error ALSA: cs4281: Fix the missing snd_card_free() call at probe error ALSA: cs5535audio: Fix the missing snd_card_free() call at probe error ALSA: emu10k1x: Fix the missing snd_card_free() call at probe error ALSA: ens137x: Fix the missing snd_card_free() call at probe error ALSA: es1938: Fix the missing snd_card_free() call at probe error ALSA: es1968: Fix the missing snd_card_free() call at probe error ALSA: fm801: Fix the missing snd_card_free() call at probe error ALSA: ice1724: Fix the missing snd_card_free() call at probe error ALSA: intel8x0: Fix the missing snd_card_free() call at probe error ALSA: korg1212: Fix the missing snd_card_free() call at probe error ALSA: maestro3: Fix the missing snd_card_free() call at probe error ALSA: riptide: Fix the missing snd_card_free() call at probe error ALSA: rme32: Fix the missing snd_card_free() call at probe error ALSA: rme96: Fix the missing snd_card_free() call at probe error ALSA: sonicvibes: Fix the missing snd_card_free() call at probe error ALSA: via82xx: Fix the missing snd_card_free() call at probe error ALSA: intel_hdmi: Fix the missing snd_card_free() call at probe error ALSA: sis7019: Fix the missing error handling ALSA: bt87x: Fix the missing snd_card_free() call at probe error ALSA: lola: Fix the missing snd_card_free() call at probe error ALSA: als300: Fix the missing snd_card_free() call at probe error ALSA: aw2: Fix the missing snd_card_free() call at probe error ALSA: cmipci: Fix the missing snd_card_free() call at probe error ALSA: lx6464es: Fix the missing snd_card_free() call at probe error ALSA: oxygen: Fix the missing snd_card_free() call at probe error ALSA: hdsp: Fix the missing snd_card_free() call at probe error ALSA: hdspm: Fix the missing snd_card_free() call at probe error ALSA: rme9652: Fix the missing snd_card_free() call at probe error ALSA: mtpav: Don't call card private_free at probe error path ALSA: nm256: Don't call card private_free at probe error path sound/drivers/mtpav.c | 4 ++-- sound/isa/galaxy/galaxy.c | 7 ++++++- sound/isa/sc6000.c | 7 ++++++- sound/pci/ad1889.c | 10 ++++++++-- sound/pci/ali5451/ali5451.c | 10 ++++++++-- sound/pci/als300.c | 8 ++++++-- sound/pci/als4000.c | 10 ++++++++-- sound/pci/atiixp.c | 10 ++++++++-- sound/pci/atiixp_modem.c | 10 ++++++++-- sound/pci/au88x0/au88x0.c | 8 +++++++- sound/pci/aw2/aw2-alsa.c | 8 ++++++-- sound/pci/azt3328.c | 8 +++++++- sound/pci/bt87x.c | 10 ++++++++-- sound/pci/ca0106/ca0106_main.c | 10 ++++++++-- sound/pci/cmipci.c | 8 ++++++-- sound/pci/cs4281.c | 10 ++++++++-- sound/pci/cs5535audio/cs5535audio.c | 10 ++++++++-- sound/pci/emu10k1/emu10k1x.c | 10 ++++++++-- sound/pci/ens1370.c | 10 ++++++++-- sound/pci/es1938.c | 10 ++++++++-- sound/pci/es1968.c | 10 ++++++++-- sound/pci/fm801.c | 10 ++++++++-- sound/pci/ice1712/ice1724.c | 10 ++++++++-- sound/pci/intel8x0.c | 10 ++++++++-- sound/pci/intel8x0m.c | 10 ++++++++-- sound/pci/korg1212/korg1212.c | 8 ++++++-- sound/pci/lola/lola.c | 10 ++++++++-- sound/pci/lx6464es/lx6464es.c | 8 ++++++-- sound/pci/maestro3.c | 8 +++++++- sound/pci/nm256/nm256.c | 2 +- sound/pci/oxygen/oxygen_lib.c | 12 +++++++++++- sound/pci/riptide/riptide.c | 8 +++++++- sound/pci/rme32.c | 8 +++++++- sound/pci/rme96.c | 10 ++++++++-- sound/pci/rme9652/hdsp.c | 8 ++++++-- sound/pci/rme9652/hdspm.c | 8 ++++++-- sound/pci/rme9652/rme9652.c | 8 ++++++-- sound/pci/sis7019.c | 14 ++++++++++---- sound/pci/sonicvibes.c | 10 ++++++++-- sound/pci/via82xx.c | 10 ++++++++-- sound/pci/via82xx_modem.c | 10 ++++++++-- sound/x86/intel_hdmi_audio.c | 7 ++++++- 42 files changed, 301 insertions(+), 76 deletions(-) -- 2.31.1

2 40

[PATCH 00/16] ASoC: SOF: add INTEL_IPC4 plumbing
by Pierre-Louis Bossart 12 Apr '22

12 Apr '22

The INTEL_IPC4 protocol and firmware architecture will rely on different sets of firmware binary and topology files. Some platforms will only support INTEL_IPC4, some will support both INTEL_IPC4 and SOF_IPC for development, and some will stay with the existing SOF_IPC. This patchset adds new IPC definitions, and search paths for firmware and topology files, along with means to override the default IPC type and search paths for development. The firmware binary names are aligned with those used by the Intel AVS driver to avoid duplicate firmware installs, but the topology will have to differ due to driver architecture differences. In addition, this patchset adds basic hardware support for SKL/KBL with HDaudio codecs, which requires a dedicated code loader and manifest support. Plain HDAudio was tested on Dell XPS 9350 and Intel NUC devices. HDAudio+DMIC support was tested on more recent UpExtreme (WHL and TGL variants). Pierre-Louis Bossart (12): ASoC: SOF: add definitions for different IPC types ASoC: SOF: add path indirection to each IPC type ASoC: SOF: add default IPC capability and file paths ASoC: SOF: add IPC-dependent file names ASoC: SOF: sof-pci-dev: add parameter to override firmware filename ASoC: SOF: sof-pci-dev: add parameter to override topology filename ASoC: SOF: sof-audio: preserve topology filename override in nocodec mode ASoC: SOF: remove const qualifier for 'struct snd_sof_dsp_ops' ASoC: SOF: Intel: hda: use common ops across platforms ASoC: SOF: Intel: hda: use BIT() macros for consistency ASoC: SOF: Intel: add initial SKL/KBL hardware support ASoC: SOF: Intel: add IP identifier Ranjani Sridharan (4): ASoC: SOF: Intel: move HDA_CL_STREAM_FORMAT definition to header ASoC: SOF: Intel: hda: define check_ipc_irq op ASoC: SOF: Intel: hda: Define rom_status_reg in sof_intel_dsp_desc ASoC: SOF: Intel: hda: expose some codeloader functions include/sound/sof.h | 23 +- sound/soc/sof/amd/acp.h | 2 +- sound/soc/sof/amd/pci-rn.c | 14 +- sound/soc/sof/amd/renoir.c | 2 +- sound/soc/sof/core.c | 6 + sound/soc/sof/debug.c | 2 +- sound/soc/sof/imx/imx8.c | 32 +- sound/soc/sof/imx/imx8m.c | 16 +- sound/soc/sof/intel/Kconfig | 24 + sound/soc/sof/intel/Makefile | 6 +- sound/soc/sof/intel/apl.c | 107 +---- sound/soc/sof/intel/bdw.c | 17 +- sound/soc/sof/intel/byt.c | 48 +- sound/soc/sof/intel/cnl.c | 112 ++--- sound/soc/sof/intel/hda-common-ops.c | 107 +++++ sound/soc/sof/intel/hda-dsp.c | 4 +- sound/soc/sof/intel/hda-ipc.c | 8 + sound/soc/sof/intel/hda-loader-skl.c | 583 +++++++++++++++++++++++++ sound/soc/sof/intel/hda-loader.c | 43 +- sound/soc/sof/intel/hda.c | 25 +- sound/soc/sof/intel/hda.h | 42 +- sound/soc/sof/intel/icl.c | 111 +---- sound/soc/sof/intel/pci-apl.c | 36 +- sound/soc/sof/intel/pci-cnl.c | 54 ++- sound/soc/sof/intel/pci-icl.c | 36 +- sound/soc/sof/intel/pci-skl.c | 89 ++++ sound/soc/sof/intel/pci-tgl.c | 91 +++- sound/soc/sof/intel/pci-tng.c | 17 +- sound/soc/sof/intel/shim.h | 16 +- sound/soc/sof/intel/skl.c | 70 +++ sound/soc/sof/intel/tgl.c | 120 ++--- sound/soc/sof/mediatek/mt8195/mt8195.c | 16 +- sound/soc/sof/ops.h | 8 + sound/soc/sof/pcm.c | 2 +- sound/soc/sof/sof-acpi-dev.c | 6 +- sound/soc/sof/sof-audio.c | 3 +- sound/soc/sof/sof-of-dev.c | 6 +- sound/soc/sof/sof-pci-dev.c | 47 +- 38 files changed, 1465 insertions(+), 486 deletions(-) create mode 100644 sound/soc/sof/intel/hda-common-ops.c create mode 100644 sound/soc/sof/intel/hda-loader-skl.c create mode 100644 sound/soc/sof/intel/pci-skl.c create mode 100644 sound/soc/sof/intel/skl.c -- 2.30.2

2 18

[PATCH v2] ASoC: dt-bindings: tas27xx: fix invalid yaml
by Corentin Labbe 12 Apr '22

12 Apr '22

The word "or" is useless and breaks yaml validation. Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> Signed-off-by: Corentin Labbe <clabbe(a)baylibre.com> --- Change since v1: - Added reviewed-by - Fixed subject Documentation/devicetree/bindings/sound/tas27xx.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/tas27xx.yaml b/Documentation/devicetree/bindings/sound/tas27xx.yaml index 191f4bceb4ee..66a0df8850ea 100644 --- a/Documentation/devicetree/bindings/sound/tas27xx.yaml +++ b/Documentation/devicetree/bindings/sound/tas27xx.yaml @@ -20,7 +20,6 @@ properties: compatible: enum: - ti,tas2764 - or - ti,tas2780 reg: -- 2.35.1

1 0

[PATCH] slimbus: qcom: fix error check return value of platform_get_irq()
by cgel.zte＠gmail.com 12 Apr '22

12 Apr '22

From: Lv Ruyi <lv.ruyi(a)zte.com.cn> platform_get_irq() return negative value on failure, so null check of ctrl->irq is incorrect. Fix it by comparing whether it is less than zero. Fixes: ad7fcbc308b0 ("slimbus: qcom: Add Qualcomm Slimbus controller driver") Reported-by: Zeal Robot <zealci(a)zte.com.cn> Signed-off-by: Lv Ruyi <lv.ruyi(a)zte.com.cn> --- drivers/slimbus/qcom-ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/slimbus/qcom-ctrl.c b/drivers/slimbus/qcom-ctrl.c index f04b961b96cd..b2f01e155d77 100644 --- a/drivers/slimbus/qcom-ctrl.c +++ b/drivers/slimbus/qcom-ctrl.c @@ -510,7 +510,7 @@ static int qcom_slim_probe(struct platform_device *pdev) } ctrl->irq = platform_get_irq(pdev, 0); - if (!ctrl->irq) { + if (ctrl->irq < 0) { dev_err(&pdev->dev, "no slimbus IRQ\n"); return -ENODEV; } -- 2.25.1

3 2

[PATCH v8 1/3] rename tas2764 to tas27xx
by Raphael-Xu 12 Apr '22

12 Apr '22

rename tas2764.c and tas2764.h to tas27xx.c and tas27xx.h rename tas2764 to tas27xx in Kconfig and Makefile Signed-off-by: Raphael-Xu <13691752556(a)139.com> --- sound/soc/codecs/Kconfig | 6 +++--- sound/soc/codecs/Makefile | 4 ++-- sound/soc/codecs/{tas2764.c => tas27xx.c} | 0 sound/soc/codecs/{tas2764.h => tas27xx.h} | 0 4 files changed, 5 insertions(+), 5 deletions(-) rename sound/soc/codecs/{tas2764.c => tas27xx.c} (100%) rename sound/soc/codecs/{tas2764.h => tas27xx.h} (100%) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index f46a22660103..2c4595f6f7ec 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -213,7 +213,7 @@ config SND_SOC_ALL_CODECS imply SND_SOC_STI_SAS imply SND_SOC_TAS2552 imply SND_SOC_TAS2562 - imply SND_SOC_TAS2764 + imply SND_SOC_TAS27XX imply SND_SOC_TAS2770 imply SND_SOC_TAS5086 imply SND_SOC_TAS571X @@ -1472,8 +1472,8 @@ config SND_SOC_TAS2562 tristate "Texas Instruments TAS2562 Mono Audio amplifier" depends on I2C -config SND_SOC_TAS2764 - tristate "Texas Instruments TAS2764 Mono Audio amplifier" +config SND_SOC_TAS27XX + tristate "Texas Instruments TAS2764/TAS2780 Mono Audio amplifier" depends on I2C config SND_SOC_TAS2770 diff --git a/sound/soc/codecs/Makefile b/sound/soc/codecs/Makefile index 8637e9e869e3..15ceb95d42f5 100644 --- a/sound/soc/codecs/Makefile +++ b/sound/soc/codecs/Makefile @@ -337,7 +337,7 @@ snd-soc-simple-amplifier-objs := simple-amplifier.o snd-soc-tpa6130a2-objs := tpa6130a2.o snd-soc-tas2552-objs := tas2552.o snd-soc-tas2562-objs := tas2562.o -snd-soc-tas2764-objs := tas2764.o +snd-soc-tas27xx-objs := tas27xx.o # Mux snd-soc-simple-mux-objs := simple-mux.o @@ -574,7 +574,7 @@ obj-$(CONFIG_SND_SOC_STAC9766) += snd-soc-stac9766.o obj-$(CONFIG_SND_SOC_STI_SAS) += snd-soc-sti-sas.o obj-$(CONFIG_SND_SOC_TAS2552) += snd-soc-tas2552.o obj-$(CONFIG_SND_SOC_TAS2562) += snd-soc-tas2562.o -obj-$(CONFIG_SND_SOC_TAS2764) += snd-soc-tas2764.o +obj-$(CONFIG_SND_SOC_TAS27XX) += snd-soc-tas27xx.o obj-$(CONFIG_SND_SOC_TAS5086) += snd-soc-tas5086.o obj-$(CONFIG_SND_SOC_TAS571X) += snd-soc-tas571x.o obj-$(CONFIG_SND_SOC_TAS5720) += snd-soc-tas5720.o diff --git a/sound/soc/codecs/tas2764.c b/sound/soc/codecs/tas27xx.c similarity index 100% rename from sound/soc/codecs/tas2764.c rename to sound/soc/codecs/tas27xx.c diff --git a/sound/soc/codecs/tas2764.h b/sound/soc/codecs/tas27xx.h similarity index 100% rename from sound/soc/codecs/tas2764.h rename to sound/soc/codecs/tas27xx.h -- 2.35.1

2 3

[PATCH] ASoC: wm8524: remove rate constraint for FE-BE case
by Shengjiu Wang 12 Apr '22

12 Apr '22

The constraint is propagate to Front End Bitstream for Front End and Back End share same snd_soc_pcm_runtime. The constraint is not needed for Back End Bitstream when there is be_hw_params_fixup() defined. Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> Tested-by: Fabio Estevam <festevam(a)denx.de> --- sound/soc/codecs/wm8524.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/wm8524.c b/sound/soc/codecs/wm8524.c index 81f858f6bd67..442a59857875 100644 --- a/sound/soc/codecs/wm8524.c +++ b/sound/soc/codecs/wm8524.c @@ -61,6 +61,7 @@ static int wm8524_startup(struct snd_pcm_substream *substream, { struct snd_soc_component *component = dai->component; struct wm8524_priv *wm8524 = snd_soc_component_get_drvdata(component); + struct snd_soc_pcm_runtime *rtd = substream->private_data; /* The set of sample rates that can be supported depends on the * MCLK supplied to the CODEC - enforce this. @@ -71,9 +72,10 @@ static int wm8524_startup(struct snd_pcm_substream *substream, return -EINVAL; } - snd_pcm_hw_constraint_list(substream->runtime, 0, - SNDRV_PCM_HW_PARAM_RATE, - &wm8524->rate_constraint); + if (!rtd->dai_link->be_hw_params_fixup) + snd_pcm_hw_constraint_list(substream->runtime, 0, + SNDRV_PCM_HW_PARAM_RATE, + &wm8524->rate_constraint); gpiod_set_value_cansleep(wm8524->mute, 1); -- 2.17.1

3 3

[PATCH] ALSA: usb-audio: Limit max buffer and period sizes per time
by Takashi Iwai 12 Apr '22

12 Apr '22

In the previous fix, we increased the max buffer bytes from 1MB to 4MB so that we can use bigger buffers for the modern HiFi devices with higher rates, more channels and wider formats. OTOH, extending this has a concern that too big buffer is allowed for the lower rates, less channels and narrower formats; when an application tries to allocate as big buffer as possible, it'll lead to unexpectedly too huge size. Also, we had a problem about the inconsistent max buffer and period bytes for the implicit feedback mode when both streams have different channels. This was fixed by the (relatively complex) patch to reduce the max buffer and period bytes accordingly. This is an alternative fix for those, a patch to kill two birds with one stone (*): instead of increasing the max buffer bytes blindly and applying the reduction per channels, we simply use the hw constraints for the buffer and period "time". Meanwhile the max buffer and period bytes are set unlimited instead. Since the inconsistency of buffer (and period) bytes comes from the difference of the channels in the tied streams, as long as we care only about the buffer (and period) time, it doesn't matter; the buffer time is same for different channels, although we still allow higher buffer size. Similarly, this will allow more buffer bytes for HiFi devices while it also keeps the reasonable size for the legacy devices, too. As of this patch, the max period and buffer time are set to 1 and 2 seconds, which should be large enough for all possible use cases. (*) No animals were harmed in the making of this patch. Fixes: 98c27add5d96 ("ALSA: usb-audio: Cap upper limits of buffer/period bytes for implicit fb") Fixes: fee2ec8cceb3 ("ALSA: usb-audio: Increase max buffer size") Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- sound/usb/pcm.c | 101 +++++++----------------------------------------- 1 file changed, 14 insertions(+), 87 deletions(-) diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c index 37ee6df8b15a..6d699065e81a 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -659,9 +659,6 @@ static int snd_usb_pcm_prepare(struct snd_pcm_substream *substream) #define hwc_debug(fmt, args...) do { } while(0) #endif -#define MAX_BUFFER_BYTES (4 * 1024 * 1024) -#define MAX_PERIOD_BYTES (512 * 1024) - static const struct snd_pcm_hardware snd_usb_hardware = { .info = SNDRV_PCM_INFO_MMAP | @@ -672,9 +669,9 @@ static const struct snd_pcm_hardware snd_usb_hardware = SNDRV_PCM_INFO_PAUSE, .channels_min = 1, .channels_max = 256, - .buffer_bytes_max = MAX_BUFFER_BYTES, + .buffer_bytes_max = INT_MAX, /* limited by BUFFER_TIME later */ .period_bytes_min = 64, - .period_bytes_max = MAX_PERIOD_BYTES, + .period_bytes_max = INT_MAX, /* limited by PERIOD_TIME later */ .periods_min = 2, .periods_max = 1024, }; @@ -974,78 +971,6 @@ static int hw_rule_periods_implicit_fb(struct snd_pcm_hw_params *params, ep->cur_buffer_periods); } -/* get the adjusted max buffer (or period) bytes that can fit with the - * paired format for implicit fb - */ -static unsigned int -get_adjusted_max_bytes(struct snd_usb_substream *subs, - struct snd_usb_substream *pair, - struct snd_pcm_hw_params *params, - unsigned int max_bytes, - bool reverse_map) -{ - const struct audioformat *fp, *pp; - unsigned int rmax = 0, r; - - list_for_each_entry(fp, &subs->fmt_list, list) { - if (!fp->implicit_fb) - continue; - if (!reverse_map && - !hw_check_valid_format(subs, params, fp)) - continue; - list_for_each_entry(pp, &pair->fmt_list, list) { - if (pp->iface != fp->sync_iface || - pp->altsetting != fp->sync_altsetting || - pp->ep_idx != fp->sync_ep_idx) - continue; - if (reverse_map && - !hw_check_valid_format(pair, params, pp)) - break; - if (!reverse_map && pp->channels > fp->channels) - r = max_bytes * fp->channels / pp->channels; - else if (reverse_map && pp->channels < fp->channels) - r = max_bytes * pp->channels / fp->channels; - else - r = max_bytes; - rmax = max(rmax, r); - break; - } - } - return rmax; -} - -/* Reduce the period or buffer bytes depending on the paired substream; - * when a paired configuration for implicit fb has a higher number of channels, - * we need to reduce the max size accordingly, otherwise it may become unusable - */ -static int hw_rule_bytes_implicit_fb(struct snd_pcm_hw_params *params, - struct snd_pcm_hw_rule *rule) -{ - struct snd_usb_substream *subs = rule->private; - struct snd_usb_substream *pair; - struct snd_interval *it; - unsigned int max_bytes; - unsigned int rmax; - - pair = &subs->stream->substream[!subs->direction]; - if (!pair->ep_num) - return 0; - - if (rule->var == SNDRV_PCM_HW_PARAM_PERIOD_BYTES) - max_bytes = MAX_PERIOD_BYTES; - else - max_bytes = MAX_BUFFER_BYTES; - - rmax = get_adjusted_max_bytes(subs, pair, params, max_bytes, false); - if (!rmax) - rmax = get_adjusted_max_bytes(pair, subs, params, max_bytes, true); - if (!rmax) - return 0; - - it = hw_param_interval(params, rule->var); - return apply_hw_params_minmax(it, 0, rmax); -} - /* * set up the runtime hardware information. */ @@ -1139,6 +1064,18 @@ static int setup_hw_info(struct snd_pcm_runtime *runtime, struct snd_usb_substre return err; } + /* set max period and buffer sizes for 1 and 2 seconds, respectively */ + err = snd_pcm_hw_constraint_minmax(runtime, + SNDRV_PCM_HW_PARAM_PERIOD_TIME, + 0, 1000000); + if (err < 0) + return err; + err = snd_pcm_hw_constraint_minmax(runtime, + SNDRV_PCM_HW_PARAM_BUFFER_TIME, + 0, 2000000); + if (err < 0) + return err; + /* additional hw constraints for implicit fb */ err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_FORMAT, hw_rule_format_implicit_fb, subs, @@ -1160,16 +1097,6 @@ static int setup_hw_info(struct snd_pcm_runtime *runtime, struct snd_usb_substre SNDRV_PCM_HW_PARAM_PERIODS, -1); if (err < 0) return err; - err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_BUFFER_BYTES, - hw_rule_bytes_implicit_fb, subs, - SNDRV_PCM_HW_PARAM_BUFFER_BYTES, -1); - if (err < 0) - return err; - err = snd_pcm_hw_rule_add(runtime, 0, SNDRV_PCM_HW_PARAM_PERIOD_BYTES, - hw_rule_bytes_implicit_fb, subs, - SNDRV_PCM_HW_PARAM_PERIOD_BYTES, -1); - if (err < 0) - return err; list_for_each_entry(fp, &subs->fmt_list, list) { if (fp->implicit_fb) { -- 2.34.1

1 0

[PATCH 0/2] ALSA: echoaudio: Fix the probe error handling
by Takashi Iwai 12 Apr '22

12 Apr '22

Hi, this is a patch set to address the regression of the error handling in the echoaudio driver probe phase. Similar error patterns are seen in other drivers, and the newly introduced helper will be used later for those, too. Takashi === Takashi Iwai (2): ALSA: core: Add snd_card_free_on_error() helper ALSA: echoaudio: Fix the missing snd_card_free() call at probe error include/sound/core.h | 1 + sound/core/init.c | 28 ++++++++++++++++++++++++++++ sound/pci/echoaudio/echoaudio.c | 9 +++++++-- 3 files changed, 36 insertions(+), 2 deletions(-) -- 2.31.1

2 4

[PATCH v2 1/2] rename tas2764 to tas27xx
by Raphael-Xu 12 Apr '22

12 Apr '22

rename tas2764.yaml to tas27xx.yaml Signed-off-by: Raphael-Xu <13691752556(a)139.com> --- .../devicetree/bindings/sound/{tas2764.yaml => tas27xx.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Documentation/devicetree/bindings/sound/{tas2764.yaml => tas27xx.yaml} (100%) diff --git a/Documentation/devicetree/bindings/sound/tas2764.yaml b/Documentation/devicetree/bindings/sound/tas27xx.yaml similarity index 100% rename from Documentation/devicetree/bindings/sound/tas2764.yaml rename to Documentation/devicetree/bindings/sound/tas27xx.yaml -- 2.35.1

2 2