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

[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

[PATCH] ASoC: fsl_rpmsg: Fix error handler with pm_runtime_enable
by Chancel Liu 02 Jan '24

02 Jan '24

There is error message when defer probe happens: fsl_rpmsg rpmsg_audio: Unbalanced pm_runtime_enable! Fix the error handler with pm_runtime_enable. Fixes: b73d9e6225e8 ("ASoC: fsl_rpmsg: Add CPU DAI driver for audio base on rpmsg") Signed-off-by: Chancel Liu <chancel.liu(a)nxp.com> --- sound/soc/fsl/fsl_rpmsg.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sound/soc/fsl/fsl_rpmsg.c b/sound/soc/fsl/fsl_rpmsg.c index 5c5c04ce9db7..00852f174a69 100644 --- a/sound/soc/fsl/fsl_rpmsg.c +++ b/sound/soc/fsl/fsl_rpmsg.c @@ -238,7 +238,7 @@ static int fsl_rpmsg_probe(struct platform_device *pdev) ret = devm_snd_soc_register_component(&pdev->dev, &fsl_component, &fsl_rpmsg_dai, 1); if (ret) - return ret; + goto err_pm_disable; rpmsg->card_pdev = platform_device_register_data(&pdev->dev, "imx-audio-rpmsg", @@ -248,16 +248,22 @@ static int fsl_rpmsg_probe(struct platform_device *pdev) if (IS_ERR(rpmsg->card_pdev)) { dev_err(&pdev->dev, "failed to register rpmsg card\n"); ret = PTR_ERR(rpmsg->card_pdev); - return ret; + goto err_pm_disable; } return 0; + +err_pm_disable: + pm_runtime_disable(&pdev->dev); + return ret; } static void fsl_rpmsg_remove(struct platform_device *pdev) { struct fsl_rpmsg *rpmsg = platform_get_drvdata(pdev); + pm_runtime_disable(&pdev->dev); + if (rpmsg->card_pdev) platform_device_unregister(rpmsg->card_pdev); } -- 2.42.0

2 1

Re: [PATCH 2/2] Add driver properties for cs35l41 for Lenovo Legion Slim 7 Gen 8 serie
by Takashi Iwai 02 Jan '24

02 Jan '24

On Sat, 30 Dec 2023 00:07:03 +0100, Dorian Cruveiller wrote: > > Add driver properties on 4 models of this laptop serie since they don't > have _DSD in the ACPI table > > Signed-off-by: Dorian Cruveiller <doriancruveiller(a)gmail.com> This doesn't seem applicable any longer, as the cs35l41_hda_property.c had some reworks. Could you rebase on top of topic/cs35l41 (or for-next) branch of sound.git tree and resubmit both patches? thanks, Takashi

1 0