Commit 1fe93b2a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-fix-7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "Here are the rest of small updates for 7.1-rc1. All small fixes mostly
  for device-specific issues or regressions.

  Core:
   - Fix a potential data race in fasync handling

  USB-audio:
   - New device support: Line6 POD HD PRO, NexiGo N930W webcam
   - Fixes for Audio Advantage Micro II SPDIF switch and E-MU sample
     rates
   - Limit UAC2 rate parsing to prevent potential overflows

  HD-Audio:
   - Device-specific quirks for HP, Acer, and Honor laptops
   - Fix for TAS2781 SPI device abnormal sound
   - Move Intel firmware loading into probe work to avoid stalling

  ASoC:
   - New support for TI TAS5832
   - Fixes for SoundWire SDCA/DisCo boolean parsing
   - Driver-specific fixes for Intel SOF, ES8311, RT1320, and PXA2xx

  Misc:
   - Fixes for resource leaks and data races in 6fire, caiaq, als4000,
     and pcmtest drivers"

* tag 'sound-fix-7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (41 commits)
  Revert "ALSA: pcmtest: fix reference leak on failed device registration"
  ASoC: tas2781: Add tas5832 support
  ASoC: dt-bindings: ti,tas2781: Add TAS5832 support
  ALSA: usb-audio: Fix Audio Advantage Micro II SPDIF switch
  ALSA: usb-audio: Avoid false E-MU sample-rate notifications
  ASoC: sdw_utils: cs42l43: allow spk component names to be combined
  ASoC: qcom: x1e80100: limit speaker volumes
  ALSA: hda/realtek - Add mute LED support for HP Victus 15-fa2xxx
  ALSA: pcmtest: Fix resource leaks in module init error paths
  ALSA: usb-audio/line6: Add support for POD HD PRO
  ALSA: hda/realtek: Add LED fixup for HP EliteBook 6 G2a Laptops
  ASoC: SDCA: Fix reading of mipi-sdca-control-deferrable
  regmap: sdw-mbq: Allow defers on undeferrable controls
  Revert "ALSA: usb-audio: Add quirk for SmartlinkTechnology M01"
  ALSA: als4000: Fix capture trigger chip->mode race
  ALSA: core: Fix potential data race at fasync handling
  ALSA: hda/tas2781: Fix sound abnormal issue on some SPI device
  ALSA: hda/realtek: add quirk for Acer Nitro 16 AN16-41
  ALSA: caiaq: Fix control_put() result and cache rollback
  ALSA: pcmtest: fix reference leak on failed device registration
  ...
parents cf950766 2724fbc9

Documentation/devicetree/bindings/sound/ti,tas2781.yaml

+6 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

# Copyright (C) 2022 - 2025 Texas Instruments Incorporated

# Copyright (C) 2022 - 2026 Texas Instruments Incorporated

%YAML 1.2

---

$id: http://devicetree.org/schemas/sound/ti,tas2781.yaml#
@@ -107,6 +107,9 @@ properties: 


      ti,tas5830: 65-W Stereo, Digital Input, High Efficiency Closed-Loop

      Class-D Amplifier with Class-H Algorithm



      ti,tas5832: 81-W Stereo, Digital Input, High Efficiency Closed-Loop

      Class-D Amplifier with Class-H Algorithm

    oneOf:

      - items:

          - enum:
@@ -128,6 +131,7 @@ properties: 
              - ti,tas5827

              - ti,tas5828

              - ti,tas5830

              - ti,tas5832

          - const: ti,tas2781

      - enum:

          - ti,tas2781
@@ -264,6 +268,7 @@ allOf: 
              - ti,tas5827

              - ti,tas5828

              - ti,tas5830

              - ti,tas5832

    then:

      properties:

        reg:

drivers/base/regmap/regmap-sdw-mbq.c

+18 −18
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static int regmap_sdw_mbq_poll_busy(struct sdw_slave *slave, unsigned int reg, 


static int regmap_sdw_mbq_write_impl(struct sdw_slave *slave,

				     unsigned int reg, unsigned int val,

				     int mbq_size, bool deferrable)

				     int mbq_size)

{

	int shift = mbq_size * BITS_PER_BYTE;

	int ret;
@@ -88,17 +88,14 @@ static int regmap_sdw_mbq_write_impl(struct sdw_slave *slave, 
			return ret;

	}



	ret = sdw_write_no_pm(slave, reg, val & 0xff);

	if (deferrable && ret == -ENODATA)

		return -EAGAIN;



	return ret;

	return sdw_write_no_pm(slave, reg, val & 0xff);

}



static int regmap_sdw_mbq_write(void *context, unsigned int reg, unsigned int val)

{

	struct regmap_mbq_context *ctx = context;

	struct sdw_slave *slave = ctx->sdw;

	struct device *dev = ctx->dev;

	bool deferrable = regmap_sdw_mbq_deferrable(ctx, reg);

	int mbq_size = regmap_sdw_mbq_size(ctx, reg);

	int ret;
@@ -113,13 +110,16 @@ static int regmap_sdw_mbq_write(void *context, unsigned int reg, unsigned int va 
	 * process a single wait/timeout on function busy and a single retry

	 * of the transaction.

	 */

	ret = regmap_sdw_mbq_write_impl(slave, reg, val, mbq_size, deferrable);

	if (ret == -EAGAIN) {

	ret = regmap_sdw_mbq_write_impl(slave, reg, val, mbq_size);

	if (ret == -ENODATA) {

		if (!deferrable)

			dev_warn(dev, "Defer on undeferrable control: %x\n", reg);



		ret = regmap_sdw_mbq_poll_busy(slave, reg, ctx);

		if (ret)

			return ret;



		ret = regmap_sdw_mbq_write_impl(slave, reg, val, mbq_size, false);

		ret = regmap_sdw_mbq_write_impl(slave, reg, val, mbq_size);

	}



	return ret;
@@ -127,18 +127,14 @@ static int regmap_sdw_mbq_write(void *context, unsigned int reg, unsigned int va 


static int regmap_sdw_mbq_read_impl(struct sdw_slave *slave,

				    unsigned int reg, unsigned int *val,

				    int mbq_size, bool deferrable)

				    int mbq_size)

{

	int shift = BITS_PER_BYTE;

	int read;



	read = sdw_read_no_pm(slave, reg);

	if (read < 0) {

		if (deferrable && read == -ENODATA)

			return -EAGAIN;



	if (read < 0)

		return read;

	}



	*val = read;
@@ -158,6 +154,7 @@ static int regmap_sdw_mbq_read(void *context, unsigned int reg, unsigned int *va 
{

	struct regmap_mbq_context *ctx = context;

	struct sdw_slave *slave = ctx->sdw;

	struct device *dev = ctx->dev;

	bool deferrable = regmap_sdw_mbq_deferrable(ctx, reg);

	int mbq_size = regmap_sdw_mbq_size(ctx, reg);

	int ret;
@@ -172,13 +169,16 @@ static int regmap_sdw_mbq_read(void *context, unsigned int reg, unsigned int *va 
	 * process a single wait/timeout on function busy and a single retry

	 * of the transaction.

	 */

	ret = regmap_sdw_mbq_read_impl(slave, reg, val, mbq_size, deferrable);

	if (ret == -EAGAIN) {

	ret = regmap_sdw_mbq_read_impl(slave, reg, val, mbq_size);

	if (ret == -ENODATA) {

		if (!deferrable)

			dev_warn(dev, "Defer on undeferable control: %x\n", reg);



		ret = regmap_sdw_mbq_poll_busy(slave, reg, ctx);

		if (ret)

			return ret;



		ret = regmap_sdw_mbq_read_impl(slave, reg, val, mbq_size, false);

		ret = regmap_sdw_mbq_read_impl(slave, reg, val, mbq_size);

	}



	return ret;

include/sound/tas2781.h

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ enum audio_device { 
	TAS5827,

	TAS5828,

	TAS5830,

	TAS5832,

	TAS_OTHERS,

};

sound/arm/pxa2xx-ac97-lib.c

+9 −6
Original line number Diff line number Diff line
@@ -331,12 +331,15 @@ int pxa2xx_ac97_hw_probe(struct platform_device *dev) 
	if (dev->dev.of_node) {

		/* Assert reset using GPIOD_OUT_HIGH, because reset is GPIO_ACTIVE_LOW */

		rst_gpio = devm_gpiod_get(&dev->dev, "reset", GPIOD_OUT_HIGH);

		if (IS_ERR(rst_gpio)) {

			ret = PTR_ERR(rst_gpio);

			if (ret == -ENOENT)

				reset_gpio = -1;

			else if (ret)

				return ret;

		} else {

			reset_gpio = desc_to_gpio(rst_gpio);

		}

	} else {

		if (cpu_is_pxa27x())

			reset_gpio = 113;

sound/core/misc.c

+10 −3
Original line number Diff line number Diff line
@@ -100,14 +100,18 @@ static LIST_HEAD(snd_fasync_list); 
static void snd_fasync_work_fn(struct work_struct *work)

{

	struct snd_fasync *fasync;

	int signal, poll;



	spin_lock_irq(&snd_fasync_lock);

	while (!list_empty(&snd_fasync_list)) {

		fasync = list_first_entry(&snd_fasync_list, struct snd_fasync, list);

		list_del_init(&fasync->list);

		if (!fasync->on)

			continue;

		signal = fasync->signal;

		poll = fasync->poll;

		spin_unlock_irq(&snd_fasync_lock);

		if (fasync->on)

			kill_fasync(&fasync->fasync, fasync->signal, fasync->poll);

		kill_fasync(&fasync->fasync, signal, poll);

		spin_lock_irq(&snd_fasync_lock);

	}

	spin_unlock_irq(&snd_fasync_lock);
@@ -158,7 +162,10 @@ void snd_fasync_free(struct snd_fasync *fasync) 
{

	if (!fasync)

		return;

	fasync->on = 0;



	scoped_guard(spinlock_irq, &snd_fasync_lock)

		list_del_init(&fasync->list);



	flush_work(&snd_fasync_work);

	kfree(fasync);

}