January 2024 - Alsa-devel - mailman.alsa-project.org

[PATCH 00/16] ALSA: hda/tas2781: Add tas2563 support
by Gergo Koteles 02 Jan '24

02 Jan '24

The tas2781-hda driver can be modified to support tas2563 as well. Before knowing this information, I created another series for a new driver. https://lore.kernel.org/lkml/cover.1701733441.git.soyer@irl.hu/ This series now extends tas2781-hda, addresses differences and fixes various bugs. The tas2563 is a smart amplifier. Similar to tas2562 but with DSP. Some Lenovo laptops have it to drive the bass speakers. By default, it is in software shutdown state. To make the DSP work it needs a firmware and some calibration data. The latter can be read from the EFI in Lenovo laptops. For the correct configuration it needs additional register data. It captured after running the Windows driver. The firmware can be extracted as TAS2563Firmware.bin from the Windows driver with innoextract. https://download.lenovo.com/consumer/mobiles/h5yd037fbfyy7kd0.exe The driver will search for it as TAS2XXX3870.bin with the 14ARB7. The captured registers extracted with TI's regtool: https://github.com/soyersoyer/tas2563rca/raw/main/INT8866RCA2.bin Gergo Koteles (16): ASoC: tas2781: add support for fw version 0x0503 ALSA: hda/tas2781: leave hda_component in usable state ASoC: tas2781: disable regmap regcache ALSA: hda/tas2781: handle missing calibration data ALSA: hda/tas2781: fix typos in comment ASoC: tas2781: add ptrs to calibration functions ALSA: hda/tas2781: load_calibration just load ASoC: tas2781: add configurable global_addr ALSA: hda/tas2781: add TAS2563 support for 14ARB7 ASoC: tas2781: check negative indexes ASoC: tas2781: use 0 as default prog/conf index ASoC: tas2781: move set_drv_data outside tasdevice_init ALSA: hda/tas2781: remove sound controls in unbind ALSA: hda/tas2781: call cleaner functions only once ALSA: hda/tas2781: reset the amp before component_add ALSA: hda/tas2781: configure the amp after firmware load include/sound/tas2781.h | 8 + sound/pci/hda/tas2781_hda_i2c.c | 364 +++++++++++++++++++----------- sound/soc/codecs/tas2781-comlib.c | 23 +- sound/soc/codecs/tas2781-fmwlib.c | 11 +- sound/soc/codecs/tas2781-i2c.c | 2 + 5 files changed, 270 insertions(+), 138 deletions(-) base-commit: ffc253263a1375a65fa6c9f62a893e9767fbebfa -- 2.43.0

4 41

[PATCH] ALSA: hda/tas2781: configure the amp after firmware load
by Gergo Koteles 02 Jan '24

02 Jan '24

Make the amp available immediately after a module load to avoid having to wait for a PCM hook action. (eg. unloading & loading the module while listening music) Signed-off-by: Gergo Koteles <soyer(a)irl.hu> --- sound/pci/hda/tas2781_hda_i2c.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/pci/hda/tas2781_hda_i2c.c b/sound/pci/hda/tas2781_hda_i2c.c index dfe281b57aa6..c8523df4105f 100644 --- a/sound/pci/hda/tas2781_hda_i2c.c +++ b/sound/pci/hda/tas2781_hda_i2c.c @@ -584,6 +584,8 @@ static void tasdev_fw_ready(const struct firmware *fmw, void *context) */ tas2781_save_calibration(tas_priv); + tasdevice_tuning_switch(tas_hda->priv, 0); + out: mutex_unlock(&tas_hda->priv->codec_lock); if (fmw) base-commit: 64bf8dec54cfe57f416884a6b3d54c7f4259e93f -- 2.43.0

2 1

[PATCH 00/23] ALSA: scarlett2: Refactor in preparation for gen4
by Geoffrey D. Bennett 02 Jan '24

02 Jan '24

Hi Takashi, This series is preparation for adding support for the Focusrite Scarlett 4th Gen devices. It applies on top of the previous series https://lore.kernel.org/linux-sound/cover.1703001053.git.g@b4.vu/ "ALSA: scarlett2: Firmware Upgrade and Error Handling Improvements". There should be no notable functional changes in this series, just refactoring/restructuring/renaming/reformatting. Regards, Geoffrey. Geoffrey D. Bennett (23): ALSA: scarlett2: Simplify enums by removing explicit values ALSA: scarlett2: Infer has_msd_mode from config items ALSA: scarlett2: Infer standalone switch from config items ALSA: scarlett2: Check for phantom persistence config item ALSA: scarlett2: Check presence of mixer using mux_assignment ALSA: scarlett2: Add config set struct ALSA: scarlett2: Remove scarlett2_config_sets array ALSA: scarlett2: Add check for config_item presence ALSA: scarlett2: Refactor scarlett2_usb_set_config() ALSA: scarlett2: Refactor scarlett2_config_save() ALSA: scarlett2: Formatting fixes ALSA: scarlett2: Parameterise notifications ALSA: scarlett2: Change num_mux_* from int to u8 ALSA: scarlett2: Refactor common port_count lookups ALSA: scarlett2: Remove struct scarlett2_usb_volume_status ALSA: scarlett2: Split dim_mute_update from vol_updated ALSA: scarlett2: Remove line_out_hw_vol device info entry ALSA: scarlett2: Allow for interfaces without per-channel volume ALSA: scarlett2: Add scarlett2_mixer_value_to_db() ALSA: scarlett2: Add #define for SCARLETT2_MIX_MAX ALSA: scarlett2: Rename db_scale_scarlett2_gain to volume ALSA: scarlett2: Split input_other into level/pad/air/phantom ALSA: scarlett2: Split direct_monitor out from monitor_other sound/usb/mixer_scarlett2.c | 1536 ++++++++++++++++++++--------------- 1 file changed, 879 insertions(+), 657 deletions(-) -- 2.43.0

2 24

[PATCH] ALSA: hda/tas2781: fix typos in comment
by Gergo Koteles 02 Jan '24

02 Jan '24

Correct typos. Signed-off-by: Gergo Koteles <soyer(a)irl.hu> --- sound/pci/hda/tas2781_hda_i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/tas2781_hda_i2c.c b/sound/pci/hda/tas2781_hda_i2c.c index fb802802939e..8f63e3099d3e 100644 --- a/sound/pci/hda/tas2781_hda_i2c.c +++ b/sound/pci/hda/tas2781_hda_i2c.c @@ -421,9 +421,9 @@ static void tas2781_apply_calib(struct tasdevice_priv *tas_priv) } } -/* Update the calibrate data, including speaker impedance, f0, etc, into algo. +/* 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 calucating the speaker temperature, speaker membrance excursion + * by Algo for calculating the speaker temperature, speaker membrane excursion * and f0 in real time during playback. */ static int tas2781_save_calibration(struct tasdevice_priv *tas_priv) base-commit: c7e37b07cc7564a07125ae48c11fd1ca2bcbeae2 -- 2.43.0

3 2

[PATCH 00/11] ALSA: scarlett2: Firmware Upgrade and Error Handling Improvements
by Geoffrey D. Bennett 02 Jan '24

02 Jan '24

Hi Takashi, 11 patches to improve error handling and add firmware upgrade support to the scarlett2 driver. The notes below incorporate your feedback & include answers to your questions in response to my previous RFC v2 email. Patch 1 adds GitHub links for the repo where I share this code before submission here, and for issue reporting. Patches 2-5 add missing error/bounds checks. Patch 6 adds a missing lock. Patches 7-11 add support for firmware upgrades. The usage of the hwdep interface is as per my previous proposal: - ioctl pversion to check the protocol version - ioctl select_flash_segment SCARLETT2_SEGMENT_ID_SETTINGS - ioctl erase_flash_segment - ioctl get_erase_progress (optional) - ioctl select_flash_segment SCARLETT2_SEGMENT_ID_FIRMWARE - ioctl erase_flash_segment - ioctl get_erase_progress (optional) - write() the firmware - ioctl reboot Notes on the hwdep interface: - Conflicting mixer operations are denied with EBUSY. - The hwdep interface is marked as exclusive so there can't be conflicting hwdep operations. - Invalid sequences of operations (e.g. erase before select, write before erase) return an error. - The erase operation is asynchronous, and the progress can optionally be monitored by calling get_erase_progress. - If the erase progress is not monitored then subsequent hwdep operations will wait until the erase is complete. - The write operation is synchronous, but <1KB can be written per call, and it returns very quickly. On the user-side it looks like this with error checking omitted: while (offset < len) offset += snd_hwdep_write(hwdep, buf + offset, len - offset); - By using a subset of the firmware-upgrade steps, other useful high-level operations can be performed: reset-to-factory-defaults, reset-to-factory-firmware, or just reboot. - I considered combining the select and erase operations, but that would prevent a future read-flash operation if that ever become possible. - I considered separate one-shot ioctls for reset-to-factory, etc., but that prevents providing progress feedback. - In case the purpose of the other firmware segments is discovered in the future, this implementation would be able to support erase/write/read of them with minimal changes. Here is a user-space implementation of all of the above: https://github.com/geoffreybennett/scarlett2 This has been tested by me on every supported Scarlett 2nd, 3rd, 4th Gen and Clarett+ device, and tested by a handful of others on their Scarlett 4th Gen devices. Thanks, Geoffrey. Geoffrey D. Bennett (11): ALSA: scarlett2: Update maintainer info ALSA: scarlett2: Add missing error check to scarlett2_config_save() ALSA: scarlett2: Add missing error check to scarlett2_usb_set_config() ALSA: scarlett2: Add missing error checks to *_ctl_get() ALSA: scarlett2: Add clamp() in scarlett2_mixer_ctl_put() ALSA: scarlett2: Add missing mutex lock around get meter levels ALSA: scarlett2: Add #defines for firmware upgrade ALSA: scarlett2: Retrieve useful flash segment numbers ALSA: scarlett2: Add skeleton hwdep/ioctl interface ALSA: scarlett2: Add ioctl commands to erase flash segments ALSA: scarlett2: Add support for uploading new firmware MAINTAINERS | 7 +- include/uapi/sound/scarlett2.h | 54 ++ sound/usb/mixer_scarlett2.c | 914 ++++++++++++++++++++++++++++++--- 3 files changed, 901 insertions(+), 74 deletions(-) create mode 100644 include/uapi/sound/scarlett2.h -- 2.43.0

2 13

[PATCH] ALSA: hda/tas2781: do not use regcache
by Gergo Koteles 02 Jan '24

02 Jan '24

There are two problems with using regcache in this module. The amplifier has 3 addressing levels (BOOK, PAGE, REG). The firmware contains blocks that must be written to BOOK 0x8C. The regcache doesn't know anything about BOOK, so regcache_sync writes invalid values to the actual BOOK. The module handles 2 or more separate amplifiers. The amplifiers have different register values, and the module uses only one regmap/regcache for all the amplifiers. The regcache_sync only writes the last amplifier used. The module successfully restores all the written register values (RC profile, program, configuration, calibration) without regcache. Remove regcache functions and set regmap cache_type to REGCACHE_NONE. Link: https://lore.kernel.org/r/21a183b5a08cb23b193af78d4b1114cc59419272.17019064… Fixes: 5be27f1e3ec9 ("ALSA: hda/tas2781: Add tas2781 HDA driver") CC: stable(a)vger.kernel.org Signed-off-by: Gergo Koteles <soyer(a)irl.hu> --- sound/pci/hda/tas2781_hda_i2c.c | 17 +---------------- sound/soc/codecs/tas2781-comlib.c | 2 +- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/sound/pci/hda/tas2781_hda_i2c.c b/sound/pci/hda/tas2781_hda_i2c.c index 2fb1a7037c82..e4c54b2a012c 100644 --- a/sound/pci/hda/tas2781_hda_i2c.c +++ b/sound/pci/hda/tas2781_hda_i2c.c @@ -717,8 +717,6 @@ static int tas2781_runtime_suspend(struct device *dev) tas_priv->tasdevice[i].cur_conf = -1; } - regcache_cache_only(tas_priv->regmap, true); - regcache_mark_dirty(tas_priv->regmap); mutex_unlock(&tas_priv->codec_lock); @@ -730,20 +728,11 @@ static int tas2781_runtime_resume(struct device *dev) struct tasdevice_priv *tas_priv = dev_get_drvdata(dev); unsigned long calib_data_sz = tas_priv->ndev * TASDEVICE_SPEAKER_CALIBRATION_SIZE; - int ret; dev_dbg(tas_priv->dev, "Runtime Resume\n"); mutex_lock(&tas_priv->codec_lock); - regcache_cache_only(tas_priv->regmap, false); - ret = regcache_sync(tas_priv->regmap); - if (ret) { - dev_err(tas_priv->dev, - "Failed to restore register cache: %d\n", ret); - goto out; - } - tasdevice_prmg_load(tas_priv, tas_priv->cur_prog); /* If calibrated data occurs error, dsp will still works with default @@ -752,10 +741,9 @@ static int tas2781_runtime_resume(struct device *dev) if (tas_priv->cali_data.total_sz > calib_data_sz) tas2781_apply_calib(tas_priv); -out: mutex_unlock(&tas_priv->codec_lock); - return ret; + return 0; } static int tas2781_system_suspend(struct device *dev) @@ -770,10 +758,7 @@ static int tas2781_system_suspend(struct device *dev) return ret; /* Shutdown chip before system suspend */ - regcache_cache_only(tas_priv->regmap, false); tasdevice_tuning_switch(tas_priv, 1); - regcache_cache_only(tas_priv->regmap, true); - regcache_mark_dirty(tas_priv->regmap); /* * Reset GPIO may be shared, so cannot reset here. diff --git a/sound/soc/codecs/tas2781-comlib.c b/sound/soc/codecs/tas2781-comlib.c index ffb26e4a7e2f..933cd008e9f5 100644 --- a/sound/soc/codecs/tas2781-comlib.c +++ b/sound/soc/codecs/tas2781-comlib.c @@ -39,7 +39,7 @@ static const struct regmap_range_cfg tasdevice_ranges[] = { static const struct regmap_config tasdevice_regmap = { .reg_bits = 8, .val_bits = 8, - .cache_type = REGCACHE_RBTREE, + .cache_type = REGCACHE_NONE, .ranges = tasdevice_ranges, .num_ranges = ARRAY_SIZE(tasdevice_ranges), .max_register = 256 * 128, base-commit: 916d051730ae48aef8b588fd096fefca4bc0590a -- 2.43.0

3 2

Re: [PATCH 00/20] ALSA: scarlett2: Add support for Scarlett 4th Gen
by Takashi Iwai 02 Jan '24

02 Jan '24

On Tue, 26 Dec 2023 19:05:43 +0100, Geoffrey D. Bennett wrote: > > Hi Takashi, > > This patch series adds support for the Focusrite Scarlett 4th Gen > interfaces. It builds on top of the two previous patch series I sent: > > - https://lore.kernel.org/linux-sound/cover.1703001053.git.g@b4.vu/ > ("ALSA: scarlett2: Firmware Upgrade and Error Handling Improvements") > > - https://lore.kernel.org/linux-sound/cover.1703444932.git.g@b4.vu/ > ("ALSA: scarlett2: Refactor in preparation for gen4") > > I already sent patch #1 in this series below separately: > https://lore.kernel.org/linux-sound/ZYsBIE3DSKdi4YC%2F@m.b4.vu/ > as it should go in to 6.7. I wasn't sure if I should include it again > here or not; sorry if I guessed wrong. > > Patch #2 is a little cleanup I missed before sending the previous > series and would have gone there had I noticed. > > Patches #3-18 add the new controls, etc. needed for the Gen 4 support. > > Patch #19 adds the USB IDs and configuration data to enable support > for the new interfaces. > > Patch #20 adds a last-minute new control that is only present on the > Solo Gen 4. > > Regards, > Geoffrey. > > Geoffrey D. Bennett (20): > ALSA: scarlett2: Convert meter levels from little-endian > ALSA: scarlett2: Remove repeated elem->head.mixer references > ALSA: scarlett2: Add support for air/phantom control on input 2 > ALSA: scarlett2: Add support for Gen 4 style parameters > ALSA: scarlett2: Allow for controls with a "mute mode" > ALSA: scarlett2: Add support for Air Presence + Drive option > ALSA: scarlett2: Add support for software-controllable input gain > ALSA: scarlett2: Minor refactor MSD mode check > ALSA: scarlett2: Disable input controls while autogain is running > ALSA: scarlett2: Disable autogain during phantom power state change > ALSA: scarlett2: Add power status control > ALSA: scarlett2: Store mix_ctls for Gen 4 Direct Monitor > ALSA: scarlett2: Handle Gen 4 Direct Monitor mix updates > ALSA: scarlett2: Add support for custom Gen 4 Direct Monitor mixes > ALSA: scarlett2: Add support for DSP mux channels > ALSA: scarlett2: Rename DSP mux channels > ALSA: scarlett2: Add minimum firmware version check > ALSA: scarlett2: Add R/O headphone volume control > ALSA: scarlett2: Add support for Solo, 2i2, and 4i4 Gen 4 > ALSA: scarlett2: Add PCM Input Switch for Solo Gen 4 Now applied to topic/scarlett2 branch (merged to for-next). The first patch was already taken in for-linus branch for 6.7. thanks, Takashi

1 0

[PATCH 1/2] ALSA: hda/tas2781: move set_drv_data outside tasdevice_init
by Gergo Koteles 02 Jan '24

02 Jan '24

allow driver specific driver data in tas2781-hda-i2c and tas2781-i2c Fixes: ef3bcde75d06 ("ASoC: tas2781: Add tas2781 driver") CC: stable(a)vger.kernel.org Signed-off-by: Gergo Koteles <soyer(a)irl.hu> --- sound/pci/hda/tas2781_hda_i2c.c | 2 ++ sound/soc/codecs/tas2781-comlib.c | 2 -- sound/soc/codecs/tas2781-i2c.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/pci/hda/tas2781_hda_i2c.c b/sound/pci/hda/tas2781_hda_i2c.c index e4c54b2a012c..769604375745 100644 --- a/sound/pci/hda/tas2781_hda_i2c.c +++ b/sound/pci/hda/tas2781_hda_i2c.c @@ -659,6 +659,8 @@ static int tas2781_hda_i2c_probe(struct i2c_client *clt) if (!tas_priv) return -ENOMEM; + dev_set_drvdata(&clt->dev, tas_priv); + tas_priv->irq_info.irq = clt->irq; ret = tas2781_read_acpi(tas_priv, device_name); if (ret) diff --git a/sound/soc/codecs/tas2781-comlib.c b/sound/soc/codecs/tas2781-comlib.c index 933cd008e9f5..00e35169ae49 100644 --- a/sound/soc/codecs/tas2781-comlib.c +++ b/sound/soc/codecs/tas2781-comlib.c @@ -316,8 +316,6 @@ int tasdevice_init(struct tasdevice_priv *tas_priv) tas_priv->tasdevice[i].cur_conf = -1; } - dev_set_drvdata(tas_priv->dev, tas_priv); - mutex_init(&tas_priv->codec_lock); out: diff --git a/sound/soc/codecs/tas2781-i2c.c b/sound/soc/codecs/tas2781-i2c.c index 55cd5e3c23a5..917b1c15f71d 100644 --- a/sound/soc/codecs/tas2781-i2c.c +++ b/sound/soc/codecs/tas2781-i2c.c @@ -689,6 +689,8 @@ static int tasdevice_i2c_probe(struct i2c_client *i2c) if (!tas_priv) return -ENOMEM; + dev_set_drvdata(&i2c->dev, tas_priv); + if (ACPI_HANDLE(&i2c->dev)) { acpi_id = acpi_match_device(i2c->dev.driver->acpi_match_table, &i2c->dev); base-commit: 916d051730ae48aef8b588fd096fefca4bc0590a prerequisite-patch-id: da39452ca686d78e5accad1c2c4aa22a5f5a6a65 -- 2.43.0

2 2

Re: [PATCH] ASoC: rt5663: add cancel_delayed_work_sync when system suspends
by Mark Brown 02 Jan '24

02 Jan '24

On Fri, Dec 29, 2023 at 01:47:35AM +0000, Shuming [范書銘] wrote: > > > This patch makes sure that the workqueue is completed before the system > > > + cancel_delayed_work_sync(&rt5663->jack_detect_work); > > > + cancel_delayed_work_sync(&rt5663->jd_unplug_work); > > Does something ensure that no more interrupts can fire after the work is > > cancelled? > As I knew, the JD source is not the wake-up source when the system suspends. > This patch just makes sure the work is done to avoid the unexpected problem. The issue isn't unexpected wakes - it's if the work manages to start running again before the system suspends. For example if a jack detect interrupt is triggered while processing the second cancel there then the jack_detect_work will be rescheduled during suspend. Interrupts will still be active until a reasonable time later in the suspend process.

1 0

Re: [PATCH] ALSA: scarlett2: Convert meter levels from little-endian
by Takashi Iwai 02 Jan '24

02 Jan '24

On Tue, 26 Dec 2023 17:36:48 +0100, Geoffrey D. Bennett wrote: > > Add missing conversion from little-endian data to CPU-endian in > scarlett2_usb_get_meter_levels(). > > Fixes: 3473185f31df ("ALSA: scarlett2: Remap Level Meter values") > Signed-off-by: Geoffrey D. Bennett <g(a)b4.vu> > --- > > Hi Takashi, > > Can you add this to 6.7-rc8 please. Applied to for-linus branch. I'm going to send a PR for 6.7 final in the next week. thanks, Takashi

1 0