Commit f0afb7bd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-6.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound fixes from Takashi Iwai:
 "A collection of small fixes again. The only change in the core is
  about the handling of ALSA compress-offload ioctl numbers for avoiding
  potential abusing the API (if any).

  Other than that, all changes are device-specific small fixes and
  quirks, which should be safe to apply"

* tag 'sound-6.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ASoC: amd: yc: Add DMI quirk for HP Laptop 17 cp-2033dx
  ASoC: Intel: soc-acpi: add support for HP Omen14 ARL
  ASoC: amd: yc: Add DMI entries to support HP 15-fb1xxx
  ALSA: hda/realtek: Add quirk for ASUS ROG Strix G712LWS
  ALSA: hda/cs35l56: Workaround bad dev-index on Lenovo Yoga Book 9i GenX
  ALSA: hda/realtek: Support mute LED for Yoga with ALC287
  ASoC: Intel: fix SND_SOC_SOF dependencies
  ASoC: rt5660: Fix the dmic data source from GPIO2
  ALSA: hda/realtek - Fix mute LED for HP Victus 16-r0xxx
  ALSA: compress_offload: tighten ioctl command number checks
  ASoC: Intel: avs: Fix NULL ptr deref on rmmod
  ASoC: amd: yc: add DMI quirk for ASUS M6501RM
parents e1da8eb2 348954f9

sound/core/compress_offload.c

+24 −24
Original line number Diff line number Diff line
@@ -1269,62 +1269,62 @@ static long snd_compr_ioctl(struct file *f, unsigned int cmd, unsigned long arg) 
	stream = &data->stream;



	guard(mutex)(&stream->device->lock);

	switch (_IOC_NR(cmd)) {

	case _IOC_NR(SNDRV_COMPRESS_IOCTL_VERSION):

	switch (cmd) {

	case SNDRV_COMPRESS_IOCTL_VERSION:

		return put_user(SNDRV_COMPRESS_VERSION,

				(int __user *)arg) ? -EFAULT : 0;

	case _IOC_NR(SNDRV_COMPRESS_GET_CAPS):

	case SNDRV_COMPRESS_GET_CAPS:

		return snd_compr_get_caps(stream, arg);

#ifndef COMPR_CODEC_CAPS_OVERFLOW

	case _IOC_NR(SNDRV_COMPRESS_GET_CODEC_CAPS):

	case SNDRV_COMPRESS_GET_CODEC_CAPS:

		return snd_compr_get_codec_caps(stream, arg);

#endif

	case _IOC_NR(SNDRV_COMPRESS_SET_PARAMS):

	case SNDRV_COMPRESS_SET_PARAMS:

		return snd_compr_set_params(stream, arg);

	case _IOC_NR(SNDRV_COMPRESS_GET_PARAMS):

	case SNDRV_COMPRESS_GET_PARAMS:

		return snd_compr_get_params(stream, arg);

	case _IOC_NR(SNDRV_COMPRESS_SET_METADATA):

	case SNDRV_COMPRESS_SET_METADATA:

		return snd_compr_set_metadata(stream, arg);

	case _IOC_NR(SNDRV_COMPRESS_GET_METADATA):

	case SNDRV_COMPRESS_GET_METADATA:

		return snd_compr_get_metadata(stream, arg);

	}



	if (stream->direction == SND_COMPRESS_ACCEL) {

#if IS_ENABLED(CONFIG_SND_COMPRESS_ACCEL)

		switch (_IOC_NR(cmd)) {

		case _IOC_NR(SNDRV_COMPRESS_TASK_CREATE):

		switch (cmd) {

		case SNDRV_COMPRESS_TASK_CREATE:

			return snd_compr_task_create(stream, arg);

		case _IOC_NR(SNDRV_COMPRESS_TASK_FREE):

		case SNDRV_COMPRESS_TASK_FREE:

			return snd_compr_task_seq(stream, arg, snd_compr_task_free_one);

		case _IOC_NR(SNDRV_COMPRESS_TASK_START):

		case SNDRV_COMPRESS_TASK_START:

			return snd_compr_task_start_ioctl(stream, arg);

		case _IOC_NR(SNDRV_COMPRESS_TASK_STOP):

		case SNDRV_COMPRESS_TASK_STOP:

			return snd_compr_task_seq(stream, arg, snd_compr_task_stop_one);

		case _IOC_NR(SNDRV_COMPRESS_TASK_STATUS):

		case SNDRV_COMPRESS_TASK_STATUS:

			return snd_compr_task_status_ioctl(stream, arg);

		}

#endif

		return -ENOTTY;

	}



	switch (_IOC_NR(cmd)) {

	case _IOC_NR(SNDRV_COMPRESS_TSTAMP):

	switch (cmd) {

	case SNDRV_COMPRESS_TSTAMP:

		return snd_compr_tstamp(stream, arg);

	case _IOC_NR(SNDRV_COMPRESS_AVAIL):

	case SNDRV_COMPRESS_AVAIL:

		return snd_compr_ioctl_avail(stream, arg);

	case _IOC_NR(SNDRV_COMPRESS_PAUSE):

	case SNDRV_COMPRESS_PAUSE:

		return snd_compr_pause(stream);

	case _IOC_NR(SNDRV_COMPRESS_RESUME):

	case SNDRV_COMPRESS_RESUME:

		return snd_compr_resume(stream);

	case _IOC_NR(SNDRV_COMPRESS_START):

	case SNDRV_COMPRESS_START:

		return snd_compr_start(stream);

	case _IOC_NR(SNDRV_COMPRESS_STOP):

	case SNDRV_COMPRESS_STOP:

		return snd_compr_stop(stream);

	case _IOC_NR(SNDRV_COMPRESS_DRAIN):

	case SNDRV_COMPRESS_DRAIN:

		return snd_compr_drain(stream);

	case _IOC_NR(SNDRV_COMPRESS_PARTIAL_DRAIN):

	case SNDRV_COMPRESS_PARTIAL_DRAIN:

		return snd_compr_partial_drain(stream);

	case _IOC_NR(SNDRV_COMPRESS_NEXT_TRACK):

	case SNDRV_COMPRESS_NEXT_TRACK:

		return snd_compr_next_track(stream);

	}

sound/pci/hda/cs35l56_hda.c

+82 −28
Original line number Diff line number Diff line
@@ -873,6 +873,52 @@ static int cs35l56_hda_system_resume(struct device *dev) 
	return 0;

}



static int cs35l56_hda_fixup_yoga9(struct cs35l56_hda *cs35l56, int *bus_addr)

{

	/* The cirrus,dev-index property has the wrong values */

	switch (*bus_addr) {

	case 0x30:

		cs35l56->index = 1;

		return 0;

	case 0x31:

		cs35l56->index = 0;

		return 0;

	default:

		/* There is a pseudo-address for broadcast to both amps - ignore it */

		dev_dbg(cs35l56->base.dev, "Ignoring I2C address %#x\n", *bus_addr);

		return 0;

	}

}



static const struct {

	const char *sub;

	int (*fixup_fn)(struct cs35l56_hda *cs35l56, int *bus_addr);

} cs35l56_hda_fixups[] = {

	{

		.sub = "17AA390B", /* Lenovo Yoga Book 9i GenX */

		.fixup_fn = cs35l56_hda_fixup_yoga9,

	},

};



static int cs35l56_hda_apply_platform_fixups(struct cs35l56_hda *cs35l56, const char *sub,

					     int *bus_addr)

{

	int i;



	if (IS_ERR(sub))

		return 0;



	for (i = 0; i < ARRAY_SIZE(cs35l56_hda_fixups); i++) {

		if (strcasecmp(cs35l56_hda_fixups[i].sub, sub) == 0) {

			dev_dbg(cs35l56->base.dev, "Applying fixup for %s\n",

				cs35l56_hda_fixups[i].sub);

			return (cs35l56_hda_fixups[i].fixup_fn)(cs35l56, bus_addr);

		}

	}



	return 0;

}



static int cs35l56_hda_read_acpi(struct cs35l56_hda *cs35l56, int hid, int id)

{

	u32 values[HDA_MAX_COMPONENTS];
@@ -897,6 +943,15 @@ static int cs35l56_hda_read_acpi(struct cs35l56_hda *cs35l56, int hid, int id) 
		ACPI_COMPANION_SET(cs35l56->base.dev, adev);

	}



	/* Initialize things that could be overwritten by a fixup */

	cs35l56->index = -1;



	sub = acpi_get_subsystem_id(ACPI_HANDLE(cs35l56->base.dev));

	ret = cs35l56_hda_apply_platform_fixups(cs35l56, sub, &id);

	if (ret)

		return ret;



	if (cs35l56->index == -1) {

		property = "cirrus,dev-index";

		ret = device_property_count_u32(cs35l56->base.dev, property);

		if (ret <= 0)
@@ -912,13 +967,13 @@ static int cs35l56_hda_read_acpi(struct cs35l56_hda *cs35l56, int hid, int id) 
		if (ret)

			goto err;



	cs35l56->index = -1;

		for (i = 0; i < nval; i++) {

			if (values[i] == id) {

				cs35l56->index = i;

				break;

			}

		}



		/*

		 * It's not an error for the ID to be missing: for I2C there can be

		 * an alias address that is not a real device. So reject silently.
@@ -928,8 +983,7 @@ static int cs35l56_hda_read_acpi(struct cs35l56_hda *cs35l56, int hid, int id) 
			ret = -ENODEV;

			goto err;

		}



	sub = acpi_get_subsystem_id(ACPI_HANDLE(cs35l56->base.dev));

	}



	if (IS_ERR(sub)) {

		dev_info(cs35l56->base.dev,

sound/pci/hda/patch_realtek.c

+5 −0
Original line number Diff line number Diff line
@@ -7497,6 +7497,9 @@ static void alc287_fixup_yoga9_14iap7_bass_spk_pin(struct hda_codec *codec, 
	};

	struct alc_spec *spec = codec->spec;



	/* Support Audio mute LED and Mic mute LED on keyboard */

	hda_fixup_ideapad_acpi(codec, fix, action);



	switch (action) {

	case HDA_FIXUP_ACT_PRE_PROBE:

		snd_hda_apply_pincfgs(codec, pincfgs);
@@ -10814,6 +10817,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8b97, "HP", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),

	SND_PCI_QUIRK(0x103c, 0x8bb3, "HP Slim OMEN", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8bb4, "HP Slim OMEN", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8bbe, "HP Victus 16-r0xxx (MB 8BBE)", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),

	SND_PCI_QUIRK(0x103c, 0x8bc8, "HP Victus 15-fa1xxx", ALC245_FIXUP_HP_MUTE_LED_COEFBIT),

	SND_PCI_QUIRK(0x103c, 0x8bcd, "HP Omen 16-xd0xxx", ALC245_FIXUP_HP_MUTE_LED_V1_COEFBIT),

	SND_PCI_QUIRK(0x103c, 0x8bdd, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),
@@ -11006,6 +11010,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW),

	SND_PCI_QUIRK(0x1043, 0x1a63, "ASUS UX3405MA", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x1a83, "ASUS UM5302LA", ALC294_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x1043, 0x1a8e, "ASUS G712LWS", ALC294_FIXUP_LENOVO_MIC_LOCATION),

	SND_PCI_QUIRK(0x1043, 0x1a8f, "ASUS UX582ZS", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x1b11, "ASUS UX431DA", ALC294_FIXUP_ASUS_COEF_1B),

	SND_PCI_QUIRK(0x1043, 0x1b13, "ASUS U41SV/GA403U", ALC285_FIXUP_ASUS_GA403U_HEADSET_MIC),

sound/soc/amd/yc/acp6x-mach.c

+21 −0
Original line number Diff line number Diff line
@@ -416,6 +416,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "M6500RC"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "M6501RM"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {
@@ -535,6 +542,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "OMEN by HP Gaming Laptop 16z-n000"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "HP"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Victus by HP Gaming Laptop 15-fb1xxx"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {
@@ -584,6 +598,13 @@ static const struct dmi_system_id yc_acp_quirk_table[] = { 
			DMI_MATCH(DMI_BOARD_NAME, "8A7F"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "HP"),

			DMI_MATCH(DMI_BOARD_NAME, "8A81"),

		}

	},

	{

		.driver_data = &acp6x_card,

		.matches = {

sound/soc/codecs/rt5660.c

+5 −2
Original line number Diff line number Diff line
@@ -1315,15 +1315,18 @@ static int rt5660_i2c_probe(struct i2c_client *i2c) 
		regmap_update_bits(rt5660->regmap, RT5660_GPIO_CTRL1,

			RT5660_GP1_PIN_MASK, RT5660_GP1_PIN_DMIC1_SCL);



		if (rt5660->pdata.dmic1_data_pin == RT5660_DMIC1_DATA_GPIO2)

		if (rt5660->pdata.dmic1_data_pin == RT5660_DMIC1_DATA_GPIO2) {

			regmap_update_bits(rt5660->regmap, RT5660_DMIC_CTRL1,

				RT5660_SEL_DMIC_DATA_MASK,

				RT5660_SEL_DMIC_DATA_GPIO2);

		else if (rt5660->pdata.dmic1_data_pin == RT5660_DMIC1_DATA_IN1P)

			regmap_update_bits(rt5660->regmap, RT5660_GPIO_CTRL1,

				RT5660_GP2_PIN_MASK, RT5660_GP2_PIN_DMIC1_SDA);

		} else if (rt5660->pdata.dmic1_data_pin == RT5660_DMIC1_DATA_IN1P) {

			regmap_update_bits(rt5660->regmap, RT5660_DMIC_CTRL1,

				RT5660_SEL_DMIC_DATA_MASK,

				RT5660_SEL_DMIC_DATA_IN1P);

		}

	}



	return devm_snd_soc_register_component(&i2c->dev,

				      &soc_component_dev_rt5660,