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

[PATCH v1] ALSA: hda/tas2781: Remove tas2781_spi_fwlib.c and leverage SND_SOC_TAS2781_FMWLIB
by Shenghao Ding 26 Apr '25

26 Apr '25

Most codes in tas2781_spi_fwlib.c are same as tas2781-fmwlib.c, mainly for firmware parsing, only differece is the register reading, bit update and book switching in i2c and spi. The main purpose of this patch is for code cleaup and arrange the shared part for i2c and spi. Signed-off-by: Shenghao Ding <shenghao-ding(a)ti.com> --- v1: - Move the definition of TASDEVICE_CRC8_POLYNOMIAL to tas2781.h for both SPI use. - Add isspi flag in the struct tasdevice_priv to distinguish SPI or I2C. - Define three register-read related methods due to the difference between SPI and I2C. For SPI-based TAS2781, it will have one-byte delay to read memory-mapped registers. During init, these three method will be initialized as spi or i2c register-read methods. - Define book-switching method due to the difference between SPI and I2C. - Add select SND_SOC_TAS2781_COMLIB & SND_SOC_TAS2781_FMWLIB for tas2781 hda spi driver in Kconfig. - remove tas2781-spi.h & tas2781_spi_fwlib.c. - remove tas2781_spi_fwlib.o in Makefile - Move the definition of TASDEVICE_CALIBRATION_DATA_NAME. - Remove the useless calib_data definition for code cleanup. - Define the TASDEV_CALIB_N definition in tas2781_hda.h for hda driver calibration. - Use TASDEV_CALIB_N instead of TAS2563_CAL_N. - Include tas2781.h instead of tas2781-dsp.h in tas2781_hda_spi.c. - Remove #include "tas2781-spi.h" in tas2781_hda_spi.c. - Move the macro definitions only for hda spi tas2781 driver into tas2781_hda_spi.c. - Add read_flag_mask and reg_shift setting in tasdevice_regmap. --- include/sound/tas2781.h | 13 + sound/pci/hda/Kconfig | 2 + sound/pci/hda/Makefile | 2 +- sound/pci/hda/tas2781-spi.h | 157 --- sound/pci/hda/tas2781_hda.h | 3 + sound/pci/hda/tas2781_hda_i2c.c | 25 +- sound/pci/hda/tas2781_hda_spi.c | 540 ++++---- sound/pci/hda/tas2781_spi_fwlib.c | 2006 ----------------------------- sound/soc/codecs/tas2781-comlib.c | 18 +- sound/soc/codecs/tas2781-fmwlib.c | 17 +- 10 files changed, 320 insertions(+), 2463 deletions(-) delete mode 100644 sound/pci/hda/tas2781-spi.h delete mode 100644 sound/pci/hda/tas2781_spi_fwlib.c diff --git a/include/sound/tas2781.h b/include/sound/tas2781.h index eff011444cc8..a86a82f4c544 100644 --- a/include/sound/tas2781.h +++ b/include/sound/tas2781.h @@ -32,6 +32,8 @@ SNDRV_PCM_FMTBIT_S24_LE | \ SNDRV_PCM_FMTBIT_S32_LE) +#define TASDEVICE_CRC8_POLYNOMIAL 0x4d + /* PAGE Control Register (available in page0 of each book) */ #define TASDEVICE_PAGE_SELECT 0x00 #define TASDEVICE_BOOKCTL_PAGE 0x00 @@ -193,6 +195,7 @@ struct tasdevice_priv { bool force_fwload_status; bool playback_started; bool isacpi; + bool isspi; bool is_user_space_calidata; unsigned int global_addr; @@ -210,6 +213,16 @@ struct tasdevice_priv { int (*tasdevice_load_block)(struct tasdevice_priv *tas_priv, struct tasdev_blk *block); + int (*change_chn_book)(struct tasdevice_priv *tas_priv, + unsigned short chn, int book); + int (*update_bits)(struct tasdevice_priv *tas_priv, + unsigned short chn, unsigned int reg, unsigned int mask, + unsigned int value); + int (*dev_read)(struct tasdevice_priv *tas_priv, + unsigned short chn, unsigned int reg, unsigned int *value); + int (*dev_bulk_read)(struct tasdevice_priv *tas_priv, + unsigned short chn, unsigned int reg, unsigned char *p_data, + unsigned int n_length); int (*save_calibration)(struct tasdevice_priv *tas_priv); void (*apply_calibration)(struct tasdevice_priv *tas_priv); }; diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig index 9c427270ff4f..90f12e0227eb 100644 --- a/sound/pci/hda/Kconfig +++ b/sound/pci/hda/Kconfig @@ -210,6 +210,8 @@ config SND_HDA_SCODEC_TAS2781_SPI depends on ACPI depends on EFI depends on SND_SOC + select SND_SOC_TAS2781_COMLIB + select SND_SOC_TAS2781_FMWLIB select CRC32 help Say Y or M here to include TAS2781 SPI HD-audio side codec support diff --git a/sound/pci/hda/Makefile b/sound/pci/hda/Makefile index 210c406dfbc5..72ef3a64d9db 100644 --- a/sound/pci/hda/Makefile +++ b/sound/pci/hda/Makefile @@ -40,7 +40,7 @@ snd-hda-scodec-cs35l56-spi-y := cs35l56_hda_spi.o snd-hda-cs-dsp-ctls-y := hda_cs_dsp_ctl.o snd-hda-scodec-component-y := hda_component.o snd-hda-scodec-tas2781-i2c-y := tas2781_hda_i2c.o -snd-hda-scodec-tas2781-spi-y := tas2781_hda_spi.o tas2781_spi_fwlib.o +snd-hda-scodec-tas2781-spi-y := tas2781_hda_spi.o # common driver obj-$(CONFIG_SND_HDA) := snd-hda-codec.o diff --git a/sound/pci/hda/tas2781-spi.h b/sound/pci/hda/tas2781-spi.h deleted file mode 100644 index 7a0faceeb675..000000000000 --- a/sound/pci/hda/tas2781-spi.h +++ /dev/null @@ -1,157 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -// -// ALSA SoC Texas Instruments TAS2781 Audio Smart Amplifier -// -// Copyright (C) 2024 Texas Instruments Incorporated -// https://www.ti.com -// -// The TAS2781 driver implements a flexible and configurable -// algo coefficient setting for TAS2781 chips. -// -// Author: Baojun Xu <baojun.xu(a)ti.com> -// - -#ifndef __TAS2781_SPI_H__ -#define __TAS2781_SPI_H__ - -#define TASDEVICE_RATES \ - (SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 | \ - SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_88200) - -#define TASDEVICE_FORMATS \ - (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S24_LE | \ - SNDRV_PCM_FMTBIT_S32_LE) - -#define TASDEVICE_MAX_BOOK_NUM 256 -#define TASDEVICE_MAX_PAGE 256 - -#define TASDEVICE_MAX_SIZE (TASDEVICE_MAX_BOOK_NUM * TASDEVICE_MAX_PAGE) - -/* PAGE Control Register (available in page0 of each book) */ -#define TASDEVICE_PAGE_SELECT 0x00 -#define TASDEVICE_BOOKCTL_PAGE 0x00 -#define TASDEVICE_BOOKCTL_REG GENMASK(7, 1) -#define TASDEVICE_BOOK_ID(reg) (((reg) & GENMASK(24, 16)) >> 16) -#define TASDEVICE_PAGE_ID(reg) (((reg) & GENMASK(15, 8)) >> 8) -#define TASDEVICE_REG_ID(reg) (((reg) & GENMASK(7, 1)) >> 1) -#define TASDEVICE_PAGE_REG(reg) ((reg) & GENMASK(15, 1)) -#define TASDEVICE_REG(book, page, reg) \ - (((book) << 16) | ((page) << 8) | ((reg) << 1)) - -/* Software Reset */ -#define TAS2781_REG_SWRESET TASDEVICE_REG(0x0, 0x0, 0x01) -#define TAS2781_REG_SWRESET_RESET BIT(0) - -/* System Reset Check Register */ -#define TAS2781_REG_CLK_CONFIG TASDEVICE_REG(0x0, 0x0, 0x5c) -#define TAS2781_REG_CLK_CONFIG_RESET (0x19) -#define TAS2781_PRE_POST_RESET_CFG 3 - -/* Block Checksum */ -#define TASDEVICE_CHECKSUM TASDEVICE_REG(0x0, 0x0, 0x7e) - -/* Volume control */ -#define TAS2781_DVC_LVL TASDEVICE_REG(0x0, 0x0, 0x1a) -#define TAS2781_AMP_LEVEL TASDEVICE_REG(0x0, 0x0, 0x03) -#define TAS2781_AMP_LEVEL_MASK GENMASK(5, 1) - -#define TASDEVICE_CMD_SING_W 0x1 -#define TASDEVICE_CMD_BURST 0x2 -#define TASDEVICE_CMD_DELAY 0x3 -#define TASDEVICE_CMD_FIELD_W 0x4 - -#define TAS2781_SPI_MAX_FREQ (4 * HZ_PER_MHZ) - -#define TASDEVICE_CRC8_POLYNOMIAL 0x4d -#define TASDEVICE_SPEAKER_CALIBRATION_SIZE 20 - -/* Flag of calibration registers address. */ -#define TASDEVICE_CALIBRATION_REG_ADDRESS BIT(7) - -#define TASDEVICE_CALIBRATION_DATA_NAME L"CALI_DATA" -#define TASDEVICE_CALIBRATION_DATA_SIZE 256 - -enum calib_data { - R0_VAL = 0, - INV_R0, - R0LOW, - POWER, - TLIM, - CALIB_MAX -}; - -struct tasdevice_priv { - struct tasdevice_fw *cali_data_fmw; - struct tasdevice_rca rcabin; - struct tasdevice_fw *fmw; - struct gpio_desc *reset; - struct mutex codec_lock; - struct regmap *regmap; - struct device *dev; - - unsigned char crc8_lkp_tbl[CRC8_TABLE_SIZE]; - unsigned char coef_binaryname[64]; - unsigned char rca_binaryname[64]; - unsigned char dev_name[32]; - - bool force_fwload_status; - bool playback_started; - bool is_loading; - bool is_loaderr; - unsigned int cali_reg_array[CALIB_MAX]; - unsigned int cali_data[CALIB_MAX]; - unsigned int err_code; - void *codec; - int cur_book; - int cur_prog; - int cur_conf; - int fw_state; - int index; - int irq; - - int (*fw_parse_variable_header)(struct tasdevice_priv *tas_priv, - const struct firmware *fmw, - int offset); - int (*fw_parse_program_data)(struct tasdevice_priv *tas_priv, - struct tasdevice_fw *tas_fmw, - const struct firmware *fmw, int offset); - int (*fw_parse_configuration_data)(struct tasdevice_priv *tas_priv, - struct tasdevice_fw *tas_fmw, - const struct firmware *fmw, - int offset); - int (*tasdevice_load_block)(struct tasdevice_priv *tas_priv, - struct tasdev_blk *block); - - int (*save_calibration)(struct tasdevice_priv *tas_priv); - void (*apply_calibration)(struct tasdevice_priv *tas_priv); -}; - -int tasdevice_spi_dev_read(struct tasdevice_priv *tas_priv, - unsigned int reg, unsigned int *value); -int tasdevice_spi_dev_write(struct tasdevice_priv *tas_priv, - unsigned int reg, unsigned int value); -int tasdevice_spi_dev_bulk_write(struct tasdevice_priv *tas_priv, - unsigned int reg, unsigned char *p_data, - unsigned int n_length); -int tasdevice_spi_dev_bulk_read(struct tasdevice_priv *tas_priv, - unsigned int reg, unsigned char *p_data, - unsigned int n_length); -int tasdevice_spi_dev_update_bits(struct tasdevice_priv *tasdevice, - unsigned int reg, unsigned int mask, - unsigned int value); - -void tasdevice_spi_select_cfg_blk(void *context, int conf_no, - unsigned char block_type); -void tasdevice_spi_config_info_remove(void *context); -int tasdevice_spi_dsp_parser(void *context); -int tasdevice_spi_rca_parser(void *context, const struct firmware *fmw); -void tasdevice_spi_dsp_remove(void *context); -void tasdevice_spi_calbin_remove(void *context); -int tasdevice_spi_select_tuningprm_cfg(void *context, int prm, int cfg_no, - int rca_conf_no); -int tasdevice_spi_prmg_load(void *context, int prm_no); -int tasdevice_spi_prmg_calibdata_load(void *context, int prm_no); -void tasdevice_spi_tuning_switch(void *context, int state); -int tas2781_spi_load_calibration(void *context, char *file_name, - unsigned short i); -#endif /* __TAS2781_SPI_H__ */ diff --git a/sound/pci/hda/tas2781_hda.h b/sound/pci/hda/tas2781_hda.h index 32d27b202591..444231f87e53 100644 --- a/sound/pci/hda/tas2781_hda.h +++ b/sound/pci/hda/tas2781_hda.h @@ -9,6 +9,9 @@ #include <sound/asound.h> +#define TASDEVICE_CALIBRATION_DATA_NAME L"CALI_DATA" +#define TASDEV_CALIB_N 5 + /* * No standard control callbacks for SNDRV_CTL_ELEM_IFACE_CARD * Define two controls, one is Volume control callbacks, the other is diff --git a/sound/pci/hda/tas2781_hda_i2c.c b/sound/pci/hda/tas2781_hda_i2c.c index 9d94ae5fcfe0..1be86d1b4a53 100644 --- a/sound/pci/hda/tas2781_hda_i2c.c +++ b/sound/pci/hda/tas2781_hda_i2c.c @@ -34,15 +34,6 @@ #define TASDEVICE_SPEAKER_CALIBRATION_SIZE 20 -enum calib_data { - R0_VAL = 0, - INV_R0, - R0LOW, - POWER, - TLIM, - CALIB_MAX -}; - #define TAS2563_MAX_CHANNELS 4 #define TAS2563_CAL_POWER TASDEVICE_REG(0, 0x0d, 0x3c) @@ -50,17 +41,15 @@ enum calib_data { #define TAS2563_CAL_INVR0 TASDEVICE_REG(0, 0x0f, 0x40) #define TAS2563_CAL_R0_LOW TASDEVICE_REG(0, 0x0f, 0x48) #define TAS2563_CAL_TLIM TASDEVICE_REG(0, 0x10, 0x14) -#define TAS2563_CAL_N 5 #define TAS2563_CAL_DATA_SIZE 4 #define TAS2563_CAL_CH_SIZE 20 #define TAS2563_CAL_ARRAY_SIZE 80 -static unsigned int cal_regs[TAS2563_CAL_N] = { +static unsigned int cal_regs[TASDEV_CALIB_N] = { TAS2563_CAL_POWER, TAS2563_CAL_R0, TAS2563_CAL_INVR0, TAS2563_CAL_R0_LOW, TAS2563_CAL_TLIM, }; - struct tas2781_hda { struct device *dev; struct tasdevice_priv *priv; @@ -475,7 +464,7 @@ static void tas2563_apply_calib(struct tasdevice_priv *tas_priv) int ret; for (int i = 0; i < tas_priv->ndev; i++) { - for (int j = 0; j < TAS2563_CAL_N; ++j) { + for (int j = 0; j < TASDEV_CALIB_N; ++j) { data = cpu_to_be32( *(uint32_t *)&tas_priv->cali_data.data[offset]); ret = tasdevice_dev_bulk_write(tas_priv, i, cal_regs[j], @@ -493,7 +482,7 @@ static int tas2563_save_calibration(struct tasdevice_priv *tas_priv) static efi_guid_t efi_guid = EFI_GUID(0x1f52d2a1, 0xbb3a, 0x457d, 0xbc, 0x09, 0x43, 0xa3, 0xf4, 0x31, 0x0a, 0x92); - static efi_char16_t *efi_vars[TAS2563_MAX_CHANNELS][TAS2563_CAL_N] = { + static efi_char16_t *efi_vars[TAS2563_MAX_CHANNELS][TASDEV_CALIB_N] = { { L"Power_1", L"R0_1", L"InvR0_1", L"R0_Low_1", L"TLim_1" }, { L"Power_2", L"R0_2", L"InvR0_2", L"R0_Low_2", L"TLim_2" }, { L"Power_3", L"R0_3", L"InvR0_3", L"R0_Low_3", L"TLim_3" }, @@ -511,7 +500,7 @@ static int tas2563_save_calibration(struct tasdevice_priv *tas_priv) return -ENOMEM; for (int i = 0; i < tas_priv->ndev; ++i) { - for (int j = 0; j < TAS2563_CAL_N; ++j) { + for (int j = 0; j < TASDEV_CALIB_N; ++j) { status = efi.get_variable(efi_vars[i][j], &efi_guid, &attr, &max_size, &tas_priv->cali_data.data[offset]); @@ -535,7 +524,7 @@ static void tas2781_apply_calib(struct tasdevice_priv *tas_priv) { struct calidata *cali_data = &tas_priv->cali_data; struct cali_reg *r = &cali_data->cali_reg_array; - unsigned int cali_reg[CALIB_MAX] = { + unsigned int cali_reg[TASDEV_CALIB_N] = { TASDEVICE_REG(0, 0x17, 0x74), TASDEVICE_REG(0, 0x18, 0x0c), TASDEVICE_REG(0, 0x18, 0x14), @@ -555,7 +544,7 @@ static void tas2781_apply_calib(struct tasdevice_priv *tas_priv) } for (i = 0; i < tas_priv->ndev; i++) { - for (j = 0; j < CALIB_MAX; j++) { + for (j = 0; j < TASDEV_CALIB_N; j++) { data = cpu_to_be32( *(uint32_t *)&tas_priv->cali_data.data[oft]); rc = tasdevice_dev_bulk_write(tas_priv, i, @@ -578,7 +567,7 @@ static int tas2781_save_calibration(struct tasdevice_priv *tas_priv) { efi_guid_t efi_guid = EFI_GUID(0x02f9af02, 0x7734, 0x4233, 0xb4, 0x3d, 0x93, 0xfe, 0x5a, 0xa3, 0x5d, 0xb3); - static efi_char16_t efi_name[] = L"CALI_DATA"; + static efi_char16_t efi_name[] = TASDEVICE_CALIBRATION_DATA_NAME; unsigned int attr, crc; unsigned int *tmp_val; efi_status_t status; diff --git a/sound/pci/hda/tas2781_hda_spi.c b/sound/pci/hda/tas2781_hda_spi.c index 92be591c6bfe..977569ee4652 100644 --- a/sound/pci/hda/tas2781_hda_spi.c +++ b/sound/pci/hda/tas2781_hda_spi.c @@ -27,12 +27,10 @@ #include <sound/hda_codec.h> #include <sound/soc.h> -#include <sound/tas2781-dsp.h> +#include <sound/tas2781.h> #include <sound/tlv.h> #include <sound/tas2781-tlv.h> -#include "tas2781-spi.h" - #include "hda_local.h" #include "hda_auto_parser.h" #include "hda_component.h" @@ -40,6 +38,17 @@ #include "hda_generic.h" #include "tas2781_hda.h" +#define TASDEVICE_RANGE_MAX_SIZE (256 * 128) +#define TASDEVICE_WIN_LEN 128 +#define TAS2781_SPI_MAX_FREQ (4 * HZ_PER_MHZ) +/* Flag of calibration registers address. */ +#define TASDEVICE_CALIBRATION_REG_ADDRESS BIT(7) +#define TASDEV_UEFI_CALI_REG_ADDR_FLG BIT(7) + +/* System Reset Check Register */ +#define TAS2781_REG_CLK_CONFIG TASDEVICE_REG(0x0, 0x0, 0x5c) +#define TAS2781_REG_CLK_CONFIG_RESET 0x19 + struct tas2781_hda { struct tasdevice_priv *priv; struct acpi_device *dacpi; @@ -52,12 +61,12 @@ struct tas2781_hda { static const struct regmap_range_cfg tasdevice_ranges[] = { { .range_min = 0, - .range_max = TASDEVICE_MAX_SIZE, + .range_max = TASDEVICE_RANGE_MAX_SIZE, .selector_reg = TASDEVICE_PAGE_SELECT, .selector_mask = GENMASK(7, 0), .selector_shift = 0, .window_start = 0, - .window_len = TASDEVICE_MAX_PAGE, + .window_len = TASDEVICE_WIN_LEN, }, }; @@ -65,39 +74,19 @@ static const struct regmap_config tasdevice_regmap = { .reg_bits = 8, .val_bits = 8, .zero_flag_mask = true, + .read_flag_mask = 0x01, + .reg_shift = -1, .cache_type = REGCACHE_NONE, .ranges = tasdevice_ranges, .num_ranges = ARRAY_SIZE(tasdevice_ranges), - .max_register = TASDEVICE_MAX_SIZE, + .max_register = TASDEVICE_RANGE_MAX_SIZE, }; -static int tasdevice_spi_switch_book(struct tasdevice_priv *tas_priv, int reg) +static int tasdevice_spi_dev_read(struct tasdevice_priv *tas_priv, + unsigned short chn, unsigned int reg, unsigned int *val) { - struct regmap *map = tas_priv->regmap; - - if (tas_priv->cur_book != TASDEVICE_BOOK_ID(reg)) { - int ret = regmap_write(map, TASDEVICE_BOOKCTL_REG, - TASDEVICE_BOOK_ID(reg)); - if (ret < 0) { - dev_err(tas_priv->dev, "Switch Book E=%d\n", ret); - return ret; - } - tas_priv->cur_book = TASDEVICE_BOOK_ID(reg); - } - return 0; -} - -int tasdevice_spi_dev_read(struct tasdevice_priv *tas_priv, - unsigned int reg, - unsigned int *val) -{ - struct regmap *map = tas_priv->regmap; int ret; - ret = tasdevice_spi_switch_book(tas_priv, reg); - if (ret < 0) - return ret; - /* * In our TAS2781 SPI mode, if read from other book (not book 0), * or read from page number larger than 1 in book 0, one more byte @@ -106,11 +95,11 @@ int tasdevice_spi_dev_read(struct tasdevice_priv *tas_priv, if ((TASDEVICE_BOOK_ID(reg) > 0) || (TASDEVICE_PAGE_ID(reg) > 1)) { unsigned char data[2]; - ret = regmap_bulk_read(map, TASDEVICE_PAGE_REG(reg) | 1, + ret = tasdevice_dev_bulk_read(tas_priv, chn, reg, data, sizeof(data)); *val = data[1]; } else { - ret = regmap_read(map, TASDEVICE_PAGE_REG(reg) | 1, val); + ret = tasdevice_dev_read(tas_priv, chn, reg, val); } if (ret < 0) dev_err(tas_priv->dev, "%s, E=%d\n", __func__, ret); @@ -118,71 +107,25 @@ int tasdevice_spi_dev_read(struct tasdevice_priv *tas_priv, return ret; } -int tasdevice_spi_dev_write(struct tasdevice_priv *tas_priv, - unsigned int reg, - unsigned int value) -{ - struct regmap *map = tas_priv->regmap; - int ret; - - ret = tasdevice_spi_switch_book(tas_priv, reg); - if (ret < 0) - return ret; - - ret = regmap_write(map, TASDEVICE_PAGE_REG(reg), value); - if (ret < 0) - dev_err(tas_priv->dev, "%s, E=%d\n", __func__, ret); - - return ret; -} - -int tasdevice_spi_dev_bulk_write(struct tasdevice_priv *tas_priv, - unsigned int reg, - unsigned char *data, - unsigned int len) -{ - struct regmap *map = tas_priv->regmap; - int ret; - - ret = tasdevice_spi_switch_book(tas_priv, reg); - if (ret < 0) - return ret; - - ret = regmap_bulk_write(map, TASDEVICE_PAGE_REG(reg), data, len); - if (ret < 0) - dev_err(tas_priv->dev, "%s, E=%d\n", __func__, ret); - - return ret; -} - -int tasdevice_spi_dev_bulk_read(struct tasdevice_priv *tas_priv, - unsigned int reg, - unsigned char *data, - unsigned int len) +static int tasdevice_spi_dev_bulk_read(struct tasdevice_priv *tas_priv, + unsigned short chn, unsigned int reg, unsigned char *data, + unsigned int len) { - struct regmap *map = tas_priv->regmap; int ret; - ret = tasdevice_spi_switch_book(tas_priv, reg); - if (ret < 0) - return ret; - - if (len > TASDEVICE_MAX_PAGE) - len = TASDEVICE_MAX_PAGE; /* * In our TAS2781 SPI mode, if read from other book (not book 0), * or read from page number larger than 1 in book 0, one more byte * read is needed, and first byte is a dummy byte, need to be ignored. */ if ((TASDEVICE_BOOK_ID(reg) > 0) || (TASDEVICE_PAGE_ID(reg) > 1)) { - unsigned char buf[TASDEVICE_MAX_PAGE+1]; + unsigned char buf[TASDEVICE_WIN_LEN + 1]; - ret = regmap_bulk_read(map, TASDEVICE_PAGE_REG(reg) | 1, buf, - len + 1); + ret = tasdevice_dev_bulk_read(tas_priv, chn, reg, + buf, len + 1); memcpy(data, buf + 1, len); } else { - ret = regmap_bulk_read(map, TASDEVICE_PAGE_REG(reg) | 1, data, - len); + ret = tasdevice_dev_bulk_read(tas_priv, chn, reg, data, len); } if (ret < 0) dev_err(tas_priv->dev, "%s, E=%d\n", __func__, ret); @@ -190,31 +133,55 @@ int tasdevice_spi_dev_bulk_read(struct tasdevice_priv *tas_priv, return ret; } -int tasdevice_spi_dev_update_bits(struct tasdevice_priv *tas_priv, - unsigned int reg, - unsigned int mask, - unsigned int value) +static int tasdevice_spi_dev_update_bits(struct tasdevice_priv *tas_priv, + unsigned short chn, unsigned int reg, unsigned int mask, + unsigned int value) { - struct regmap *map = tas_priv->regmap; int ret, val; /* * In our TAS2781 SPI mode, read/write was masked in last bit of * address, it cause regmap_update_bits() not work as expected. */ - ret = tasdevice_spi_dev_read(tas_priv, reg, &val); + ret = tasdevice_dev_read(tas_priv, chn, reg, &val); if (ret < 0) { dev_err(tas_priv->dev, "%s, E=%d\n", __func__, ret); return ret; } - ret = regmap_write(map, TASDEVICE_PAGE_REG(reg), - (val & ~mask) | (mask & value)); + + ret = tasdevice_dev_write(tas_priv, chn, TASDEVICE_PAGE_REG(reg), + (val & ~mask) | (mask & value)); if (ret < 0) dev_err(tas_priv->dev, "%s, E=%d\n", __func__, ret); return ret; } +static int tasdevice_spi_change_chn_book(struct tasdevice_priv *p, + unsigned short chn, int book) +{ + int ret = 0; + + if (chn == p->index) { + struct tasdevice *tasdev = &p->tasdevice[chn]; + struct regmap *map = p->regmap; + + if (tasdev->cur_book != book) { + ret = regmap_write(map, TASDEVICE_BOOKCTL_REG, book); + if (ret < 0) + dev_err(p->dev, "%s, E=%d\n", __func__, ret); + else + tasdev->cur_book = book; + } + } else { + ret = -EXDEV; + dev_dbg(p->dev, "Not error, %s ignore channel(%d)\n", + __func__, chn); + } + + return ret; +} + static void tas2781_spi_reset(struct tasdevice_priv *tas_dev) { int ret; @@ -223,12 +190,13 @@ static void tas2781_spi_reset(struct tasdevice_priv *tas_dev) gpiod_set_value_cansleep(tas_dev->reset, 0); fsleep(800); gpiod_set_value_cansleep(tas_dev->reset, 1); + } else { + ret = tasdevice_dev_write(tas_dev, tas_dev->index, + TASDEVICE_REG_SWRESET, TASDEVICE_REG_SWRESET_RESET); + if (ret < 0) + dev_err(tas_dev->dev, "dev sw-reset fail, %d\n", ret); + fsleep(1000); } - ret = tasdevice_spi_dev_write(tas_dev, TAS2781_REG_SWRESET, - TAS2781_REG_SWRESET_RESET); - if (ret < 0) - dev_err(tas_dev->dev, "dev sw-reset fail, %d\n", ret); - fsleep(1000); } static int tascodec_spi_init(struct tasdevice_priv *tas_priv, @@ -245,7 +213,7 @@ static int tascodec_spi_init(struct tasdevice_priv *tas_priv, scnprintf(tas_priv->rca_binaryname, sizeof(tas_priv->rca_binaryname), "%sRCA%d.bin", - tas_priv->dev_name, tas_priv->index); + tas_priv->dev_name, tas_priv->ndev); crc8_populate_msb(tas_priv->crc8_lkp_tbl, TASDEVICE_CRC8_POLYNOMIAL); tas_priv->codec = codec; ret = request_firmware_nowait(module, FW_ACTION_UEVENT, @@ -260,26 +228,22 @@ static int tascodec_spi_init(struct tasdevice_priv *tas_priv, static void tasdevice_spi_init(struct tasdevice_priv *tas_priv) { - tas_priv->cur_prog = -1; - tas_priv->cur_conf = -1; + tas_priv->tasdevice[tas_priv->index].cur_book = -1; + tas_priv->tasdevice[tas_priv->index].cur_conf = -1; + tas_priv->tasdevice[tas_priv->index].cur_prog = -1; - tas_priv->cur_book = -1; - tas_priv->cur_prog = -1; - tas_priv->cur_conf = -1; + tas_priv->isspi = true; - /* Store default registers address for calibration data. */ - tas_priv->cali_reg_array[0] = TASDEVICE_REG(0, 0x17, 0x74); - tas_priv->cali_reg_array[1] = TASDEVICE_REG(0, 0x18, 0x0c); - tas_priv->cali_reg_array[2] = TASDEVICE_REG(0, 0x18, 0x14); - tas_priv->cali_reg_array[3] = TASDEVICE_REG(0, 0x13, 0x70); - tas_priv->cali_reg_array[4] = TASDEVICE_REG(0, 0x18, 0x7c); + tas_priv->update_bits = tasdevice_spi_dev_update_bits; + tas_priv->change_chn_book = tasdevice_spi_change_chn_book; + tas_priv->dev_read = tasdevice_spi_dev_read; + tas_priv->dev_bulk_read = tasdevice_spi_dev_bulk_read; mutex_init(&tas_priv->codec_lock); } static int tasdevice_spi_amp_putvol(struct tasdevice_priv *tas_priv, - struct snd_ctl_elem_value *ucontrol, - struct soc_mixer_control *mc) + struct snd_ctl_elem_value *ucontrol, struct soc_mixer_control *mc) { unsigned int invert = mc->invert; unsigned char mask; @@ -290,7 +254,8 @@ static int tasdevice_spi_amp_putvol(struct tasdevice_priv *tas_priv, mask <<= mc->shift; val = clamp(invert ? max - ucontrol->value.integer.value[0] : ucontrol->value.integer.value[0], 0, max); - ret = tasdevice_spi_dev_update_bits(tas_priv, + + ret = tasdevice_spi_dev_update_bits(tas_priv, tas_priv->index, mc->reg, mask, (unsigned int)(val << mc->shift)); if (ret) dev_err(tas_priv->dev, "set AMP vol error in dev %d\n", @@ -300,16 +265,14 @@ static int tasdevice_spi_amp_putvol(struct tasdevice_priv *tas_priv, } static int tasdevice_spi_amp_getvol(struct tasdevice_priv *tas_priv, - struct snd_ctl_elem_value *ucontrol, - struct soc_mixer_control *mc) + struct snd_ctl_elem_value *ucontrol, struct soc_mixer_control *mc) { unsigned int invert = mc->invert; unsigned char mask = 0; int max = mc->max; int ret, val; - /* Read the primary device */ - ret = tasdevice_spi_dev_read(tas_priv, mc->reg, &val); + ret = tasdevice_spi_dev_read(tas_priv, tas_priv->index, mc->reg, &val); if (ret) { dev_err(tas_priv->dev, "%s, get AMP vol error\n", __func__); return ret; @@ -324,9 +287,8 @@ static int tasdevice_spi_amp_getvol(struct tasdevice_priv *tas_priv, return ret; } -static int tasdevice_spi_digital_putvol(struct tasdevice_priv *tas_priv, - struct snd_ctl_elem_value *ucontrol, - struct soc_mixer_control *mc) +static int tasdevice_spi_digital_putvol(struct tasdevice_priv *p, + struct snd_ctl_elem_value *ucontrol, struct soc_mixer_control *mc) { unsigned int invert = mc->invert; int max = mc->max; @@ -334,26 +296,23 @@ static int tasdevice_spi_digital_putvol(struct tasdevice_priv *tas_priv, val = clamp(invert ? max - ucontrol->value.integer.value[0] : ucontrol->value.integer.value[0], 0, max); - ret = tasdevice_spi_dev_write(tas_priv, mc->reg, (unsigned int)val); + ret = tasdevice_dev_write(p, p->index, mc->reg, (unsigned int)val); if (ret) - dev_err(tas_priv->dev, "set digital vol err in dev %d\n", - tas_priv->index); + dev_err(p->dev, "set digital vol err in dev %d\n", p->index); return ret; } -static int tasdevice_spi_digital_getvol(struct tasdevice_priv *tas_priv, - struct snd_ctl_elem_value *ucontrol, - struct soc_mixer_control *mc) +static int tasdevice_spi_digital_getvol(struct tasdevice_priv *p, + struct snd_ctl_elem_value *ucontrol, struct soc_mixer_control *mc) { unsigned int invert = mc->invert; int max = mc->max; int ret, val; - /* Read the primary device as the whole */ - ret = tasdevice_spi_dev_read(tas_priv, mc->reg, &val); + ret = tasdevice_spi_dev_read(p, p->index, mc->reg, &val); if (ret) { - dev_err(tas_priv->dev, "%s, get digital vol err\n", __func__); + dev_err(p->dev, "%s, get digital vol err\n", __func__); return ret; } @@ -392,7 +351,7 @@ static int tas2781_read_acpi(struct tas2781_hda *tas_hda, ret = -EINVAL; goto err; } - nval = ret; + p->ndev = nval = ret; ret = device_property_read_u32_array(physdev, property, values, nval); if (ret) @@ -435,14 +394,17 @@ static int tas2781_read_acpi(struct tas2781_hda *tas_hda, static void tas2781_hda_playback_hook(struct device *dev, int action) { struct tas2781_hda *tas_hda = dev_get_drvdata(dev); + struct tasdevice_priv *tas_priv = tas_hda->priv; if (action == HDA_GEN_PCM_ACT_OPEN) { pm_runtime_get_sync(dev); - guard(mutex)(&tas_hda->priv->codec_lock); - tasdevice_spi_tuning_switch(tas_hda->priv, 0); + guard(mutex)(&tas_priv->codec_lock); + if (tas_priv->fw_state == TASDEVICE_DSP_FW_ALL_OK) + tasdevice_tuning_switch(tas_hda->priv, 0); } else if (action == HDA_GEN_PCM_ACT_CLOSE) { - guard(mutex)(&tas_hda->priv->codec_lock); - tasdevice_spi_tuning_switch(tas_hda->priv, 1); + guard(mutex)(&tas_priv->codec_lock); + if (tas_priv->fw_state == TASDEVICE_DSP_FW_ALL_OK) + tasdevice_tuning_switch(tas_priv, 1); pm_runtime_mark_last_busy(dev); pm_runtime_put_autosuspend(dev); } @@ -589,6 +551,7 @@ static int tas2781_digital_getvol(struct snd_kcontrol *kcontrol, struct soc_mixer_control *mc = (struct soc_mixer_control *)kcontrol->private_value; + guard(mutex)(&tas_priv->codec_lock); return tasdevice_spi_digital_getvol(tas_priv, ucontrol, mc); } @@ -599,6 +562,7 @@ static int tas2781_amp_getvol(struct snd_kcontrol *kcontrol, struct soc_mixer_control *mc = (struct soc_mixer_control *)kcontrol->private_value; + guard(mutex)(&tas_priv->codec_lock); return tasdevice_spi_amp_getvol(tas_priv, ucontrol, mc); } @@ -610,6 +574,7 @@ static int tas2781_digital_putvol(struct snd_kcontrol *kcontrol, (struct soc_mixer_control *)kcontrol->private_value; /* The check of the given value is in tasdevice_digital_putvol. */ + guard(mutex)(&tas_priv->codec_lock); return tasdevice_spi_digital_putvol(tas_priv, ucontrol, mc); } @@ -621,6 +586,7 @@ static int tas2781_amp_putvol(struct snd_kcontrol *kcontrol, (struct soc_mixer_control *)kcontrol->private_value; /* The check of the given value is in tasdevice_amp_putvol. */ + guard(mutex)(&tas_priv->codec_lock); return tasdevice_spi_amp_putvol(tas_priv, ucontrol, mc); } @@ -725,137 +691,164 @@ static const struct snd_kcontrol_new tas2781_dsp_conf_ctrl[] = { static void tas2781_apply_calib(struct tasdevice_priv *tas_priv) { - int i, rc; - - /* - * If no calibration data exist in tasdevice_priv *tas_priv, - * calibration apply will be ignored, and use default values - * in firmware binary, which was loaded during firmware download. - */ - if (tas_priv->cali_data[0] == 0) - return; - /* - * Calibration data was saved in tasdevice_priv *tas_priv as: - * unsigned int cali_data[CALIB_MAX]; - * and every data (in 4 bytes) will be saved in register which in - * book 0, and page number in page_array[], offset was saved in - * rgno_array[]. - */ - for (i = 0; i < CALIB_MAX; i++) { - rc = tasdevice_spi_dev_bulk_write(tas_priv, - tas_priv->cali_reg_array[i], - (unsigned char *)&tas_priv->cali_data[i], 4); - if (rc < 0) - dev_err(tas_priv->dev, - "chn %d calib %d bulk_wr err = %d\n", - tas_priv->index, i, rc); - } -} - -/* - * Update the calibration data, including speaker impedance, f0, etc, - * into algo. Calibrate data is done by manufacturer in the factory. - * These data are used by Algo for calculating the speaker temperature, - * speaker membrane excursion and f0 in real time during playback. - * Calibration data format in EFI is V2, since 2024. - */ -static int tas2781_save_calibration(struct tasdevice_priv *tas_priv) -{ - /* - * GUID was used for data access in BIOS, it was provided by board - * manufactory, like HP: "{02f9af02-7734-4233-b43d-93fe5aa35db3}" - */ - efi_guid_t efi_guid = - EFI_GUID(0x02f9af02, 0x7734, 0x4233, - 0xb4, 0x3d, 0x93, 0xfe, 0x5a, 0xa3, 0x5d, 0xb3); - static efi_char16_t efi_name[] = TASDEVICE_CALIBRATION_DATA_NAME; - unsigned char data[TASDEVICE_CALIBRATION_DATA_SIZE], *buf; - unsigned int attr, crc, offset, *tmp_val; - unsigned long total_sz = 0; - efi_status_t status; + struct calidata *cali_data = &tas_priv->cali_data; + struct cali_reg *r = &cali_data->cali_reg_array; + unsigned char *data = cali_data->data; + unsigned int *tmp_val = (unsigned int *)data; + unsigned int cali_reg[TASDEV_CALIB_N] = { + TASDEVICE_REG(0, 0x17, 0x74), + TASDEVICE_REG(0, 0x18, 0x0c), + TASDEVICE_REG(0, 0x18, 0x14), + TASDEVICE_REG(0, 0x13, 0x70), + TASDEVICE_REG(0, 0x18, 0x7c), + }; + unsigned int crc, oft; + unsigned char *buf; + int i, j, k, l; - tas_priv->cali_data[0] = 0; - status = efi.get_variable(efi_name, &efi_guid, &attr, &total_sz, data); - if (status == EFI_BUFFER_TOO_SMALL) { - if (total_sz > TASDEVICE_CALIBRATION_DATA_SIZE) - return -ENOMEM; - /* Get variable contents into buffer */ - status = efi.get_variable(efi_name, &efi_guid, &attr, - &total_sz, data); - } - if (status != EFI_SUCCESS) - return status; - - tmp_val = (unsigned int *)data; if (tmp_val[0] == 2781) { /* * New features were added in calibrated Data V3: * 1. Added calibration registers address define in - * a node, marked as Device id == 0x80. + * a node, marked as Device id == 0x80. * New features were added in calibrated Data V2: * 1. Added some the fields to store the link_id and - * uniqie_id for multi-link solutions + * uniqie_id for multi-link solutions * 2. Support flexible number of devices instead of - * fixed one in V1. + * fixed one in V1. * Layout of calibrated data V2 in UEFI(total 256 bytes): * ChipID (2781, 4 bytes) - * Device-Sum (4 bytes) + * Data-Group-Sum (4 bytes) * TimeStamp of Calibration (4 bytes) - * for (i = 0; i < Device-Sum; i++) { - * Device #i index_info () { - * SDW link id (2bytes) - * SDW unique_id (2bytes) - * } // if Device number is 0x80, mean it's - * calibration registers address. - * Calibrated Data of Device #i (20 bytes) + * for (i = 0; i < Data-Group-Sum; i++) { + * if (Data type != 0x80) (4 bytes) + * Calibrated Data of Device #i (20 bytes) + * else + * Calibration registers address (5*4 = 20 bytes) + * # V2: No reg addr in data grp section. + * # V3: Normally the last grp is the reg addr. * } * CRC (4 bytes) * Reserved (the rest) */ crc = crc32(~0, data, (3 + tmp_val[1] * 6) * 4) ^ ~0; - if (crc != tmp_val[3 + tmp_val[1] * 6]) - return 0; - - for (int j = 0; j < tmp_val[1]; j++) { - offset = j * 6 + 3; - if (tmp_val[offset] == tas_priv->index) { - for (int i = 0; i < CALIB_MAX; i++) - tas_priv->cali_data[i] = - tmp_val[offset + i + 1]; - } else if (tmp_val[offset] == - TASDEVICE_CALIBRATION_REG_ADDRESS) { - for (int i = 0; i < CALIB_MAX; i++) { - buf = &data[(offset + i + 1) * 4]; - tas_priv->cali_reg_array[i] = - TASDEVICE_REG(buf[1], buf[2], - buf[3]); + if (crc != tmp_val[3 + tmp_val[1] * 6]) { + cali_data->total_sz = 0; + dev_err(tas_priv->dev, "%s: CRC error\n", __func__); + return; + } + + for (j = 0, k = 0; j < tmp_val[1]; j++) { + oft = j * 6 + 3; + if (tmp_val[oft] == TASDEV_UEFI_CALI_REG_ADDR_FLG) { + for (i = 0; i < TASDEV_CALIB_N; i++) { + buf = &data[(oft + i + 1) * 4]; + cali_reg[i] = TASDEVICE_REG(buf[1], + buf[2], buf[3]); + } + } else { + l = j * (cali_data->cali_dat_sz_per_dev + 1); + if (k >= tas_priv->ndev || l > oft * 4) { + dev_err(tas_priv->dev, + "%s: dev sum error\n", + __func__); + cali_data->total_sz = 0; + return; } + + data[l] = k; + for (i = 0; i < TASDEV_CALIB_N * 4; i++) + data[l + i] = data[4 * oft + i]; + k++; } - tas_priv->apply_calibration(tas_priv); } } else { /* * Calibration data is in V1 format. * struct cali_data { - * char cali_data[20]; + * char cali_data[20]; * } * * struct { - * struct cali_data cali_data[4]; - * int TimeStamp of Calibration (4 bytes) - * int CRC (4 bytes) + * struct cali_data cali_data[4]; + * int TimeStamp of Calibration (4 bytes) + * int CRC (4 bytes) * } ueft; */ crc = crc32(~0, data, 84) ^ ~0; - if (crc == tmp_val[21]) { - for (int i = 0; i < CALIB_MAX; i++) - tas_priv->cali_data[i] = - tmp_val[tas_priv->index * 5 + i]; - tas_priv->apply_calibration(tas_priv); + if (crc != tmp_val[21]) { + cali_data->total_sz = 0; + dev_err(tas_priv->dev, "%s: V1 CRC error\n", __func__); + return; + } + + for (j = tas_priv->ndev - 1; j >= 0; j--) { + l = j * (cali_data->cali_dat_sz_per_dev + 1); + for (i = TASDEV_CALIB_N * 4; i > 0 ; i--) + data[l + i] = data[tas_priv->index * 5 + i]; + data[l+i] = j; + } + } + + if (tas_priv->dspbin_typ == TASDEV_BASIC) { + r->r0_reg = cali_reg[0]; + r->invr0_reg = cali_reg[1]; + r->r0_low_reg = cali_reg[2]; + r->pow_reg = cali_reg[3]; + r->tlimit_reg = cali_reg[4]; + } + + tas_priv->is_user_space_calidata = true; + cali_data->total_sz = + tas_priv->ndev * (cali_data->cali_dat_sz_per_dev + 1); +} + +/* + * Update the calibration data, including speaker impedance, f0, etc, + * into algo. Calibrate data is done by manufacturer in the factory. + * These data are used by Algo for calculating the speaker temperature, + * speaker membrane excursion and f0 in real time during playback. + * Calibration data format in EFI is V2, since 2024. + */ +static int tas2781_save_calibration(struct tasdevice_priv *tas_priv) +{ + /* + * GUID was used for data access in BIOS, it was provided by board + * manufactory, like HP: "{02f9af02-7734-4233-b43d-93fe5aa35db3}" + */ + efi_guid_t efi_guid = + EFI_GUID(0x02f9af02, 0x7734, 0x4233, + 0xb4, 0x3d, 0x93, 0xfe, 0x5a, 0xa3, 0x5d, 0xb3); + static efi_char16_t efi_name[] = TASDEVICE_CALIBRATION_DATA_NAME; + struct calidata *cali_data = &tas_priv->cali_data; + unsigned long total_sz = 0; + unsigned int attr, size; + efi_status_t status; + unsigned char *data; + + cali_data->cali_dat_sz_per_dev = 20; + size = tas_priv->ndev * (cali_data->cali_dat_sz_per_dev + 1); + status = efi.get_variable(efi_name, &efi_guid, &attr, &total_sz, NULL); + cali_data->total_sz = total_sz > size ? total_sz : size; + if (status == EFI_BUFFER_TOO_SMALL) { + /* Allocate data buffer of data_size bytes */ + data = tas_priv->cali_data.data = devm_kzalloc(tas_priv->dev, + tas_priv->cali_data.total_sz, GFP_KERNEL); + if (!data) { + tas_priv->cali_data.total_sz = 0; + return -ENOMEM; } + /* Get variable contents into buffer */ + status = efi.get_variable(efi_name, &efi_guid, &attr, + &tas_priv->cali_data.total_sz, data); + } + if (status != EFI_SUCCESS) { + tas_priv->cali_data.total_sz = 0; + return status; } + tas_priv->apply_calibration(tas_priv); return 0; } @@ -883,7 +876,7 @@ static void tasdev_fw_ready(const struct firmware *fmw, void *context) pm_runtime_get_sync(tas_priv->dev); guard(mutex)(&tas_priv->codec_lock); - ret = tasdevice_spi_rca_parser(tas_priv, fmw); + ret = tasdevice_rca_parser(tas_priv, fmw); if (ret) goto out; @@ -910,12 +903,12 @@ static void tasdev_fw_ready(const struct firmware *fmw, void *context) } } - tasdevice_spi_dsp_remove(tas_priv); + tasdevice_dsp_remove(tas_priv); tas_priv->fw_state = TASDEVICE_DSP_FW_PENDING; scnprintf(tas_priv->coef_binaryname, 64, "TAS2XXX%08X-%01d.bin", codec->core.subsystem_id, tas_priv->index); - ret = tasdevice_spi_dsp_parser(tas_priv); + ret = tasdevice_dsp_parser(tas_priv); if (ret) { dev_err(tas_priv->dev, "dspfw load %s error\n", tas_priv->coef_binaryname); @@ -945,26 +938,27 @@ static void tasdev_fw_ready(const struct firmware *fmw, void *context) goto out; } - /* Perform AMP reset before firmware download. */ - tas_priv->rcabin.profile_cfg_id = TAS2781_PRE_POST_RESET_CFG; tas2781_spi_reset(tas_priv); tas_priv->rcabin.profile_cfg_id = 0; tas_priv->fw_state = TASDEVICE_DSP_FW_ALL_OK; - ret = tasdevice_spi_dev_read(tas_priv, TAS2781_REG_CLK_CONFIG, &val); + ret = tas_priv->dev_read(tas_priv, tas_priv->index, + TAS2781_REG_CLK_CONFIG, &val); if (ret < 0) goto out; - if (val == TAS2781_REG_CLK_CONFIG_RESET) - ret = tasdevice_spi_prmg_load(tas_priv, 0); - if (ret < 0) { - dev_err(tas_priv->dev, "FW download failed = %d\n", ret); - goto out; + if (val == TAS2781_REG_CLK_CONFIG_RESET) { + ret = tasdevice_prmg_load(tas_priv, 0); + if (ret < 0) { + dev_err(tas_priv->dev, "FW download failed = %d\n", + ret); + goto out; + } } if (tas_priv->fmw->nr_programs > 0) - tas_priv->cur_prog = 0; + tas_priv->tasdevice[tas_priv->index].cur_prog = 0; if (tas_priv->fmw->nr_configurations > 0) - tas_priv->cur_conf = 0; + tas_priv->tasdevice[tas_priv->index].cur_conf = 0; /* * If calibrated data occurs error, dsp will still works with default @@ -1017,9 +1011,10 @@ static void tas2781_hda_unbind(struct device *dev, struct device *master, { struct tas2781_hda *tas_hda = dev_get_drvdata(dev); struct hda_component_parent *parent = master_data; + struct tasdevice_priv *tas_priv = tas_hda->priv; struct hda_component *comp; - comp = hda_component_from_index(parent, tas_hda->priv->index); + comp = hda_component_from_index(parent, tas_priv->index); if (comp && (comp->dev == dev)) { comp->dev = NULL; memset(comp->name, 0, sizeof(comp->name)); @@ -1028,8 +1023,8 @@ static void tas2781_hda_unbind(struct device *dev, struct device *master, tas2781_hda_remove_controls(tas_hda); - tasdevice_spi_config_info_remove(tas_hda->priv); - tasdevice_spi_dsp_remove(tas_hda->priv); + tasdevice_config_info_remove(tas_priv); + tasdevice_dsp_remove(tas_priv); tas_hda->priv->fw_state = TASDEVICE_DSP_FW_PENDING; } @@ -1124,14 +1119,16 @@ static void tas2781_hda_spi_remove(struct spi_device *spi) static int tas2781_runtime_suspend(struct device *dev) { struct tas2781_hda *tas_hda = dev_get_drvdata(dev); + struct tasdevice_priv *tas_priv = tas_hda->priv; - guard(mutex)(&tas_hda->priv->codec_lock); + guard(mutex)(&tas_priv->codec_lock); - if (tas_hda->priv->playback_started) - tasdevice_spi_tuning_switch(tas_hda->priv, 1); + if (tas_priv->fw_state == TASDEVICE_DSP_FW_ALL_OK + && tas_priv->playback_started) + tasdevice_tuning_switch(tas_priv, 1); - tas_hda->priv->cur_book = -1; - tas_hda->priv->cur_conf = -1; + tas_priv->tasdevice[tas_priv->index].cur_book = -1; + tas_priv->tasdevice[tas_priv->index].cur_conf = -1; return 0; } @@ -1139,11 +1136,13 @@ static int tas2781_runtime_suspend(struct device *dev) static int tas2781_runtime_resume(struct device *dev) { struct tas2781_hda *tas_hda = dev_get_drvdata(dev); + struct tasdevice_priv *tas_priv = tas_hda->priv; - guard(mutex)(&tas_hda->priv->codec_lock); + guard(mutex)(&tas_priv->codec_lock); - if (tas_hda->priv->playback_started) - tasdevice_spi_tuning_switch(tas_hda->priv, 0); + if (tas_priv->fw_state == TASDEVICE_DSP_FW_ALL_OK + && tas_priv->playback_started) + tasdevice_tuning_switch(tas_priv, 0); return 0; } @@ -1151,6 +1150,7 @@ static int tas2781_runtime_resume(struct device *dev) static int tas2781_system_suspend(struct device *dev) { struct tas2781_hda *tas_hda = dev_get_drvdata(dev); + struct tasdevice_priv *tas_priv = tas_hda->priv; int ret; ret = pm_runtime_force_suspend(dev); @@ -1158,8 +1158,9 @@ static int tas2781_system_suspend(struct device *dev) return ret; /* Shutdown chip before system suspend */ - if (tas_hda->priv->playback_started) - tasdevice_spi_tuning_switch(tas_hda->priv, 1); + if (tas_priv->fw_state == TASDEVICE_DSP_FW_ALL_OK + && tas_priv->playback_started) + tasdevice_tuning_switch(tas_priv, 1); return 0; } @@ -1167,32 +1168,34 @@ static int tas2781_system_suspend(struct device *dev) static int tas2781_system_resume(struct device *dev) { struct tas2781_hda *tas_hda = dev_get_drvdata(dev); + struct tasdevice_priv *tas_priv = tas_hda->priv; int ret, val; ret = pm_runtime_force_resume(dev); if (ret) return ret; - guard(mutex)(&tas_hda->priv->codec_lock); - ret = tasdevice_spi_dev_read(tas_hda->priv, TAS2781_REG_CLK_CONFIG, - &val); + guard(mutex)(&tas_priv->codec_lock); + ret = tas_priv->dev_read(tas_priv, tas_priv->index, + TAS2781_REG_CLK_CONFIG, &val); if (ret < 0) return ret; if (val == TAS2781_REG_CLK_CONFIG_RESET) { - tas_hda->priv->cur_book = -1; - tas_hda->priv->cur_conf = -1; - tas_hda->priv->cur_prog = -1; + tas_priv->tasdevice[tas_priv->index].cur_book = -1; + tas_priv->tasdevice[tas_priv->index].cur_conf = -1; + tas_priv->tasdevice[tas_priv->index].cur_prog = -1; - ret = tasdevice_spi_prmg_load(tas_hda->priv, 0); + ret = tasdevice_prmg_load(tas_priv, 0); if (ret < 0) { - dev_err(tas_hda->priv->dev, + dev_err(tas_priv->dev, "FW download failed = %d\n", ret); return ret; } + tas_priv->fw_state = TASDEVICE_DSP_FW_ALL_OK; - if (tas_hda->priv->playback_started) - tasdevice_spi_tuning_switch(tas_hda->priv, 0); + if (tas_priv->playback_started) + tasdevice_tuning_switch(tas_priv, 0); } return ret; @@ -1229,3 +1232,4 @@ module_spi_driver(tas2781_hda_spi_driver); MODULE_DESCRIPTION("TAS2781 HDA SPI Driver"); MODULE_AUTHOR("Baojun, Xu, <baojun.xug(a)ti.com>"); MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS("SND_SOC_TAS2781_FMWLIB"); diff --git a/sound/pci/hda/tas2781_spi_fwlib.c b/sound/pci/hda/tas2781_spi_fwlib.c deleted file mode 100644 index d90d022d8449..000000000000 --- a/sound/pci/hda/tas2781_spi_fwlib.c +++ /dev/null @@ -1,2006 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -// -// TAS2781 HDA SPI driver -// -// Copyright 2024 - 2025 Texas Instruments, Inc. -// -// Author: Baojun Xu <baojun.xu(a)ti.com> - -#include <linux/crc8.h> -#include <linux/firmware.h> -#include <linux/init.h> -#include <linux/interrupt.h> -#include <linux/module.h> -#include <linux/slab.h> -#include <linux/types.h> -#include <linux/unaligned.h> -#include <sound/pcm_params.h> -#include <sound/soc.h> -#include <sound/tas2781-dsp.h> -#include <sound/tlv.h> - -#include "tas2781-spi.h" - -#define OFFSET_ERROR_BIT BIT(31) - -#define ERROR_PRAM_CRCCHK 0x0000000 -#define ERROR_YRAM_CRCCHK 0x0000001 -#define PPC_DRIVER_CRCCHK 0x00000200 - -#define TAS2781_SA_COEFF_SWAP_REG TASDEVICE_REG(0, 0x35, 0x2c) -#define TAS2781_YRAM_BOOK1 140 -#define TAS2781_YRAM1_PAGE 42 -#define TAS2781_YRAM1_START_REG 88 - -#define TAS2781_YRAM2_START_PAGE 43 -#define TAS2781_YRAM2_END_PAGE 49 -#define TAS2781_YRAM2_START_REG 8 -#define TAS2781_YRAM2_END_REG 127 - -#define TAS2781_YRAM3_PAGE 50 -#define TAS2781_YRAM3_START_REG 8 -#define TAS2781_YRAM3_END_REG 27 - -/* should not include B0_P53_R44-R47 */ -#define TAS2781_YRAM_BOOK2 0 -#define TAS2781_YRAM4_START_PAGE 50 -#define TAS2781_YRAM4_END_PAGE 60 - -#define TAS2781_YRAM5_PAGE 61 -#define TAS2781_YRAM5_START_REG TAS2781_YRAM3_START_REG -#define TAS2781_YRAM5_END_REG TAS2781_YRAM3_END_REG - -#define TASDEVICE_MAXPROGRAM_NUM_KERNEL 5 -#define TASDEVICE_MAXCONFIG_NUM_KERNEL_MULTIPLE_AMPS 64 -#define TASDEVICE_MAXCONFIG_NUM_KERNEL 10 -#define MAIN_ALL_DEVICES_1X 0x01 -#define MAIN_DEVICE_A_1X 0x02 -#define MAIN_DEVICE_B_1X 0x03 -#define MAIN_DEVICE_C_1X 0x04 -#define MAIN_DEVICE_D_1X 0x05 -#define COEFF_DEVICE_A_1X 0x12 -#define COEFF_DEVICE_B_1X 0x13 -#define COEFF_DEVICE_C_1X 0x14 -#define COEFF_DEVICE_D_1X 0x15 -#define PRE_DEVICE_A_1X 0x22 -#define PRE_DEVICE_B_1X 0x23 -#define PRE_DEVICE_C_1X 0x24 -#define PRE_DEVICE_D_1X 0x25 -#define PRE_SOFTWARE_RESET_DEVICE_A 0x41 -#define PRE_SOFTWARE_RESET_DEVICE_B 0x42 -#define PRE_SOFTWARE_RESET_DEVICE_C 0x43 -#define PRE_SOFTWARE_RESET_DEVICE_D 0x44 -#define POST_SOFTWARE_RESET_DEVICE_A 0x45 -#define POST_SOFTWARE_RESET_DEVICE_B 0x46 -#define POST_SOFTWARE_RESET_DEVICE_C 0x47 -#define POST_SOFTWARE_RESET_DEVICE_D 0x48 - -struct tas_crc { - unsigned char offset; - unsigned char len; -}; - -struct blktyp_devidx_map { - unsigned char blktyp; - unsigned char dev_idx; -}; - -/* fixed m68k compiling issue: mapping table can save code field */ -static const struct blktyp_devidx_map ppc3_tas2781_mapping_table[] = { - { MAIN_ALL_DEVICES_1X, 0x80 }, - { MAIN_DEVICE_A_1X, 0x81 }, - { COEFF_DEVICE_A_1X, 0x81 }, - { PRE_DEVICE_A_1X, 0x81 }, - { PRE_SOFTWARE_RESET_DEVICE_A, 0xC1 }, - { POST_SOFTWARE_RESET_DEVICE_A, 0xC1 }, - { MAIN_DEVICE_B_1X, 0x82 }, - { COEFF_DEVICE_B_1X, 0x82 }, - { PRE_DEVICE_B_1X, 0x82 }, - { PRE_SOFTWARE_RESET_DEVICE_B, 0xC2 }, - { POST_SOFTWARE_RESET_DEVICE_B, 0xC2 }, - { MAIN_DEVICE_C_1X, 0x83 }, - { COEFF_DEVICE_C_1X, 0x83 }, - { PRE_DEVICE_C_1X, 0x83 }, - { PRE_SOFTWARE_RESET_DEVICE_C, 0xC3 }, - { POST_SOFTWARE_RESET_DEVICE_C, 0xC3 }, - { MAIN_DEVICE_D_1X, 0x84 }, - { COEFF_DEVICE_D_1X, 0x84 }, - { PRE_DEVICE_D_1X, 0x84 }, - { PRE_SOFTWARE_RESET_DEVICE_D, 0xC4 }, - { POST_SOFTWARE_RESET_DEVICE_D, 0xC4 }, -}; - -static const struct blktyp_devidx_map ppc3_mapping_table[] = { - { MAIN_ALL_DEVICES_1X, 0x80 }, - { MAIN_DEVICE_A_1X, 0x81 }, - { COEFF_DEVICE_A_1X, 0xC1 }, - { PRE_DEVICE_A_1X, 0xC1 }, - { MAIN_DEVICE_B_1X, 0x82 }, - { COEFF_DEVICE_B_1X, 0xC2 }, - { PRE_DEVICE_B_1X, 0xC2 }, - { MAIN_DEVICE_C_1X, 0x83 }, - { COEFF_DEVICE_C_1X, 0xC3 }, - { PRE_DEVICE_C_1X, 0xC3 }, - { MAIN_DEVICE_D_1X, 0x84 }, - { COEFF_DEVICE_D_1X, 0xC4 }, - { PRE_DEVICE_D_1X, 0xC4 }, -}; - -static const struct blktyp_devidx_map non_ppc3_mapping_table[] = { - { MAIN_ALL_DEVICES, 0x80 }, - { MAIN_DEVICE_A, 0x81 }, - { COEFF_DEVICE_A, 0xC1 }, - { PRE_DEVICE_A, 0xC1 }, - { MAIN_DEVICE_B, 0x82 }, - { COEFF_DEVICE_B, 0xC2 }, - { PRE_DEVICE_B, 0xC2 }, - { MAIN_DEVICE_C, 0x83 }, - { COEFF_DEVICE_C, 0xC3 }, - { PRE_DEVICE_C, 0xC3 }, - { MAIN_DEVICE_D, 0x84 }, - { COEFF_DEVICE_D, 0xC4 }, - { PRE_DEVICE_D, 0xC4 }, -}; - -/* - * Device support different configurations for different scene, - * like voice, music, calibration, was write in regbin file. - * Will be stored into tas_priv after regbin was loaded. - */ -static struct tasdevice_config_info *tasdevice_add_config( - struct tasdevice_priv *tas_priv, unsigned char *config_data, - unsigned int config_size, int *status) -{ - struct tasdevice_config_info *cfg_info; - struct tasdev_blk_data **bk_da; - unsigned int config_offset = 0; - unsigned int i; - - /* - * In most projects are many audio cases, such as music, handfree, - * receiver, games, audio-to-haptics, PMIC record, bypass mode, - * portrait, landscape, etc. Even in multiple audios, one or - * two of the chips will work for the special case, such as - * ultrasonic application. In order to support these variable-numbers - * of audio cases, flexible configs have been introduced in the - * DSP firmware. - */ - cfg_info = kzalloc(sizeof(*cfg_info), GFP_KERNEL); - if (!cfg_info) { - *status = -ENOMEM; - return NULL; - } - - if (tas_priv->rcabin.fw_hdr.binary_version_num >= 0x105) { - if ((config_offset + 64) > config_size) { - *status = -EINVAL; - dev_err(tas_priv->dev, "add conf: Out of boundary\n"); - goto config_err; - } - config_offset += 64; - } - - if ((config_offset + 4) > config_size) { - *status = -EINVAL; - dev_err(tas_priv->dev, "add config: Out of boundary\n"); - goto config_err; - } - - /* - * convert data[offset], data[offset + 1], data[offset + 2] and - * data[offset + 3] into host - */ - cfg_info->nblocks = get_unaligned_be32(&config_data[config_offset]); - config_offset += 4; - - /* - * Several kinds of dsp/algorithm firmwares can run on tas2781, - * the number and size of blk are not fixed and different among - * these firmwares. - */ - bk_da = cfg_info->blk_data = kcalloc(cfg_info->nblocks, - sizeof(*bk_da), GFP_KERNEL); - if (!bk_da) { - *status = -ENOMEM; - goto config_err; - } - cfg_info->real_nblocks = 0; - for (i = 0; i < cfg_info->nblocks; i++) { - if (config_offset + 12 > config_size) { - *status = -EINVAL; - dev_err(tas_priv->dev, - "%s: Out of boundary: i = %d nblocks = %u!\n", - __func__, i, cfg_info->nblocks); - goto block_err; - } - bk_da[i] = kzalloc(sizeof(*bk_da[i]), GFP_KERNEL); - if (!bk_da[i]) { - *status = -ENOMEM; - goto block_err; - } - - bk_da[i]->dev_idx = config_data[config_offset]; - config_offset++; - - bk_da[i]->block_type = config_data[config_offset]; - config_offset++; - - bk_da[i]->yram_checksum = - get_unaligned_be16(&config_data[config_offset]); - config_offset += 2; - bk_da[i]->block_size = - get_unaligned_be32(&config_data[config_offset]); - config_offset += 4; - - bk_da[i]->n_subblks = - get_unaligned_be32(&config_data[config_offset]); - - config_offset += 4; - - if (config_offset + bk_da[i]->block_size > config_size) { - *status = -EINVAL; - dev_err(tas_priv->dev, - "%s: Out of boundary: i = %d blks = %u!\n", - __func__, i, cfg_info->nblocks); - goto block_err; - } - /* instead of kzalloc+memcpy */ - bk_da[i]->regdata = kmemdup(&config_data[config_offset], - bk_da[i]->block_size, GFP_KERNEL); - if (!bk_da[i]->regdata) { - *status = -ENOMEM; - i++; - goto block_err; - } - - config_offset += bk_da[i]->block_size; - cfg_info->real_nblocks += 1; - } - - return cfg_info; -block_err: - for (int j = 0; j < i; j++) - kfree(bk_da[j]); - kfree(bk_da); -config_err: - kfree(cfg_info); - return NULL; -} - -/* Regbin file parser function. */ -int tasdevice_spi_rca_parser(void *context, const struct firmware *fmw) -{ - struct tasdevice_priv *tas_priv = context; - struct tasdevice_config_info **cfg_info; - struct tasdevice_rca_hdr *fw_hdr; - struct tasdevice_rca *rca; - unsigned int total_config_sz = 0; - int offset = 0, ret = 0, i; - unsigned char *buf; - - rca = &tas_priv->rcabin; - fw_hdr = &rca->fw_hdr; - if (!fmw || !fmw->data) { - dev_err(tas_priv->dev, "Failed to read %s\n", - tas_priv->rca_binaryname); - tas_priv->fw_state = TASDEVICE_DSP_FW_FAIL; - return -EINVAL; - } - buf = (unsigned char *)fmw->data; - fw_hdr->img_sz = get_unaligned_be32(&buf[offset]); - offset += 4; - if (fw_hdr->img_sz != fmw->size) { - dev_err(tas_priv->dev, - "File size not match, %d %u", (int)fmw->size, - fw_hdr->img_sz); - tas_priv->fw_state = TASDEVICE_DSP_FW_FAIL; - return -EINVAL; - } - - fw_hdr->checksum = get_unaligned_be32(&buf[offset]); - offset += 4; - fw_hdr->binary_version_num = get_unaligned_be32(&buf[offset]); - if (fw_hdr->binary_version_num < 0x103) { - dev_err(tas_priv->dev, "File version 0x%04x is too low", - fw_hdr->binary_version_num); - tas_priv->fw_state = TASDEVICE_DSP_FW_FAIL; - return -EINVAL; - } - offset += 4; - fw_hdr->drv_fw_version = get_unaligned_be32(&buf[offset]); - offset += 8; - fw_hdr->plat_type = buf[offset++]; - fw_hdr->dev_family = buf[offset++]; - fw_hdr->reserve = buf[offset++]; - fw_hdr->ndev = buf[offset++]; - if (offset + TASDEVICE_DEVICE_SUM > fw_hdr->img_sz) { - dev_err(tas_priv->dev, "rca_ready: Out of boundary!\n"); - tas_priv->fw_state = TASDEVICE_DSP_FW_FAIL; - return -EINVAL; - } - - for (i = 0; i < TASDEVICE_DEVICE_SUM; i++, offset++) - fw_hdr->devs[i] = buf[offset]; - - fw_hdr->nconfig = get_unaligned_be32(&buf[offset]); - offset += 4; - - for (i = 0; i < TASDEVICE_CONFIG_SUM; i++) { - fw_hdr->config_size[i] = get_unaligned_be32(&buf[offset]); - offset += 4; - total_config_sz += fw_hdr->config_size[i]; - } - - if (fw_hdr->img_sz - total_config_sz != (unsigned int)offset) { - dev_err(tas_priv->dev, "Bin file err %d - %d != %d!\n", - fw_hdr->img_sz, total_config_sz, (int)offset); - tas_priv->fw_state = TASDEVICE_DSP_FW_FAIL; - return -EINVAL; - } - - cfg_info = kcalloc(fw_hdr->nconfig, sizeof(*cfg_info), GFP_KERNEL); - if (!cfg_info) { - tas_priv->fw_state = TASDEVICE_DSP_FW_FAIL; - return -ENOMEM; - } - rca->cfg_info = cfg_info; - rca->ncfgs = 0; - for (i = 0; i < (int)fw_hdr->nconfig; i++) { - rca->ncfgs += 1; - cfg_info[i] = tasdevice_add_config(tas_priv, &buf[offset], - fw_hdr->config_size[i], &ret); - if (ret) { - tas_priv->fw_state = TASDEVICE_DSP_FW_FAIL; - return ret; - } - offset += (int)fw_hdr->config_size[i]; - } - - return ret; -} - -/* fixed m68k compiling issue: mapping table can save code field */ -static unsigned char map_dev_idx(struct tasdevice_fw *tas_fmw, - struct tasdev_blk *block) -{ - struct blktyp_devidx_map *p = - (struct blktyp_devidx_map *)non_ppc3_mapping_table; - struct tasdevice_dspfw_hdr *fw_hdr = &tas_fmw->fw_hdr; - struct tasdevice_fw_fixed_hdr *fw_fixed_hdr = &fw_hdr->fixed_hdr; - int i, n = ARRAY_SIZE(non_ppc3_mapping_table); - unsigned char dev_idx = 0; - - if (fw_fixed_hdr->ppcver >= PPC3_VERSION_TAS2781_BASIC_MIN) { - p = (struct blktyp_devidx_map *)ppc3_tas2781_mapping_table; - n = ARRAY_SIZE(ppc3_tas2781_mapping_table); - } else if (fw_fixed_hdr->ppcver >= PPC3_VERSION_BASE) { - p = (struct blktyp_devidx_map *)ppc3_mapping_table; - n = ARRAY_SIZE(ppc3_mapping_table); - } - - for (i = 0; i < n; i++) { - if (block->type == p[i].blktyp) { - dev_idx = p[i].dev_idx; - break; - } - } - - return dev_idx; -} - -/* Block parser function. */ -static int fw_parse_block_data_kernel(struct tasdevice_fw *tas_fmw, - struct tasdev_blk *block, const struct firmware *fmw, int offset) -{ - const unsigned char *data = fmw->data; - - if (offset + 16 > fmw->size) { - dev_err(tas_fmw->dev, "%s: File Size error\n", __func__); - return -EINVAL; - } - - /* - * Convert data[offset], data[offset + 1], data[offset + 2] and - * data[offset + 3] into host. - */ - block->type = get_unaligned_be32(&data[offset]); - offset += 4; - - block->is_pchksum_present = data[offset++]; - block->pchksum = data[offset++]; - block->is_ychksum_present = data[offset++]; - block->ychksum = data[offset++]; - block->blk_size = get_unaligned_be32(&data[offset]); - offset += 4; - block->nr_subblocks = get_unaligned_be32(&data[offset]); - offset += 4; - - /* - * Fixed m68k compiling issue: - * 1. mapping table can save code field. - * 2. storing the dev_idx as a member of block can reduce unnecessary - * time and system resource comsumption of dev_idx mapping every - * time the block data writing to the dsp. - */ - block->dev_idx = map_dev_idx(tas_fmw, block); - - if (offset + block->blk_size > fmw->size) { - dev_err(tas_fmw->dev, "%s: nSublocks error\n", __func__); - return -EINVAL; - } - /* instead of kzalloc+memcpy */ - block->data = kmemdup(&data[offset], block->blk_size, GFP_KERNEL); - if (!block->data) - return -ENOMEM; - - offset += block->blk_size; - - return offset; -} - -/* Data of block parser function. */ -static int fw_parse_data_kernel(struct tasdevice_fw *tas_fmw, - struct tasdevice_data *img_data, const struct firmware *fmw, - int offset) -{ - const unsigned char *data = fmw->data; - struct tasdev_blk *blk; - unsigned int i; - - if (offset + 4 > fmw->size) { - dev_err(tas_fmw->dev, "%s: File Size error\n", __func__); - return -EINVAL; - } - img_data->nr_blk = get_unaligned_be32(&data[offset]); - offset += 4; - - img_data->dev_blks = kcalloc(img_data->nr_blk, - sizeof(struct tasdev_blk), GFP_KERNEL); - if (!img_data->dev_blks) - return -ENOMEM; - - for (i = 0; i < img_data->nr_blk; i++) { - blk = &img_data->dev_blks[i]; - offset = fw_parse_block_data_kernel( - tas_fmw, blk, fmw, offset); - if (offset < 0) { - kfree(img_data->dev_blks); - return -EINVAL; - } - } - - return offset; -} - -/* Data of DSP program parser function. */ -static int fw_parse_program_data_kernel( - struct tasdevice_priv *tas_priv, struct tasdevice_fw *tas_fmw, - const struct firmware *fmw, int offset) -{ - struct tasdevice_prog *program; - unsigned int i; - - for (i = 0; i < tas_fmw->nr_programs; i++) { - program = &tas_fmw->programs[i]; - if (offset + 72 > fmw->size) { - dev_err(tas_priv->dev, "%s: mpName error\n", __func__); - return -EINVAL; - } - /* skip 72 unused byts */ - offset += 72; - - offset = fw_parse_data_kernel(tas_fmw, &program->dev_data, - fmw, offset); - if (offset < 0) - break; - } - - return offset; -} - -/* Data of DSP configurations parser function. */ -static int fw_parse_configuration_data_kernel(struct tasdevice_priv *tas_priv, - struct tasdevice_fw *tas_fmw, const struct firmware *fmw, int offset) -{ - const unsigned char *data = fmw->data; - struct tasdevice_config *config; - unsigned int i; - - for (i = 0; i < tas_fmw->nr_configurations; i++) { - config = &tas_fmw->configs[i]; - if (offset + 80 > fmw->size) { - dev_err(tas_priv->dev, "%s: mpName error\n", __func__); - return -EINVAL; - } - memcpy(config->name, &data[offset], 64); - /* skip extra 16 bytes */ - offset += 80; - - offset = fw_parse_data_kernel(tas_fmw, &config->dev_data, - fmw, offset); - if (offset < 0) - break; - } - - return offset; -} - -/* DSP firmware file header parser function for early PPC3 firmware binary. */ -static int fw_parse_variable_header_kernel(struct tasdevice_priv *tas_priv, - const struct firmware *fmw, int offset) -{ - struct tasdevice_fw *tas_fmw = tas_priv->fmw; - struct tasdevice_dspfw_hdr *fw_hdr = &tas_fmw->fw_hdr; - struct tasdevice_config *config; - struct tasdevice_prog *program; - const unsigned char *buf = fmw->data; - unsigned short max_confs; - unsigned int i; - - if (offset + 12 + 4 * TASDEVICE_MAXPROGRAM_NUM_KERNEL > fmw->size) { - dev_err(tas_priv->dev, "%s: File Size error\n", __func__); - return -EINVAL; - } - fw_hdr->device_family = get_unaligned_be16(&buf[offset]); - if (fw_hdr->device_family != 0) { - dev_err(tas_priv->dev, "%s:not TAS device\n", __func__); - return -EINVAL; - } - offset += 2; - fw_hdr->device = get_unaligned_be16(&buf[offset]); - if (fw_hdr->device >= TASDEVICE_DSP_TAS_MAX_DEVICE || - fw_hdr->device == 6) { - dev_err(tas_priv->dev, "Unsupported dev %d\n", fw_hdr->device); - return -EINVAL; - } - offset += 2; - - tas_fmw->nr_programs = get_unaligned_be32(&buf[offset]); - offset += 4; - - if (tas_fmw->nr_programs == 0 || - tas_fmw->nr_programs > TASDEVICE_MAXPROGRAM_NUM_KERNEL) { - dev_err(tas_priv->dev, "mnPrograms is invalid\n"); - return -EINVAL; - } - - tas_fmw->programs = kcalloc(tas_fmw->nr_programs, - sizeof(*tas_fmw->programs), GFP_KERNEL); - if (!tas_fmw->programs) - return -ENOMEM; - - for (i = 0; i < tas_fmw->nr_programs; i++) { - program = &tas_fmw->programs[i]; - program->prog_size = get_unaligned_be32(&buf[offset]); - offset += 4; - } - - /* Skip the unused prog_size */ - offset += 4 * (TASDEVICE_MAXPROGRAM_NUM_KERNEL - tas_fmw->nr_programs); - - tas_fmw->nr_configurations = get_unaligned_be32(&buf[offset]); - offset += 4; - - /* - * The max number of config in firmware greater than 4 pieces of - * tas2781s is different from the one lower than 4 pieces of - * tas2781s. - */ - max_confs = TASDEVICE_MAXCONFIG_NUM_KERNEL; - if (tas_fmw->nr_configurations == 0 || - tas_fmw->nr_configurations > max_confs) { - dev_err(tas_priv->dev, "%s: Conf is invalid\n", __func__); - kfree(tas_fmw->programs); - return -EINVAL; - } - - if (offset + 4 * max_confs > fmw->size) { - dev_err(tas_priv->dev, "%s: mpConfigurations err\n", __func__); - kfree(tas_fmw->programs); - return -EINVAL; - } - - tas_fmw->configs = kcalloc(tas_fmw->nr_configurations, - sizeof(*tas_fmw->configs), GFP_KERNEL); - if (!tas_fmw->configs) { - kfree(tas_fmw->programs); - return -ENOMEM; - } - - for (i = 0; i < tas_fmw->nr_programs; i++) { - config = &tas_fmw->configs[i]; - config->cfg_size = get_unaligned_be32(&buf[offset]); - offset += 4; - } - - /* Skip the unused configs */ - offset += 4 * (max_confs - tas_fmw->nr_programs); - - return offset; -} - -/* - * In sub-block data, have three type sub-block: - * 1. Single byte write. - * 2. Multi-byte write. - * 3. Delay. - * 4. Bits update. - * This function perform single byte write to device. - */ -static int tasdevice_single_byte_wr(void *context, int dev_idx, - unsigned char *data, int sublocksize) -{ - struct tasdevice_priv *tas_priv = context; - unsigned short len = get_unaligned_be16(&data[2]); - int i, subblk_offset, rc; - - subblk_offset = 4; - if (subblk_offset + 4 * len > sublocksize) { - dev_err(tas_priv->dev, "process_block: Out of boundary\n"); - return 0; - } - - for (i = 0; i < len; i++) { - if (dev_idx == (tas_priv->index + 1) || dev_idx == 0) { - rc = tasdevice_spi_dev_write(tas_priv, - TASDEVICE_REG(data[subblk_offset], - data[subblk_offset + 1], - data[subblk_offset + 2]), - data[subblk_offset + 3]); - if (rc < 0) { - dev_err(tas_priv->dev, - "process_block: single write error\n"); - subblk_offset |= OFFSET_ERROR_BIT; - } - } - subblk_offset += 4; - } - - return subblk_offset; -} - -/* - * In sub-block data, have three type sub-block: - * 1. Single byte write. - * 2. Multi-byte write. - * 3. Delay. - * 4. Bits update. - * This function perform multi-write to device. - */ -static int tasdevice_burst_wr(void *context, int dev_idx, unsigned char *data, - int sublocksize) -{ - struct tasdevice_priv *tas_priv = context; - unsigned short len = get_unaligned_be16(&data[2]); - int subblk_offset, rc; - - subblk_offset = 4; - if (subblk_offset + 4 + len > sublocksize) { - dev_err(tas_priv->dev, "%s: BST Out of boundary\n", __func__); - subblk_offset |= OFFSET_ERROR_BIT; - } - if (len % 4) { - dev_err(tas_priv->dev, "%s:Bst-len(%u)not div by 4\n", - __func__, len); - subblk_offset |= OFFSET_ERROR_BIT; - } - - if (dev_idx == (tas_priv->index + 1) || dev_idx == 0) { - rc = tasdevice_spi_dev_bulk_write(tas_priv, - TASDEVICE_REG(data[subblk_offset], - data[subblk_offset + 1], - data[subblk_offset + 2]), - &data[subblk_offset + 4], len); - if (rc < 0) { - dev_err(tas_priv->dev, "%s: bulk_write error = %d\n", - __func__, rc); - subblk_offset |= OFFSET_ERROR_BIT; - } - } - subblk_offset += (len + 4); - - return subblk_offset; -} - -/* Just delay for ms.*/ -static int tasdevice_delay(void *context, int dev_idx, unsigned char *data, - int sublocksize) -{ - struct tasdevice_priv *tas_priv = context; - unsigned int sleep_time, subblk_offset = 2; - - if (subblk_offset + 2 > sublocksize) { - dev_err(tas_priv->dev, "%s: delay Out of boundary\n", - __func__); - subblk_offset |= OFFSET_ERROR_BIT; - } - if (dev_idx == (tas_priv->index + 1) || dev_idx == 0) { - sleep_time = get_unaligned_be16(&data[2]) * 1000; - fsleep(sleep_time); - } - subblk_offset += 2; - - return subblk_offset; -} - -/* - * In sub-block data, have three type sub-block: - * 1. Single byte write. - * 2. Multi-byte write. - * 3. Delay. - * 4. Bits update. - * This function perform bits update. - */ -static int tasdevice_field_wr(void *context, int dev_idx, unsigned char *data, - int sublocksize) -{ - struct tasdevice_priv *tas_priv = context; - int rc, subblk_offset = 2; - - if (subblk_offset + 6 > sublocksize) { - dev_err(tas_priv->dev, "%s: bit write Out of boundary\n", - __func__); - subblk_offset |= OFFSET_ERROR_BIT; - } - if (dev_idx == (tas_priv->index + 1) || dev_idx == 0) { - rc = tasdevice_spi_dev_update_bits(tas_priv, - TASDEVICE_REG(data[subblk_offset + 2], - data[subblk_offset + 3], - data[subblk_offset + 4]), - data[subblk_offset + 1], - data[subblk_offset + 5]); - if (rc < 0) { - dev_err(tas_priv->dev, "%s: update_bits error = %d\n", - __func__, rc); - subblk_offset |= OFFSET_ERROR_BIT; - } - } - subblk_offset += 6; - - return subblk_offset; -} - -/* Data block process function. */ -static int tasdevice_process_block(void *context, unsigned char *data, - unsigned char dev_idx, int sublocksize) -{ - struct tasdevice_priv *tas_priv = context; - int blktyp = dev_idx & 0xC0, subblk_offset; - unsigned char subblk_typ = data[1]; - - switch (subblk_typ) { - case TASDEVICE_CMD_SING_W: - subblk_offset = tasdevice_single_byte_wr(tas_priv, - dev_idx & 0x3f, data, sublocksize); - break; - case TASDEVICE_CMD_BURST: - subblk_offset = tasdevice_burst_wr(tas_priv, - dev_idx & 0x3f, data, sublocksize); - break; - case TASDEVICE_CMD_DELAY: - subblk_offset = tasdevice_delay(tas_priv, - dev_idx & 0x3f, data, sublocksize); - break; - case TASDEVICE_CMD_FIELD_W: - subblk_offset = tasdevice_field_wr(tas_priv, - dev_idx & 0x3f, data, sublocksize); - break; - default: - subblk_offset = 2; - break; - } - if (((subblk_offset & OFFSET_ERROR_BIT) != 0) && blktyp != 0) { - if (blktyp == 0x80) { - tas_priv->cur_prog = -1; - tas_priv->cur_conf = -1; - } else - tas_priv->cur_conf = -1; - } - subblk_offset &= ~OFFSET_ERROR_BIT; - - return subblk_offset; -} - -/* - * Device support different configurations for different scene, - * this function was used for choose different config. - */ -void tasdevice_spi_select_cfg_blk(void *pContext, int conf_no, - unsigned char block_type) -{ - struct tasdevice_priv *tas_priv = pContext; - struct tasdevice_rca *rca = &tas_priv->rcabin; - struct tasdevice_config_info **cfg_info = rca->cfg_info; - struct tasdev_blk_data **blk_data; - unsigned int j, k; - - if (conf_no >= rca->ncfgs || conf_no < 0 || !cfg_info) { - dev_err(tas_priv->dev, "conf_no should be not more than %u\n", - rca->ncfgs); - return; - } - blk_data = cfg_info[conf_no]->blk_data; - - for (j = 0; j < cfg_info[conf_no]->real_nblocks; j++) { - unsigned int length = 0, rc = 0; - - if (block_type > 5 || block_type < 2) { - dev_err(tas_priv->dev, - "block_type should be in range from 2 to 5\n"); - break; - } - if (block_type != blk_data[j]->block_type) - continue; - - for (k = 0; k < blk_data[j]->n_subblks; k++) { - tas_priv->is_loading = true; - - rc = tasdevice_process_block(tas_priv, - blk_data[j]->regdata + length, - blk_data[j]->dev_idx, - blk_data[j]->block_size - length); - length += rc; - if (blk_data[j]->block_size < length) { - dev_err(tas_priv->dev, - "%s: %u %u out of boundary\n", - __func__, length, - blk_data[j]->block_size); - break; - } - } - if (length != blk_data[j]->block_size) - dev_err(tas_priv->dev, "%s: %u %u size is not same\n", - __func__, length, blk_data[j]->block_size); - } -} - -/* Block process function. */ -static int tasdevice_load_block_kernel( - struct tasdevice_priv *tasdevice, struct tasdev_blk *block) -{ - const unsigned int blk_size = block->blk_size; - unsigned char *data = block->data; - unsigned int i, length; - - for (i = 0, length = 0; i < block->nr_subblocks; i++) { - int rc = tasdevice_process_block(tasdevice, data + length, - block->dev_idx, blk_size - length); - if (rc < 0) { - dev_err(tasdevice->dev, - "%s: %u %u sublock write error\n", - __func__, length, blk_size); - return rc; - } - length += rc; - if (blk_size < length) { - dev_err(tasdevice->dev, "%s: %u %u out of boundary\n", - __func__, length, blk_size); - rc = -ENOMEM; - return rc; - } - } - - return 0; -} - -/* DSP firmware file header parser function. */ -static int fw_parse_variable_hdr(struct tasdevice_priv *tas_priv, - struct tasdevice_dspfw_hdr *fw_hdr, - const struct firmware *fmw, int offset) -{ - const unsigned char *buf = fmw->data; - int len = strlen((char *)&buf[offset]); - - len++; - - if (offset + len + 8 > fmw->size) { - dev_err(tas_priv->dev, "%s: File Size error\n", __func__); - return -EINVAL; - } - - offset += len; - - fw_hdr->device_family = get_unaligned_be32(&buf[offset]); - if (fw_hdr->device_family != 0) { - dev_err(tas_priv->dev, "%s: not TAS device\n", __func__); - return -EINVAL; - } - offset += 4; - - fw_hdr->device = get_unaligned_be32(&buf[offset]); - if (fw_hdr->device >= TASDEVICE_DSP_TAS_MAX_DEVICE || - fw_hdr->device == 6) { - dev_err(tas_priv->dev, "Unsupported dev %d\n", fw_hdr->device); - return -EINVAL; - } - offset += 4; - fw_hdr->ndev = 1; - - return offset; -} - -/* DSP firmware file header parser function for size variabled header. */ -static int fw_parse_variable_header_git(struct tasdevice_priv - *tas_priv, const struct firmware *fmw, int offset) -{ - struct tasdevice_fw *tas_fmw = tas_priv->fmw; - struct tasdevice_dspfw_hdr *fw_hdr = &tas_fmw->fw_hdr; - - offset = fw_parse_variable_hdr(tas_priv, fw_hdr, fmw, offset); - - return offset; -} - -/* DSP firmware file block parser function. */ -static int fw_parse_block_data(struct tasdevice_fw *tas_fmw, - struct tasdev_blk *block, const struct firmware *fmw, int offset) -{ - unsigned char *data = (unsigned char *)fmw->data; - int n; - - if (offset + 8 > fmw->size) { - dev_err(tas_fmw->dev, "%s: Type error\n", __func__); - return -EINVAL; - } - block->type = get_unaligned_be32(&data[offset]); - offset += 4; - - if (tas_fmw->fw_hdr.fixed_hdr.drv_ver >= PPC_DRIVER_CRCCHK) { - if (offset + 8 > fmw->size) { - dev_err(tas_fmw->dev, "PChkSumPresent error\n"); - return -EINVAL; - } - block->is_pchksum_present = data[offset]; - offset++; - - block->pchksum = data[offset]; - offset++; - - block->is_ychksum_present = data[offset]; - offset++; - - block->ychksum = data[offset]; - offset++; - } else { - block->is_pchksum_present = 0; - block->is_ychksum_present = 0; - } - - block->nr_cmds = get_unaligned_be32(&data[offset]); - offset += 4; - - n = block->nr_cmds * 4; - if (offset + n > fmw->size) { - dev_err(tas_fmw->dev, - "%s: File Size(%lu) error offset = %d n = %d\n", - __func__, (unsigned long)fmw->size, offset, n); - return -EINVAL; - } - /* instead of kzalloc+memcpy */ - block->data = kmemdup(&data[offset], n, GFP_KERNEL); - if (!block->data) - return -ENOMEM; - - offset += n; - - return offset; -} - -/* - * When parsing error occurs, all the memory resource will be released - * in the end of tasdevice_rca_ready. - */ -static int fw_parse_data(struct tasdevice_fw *tas_fmw, - struct tasdevice_data *img_data, const struct firmware *fmw, - int offset) -{ - const unsigned char *data = (unsigned char *)fmw->data; - struct tasdev_blk *blk; - unsigned int i, n; - - if (offset + 64 > fmw->size) { - dev_err(tas_fmw->dev, "%s: Name error\n", __func__); - return -EINVAL; - } - memcpy(img_data->name, &data[offset], 64); - offset += 64; - - n = strlen((char *)&data[offset]); - n++; - if (offset + n + 2 > fmw->size) { - dev_err(tas_fmw->dev, "%s: Description error\n", __func__); - return -EINVAL; - } - offset += n; - img_data->nr_blk = get_unaligned_be16(&data[offset]); - offset += 2; - - img_data->dev_blks = kcalloc(img_data->nr_blk, - sizeof(*img_data->dev_blks), GFP_KERNEL); - if (!img_data->dev_blks) - return -ENOMEM; - - for (i = 0; i < img_data->nr_blk; i++) { - blk = &img_data->dev_blks[i]; - offset = fw_parse_block_data(tas_fmw, blk, fmw, offset); - if (offset < 0) - return -EINVAL; - } - - return offset; -} - -/* - * When parsing error occurs, all the memory resource will be released - * in the end of tasdevice_rca_ready. - */ -static int fw_parse_program_data(struct tasdevice_priv *tas_priv, - struct tasdevice_fw *tas_fmw, const struct firmware *fmw, int offset) -{ - unsigned char *buf = (unsigned char *)fmw->data; - struct tasdevice_prog *program; - int i; - - if (offset + 2 > fmw->size) { - dev_err(tas_priv->dev, "%s: File Size error\n", __func__); - return -EINVAL; - } - tas_fmw->nr_programs = get_unaligned_be16(&buf[offset]); - offset += 2; - - if (tas_fmw->nr_programs == 0) { - /* Not error in calibration Data file, return directly */ - dev_dbg(tas_priv->dev, "%s: No Programs data, maybe calbin\n", - __func__); - return offset; - } - - tas_fmw->programs = - kcalloc(tas_fmw->nr_programs, sizeof(*tas_fmw->programs), - GFP_KERNEL); - if (!tas_fmw->programs) - return -ENOMEM; - - for (i = 0; i < tas_fmw->nr_programs; i++) { - int n = 0; - - program = &tas_fmw->programs[i]; - if (offset + 64 > fmw->size) { - dev_err(tas_priv->dev, "%s: mpName error\n", __func__); - return -EINVAL; - } - offset += 64; - - n = strlen((char *)&buf[offset]); - /* skip '\0' and 5 unused bytes */ - n += 6; - if (offset + n > fmw->size) { - dev_err(tas_priv->dev, "Description err\n"); - return -EINVAL; - } - - offset += n; - - offset = fw_parse_data(tas_fmw, &program->dev_data, fmw, - offset); - if (offset < 0) - return offset; - } - - return offset; -} - -/* - * When parsing error occurs, all the memory resource will be released - * in the end of tasdevice_rca_ready. - */ -static int fw_parse_configuration_data(struct tasdevice_priv *tas_priv, - struct tasdevice_fw *tas_fmw, const struct firmware *fmw, int offset) -{ - unsigned char *data = (unsigned char *)fmw->data; - struct tasdevice_config *config; - unsigned int i, n; - - if (offset + 2 > fmw->size) { - dev_err(tas_priv->dev, "%s: File Size error\n", __func__); - return -EINVAL; - } - tas_fmw->nr_configurations = get_unaligned_be16(&data[offset]); - offset += 2; - - if (tas_fmw->nr_configurations == 0) { - dev_err(tas_priv->dev, "%s: Conf is zero\n", __func__); - /* Not error for calibration Data file, return directly */ - return offset; - } - tas_fmw->configs = kcalloc(tas_fmw->nr_configurations, - sizeof(*tas_fmw->configs), GFP_KERNEL); - if (!tas_fmw->configs) - return -ENOMEM; - for (i = 0; i < tas_fmw->nr_configurations; i++) { - config = &tas_fmw->configs[i]; - if (offset + 64 > fmw->size) { - dev_err(tas_priv->dev, "File Size err\n"); - return -EINVAL; - } - memcpy(config->name, &data[offset], 64); - offset += 64; - - n = strlen((char *)&data[offset]); - n += 15; - if (offset + n > fmw->size) { - dev_err(tas_priv->dev, "Description err\n"); - return -EINVAL; - } - offset += n; - offset = fw_parse_data(tas_fmw, &config->dev_data, - fmw, offset); - if (offset < 0) - break; - } - - return offset; -} - -/* yram5 page check. */ -static bool check_inpage_yram_rg(struct tas_crc *cd, - unsigned char reg, unsigned char len) -{ - bool in = false; - - if (reg <= TAS2781_YRAM5_END_REG && - reg >= TAS2781_YRAM5_START_REG) { - if (reg + len > TAS2781_YRAM5_END_REG) - cd->len = TAS2781_YRAM5_END_REG - reg + 1; - else - cd->len = len; - cd->offset = reg; - in = true; - } else if (reg < TAS2781_YRAM5_START_REG) { - if (reg + len > TAS2781_YRAM5_START_REG) { - cd->offset = TAS2781_YRAM5_START_REG; - cd->len = len - TAS2781_YRAM5_START_REG + reg; - in = true; - } - } - - return in; -} - -/* DSP firmware yram block check. */ -static bool check_inpage_yram_bk1(struct tas_crc *cd, - unsigned char page, unsigned char reg, unsigned char len) -{ - bool in = false; - - if (page == TAS2781_YRAM1_PAGE) { - if (reg >= TAS2781_YRAM1_START_REG) { - cd->offset = reg; - cd->len = len; - in = true; - } else if (reg + len > TAS2781_YRAM1_START_REG) { - cd->offset = TAS2781_YRAM1_START_REG; - cd->len = len - TAS2781_YRAM1_START_REG + reg; - in = true; - } - } else if (page == TAS2781_YRAM3_PAGE) { - in = check_inpage_yram_rg(cd, reg, len); - } - - return in; -} - -/* - * Return Code: - * true -- the registers are in the inpage yram - * false -- the registers are NOT in the inpage yram - */ -static bool check_inpage_yram(struct tas_crc *cd, unsigned char book, - unsigned char page, unsigned char reg, unsigned char len) -{ - bool in = false; - - if (book == TAS2781_YRAM_BOOK1) - in = check_inpage_yram_bk1(cd, page, reg, len); - else if (book == TAS2781_YRAM_BOOK2 && page == TAS2781_YRAM5_PAGE) - in = check_inpage_yram_rg(cd, reg, len); - - return in; -} - -/* yram4 page check. */ -static bool check_inblock_yram_bk(struct tas_crc *cd, - unsigned char page, unsigned char reg, unsigned char len) -{ - bool in = false; - - if ((page >= TAS2781_YRAM4_START_PAGE && - page <= TAS2781_YRAM4_END_PAGE) || - (page >= TAS2781_YRAM2_START_PAGE && - page <= TAS2781_YRAM2_END_PAGE)) { - if (reg <= TAS2781_YRAM2_END_REG && - reg >= TAS2781_YRAM2_START_REG) { - cd->offset = reg; - cd->len = len; - in = true; - } else if (reg < TAS2781_YRAM2_START_REG) { - if (reg + len - 1 >= TAS2781_YRAM2_START_REG) { - cd->offset = TAS2781_YRAM2_START_REG; - cd->len = reg + len - TAS2781_YRAM2_START_REG; - in = true; - } - } - } - - return in; -} - -/* - * Return Code: - * true -- the registers are in the inblock yram - * false -- the registers are NOT in the inblock yram - */ -static bool check_inblock_yram(struct tas_crc *cd, unsigned char book, - unsigned char page, unsigned char reg, unsigned char len) -{ - bool in = false; - - if (book == TAS2781_YRAM_BOOK1 || book == TAS2781_YRAM_BOOK2) - in = check_inblock_yram_bk(cd, page, reg, len); - - return in; -} - -/* yram page check. */ -static bool check_yram(struct tas_crc *cd, unsigned char book, - unsigned char page, unsigned char reg, unsigned char len) -{ - bool in; - - in = check_inpage_yram(cd, book, page, reg, len); - if (!in) - in = check_inblock_yram(cd, book, page, reg, len); - - return in; -} - -/* Checksum for data block. */ -static int tasdev_multibytes_chksum(struct tasdevice_priv *tasdevice, - unsigned char book, unsigned char page, - unsigned char reg, unsigned int len) -{ - struct tas_crc crc_data; - unsigned char crc_chksum = 0; - unsigned char nBuf1[128]; - int ret = 0, i; - bool in; - - if ((reg + len - 1) > 127) { - ret = -EINVAL; - dev_err(tasdevice->dev, "firmware error\n"); - goto end; - } - - if ((book == TASDEVICE_BOOK_ID(TAS2781_SA_COEFF_SWAP_REG)) && - (page == TASDEVICE_PAGE_ID(TAS2781_SA_COEFF_SWAP_REG)) && - (reg == TASDEVICE_REG_ID(TAS2781_SA_COEFF_SWAP_REG)) && - (len == 4)) { - /* DSP swap command, pass */ - ret = 0; - goto end; - } - - in = check_yram(&crc_data, book, page, reg, len); - if (!in) - goto end; - - if (len == 1) { - dev_err(tasdevice->dev, "firmware error\n"); - ret = -EINVAL; - goto end; - } - - ret = tasdevice_spi_dev_bulk_read(tasdevice, - TASDEVICE_REG(book, page, crc_data.offset), - nBuf1, crc_data.len); - if (ret < 0) - goto end; - - for (i = 0; i < crc_data.len; i++) { - if ((book == TASDEVICE_BOOK_ID(TAS2781_SA_COEFF_SWAP_REG)) && - (page == TASDEVICE_PAGE_ID(TAS2781_SA_COEFF_SWAP_REG)) && - ((i + crc_data.offset) >= - TASDEVICE_REG_ID(TAS2781_SA_COEFF_SWAP_REG)) && - ((i + crc_data.offset) <= - (TASDEVICE_REG_ID(TAS2781_SA_COEFF_SWAP_REG) + 4))) - /* DSP swap command, bypass */ - continue; - else - crc_chksum += crc8(tasdevice->crc8_lkp_tbl, &nBuf1[i], - 1, 0); - } - - ret = crc_chksum; - -end: - return ret; -} - -/* Checksum for single register. */ -static int do_singlereg_checksum(struct tasdevice_priv *tasdevice, - unsigned char book, unsigned char page, - unsigned char reg, unsigned char val) -{ - struct tas_crc crc_data; - unsigned int nData1; - int ret = 0; - bool in; - - /* DSP swap command, pass */ - if ((book == TASDEVICE_BOOK_ID(TAS2781_SA_COEFF_SWAP_REG)) && - (page == TASDEVICE_PAGE_ID(TAS2781_SA_COEFF_SWAP_REG)) && - (reg >= TASDEVICE_REG_ID(TAS2781_SA_COEFF_SWAP_REG)) && - (reg <= (TASDEVICE_REG_ID(TAS2781_SA_COEFF_SWAP_REG) + 4))) - return 0; - - in = check_yram(&crc_data, book, page, reg, 1); - if (!in) - return 0; - ret = tasdevice_spi_dev_read(tasdevice, - TASDEVICE_REG(book, page, reg), &nData1); - if (ret < 0) - return ret; - - if (nData1 != val) { - dev_err(tasdevice->dev, - "B[0x%x]P[0x%x]R[0x%x] W[0x%x], R[0x%x]\n", - book, page, reg, val, nData1); - tasdevice->err_code |= ERROR_YRAM_CRCCHK; - return -EAGAIN; - } - - ret = crc8(tasdevice->crc8_lkp_tbl, &val, 1, 0); - - return ret; -} - -/* Block type check. */ -static void set_err_prg_cfg(unsigned int type, struct tasdevice_priv *p) -{ - if ((type == MAIN_ALL_DEVICES) || (type == MAIN_DEVICE_A) || - (type == MAIN_DEVICE_B) || (type == MAIN_DEVICE_C) || - (type == MAIN_DEVICE_D)) - p->cur_prog = -1; - else - p->cur_conf = -1; -} - -/* Checksum for data bytes. */ -static int tasdev_bytes_chksum(struct tasdevice_priv *tas_priv, - struct tasdev_blk *block, unsigned char book, - unsigned char page, unsigned char reg, unsigned int len, - unsigned char val, unsigned char *crc_chksum) -{ - int ret; - - if (len > 1) - ret = tasdev_multibytes_chksum(tas_priv, book, page, reg, - len); - else - ret = do_singlereg_checksum(tas_priv, book, page, reg, val); - - if (ret > 0) { - *crc_chksum += ret; - goto end; - } - - if (ret != -EAGAIN) - goto end; - - block->nr_retry--; - if (block->nr_retry > 0) - goto end; - - set_err_prg_cfg(block->type, tas_priv); - -end: - return ret; -} - -/* Multi-data byte write. */ -static int tasdev_multibytes_wr(struct tasdevice_priv *tas_priv, - struct tasdev_blk *block, unsigned char book, - unsigned char page, unsigned char reg, unsigned char *data, - unsigned int len, unsigned int *nr_cmds, - unsigned char *crc_chksum) -{ - int ret; - - if (len > 1) { - ret = tasdevice_spi_dev_bulk_write(tas_priv, - TASDEVICE_REG(book, page, reg), data + 3, len); - if (ret < 0) - return ret; - if (block->is_ychksum_present) - ret = tasdev_bytes_chksum(tas_priv, block, - book, page, reg, len, 0, crc_chksum); - } else { - ret = tasdevice_spi_dev_write(tas_priv, - TASDEVICE_REG(book, page, reg), data[3]); - if (ret < 0) - return ret; - if (block->is_ychksum_present) - ret = tasdev_bytes_chksum(tas_priv, block, book, - page, reg, 1, data[3], crc_chksum); - } - - if (!block->is_ychksum_present || ret >= 0) { - *nr_cmds += 1; - if (len >= 2) - *nr_cmds += ((len - 2) / 4) + 1; - } - - return ret; -} - -/* Checksum for block. */ -static int tasdev_block_chksum(struct tasdevice_priv *tas_priv, - struct tasdev_blk *block) -{ - unsigned int nr_value; - int ret; - - ret = tasdevice_spi_dev_read(tas_priv, TASDEVICE_CHECKSUM, &nr_value); - if (ret < 0) { - dev_err(tas_priv->dev, "%s: read error %d.\n", __func__, ret); - set_err_prg_cfg(block->type, tas_priv); - return ret; - } - - if ((nr_value & 0xff) != block->pchksum) { - dev_err(tas_priv->dev, "%s: PChkSum err %d ", __func__, ret); - dev_err(tas_priv->dev, "PChkSum = 0x%x, Reg = 0x%x\n", - block->pchksum, (nr_value & 0xff)); - tas_priv->err_code |= ERROR_PRAM_CRCCHK; - ret = -EAGAIN; - block->nr_retry--; - - if (block->nr_retry <= 0) - set_err_prg_cfg(block->type, tas_priv); - } else { - tas_priv->err_code &= ~ERROR_PRAM_CRCCHK; - } - - return ret; -} - -/* Firmware block load function. */ -static int tasdev_load_blk(struct tasdevice_priv *tas_priv, - struct tasdev_blk *block) -{ - unsigned int sleep_time, len, nr_cmds; - unsigned char offset, book, page, val; - unsigned char *data = block->data; - unsigned char crc_chksum = 0; - int ret = 0; - - while (block->nr_retry > 0) { - if (block->is_pchksum_present) { - ret = tasdevice_spi_dev_write(tas_priv, - TASDEVICE_CHECKSUM, 0); - if (ret < 0) - break; - } - - if (block->is_ychksum_present) - crc_chksum = 0; - - nr_cmds = 0; - - while (nr_cmds < block->nr_cmds) { - data = block->data + nr_cmds * 4; - - book = data[0]; - page = data[1]; - offset = data[2]; - val = data[3]; - - nr_cmds++; - /* Single byte write */ - if (offset <= 0x7F) { - ret = tasdevice_spi_dev_write(tas_priv, - TASDEVICE_REG(book, page, offset), - val); - if (ret < 0) - break; - if (block->is_ychksum_present) { - ret = tasdev_bytes_chksum(tas_priv, - block, book, page, offset, - 1, val, &crc_chksum); - if (ret < 0) - break; - } - continue; - } - /* sleep command */ - if (offset == 0x81) { - /* book -- data[0] page -- data[1] */ - sleep_time = ((book << 8) + page)*1000; - fsleep(sleep_time); - continue; - } - /* Multiple bytes write */ - if (offset == 0x85) { - data += 4; - len = (book << 8) + page; - book = data[0]; - page = data[1]; - offset = data[2]; - ret = tasdev_multibytes_wr(tas_priv, - block, book, page, offset, data, - len, &nr_cmds, &crc_chksum); - if (ret < 0) - break; - } - } - if (ret == -EAGAIN) { - if (block->nr_retry > 0) - continue; - } else if (ret < 0) { - /* err in current device, skip it */ - break; - } - - if (block->is_pchksum_present) { - ret = tasdev_block_chksum(tas_priv, block); - if (ret == -EAGAIN) { - if (block->nr_retry > 0) - continue; - } else if (ret < 0) { - /* err in current device, skip it */ - break; - } - } - - if (block->is_ychksum_present) { - /* TBD, open it when FW ready */ - dev_err(tas_priv->dev, - "Blk YChkSum: FW = 0x%x, YCRC = 0x%x\n", - block->ychksum, crc_chksum); - - tas_priv->err_code &= - ~ERROR_YRAM_CRCCHK; - ret = 0; - } - /* skip current blk */ - break; - } - - return ret; -} - -/* Firmware block load function. */ -static int tasdevice_load_block(struct tasdevice_priv *tas_priv, - struct tasdev_blk *block) -{ - int ret = 0; - - block->nr_retry = 6; - if (tas_priv->is_loading == false) - return 0; - ret = tasdev_load_blk(tas_priv, block); - if (ret < 0) - dev_err(tas_priv->dev, "Blk (%d) load error\n", block->type); - - return ret; -} - -/* - * Select firmware binary parser & load callback functions by ppc3 version - * and firmware binary version. - */ -static int dspfw_default_callback(struct tasdevice_priv *tas_priv, - unsigned int drv_ver, unsigned int ppcver) -{ - int rc = 0; - - if (drv_ver == 0x100) { - if (ppcver >= PPC3_VERSION_BASE) { - tas_priv->fw_parse_variable_header = - fw_parse_variable_header_kernel; - tas_priv->fw_parse_program_data = - fw_parse_program_data_kernel; - tas_priv->fw_parse_configuration_data = - fw_parse_configuration_data_kernel; - tas_priv->tasdevice_load_block = - tasdevice_load_block_kernel; - } else if (ppcver == 0x00) { - tas_priv->fw_parse_variable_header = - fw_parse_variable_header_git; - tas_priv->fw_parse_program_data = - fw_parse_program_data; - tas_priv->fw_parse_configuration_data = - fw_parse_configuration_data; - tas_priv->tasdevice_load_block = - tasdevice_load_block; - } else { - dev_err(tas_priv->dev, - "Wrong PPCVer :0x%08x\n", ppcver); - rc = -EINVAL; - } - } else { - dev_err(tas_priv->dev, "Wrong DrvVer : 0x%02x\n", drv_ver); - rc = -EINVAL; - } - - return rc; -} - -/* DSP firmware binary file header parser function. */ -static int fw_parse_header(struct tasdevice_priv *tas_priv, - struct tasdevice_fw *tas_fmw, const struct firmware *fmw, int offset) -{ - struct tasdevice_dspfw_hdr *fw_hdr = &tas_fmw->fw_hdr; - struct tasdevice_fw_fixed_hdr *fw_fixed_hdr = &fw_hdr->fixed_hdr; - static const unsigned char magic_number[] = {0x35, 0x35, 0x35, 0x32, }; - const unsigned char *buf = (unsigned char *)fmw->data; - - if (offset + 92 > fmw->size) { - dev_err(tas_priv->dev, "%s: File Size error\n", __func__); - offset = -EINVAL; - goto out; - } - if (memcmp(&buf[offset], magic_number, 4)) { - dev_err(tas_priv->dev, "%s: Magic num NOT match\n", __func__); - offset = -EINVAL; - goto out; - } - offset += 4; - - /* - * Convert data[offset], data[offset + 1], data[offset + 2] and - * data[offset + 3] into host - */ - fw_fixed_hdr->fwsize = get_unaligned_be32(&buf[offset]); - offset += 4; - if (fw_fixed_hdr->fwsize != fmw->size) { - dev_err(tas_priv->dev, "File size not match, %lu %u", - (unsigned long)fmw->size, fw_fixed_hdr->fwsize); - offset = -EINVAL; - goto out; - } - offset += 4; - fw_fixed_hdr->ppcver = get_unaligned_be32(&buf[offset]); - offset += 8; - fw_fixed_hdr->drv_ver = get_unaligned_be32(&buf[offset]); - offset += 72; - -out: - return offset; -} - -/* DSP firmware binary file parser function. */ -static int tasdevice_dspfw_ready(const struct firmware *fmw, void *context) -{ - struct tasdevice_priv *tas_priv = context; - struct tasdevice_fw_fixed_hdr *fw_fixed_hdr; - struct tasdevice_fw *tas_fmw; - int offset = 0, ret = 0; - - if (!fmw || !fmw->data) { - dev_err(tas_priv->dev, "%s: Failed to read firmware %s\n", - __func__, tas_priv->coef_binaryname); - return -EINVAL; - } - - tas_priv->fmw = kzalloc(sizeof(*tas_priv->fmw), GFP_KERNEL); - if (!tas_priv->fmw) - return -ENOMEM; - tas_fmw = tas_priv->fmw; - tas_fmw->dev = tas_priv->dev; - offset = fw_parse_header(tas_priv, tas_fmw, fmw, offset); - - if (offset == -EINVAL) - return -EINVAL; - - fw_fixed_hdr = &tas_fmw->fw_hdr.fixed_hdr; - /* Support different versions of firmware */ - switch (fw_fixed_hdr->drv_ver) { - case 0x301: - case 0x302: - case 0x502: - case 0x503: - tas_priv->fw_parse_variable_header = - fw_parse_variable_header_kernel; - tas_priv->fw_parse_program_data = - fw_parse_program_data_kernel; - tas_priv->fw_parse_configuration_data = - fw_parse_configuration_data_kernel; - tas_priv->tasdevice_load_block = - tasdevice_load_block_kernel; - break; - case 0x202: - case 0x400: - tas_priv->fw_parse_variable_header = - fw_parse_variable_header_git; - tas_priv->fw_parse_program_data = - fw_parse_program_data; - tas_priv->fw_parse_configuration_data = - fw_parse_configuration_data; - tas_priv->tasdevice_load_block = - tasdevice_load_block; - break; - default: - ret = dspfw_default_callback(tas_priv, - fw_fixed_hdr->drv_ver, fw_fixed_hdr->ppcver); - if (ret) - return ret; - break; - } - - offset = tas_priv->fw_parse_variable_header(tas_priv, fmw, offset); - if (offset < 0) - return offset; - - offset = tas_priv->fw_parse_program_data(tas_priv, tas_fmw, fmw, - offset); - if (offset < 0) - return offset; - - offset = tas_priv->fw_parse_configuration_data(tas_priv, - tas_fmw, fmw, offset); - if (offset < 0) - ret = offset; - - return ret; -} - -/* DSP firmware binary file parser function. */ -int tasdevice_spi_dsp_parser(void *context) -{ - struct tasdevice_priv *tas_priv = context; - const struct firmware *fw_entry; - int ret; - - ret = request_firmware(&fw_entry, tas_priv->coef_binaryname, - tas_priv->dev); - if (ret) { - dev_err(tas_priv->dev, "%s: load %s error\n", __func__, - tas_priv->coef_binaryname); - return ret; - } - - ret = tasdevice_dspfw_ready(fw_entry, tas_priv); - release_firmware(fw_entry); - fw_entry = NULL; - - return ret; -} - -/* DSP firmware program block data remove function. */ -static void tasdev_dsp_prog_blk_remove(struct tasdevice_prog *prog) -{ - struct tasdevice_data *tas_dt; - struct tasdev_blk *blk; - unsigned int i; - - if (!prog) - return; - - tas_dt = &prog->dev_data; - - if (!tas_dt->dev_blks) - return; - - for (i = 0; i < tas_dt->nr_blk; i++) { - blk = &tas_dt->dev_blks[i]; - kfree(blk->data); - } - kfree(tas_dt->dev_blks); -} - -/* DSP firmware program block data remove function. */ -static void tasdev_dsp_prog_remove(struct tasdevice_prog *prog, - unsigned short nr) -{ - int i; - - for (i = 0; i < nr; i++) - tasdev_dsp_prog_blk_remove(&prog[i]); - kfree(prog); -} - -/* DSP firmware config block data remove function. */ -static void tasdev_dsp_cfg_blk_remove(struct tasdevice_config *cfg) -{ - struct tasdevice_data *tas_dt; - struct tasdev_blk *blk; - unsigned int i; - - if (cfg) { - tas_dt = &cfg->dev_data; - - if (!tas_dt->dev_blks) - return; - - for (i = 0; i < tas_dt->nr_blk; i++) { - blk = &tas_dt->dev_blks[i]; - kfree(blk->data); - } - kfree(tas_dt->dev_blks); - } -} - -/* DSP firmware config remove function. */ -static void tasdev_dsp_cfg_remove(struct tasdevice_config *config, - unsigned short nr) -{ - int i; - - for (i = 0; i < nr; i++) - tasdev_dsp_cfg_blk_remove(&config[i]); - kfree(config); -} - -/* DSP firmware remove function. */ -void tasdevice_spi_dsp_remove(void *context) -{ - struct tasdevice_priv *tas_dev = context; - - if (!tas_dev->fmw) - return; - - if (tas_dev->fmw->programs) - tasdev_dsp_prog_remove(tas_dev->fmw->programs, - tas_dev->fmw->nr_programs); - if (tas_dev->fmw->configs) - tasdev_dsp_cfg_remove(tas_dev->fmw->configs, - tas_dev->fmw->nr_configurations); - kfree(tas_dev->fmw); - tas_dev->fmw = NULL; -} - -/* DSP firmware calibration data remove function. */ -static void tas2781_clear_calfirmware(struct tasdevice_fw *tas_fmw) -{ - struct tasdevice_calibration *calibration; - struct tasdev_blk *block; - unsigned int blks; - int i; - - if (!tas_fmw->calibrations) - goto out; - - for (i = 0; i < tas_fmw->nr_calibrations; i++) { - calibration = &tas_fmw->calibrations[i]; - if (!calibration) - continue; - - if (!calibration->dev_data.dev_blks) - continue; - - for (blks = 0; blks < calibration->dev_data.nr_blk; blks++) { - block = &calibration->dev_data.dev_blks[blks]; - if (!block) - continue; - kfree(block->data); - } - kfree(calibration->dev_data.dev_blks); - } - kfree(tas_fmw->calibrations); -out: - kfree(tas_fmw); -} - -/* Calibration data from firmware remove function. */ -void tasdevice_spi_calbin_remove(void *context) -{ - struct tasdevice_priv *tas_priv = context; - - if (tas_priv->cali_data_fmw) { - tas2781_clear_calfirmware(tas_priv->cali_data_fmw); - tas_priv->cali_data_fmw = NULL; - } -} - -/* Configuration remove function. */ -void tasdevice_spi_config_info_remove(void *context) -{ - struct tasdevice_priv *tas_priv = context; - struct tasdevice_rca *rca = &tas_priv->rcabin; - struct tasdevice_config_info **ci = rca->cfg_info; - unsigned int i, j; - - if (!ci) - return; - for (i = 0; i < rca->ncfgs; i++) { - if (!ci[i]) - continue; - if (ci[i]->blk_data) { - for (j = 0; j < ci[i]->real_nblocks; j++) { - if (!ci[i]->blk_data[j]) - continue; - kfree(ci[i]->blk_data[j]->regdata); - kfree(ci[i]->blk_data[j]); - } - kfree(ci[i]->blk_data); - } - kfree(ci[i]); - } - kfree(ci); -} - -/* DSP firmware program block data load function. */ -static int tasdevice_load_data(struct tasdevice_priv *tas_priv, - struct tasdevice_data *dev_data) -{ - struct tasdev_blk *block; - unsigned int i; - int ret = 0; - - for (i = 0; i < dev_data->nr_blk; i++) { - block = &dev_data->dev_blks[i]; - ret = tas_priv->tasdevice_load_block(tas_priv, block); - if (ret < 0) - break; - } - - return ret; -} - -/* DSP firmware program load interface function. */ -int tasdevice_spi_prmg_load(void *context, int prm_no) -{ - struct tasdevice_priv *tas_priv = context; - struct tasdevice_fw *tas_fmw = tas_priv->fmw; - struct tasdevice_prog *program; - struct tasdevice_config *conf; - int ret = 0; - - if (!tas_fmw) { - dev_err(tas_priv->dev, "%s: Firmware is NULL\n", __func__); - return -EINVAL; - } - if (prm_no >= 0 && prm_no <= tas_fmw->nr_programs) { - tas_priv->cur_conf = 0; - tas_priv->is_loading = true; - program = &tas_fmw->programs[prm_no]; - ret = tasdevice_load_data(tas_priv, &program->dev_data); - if (ret < 0) { - dev_err(tas_priv->dev, "Program failed %d.\n", ret); - return ret; - } - tas_priv->cur_prog = prm_no; - - conf = &tas_fmw->configs[tas_priv->cur_conf]; - ret = tasdevice_load_data(tas_priv, &conf->dev_data); - if (ret < 0) - dev_err(tas_priv->dev, "Config failed %d.\n", ret); - } else { - dev_err(tas_priv->dev, - "%s: prm(%d) is not in range of Programs %u\n", - __func__, prm_no, tas_fmw->nr_programs); - return -EINVAL; - } - - return ret; -} - -/* RCABIN configuration switch interface function. */ -void tasdevice_spi_tuning_switch(void *context, int state) -{ - struct tasdevice_priv *tas_priv = context; - int profile_cfg_id = tas_priv->rcabin.profile_cfg_id; - - if (tas_priv->fw_state == TASDEVICE_DSP_FW_FAIL) { - dev_err(tas_priv->dev, "DSP bin file not loaded\n"); - return; - } - - if (state == 0) - tasdevice_spi_select_cfg_blk(tas_priv, profile_cfg_id, - TASDEVICE_BIN_BLK_PRE_POWER_UP); - else - tasdevice_spi_select_cfg_blk(tas_priv, profile_cfg_id, - TASDEVICE_BIN_BLK_PRE_SHUTDOWN); -} diff --git a/sound/soc/codecs/tas2781-comlib.c b/sound/soc/codecs/tas2781-comlib.c index 1e0b3aa95749..4df2edcfac40 100644 --- a/sound/soc/codecs/tas2781-comlib.c +++ b/sound/soc/codecs/tas2781-comlib.c @@ -21,8 +21,6 @@ #include <sound/soc.h> #include <sound/tas2781.h> -#define TASDEVICE_CRC8_POLYNOMIAL 0x4d - static const struct regmap_range_cfg tasdevice_ranges[] = { { .range_min = 0, @@ -122,7 +120,7 @@ int tasdevice_dev_read(struct tasdevice_priv *tas_priv, if (chn < tas_priv->ndev) { struct regmap *map = tas_priv->regmap; - ret = tasdevice_change_chn_book(tas_priv, chn, + ret = tas_priv->change_chn_book(tas_priv, chn, TASDEVICE_BOOK_ID(reg)); if (ret < 0) goto out; @@ -149,7 +147,7 @@ int tasdevice_dev_write(struct tasdevice_priv *tas_priv, if (chn < tas_priv->ndev) { struct regmap *map = tas_priv->regmap; - ret = tasdevice_change_chn_book(tas_priv, chn, + ret = tas_priv->change_chn_book(tas_priv, chn, TASDEVICE_BOOK_ID(reg)); if (ret < 0) goto out; @@ -179,7 +177,7 @@ int tasdevice_dev_bulk_write( if (chn < tas_priv->ndev) { struct regmap *map = tas_priv->regmap; - ret = tasdevice_change_chn_book(tas_priv, chn, + ret = tas_priv->change_chn_book(tas_priv, chn, TASDEVICE_BOOK_ID(reg)); if (ret < 0) goto out; @@ -208,7 +206,7 @@ int tasdevice_dev_bulk_read(struct tasdevice_priv *tas_priv, if (chn < tas_priv->ndev) { struct regmap *map = tas_priv->regmap; - ret = tasdevice_change_chn_book(tas_priv, chn, + ret = tas_priv->change_chn_book(tas_priv, chn, TASDEVICE_BOOK_ID(reg)); if (ret < 0) goto out; @@ -234,7 +232,7 @@ int tasdevice_dev_update_bits( if (chn < tas_priv->ndev) { struct regmap *map = tas_priv->regmap; - ret = tasdevice_change_chn_book(tas_priv, chn, + ret = tas_priv->change_chn_book(tas_priv, chn, TASDEVICE_BOOK_ID(reg)); if (ret < 0) goto out; @@ -340,6 +338,7 @@ int tasdevice_init(struct tasdevice_priv *tas_priv) tas_priv->cur_prog = -1; tas_priv->cur_conf = -1; + tas_priv->isspi = false; for (i = 0; i < tas_priv->ndev; i++) { tas_priv->tasdevice[i].cur_book = -1; @@ -347,6 +346,11 @@ int tasdevice_init(struct tasdevice_priv *tas_priv) tas_priv->tasdevice[i].cur_conf = -1; } + tas_priv->update_bits = tasdevice_dev_update_bits; + tas_priv->change_chn_book = tasdevice_change_chn_book; + tas_priv->dev_read = tasdevice_dev_read; + tas_priv->dev_bulk_read = tasdevice_dev_bulk_read; + mutex_init(&tas_priv->codec_lock); out: diff --git a/sound/soc/codecs/tas2781-fmwlib.c b/sound/soc/codecs/tas2781-fmwlib.c index 13a197468193..3dd76aff1b6e 100644 --- a/sound/soc/codecs/tas2781-fmwlib.c +++ b/sound/soc/codecs/tas2781-fmwlib.c @@ -803,8 +803,13 @@ static int tasdevice_process_block(void *context, unsigned char *data, chn = idx - 1; chnend = idx; } else { - chn = 0; - chnend = tas_priv->ndev; + if (tas_priv->isspi) { + chn = tas_priv->index; + chnend = chn + 1; + } else { + chn = 0; + chnend = tas_priv->ndev; + } } for (; chn < chnend; chn++) { @@ -896,7 +901,7 @@ static int tasdevice_process_block(void *context, unsigned char *data, is_err = true; break; } - rc = tasdevice_dev_update_bits(tas_priv, chn, + rc = tas_priv->update_bits(tas_priv, chn, TASDEVICE_REG(data[subblk_offset + 2], data[subblk_offset + 3], data[subblk_offset + 4]), @@ -1461,7 +1466,7 @@ static int tasdev_multibytes_chksum(struct tasdevice_priv *tasdevice, goto end; } - ret = tasdevice_dev_bulk_read(tasdevice, chn, + ret = tasdevice->dev_bulk_read(tasdevice, chn, TASDEVICE_REG(book, page, crc_data.offset), nBuf1, crc_data.len); if (ret < 0) @@ -1511,7 +1516,7 @@ static int do_singlereg_checksum(struct tasdevice_priv *tasdevice, in = check_yram(&crc_data, book, page, reg, 1); if (!in) goto end; - ret = tasdevice_dev_read(tasdevice, chl, + ret = tasdevice->dev_read(tasdevice, chl, TASDEVICE_REG(book, page, reg), &nData1); if (ret < 0) goto end; @@ -1615,7 +1620,7 @@ static int tasdev_block_chksum(struct tasdevice_priv *tas_priv, unsigned int nr_value; int ret; - ret = tasdevice_dev_read(tas_priv, chn, TASDEVICE_CHECKSUM_REG, + ret = tas_priv->dev_read(tas_priv, chn, TASDEVICE_CHECKSUM_REG, &nr_value); if (ret < 0) { dev_err(tas_priv->dev, "%s: Chn %d\n", __func__, chn); -- 2.43.0

3 2

Re: [PATCH v3 2/5] ASoC: qcom: sm8250: set card driver name from match data
by Mark Brown 25 Apr '25

25 Apr '25

On Fri, Apr 25, 2025 at 10:47:42PM +0200, Luca Weiss wrote: > On Fri Apr 25, 2025 at 9:03 PM CEST, Mark Brown wrote: > > Or base it on my tree and let things get sorted in the merge, I don't > > know what the conflicts might be? > For this patch here it might be okay but patch 3/5 from this series very > much depends on the patch in Greg's tree, given it refactors/expands on > the USB_RX if there. Resolving this through merge wouldn't be very > pretty. Well, unfortunately Greg didn't put things on a branch so yeah waiting for next release might be easiest.

1 0

Re: [PATCH v3 2/5] ASoC: qcom: sm8250: set card driver name from match data
by Mark Brown 25 Apr '25

25 Apr '25

On Fri, Apr 25, 2025 at 08:19:39PM +0200, Luca Weiss wrote: > I've based this series on next-20250417 tag, so this is probably due to > the changes from the USB sound offloading series that Greg has picked > up. > So either Greg also picks up these changes when they're ready, or we > wait until 6.17? Or base it on my tree and let things get sorted in the merge, I don't know what the conflicts might be?

1 0

[PATCH 1/3] ASoC: amd: acp: Fix NULL pointer deref on acp resume path
by Venkata Prasad Potturu 25 Apr '25

25 Apr '25

update chip data using dev_get_drvdata(dev->parent) instead of dev_get_platdata(dev). BUG: kernel NULL pointer dereference, address: 0000000000000010 Call Trace: <TASK> ? __pfx_platform_pm_resume+0x10/0x10 platform_pm_resume+0x28/0x60 dpm_run_callback+0x51/0x1a0 device_resume+0x1a6/0x2b0 dpm_resume+0x168/0x230 Fixes: e3933683b25e ("ASoC: amd: acp: Remove redundant acp_dev_data structure") Signed-off-by: Venkata Prasad Potturu <venkataprasad.potturu(a)amd.com> --- sound/soc/amd/acp/acp-rembrandt.c | 2 +- sound/soc/amd/acp/acp-renoir.c | 2 +- sound/soc/amd/acp/acp63.c | 2 +- sound/soc/amd/acp/acp70.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/amd/acp/acp-rembrandt.c b/sound/soc/amd/acp/acp-rembrandt.c index 746b6ed72029..cccdd10c345e 100644 --- a/sound/soc/amd/acp/acp-rembrandt.c +++ b/sound/soc/amd/acp/acp-rembrandt.c @@ -199,7 +199,7 @@ static void rembrandt_audio_remove(struct platform_device *pdev) static int rmb_pcm_resume(struct device *dev) { - struct acp_chip_info *chip = dev_get_platdata(dev); + struct acp_chip_info *chip = dev_get_drvdata(dev->parent); struct acp_stream *stream; struct snd_pcm_substream *substream; snd_pcm_uframes_t buf_in_frames; diff --git a/sound/soc/amd/acp/acp-renoir.c b/sound/soc/amd/acp/acp-renoir.c index ebf0106fc737..04f6d70b6a92 100644 --- a/sound/soc/amd/acp/acp-renoir.c +++ b/sound/soc/amd/acp/acp-renoir.c @@ -146,7 +146,7 @@ static void renoir_audio_remove(struct platform_device *pdev) static int rn_pcm_resume(struct device *dev) { - struct acp_chip_info *chip = dev_get_platdata(dev); + struct acp_chip_info *chip = dev_get_drvdata(dev->parent); struct acp_stream *stream; struct snd_pcm_substream *substream; snd_pcm_uframes_t buf_in_frames; diff --git a/sound/soc/amd/acp/acp63.c b/sound/soc/amd/acp/acp63.c index 52d895e624c7..1f15c96a9b94 100644 --- a/sound/soc/amd/acp/acp63.c +++ b/sound/soc/amd/acp/acp63.c @@ -250,7 +250,7 @@ static void acp63_audio_remove(struct platform_device *pdev) static int acp63_pcm_resume(struct device *dev) { - struct acp_chip_info *chip = dev_get_platdata(dev); + struct acp_chip_info *chip = dev_get_drvdata(dev->parent); struct acp_stream *stream; struct snd_pcm_substream *substream; snd_pcm_uframes_t buf_in_frames; diff --git a/sound/soc/amd/acp/acp70.c b/sound/soc/amd/acp/acp70.c index 6d5f5ade075c..217b717e9beb 100644 --- a/sound/soc/amd/acp/acp70.c +++ b/sound/soc/amd/acp/acp70.c @@ -182,7 +182,7 @@ static void acp_acp70_audio_remove(struct platform_device *pdev) static int acp70_pcm_resume(struct device *dev) { - struct acp_chip_info *chip = dev_get_platdata(dev); + struct acp_chip_info *chip = dev_get_drvdata(dev->parent); struct acp_stream *stream; struct snd_pcm_substream *substream; snd_pcm_uframes_t buf_in_frames; -- 2.43.0

4 6

Re: [PATCH v3 2/5] ASoC: qcom: sm8250: set card driver name from match data
by Mark Brown 25 Apr '25

25 Apr '25

On Fri, Apr 25, 2025 at 10:07:26AM +0200, Luca Weiss wrote: > Sound machine drivers for Qualcomm SoCs can be reused across multiple > SoCs. But user space ALSA UCM files depend on the card driver name which > should be set per board/SoC. This doesn't apply against current code, please check and resend.

1 0

SSL2+ MK II "ucm is not supported for this device"
by GitHub issues - opened 25 Apr '25

25 Apr '25

alsa-project/alsa-ucm-conf issue #555 was opened from ATRAhassis: " ALSA lib parser.c:244:(error_node) UCM is not supported for this USB device (Solid State Logic SSL 2+ Mk II at usb-0000:0b:00.1-6, high speed @ USB31e9:0009) ALSA lib main.c:1554:(snd_use_case_mgr_open) error: failed to import hw:0 use case configuration -6 alsaucm: error failed to open sound card hw:0: No such device or address " i believe i just need to make a file for it but i am too new to understand exactly how. willing to help if i can get any direction. was told if a UCM can be made for this device that its helpful for all distros so i figured id make this issue ticket Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/555 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

DRAFT [for alsa-lib 1.2.15]: HDA: Handle better Bass speaker including 4 channel mode
by GitHub pull_request - edited 25 Apr '25

25 Apr '25

alsa-project/alsa-ucm-conf pull request #533 was edited from perexg: It's a follow up of #410 . Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/533 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/533.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

DRAFT [for alsa-lib 1.2.15] USB-Audio: Steinberg UR22C - fix capture channels for older firmware
by GitHub pull_request - edited 24 Apr '25

24 Apr '25

alsa-project/alsa-ucm-conf pull request #554 was edited from perexg: It seems that firmware version 3.20 added 4 capture channels while previous firmware has only 2 capture channels. Fixes: https://github.com/alsa-project/alsa-ucm-conf/issues/547 Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/554 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/554.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

USB-Audio: Steinberg UR22C - fix capture channels for older firmware
by GitHub pull_request - opened 24 Apr '25

24 Apr '25

alsa-project/alsa-ucm-conf pull request #554 was opened from perexg: It seems that firmware version 3.20 added 4 capture channels while previous firmware has only 2 capture channels. Fixes: https://github.com/alsa-project/alsa-ucm-conf/issues/547 Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/554 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/554.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

DRAFT [for alsa-lib-1.2.15]: USB-Audio: GoXLR: enable detection of beta firmware (25 channels)
by GitHub pull_request - edited 24 Apr '25

24 Apr '25

alsa-project/alsa-ucm-conf pull request #524 was edited from perexg: 'Syntax 8' is required (alsa-lib 1.2.14+) Fixes: 17f9b4f ("USB-Audio: GoXLR - fix the channel detection for mini, cleanups") Link: https://github.com/alsa-project/alsa-ucm-conf/issues/444 Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/524 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/524.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

GoXLR Mini (ALSA UCM error)
by GitHub issues - edited 24 Apr '25

24 Apr '25

alsa-project/alsa-ucm-conf issue #553 was edited from Crav07: The device seems to be functioning, but this error has came up after updating to Bazzite 42 from Bazzite 41. Here is the result after running "journalctl --user -u wireplumber --boot 0" Apr 24 10:52:12 fedora wireplumber[2409]: wp-internal-comp-loader: Loading profile 'main' Apr 24 10:52:12 fedora wireplumber[2409]: spa.alsa: Error in ALSA UCM profile for _ucm0003.hw:GoXLRMini,0 (HiFi: Line5: source> Apr 24 10:52:13 fedora wireplumber[2409]: spa.alsa: Errors in ALSA UCM profile for card GoXLRMini Apr 24 10:52:13 fedora wireplumber[2409]: spa.bluez5: BlueZ system service is not available Apr 24 11:30:31 fedora wireplumber[2409]: wp-event-dispatcher: <WpAsyncEventHook:0x557d66add4c0> failed: <WpSiStandardLink:0x5> (Edit: added results) Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/553 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

GoXLR Mini (ALSA UCM error)
by GitHub issues - opened 24 Apr '25

24 Apr '25

alsa-project/alsa-ucm-conf issue #553 was opened from Crav07: The device seems to be functioning, but this error has came up after updating to Bazzite 42 from Bazzite 41. Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/553 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

SSL2+ reports [ALSA UCM error] but seems to be working fine.
by GitHub issues - opened 24 Apr '25

24 Apr '25

alsa-project/alsa-ucm-conf issue #552 was opened from Steamvoker: Got redirected here from https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/4653 Don't want to just copy paste and issue here, but everything seems to be working fine, except that the device reports errors in KDE sound settings. Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/552 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Question about conversion kcontrol to component
by Kuninori Morimoto 24 Apr '25

24 Apr '25

Hi ALSA ML I have noticed that we have similar functions snd_soc_kcontrol_component() snd_soc_dapm_kcontrol_component() Both converts snd_kcontrol to snd_soc_component. I wonder can we merge these ? or which we can use is case-by-case ? Thank you for your help !! Best regards --- Kuninori Morimoto

1 0

Pioneer DJ DJM mixers channel names
by František Kučera 24 Apr '25

24 Apr '25

When working on DJM-V10, I noticed that other Pioneer mixers (like my older DJM-250MK2) have control names that do not comply with conventions described at <https://docs.kernel.org/sound/designs/control-names.html> and thus do not show in alsamixer under proper category (playback/capture) and they are all under playback. I am preparing a patch that will add "Playback Switch" or "Capture Switch" suffix to control names. But I am not sure about the prefix. Should it be "aux" or "PCM"? It is often the main function, so I tend rather to PCM than auxiliary... Could you give some advice regarding the mixer control names? Thanks, Franta

1 0

1.2.14: test suite build fails with `-Wincompatible-pointer-types` and `-Wold-style-definition` errors
by GitHub issues - opened 23 Apr '25

23 Apr '25

alsa-project/alsa-lib issue #452 was opened from kloczek: gcc 15.0.1 from fedora rawhide. <details> <summary>Test suite output</summary> ``` [tkloczko@pers-tkloczko alsa-lib-1.2.14]$ make check -k Making check in doc make[1]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/doc' Making check in pictures make[2]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/doc/pictures' make[2]: Nothing to be done for 'check'. make[2]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/doc/pictures' make[2]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/doc' make[2]: Nothing to be done for 'check-am'. make[2]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/doc' make[1]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/doc' Making check in include make[1]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/include' Making check in sound make[2]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/include/sound' Making check in uapi make[3]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/include/sound/uapi' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/include/sound/uapi' make[3]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/include/sound' make[3]: Nothing to be done for 'check-am'. make[3]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/include/sound' make[2]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/include/sound' make[2]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/include' if ! test -r alsa/local.h; then \ ln -s ../include alsa; \ fi for f in asoundlib.h version.h; do \ if ! test -r ../include/$f; then \ ln -s /home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/include/$f ../include/$f; \ fi; \ done make[2]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/include' make[1]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/include' Making check in src make[1]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src' make check-recursive make[2]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src' Making check in control make[3]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/control' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/control' Making check in mixer make[3]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/mixer' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/mixer' Making check in pcm make[3]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/pcm' make[4]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/pcm' make[4]: Nothing to be done for 'check-am'. make[4]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/pcm' make[3]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/pcm' Making check in timer make[3]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/timer' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/timer' Making check in rawmidi make[3]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/rawmidi' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/rawmidi' Making check in hwdep make[3]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/hwdep' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/hwdep' Making check in seq make[3]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/seq' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/seq' Making check in ucm make[3]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/ucm' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/ucm' Making check in conf make[3]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/conf' Making check in cards make[4]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/conf/cards' make[4]: Nothing to be done for 'check'. make[4]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/conf/cards' Making check in ctl make[4]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/conf/ctl' make[4]: Nothing to be done for 'check'. make[4]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/conf/ctl' Making check in pcm make[4]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/conf/pcm' make[4]: Nothing to be done for 'check'. make[4]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/conf/pcm' make[4]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/conf' make[4]: Nothing to be done for 'check-am'. make[4]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/conf' make[3]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/conf' make[3]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src' make[3]: Nothing to be done for 'check-am'. make[3]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src' make[2]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src' make[1]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src' Making check in src/topology make[1]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/topology' make[1]: Nothing to be done for 'check'. make[1]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/src/topology' Making check in modules make[1]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/modules' Making check in mixer make[2]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/modules/mixer' Making check in simple make[3]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/modules/mixer/simple' make[3]: Nothing to be done for 'check'. make[3]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/modules/mixer/simple' make[3]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/modules/mixer' make[3]: Nothing to be done for 'check-am'. make[3]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/modules/mixer' make[2]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/modules/mixer' make[2]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/modules' make[2]: Nothing to be done for 'check-am'. make[2]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/modules' make[1]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/modules' Making check in aserver make[1]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/aserver' make[1]: Nothing to be done for 'check'. make[1]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/aserver' Making check in test make[1]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/test' Making check in . make[2]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/test' make control pcm pcm_min latency seq seq-ump-example playmidi1 timer rawmidi midiloop umpinfo oldapi queue_timer namehint client_event_filter chmap audio_time user-ctl-element-set pcm-multi-thread make[3]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/test' make[3]: 'control' is up to date. make[3]: 'pcm' is up to date. make[3]: 'pcm_min' is up to date. make[3]: 'latency' is up to date. make[3]: 'seq' is up to date. make[3]: 'seq-ump-example' is up to date. CC playmidi1.o In file included from playmidi1.c:51: midifile.c: In function ‘readmt’: midifile.c:191:1: warning: old-style function definition [-Wold-style-definition] 191 | readmt (s) /* read through the "MThd" or "MTrk" header string */ | ^~~~~~ midifile.c: In function ‘readheader’: midifile.c:274:6: error: too many arguments to function ‘Mf_header’; expected 0, have 3 274 | (*Mf_header) (format, ntrks, division); | ~^~~~~~~~~~~ ~~~~~~ midifile.c: In function ‘readtrack’: midifile.c:437:11: error: too many arguments to function ‘chanmessage’; expected 0, have 3 437 | chanmessage (status, c1, (needed > 1) ? egetc () : 0); | ^~~~~~~~~~~ ~~~~~~ midifile.c:146:13: note: declared here 146 | static void chanmessage (); | ^~~~~~~~~~~ midifile.c:451:13: error: too many arguments to function ‘msgadd’; expected 0, have 1 451 | msgadd (egetc ()); | ^~~~~~ ~~~~~~~~ midifile.c:149:13: note: declared here 149 | static void msgadd (); | ^~~~~~ midifile.c:453:11: error: too many arguments to function ‘metaevent’; expected 0, have 1 453 | metaevent (type); | ^~~~~~~~~ ~~~~ midifile.c:144:13: note: declared here 144 | static void metaevent (); | ^~~~~~~~~ midifile.c:460:11: error: too many arguments to function ‘msgadd’; expected 0, have 1 460 | msgadd (0xf0); | ^~~~~~ ~~~~ midifile.c:149:13: note: declared here 149 | static void msgadd (); | ^~~~~~ midifile.c:463:13: error: too many arguments to function ‘msgadd’; expected 0, have 1 463 | msgadd (c = egetc ()); | ^~~~~~ ~~~~~~~~~~~~ midifile.c:149:13: note: declared here 149 | static void msgadd (); | ^~~~~~ midifile.c:479:13: error: too many arguments to function ‘msgadd’; expected 0, have 1 479 | msgadd (c = egetc ()); | ^~~~~~ ~~~~~~~~~~~~ midifile.c:149:13: note: declared here 149 | static void msgadd (); | ^~~~~~ midifile.c:484:18: error: too many arguments to function ‘Mf_arbitrary’; expected 0, have 2 484 | (*Mf_arbitrary) (msgleng (), msg ()); | ~^~~~~~~~~~~~~~ ~~~~~~~~~~ midifile.c:493:11: error: too many arguments to function ‘badbyte’; expected 0, have 1 493 | badbyte (c); | ^~~~~~~ ~ midifile.c:143:13: note: declared here 143 | static void badbyte (); | ^~~~~~~ midifile.c: In function ‘badbyte’: midifile.c:504:1: warning: old-style function definition [-Wold-style-definition] 504 | badbyte (c) | ^~~~~~~ midifile.c: At top level: midifile.c:515:1: error: conflicting types for ‘metaevent’; have ‘void(int)’ 515 | metaevent (int type) | ^~~~~~~~~ midifile.c:144:13: note: previous declaration of ‘metaevent’ with type ‘void(void)’ 144 | static void metaevent (); | ^~~~~~~~~ midifile.c: In function ‘metaevent’: midifile.c:524:23: error: too many arguments to function ‘to16bit’; expected 0, have 2 524 | (*Mf_seqnum) (to16bit (m[0], m[1])); | ^~~~~~~ ~~~~ midifile.c:139:12: note: declared here 139 | static int to16bit (); | ^~~~~~~ midifile.c:524:10: error: too many arguments to function ‘Mf_seqnum’; expected 0, have 1 524 | (*Mf_seqnum) (to16bit (m[0], m[1])); | ~^~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~ midifile.c:543:10: error: too many arguments to function ‘Mf_text’; expected 0, have 3 543 | (*Mf_text) (type, leng, m); | ~^~~~~~~~~ ~~~~ midifile.c:551:37: error: too many arguments to function ‘to32bit’; expected 0, have 4 551 | (*Mf_tempo) (Mf_currtempo = to32bit (0, m[0], m[1], m[2])); | ^~~~~~~ ~ midifile.c:137:13: note: declared here 137 | static long to32bit (); | ^~~~~~~ midifile.c:551:10: error: too many arguments to function ‘Mf_tempo’; expected 0, have 1 551 | (*Mf_tempo) (Mf_currtempo = to32bit (0, m[0], m[1], m[2])); | ~^~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ midifile.c:560:10: error: too many arguments to function ‘Mf_smpte’; expected 0, have 5 560 | (*Mf_smpte) (m[0], m[1], m[2], m[3], m[4]); | ~^~~~~~~~~~ ~~~~ midifile.c:564:10: error: too many arguments to function ‘Mf_timesig’; expected 0, have 4 564 | (*Mf_timesig) (m[0], m[1], m[2], m[3]); | ~^~~~~~~~~~~~ ~~~~ midifile.c:568:10: error: too many arguments to function ‘Mf_keysig’; expected 0, have 2 568 | (*Mf_keysig) (m[0], m[1]); | ~^~~~~~~~~~~ ~~~~ midifile.c:572:10: error: too many arguments to function ‘Mf_seqspecific’; expected 0, have 2 572 | (*Mf_seqspecific) (leng, m); | ~^~~~~~~~~~~~~~~~ ~~~~ midifile.c:576:10: error: too many arguments to function ‘Mf_metamisc’; expected 0, have 3 576 | (*Mf_metamisc) (type, leng, m); | ~^~~~~~~~~~~~~ ~~~~ midifile.c: In function ‘sysex’: midifile.c:585:6: error: too many arguments to function ‘Mf_sysex’; expected 0, have 2 585 | (*Mf_sysex) (msgleng (), msg ()); | ~^~~~~~~~~~ ~~~~~~~~~~ midifile.c: In function ‘chanmessage’: midifile.c:590:1: warning: old-style function definition [-Wold-style-definition] 590 | chanmessage (status, c1, c2) | ^~~~~~~~~~~ midifile.c:605:10: error: too many arguments to function ‘Mf_noteoff’; expected 0, have 3 605 | (*Mf_noteoff) (chan, c1, c2); | ~^~~~~~~~~~~~ ~~~~ midifile.c:609:10: error: too many arguments to function ‘Mf_noteon’; expected 0, have 3 609 | (*Mf_noteon) (chan, c1, c2); | ~^~~~~~~~~~~ ~~~~ midifile.c:613:10: error: too many arguments to function ‘Mf_pressure’; expected 0, have 3 613 | (*Mf_pressure) (chan, c1, c2); | ~^~~~~~~~~~~~~ ~~~~ midifile.c:617:10: error: too many arguments to function ‘Mf_parameter’; expected 0, have 3 617 | (*Mf_parameter) (chan, c1, c2); | ~^~~~~~~~~~~~~~ ~~~~ midifile.c:621:10: error: too many arguments to function ‘Mf_pitchbend’; expected 0, have 3 621 | (*Mf_pitchbend) (chan, c1, c2); | ~^~~~~~~~~~~~~~ ~~~~ midifile.c:625:10: error: too many arguments to function ‘Mf_program’; expected 0, have 2 625 | (*Mf_program) (chan, c1); | ~^~~~~~~~~~~~ ~~~~ midifile.c:629:10: error: too many arguments to function ‘Mf_chanpressure’; expected 0, have 2 629 | (*Mf_chanpressure) (chan, c1); | ~^~~~~~~~~~~~~~~~~ ~~~~ midifile.c: At top level: midifile.c:659:1: error: conflicting types for ‘to32bit’; have ‘long int(int, int, int, int)’ 659 | to32bit (int c1, int c2, int c3, int c4) | ^~~~~~~ midifile.c:137:13: note: previous declaration of ‘to32bit’ with type ‘long int(void)’ 137 | static long to32bit (); | ^~~~~~~ midifile.c: In function ‘to16bit’: midifile.c:671:1: warning: old-style function definition [-Wold-style-definition] 671 | to16bit (c1, c2) | ^~~~~~~ midifile.c: In function ‘read16bit’: midifile.c:695:10: error: too many arguments to function ‘to16bit’; expected 0, have 2 695 | return to16bit (c1, c2); | ^~~~~~~ ~~ midifile.c:671:1: note: declared here 671 | to16bit (c1, c2) | ^~~~~~~ midifile.c: In function ‘mferror’: midifile.c:700:1: warning: old-style function definition [-Wold-style-definition] 700 | mferror (s) | ^~~~~~~ midifile.c:704:6: error: too many arguments to function ‘Mf_error’; expected 0, have 1 704 | (*Mf_error) (s); | ~^~~~~~~~~~ ~ midifile.c: In function ‘msgadd’: midifile.c:739:1: warning: old-style function definition [-Wold-style-definition] 739 | msgadd (c) | ^~~~~~ midifile.c: In function ‘mfwrite’: midifile.c:808:1: warning: old-style function definition [-Wold-style-definition] 808 | mfwrite (format, ntracks, division, fp) | ^~~~~~~ midifile.c:811:1: error: number of arguments doesn’t match prototype 811 | { | ^ In file included from midifile.c:53: midifile.h:42:13: error: prototype declaration 42 | extern void mfwrite(); | ^~~~~~~ midifile.c:824:3: error: too many arguments to function ‘mf_write_header_chunk’; expected 0, have 3 824 | mf_write_header_chunk (format, ntracks, division); | ^~~~~~~~~~~~~~~~~~~~~ ~~~~~~ midifile.c:813:33: note: declared here 813 | void mf_write_track_chunk (), mf_write_header_chunk (); | ^~~~~~~~~~~~~~~~~~~~~ midifile.c:836:5: error: too many arguments to function ‘mf_write_track_chunk’; expected 0, have 2 836 | mf_write_track_chunk (i, fp); | ^~~~~~~~~~~~~~~~~~~~ ~ midifile.c:813:8: note: declared here 813 | void mf_write_track_chunk (), mf_write_header_chunk (); | ^~~~~~~~~~~~~~~~~~~~ midifile.c: In function ‘mf_write_track_chunk’: midifile.c:813:8: warning: old-style function definition [-Wold-style-definition] midifile.c:843:1: error: number of arguments doesn’t match prototype 843 | { | ^ midifile.c:813:8: error: prototype declaration 813 | void mf_write_track_chunk (), mf_write_header_chunk (); | ^~~~~~~~~~~~~~~~~~~~ midifile.c:863:3: error: too many arguments to function ‘write32bit’; expected 0, have 1 863 | write32bit (trkhdr); | ^~~~~~~~~~ ~~~~~~ midifile.c:846:23: note: declared here 846 | void write16bit (), write32bit (); | ^~~~~~~~~~ midifile.c:864:3: error: too many arguments to function ‘write32bit’; expected 0, have 1 864 | write32bit (trklength); | ^~~~~~~~~~ ~~~~~~~~~ midifile.c:846:23: note: declared here 846 | void write16bit (), write32bit (); | ^~~~~~~~~~ midifile.c:870:8: error: too many arguments to function ‘Mf_writetrack’; expected 0, have 1 870 | (*Mf_writetrack) (which_track); | ~^~~~~~~~~~~~~~~ ~~~~~~~~~~~ midifile.c:905:3: error: too many arguments to function ‘write32bit’; expected 0, have 1 905 | write32bit (trkhdr); | ^~~~~~~~~~ ~~~~~~ midifile.c:846:23: note: declared here 846 | void write16bit (), write32bit (); | ^~~~~~~~~~ midifile.c:906:3: error: too many arguments to function ‘write32bit’; expected 0, have 1 906 | write32bit (trklength); | ^~~~~~~~~~ ~~~~~~~~~ midifile.c:846:23: note: declared here 846 | void write16bit (), write32bit (); | ^~~~~~~~~~ midifile.c: In function ‘mf_write_header_chunk’: midifile.c:813:33: warning: old-style function definition [-Wold-style-definition] 813 | void mf_write_track_chunk (), mf_write_header_chunk (); | ^~~~~~~~~~~~~~~~~~~~~ midifile.c:915:1: error: number of arguments doesn’t match prototype 915 | { | ^ midifile.c:813:33: error: prototype declaration 813 | void mf_write_track_chunk (), mf_write_header_chunk (); | ^~~~~~~~~~~~~~~~~~~~~ midifile.c:924:3: error: too many arguments to function ‘write32bit’; expected 0, have 1 924 | write32bit (ident); | ^~~~~~~~~~ ~~~~~ midifile.c:917:23: note: declared here 917 | void write16bit (), write32bit (); | ^~~~~~~~~~ midifile.c:925:3: error: too many arguments to function ‘write32bit’; expected 0, have 1 925 | write32bit (length); | ^~~~~~~~~~ ~~~~~~ midifile.c:917:23: note: declared here 917 | void write16bit (), write32bit (); | ^~~~~~~~~~ midifile.c:926:3: error: too many arguments to function ‘write16bit’; expected 0, have 1 926 | write16bit (format); | ^~~~~~~~~~ ~~~~~~ midifile.c:917:8: note: declared here 917 | void write16bit (), write32bit (); | ^~~~~~~~~~ midifile.c:927:3: error: too many arguments to function ‘write16bit’; expected 0, have 1 927 | write16bit (ntracks); | ^~~~~~~~~~ ~~~~~~~ midifile.c:917:8: note: declared here 917 | void write16bit (), write32bit (); | ^~~~~~~~~~ midifile.c:928:3: error: too many arguments to function ‘write16bit’; expected 0, have 1 928 | write16bit (division); | ^~~~~~~~~~ ~~~~~~~~ midifile.c:917:8: note: declared here 917 | void write16bit (), write32bit (); | ^~~~~~~~~~ midifile.c: In function ‘mf_write_midi_event’: midifile.c:951:1: warning: old-style function definition [-Wold-style-definition] 951 | mf_write_midi_event (delta_time, type, chan, data, size) | ^~~~~~~~~~~~~~~~~~~ midifile.c:960:3: error: too many arguments to function ‘WriteVarLen’; expected 0, have 1 960 | WriteVarLen (delta_time); | ^~~~~~~~~~~ ~~~~~~~~~~ midifile.c:157:6: note: declared here 157 | void WriteVarLen (); | ^~~~~~~~~~~ midifile.c:976:5: error: too many arguments to function ‘eputc’; expected 0, have 1 976 | eputc (laststatus = c); | ^~~~~ ~~~~~~~~~~~~~~ midifile.c:151:12: note: declared here 151 | static int eputc (); | ^~~~~ midifile.c:979:5: error: too many arguments to function ‘WriteVarLen’; expected 0, have 1 979 | WriteVarLen (size); | ^~~~~~~~~~~ ~~~~ midifile.c:157:6: note: declared here 157 | void WriteVarLen (); | ^~~~~~~~~~~ midifile.c:983:5: error: too many arguments to function ‘eputc’; expected 0, have 1 983 | eputc (data[i]); | ^~~~~ ~~~~~~~ midifile.c:151:12: note: declared here 151 | static int eputc (); | ^~~~~ midifile.c: In function ‘mf_write_meta_event’: midifile.c:1003:1: warning: old-style function definition [-Wold-style-definition] 1003 | mf_write_meta_event (delta_time, type, data, size) | ^~~~~~~~~~~~~~~~~~~ midifile.c:1007:1: error: number of arguments doesn’t match prototype 1007 | { | ^ midifile.c:154:5: error: prototype declaration 154 | int mf_write_meta_event (); | ^~~~~~~~~~~~~~~~~~~ midifile.c:1010:3: error: too many arguments to function ‘WriteVarLen’; expected 0, have 1 1010 | WriteVarLen (delta_time); | ^~~~~~~~~~~ ~~~~~~~~~~ midifile.c:157:6: note: declared here 157 | void WriteVarLen (); | ^~~~~~~~~~~ midifile.c:1013:3: error: too many arguments to function ‘eputc’; expected 0, have 1 1013 | eputc (laststatus = meta_event); | ^~~~~ midifile.c:151:12: note: declared here 151 | static int eputc (); | ^~~~~ midifile.c:1016:3: error: too many arguments to function ‘eputc’; expected 0, have 1 1016 | eputc (type); | ^~~~~ ~~~~ midifile.c:151:12: note: declared here 151 | static int eputc (); | ^~~~~ midifile.c:1019:3: error: too many arguments to function ‘WriteVarLen’; expected 0, have 1 1019 | WriteVarLen (size); | ^~~~~~~~~~~ ~~~~ midifile.c:157:6: note: declared here 157 | void WriteVarLen (); | ^~~~~~~~~~~ midifile.c:1023:11: error: too many arguments to function ‘eputc’; expected 0, have 1 1023 | if (eputc (data[i]) != data[i]) | ^~~~~ ~~~~~~~ midifile.c:151:12: note: declared here 151 | static int eputc (); | ^~~~~ midifile.c: In function ‘mf_write_tempo’: midifile.c:1030:1: warning: old-style function definition [-Wold-style-definition] 1030 | mf_write_tempo (delta_time, tempo) | ^~~~~~~~~~~~~~ midifile.c:1033:1: error: number of arguments doesn’t match prototype 1033 | { | ^ midifile.c:155:6: error: prototype declaration 155 | void mf_write_tempo (); | ^~~~~~~~~~~~~~ midifile.c:1038:3: error: too many arguments to function ‘WriteVarLen’; expected 0, have 1 1038 | WriteVarLen (delta_time); | ^~~~~~~~~~~ ~~~~~~~~~~ midifile.c:157:6: note: declared here 157 | void WriteVarLen (); | ^~~~~~~~~~~ midifile.c:1039:3: error: too many arguments to function ‘eputc’; expected 0, have 1 1039 | eputc (laststatus = meta_event); | ^~~~~ midifile.c:151:12: note: declared here 151 | static int eputc (); | ^~~~~ midifile.c:1040:3: error: too many arguments to function ‘eputc’; expected 0, have 1 1040 | eputc (set_tempo); | ^~~~~ midifile.c:151:12: note: declared here 151 | static int eputc (); | ^~~~~ midifile.c:1042:3: error: too many arguments to function ‘eputc’; expected 0, have 1 1042 | eputc (3); | ^~~~~ ~ midifile.c:151:12: note: declared here 151 | static int eputc (); | ^~~~~ midifile.c:1043:3: error: too many arguments to function ‘eputc’; expected 0, have 1 1043 | eputc ((unsigned) (0xff & (tempo >> 16))); | ^~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ midifile.c:151:12: note: declared here 151 | static int eputc (); | ^~~~~ midifile.c:1044:3: error: too many arguments to function ‘eputc’; expected 0, have 1 1044 | eputc ((unsigned) (0xff & (tempo >> 8))); | ^~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ midifile.c:151:12: note: declared here 151 | static int eputc (); | ^~~~~ midifile.c:1045:3: error: too many arguments to function ‘eputc’; expected 0, have 1 1045 | eputc ((unsigned) (0xff & tempo)); | ^~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~ midifile.c:151:12: note: declared here 151 | static int eputc (); | ^~~~~ midifile.c: In function ‘mf_write_seqnum’: midifile.c:1049:1: warning: old-style function definition [-Wold-style-definition] 1049 | mf_write_seqnum (delta_time, seqnum) | ^~~~~~~~~~~~~~~ midifile.c:1052:1: error: number of arguments doesn’t match prototype 1052 | { | ^ midifile.c:156:6: error: prototype declaration 156 | void mf_write_seqnum (); | ^~~~~~~~~~~~~~~ midifile.c:1054:3: error: too many arguments to function ‘WriteVarLen’; expected 0, have 1 1054 | WriteVarLen (delta_time); | ^~~~~~~~~~~ ~~~~~~~~~~ midifile.c:157:6: note: declared here 157 | void WriteVarLen (); | ^~~~~~~~~~~ midifile.c:1055:3: error: too many arguments to function ‘eputc’; expected 0, have 1 1055 | eputc (laststatus = meta_event); | ^~~~~ midifile.c:151:12: note: declared here 151 | static int eputc (); | ^~~~~ midifile.c:1056:3: error: too many arguments to function ‘eputc’; expected 0, have 1 1056 | eputc (0); | ^~~~~ ~ midifile.c:151:12: note: declared here 151 | static int eputc (); | ^~~~~ midifile.c:1058:3: error: too many arguments to function ‘eputc’; expected 0, have 1 1058 | eputc ((unsigned) (0xff & (seqnum >> 8))); | ^~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ midifile.c:151:12: note: declared here 151 | static int eputc (); | ^~~~~ midifile.c:1059:3: error: too many arguments to function ‘eputc’; expected 0, have 1 1059 | eputc ((unsigned) (0xff & seqnum)); | ^~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~ midifile.c:151:12: note: declared here 151 | static int eputc (); | ^~~~~ midifile.c: In function ‘mf_sec2ticks’: midifile.c:1063:1: warning: old-style function definition [-Wold-style-definition] 1063 | mf_sec2ticks (secs, division, tempo) | ^~~~~~~~~~~~ midifile.c:1067:1: error: number of arguments doesn’t match prototype 1067 | { | ^ midifile.h:41:22: error: prototype declaration 41 | extern unsigned long mf_sec2ticks(); | ^~~~~~~~~~~~ midifile.c: In function ‘WriteVarLen’: midifile.c:1075:1: warning: old-style function definition [-Wold-style-definition] 1075 | WriteVarLen (value) | ^~~~~~~~~~~ midifile.c:1077:1: error: number of arguments doesn’t match prototype 1077 | { | ^ midifile.c:157:6: error: prototype declaration 157 | void WriteVarLen (); | ^~~~~~~~~~~ midifile.c:1089:7: error: too many arguments to function ‘eputc’; expected 0, have 1 1089 | eputc ((unsigned) (buffer & 0xff)); | ^~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~ midifile.c:151:12: note: declared here 151 | static int eputc (); | ^~~~~ midifile.c: In function ‘mf_ticks2sec’: midifile.c:1105:1: warning: old-style function definition [-Wold-style-definition] 1105 | mf_ticks2sec (ticks, division, tempo) | ^~~~~~~~~~~~ midifile.c: In function ‘write32bit’: midifile.c:917:23: warning: old-style function definition [-Wold-style-definition] 917 | void write16bit (), write32bit (); | ^~~~~~~~~~ midifile.c:1138:1: error: number of arguments doesn’t match prototype 1138 | { | ^ midifile.c:917:23: error: prototype declaration 917 | void write16bit (), write32bit (); | ^~~~~~~~~~ midifile.c:1139:3: error: too many arguments to function ‘eputc’; expected 0, have 1 1139 | eputc ((unsigned) ((data >> 24) & 0xff)); | ^~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ midifile.c:151:12: note: declared here 151 | static int eputc (); | ^~~~~ midifile.c:1140:3: error: too many arguments to function ‘eputc’; expected 0, have 1 1140 | eputc ((unsigned) ((data >> 16) & 0xff)); | ^~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ midifile.c:151:12: note: declared here 151 | static int eputc (); | ^~~~~ midifile.c:1141:3: error: too many arguments to function ‘eputc’; expected 0, have 1 1141 | eputc ((unsigned) ((data >> 8) & 0xff)); | ^~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ midifile.c:151:12: note: declared here 151 | static int eputc (); | ^~~~~ midifile.c:1142:3: error: too many arguments to function ‘eputc’; expected 0, have 1 1142 | eputc ((unsigned) (data & 0xff)); | ^~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~ midifile.c:151:12: note: declared here 151 | static int eputc (); | ^~~~~ midifile.c: In function ‘write16bit’: midifile.c:917:8: warning: old-style function definition [-Wold-style-definition] 917 | void write16bit (), write32bit (); | ^~~~~~~~~~ midifile.c:1148:1: error: number of arguments doesn’t match prototype 1148 | { | ^ midifile.c:917:8: error: prototype declaration 917 | void write16bit (), write32bit (); | ^~~~~~~~~~ midifile.c:1149:3: error: too many arguments to function ‘eputc’; expected 0, have 1 1149 | eputc ((unsigned) ((data & 0xff00) >> 8)); | ^~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ midifile.c:151:12: note: declared here 151 | static int eputc (); | ^~~~~ midifile.c:1150:3: error: too many arguments to function ‘eputc’; expected 0, have 1 1150 | eputc ((unsigned) (data & 0xff)); | ^~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~ midifile.c:151:12: note: declared here 151 | static int eputc (); | ^~~~~ midifile.c: In function ‘eputc’: midifile.c:1155:1: warning: old-style function definition [-Wold-style-definition] 1155 | eputc (c) | ^~~~~ midifile.c:1166:17: error: too many arguments to function ‘Mf_putc’; expected 0, have 1 1166 | return_val = (*Mf_putc) (c); | ~^~~~~~~~~ ~ playmidi1.c: In function ‘main’: playmidi1.c:591:19: error: assignment to ‘void (*)(void)’ from incompatible pointer type ‘void (*)(int, int, int)’ [-Wincompatible-pointer-types] 591 | Mf_header = do_header; | ^ playmidi1.c:151:13: note: ‘do_header’ declared here 151 | static void do_header(int format, int ntracks, int division) | ^~~~~~~~~ playmidi1.c:592:18: error: assignment to ‘void (*)(void)’ from incompatible pointer type ‘void (*)(int)’ [-Wincompatible-pointer-types] 592 | Mf_tempo = do_tempo; | ^ playmidi1.c:246:13: note: ‘do_tempo’ declared here 246 | static void do_tempo(int us) | ^~~~~~~~ playmidi1.c:594:17: error: assignment to ‘void (*)(void)’ from incompatible pointer type ‘void (*)(int, int, char *)’ [-Wincompatible-pointer-types] 594 | Mf_text = mytext; | ^ playmidi1.c:139:13: note: ‘mytext’ declared here 139 | static void mytext(int type ATTRIBUTE_UNUSED, int leng, char *msg) | ^~~~~~ playmidi1.c:596:19: error: assignment to ‘void (*)(void)’ from incompatible pointer type ‘void (*)(int, int, int)’ [-Wincompatible-pointer-types] 596 | Mf_noteon = do_noteon; | ^ playmidi1.c:266:13: note: ‘do_noteon’ declared here 266 | static void do_noteon(int chan, int pitch, int vol) | ^~~~~~~~~ playmidi1.c:597:20: error: assignment to ‘void (*)(void)’ from incompatible pointer type ‘void (*)(int, int, int)’ [-Wincompatible-pointer-types] 597 | Mf_noteoff = do_noteoff; | ^ playmidi1.c:278:13: note: ‘do_noteoff’ declared here 278 | static void do_noteoff(int chan, int pitch, int vol) | ^~~~~~~~~~ playmidi1.c:598:20: error: assignment to ‘void (*)(void)’ from incompatible pointer type ‘void (*)(int, int)’ [-Wincompatible-pointer-types] 598 | Mf_program = do_program; | ^ playmidi1.c:290:13: note: ‘do_program’ declared here 290 | static void do_program(int chan, int program) | ^~~~~~~~~~ playmidi1.c:599:22: error: assignment to ‘void (*)(void)’ from incompatible pointer type ‘void (*)(int, int, int)’ [-Wincompatible-pointer-types] 599 | Mf_parameter = do_parameter; | ^ playmidi1.c:302:13: note: ‘do_parameter’ declared here 302 | static void do_parameter(int chan, int control, int value) | ^~~~~~~~~~~~ playmidi1.c:600:22: error: assignment to ‘void (*)(void)’ from incompatible pointer type ‘void (*)(int, int, int)’ [-Wincompatible-pointer-types] 600 | Mf_pitchbend = do_pitchbend; | ^ playmidi1.c:314:13: note: ‘do_pitchbend’ declared here 314 | static void do_pitchbend(int chan, int lsb, int msb) | ^~~~~~~~~~~~ playmidi1.c:601:21: error: assignment to ‘void (*)(void)’ from incompatible pointer type ‘void (*)(int, int, int)’ [-Wincompatible-pointer-types] 601 | Mf_pressure = do_pressure; | ^ playmidi1.c:325:13: note: ‘do_pressure’ declared here 325 | static void do_pressure(int chan, int pitch, int pressure) | ^~~~~~~~~~~ playmidi1.c:602:25: error: assignment to ‘void (*)(void)’ from incompatible pointer type ‘void (*)(int, int)’ [-Wincompatible-pointer-types] 602 | Mf_chanpressure = do_chanpressure; | ^ playmidi1.c:336:13: note: ‘do_chanpressure’ declared here 336 | static void do_chanpressure(int chan, int pressure) | ^~~~~~~~~~~~~~~ playmidi1.c:603:18: error: assignment to ‘void (*)(void)’ from incompatible pointer type ‘void (*)(int, char *)’ [-Wincompatible-pointer-types] 603 | Mf_sysex = do_sysex; | ^ playmidi1.c:347:13: note: ‘do_sysex’ declared here 347 | static void do_sysex(int len, char *msg) | ^~~~~~~~ midifile.c: At top level: midifile.c:137:13: warning: ‘to32bit’ used but never defined 137 | static long to32bit (); | ^~~~~~~ midifile.c:144:13: warning: ‘metaevent’ used but never defined 144 | static void metaevent (); | ^~~~~~~~~ midifile.c:515:1: warning: ‘metaevent’ defined but not used [-Wunused-function] 515 | metaevent (int type) | ^~~~~~~~~ make[3]: *** [Makefile:626: playmidi1.o] Error 1 make[3]: Target 'playmidi1' not remade because of errors. make[3]: 'timer' is up to date. make[3]: 'rawmidi' is up to date. make[3]: 'midiloop' is up to date. make[3]: 'umpinfo' is up to date. make[3]: 'oldapi' is up to date. make[3]: 'queue_timer' is up to date. make[3]: 'namehint' is up to date. make[3]: 'client_event_filter' is up to date. make[3]: 'chmap' is up to date. make[3]: 'audio_time' is up to date. make[3]: 'user-ctl-element-set' is up to date. make[3]: 'pcm-multi-thread' is up to date. make[3]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/test' make[2]: *** [Makefile:819: check-am] Error 2 make[2]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/test' Making check in lsb make[2]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/test/lsb' make config midi_event make[3]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/test/lsb' make[3]: 'config' is up to date. make[3]: 'midi_event' is up to date. make[3]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/test/lsb' make check-TESTS make[3]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/test/lsb' make[4]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/test/lsb' PASS: config PASS: midi_event ============================================================================ Testsuite summary for alsa-lib 1.2.14 ============================================================================ # TOTAL: 2 # PASS: 2 # SKIP: 0 # XFAIL: 0 # FAIL: 0 # XPASS: 0 # ERROR: 0 ============================================================================ make[4]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/test/lsb' make[3]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/test/lsb' make[2]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/test/lsb' make[1]: *** [Makefile:669: check-recursive] Error 1 make[1]: Target 'check' not remade because of errors. make[1]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/test' Making check in utils make[1]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/utils' make[1]: Nothing to be done for 'check'. make[1]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14/utils' make[1]: Entering directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14' make[1]: Nothing to be done for 'check-am'. make[1]: Leaving directory '/home/tkloczko/rpmbuild/BUILD/alsa-lib-1.2.14' make: *** [Makefile:412: check-recursive] Error 1 make: Target 'check' not remade because of errors. ``` </details> Issue URL : https://github.com/alsa-project/alsa-lib/issues/452 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[PATCH v2 0/5] Add DisplayPort sound support for Fairphone 5 smartphone
by Luca Weiss 23 Apr '25

23 Apr '25

Add the necessary sound card bits and some dts additions to enable sound over DisplayPort-over-USB-C, e.g. to a connected TV or monitor. The UCM files can be found here: https://gitlab.postmarketos.org/postmarketOS/pmaports/-/tree/master/device/… This series - in spirit - depends on the series enabling DisplayPort in the first place, but can land pretty independently, especially the ASoC bits: https://lore.kernel.org/linux-arm-msm/20250312-fp5-pmic-glink-dp-v2-0-a5592… Signed-off-by: Luca Weiss <luca.weiss(a)fairphone.com> --- Changes in v2: - Revamp series based on comments on v1, doesn't have much too much in common anymore - Use sm8250 instead of sc8280xp sndcard file, so port other required changes from sc8280xp.c to sm8250.c - This also changes the sound card compatible to from qcom,qcm6490-sndcard to fairphone,fp5-sndcard - Link to v1: https://lore.kernel.org/r/20240809-fp5-dp-sound-v1-0-d7ba2c24f6b9@fairphone… --- Luca Weiss (5): ASoC: dt-bindings: qcom,sm8250: Add Fairphone 5 sound card ASoC: qcom: sm8250: set card driver name from match data ASoC: qcom: sm8250: add DisplayPort Jack support ASoC: qcom: sm8250: Add Fairphone 5 soundcard compatible arm64: dts: qcom: qcm6490-fairphone-fp5: Add DisplayPort sound support .../devicetree/bindings/sound/qcom,sm8250.yaml | 1 + arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts | 31 ++++++++++++++++++++++ sound/soc/qcom/sm8250.c | 28 +++++++++++-------- 3 files changed, 49 insertions(+), 11 deletions(-) --- base-commit: 7f1dd4e6634d085f3c9652d4e0f1903659fb96f9 change-id: 20240809-fp5-dp-sound-b3768f3019bd Best regards, -- Luca Weiss <luca.weiss(a)fairphone.com>

4 12

[PATCH] ALSA: usb-audio: Add Pioneer DJ DJM-V10 support
by František Kučera 22 Apr '25

22 Apr '25

From: František Kučera <franta-linux(a)frantovo.cz> Pioneer DJ DJM-V10 is a high end mixer that acts like a USB sound card. The MIDI controller part is standard but the PCM part is "vendor specific". Input and output is enabled by this patch: - 12 channels (6 stereo) in each direction - 44 100 / 48 000 / 96 000 Hz - S24_3LE Capture channels can be configured through alsamixer. Playback channels are fixed and controlled by hardware knobs on the mixer. Signed-off-by: František Kučera <franta-linux(a)frantovo.cz> --- sound/usb/mixer_quirks.c | 62 ++++++++++++++++++++++++++++++++++++++-- sound/usb/quirks-table.h | 51 +++++++++++++++++++++++++++++++++ sound/usb/quirks.c | 1 + 3 files changed, 111 insertions(+), 3 deletions(-) diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c index a90673d43822..01091c3a83fc 100644 --- a/sound/usb/mixer_quirks.c +++ b/sound/usb/mixer_quirks.c @@ -3525,10 +3525,13 @@ static int snd_rme_digiface_controls_create(struct usb_mixer_interface *mixer) #define SND_DJM_CAP_RECOUT 0x0a #define SND_DJM_CAP_RECOUT_NOMIC 0x0e #define SND_DJM_CAP_NONE 0x0f +#define SND_DJM_CAP_FXSEND 0x10 #define SND_DJM_CAP_CH1PFADER 0x11 #define SND_DJM_CAP_CH2PFADER 0x12 #define SND_DJM_CAP_CH3PFADER 0x13 #define SND_DJM_CAP_CH4PFADER 0x14 +#define SND_DJM_CAP_EXT1SEND 0x21 +#define SND_DJM_CAP_EXT2SEND 0x22 #define SND_DJM_CAP_CH1PREFADER 0x31 #define SND_DJM_CAP_CH2PREFADER 0x32 #define SND_DJM_CAP_CH3PREFADER 0x33 @@ -3559,6 +3562,7 @@ static int snd_rme_digiface_controls_create(struct usb_mixer_interface *mixer) #define SND_DJM_750MK2_IDX 0x4 #define SND_DJM_450_IDX 0x5 #define SND_DJM_A9_IDX 0x6 +#define SND_DJM_V10_IDX 0x7 #define SND_DJM_CTL(_name, suffix, _default_value, _windex) { \ @@ -3598,8 +3602,8 @@ static const char *snd_djm_get_label_caplevel_common(u16 wvalue) } }; -// The DJM-A9 has different capture levels than other, older models -static const char *snd_djm_get_label_caplevel_a9(u16 wvalue) +// Models like DJM-A9 or DJM-V10 have different capture levels than others +static const char *snd_djm_get_label_caplevel_high(u16 wvalue) { switch (wvalue) { case 0x0000: return "+15dB"; @@ -3627,6 +3631,7 @@ static const char *snd_djm_get_label_cap_common(u16 wvalue) case SND_DJM_CAP_RECOUT_NOMIC: return "Rec Out without Mic"; case SND_DJM_CAP_AUX: return "Aux"; case SND_DJM_CAP_NONE: return "None"; + case SND_DJM_CAP_FXSEND: return "FX SEND"; case SND_DJM_CAP_CH1PREFADER: return "Pre Fader Ch1"; case SND_DJM_CAP_CH2PREFADER: return "Pre Fader Ch2"; case SND_DJM_CAP_CH3PREFADER: return "Pre Fader Ch3"; @@ -3635,6 +3640,8 @@ static const char *snd_djm_get_label_cap_common(u16 wvalue) case SND_DJM_CAP_CH2PFADER: return "Post Fader Ch2"; case SND_DJM_CAP_CH3PFADER: return "Post Fader Ch3"; case SND_DJM_CAP_CH4PFADER: return "Post Fader Ch4"; + case SND_DJM_CAP_EXT1SEND: return "EXT1 SEND"; + case SND_DJM_CAP_EXT2SEND: return "EXT2 SEND"; default: return NULL; } }; @@ -3653,7 +3660,8 @@ static const char *snd_djm_get_label_cap_850(u16 wvalue) static const char *snd_djm_get_label_caplevel(u8 device_idx, u16 wvalue) { switch (device_idx) { - case SND_DJM_A9_IDX: return snd_djm_get_label_caplevel_a9(wvalue); + case SND_DJM_A9_IDX: return snd_djm_get_label_caplevel_high(wvalue); + case SND_DJM_V10_IDX: return snd_djm_get_label_caplevel_high(wvalue); default: return snd_djm_get_label_caplevel_common(wvalue); } }; @@ -3853,6 +3861,50 @@ static const struct snd_djm_ctl snd_djm_ctls_a9[] = { SND_DJM_CTL("Ch4 Input", a9_cap5, 2, SND_DJM_WINDEX_CAP) }; +// DJM-V10 +static const u16 snd_djm_opts_v10_cap_level[] = { + 0x0000, 0x0100, 0x0200, 0x0300, 0x0400, 0x0500 +}; +static const u16 snd_djm_opts_v10_cap1[] = { + 0x0103, + 0x0100, 0x0102, 0x0106, 0x0110, 0x0107, + 0x0108, 0x0109, 0x010a, 0x0121, 0x0122 +}; +static const u16 snd_djm_opts_v10_cap2[] = { + 0x0200, 0x0202, 0x0206, 0x0210, 0x0207, + 0x0208, 0x0209, 0x020a, 0x0221, 0x0222 +}; +static const u16 snd_djm_opts_v10_cap3[] = { + 0x0303, + 0x0300, 0x0302, 0x0306, 0x0310, 0x0307, + 0x0308, 0x0309, 0x030a, 0x0321, 0x0322 +}; +static const u16 snd_djm_opts_v10_cap4[] = { + 0x0403, + 0x0400, 0x0402, 0x0406, 0x0410, 0x0407, + 0x0408, 0x0409, 0x040a, 0x0421, 0x0422 +}; +static const u16 snd_djm_opts_v10_cap5[] = { + 0x0500, 0x0502, 0x0506, 0x0510, 0x0507, + 0x0508, 0x0509, 0x050a, 0x0521, 0x0522 +}; +static const u16 snd_djm_opts_v10_cap6[] = { + 0x0603, + 0x0600, 0x0602, 0x0606, 0x0610, 0x0607, + 0x0608, 0x0609, 0x060a, 0x0621, 0x0622 +}; + +static const struct snd_djm_ctl snd_djm_ctls_v10[] = { + SND_DJM_CTL("Master Capture Level Capture Switch", v10_cap_level, 0, SND_DJM_WINDEX_CAPLVL), + SND_DJM_CTL("Capture Ch1 Capture Switch", v10_cap1, 2, SND_DJM_WINDEX_CAP), + SND_DJM_CTL("Capture Ch2 Capture Switch", v10_cap2, 2, SND_DJM_WINDEX_CAP), + SND_DJM_CTL("Capture Ch3 Capture Switch", v10_cap3, 0, SND_DJM_WINDEX_CAP), + SND_DJM_CTL("Capture Ch4 Capture Switch", v10_cap4, 0, SND_DJM_WINDEX_CAP), + SND_DJM_CTL("Capture Ch5 Capture Switch", v10_cap5, 0, SND_DJM_WINDEX_CAP), + SND_DJM_CTL("Capture Ch6 Capture Switch", v10_cap6, 0, SND_DJM_WINDEX_CAP) + // playback channels are fixed and controlled by hardware knobs on the mixer +}; + static const struct snd_djm_device snd_djm_devices[] = { [SND_DJM_250MK2_IDX] = SND_DJM_DEVICE(250mk2), [SND_DJM_750_IDX] = SND_DJM_DEVICE(750), @@ -3861,6 +3913,7 @@ static const struct snd_djm_device snd_djm_devices[] = { [SND_DJM_750MK2_IDX] = SND_DJM_DEVICE(750mk2), [SND_DJM_450_IDX] = SND_DJM_DEVICE(450), [SND_DJM_A9_IDX] = SND_DJM_DEVICE(a9), + [SND_DJM_V10_IDX] = SND_DJM_DEVICE(v10), }; @@ -4151,6 +4204,9 @@ int snd_usb_mixer_apply_create_quirk(struct usb_mixer_interface *mixer) case USB_ID(0x2b73, 0x003c): /* Pioneer DJ / AlphaTheta DJM-A9 */ err = snd_djm_controls_create(mixer, SND_DJM_A9_IDX); break; + case USB_ID(0x2b73, 0x0034): /* Pioneer DJ DJM-V10 */ + err = snd_djm_controls_create(mixer, SND_DJM_V10_IDX); + break; } return err; diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 8954be23325c..eafc0d73cca1 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h @@ -3187,6 +3187,57 @@ YAMAHA_DEVICE(0x7010, "UB99"), } } }, +{ + /* + * Pioneer DJ DJM-V10 + */ + USB_DEVICE_VENDOR_SPEC(0x2b73, 0x0034), + QUIRK_DRIVER_INFO { + QUIRK_DATA_COMPOSITE { + { + QUIRK_DATA_AUDIOFORMAT(0) { + .formats = SNDRV_PCM_FMTBIT_S24_3LE, + .channels = 12, // outputs + .iface = 0, + .altsetting = 1, + .altset_idx = 1, + .endpoint = 0x01, + .ep_attr = USB_ENDPOINT_XFER_ISOC| + USB_ENDPOINT_SYNC_ASYNC, + .rates = SNDRV_PCM_RATE_44100| + SNDRV_PCM_RATE_48000| + SNDRV_PCM_RATE_96000, + .rate_min = 44100, + .rate_max = 96000, + .nr_rates = 3, + .rate_table = (unsigned int[]) { 44100, 48000, 96000 } + } + }, + { + QUIRK_DATA_AUDIOFORMAT(0) { + .formats = SNDRV_PCM_FMTBIT_S24_3LE, + .channels = 12, // inputs + .iface = 0, + .altsetting = 1, + .altset_idx = 1, + .endpoint = 0x82, + .ep_idx = 1, + .ep_attr = USB_ENDPOINT_XFER_ISOC| + USB_ENDPOINT_SYNC_ASYNC| + USB_ENDPOINT_USAGE_IMPLICIT_FB, + .rates = SNDRV_PCM_RATE_44100| + SNDRV_PCM_RATE_48000| + SNDRV_PCM_RATE_96000, + .rate_min = 44100, + .rate_max = 96000, + .nr_rates = 3, + .rate_table = (unsigned int[]) { 44100, 48000, 96000 } + } + }, + QUIRK_COMPOSITE_END + } + } +}, /* * MacroSilicon MS2100/MS2106 based AV capture cards diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 9112313a9dbc..4dcddab1a0e3 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1872,6 +1872,7 @@ void snd_usb_set_format_quirk(struct snd_usb_substream *subs, break; case USB_ID(0x2b73, 0x000a): /* Pioneer DJM-900NXS2 */ case USB_ID(0x2b73, 0x0013): /* Pioneer DJM-450 */ + case USB_ID(0x2b73, 0x0034): /* Pioneer DJM-V10 */ pioneer_djm_set_format_quirk(subs, 0x0082); break; case USB_ID(0x08e4, 0x017f): /* Pioneer DJM-750 */ -- 2.43.0

2 1

[PATCH 0/9] ALSA: usb-audio: More fixes / improvements on PCM
by Takashi Iwai 22 Apr '25

22 Apr '25

Hi, this is a patch set for USB-audio to fix and improve the PCM stream handling. The primary target is the enhancement of the low-latency playback that was introduced recently for dealing with the small period size (that is used typically by JACK). There are a few other fixes that are relevant with it. The current patches are found in topic/usb-audio branch of sound.git tree, too. Takashi === Takashi Iwai (9): ALSA: usb-audio: Restrict rates for the shared clocks ALSA: usb-audio: Fix possible race at sync of urb completions ALSA: usb-audio: Rename early_playback_start flag with lowlatency_playback ALSA: usb-audio: Disable low-latency playback for free-wheel mode ALSA: usb-audio: Disable low-latency mode for implicit feedback sync ALSA: usb-audio: Check available frames for the next packet size ALSA: usb-audio: Add spinlock to stop_urbs() ALSA: usb-audio: Improved lowlatency playback support ALSA: usb-audio: Avoid killing in-flight URBs during draining sound/usb/card.h | 11 ++- sound/usb/endpoint.c | 230 +++++++++++++++++++++++++++++++------------ sound/usb/endpoint.h | 13 ++- sound/usb/pcm.c | 157 ++++++++++++++++++++++------- 4 files changed, 305 insertions(+), 106 deletions(-) -- 2.26.2

2 23

acp3x-alc5682-max98357: Fix path of HiFi.conf
by GitHub pull_request - opened 22 Apr '25

22 Apr '25

alsa-project/alsa-ucm-conf pull request #551 was opened from meithecatte: Closes: https://github.com/alsa-project/alsa-ucm-conf/issues/550 Fixes: 1048796e7fa9 ("Rename ucm2/AMD/acp3xalc5682m98 to ucm2/AMD/acp3x-alc5682-max98357") Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/551 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/551.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Audio doesn't work on acp3xalc5682m98357 since 1.2.14
by GitHub issues - opened 22 Apr '25

22 Apr '25

alsa-project/alsa-ucm-conf issue #550 was opened from meithecatte: Since 1.2.14, pipewire doesn't detect the audio device, and trying to use `aplay` results in ``` ALSA lib pcm_dmix.c:1000:(snd_pcm_dmix_open) unable to open slave aplay: main:850: audio open error: No such file or directory ``` `aplay -l` lists ``` card 1: acp3xalc5682m98 [acp3xalc5682m98357], device 0: Playback rt5682-aif1-0 [] Subdevices: 1/1 Subdevice #0: subdevice #0 card 1: acp3xalc5682m98 [acp3xalc5682m98357], device 1: HiFi Playback HiFi-1 [] Subdevices: 1/1 Subdevice #0: subdevice #0 ``` `git bisect` says 0a87bd36b77e4e22397450d7ba3f9d36ce9eb5e0 is the first bad commit. Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/550 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH v1] ASoC: tas2781: Add "Acoustic Tuning" kcontrol for acoustic application
by Shenghao Ding 21 Apr '25

21 Apr '25

"Acoustic Tuning" kcontrol is a bridge to the acoustic tuning application tool which can tune the chips' acoustic effect. Signed-off-by: Shenghao Ding <shenghao-ding(a)ti.com> --- include/sound/tas2781.h | 13 ++++ sound/soc/codecs/tas2781-i2c.c | 138 ++++++++++++++++++++++++++++++++- 2 files changed, 149 insertions(+), 2 deletions(-) diff --git a/include/sound/tas2781.h b/include/sound/tas2781.h index eff011444cc8..a9c236ab8cba 100644 --- a/include/sound/tas2781.h +++ b/include/sound/tas2781.h @@ -32,6 +32,8 @@ SNDRV_PCM_FMTBIT_S24_LE | \ SNDRV_PCM_FMTBIT_S32_LE) +#define TASDEV_DATA_PAYLOAD_SIZE 128 + /* PAGE Control Register (available in page0 of each book) */ #define TASDEVICE_PAGE_SELECT 0x00 #define TASDEVICE_BOOKCTL_PAGE 0x00 @@ -159,10 +161,21 @@ struct calidata { unsigned int cali_dat_sz_per_dev; }; +struct acoustic_data { + unsigned char len; + unsigned char id; + unsigned char addr; + unsigned char book; + unsigned char page; + unsigned char reg; + unsigned char data[TASDEV_DATA_PAYLOAD_SIZE]; +}; + struct tasdevice_priv { struct tasdevice tasdevice[TASDEVICE_MAX_CHANNELS]; struct tasdevice_rca rcabin; struct calidata cali_data; + struct acoustic_data acou_data; struct tasdevice_fw *fmw; struct gpio_desc *speaker_id; struct gpio_desc *reset; diff --git a/sound/soc/codecs/tas2781-i2c.c b/sound/soc/codecs/tas2781-i2c.c index b950914b7d48..0d52cfc12743 100644 --- a/sound/soc/codecs/tas2781-i2c.c +++ b/sound/soc/codecs/tas2781-i2c.c @@ -328,6 +328,24 @@ static int tasdev_cali_data_get(struct snd_kcontrol *kcontrol, return 0; } +static int tasdev_acoustic_data_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *comp = snd_soc_kcontrol_component(kcontrol); + struct tasdevice_priv *priv = snd_soc_component_get_drvdata(comp); + struct soc_bytes_ext *bytes_ext = + (struct soc_bytes_ext *) kcontrol->private_value; + unsigned char *dst = ucontrol->value.bytes.data; + struct acoustic_data *p = &priv->acou_data; + + if (p->id == 'r' && p->len <= bytes_ext->max) + memcpy(dst, p, p->len); + else + dev_err(priv->dev, "Not ready for get.\n"); + + return 0; +} + static int calib_data_get(struct tasdevice_priv *tas_priv, int reg, unsigned char *dst) { @@ -700,6 +718,84 @@ static int tasdev_tf_data_get(struct snd_kcontrol *kcontrol, return calib_data_get(tas_priv, reg, &dst[1]); } +static int tasdev_acoustic_data_put(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + struct snd_soc_component *comp = snd_soc_kcontrol_component(kcontrol); + struct tasdevice_priv *priv = snd_soc_component_get_drvdata(comp); + struct soc_bytes_ext *bytes_ext = + (struct soc_bytes_ext *) kcontrol->private_value; + unsigned char *src = ucontrol->value.bytes.data; + int j, len, ret, value, reg; + unsigned short chn; + + if (src[0] > bytes_ext->max) { + dev_err(priv->dev, "pkg len(%u) is larger than max(%d).\n", + src[0], bytes_ext->max); + return 0; + } + + switch (src[1]) { + case 'r': + /* length of data to read */ + len = src[6]; + break; + case 'w': + /* Skip 6 bytes for package type and register address */ + len = src[0] - 6; + break; + default: + dev_err(priv->dev, "%s Wrong code %02x.\n", __func__, src[1]); + return 0; + } + + if (len < 1) { + dev_err(priv->dev, "pkg fmt invalid %02x.\n", len); + return 0; + } + + for (j = 0; j < priv->ndev; j++) + if (src[2] == priv->tasdevice[j].dev_addr) { + chn = j; + break; + } + if (j >= priv->ndev) { + dev_err(priv->dev, "no such device 0x%02x.\n", src[2]); + return 0; + } + + reg = TASDEVICE_REG(src[3], src[4], src[5]); + + guard(mutex)(&priv->codec_lock); + + if (src[1] == 'w') { + if (len > 1) + ret = tasdevice_dev_bulk_write(priv, chn, reg, + &src[6], len); + else + ret = tasdevice_dev_write(priv, chn, reg, src[6]); + } else { + struct acoustic_data *p = &priv->acou_data; + + memcpy(p, src, 6); + if (len > 1) { + ret = tasdevice_dev_bulk_read(priv, chn, reg, + p->data, len); + } else { + ret = tasdevice_dev_read(priv, chn, reg, &value); + p->data[0] = value; + } + p->len = len + 6; + } + + if (ret) { + dev_err(priv->dev, "i2c communication error.\n"); + return 0; + } + + return 1; +} + static int tasdev_re_data_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { @@ -1043,10 +1139,11 @@ static int tasdevice_get_chip_id(struct snd_kcontrol *kcontrol, static int tasdevice_create_control(struct tasdevice_priv *tas_priv) { struct snd_kcontrol_new *prof_ctrls; - int nr_controls = 1; + struct soc_bytes_ext *ext_acoustic; + char *acoustic_name, *name; + int nr_controls = 2; int mix_index = 0; int ret; - char *name; prof_ctrls = devm_kcalloc(tas_priv->dev, nr_controls, sizeof(prof_ctrls[0]), GFP_KERNEL); @@ -1068,6 +1165,43 @@ static int tasdevice_create_control(struct tasdevice_priv *tas_priv) prof_ctrls[mix_index].put = tasdevice_set_profile_id; mix_index++; + ext_acoustic = devm_kzalloc(tas_priv->dev, sizeof(*ext_acoustic), + GFP_KERNEL); + if (!ext_acoustic) + return -ENOMEM; + + /* + * This kcontrol is a bridge to the acoustic tuning application + * tool which can tune the chips' acoustic effect. + */ + acoustic_name = devm_kstrdup(tas_priv->dev, "Acoustic Tuning", + GFP_KERNEL); + if (!acoustic_name) + return -ENOMEM; + /* + * package structure for PPC3 communications: + * Pkg len (1 byte) + * Pkg id (1 byte, 'r' or 'w') + * Dev id (1 byte, i2c address) + * Book id (1 byte) + * Page id (1 byte) + * Reg id (1 byte) + * switch (pkg id) { + * case 'w': + * 1 byte, length of data to read + * case 'r': + * data payload (1~128 bytes) + * } + */ + ext_acoustic->max = sizeof(tas_priv->acou_data); + prof_ctrls[mix_index].name = acoustic_name; + prof_ctrls[mix_index].iface = SNDRV_CTL_ELEM_IFACE_MIXER; + prof_ctrls[mix_index].info = snd_soc_bytes_info_ext; + prof_ctrls[mix_index].put = tasdev_acoustic_data_put; + prof_ctrls[mix_index].get = tasdev_acoustic_data_get; + prof_ctrls[mix_index].private_value = (unsigned long)ext_acoustic; + mix_index++; + ret = snd_soc_add_component_controls(tas_priv->codec, prof_ctrls, nr_controls < mix_index ? nr_controls : mix_index); -- 2.34.1

3 5

Speaker can't mute when headphone was plugged
by Kailang 20 Apr '25

20 Apr '25

Hi Takashi, Speaker can't mute when headphone was plugged for HP platform. Add attach patch will solve issue. BR, Kailang

2 1

ucm2: MediaTek: mt8395-evk: Add support for SOF
by GitHub pull_request - opened 17 Apr '25

17 Apr '25

alsa-project/alsa-ucm-conf pull request #549 was opened from julien-massot: Similar to #513, add support for MT8395 with SOF enabled. We use different playback and capture PCM. Also, split the mixers that are not yet available upstream. Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/549 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/549.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

No audio on Lenovo Yoga Slim 7 14ILL10
by GitHub issues - edited 16 Apr '25

16 Apr '25

alsa-project/alsa-ucm-conf issue #548 was edited from miguel1117: Only "Dummy Output" is available as an output device on the Lenovo Yoga Slim 7 14ILL10. I'm not absolutely sure if this is the right place to report this so apologies if it's not. [ALSA information](https://alsa-project.org/db/?f=71342ec47d52681c81335d75d2947d8… Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/548 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

No audio on Lenovo Yoga Slim 7 14ILL10
by GitHub issues - edited 16 Apr '25

16 Apr '25

alsa-project/alsa-ucm-conf issue #548 was edited from miguel1117: Only "Dummy Output" is available as an output device on the Lenovo Yoga Slim 7 14ILL1. I'm not absolutely sure if this is the right place to report this so apologies if it's not. [ALSA information](https://alsa-project.org/db/?f=71342ec47d52681c81335d75d2947d8… Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/548 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH v3] ALSA: hda/tas2781: Create a common header for both spi and i2c tas2781 hda driver
by Shenghao Ding 16 Apr '25

16 Apr '25

Move the common macro definition of kcontrols into a common header for code cleanup, and create a common header to store the common declaration for both spi and i2c hda driver. Signed-off-by: Shenghao Ding <shenghao-ding(a)ti.com> --- v3: - Add the purpose of this patch. v2: - Follow IWYU principle, add sound/asound.h into the header file. v1: - Revise the year of spi and i2c tas2781 hda drivers. - Create a common header for both spi and i2c tas2781 hda driver to define the common macros and declare the common functions. --- sound/pci/hda/tas2781_hda.h | 44 +++++++++++++++++++++++++++++++++ sound/pci/hda/tas2781_hda_i2c.c | 29 ++-------------------- sound/pci/hda/tas2781_hda_spi.c | 35 ++------------------------ 3 files changed, 48 insertions(+), 60 deletions(-) create mode 100644 sound/pci/hda/tas2781_hda.h diff --git a/sound/pci/hda/tas2781_hda.h b/sound/pci/hda/tas2781_hda.h new file mode 100644 index 000000000000..fc741fac419a --- /dev/null +++ b/sound/pci/hda/tas2781_hda.h @@ -0,0 +1,44 @@ +/* SPDX-License-Identifier: GPL-2.0-only + * + * HDA audio driver for Texas Instruments TAS2781 smart amp + * + * Copyright (C) 2025 Texas Instruments, Inc. + */ +#ifndef __TAS2781_HDA_H__ +#define __TAS2781_HDA_H__ + +#include <sound/asound.h> + +/* + * No standard control callbacks for SNDRV_CTL_ELEM_IFACE_CARD + * Define two controls, one is Volume control callbacks, the other is + * flag setting control callbacks. + */ + +/* Volume control callbacks for tas2781 */ +#define ACARD_SINGLE_RANGE_EXT_TLV(xname, xreg, xshift, xmin, xmax, xinvert, \ + xhandler_get, xhandler_put, tlv_array) { \ + .iface = SNDRV_CTL_ELEM_IFACE_CARD, .name = (xname), \ + .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \ + SNDRV_CTL_ELEM_ACCESS_READWRITE, \ + .tlv.p = (tlv_array), \ + .info = snd_soc_info_volsw, \ + .get = xhandler_get, .put = xhandler_put, \ + .private_value = (unsigned long)&(struct soc_mixer_control) { \ + .reg = xreg, .rreg = xreg, \ + .shift = xshift, .rshift = xshift,\ + .min = xmin, .max = xmax, .invert = xinvert, \ + } \ +} + +/* Flag control callbacks for tas2781 */ +#define ACARD_SINGLE_BOOL_EXT(xname, xdata, xhandler_get, xhandler_put) { \ + .iface = SNDRV_CTL_ELEM_IFACE_CARD, \ + .name = xname, \ + .info = snd_ctl_boolean_mono_info, \ + .get = xhandler_get, \ + .put = xhandler_put, \ + .private_value = xdata, \ +} + +#endif diff --git a/sound/pci/hda/tas2781_hda_i2c.c b/sound/pci/hda/tas2781_hda_i2c.c index 29dc4f500580..9d94ae5fcfe0 100644 --- a/sound/pci/hda/tas2781_hda_i2c.c +++ b/sound/pci/hda/tas2781_hda_i2c.c @@ -2,7 +2,7 @@ // // TAS2781 HDA I2C driver // -// Copyright 2023 - 2024 Texas Instruments, Inc. +// Copyright 2023 - 2025 Texas Instruments, Inc. // // Author: Shenghao Ding <shenghao-ding(a)ti.com> // Current maintainer: Baojun Xu <baojun.xu(a)ti.com> @@ -30,35 +30,10 @@ #include "hda_component.h" #include "hda_jack.h" #include "hda_generic.h" +#include "tas2781_hda.h" #define TASDEVICE_SPEAKER_CALIBRATION_SIZE 20 -/* No standard control callbacks for SNDRV_CTL_ELEM_IFACE_CARD - * Define two controls, one is Volume control callbacks, the other is - * flag setting control callbacks. - */ - -/* Volume control callbacks for tas2781 */ -#define ACARD_SINGLE_RANGE_EXT_TLV(xname, xreg, xshift, xmin, xmax, xinvert, \ - xhandler_get, xhandler_put, tlv_array) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_CARD, .name = (xname),\ - .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\ - SNDRV_CTL_ELEM_ACCESS_READWRITE,\ - .tlv.p = (tlv_array), \ - .info = snd_soc_info_volsw, \ - .get = xhandler_get, .put = xhandler_put, \ - .private_value = (unsigned long)&(struct soc_mixer_control) \ - {.reg = xreg, .rreg = xreg, .shift = xshift, \ - .rshift = xshift, .min = xmin, .max = xmax, \ - .invert = xinvert} } - -/* Flag control callbacks for tas2781 */ -#define ACARD_SINGLE_BOOL_EXT(xname, xdata, xhandler_get, xhandler_put) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_CARD, .name = xname, \ - .info = snd_ctl_boolean_mono_info, \ - .get = xhandler_get, .put = xhandler_put, \ - .private_value = xdata } - enum calib_data { R0_VAL = 0, INV_R0, diff --git a/sound/pci/hda/tas2781_hda_spi.c b/sound/pci/hda/tas2781_hda_spi.c index 399f2e4c3b62..c6be2be1b53e 100644 --- a/sound/pci/hda/tas2781_hda_spi.c +++ b/sound/pci/hda/tas2781_hda_spi.c @@ -2,7 +2,7 @@ // // TAS2781 HDA SPI driver // -// Copyright 2024 Texas Instruments, Inc. +// Copyright 2024 - 2025 Texas Instruments, Inc. // // Author: Baojun Xu <baojun.xu(a)ti.com> @@ -38,38 +38,7 @@ #include "hda_component.h" #include "hda_jack.h" #include "hda_generic.h" - -/* - * No standard control callbacks for SNDRV_CTL_ELEM_IFACE_CARD - * Define two controls, one is Volume control callbacks, the other is - * flag setting control callbacks. - */ - -/* Volume control callbacks for tas2781 */ -#define ACARD_SINGLE_RANGE_EXT_TLV(xname, xreg, xshift, xmin, xmax, xinvert, \ - xhandler_get, xhandler_put, tlv_array) { \ - .iface = SNDRV_CTL_ELEM_IFACE_CARD, .name = (xname), \ - .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \ - SNDRV_CTL_ELEM_ACCESS_READWRITE, \ - .tlv.p = (tlv_array), \ - .info = snd_soc_info_volsw, \ - .get = xhandler_get, .put = xhandler_put, \ - .private_value = (unsigned long)&(struct soc_mixer_control) { \ - .reg = xreg, .rreg = xreg, \ - .shift = xshift, .rshift = xshift,\ - .min = xmin, .max = xmax, .invert = xinvert, \ - } \ -} - -/* Flag control callbacks for tas2781 */ -#define ACARD_SINGLE_BOOL_EXT(xname, xdata, xhandler_get, xhandler_put) { \ - .iface = SNDRV_CTL_ELEM_IFACE_CARD, \ - .name = xname, \ - .info = snd_ctl_boolean_mono_info, \ - .get = xhandler_get, \ - .put = xhandler_put, \ - .private_value = xdata, \ -} +#include "tas2781_hda.h" struct tas2781_hda { struct tasdevice_priv *priv; -- 2.34.1

2 1

No audio on Lenovo Yoga Slim 7 14ILL1
by GitHub issues - edited 16 Apr '25

16 Apr '25

alsa-project/alsa-ucm-conf issue #548 was edited from miguel1117: Only "Dummy Output" is available as an output device on the Lenovo Yoga Slim 7 14ILL1. I'm not absolutely sure if this is the right place to report this so apologies if it's not. [ALSA information](https://alsa-project.org/db/?f=71342ec47d52681c81335d75d2947d8… Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/548 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

No audio on Lenovo Yoga Slim 7 14ILL1
by GitHub issues - opened 16 Apr '25

16 Apr '25

alsa-project/alsa-ucm-conf issue #548 was opened from miguel1117: Only "Dummy Output" is available as an output device on the Lenovo Yoga Slim 7 14ILL1. I'm not absolutely sure if this is the right place to report this so apologies if it's not. [ALSA information](https://alsa-project.org/db/?f=80c739775b022831be9c3aad038f8de… Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/548 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Steinberg UR22C: Version 1.2.14 introduced "[ALSA UCM error]" on older firmware.
by GitHub issues - edited 15 Apr '25

15 Apr '25

alsa-project/alsa-ucm-conf issue #547 was edited from NoXPhasma: Since version 1.2.14 the `node.description` of the Steinberg UR22C shows `[ALSA UCM error]`: ``` node.description = "Steinberg UR22C [ALSA UCM error] Direct Steinberg UR22C" ``` ``` > journalctl --user -u wireplumber --boot 0 systemd[1286]: Started Multimedia Service Session Manager. wp-internal-comp-loader: Loading profile 'main' spa.alsa: Error in ALSA UCM profile for _ucm0001.hw:UR22C,0 (HiFi: Line 3: source): CaptureChannels=4 > avail 2 spa.alsa: Errors in ALSA UCM profile for card Steinberg UR22C wireplumber[1359]: wp-device: SPA handle 'api.libcamera.enum.manager' could not be loaded; is it installed? wireplumber[1359]: s-monitors-libcamera: PipeWire's libcamera SPA plugin is missing or broken. Some camera types may not be supported. wireplumber[1359]: default: Failed to get percentage from UPower: org.freedesktop.DBus.Error.NameHasNoOwner wireplumber[1359]: spa.bluez5: BlueZ system service is not available ``` Reverting to version 1.2.13 fixes this issue. Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/547 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Steinberg UR22C: Version 1.2.14 introduced "[ALSA UCM error]"
by GitHub issues - edited 15 Apr '25

15 Apr '25

alsa-project/alsa-ucm-conf issue #547 was edited from NoXPhasma: Since version 1.2.14 the `node.description` of the Steinberg UR22C shows `[ALSA UCM error]`: ``` node.description = "Steinberg UR22C [ALSA UCM error] Direct Steinberg UR22C" ``` ``` > journalctl --user -u wireplumber --boot 0 systemd[1286]: Started Multimedia Service Session Manager. wp-internal-comp-loader: Loading profile 'main' spa.alsa: Error in ALSA UCM profile for _ucm0001.hw:UR22C,0 (HiFi: Line 3: source): CaptureChannels=4 > avail 2 spa.alsa: Errors in ALSA UCM profile for card Steinberg UR22C wireplumber[1359]: wp-device: SPA handle 'api.libcamera.enum.manager' could not be loaded; is it installed? wireplumber[1359]: s-monitors-libcamera: PipeWire's libcamera SPA plugin is missing or broken. Some camera types may not be supported. wireplumber[1359]: default: Failed to get percentage from UPower: org.freedesktop.DBus.Error.NameHasNoOwner wireplumber[1359]: spa.bluez5: BlueZ system service is not available ``` Reverting to version 1.2.13 fixes this issue. Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/547 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Steinberg UR22C: Version 1.2.14 introduced "[ALSA UCM error]"
by GitHub issues - opened 15 Apr '25

15 Apr '25

alsa-project/alsa-ucm-conf issue #547 was opened from NoXPhasma: Since version 1.2.14 the `node.description` of the Steinberg UR22C shows `[ALSA UCM error]`: ``` node.description = "Steinberg UR22C [ALSA UCM error] Direct Steinberg UR22C" ``` Reverting to version 1.2.13 fixes this issue. Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/547 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[RESEND PATCH v2] ALSA: hda/tas2781: Create a common header for both spi and i2c tas2781 hda driver
by Shenghao Ding 15 Apr '25

15 Apr '25

Move the common macro definition of kcontrols into a common header. Signed-off-by: Shenghao Ding <shenghao-ding(a)ti.com> --- v2: - Follow IWYU principle, add sound/asound.h into the header file. v1: - Revise the year of spi and i2c tas2781 hda drivers. - Create a common header for both spi and i2c tas2781 hda driver to define the common macros and declare the common functions. --- sound/pci/hda/tas2781_hda.h | 44 +++++++++++++++++++++++++++++++++ sound/pci/hda/tas2781_hda_i2c.c | 29 ++-------------------- sound/pci/hda/tas2781_hda_spi.c | 35 ++------------------------ 3 files changed, 48 insertions(+), 60 deletions(-) create mode 100644 sound/pci/hda/tas2781_hda.h diff --git a/sound/pci/hda/tas2781_hda.h b/sound/pci/hda/tas2781_hda.h new file mode 100644 index 000000000000..fc741fac419a --- /dev/null +++ b/sound/pci/hda/tas2781_hda.h @@ -0,0 +1,44 @@ +/* SPDX-License-Identifier: GPL-2.0-only + * + * HDA audio driver for Texas Instruments TAS2781 smart amp + * + * Copyright (C) 2025 Texas Instruments, Inc. + */ +#ifndef __TAS2781_HDA_H__ +#define __TAS2781_HDA_H__ + +#include <sound/asound.h> + +/* + * No standard control callbacks for SNDRV_CTL_ELEM_IFACE_CARD + * Define two controls, one is Volume control callbacks, the other is + * flag setting control callbacks. + */ + +/* Volume control callbacks for tas2781 */ +#define ACARD_SINGLE_RANGE_EXT_TLV(xname, xreg, xshift, xmin, xmax, xinvert, \ + xhandler_get, xhandler_put, tlv_array) { \ + .iface = SNDRV_CTL_ELEM_IFACE_CARD, .name = (xname), \ + .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \ + SNDRV_CTL_ELEM_ACCESS_READWRITE, \ + .tlv.p = (tlv_array), \ + .info = snd_soc_info_volsw, \ + .get = xhandler_get, .put = xhandler_put, \ + .private_value = (unsigned long)&(struct soc_mixer_control) { \ + .reg = xreg, .rreg = xreg, \ + .shift = xshift, .rshift = xshift,\ + .min = xmin, .max = xmax, .invert = xinvert, \ + } \ +} + +/* Flag control callbacks for tas2781 */ +#define ACARD_SINGLE_BOOL_EXT(xname, xdata, xhandler_get, xhandler_put) { \ + .iface = SNDRV_CTL_ELEM_IFACE_CARD, \ + .name = xname, \ + .info = snd_ctl_boolean_mono_info, \ + .get = xhandler_get, \ + .put = xhandler_put, \ + .private_value = xdata, \ +} + +#endif diff --git a/sound/pci/hda/tas2781_hda_i2c.c b/sound/pci/hda/tas2781_hda_i2c.c index 29dc4f500580..9d94ae5fcfe0 100644 --- a/sound/pci/hda/tas2781_hda_i2c.c +++ b/sound/pci/hda/tas2781_hda_i2c.c @@ -2,7 +2,7 @@ // // TAS2781 HDA I2C driver // -// Copyright 2023 - 2024 Texas Instruments, Inc. +// Copyright 2023 - 2025 Texas Instruments, Inc. // // Author: Shenghao Ding <shenghao-ding(a)ti.com> // Current maintainer: Baojun Xu <baojun.xu(a)ti.com> @@ -30,35 +30,10 @@ #include "hda_component.h" #include "hda_jack.h" #include "hda_generic.h" +#include "tas2781_hda.h" #define TASDEVICE_SPEAKER_CALIBRATION_SIZE 20 -/* No standard control callbacks for SNDRV_CTL_ELEM_IFACE_CARD - * Define two controls, one is Volume control callbacks, the other is - * flag setting control callbacks. - */ - -/* Volume control callbacks for tas2781 */ -#define ACARD_SINGLE_RANGE_EXT_TLV(xname, xreg, xshift, xmin, xmax, xinvert, \ - xhandler_get, xhandler_put, tlv_array) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_CARD, .name = (xname),\ - .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\ - SNDRV_CTL_ELEM_ACCESS_READWRITE,\ - .tlv.p = (tlv_array), \ - .info = snd_soc_info_volsw, \ - .get = xhandler_get, .put = xhandler_put, \ - .private_value = (unsigned long)&(struct soc_mixer_control) \ - {.reg = xreg, .rreg = xreg, .shift = xshift, \ - .rshift = xshift, .min = xmin, .max = xmax, \ - .invert = xinvert} } - -/* Flag control callbacks for tas2781 */ -#define ACARD_SINGLE_BOOL_EXT(xname, xdata, xhandler_get, xhandler_put) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_CARD, .name = xname, \ - .info = snd_ctl_boolean_mono_info, \ - .get = xhandler_get, .put = xhandler_put, \ - .private_value = xdata } - enum calib_data { R0_VAL = 0, INV_R0, diff --git a/sound/pci/hda/tas2781_hda_spi.c b/sound/pci/hda/tas2781_hda_spi.c index 399f2e4c3b62..c6be2be1b53e 100644 --- a/sound/pci/hda/tas2781_hda_spi.c +++ b/sound/pci/hda/tas2781_hda_spi.c @@ -2,7 +2,7 @@ // // TAS2781 HDA SPI driver // -// Copyright 2024 Texas Instruments, Inc. +// Copyright 2024 - 2025 Texas Instruments, Inc. // // Author: Baojun Xu <baojun.xu(a)ti.com> @@ -38,38 +38,7 @@ #include "hda_component.h" #include "hda_jack.h" #include "hda_generic.h" - -/* - * No standard control callbacks for SNDRV_CTL_ELEM_IFACE_CARD - * Define two controls, one is Volume control callbacks, the other is - * flag setting control callbacks. - */ - -/* Volume control callbacks for tas2781 */ -#define ACARD_SINGLE_RANGE_EXT_TLV(xname, xreg, xshift, xmin, xmax, xinvert, \ - xhandler_get, xhandler_put, tlv_array) { \ - .iface = SNDRV_CTL_ELEM_IFACE_CARD, .name = (xname), \ - .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \ - SNDRV_CTL_ELEM_ACCESS_READWRITE, \ - .tlv.p = (tlv_array), \ - .info = snd_soc_info_volsw, \ - .get = xhandler_get, .put = xhandler_put, \ - .private_value = (unsigned long)&(struct soc_mixer_control) { \ - .reg = xreg, .rreg = xreg, \ - .shift = xshift, .rshift = xshift,\ - .min = xmin, .max = xmax, .invert = xinvert, \ - } \ -} - -/* Flag control callbacks for tas2781 */ -#define ACARD_SINGLE_BOOL_EXT(xname, xdata, xhandler_get, xhandler_put) { \ - .iface = SNDRV_CTL_ELEM_IFACE_CARD, \ - .name = xname, \ - .info = snd_ctl_boolean_mono_info, \ - .get = xhandler_get, \ - .put = xhandler_put, \ - .private_value = xdata, \ -} +#include "tas2781_hda.h" struct tas2781_hda { struct tasdevice_priv *priv; -- 2.34.1

2 1

ALSA 1.2.8 release
by Jaroslav Kysela 15 Apr '25

15 Apr '25

Hello all, new ALSA userspace packages were released. You may download them from the ALSA website http://www.alsa-project.org or directly: HTTP: https://www.alsa-project.org/files/pub FTP: ftp://ftp.alsa-project.org/pub Released packages: alsa-lib alsa-utils alsa-ucm-conf tinycompress Full list of changes: https://www.alsa-project.org/wiki/Changes_v1.2.7.2_v1.2.8 The fingerprint of the public signing key is: F04D F507 37AC 1A88 4C4B 3D71 8380 596D A6E5 9C91 Have fun, Jaroslav -- Jaroslav Kysela <perex(a)perex.cz> Linux Sound Maintainer; ALSA Project; Red Hat, Inc.

2 8

1.2.14: SetuptoolsDeprecationWarning due to the use of `sys.exit(0)`
by GitHub issues - opened 15 Apr '25

15 Apr '25

alsa-project/alsa-python issue #18 was opened from dvzrv: Hi! 👋 I package this project for Arch Linux. During update to 1.2.14 I noticed that setuptools now raises the following warning: ``` /usr/lib/python3.13/site-packages/setuptools/build_meta.py:522: SetuptoolsDeprecationWarning: Running `setup.py` directly as CLI tool is deprecated. !! ******************************************************************************** Please avoid using `sys.exit(0)` or similar statements that don't fit in the paradigm of a configuration file. See https://blog.ganssle.io/articles/2021/10/setup-py-deprecated.html for details. ******************************************************************************** !! super().run_setup(setup_script=setup_script) ``` This appears to be triggered by the `sys.exit(0)` call in setup.py: https://github.com/alsa-project/alsa-python/blob/20b2b3999f24af462815b9c86e… (Setuptools now offers one of the various PEP517 build backends and calling setup.py directly as a script is deprecated). Looking at the file I noticed that there are still conditionals that accommodate Python2: https://github.com/alsa-project/alsa-python/blob/20b2b3999f24af462815b9c86e… Those should be removed, as the script itself is marked as Python3 (and well of course because Python2 is long discontinued 😅). Issue URL : https://github.com/alsa-project/alsa-python/issues/18 Repository URL: https://github.com/alsa-project/alsa-python

1 0

recent change in seqmid.c is broken?
by Takashi Iwai 15 Apr '25

15 Apr '25

Hi Jaroslav, I'm afraid that your recent fix for alsa-lib commit a4e47461eca1 doesn't work as expected: ``` @@ -664,15 +663,11 @@ static void update_group_ports(snd_seq_t *seq, snd_ump_endpoint_info_t *ep) break; } - if (!*bp->name) + if (bp->name[0] == '\0') continue; - len = strlen(blknames); - if (len) - snprintf(blknames + len, sizeof(blknames) - len, - ", %s", bp->name); - else - snd_strlcpy(blknames, (const char *)bp->name, - sizeof(blknames)); + if (blknames[0]) + snd_strlcpy(blknames, ", ", sizeof(blknames)); + snd_strlcpy(blknames, (const char *)bp->name, sizeof(blknames)); } if (!*blknames) ``` The original code appended the new bp->name string with the prefix of ", " if blknames is already present, but the new code looks as if it overwrites onto blknames with strlcpy() from scratch for each bp->name. FWIW, the code there used to be with strlcat(), but it was rewritten in the way above because strlcat() isn't always available in commit d9694398130c. thanks, Takashi

2 3

On output devices, `snd_pcm_open()` makes a bad loud tick.
by GitHub issues - opened 13 Apr '25

13 Apr '25

alsa-project/alsa-lib issue #451 was opened from ewtoombs: Minimal reproduction: ``` #include <alsa/asoundlib.h> #include <stdbool.h> int main(int argc, const char **argv) { snd_pcm_t *out; assert(snd_pcm_open(&out, "default", // the name of the device being opened SND_PCM_STREAM_PLAYBACK, // it is an output stream false // iff nonblocking stream ) == 0); } ``` (Compile with `gcc -o test test.c -lasound`.) Relevant `lspci`: ``` 00:1f.3 Audio device: Intel Corporation Sunrise Point-LP HD Audio (rev 21) ``` `uname`: ``` Linux robert 6.13.8-arch1-1 #1 SMP PREEMPT_DYNAMIC Sun, 23 Mar 2025 17:17:30 +0000 x86_64 GNU/Linux ``` alsa-lib version: 1.2.13-1 (archlinux) I've heard similar artefacts on many different sound cards, though, across many different architectures, always on linux. One must wait about five minutes in between trials, or the artefact does not occur. This isn't a minor detail. The tick is very loud. It might even damage speakers in a worst case scenario. Issue URL : https://github.com/alsa-project/alsa-lib/issues/451 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

[GIT PULL] ASoC fixes for v6.15-rc1
by Mark Brown 11 Apr '25

11 Apr '25

The following changes since commit 0af2f6be1b4281385b618cb86ad946eded089ac8: Linux 6.15-rc1 (2025-04-06 13:11:33 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v6.15-rc1 for you to fetch changes up to e6c4618422a25cb266bf752040eb509865caeb0e: MAINTAINERS: update my email address (2025-04-11 06:17:24 +0100) ---------------------------------------------------------------- ASoC: Fixes for v6.15 A set of small fixes, quirks and device ID additions that came in since -rc1, none of them super stand out. There's also a change to Srini's email address in MAINTAINERS. ---------------------------------------------------------------- Amadeusz Sławiński (1): ASoC: Intel: avs: Constrain path based on BE capabilities Brady Norander (1): ASoC: dwc: always enable/disable i2s irqs Charles Keepax (1): ASoC: cs42l43: Reset clamp override on jack removal Evgeny Pimenov (1): ASoC: qcom: Fix sc7280 lpass potential buffer overflow Henry Martin (1): ASoC: Intel: avs: Fix null-ptr-deref in avs_component_probe() Herve Codina (1): ASoC: fsl: fsl_qmc_audio: Reset audio data pointers on TRIGGER_START event Kuninori Morimoto (1): ASoC: hdmi-codec: use RTD ID instead of DAI ID for ELD entry Mark Brown (2): ASoC: codecs: lpass-wsa: fix VI capture setup. MAINTAINERS: update my email address Peter Ujfalusi (1): ASoC: Intel: sof_sdw: Add quirk for Asus Zenbook S16 Richard Fitzgerald (1): firmware: cs_dsp: test_bin_error: Fix uninitialized data used as fw version Shengjiu Wang (1): ASoC: fsl_asrc_dma: get codec or cpu dai from backend Srinivas Kandagatla (4): ASoC: codecs:lpass-wsa-macro: Fix vi feedback rate ASoC: codecs:lpass-wsa-macro: Fix logic of enabling vi channels MAINTAINERS: use kernel.org alias mailmap: Add entry for Srinivas Kandagatla Weidong Wang (1): ASoC: codecs: Add of_match_table for aw888081 driver .mailmap | 2 + MAINTAINERS | 8 +- .../firmware/cirrus/test/cs_dsp_mock_mem_maps.c | 30 ------ drivers/firmware/cirrus/test/cs_dsp_test_bin.c | 2 +- .../firmware/cirrus/test/cs_dsp_test_bin_error.c | 2 +- include/linux/firmware/cirrus/cs_dsp_test_utils.h | 1 - sound/soc/codecs/aw88081.c | 10 ++ sound/soc/codecs/cs42l43-jack.c | 3 + sound/soc/codecs/hdmi-codec.c | 22 +++- sound/soc/codecs/lpass-wsa-macro.c | 117 +++++++++++++++------ sound/soc/dwc/dwc-i2s.c | 13 ++- sound/soc/fsl/fsl_asrc_dma.c | 15 ++- sound/soc/fsl/fsl_qmc_audio.c | 3 + sound/soc/intel/avs/path.c | 72 +++++++++++++ sound/soc/intel/avs/path.h | 5 + sound/soc/intel/avs/pcm.c | 52 ++++++++- sound/soc/intel/boards/sof_sdw.c | 1 + sound/soc/qcom/lpass.h | 3 +- 18 files changed, 277 insertions(+), 84 deletions(-)

2 1

[PATCH 0/2] MAINTAINERS: update my email address
by srinivas.kandagatla＠linaro.org 11 Apr '25

11 Apr '25

From: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Update .mailmap and MAINTAINERS to point to the @kernel.org instead of the @linaro.org. Linaro address will stop working in few days. Mark or Greg, could you please pick these two patches? Srinivas Kandagatla (2): MAINTAINERS: use kernel.org alias mailmap: Add entry for Srinivas Kandagatla .mailmap | 2 ++ MAINTAINERS | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) -- 2.25.1

2 3

Add support of HyperX SoloCast
by GitHub pull_request - opened 11 Apr '25

11 Apr '25

alsa-project/alsa-ucm-conf pull request #545 was opened from serhii-nakon: Support of - volume control - un/mute control PS: About un/mute control - only from PC to Mic, vise versa does not work - like when you un/mute Mic on PC it works as expected (even LED show actual status) but when you click button on Mic side it does not reflect on PC side. Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/545 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/545.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

ucm2: Qualcomm: add Asus Zenbook A14
by GitHub pull_request - opened 10 Apr '25

10 Apr '25

alsa-project/alsa-ucm-conf pull request #544 was opened from alexVinarskis: Add a Regex string, seems compatible with Lenovo T14s x2 speakers, x2 DMICs, x3 DP (x2 USB-C, x1 DP->HDMI), headphone jack. Initial support for the platform is available on the [lists](https://lore.kernel.org/all/20250402084646.10098-1-alex.vinarskis@gm…, with [Audio part ](https://github.com/alexVinarskis/linux-x1e80100-zenbook-a14/blob/master/0013-arm64-dts-qcom-support-sound-on-Asus-Zenbook-A14.patch)not being upstreamed just yet. Tested that speakers, MICs and jack are working. Respective audioreach-topology changes are open [for PR.](https://github.com/linux-msm/audioreach-topology/pull/14) Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/544 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/544.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[PATCH 1/1] bat: Fix buffer time configuration
by Alexander Stein 10 Apr '25

10 Apr '25

By swapping time configuration some hardware constraints can be supported. Fixes the error: Set parameter to device error: buffer time: 500000 hw:tqmtlv320aic32: Invalid argument(-22) Signed-off-by: Alexander Stein <alexander.stein(a)ew.tq-group.com> --- Our common 'alsabat -Dhw:tqmtlv320aic32 -f S16_LE -c 2 -r 44100 -F 997:500' failed ona i.MX95 based platform, while it worked flawlessly on others, e.g. i.MX8M Plus. Upon searching I stumbled across [1], which this patch is inspired/based on. [1] https://github.com/arkq/bluez-alsa/pull/290/commits/da78b82ff77310093b4b4a9… --- bat/alsa.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/bat/alsa.c b/bat/alsa.c index 67489c4..457e79a 100644 --- a/bat/alsa.c +++ b/bat/alsa.c @@ -221,23 +221,23 @@ static int set_snd_pcm_params(struct bat *bat, struct pcm_container *sndpcm) period_time = buffer_time / DIV_BUFFERTIME; - /* Set buffer time and period time */ - err = snd_pcm_hw_params_set_buffer_time_near(sndpcm->handle, - params, &buffer_time, 0); + /* Set period time and buffer time */ + err = snd_pcm_hw_params_set_period_time_near(sndpcm->handle, + params, &period_time, 0); if (err < 0) { fprintf(bat->err, _("Set parameter to device error: ")); - fprintf(bat->err, _("buffer time: %d %s: %s(%d)\n"), - buffer_time, + fprintf(bat->err, _("period time: %d %s: %s(%d)\n"), + period_time, device_name, snd_strerror(err), err); return err; } - err = snd_pcm_hw_params_set_period_time_near(sndpcm->handle, - params, &period_time, 0); + err = snd_pcm_hw_params_set_buffer_time_near(sndpcm->handle, + params, &buffer_time, 0); if (err < 0) { fprintf(bat->err, _("Set parameter to device error: ")); - fprintf(bat->err, _("period time: %d %s: %s(%d)\n"), - period_time, + fprintf(bat->err, _("buffer time: %d %s: %s(%d)\n"), + buffer_time, device_name, snd_strerror(err), err); return err; } -- 2.43.0

1 0

[PATCH v2] ALSA: hda/tas2781: Create a common header for both spi and i2c tas2781 hda driver
by Shenghao Ding 10 Apr '25

10 Apr '25

Move the common macro definition of kcontrols into a common header. Signed-off-by: Shenghao Ding <shenghao-ding(a)ti.com> --- v2: - Follow IWYU principle, add sound/asound.h into the header file. v1: - Revise the year of spi and i2c tas2781 hda drivers. - Create a common header for both spi and i2c tas2781 hda driver to define the common macros and declare the common functions. --- sound/pci/hda/tas2781_hda.h | 44 +++++++++++++++++++++++++++++++++ sound/pci/hda/tas2781_hda_i2c.c | 29 ++-------------------- sound/pci/hda/tas2781_hda_spi.c | 35 ++------------------------ 3 files changed, 48 insertions(+), 60 deletions(-) create mode 100644 sound/pci/hda/tas2781_hda.h diff --git a/sound/pci/hda/tas2781_hda.h b/sound/pci/hda/tas2781_hda.h new file mode 100644 index 000000000000..fc741fac419a --- /dev/null +++ b/sound/pci/hda/tas2781_hda.h @@ -0,0 +1,44 @@ +/* SPDX-License-Identifier: GPL-2.0-only + * + * HDA audio driver for Texas Instruments TAS2781 smart amp + * + * Copyright (C) 2025 Texas Instruments, Inc. + */ +#ifndef __TAS2781_HDA_H__ +#define __TAS2781_HDA_H__ + +#include <sound/asound.h> + +/* + * No standard control callbacks for SNDRV_CTL_ELEM_IFACE_CARD + * Define two controls, one is Volume control callbacks, the other is + * flag setting control callbacks. + */ + +/* Volume control callbacks for tas2781 */ +#define ACARD_SINGLE_RANGE_EXT_TLV(xname, xreg, xshift, xmin, xmax, xinvert, \ + xhandler_get, xhandler_put, tlv_array) { \ + .iface = SNDRV_CTL_ELEM_IFACE_CARD, .name = (xname), \ + .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \ + SNDRV_CTL_ELEM_ACCESS_READWRITE, \ + .tlv.p = (tlv_array), \ + .info = snd_soc_info_volsw, \ + .get = xhandler_get, .put = xhandler_put, \ + .private_value = (unsigned long)&(struct soc_mixer_control) { \ + .reg = xreg, .rreg = xreg, \ + .shift = xshift, .rshift = xshift,\ + .min = xmin, .max = xmax, .invert = xinvert, \ + } \ +} + +/* Flag control callbacks for tas2781 */ +#define ACARD_SINGLE_BOOL_EXT(xname, xdata, xhandler_get, xhandler_put) { \ + .iface = SNDRV_CTL_ELEM_IFACE_CARD, \ + .name = xname, \ + .info = snd_ctl_boolean_mono_info, \ + .get = xhandler_get, \ + .put = xhandler_put, \ + .private_value = xdata, \ +} + +#endif diff --git a/sound/pci/hda/tas2781_hda_i2c.c b/sound/pci/hda/tas2781_hda_i2c.c index 29dc4f500580..9d94ae5fcfe0 100644 --- a/sound/pci/hda/tas2781_hda_i2c.c +++ b/sound/pci/hda/tas2781_hda_i2c.c @@ -2,7 +2,7 @@ // // TAS2781 HDA I2C driver // -// Copyright 2023 - 2024 Texas Instruments, Inc. +// Copyright 2023 - 2025 Texas Instruments, Inc. // // Author: Shenghao Ding <shenghao-ding(a)ti.com> // Current maintainer: Baojun Xu <baojun.xu(a)ti.com> @@ -30,35 +30,10 @@ #include "hda_component.h" #include "hda_jack.h" #include "hda_generic.h" +#include "tas2781_hda.h" #define TASDEVICE_SPEAKER_CALIBRATION_SIZE 20 -/* No standard control callbacks for SNDRV_CTL_ELEM_IFACE_CARD - * Define two controls, one is Volume control callbacks, the other is - * flag setting control callbacks. - */ - -/* Volume control callbacks for tas2781 */ -#define ACARD_SINGLE_RANGE_EXT_TLV(xname, xreg, xshift, xmin, xmax, xinvert, \ - xhandler_get, xhandler_put, tlv_array) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_CARD, .name = (xname),\ - .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\ - SNDRV_CTL_ELEM_ACCESS_READWRITE,\ - .tlv.p = (tlv_array), \ - .info = snd_soc_info_volsw, \ - .get = xhandler_get, .put = xhandler_put, \ - .private_value = (unsigned long)&(struct soc_mixer_control) \ - {.reg = xreg, .rreg = xreg, .shift = xshift, \ - .rshift = xshift, .min = xmin, .max = xmax, \ - .invert = xinvert} } - -/* Flag control callbacks for tas2781 */ -#define ACARD_SINGLE_BOOL_EXT(xname, xdata, xhandler_get, xhandler_put) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_CARD, .name = xname, \ - .info = snd_ctl_boolean_mono_info, \ - .get = xhandler_get, .put = xhandler_put, \ - .private_value = xdata } - enum calib_data { R0_VAL = 0, INV_R0, diff --git a/sound/pci/hda/tas2781_hda_spi.c b/sound/pci/hda/tas2781_hda_spi.c index 399f2e4c3b62..c6be2be1b53e 100644 --- a/sound/pci/hda/tas2781_hda_spi.c +++ b/sound/pci/hda/tas2781_hda_spi.c @@ -2,7 +2,7 @@ // // TAS2781 HDA SPI driver // -// Copyright 2024 Texas Instruments, Inc. +// Copyright 2024 - 2025 Texas Instruments, Inc. // // Author: Baojun Xu <baojun.xu(a)ti.com> @@ -38,38 +38,7 @@ #include "hda_component.h" #include "hda_jack.h" #include "hda_generic.h" - -/* - * No standard control callbacks for SNDRV_CTL_ELEM_IFACE_CARD - * Define two controls, one is Volume control callbacks, the other is - * flag setting control callbacks. - */ - -/* Volume control callbacks for tas2781 */ -#define ACARD_SINGLE_RANGE_EXT_TLV(xname, xreg, xshift, xmin, xmax, xinvert, \ - xhandler_get, xhandler_put, tlv_array) { \ - .iface = SNDRV_CTL_ELEM_IFACE_CARD, .name = (xname), \ - .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \ - SNDRV_CTL_ELEM_ACCESS_READWRITE, \ - .tlv.p = (tlv_array), \ - .info = snd_soc_info_volsw, \ - .get = xhandler_get, .put = xhandler_put, \ - .private_value = (unsigned long)&(struct soc_mixer_control) { \ - .reg = xreg, .rreg = xreg, \ - .shift = xshift, .rshift = xshift,\ - .min = xmin, .max = xmax, .invert = xinvert, \ - } \ -} - -/* Flag control callbacks for tas2781 */ -#define ACARD_SINGLE_BOOL_EXT(xname, xdata, xhandler_get, xhandler_put) { \ - .iface = SNDRV_CTL_ELEM_IFACE_CARD, \ - .name = xname, \ - .info = snd_ctl_boolean_mono_info, \ - .get = xhandler_get, \ - .put = xhandler_put, \ - .private_value = xdata, \ -} +#include "tas2781_hda.h" struct tas2781_hda { struct tasdevice_priv *priv; -- 2.34.1

1 0

Enable Headset Mic for ASUS platform
by Kailang 09 Apr '25

09 Apr '25

Hi Takashi, Attach patch was fixed headset Mic issue for Asus platform. Many Thanks. Kailang.

2 1

Dell Precision 3571: DMIC not detected by SOF driver, silent mic under Linux, works in Windows
by Adam Larios 08 Apr '25

08 Apr '25

*System*: Dell Precision 3571 Realtek ALC3204 codec Intel Alder Lake (SOF platform) *Symptoms*: Internal mic is silent or muffled in all Linux applications Works perfectly in Windows SOF driver loads correctly with firmware sof-adl.ri and topology sof-hda-generic.tplg But dmesg shows: sof-audio-pci-intel-tgl 0000:00:1f.3: DMICs detected in NHLT tables: 0 No working audio input nodes exposed in PipeWire *Tested*: - Ubuntu 24.04 with kernel 6.8.0-57-generic - snd-intel-dspcfg.dsp_driver=3 set - PulseAudio and PipeWire backends - alsa-base.conf overrides for model options - hdajackretask pin remapping - SOF firmware and topology confirmed present *Conclusion*: Firmware/ACPI likely missing DMIC NHLT entry; requesting kernel quirk or guidance

1 0

[PATCH v1] ALSA: hda/tas2781: Create a common header for both spi and i2c tas2781 hda driver
by Shenghao Ding 08 Apr '25

08 Apr '25

Move the common macro definition of kcontrols into a common header. Signed-off-by: Shenghao Ding <shenghao-ding(a)ti.com> --- v1: - revise the year of spi and i2c tas2781 hda drivers. - Create a common header for both spi and i2c tas2781 hda driver to define the common macros and declare the common functions. --- sound/pci/hda/tas2781_hda.h | 42 +++++++++++++++++++++++++++++++++ sound/pci/hda/tas2781_hda_i2c.c | 29 ++--------------------- sound/pci/hda/tas2781_hda_spi.c | 35 ++------------------------- 3 files changed, 46 insertions(+), 60 deletions(-) create mode 100644 sound/pci/hda/tas2781_hda.h diff --git a/sound/pci/hda/tas2781_hda.h b/sound/pci/hda/tas2781_hda.h new file mode 100644 index 000000000000..c57909c0ed65 --- /dev/null +++ b/sound/pci/hda/tas2781_hda.h @@ -0,0 +1,42 @@ +/* SPDX-License-Identifier: GPL-2.0-only + * + * HDA audio driver for Texas Instruments TAS2781 smart amp + * + * Copyright (C) 2025 Texas Instruments, Inc. + */ +#ifndef __TAS2781_HDA_H__ +#define __TAS2781_HDA_H__ + +/* + * No standard control callbacks for SNDRV_CTL_ELEM_IFACE_CARD + * Define two controls, one is Volume control callbacks, the other is + * flag setting control callbacks. + */ + +/* Volume control callbacks for tas2781 */ +#define ACARD_SINGLE_RANGE_EXT_TLV(xname, xreg, xshift, xmin, xmax, xinvert, \ + xhandler_get, xhandler_put, tlv_array) { \ + .iface = SNDRV_CTL_ELEM_IFACE_CARD, .name = (xname), \ + .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \ + SNDRV_CTL_ELEM_ACCESS_READWRITE, \ + .tlv.p = (tlv_array), \ + .info = snd_soc_info_volsw, \ + .get = xhandler_get, .put = xhandler_put, \ + .private_value = (unsigned long)&(struct soc_mixer_control) { \ + .reg = xreg, .rreg = xreg, \ + .shift = xshift, .rshift = xshift,\ + .min = xmin, .max = xmax, .invert = xinvert, \ + } \ +} + +/* Flag control callbacks for tas2781 */ +#define ACARD_SINGLE_BOOL_EXT(xname, xdata, xhandler_get, xhandler_put) { \ + .iface = SNDRV_CTL_ELEM_IFACE_CARD, \ + .name = xname, \ + .info = snd_ctl_boolean_mono_info, \ + .get = xhandler_get, \ + .put = xhandler_put, \ + .private_value = xdata, \ +} + +#endif diff --git a/sound/pci/hda/tas2781_hda_i2c.c b/sound/pci/hda/tas2781_hda_i2c.c index 29dc4f500580..9d94ae5fcfe0 100644 --- a/sound/pci/hda/tas2781_hda_i2c.c +++ b/sound/pci/hda/tas2781_hda_i2c.c @@ -2,7 +2,7 @@ // // TAS2781 HDA I2C driver // -// Copyright 2023 - 2024 Texas Instruments, Inc. +// Copyright 2023 - 2025 Texas Instruments, Inc. // // Author: Shenghao Ding <shenghao-ding(a)ti.com> // Current maintainer: Baojun Xu <baojun.xu(a)ti.com> @@ -30,35 +30,10 @@ #include "hda_component.h" #include "hda_jack.h" #include "hda_generic.h" +#include "tas2781_hda.h" #define TASDEVICE_SPEAKER_CALIBRATION_SIZE 20 -/* No standard control callbacks for SNDRV_CTL_ELEM_IFACE_CARD - * Define two controls, one is Volume control callbacks, the other is - * flag setting control callbacks. - */ - -/* Volume control callbacks for tas2781 */ -#define ACARD_SINGLE_RANGE_EXT_TLV(xname, xreg, xshift, xmin, xmax, xinvert, \ - xhandler_get, xhandler_put, tlv_array) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_CARD, .name = (xname),\ - .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\ - SNDRV_CTL_ELEM_ACCESS_READWRITE,\ - .tlv.p = (tlv_array), \ - .info = snd_soc_info_volsw, \ - .get = xhandler_get, .put = xhandler_put, \ - .private_value = (unsigned long)&(struct soc_mixer_control) \ - {.reg = xreg, .rreg = xreg, .shift = xshift, \ - .rshift = xshift, .min = xmin, .max = xmax, \ - .invert = xinvert} } - -/* Flag control callbacks for tas2781 */ -#define ACARD_SINGLE_BOOL_EXT(xname, xdata, xhandler_get, xhandler_put) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_CARD, .name = xname, \ - .info = snd_ctl_boolean_mono_info, \ - .get = xhandler_get, .put = xhandler_put, \ - .private_value = xdata } - enum calib_data { R0_VAL = 0, INV_R0, diff --git a/sound/pci/hda/tas2781_hda_spi.c b/sound/pci/hda/tas2781_hda_spi.c index 399f2e4c3b62..c6be2be1b53e 100644 --- a/sound/pci/hda/tas2781_hda_spi.c +++ b/sound/pci/hda/tas2781_hda_spi.c @@ -2,7 +2,7 @@ // // TAS2781 HDA SPI driver // -// Copyright 2024 Texas Instruments, Inc. +// Copyright 2024 - 2025 Texas Instruments, Inc. // // Author: Baojun Xu <baojun.xu(a)ti.com> @@ -38,38 +38,7 @@ #include "hda_component.h" #include "hda_jack.h" #include "hda_generic.h" - -/* - * No standard control callbacks for SNDRV_CTL_ELEM_IFACE_CARD - * Define two controls, one is Volume control callbacks, the other is - * flag setting control callbacks. - */ - -/* Volume control callbacks for tas2781 */ -#define ACARD_SINGLE_RANGE_EXT_TLV(xname, xreg, xshift, xmin, xmax, xinvert, \ - xhandler_get, xhandler_put, tlv_array) { \ - .iface = SNDRV_CTL_ELEM_IFACE_CARD, .name = (xname), \ - .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \ - SNDRV_CTL_ELEM_ACCESS_READWRITE, \ - .tlv.p = (tlv_array), \ - .info = snd_soc_info_volsw, \ - .get = xhandler_get, .put = xhandler_put, \ - .private_value = (unsigned long)&(struct soc_mixer_control) { \ - .reg = xreg, .rreg = xreg, \ - .shift = xshift, .rshift = xshift,\ - .min = xmin, .max = xmax, .invert = xinvert, \ - } \ -} - -/* Flag control callbacks for tas2781 */ -#define ACARD_SINGLE_BOOL_EXT(xname, xdata, xhandler_get, xhandler_put) { \ - .iface = SNDRV_CTL_ELEM_IFACE_CARD, \ - .name = xname, \ - .info = snd_ctl_boolean_mono_info, \ - .get = xhandler_get, \ - .put = xhandler_put, \ - .private_value = xdata, \ -} +#include "tas2781_hda.h" struct tas2781_hda { struct tasdevice_priv *priv; -- 2.34.1

2 1

ucm2: Qualcomm: add Lenovo ThinkBook 16 support
by GitHub pull_request - opened 08 Apr '25

08 Apr '25

alsa-project/alsa-ucm-conf pull request #543 was opened from jglathe: add a Regex string, seems compatible with Thinkpad T14s Tested-by: Jens Glathe <jens.glathe(a)oldschoolsolutions.biz> Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/543 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/543.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Fireworks Alsa Driver Buffer SIze
by jayt0808＠gmail.com 08 Apr '25

08 Apr '25

Hi I'm using an AudioFire 8a that has 16 channels over the firewire bus and the snd-fireworks alsa firewire driver. In Jack, when I set Frames/Period to anything higher than 64, alsa fails with an error saying Mon Apr 7 22:15:35 2025: ERROR: ALSA: cannot set hardware parameters for capture Mon Apr 7 22:15:35 2025: ERROR: ALSA: cannot configure capture channel I noticed that the output of "aplay -D hw:1,0 --dump-hw-params /dev/zero" indicated the following alsa settings: Playing raw data '/dev/zero' : Unsigned 8 bit, Rate 8000 Hz, Mono HW Params of device "hw:1,0": -------------------- ACCESS: MMAP_INTERLEAVED RW_INTERLEAVED FORMAT: S32_LE SUBFORMAT: STD SAMPLE_BITS: 32 FRAME_BITS: [384 512] CHANNELS: [12 16] RATE: [32000 96000] PERIOD_TIME: [250 32000] PERIOD_SIZE: [16 2720] PERIOD_BYTES: [768 131072] PERIODS: [2 341] BUFFER_TIME: (333 170500] BUFFER_SIZE: [32 5456] BUFFER_BYTES: [1536 262144] TICK_TIME: ALL -------------------- aplay: set_params:1371: Sample format non available Available formats: - S32_LE I was concerned that the BUFFER_SIZE was too small to support 16 channels at a 128 Frames/Period size. But when I modded the driver to increase this figure, it did not fix the issue. Anyone have any insight on this issue? Running Ubuntu 24.04 with kernel 6.8.0-57-lowlatency. Everything seems to work fine when I set 64 Frames/Period (except the occasional annoying stuttering that one can expect in that scenario; with a buffer that is too small to support the system load). Thanks Jay

1 0

[PATCH v2] ASoC: dwc: always enable/disable i2s irqs
by Brady Norander 08 Apr '25

08 Apr '25

Commit a42e988 ("ASoC: dwc: add DMA handshake control") changed the behavior of the driver to not enable or disable i2s irqs if using DMA. This breaks platforms such as AMD ACP. Audio playback appears to work but no audio can be heard. Revert to the old behavior by always enabling and disabling i2s irqs while keeping DMA handshake control. Fixes: a42e988 ("ASoC: dwc: add DMA handshake control") Signed-off-by: Brady Norander <bradynorander(a)gmail.com> --- v2: reword commit message to better describe the issue --- sound/soc/dwc/dwc-i2s.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/sound/soc/dwc/dwc-i2s.c b/sound/soc/dwc/dwc-i2s.c index 57b789d7fbed..5b4f20dbf7bb 100644 --- a/sound/soc/dwc/dwc-i2s.c +++ b/sound/soc/dwc/dwc-i2s.c @@ -199,12 +199,10 @@ static void i2s_start(struct dw_i2s_dev *dev, else i2s_write_reg(dev->i2s_base, IRER, 1); - /* I2S needs to enable IRQ to make a handshake with DMAC on the JH7110 SoC */ - if (dev->use_pio || dev->is_jh7110) - i2s_enable_irqs(dev, substream->stream, config->chan_nr); - else + if (!(dev->use_pio || dev->is_jh7110)) i2s_enable_dma(dev, substream->stream); + i2s_enable_irqs(dev, substream->stream, config->chan_nr); i2s_write_reg(dev->i2s_base, CER, 1); } @@ -218,11 +216,12 @@ static void i2s_stop(struct dw_i2s_dev *dev, else i2s_write_reg(dev->i2s_base, IRER, 0); - if (dev->use_pio || dev->is_jh7110) - i2s_disable_irqs(dev, substream->stream, 8); - else + if (!(dev->use_pio || dev->is_jh7110)) i2s_disable_dma(dev, substream->stream); + i2s_disable_irqs(dev, substream->stream, 8); + + if (!dev->active) { i2s_write_reg(dev->i2s_base, CER, 0); i2s_write_reg(dev->i2s_base, IER, 0); -- 2.49.0

1 0

pcm: hw: do not reset tstamp_type in SND_PCM_APPEND mode
by GitHub pull_request - opened 07 Apr '25

07 Apr '25

alsa-project/alsa-lib pull request #450 was opened from kgroeneveld: When the first client of plugins such as dshare open the hw device they set a default tstamp_type in snd_pcm_direct_initialize_slave based on tstamp_type from the config file. But when subsequent clients open the same plugin the snd_pcm_hw_open_fd function clobbers this default. Request URL : https://github.com/alsa-project/alsa-lib/pull/450 Patch URL : https://github.com/alsa-project/alsa-lib/pull/450.patch Repository URL: https://github.com/alsa-project/alsa-lib

1 0

alsaseq: Fix type check in set_time()
by GitHub pull_request - opened 06 Apr '25

06 Apr '25

alsa-project/alsa-python pull request #17 was opened from ernestask: SeqEvent_set_time() has fallen victim to the inverted get_long1() return value here, erroring out when called with actual integers. Request URL : https://github.com/alsa-project/alsa-python/pull/17 Patch URL : https://github.com/alsa-project/alsa-python/pull/17.patch Repository URL: https://github.com/alsa-project/alsa-python

1 0

envy24control: port to GTK 3
by GitHub pull_request - opened 05 Apr '25

05 Apr '25

alsa-project/alsa-tools pull request #35 was opened from andreas56: This is a port envy24control from GTK 2 to GTK 3. Note: There is another very similar port in #27, but that one isn't quite finished. I did my port before noticing that there already was one, but I have compared them now to check that I didn't miss anything. My version has more changes, as I wanted to avoid using deprecated GTK functions. It also fixes the rendering of the level meters and optimizes it a bit so the CPU load isn't much higher than it was in GTK 2. Note 2: the fix from #31 is included in this pull request, as it is necessary for the spin buttons to work in GTK 3. Note 3: my other envy24control pull requests are not included here, as they are not related to GTK 3. #29 will probably cause merge conflicts with this one, but I will fix them if you decide to merge any of the pull requests. Request URL : https://github.com/alsa-project/alsa-tools/pull/35 Patch URL : https://github.com/alsa-project/alsa-tools/pull/35.patch Repository URL: https://github.com/alsa-project/alsa-tools

1 0

ALC4080 - general discussion (driver support)
by GitHub issues - edited 04 Apr '25

04 Apr '25

alsa-project/alsa-ucm-conf issue #541 was edited from perexg: UCM cannot add basic functionalities when the driver does not expose them. I already explained situation in [kernel bugzilla](https://bugzilla.kernel.org/show_bug.cgi?id=218913). **Note** This issue is for the kernel driver related problems. If the driver works and something is missing in UCM configuration, please, create a new issue in this tracker. It may be difficult to distinguish the right place, but if the developers redirected you here, follow the instructions bellow. **For issues like** 1. jack functionality assignment is unstable (jack functionality is not fixed - e.g. changes on warm reboot from windows) 2. low microphone volume (which cannot be controlled using native ALSA mixer controls) 3. sound is activated only after some magic plug/unplug sequence **Further steps** Try to analyze the audio driver using direct ALSA API. See [DEBUG.md](https://github.com/alsa-project/alsa-ucm-conf/blob/master/ucm2/DE…. Very nice report is in #528. Please, use it as a reference what to do. Developers usually do not have exact hardware, so observations describing which ALSA PCM device, which ALSA Mixer control, which ALSA Jack control can be used for given playback/capture device are essential. If the functionality cannot be handled with current ALSA audio driver, go to paragraphs bellow. Reverse engineering of the Windows driver. Capture USB communication and save it to a file which can be replayed by [wireshark](https://www.wireshark.org). Try to write an explanation including timing (what happened in given time slots). Driver reports should go to [kernel bugzilla](https://bugzilla.kernel.org). Add a comment with a link here. You may also push hardware vendors to create USB device which fully follows the USB audio specification, so the ALSA driver will work out-of-box (without "quirks"). **Documentation links** The documentation is not complete. Realtek support is generally very limited to provide full specification to their codecs / audio chips those years. They are providing details only to hardware vendors with a contract. If you know more, please, let us know. - [ALC4080 block scheme](https://bugzilla.kernel.org/attachment.cgi?id=306370) - [ALC4080 datasheet](https://bugzilla.kernel.org/attachment.cgi?id=307224) **Some details** ALC4080 is USB codec, thus it exposes functionality through the USB bus. The block scheme is nice to know internals, but look to the MCU paragraph in the datasheet: ``` 2.1.2. Micro Controller Unit - On-chip high-performance and low-power MCU - Ultra-low power consumption when MCU is at idle state - MCU controls connection to USB bus for re-enumeration without hot-plug - Internal programmable memory support for customized audio function - Watchdog control for MCU reset and interrupt - Configurable VID (Vendor ID), PID (Product ID), and serial number string ``` This means, that the internal firmware for this MCU unit can change the behaviour of audio hardware. Usually, the firmware is vendor specific. The USB audio hardware should comply with the USB Audio specification (refer https://www.usb.org/). The control units parsed by the ALSA driver can be obtained using 'cat /proc/asound/cardX/usbmixer' command (replace X with the correct ALSA card number). Those units are mapped to the standard mixer controls. My guess is that the firmware is not complaint with the USB audio specification and some functionality is controlled using specific USB handshake (data blocks). Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/541 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

ALC4080 - general discussion (driver support)
by GitHub issues - edited 04 Apr '25

04 Apr '25

alsa-project/alsa-ucm-conf issue #541 was edited from perexg: UCM cannot add basic functionalities when the driver does not expose them. I already explained situation in [kernel bugzilla](https://bugzilla.kernel.org/show_bug.cgi?id=218913). **Note** This issue is for the kernel driver related problems. If the driver works and something is missing in UCM configuration, please, create a new issue in this tracker. It may be difficult to distinguish the right place, but if the developers redirected you here, follow the instructions bellow. **For issues like** 1. jack functionality assignment is unstable (jack functionality is not fixed - e.g. changes on warm reboot from windows) 2. low microphone volume (which cannot be controlled using native ALSA mixer controls) 3. sound is activated only after some magic plug/unplug sequence **Further steps** Try to analyze the audio driver using direct ALSA API. See [DEBUG.md](https://github.com/alsa-project/alsa-ucm-conf/blob/master/ucm2/DE…. Very nice report is in #528. Please, use it as a reference what to do. Developers usually do not have exact hardware, so observations describing which ALSA PCM device, which ALSA Mixer control, which ALSA Jack control can be used for given playback/capture device are essential. Reverse engineering of the Windows driver. Capture USB communication and save it to a file which can be replayed by [wireshark](https://www.wireshark.org). Try to write an explanation including timing (what happened in given time slots). Driver reports should go to [kernel bugzilla](https://bugzilla.kernel.org). Add a comment with a link here. You may also push hardware vendors to create USB device which fully follows the USB audio specification, so the ALSA driver will work out-of-box (without "quirks"). **Documentation links** The documentation is not complete. Realtek support is generally very limited to provide full specification to their codecs / audio chips those years. They are providing details only to hardware vendors with a contract. If you know more, please, let us know. - [ALC4080 block scheme](https://bugzilla.kernel.org/attachment.cgi?id=306370) - [ALC4080 datasheet](https://bugzilla.kernel.org/attachment.cgi?id=307224) **Some details** ALC4080 is USB codec, thus it exposes functionality through the USB bus. The block scheme is nice to know internals, but look to the MCU paragraph in the datasheet: ``` 2.1.2. Micro Controller Unit - On-chip high-performance and low-power MCU - Ultra-low power consumption when MCU is at idle state - MCU controls connection to USB bus for re-enumeration without hot-plug - Internal programmable memory support for customized audio function - Watchdog control for MCU reset and interrupt - Configurable VID (Vendor ID), PID (Product ID), and serial number string ``` This means, that the internal firmware for this MCU unit can change the behaviour of audio hardware. Usually, the firmware is vendor specific. The USB audio hardware should comply with the USB Audio specification (refer https://www.usb.org/). The control units parsed by the ALSA driver can be obtained using 'cat /proc/asound/cardX/usbmixer' command (replace X with the correct ALSA card number). Those units are mapped to the standard mixer controls. My guess is that the firmware is not complaint with the USB audio specification and some functionality is controlled using specific USB handshake (data blocks). Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/541 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

ALC4080 - general discussion (driver support)
by GitHub issues - edited 04 Apr '25

04 Apr '25

alsa-project/alsa-ucm-conf issue #541 was edited from perexg: UCM cannot add basic functionalities when the driver does not expose them. I already explained situation in [kernel bugzilla](https://bugzilla.kernel.org/show_bug.cgi?id=218913). **Note** This issue is for the kernel driver related problems. If the driver works and something is missing in UCM configuration, please, create a new issue in this tracker. It may be difficult to distinguish the right place, but if the developers redirected you here, follow the instructions bellow. **For issues like** 1. jack functionality assignment is unstable (jack functionality is not fixed - e.g. changes on warm reboot from windows) 2. low microphone volume (which cannot be controlled using native ALSA mixer controls) 3. sound is activated only after some magic plug/unplug sequence **Further steps** Try to analyze the audio driver using direct ALSA API. See [DEBUG.md](https://github.com/alsa-project/alsa-ucm-conf/blob/master/ucm2/DE…. Very nice report is in #528. Please, use it as a reference what to do. Developers usually do not have exact hardware, so observations describing which ALSA PCM device, which ALSA Mixer control, which ALSA Jack control can be used for given playback/capture device is essential. Reverse engineering of the Windows driver. Capture USB communication and save it to a file which can be replayed by [wireshark](https://www.wireshark.org). Try to write an explanation including timing (what happened in given time slots). Driver reports should go to [kernel bugzilla](https://bugzilla.kernel.org). Add a comment with a link here. You may also push hardware vendors to create USB device which fully follows the USB audio specification, so the ALSA driver will work out-of-box (without "quirks"). **Documentation links** The documentation is not complete. Realtek support is generally very limited to provide full specification to their codecs / audio chips those years. They are providing details only to hardware vendors with a contract. If you know more, please, let us know. - [ALC4080 block scheme](https://bugzilla.kernel.org/attachment.cgi?id=306370) - [ALC4080 datasheet](https://bugzilla.kernel.org/attachment.cgi?id=307224) **Some details** ALC4080 is USB codec, thus it exposes functionality through the USB bus. The block scheme is nice to know internals, but look to the MCU paragraph in the datasheet: ``` 2.1.2. Micro Controller Unit - On-chip high-performance and low-power MCU - Ultra-low power consumption when MCU is at idle state - MCU controls connection to USB bus for re-enumeration without hot-plug - Internal programmable memory support for customized audio function - Watchdog control for MCU reset and interrupt - Configurable VID (Vendor ID), PID (Product ID), and serial number string ``` This means, that the internal firmware for this MCU unit can change the behaviour of audio hardware. Usually, the firmware is vendor specific. The USB audio hardware should comply with the USB Audio specification (refer https://www.usb.org/). The control units parsed by the ALSA driver can be obtained using 'cat /proc/asound/cardX/usbmixer' command (replace X with the correct ALSA card number). Those units are mapped to the standard mixer controls. My guess is that the firmware is not complaint with the USB audio specification and some functionality is controlled using specific USB handshake (data blocks). Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/541 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

ucm2: sof-soundwire: Correct include file path for dsp.conf
by GitHub pull_request - opened 04 Apr '25

04 Apr '25

alsa-project/alsa-ucm-conf pull request #542 was opened from ujfalusi: The file path must be given as absolut and not relative, otherwise the dsp.conf file will not be found: $ alsaucm dump text ALSA lib utils.c:364:(uc_mgr_config_load_into) could not open configuration file /usr/share/alsa/ucm2/conf.d/sof-soundwire/../Intel/sof-hda-dsp/dsp.conf ALSA lib parser.c:78:(uc_mgr_config_load_file) error: failed to open file /usr/share/alsa/ucm2/conf.d/sof-soundwire/../Intel/sof-hda-dsp/dsp.conf: -2 ALSA lib main.c:1554:(snd_use_case_mgr_open) error: failed to import hw:0 use case configuration -2 alsaucm: error failed to open sound card hw:0: No such file or directory Fixes: c9d1f7eafa6c ("UCM2: sof-soundwire: Enable DRC and equalizers for") Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/542 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/542.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

USB-Audio: Add Roland BridgeCast One | adapted
by GitHub pull_request - edited 03 Apr '25

03 Apr '25

alsa-project/alsa-ucm-conf pull request #536 was edited from Simon99de: Add Roland BridgeCast One uses the same config as the bridge cast v2 as it has the same outputs and it worked in my test. 0582:030d Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/536 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/536.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Alsa lib is not able to find the UCM .conf files
by GitHub issues - opened 03 Apr '25

03 Apr '25

alsa-project/alsa-lib issue #449 was opened from 3bitbrain: Note : the sound card is a Xonar DX ( AV200 ) The alsa UCM files are installed at PATH=/usr/share/alsa When I try to start alsasound, I get this error == ` alsa-lib-1.2.11/src/umc/main.c:1554: (snd_use_case_mgr_open) error : failed to import hw:1 use case configuration -2 ` The CMD alsaucm listcards gets this response : list is empty. [alsa-info.txt](https://github.com/alsa-project/alsa-ucm-conf/files/15455180… [aplay-info.txt](https://github.com/alsa-project/alsa-ucm-conf/files/1545518… Issue URL : https://github.com/alsa-project/alsa-lib/issues/449 Repository URL: https://github.com/alsa-project/alsa-lib

1 0

ALC4080 - general discussion (driver support)
by GitHub issues - edited 03 Apr '25

03 Apr '25

alsa-project/alsa-ucm-conf issue #541 was edited from perexg: UCM cannot add basic functionalities when the driver does not expose them. I already explained situation in [kernel bugzilla](https://bugzilla.kernel.org/show_bug.cgi?id=218913). **Note** This issue is for the kernel driver related problems. If the driver works and something is missing in UCM configuration, please, create a new issue in this tracker. It may be difficult to distinguish the right place, but if the developers redirected you here, follow the instructions bellow. **For issues like** 1. jack functionality assignment is unstable (jack functionality is not fixed - e.g. changes on warm reboot from windows) 2. low microphone volume (which cannot be controlled using native ALSA mixer controls) 3. sound is activated only after some magic plug/unplug sequence **Further steps** Try to analyze the audio driver using direct ALSA API. See [DEBUG.md](https://github.com/alsa-project/alsa-ucm-conf/blob/master/ucm2/DE…. Very nice report is in #528. Please, use it as a reference what to do. Reverse engineering of the Windows driver. Capture USB communication and save it to a file which can be replayed by [wireshark](https://www.wireshark.org). Try to write an explanation including timing (what happened in given time slots). Driver reports should go to [kernel bugzilla](https://bugzilla.kernel.org). Add a comment with a link here. You may also push hardware vendors to create USB device which fully follows the USB audio specification, so the ALSA driver will work out-of-box (without "quirks"). **Documentation links** The documentation is not complete. Realtek support is generally very limited to provide full specification to their codecs / audio chips those years. They are providing details only to hardware vendors with a contract. If you know more, please, let us know. - [ALC4080 block scheme](https://bugzilla.kernel.org/attachment.cgi?id=306370) - [ALC4080 datasheet](https://bugzilla.kernel.org/attachment.cgi?id=307224) **Some details** ALC4080 is USB codec, thus it exposes functionality through the USB bus. The block scheme is nice to know internals, but look to the MCU paragraph in the datasheet: ``` 2.1.2. Micro Controller Unit - On-chip high-performance and low-power MCU - Ultra-low power consumption when MCU is at idle state - MCU controls connection to USB bus for re-enumeration without hot-plug - Internal programmable memory support for customized audio function - Watchdog control for MCU reset and interrupt - Configurable VID (Vendor ID), PID (Product ID), and serial number string ``` This means, that the internal firmware for this MCU unit can change the behaviour of audio hardware. Usually, the firmware is vendor specific. The USB audio hardware should comply with the USB Audio specification (refer https://www.usb.org/). The control units parsed by the ALSA driver can be obtained using 'cat /proc/asound/cardX/usbmixer' command (replace X with the correct ALSA card number). Those units are mapped to the standard mixer controls. My guess is that the firmware is not complaint with the USB audio specification and some functionality is controlled using specific USB handshake (data blocks). Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/541 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

ALC4080 - general discussion (driver support)
by GitHub issues - edited 03 Apr '25

03 Apr '25

alsa-project/alsa-ucm-conf issue #541 was edited from perexg: UCM cannot add basic functionalities when the driver does not expose them. I already explained situation in [kernel bugzilla](https://bugzilla.kernel.org/show_bug.cgi?id=218913). **Note** This issue is for the kernel driver related problems. If the driver works and something is missing in UCM configuration, please, create a new issue in this tracker. It may be difficult to distinguish the right place, but if the developers redirected you here, follow the instructions bellow. **For issues like** 1. jack functionality assignment is unstable (jack functionality is not fixed - e.g. changes on warm reboot from windows) 2. low microphone volume (which cannot be controlled using native ALSA mixer controls) 3. sound is activated only after some magic plug/unplug sequence **Further steps** Try to analyze the audio driver using direct ALSA API. See [DEBUG.md](https://github.com/alsa-project/alsa-ucm-conf/blob/master/ucm2/DE…. Very nice report is in #528. Please, use it as a reference what to do. Reverse engineering of the Windows driver. Capture USB communication and save it to a file which can be replayed by [wireshark] (https://www.wireshark.org). Try to write an explanation including timing (what happened in given time slots). Driver reports should go to [kernel bugzilla](https://bugzilla.kernel.org). Add a comment with a link here. You may also push hardware vendors to create USB device which fully follows the USB audio specification, so the ALSA driver will work out-of-box (without "quirks"). **Documentation links** The documentation is not complete. Realtek support is generally very limited to provide full specification to their codecs / audio chips those years. They are providing details only to hardware vendors with a contract. If you know more, please, let us know. - [ALC4080 block scheme](https://bugzilla.kernel.org/attachment.cgi?id=306370) - [ALC4080 datasheet](https://bugzilla.kernel.org/attachment.cgi?id=307224) **Some details** ALC4080 is USB codec, thus it exposes functionality through the USB bus. The block scheme is nice to know internals, but look to the MCU paragraph in the datasheet: ``` 2.1.2. Micro Controller Unit - On-chip high-performance and low-power MCU - Ultra-low power consumption when MCU is at idle state - MCU controls connection to USB bus for re-enumeration without hot-plug - Internal programmable memory support for customized audio function - Watchdog control for MCU reset and interrupt - Configurable VID (Vendor ID), PID (Product ID), and serial number string ``` This means, that the internal firmware for this MCU unit can change the behaviour of audio hardware. Usually, the firmware is vendor specific. The USB audio hardware should comply with the USB Audio specification (refer https://www.usb.org/). The control units parsed by the ALSA driver can be obtained using 'cat /proc/asound/cardX/usbmixer' command (replace X with the correct ALSA card number). Those units are mapped to the standard mixer controls. My guess is that the firmware is not complaint with the USB audio specification and some functionality is controlled using specific USB handshake (data blocks). Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/541 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

ALC4080 - general discussion (driver support)
by GitHub issues - opened 03 Apr '25

03 Apr '25

alsa-project/alsa-ucm-conf issue #541 was opened from perexg: UCM cannot add basic functionalities when the driver does not expose them. I already explained situation in [kernel bugzilla](https://bugzilla.kernel.org/show_bug.cgi?id=218913). **For issues like** 1. jack functionality assignment is unstable (jack functionality is not fixed - e.g. changes on warm reboot from windows) 2. low microphone volume (which cannot be controlled using native ALSA mixer controls) 3. sound is activated only after some magic plug/unplug sequence **Further steps** Try to analyze the audio driver using direct ALSA API. See [DEBUG.md](https://github.com/alsa-project/alsa-ucm-conf/blob/master/ucm2/DE…. Very nice report is in #528. Please, use it as a reference what to do. Reverse engineering of the Windows driver. Capture USB communication and save it to a file which can be replayed by [wireshark] (https://www.wireshark.org). Try to write an explanation including timing (what happened in given time slots). Driver reports should go to [kernel bugzilla](https://bugzilla.kernel.org). Add a comment with a link here. You may also push hardware vendors to create USB device which fully follows the USB audio specification, so the ALSA driver will work out-of-box (without "quirks"). **Documentation links** The documentation is not complete. Realtek support is generally very limited to provide full specification to their codecs / audio chips those years. They are providing details only to hardware vendors with a contract. If you know more, please, let us know. - [ALC4080 block scheme](https://bugzilla.kernel.org/attachment.cgi?id=306370) - [ALC4080 datasheet](https://bugzilla.kernel.org/attachment.cgi?id=307224) **Some details** ALC4080 is USB codec, thus it exposes functionality through the USB bus. The block scheme is nice to know internals, but look to the MCU paragraph in the datasheet: ``` 2.1.2. Micro Controller Unit - On-chip high-performance and low-power MCU - Ultra-low power consumption when MCU is at idle state - MCU controls connection to USB bus for re-enumeration without hot-plug - Internal programmable memory support for customized audio function - Watchdog control for MCU reset and interrupt - Configurable VID (Vendor ID), PID (Product ID), and serial number string ``` This means, that the internal firmware for this MCU unit can change the behaviour of audio hardware. Usually, the firmware is vendor specific. The USB audio hardware should comply with the USB Audio specification (refer https://www.usb.org/). The control units parsed by the ALSA driver can be obtained using 'cat /proc/asound/cardX/usbmixer' command (replace X with the correct ALSA card number). Those units are mapped to the standard mixer controls. My guess is that the firmware is not complaint with the USB audio specification and some functionality is controlled using specific USB handshake (data blocks). Issue URL : https://github.com/alsa-project/alsa-ucm-conf/issues/541 Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

Delete alsalisp code
by GitHub pull_request - opened 02 Apr '25

02 Apr '25

alsa-project/alsa-lib pull request #448 was opened from fragglet: Install of the alsalisp binary has been disabled since 2006 (in commit 8d382ccd), and building of it was disabled by default in 2018 (in commit 32ceab21), so it is reasonable to assume that nobody is using it. Use within the alsa-lib project is limited to an aliases file that looks like it is intended as an example, plus some very small .alisp files associated with the SiS SI7018 PCI sound card which has not been manufactured in years. These too have not been installed since 2018 when commit 32ceab21 disabled building of the alsalisp binary. In preparing this change, I searched the Github issue tracker for "lisp", "alisp" and "alsalisp", and found no complaints about the above changes. I also did a Github code search for projects that might be including the `alisp.h` header and found none. Therefore I think this code can be safely deleted and nobody is likely to object. Request URL : https://github.com/alsa-project/alsa-lib/pull/448 Patch URL : https://github.com/alsa-project/alsa-lib/pull/448.patch Repository URL: https://github.com/alsa-project/alsa-lib

1 0

sof-soundwire: cs42l43: Switch mixer based on output volume
by GitHub pull_request - opened 02 Apr '25

02 Apr '25

alsa-project/alsa-ucm-conf pull request #540 was opened from mstrozek: Hardware volume control in cs42l43 can go up to +31.5dB which can cause audio degradation. For best results, limit hardware volume to 0dB. Link: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/4622 Request URL : https://github.com/alsa-project/alsa-ucm-conf/pull/540 Patch URL : https://github.com/alsa-project/alsa-ucm-conf/pull/540.patch Repository URL: https://github.com/alsa-project/alsa-ucm-conf

1 0

[GIT PULL] ASoC fixes for v6.15-merge-window
by Mark Brown 02 Apr '25

02 Apr '25

The following changes since commit 9ef52d529bb75071e03cf85078f724d69c4abe89: ASoC: SDCA: Correct handling of selected mode DisCo property (2025-03-21 15:45:25 +0000) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tags/asoc-fix-v6.15-merge-window for you to fetch changes up to 93d34608fd162f725172e780b1c60cc93a920719: ASoC: imx-card: Add NULL check in imx_card_probe() (2025-04-01 17:01:10 +0100) ---------------------------------------------------------------- ASoC: Fixes for v6.15 A relatively large set of fixes that came in since the release, mostly for Qualcomm platforms. The biggest block of fixes is the set from Srini which fixes various quality and glitching issues on AudioReach systems. ---------------------------------------------------------------- Alexey Klimov (1): ASoC: qdsp6: q6asm-dai: fix q6asm_dai_compr_set_params error path Christophe JAILLET (1): ASoC: codecs: rt5665: Fix some error handling paths in rt5665_probe() Dan Carpenter (1): ASoC: sma1307: Fix error handling in sma1307_setting_loaded() Henry Martin (1): ASoC: imx-card: Add NULL check in imx_card_probe() Krzysztof Kozlowski (2): ASoC: codecs: wsa883x: Correct VI sense channel mask ASoC: codecs: wsa884x: Correct VI sense channel mask Mark Brown (2): ASoC: codecs: wsa88xx: Correct VI sense channel mask ASoC: q6apm: fix under runs and fragment sizes Peter Ujfalusi (1): ASoC: SOF: hda/ptl: Move mic privacy change notification sending to a work Richard Fitzgerald (1): firmware: cs_dsp: Ensure cs_dsp_load[_coeff]() returns 0 on success Srinivas Kandagatla (5): ASoC: q6apm-dai: schedule all available frames to avoid dsp under-runs ASoC: q6apm: add q6apm_get_hw_pointer helper ASoC: qdsp6: q6apm-dai: set 10 ms period and buffer alignment. ASoC: qdsp6: q6apm-dai: fix capture pipeline overruns. ASoC: q6apm-dai: make use of q6apm_get_hw_pointer drivers/firmware/cirrus/cs_dsp.c | 2 ++ sound/soc/codecs/rt5665.c | 24 +++------------- sound/soc/codecs/sma1307.c | 11 ++------ sound/soc/codecs/wsa883x.c | 2 +- sound/soc/codecs/wsa884x.c | 2 +- sound/soc/fsl/imx-card.c | 4 +++ sound/soc/qcom/qdsp6/q6apm-dai.c | 60 +++++++++++++++++++++------------------- sound/soc/qcom/qdsp6/q6apm.c | 18 +++++++++++- sound/soc/qcom/qdsp6/q6apm.h | 3 ++ sound/soc/qcom/qdsp6/q6asm-dai.c | 19 +++++++++---- sound/soc/sof/intel/hda-dsp.c | 8 ++++++ sound/soc/sof/intel/hda.c | 4 +++ sound/soc/sof/intel/hda.h | 8 ++++++ sound/soc/sof/intel/ptl.c | 33 +++++++++++++++++++--- 14 files changed, 128 insertions(+), 70 deletions(-)

2 1

Support mute led function for HP platform
by Kailang 02 Apr '25

02 Apr '25

Hi Takashi, Attach was fixed mute led no function with HP platform. Many Thanks. BR, Kailang

2 1

aplay: add support for G.711 A_LAW enconding in AU file format
by GitHub pull_request - opened 02 Apr '25

02 Apr '25

alsa-project/alsa-utils pull request #297 was opened from chleroy: At the time being, aplay only supports G.711 µ-law, 8-bits PCM and 16-bits PCM encodings for the AU format while the AU format supports many more. In Europe the most G.711 used encoding is the A-law, which is also part of the encodings supported by the AU file format. Add support for that encoding in aplay. Request URL : https://github.com/alsa-project/alsa-utils/pull/297 Patch URL : https://github.com/alsa-project/alsa-utils/pull/297.patch Repository URL: https://github.com/alsa-project/alsa-utils

1 0

[PATCH alsa-ucm-conf 1/2] sof-soundwire: cs42l43: Drop headset mic from mic mute LED
by Maciej Strozek 01 Apr '25

01 Apr '25

As per conversation in [1], let headsets be dropped from LED bindings. Also remove turning off the mics on device disable since they are now not needed. [1]: https://github.com/alsa-project/alsa-ucm-conf/pull/512 Signed-off-by: Maciej Strozek <mstrozek(a)opensource.cirrus.com> --- ucm2/codecs/cs42l43/init.conf | 6 ------ ucm2/sof-soundwire/cs42l43-dmic.conf | 2 -- ucm2/sof-soundwire/cs42l43.conf | 1 - 3 files changed, 9 deletions(-) diff --git a/ucm2/codecs/cs42l43/init.conf b/ucm2/codecs/cs42l43/init.conf index 0e987c21..c0fa863c 100644 --- a/ucm2/codecs/cs42l43/init.conf +++ b/ucm2/codecs/cs42l43/init.conf @@ -10,9 +10,3 @@ LibraryConfig.remap.Config { } } } - -BootSequence [ - cset "name='cs42l43 Decimator 1 Switch' 0" -] - -Macro [{ SetLED { LED="mic" Action="attach" CtlId="cs42l43 Decimator 1 Switch" } }] diff --git a/ucm2/sof-soundwire/cs42l43-dmic.conf b/ucm2/sof-soundwire/cs42l43-dmic.conf index 70ce40ff..b68a70d1 100644 --- a/ucm2/sof-soundwire/cs42l43-dmic.conf +++ b/ucm2/sof-soundwire/cs42l43-dmic.conf @@ -13,8 +13,6 @@ SectionDevice."Mic" { ] DisableSequence [ - cset "name='cs42l43 Decimator 3 Switch' 0" - cset "name='cs42l43 Decimator 4 Switch' 0" cset "name='cs42l43 DP1TX1 Input' 'None'" cset "name='cs42l43 DP1TX2 Input' 'None'" ] diff --git a/ucm2/sof-soundwire/cs42l43.conf b/ucm2/sof-soundwire/cs42l43.conf index 4b4e1187..51832126 100644 --- a/ucm2/sof-soundwire/cs42l43.conf +++ b/ucm2/sof-soundwire/cs42l43.conf @@ -33,7 +33,6 @@ SectionDevice."Headset" { ] DisableSequence [ - cset "name='cs42l43 Decimator 1 Switch' 0" cset "name='cs42l43 DP2TX1 Input' 'None'" cset "name='cs42l43 DP2TX2 Input' 'None'" ] -- 2.39.5

2 6