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

[PATCH] ALSA: pcm: fix ELD constraints for (E)AC3, DTS(-HD) and MLP formats
by Matthias Reichl 25 Jun '23

25 Jun '23

The SADs of compressed formats contain the channel and sample rate info of the audio data inside the compressed stream, but when building constraints we must use the rates and channels used to transport the compressed streams. eg 48kHz 6ch EAC3 needs to be transmitted as a 2ch 192kHz stream. This patch fixes the constraints for the common AC3 and DTS formats, the constraints for the less common MPEG, DSD etc formats are copied directly from the info in the SADs as before as I don't have the specs and equipment to test those. Signed-off-by: Matthias Reichl <hias(a)horus.com> --- sound/core/pcm_drm_eld.c | 73 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 70 insertions(+), 3 deletions(-) diff --git a/sound/core/pcm_drm_eld.c b/sound/core/pcm_drm_eld.c index 4b5faae5d16e5..07075071972dd 100644 --- a/sound/core/pcm_drm_eld.c +++ b/sound/core/pcm_drm_eld.c @@ -2,11 +2,25 @@ /* * PCM DRM helpers */ +#include <linux/bitfield.h> #include <linux/export.h> +#include <linux/hdmi.h> #include <drm/drm_edid.h> #include <sound/pcm.h> #include <sound/pcm_drm_eld.h> +#define SAD0_CHANNELS_MASK GENMASK(2, 0) /* max number of channels - 1 */ +#define SAD0_FORMAT_MASK GENMASK(6, 3) /* audio format */ + +#define SAD1_RATE_MASK GENMASK(6, 0) /* bitfield of supported rates */ +#define SAD1_RATE_32000_MASK BIT(0) +#define SAD1_RATE_44100_MASK BIT(1) +#define SAD1_RATE_48000_MASK BIT(2) +#define SAD1_RATE_88200_MASK BIT(3) +#define SAD1_RATE_96000_MASK BIT(4) +#define SAD1_RATE_176400_MASK BIT(5) +#define SAD1_RATE_192000_MASK BIT(6) + static const unsigned int eld_rates[] = { 32000, 44100, @@ -17,9 +31,62 @@ static const unsigned int eld_rates[] = { 192000, }; +static unsigned int map_rate_families(const u8 *sad, + unsigned int mask_32000, + unsigned int mask_44100, + unsigned int mask_48000) +{ + unsigned int rate_mask = 0; + + if (sad[1] & SAD1_RATE_32000_MASK) + rate_mask |= mask_32000; + if (sad[1] & (SAD1_RATE_44100_MASK | SAD1_RATE_88200_MASK | SAD1_RATE_176400_MASK)) + rate_mask |= mask_44100; + if (sad[1] & (SAD1_RATE_48000_MASK | SAD1_RATE_96000_MASK | SAD1_RATE_192000_MASK)) + rate_mask |= mask_48000; + return rate_mask; +} + +static unsigned int sad_rate_mask(const u8 *sad) +{ + switch (FIELD_GET(SAD0_FORMAT_MASK, sad[0])) { + case HDMI_AUDIO_CODING_TYPE_PCM: + return sad[1] & SAD1_RATE_MASK; + case HDMI_AUDIO_CODING_TYPE_AC3: + case HDMI_AUDIO_CODING_TYPE_DTS: + return map_rate_families(sad, + SAD1_RATE_32000_MASK, + SAD1_RATE_44100_MASK, + SAD1_RATE_48000_MASK); + case HDMI_AUDIO_CODING_TYPE_EAC3: + case HDMI_AUDIO_CODING_TYPE_DTS_HD: + case HDMI_AUDIO_CODING_TYPE_MLP: + return map_rate_families(sad, + 0, + SAD1_RATE_176400_MASK, + SAD1_RATE_192000_MASK); + default: + /* TODO adjust for other compressed formats as well */ + return sad[1] & SAD1_RATE_MASK; + } +} + static unsigned int sad_max_channels(const u8 *sad) { - return 1 + (sad[0] & 7); + switch (FIELD_GET(SAD0_FORMAT_MASK, sad[0])) { + case HDMI_AUDIO_CODING_TYPE_PCM: + return 1 + FIELD_GET(SAD0_CHANNELS_MASK, sad[0]); + case HDMI_AUDIO_CODING_TYPE_AC3: + case HDMI_AUDIO_CODING_TYPE_DTS: + case HDMI_AUDIO_CODING_TYPE_EAC3: + return 2; + case HDMI_AUDIO_CODING_TYPE_DTS_HD: + case HDMI_AUDIO_CODING_TYPE_MLP: + return 8; + default: + /* TODO adjust for other compressed formats as well */ + return 1 + FIELD_GET(SAD0_CHANNELS_MASK, sad[0]); + } } static int eld_limit_rates(struct snd_pcm_hw_params *params, @@ -42,7 +109,7 @@ static int eld_limit_rates(struct snd_pcm_hw_params *params, * requested number of channels. */ if (c->min <= max_channels) - rate_mask |= sad[1]; + rate_mask |= sad_rate_mask(sad); } } @@ -70,7 +137,7 @@ static int eld_limit_channels(struct snd_pcm_hw_params *params, rate_mask |= BIT(i); for (i = drm_eld_sad_count(eld); i > 0; i--, sad += 3) - if (rate_mask & sad[1]) + if (rate_mask & sad_rate_mask(sad)) t.max = max(t.max, sad_max_channels(sad)); } -- 2.39.2

3 4

[PATCH v2 RESEND] ASoC: fsl MPC52xx drivers require PPC_BESTCOMM
by Randy Dunlap 25 Jun '23

25 Jun '23

Both SND_MPC52xx_SOC_PCM030 and SND_MPC52xx_SOC_EFIKA select SND_SOC_MPC5200_AC97. The latter symbol depends on PPC_BESTCOMM, so the 2 former symbols should also depend on PPC_BESTCOMM since "select" does not follow any dependency chains. This prevents a kconfig warning and build errors: WARNING: unmet direct dependencies detected for SND_SOC_MPC5200_AC97 Depends on [n]: SOUND [=y] && !UML && SND [=m] && SND_SOC [=m] && SND_POWERPC_SOC [=m] && PPC_MPC52xx [=y] && PPC_BESTCOMM [=n] Selected by [m]: - SND_MPC52xx_SOC_PCM030 [=m] && SOUND [=y] && !UML && SND [=m] && SND_SOC [=m] && SND_POWERPC_SOC [=m] && PPC_MPC5200_SIMPLE [=y] - SND_MPC52xx_SOC_EFIKA [=m] && SOUND [=y] && !UML && SND [=m] && SND_SOC [=m] && SND_POWERPC_SOC [=m] && PPC_EFIKA [=y] ERROR: modpost: "mpc5200_audio_dma_destroy" [sound/soc/fsl/mpc5200_psc_ac97.ko] undefined! ERROR: modpost: "mpc5200_audio_dma_create" [sound/soc/fsl/mpc5200_psc_ac97.ko] undefined! Fixes: 40d9ec14e7e1 ("ASoC: remove BROKEN from Efika and pcm030 fabric drivers") Signed-off-by: Randy Dunlap <rdunlap(a)infradead.org> Cc: Grant Likely <grant.likely(a)secretlab.ca> Cc: Mark Brown <broonie(a)kernel.org> Cc: Liam Girdwood <lgirdwood(a)gmail.com> Cc: Shengjiu Wang <shengjiu.wang(a)gmail.com> Cc: Xiubo Li <Xiubo.Lee(a)gmail.com> Cc: alsa-devel(a)alsa-project.org Cc: linuxppc-dev(a)lists.ozlabs.org Cc: Jaroslav Kysela <perex(a)perex.cz> Cc: Takashi Iwai <tiwai(a)suse.com> --- v2: use correct email address for Mark Brown. sound/soc/fsl/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -- a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -243,7 +243,7 @@ config SND_SOC_MPC5200_AC97 config SND_MPC52xx_SOC_PCM030 tristate "SoC AC97 Audio support for Phytec pcm030 and WM9712" - depends on PPC_MPC5200_SIMPLE + depends on PPC_MPC5200_SIMPLE && PPC_BESTCOMM select SND_SOC_MPC5200_AC97 select SND_SOC_WM9712 help @@ -252,7 +252,7 @@ config SND_MPC52xx_SOC_PCM030 config SND_MPC52xx_SOC_EFIKA tristate "SoC AC97 Audio support for bbplan Efika and STAC9766" - depends on PPC_EFIKA + depends on PPC_EFIKA && PPC_BESTCOMM select SND_SOC_MPC5200_AC97 select SND_SOC_STAC9766 help

2 3

Focusrite Scarlett 2i2 3rd Gen suffers from high output latency with the 1.2.9-1 update
by GitHub issues - edited 25 Jun '23

25 Jun '23

alsa-project/alsa-ucm-conf issue #329 was edited from IsaacLambat: Hello, I have recently upgraded from `alsa-ucm-conf 1.2.8-1` to `1.2.9-1` and this has caused some latency of around 1/2 seconds for outputting audio via the `Focusrite Scarlett 2i2 3rd Gen` with is connected the computer via USB. No latency is introduced when plugging wired headphones directly in to the motherboard so this seems to be isolated to the device. I noticed the change logs indicate better support for this device was added in this version (which is great!) so these changes may have affected the existing settings of the headphones. I have downgraded only `alsa-ucm-conf` to `1.2.8-1` and the output has no latency so I am using this as a workaround. I use PulseAudio with ALSA on Arch Linux. Versions: ``` alsa-card-profiles - 0.3.71 alsa-lib - 1.2.9 alsa-ucm-conf - 1.2.9 alsa-utils - 1.2.9 pulseaudio - 16.1 Arch Linux - 6.3.9-arch1-1 ``` dmesg detects the product as `Scarlett 2i2 USB` Please let me know if any more information is needed (such as logs or config files) and if there is anything I should try. Many thanks :D Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/329 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH v2 00/45] Add support for sam9x7 SoC family
by Varshini Rajendran 24 Jun '23

24 Jun '23

This patch series adds support for the new SoC family - sam9x7. - The device tree, configs and drivers are added - Clock driver for sam9x7 is added - Support for basic peripherals is added - Target board SAM9X75 Curiosity is added Changes in v2: -------------- - Added sam9x7 specific compatibles in DT with fallbacks - Documented all the newly added DT compatible strings - Added device tree for the target board sam9x75 curiosity and documented the same in the DT bindings documentation - Removed the dt nodes that are not supported at the moment - Removed the configs added by previous version that are not supported at the moment - Fixed all the corrections in the commit message - Changed all the instances of copyright year to 2023 - Added sam9x7 flag in PIT64B configuration - Moved macro definitions to header file - Added another divider in mck characteristics in the pmc driver - Fixed the memory leak in the pmc driver - Dropped patches that are no longer needed - Picked up Acked-by and Reviewed-by tags Hari Prasath (1): irqchip/atmel-aic5: Add support for sam9x7 aic Varshini Rajendran (44): dt-bindings: microchip: atmel,at91rm9200-tcb: add sam9x60, sam9x7 compatible dt-bindings: usb: ehci: Add atmel at91sam9g45-ehci compatible dt-bindings: usb: generic-ehci: Document clock-names property dt-bindings: net: cdns,macb: add documentation for sam9x7 ethernet interface ARM: at91: pm: add support for sam9x7 SoC family ARM: at91: pm: add sam9x7 SoC init config ARM: at91: add support in SoC driver for new sam9x7 clk: at91: clk-sam9x60-pll: re-factor to support individual core freq outputs clk: at91: sam9x7: add support for HW PLL freq dividers clk: at91: sama7g5: move mux table macros to header file dt-bindings: clk: at91: add bindings for SAM9X7's clock controller dt-bindings: reset: atmel,at91sam9260-reset: add sam9x7 binding dt-bindings: atmel-sysreg: add bindings for sam9x7 dt-bindings: crypto: add bindings for sam9x7 in Atmel AES dt-bindings: crypto: add bindings for sam9x7 in Atmel SHA dt-bindings: crypto: add bindings for sam9x7 in Atmel TDES dt-bindings: dmaengine: at_xdmac: add compatible with microchip,sam9x7 dt-bindings: i2c: at91: Add SAM9X7 compatible string dt-bindings: mfd: at91: Add SAM9X7 compatible string dt-bindings: atmel-gpbr: add microchip,sam9x7-gpbr dt-bindings: atmel-matrix: add microchip,sam9x7-matrix dt-bindings: atmel-smc: add microchip,sam9x7-smc dt-bindings: atmel-ssc: add microchip,sam9x7-ssc dt-bindings: sdhci-of-at91: add microchip,sam9x7-sdhci dt-bindings: atmel-nand: add microchip,sam9x7-pmecc dt-bindings: pinctrl: at91: add bindings for SAM9X7 dt-bindings: rng: atmel,at91-trng: document sam9x7 TRNG dt-bindings: rtc: at91rm9200: add sam9x7 compatible dt-bindings: rtt: at91rm9260: add sam9x7 compatible dt-bindings: serial: atmel,at91-usart: add compatible for sam9x7 dt-bindings: atmel-classd: add sam9x7 compatible spi: dt-bindings: atmel,at91rm9200-spi: add sam9x7 compatible dt-bindings: usb: atmel: Update DT bindings documentation for sam9x7 dt-bindings: watchdog: sama5d4-wdt: add compatible for sam9x7-wdt dt-bindings: irqchip/atmel-aic5: Add support for sam9x7 aic clk: at91: sam9x7: add sam9x7 pmc driver power: reset: at91-poweroff: lookup for proper pmc dt node for sam9x7 power: reset: at91-reset: add reset support for sam9x7 SoC power: reset: at91-reset: add sdhwc support for sam9x7 SoC ARM: at91: Kconfig: add config flag for SAM9X7 SoC ARM: configs: at91: enable config flags for sam9x7 SoC family ARM: dts: at91: sam9x7: add device tree for SoC dt-bindings: arm: add sam9x75 curiosity board ARM: dts: at91: sam9x75_curiosity: add device tree for sam9x75 curiosity board .../devicetree/bindings/arm/atmel-at91.yaml | 6 + .../devicetree/bindings/arm/atmel-sysregs.txt | 7 +- .../devicetree/bindings/clock/at91-clock.txt | 7 +- .../crypto/atmel,at91sam9g46-aes.yaml | 5 +- .../crypto/atmel,at91sam9g46-sha.yaml | 5 +- .../crypto/atmel,at91sam9g46-tdes.yaml | 5 +- .../devicetree/bindings/dma/atmel-xdma.txt | 4 +- .../bindings/i2c/atmel,at91sam-i2c.yaml | 3 + .../interrupt-controller/atmel,aic.txt | 2 +- .../devicetree/bindings/mfd/atmel-flexcom.txt | 2 +- .../devicetree/bindings/mfd/atmel-gpbr.txt | 1 + .../devicetree/bindings/mfd/atmel-matrix.txt | 1 + .../devicetree/bindings/mfd/atmel-smc.txt | 1 + .../devicetree/bindings/misc/atmel-ssc.txt | 1 + .../devicetree/bindings/mmc/sdhci-atmel.txt | 4 +- .../devicetree/bindings/mtd/atmel-nand.txt | 1 + .../devicetree/bindings/net/cdns,macb.yaml | 1 + .../bindings/pinctrl/atmel,at91-pinctrl.txt | 3 +- .../reset/atmel,at91sam9260-reset.yaml | 1 + .../bindings/rng/atmel,at91-trng.yaml | 1 + .../bindings/rtc/atmel,at91rm9200-rtc.yaml | 1 + .../bindings/rtc/atmel,at91sam9260-rtt.yaml | 1 + .../bindings/serial/atmel,at91-usart.yaml | 3 + .../soc/microchip/atmel,at91rm9200-tcb.yaml | 2 + .../bindings/sound/atmel,sama5d2-classd.yaml | 5 +- .../bindings/spi/atmel,at91rm9200-spi.yaml | 1 + .../devicetree/bindings/usb/atmel-usb.txt | 9 +- .../devicetree/bindings/usb/generic-ehci.yaml | 5 + .../bindings/watchdog/atmel,sama5d4-wdt.yaml | 1 + arch/arm/boot/dts/Makefile | 2 + arch/arm/boot/dts/at91-sam9x75_curiosity.dts | 336 +++++ arch/arm/boot/dts/sam9x7.dtsi | 1237 +++++++++++++++++ arch/arm/configs/at91_dt_defconfig | 1 + arch/arm/mach-at91/Kconfig | 23 +- arch/arm/mach-at91/Makefile | 1 + arch/arm/mach-at91/generic.h | 2 + arch/arm/mach-at91/pm.c | 35 + arch/arm/mach-at91/sam9x7.c | 34 + drivers/clk/at91/Makefile | 1 + drivers/clk/at91/clk-sam9x60-pll.c | 50 +- drivers/clk/at91/pmc.h | 18 + drivers/clk/at91/sam9x60.c | 7 + drivers/clk/at91/sam9x7.c | 942 +++++++++++++ drivers/clk/at91/sama7g5.c | 42 +- drivers/irqchip/irq-atmel-aic5.c | 10 + drivers/power/reset/Kconfig | 4 +- drivers/power/reset/at91-sama5d2_shdwc.c | 1 + drivers/soc/atmel/soc.c | 23 + drivers/soc/atmel/soc.h | 9 + 49 files changed, 2806 insertions(+), 61 deletions(-) create mode 100644 arch/arm/boot/dts/at91-sam9x75_curiosity.dts create mode 100644 arch/arm/boot/dts/sam9x7.dtsi create mode 100644 arch/arm/mach-at91/sam9x7.c create mode 100644 drivers/clk/at91/sam9x7.c -- 2.25.1

4 82

[PATCH] ASoC: tas2781: Fix error code in tas2781_load_calibration()
by Dan Carpenter 24 Jun '23

24 Jun '23

Return -EINVAL instead of success on this error path. Fixes: 915f5eadebd2 ("ASoC: tas2781: firmware lib") Signed-off-by: Dan Carpenter <dan.carpenter(a)linaro.org> --- sound/soc/codecs/tas2781-fmwlib.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/codecs/tas2781-fmwlib.c b/sound/soc/codecs/tas2781-fmwlib.c index cbf0aef2c001..eb55abae0d7b 100644 --- a/sound/soc/codecs/tas2781-fmwlib.c +++ b/sound/soc/codecs/tas2781-fmwlib.c @@ -1924,6 +1924,7 @@ int tas2781_load_calibration(void *context, char *file_name, if (!fw_entry->size) { dev_err(tas_priv->dev, "%s: file read error: size = %lu\n", __func__, (unsigned long)fw_entry->size); + ret = -EINVAL; goto out; } fmw.size = fw_entry->size; -- 2.39.2

2 1

Focusrite Scarlett 2i2 3rd Gen suffers from high output latency with the 1.2.9-1 update
by GitHub issues - edited 23 Jun '23

23 Jun '23

alsa-project/alsa-ucm-conf issue #329 was edited from IsaacLambat: Hello, I have recently upgraded from `alsa-ucm-conf 1.2.8-1` to `1.2.9-1` and this has caused some latency of around 1 second for outputting audio via the `Focusrite Scarlett 2i2 3rd Gen` with is connected the computer via USB. No latency is introduced when plugging wired headphones directly in to the motherboard so this seems to be isolated to the device. I noticed the change logs indicate better support for this device was added in this version (which is great!) so these changes may have affected the existing settings of the headphones. I have downgraded only `alsa-ucm-conf` to `1.2.8-1` and the output has no latency so I am using this as a workaround. I use PulseAudio with ALSA on Arch Linux. Versions: ``` alsa-card-profiles - 0.3.71 alsa-lib - 1.2.9 alsa-ucm-conf - 1.2.9 alsa-utils - 1.2.9 pulseaudio - 16.1 Arch Linux - 6.3.9-arch1-1 ``` dmesg detects the product as `Scarlett 2i2 USB` Please let me know if any more information is needed (such as logs or config files) and if there is anything I should try. Many thanks :D Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/329 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Focusrite Scarlett 2i2 3rd Gen suffers from high output latency with the 1.2.9-1 update
by GitHub issues - opened 23 Jun '23

23 Jun '23

alsa-project/alsa-ucm-conf issue #329 was opened from IsaacLambat: Hello, I have recently upgraded from `alsa-ucm-conf 1.2.8-1` to `1.2.9-1` and this has caused some latency of around 1 second for outputting audio via the `Focusrite Scarlett 2i2 3rd Gen` with is connected the computer via USB. No latency is introduced when plugging wired headphones directly in to the motherboard so this seems to be isolated to the device. I noticed the change logs indicate better support for this device was added in this version (which is great!) so these changes may have affected the existing settings of the headphones. I have downgraded only `alsa-ucm-conf` to `1.2.8-1` and the output has no latency so I am using this as a workaround. I use PulseAudio with ALSA on Arch Linux. Versions: ``` alsa-card-profiles - 0.3.71 alsa-lib - 1.2.9 alsa-ucm-conf - 1.2.9 alsa-utils - 1.2.9 pulseaudio - 16.1 Arch Linux - 6.3.9-arch1-1 ``` Please let me know if any more information is needed (such as logs or config files) and if there is anything I should try. Many thanks :D Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/329 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH 01/12] ASoC: amd: acp: clear pdm dma interrupt mask
by Syed Saba Kareem 23 Jun '23

23 Jun '23

Clear pdm dma interrupt mask in acp_dmic_shutdown(). 'Fixes: c32bd332ce5c9 ("ASoC: amd: acp: Add generic support for PDM controller on ACP")' Signed-off-by: Syed Saba Kareem <Syed.SabaKareem(a)amd.com> --- sound/soc/amd/acp/acp-pdm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/amd/acp/acp-pdm.c b/sound/soc/amd/acp/acp-pdm.c index 66ec6b6a5972..f8030b79ac17 100644 --- a/sound/soc/amd/acp/acp-pdm.c +++ b/sound/soc/amd/acp/acp-pdm.c @@ -176,7 +176,7 @@ static void acp_dmic_dai_shutdown(struct snd_pcm_substream *substream, /* Disable DMIC interrupts */ ext_int_ctrl = readl(ACP_EXTERNAL_INTR_CNTL(adata, 0)); - ext_int_ctrl |= ~PDM_DMA_INTR_MASK; + ext_int_ctrl &= ~PDM_DMA_INTR_MASK; writel(ext_int_ctrl, ACP_EXTERNAL_INTR_CNTL(adata, 0)); } -- 2.25.1

4 27

[PATCH] ALSA: ump: Export MIDI1 / UMP conversion helpers
by Takashi Iwai 23 Jun '23

23 Jun '23

Yet more preliminary work for the upcoming USB gadget support. Now export the helpers to convert between legacy MIDI1 and UMP data for handling the MIDI 1.0 USB interface. The header file is moved to include/sound. The API functions are slightly changed, so that they can be used without the direct access to snd_ump object. The allocation is done in ump.c itself as it's a simple kcalloc(). Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- include/sound/ump_convert.h | 46 +++++++++++++++++++++ sound/core/ump.c | 18 ++++----- sound/core/ump_convert.c | 80 ++++++++++++++++--------------------- sound/core/ump_convert.h | 43 -------------------- 4 files changed, 89 insertions(+), 98 deletions(-) create mode 100644 include/sound/ump_convert.h delete mode 100644 sound/core/ump_convert.h diff --git a/include/sound/ump_convert.h b/include/sound/ump_convert.h new file mode 100644 index 000000000000..28c364c63245 --- /dev/null +++ b/include/sound/ump_convert.h @@ -0,0 +1,46 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +#ifndef __SOUND_UMP_CONVERT_H +#define __SOUND_UMP_CONVERT_H + +#include <sound/ump_msg.h> + +/* context for converting from legacy control messages to UMP packet */ +struct ump_cvt_to_ump_bank { + bool rpn_set; + bool nrpn_set; + bool bank_set; + unsigned char cc_rpn_msb, cc_rpn_lsb; + unsigned char cc_nrpn_msb, cc_nrpn_lsb; + unsigned char cc_data_msb, cc_data_lsb; + unsigned char cc_bank_msb, cc_bank_lsb; +}; + +/* context for converting from MIDI1 byte stream to UMP packet */ +struct ump_cvt_to_ump { + /* MIDI1 intermediate buffer */ + unsigned char buf[4]; + int len; + int cmd_bytes; + + /* UMP output packet */ + u32 ump[4]; + int ump_bytes; + + /* various status */ + unsigned int in_sysex; + struct ump_cvt_to_ump_bank bank[16]; /* per channel */ +}; + +int snd_ump_convert_from_ump(const u32 *data, unsigned char *dst, + unsigned char *group_ret); +void snd_ump_convert_to_ump(struct ump_cvt_to_ump *cvt, unsigned char group, + unsigned int protocol, unsigned char c); + +/* reset the converter context, called at each open to ump */ +static inline void snd_ump_convert_reset(struct ump_cvt_to_ump *ctx) +{ + memset(ctx, 0, sizeof(*ctx)); + +} + +#endif /* __SOUND_UMP_CONVERT_H */ diff --git a/sound/core/ump.c b/sound/core/ump.c index 5e17351ca984..246348766ec1 100644 --- a/sound/core/ump.c +++ b/sound/core/ump.c @@ -11,7 +11,7 @@ #include <sound/core.h> #include <sound/rawmidi.h> #include <sound/ump.h> -#include "ump_convert.h" +#include <sound/ump_convert.h> #define ump_err(ump, fmt, args...) dev_err(&(ump)->core.dev, fmt, ##args) #define ump_warn(ump, fmt, args...) dev_warn(&(ump)->core.dev, fmt, ##args) @@ -87,7 +87,7 @@ static void snd_ump_endpoint_free(struct snd_rawmidi *rmidi) ump->private_free(ump); #if IS_ENABLED(CONFIG_SND_UMP_LEGACY_RAWMIDI) - snd_ump_convert_free(ump); + kfree(ump->out_cvts); #endif } @@ -1002,7 +1002,7 @@ static int snd_ump_legacy_open(struct snd_rawmidi_substream *substream) goto unlock; } ump->legacy_out_opens++; - snd_ump_reset_convert_to_ump(ump, group); + snd_ump_convert_reset(&ump->out_cvts[group]); } spin_lock_irq(&ump->legacy_locks[dir]); ump->legacy_substreams[dir][group] = substream; @@ -1091,7 +1091,7 @@ static int process_legacy_output(struct snd_ump_endpoint *ump, ctx = &ump->out_cvts[group]; while (!ctx->ump_bytes && snd_rawmidi_transmit(substream, &c, 1) > 0) - snd_ump_convert_to_ump(ump, group, c); + snd_ump_convert_to_ump(ctx, group, ump->info.protocol, c); if (ctx->ump_bytes && ctx->ump_bytes <= count) { size = ctx->ump_bytes; memcpy(buffer, ctx->ump, size); @@ -1113,7 +1113,7 @@ static void process_legacy_input(struct snd_ump_endpoint *ump, const u32 *src, const int dir = SNDRV_RAWMIDI_STREAM_INPUT; int size; - size = snd_ump_convert_from_ump(ump, src, buf, &group); + size = snd_ump_convert_from_ump(src, buf, &group); if (size <= 0) return; spin_lock_irqsave(&ump->legacy_locks[dir], flags); @@ -1130,9 +1130,9 @@ int snd_ump_attach_legacy_rawmidi(struct snd_ump_endpoint *ump, bool input, output; int err; - err = snd_ump_convert_init(ump); - if (err < 0) - return err; + ump->out_cvts = kcalloc(16, sizeof(*ump->out_cvts), GFP_KERNEL); + if (!ump->out_cvts) + return -ENOMEM; input = ump->core.info_flags & SNDRV_RAWMIDI_INFO_INPUT; output = ump->core.info_flags & SNDRV_RAWMIDI_INFO_OUTPUT; @@ -1140,7 +1140,7 @@ int snd_ump_attach_legacy_rawmidi(struct snd_ump_endpoint *ump, output ? 16 : 0, input ? 16 : 0, &rmidi); if (err < 0) { - snd_ump_convert_free(ump); + kfree(ump->out_cvts); return err; } diff --git a/sound/core/ump_convert.c b/sound/core/ump_convert.c index 48ab3e1bd62e..fb61df424a87 100644 --- a/sound/core/ump_convert.c +++ b/sound/core/ump_convert.c @@ -8,7 +8,7 @@ #include <sound/core.h> #include <sound/asound.h> #include <sound/ump.h> -#include "ump_convert.h" +#include <sound/ump_convert.h> /* * Upgrade / downgrade value bits @@ -205,12 +205,18 @@ static int cvt_ump_sysex7_to_legacy(const u32 *data, unsigned char *buf) return size; } -/* convert from a UMP packet @data to MIDI 1.0 bytes at @buf; - * the target group is stored at @group_ret, - * returns the number of bytes of MIDI 1.0 stream +/** + * snd_ump_convert_from_ump - convert from UMP to legacy MIDI + * @data: UMP packet + * @buf: buffer to store legacy MIDI data + * @group_ret: pointer to store the target group + * + * Convert from a UMP packet @data to MIDI 1.0 bytes at @buf. + * The target group is stored at @group_ret. + * + * The function returns the number of bytes of MIDI 1.0 stream. */ -int snd_ump_convert_from_ump(struct snd_ump_endpoint *ump, - const u32 *data, +int snd_ump_convert_from_ump(const u32 *data, unsigned char *buf, unsigned char *group_ret) { @@ -230,6 +236,7 @@ int snd_ump_convert_from_ump(struct snd_ump_endpoint *ump, return 0; } +EXPORT_SYMBOL_GPL(snd_ump_convert_from_ump); /* * MIDI 1 byte stream -> UMP conversion @@ -302,10 +309,10 @@ static void fill_rpn(struct ump_cvt_to_ump_bank *cc, } /* convert to a MIDI 1.0 Channel Voice message */ -static int cvt_legacy_cmd_to_ump(struct snd_ump_endpoint *ump, - struct ump_cvt_to_ump *cvt, - unsigned char group, u32 *data, - unsigned char bytes) +static int cvt_legacy_cmd_to_ump(struct ump_cvt_to_ump *cvt, + unsigned char group, + unsigned int protocol, + u32 *data, unsigned char bytes) { const unsigned char *buf = cvt->buf; struct ump_cvt_to_ump_bank *cc; @@ -316,7 +323,7 @@ static int cvt_legacy_cmd_to_ump(struct snd_ump_endpoint *ump, BUILD_BUG_ON(sizeof(union snd_ump_midi2_msg) != 8); /* for MIDI 1.0 UMP, it's easy, just pack it into UMP */ - if (ump->info.protocol & SNDRV_UMP_EP_INFO_PROTO_MIDI1) { + if (protocol & SNDRV_UMP_EP_INFO_PROTO_MIDI1) { data[0] = ump_compose(UMP_MSG_TYPE_MIDI1_CHANNEL_VOICE, group, 0, buf[0]); data[0] |= buf[1] << 8; @@ -413,8 +420,8 @@ static int cvt_legacy_cmd_to_ump(struct snd_ump_endpoint *ump, return 8; } -static int do_convert_to_ump(struct snd_ump_endpoint *ump, - unsigned char group, unsigned char c, u32 *data) +static int do_convert_to_ump(struct ump_cvt_to_ump *cvt, unsigned char group, + unsigned int protocol, unsigned char c, u32 *data) { /* bytes for 0x80-0xf0 */ static unsigned char cmd_bytes[8] = { @@ -424,7 +431,6 @@ static int do_convert_to_ump(struct snd_ump_endpoint *ump, static unsigned char system_bytes[16] = { 0, 2, 3, 2, 0, 0, 1, 0, 1, 1, 1, 1, 0, 0, 1, 1 }; - struct ump_cvt_to_ump *cvt = &ump->out_cvts[group]; unsigned char bytes; if (c == UMP_MIDI1_MSG_SYSEX_START) { @@ -478,40 +484,22 @@ static int do_convert_to_ump(struct snd_ump_endpoint *ump, cvt->len = 1; if ((cvt->buf[0] & 0xf0) == UMP_MIDI1_MSG_REALTIME) return cvt_legacy_system_to_ump(cvt, group, data); - return cvt_legacy_cmd_to_ump(ump, cvt, group, data, cvt->cmd_bytes); + return cvt_legacy_cmd_to_ump(cvt, group, protocol, data, cvt->cmd_bytes); } -/* feed a MIDI 1.0 byte @c and convert to a UMP packet; - * the target group is @group, - * the result is stored in out_cvts[group].ump[] and out_cvts[group].ump_bytes +/** + * snd_ump_convert_to_ump - convert legacy MIDI byte to UMP packet + * @cvt: converter context + * @group: target UMP group + * @protocol: target UMP protocol + * @c: MIDI 1.0 byte data + * + * Feed a MIDI 1.0 byte @c and convert to a UMP packet if completed. + * The result is stored in the buffer in @cvt. */ -void snd_ump_convert_to_ump(struct snd_ump_endpoint *ump, - unsigned char group, unsigned char c) +void snd_ump_convert_to_ump(struct ump_cvt_to_ump *cvt, unsigned char group, + unsigned int protocol, unsigned char c) { - struct ump_cvt_to_ump *cvt = &ump->out_cvts[group]; - - cvt->ump_bytes = do_convert_to_ump(ump, group, c, cvt->ump); -} - -/* reset the converter context, called at each open */ -void snd_ump_reset_convert_to_ump(struct snd_ump_endpoint *ump, - unsigned char group) -{ - memset(&ump->out_cvts[group], 0, sizeof(*ump->out_cvts)); -} - -/* initialize converters */ -int snd_ump_convert_init(struct snd_ump_endpoint *ump) -{ - ump->out_cvts = kcalloc(16, sizeof(*ump->out_cvts), GFP_KERNEL); - if (!ump->out_cvts) - return -ENOMEM; - return 0; -} - -/* release resources */ -void snd_ump_convert_free(struct snd_ump_endpoint *ump) -{ - kfree(ump->out_cvts); - ump->out_cvts = NULL; + cvt->ump_bytes = do_convert_to_ump(cvt, group, protocol, c, cvt->ump); } +EXPORT_SYMBOL_GPL(snd_ump_convert_to_ump); diff --git a/sound/core/ump_convert.h b/sound/core/ump_convert.h deleted file mode 100644 index bbfe96084779..000000000000 --- a/sound/core/ump_convert.h +++ /dev/null @@ -1,43 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -#ifndef __UMP_CONVERT_H -#define __UMP_CONVERT_H - -#include <sound/ump_msg.h> - -/* context for converting from legacy control messages to UMP packet */ -struct ump_cvt_to_ump_bank { - bool rpn_set; - bool nrpn_set; - bool bank_set; - unsigned char cc_rpn_msb, cc_rpn_lsb; - unsigned char cc_nrpn_msb, cc_nrpn_lsb; - unsigned char cc_data_msb, cc_data_lsb; - unsigned char cc_bank_msb, cc_bank_lsb; -}; - -/* context for converting from MIDI1 byte stream to UMP packet */ -struct ump_cvt_to_ump { - /* MIDI1 intermediate buffer */ - unsigned char buf[4]; - int len; - int cmd_bytes; - - /* UMP output packet */ - u32 ump[4]; - int ump_bytes; - - /* various status */ - unsigned int in_sysex; - struct ump_cvt_to_ump_bank bank[16]; /* per channel */ -}; - -int snd_ump_convert_init(struct snd_ump_endpoint *ump); -void snd_ump_convert_free(struct snd_ump_endpoint *ump); -int snd_ump_convert_from_ump(struct snd_ump_endpoint *ump, - const u32 *data, unsigned char *dst, - unsigned char *group_ret); -void snd_ump_convert_to_ump(struct snd_ump_endpoint *ump, - unsigned char group, unsigned char c); -void snd_ump_reset_convert_to_ump(struct snd_ump_endpoint *ump, - unsigned char group); -#endif /* __UMP_CONVERT_H */ -- 2.35.3

1 0

[bug report] ASoC: tas2781: Add tas2781 driver
by Dan Carpenter 23 Jun '23

23 Jun '23

Hello Shenghao Ding, The patch ef3bcde75d06: "ASoC: tas2781: Add tas2781 driver" from Jun 18, 2023, leads to the following Smatch static checker warning: sound/soc/codecs/tas2781-i2c.c:651 tasdevice_parse_dt() warn: assigning signed to unsigned: 'tas_priv->ndev = ndev' 's32min-s32max' sound/soc/codecs/tas2781-i2c.c 602 static void tasdevice_parse_dt(struct tasdevice_priv *tas_priv) 603 { 604 struct i2c_client *client = (struct i2c_client *)tas_priv->client; 605 unsigned int dev_addrs[TASDEVICE_MAX_CHANNELS]; 606 int rc, i, ndev = 0; 607 608 if (tas_priv->isacpi) { 609 ndev = device_property_read_u32_array(&client->dev, 610 "ti,audio-slots", NULL, 0); When we pass NULL to device_property_read_u32_array() then it returns then number of items. 611 if (ndev <= 0) { 612 ndev = 1; 613 dev_addrs[0] = client->addr; 614 } else { 615 ndev = (ndev < ARRAY_SIZE(dev_addrs)) 616 ? ndev : ARRAY_SIZE(dev_addrs); 617 ndev = device_property_read_u32_array(&client->dev, ^^^^^^^ Smatch is concerned that this value can be negative. But actually this sets it to zero, doesn't it? Is that intentional? It feels like we should leave ndev as the number of items. Or if we want ndev to be zero do "ndev = 0;" on the next line. 618 "ti,audio-slots", dev_addrs, ndev); 619 } 620 621 tas_priv->irq_info.irq_gpio = 622 acpi_dev_gpio_irq_get(ACPI_COMPANION(&client->dev), 0); 623 } else { 624 struct device_node *np = tas_priv->dev->of_node; 625 #ifdef CONFIG_OF 626 const __be32 *reg, *reg_end; 627 int len, sw, aw; 628 629 aw = of_n_addr_cells(np); 630 sw = of_n_size_cells(np); 631 if (sw == 0) { 632 reg = (const __be32 *)of_get_property(np, 633 "reg", &len); 634 reg_end = reg + len/sizeof(*reg); 635 ndev = 0; 636 do { 637 dev_addrs[ndev] = of_read_number(reg, aw); 638 reg += aw; 639 ndev++; 640 } while (reg < reg_end); 641 } else { 642 ndev = 1; 643 dev_addrs[0] = client->addr; 644 } 645 #else 646 ndev = 1; 647 dev_addrs[0] = client->addr; 648 #endif 649 tas_priv->irq_info.irq_gpio = of_irq_get(np, 0); 650 } --> 651 tas_priv->ndev = ndev; ^^^^^^^^^^^^^^^^^^^^^ Warning 652 for (i = 0; i < ndev; i++) 653 tas_priv->tasdevice[i].dev_addr = dev_addrs[i]; 654 655 tas_priv->reset = devm_gpiod_get_optional(&client->dev, 656 "reset-gpios", GPIOD_OUT_HIGH); regards, dan carpenter

2 1