Commit 2a239ffb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound fixes from Takashi Iwai:
 "A bunch of small fixes.  Mostly driver specific.

   - An OOB access fix in core UMP rawmidi conversion code

   - Fix for ASoC DAPM hw_params widget sequence

   - Make retry of usb_set_interface() errors for flaky devices

   - Fix redundant USB MIDI name strings

   - Quirks for various HP and ASUS models with HD-audio, and
     Jabra Evolve 65 USB-audio

   - Cirrus Kunit test fixes

   - Various fixes for ASoC Intel, stm32, renesas, imx-card, and
     simple-card"

* tag 'sound-6.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (30 commits)
  ASoC: amd: ps: fix for irq handler return status
  ASoC: simple-card-utils: Fix pointer check in graph_util_parse_link_direction
  ASoC: intel/sdw_utils: Add volume limit to cs35l56 speakers
  ASoC: intel/sdw_utils: Add volume limit to cs42l43 speakers
  ASoC: stm32: sai: add a check on minimal kernel frequency
  ASoC: stm32: sai: skip useless iterations on kernel rate loop
  ALSA: hda/realtek - Add more HP laptops which need mute led fixup
  ALSA: hda/realtek: Fix built-mic regression on other ASUS models
  ASoC: Intel: catpt: avoid type mismatch in dev_dbg() format
  ALSA: usb-audio: Fix duplicated name in MIDI substream names
  ALSA: ump: Fix buffer overflow at UMP SysEx message conversion
  ALSA: usb-audio: Add second USB ID for Jabra Evolve 65 headset
  ALSA: hda/realtek: Add quirk for HP Spectre x360 15-df1xxx
  ALSA: hda: Apply volume control on speaker+lineout for HP EliteStudio AIO
  ASoC: Intel: bytcr_rt5640: Add DMI quirk for Acer Aspire SW3-013
  ASoC: amd: acp: Fix devm_snd_soc_register_card(acp-pdm-mach) failure
  ASoC: amd: acp: Fix NULL pointer deref in acp_i2s_set_tdm_slot
  ASoC: amd: acp: Fix NULL pointer deref on acp resume path
  ASoC: renesas: rz-ssi: Use NOIRQ_SYSTEM_SLEEP_PM_OPS()
  ASoC: soc-acpi-intel-ptl-match: add empty item to ptl_cs42l43_l3[]
  ...
parents 95d3481a 6e5bea1c

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -22738,9 +22738,15 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 
F:	Documentation/devicetree/bindings/sound/

F:	Documentation/sound/soc/

F:	include/dt-bindings/sound/

F:	include/sound/cs-amp-lib.h

F:	include/sound/cs35l*

F:	include/sound/cs4271.h

F:	include/sound/cs42l*

F:	include/sound/madera-pdata.h

F:	include/sound/soc*

F:	include/sound/sof.h

F:	include/sound/sof/

F:	include/sound/wm*.h

F:	include/trace/events/sof*.h

F:	include/uapi/sound/asoc.h

F:	sound/soc/

drivers/firmware/cirrus/Kconfig

+1 −4
Original line number Diff line number Diff line
@@ -6,14 +6,11 @@ config FW_CS_DSP 


config FW_CS_DSP_KUNIT_TEST_UTILS

	tristate

	depends on KUNIT && REGMAP

	select FW_CS_DSP



config FW_CS_DSP_KUNIT_TEST

	tristate "KUnit tests for Cirrus Logic cs_dsp" if !KUNIT_ALL_TESTS

	depends on KUNIT && REGMAP

	depends on KUNIT && REGMAP && FW_CS_DSP

	default KUNIT_ALL_TESTS

	select FW_CS_DSP

	select FW_CS_DSP_KUNIT_TEST_UTILS

	help

	  This builds KUnit tests for cs_dsp.

include/sound/soc_sdw_utils.h

+1 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ int asoc_sdw_cs_amp_init(struct snd_soc_card *card, 
			 bool playback);

int asoc_sdw_cs_spk_feedback_rtd_init(struct snd_soc_pcm_runtime *rtd,

				      struct snd_soc_dai *dai);

int asoc_sdw_cs35l56_volume_limit(struct snd_soc_card *card, const char *name_prefix);



/* MAXIM codec support */

int asoc_sdw_maxim_init(struct snd_soc_card *card,

include/sound/ump_convert.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ struct ump_cvt_to_ump_bank { 
/* context for converting from MIDI1 byte stream to UMP packet */

struct ump_cvt_to_ump {

	/* MIDI1 intermediate buffer */

	unsigned char buf[4];

	unsigned char buf[6]; /* up to 6 bytes for SysEx */

	int len;

	int cmd_bytes;

sound/pci/hda/patch_realtek.c

+81 −10
Original line number Diff line number Diff line
@@ -441,6 +441,10 @@ static void alc_fill_eapd_coef(struct hda_codec *codec) 
		alc_update_coef_idx(codec, 0x67, 0xf000, 0x3000);

		fallthrough;

	case 0x10ec0215:

	case 0x10ec0236:

	case 0x10ec0245:

	case 0x10ec0256:

	case 0x10ec0257:

	case 0x10ec0285:

	case 0x10ec0289:

		alc_update_coef_idx(codec, 0x36, 1<<13, 0);
@@ -448,12 +452,8 @@ static void alc_fill_eapd_coef(struct hda_codec *codec) 
	case 0x10ec0230:

	case 0x10ec0233:

	case 0x10ec0235:

	case 0x10ec0236:

	case 0x10ec0245:

	case 0x10ec0255:

	case 0x10ec0256:

	case 0x19e58326:

	case 0x10ec0257:

	case 0x10ec0282:

	case 0x10ec0283:

	case 0x10ec0286:
@@ -6742,6 +6742,25 @@ static void alc274_fixup_bind_dacs(struct hda_codec *codec, 
	codec->power_save_node = 0;

}



/* avoid DAC 0x06 for speaker switch 0x17; it has no volume control */

static void alc274_fixup_hp_aio_bind_dacs(struct hda_codec *codec,

				    const struct hda_fixup *fix, int action)

{

	static const hda_nid_t conn[] = { 0x02, 0x03 }; /* exclude 0x06 */

	/* The speaker is routed to the Node 0x06 by a mistake, thus the

	 * speaker's volume can't be adjusted since the node doesn't have

	 * Amp-out capability. Assure the speaker and lineout pin to be

	 * coupled with DAC NID 0x02.

	 */

	static const hda_nid_t preferred_pairs[] = {

		0x16, 0x02, 0x17, 0x02, 0x21, 0x03, 0

	};

	struct alc_spec *spec = codec->spec;



	snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);

	spec->gen.preferred_dacs = preferred_pairs;

}



/* avoid DAC 0x06 for bass speaker 0x17; it has no volume control */

static void alc289_fixup_asus_ga401(struct hda_codec *codec,

				    const struct hda_fixup *fix, int action)
@@ -6963,6 +6982,41 @@ static void alc285_fixup_hp_spectre_x360_eb1(struct hda_codec *codec, 
	}

}



/* GPIO1 = amplifier on/off */

static void alc285_fixup_hp_spectre_x360_df1(struct hda_codec *codec,

					     const struct hda_fixup *fix,

					     int action)

{

	struct alc_spec *spec = codec->spec;

	static const hda_nid_t conn[] = { 0x02 };

	static const struct hda_pintbl pincfgs[] = {

		{ 0x14, 0x90170110 },  /* front/high speakers */

		{ 0x17, 0x90170130 },  /* back/bass speakers */

		{ }

	};



	// enable mute led

	alc285_fixup_hp_mute_led_coefbit(codec, fix, action);



	switch (action) {

	case HDA_FIXUP_ACT_PRE_PROBE:

		/* needed for amp of back speakers */

		spec->gpio_mask |= 0x01;

		spec->gpio_dir |= 0x01;

		snd_hda_apply_pincfgs(codec, pincfgs);

		/* share DAC to have unified volume control */

		snd_hda_override_conn_list(codec, 0x14, ARRAY_SIZE(conn), conn);

		snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);

		break;

	case HDA_FIXUP_ACT_INIT:

		/* need to toggle GPIO to enable the amp of back speakers */

		alc_update_gpio_data(codec, 0x01, true);

		msleep(100);

		alc_update_gpio_data(codec, 0x01, false);

		break;

	}

}



static void alc285_fixup_hp_spectre_x360(struct hda_codec *codec,

					  const struct hda_fixup *fix, int action)

{
@@ -7761,6 +7815,7 @@ enum { 
	ALC280_FIXUP_HP_9480M,

	ALC245_FIXUP_HP_X360_AMP,

	ALC285_FIXUP_HP_SPECTRE_X360_EB1,

	ALC285_FIXUP_HP_SPECTRE_X360_DF1,

	ALC285_FIXUP_HP_ENVY_X360,

	ALC288_FIXUP_DELL_HEADSET_MODE,

	ALC288_FIXUP_DELL1_MIC_NO_PRESENCE,
@@ -7970,6 +8025,7 @@ enum { 
	ALC294_FIXUP_BASS_SPEAKER_15,

	ALC283_FIXUP_DELL_HP_RESUME,

	ALC294_FIXUP_ASUS_CS35L41_SPI_2,

	ALC274_FIXUP_HP_AIO_BIND_DACS,

};



/* A special fixup for Lenovo C940 and Yoga Duet 7;
@@ -9837,6 +9893,10 @@ static const struct hda_fixup alc269_fixups[] = { 
		.type = HDA_FIXUP_FUNC,

		.v.func = alc285_fixup_hp_spectre_x360_eb1

	},

	[ALC285_FIXUP_HP_SPECTRE_X360_DF1] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc285_fixup_hp_spectre_x360_df1

	},

	[ALC285_FIXUP_HP_ENVY_X360] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc285_fixup_hp_envy_x360,
@@ -10340,6 +10400,10 @@ static const struct hda_fixup alc269_fixups[] = { 
		.chained = true,

		.chain_id = ALC294_FIXUP_ASUS_HEADSET_MIC,

	},

	[ALC274_FIXUP_HP_AIO_BIND_DACS] = {

		.type = HDA_FIXUP_FUNC,

		.v.func = alc274_fixup_hp_aio_bind_dacs,

	},

};



static const struct hda_quirk alc269_fixup_tbl[] = {
@@ -10564,6 +10628,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x86c1, "HP Laptop 15-da3001TU", ALC236_FIXUP_HP_MUTE_LED_COEFBIT2),

	SND_PCI_QUIRK(0x103c, 0x86c7, "HP Envy AiO 32", ALC274_FIXUP_HP_ENVY_GPIO),

	SND_PCI_QUIRK(0x103c, 0x86e7, "HP Spectre x360 15-eb0xxx", ALC285_FIXUP_HP_SPECTRE_X360_EB1),

	SND_PCI_QUIRK(0x103c, 0x863e, "HP Spectre x360 15-df1xxx", ALC285_FIXUP_HP_SPECTRE_X360_DF1),

	SND_PCI_QUIRK(0x103c, 0x86e8, "HP Spectre x360 15-eb0xxx", ALC285_FIXUP_HP_SPECTRE_X360_EB1),

	SND_PCI_QUIRK(0x103c, 0x86f9, "HP Spectre x360 13-aw0xxx", ALC285_FIXUP_HP_SPECTRE_X360_MUTE_LED),

	SND_PCI_QUIRK(0x103c, 0x8716, "HP Elite Dragonfly G2 Notebook PC", ALC285_FIXUP_HP_GPIO_AMP_INIT),
@@ -10768,12 +10833,13 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8ca7, "HP ZBook Fury", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8caf, "HP Elite mt645 G8 Mobile Thin Client", ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF),

	SND_PCI_QUIRK(0x103c, 0x8cbd, "HP Pavilion Aero Laptop 13-bg0xxx", ALC245_FIXUP_HP_X360_MUTE_LEDS),

	SND_PCI_QUIRK(0x103c, 0x8cdd, "HP Spectre", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8cde, "HP Spectre", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8cdd, "HP Spectre", ALC245_FIXUP_HP_SPECTRE_X360_EU0XXX),

	SND_PCI_QUIRK(0x103c, 0x8cde, "HP OmniBook Ultra Flip Laptop 14t", ALC245_FIXUP_HP_SPECTRE_X360_EU0XXX),

	SND_PCI_QUIRK(0x103c, 0x8cdf, "HP SnowWhite", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8ce0, "HP SnowWhite", ALC287_FIXUP_CS35L41_I2C_2_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8cf5, "HP ZBook Studio 16", ALC245_FIXUP_CS35L41_SPI_4_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8d01, "HP ZBook Power 14 G12", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8d18, "HP EliteStudio 8 AIO", ALC274_FIXUP_HP_AIO_BIND_DACS),

	SND_PCI_QUIRK(0x103c, 0x8d84, "HP EliteBook X G1i", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8d85, "HP EliteBook 14 G12", ALC285_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8d86, "HP Elite X360 14 G12", ALC285_FIXUP_HP_GPIO_LED),
@@ -10793,11 +10859,15 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x103c, 0x8da1, "HP 16 Clipper OmniBook X", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8da7, "HP 14 Enstrom OmniBook X", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8da8, "HP 16 Piston OmniBook X", ALC287_FIXUP_CS35L41_I2C_2),

	SND_PCI_QUIRK(0x103c, 0x8dd4, "HP EliteStudio 8 AIO", ALC274_FIXUP_HP_AIO_BIND_DACS),

	SND_PCI_QUIRK(0x103c, 0x8de8, "HP Gemtree", ALC245_FIXUP_TAS2781_SPI_2),

	SND_PCI_QUIRK(0x103c, 0x8de9, "HP Gemtree", ALC245_FIXUP_TAS2781_SPI_2),

	SND_PCI_QUIRK(0x103c, 0x8dec, "HP EliteBook 640 G12", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8ded, "HP EliteBook 640 G12", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8dee, "HP EliteBook 660 G12", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8def, "HP EliteBook 660 G12", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8df0, "HP EliteBook 630 G12", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8df1, "HP EliteBook 630 G12", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8dfc, "HP EliteBook 645 G12", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8dfe, "HP EliteBook 665 G12", ALC236_FIXUP_HP_GPIO_LED),

	SND_PCI_QUIRK(0x103c, 0x8e11, "HP Trekker", ALC287_FIXUP_CS35L41_I2C_2),
@@ -10843,10 +10913,10 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x12a3, "Asus N7691ZM", ALC269_FIXUP_ASUS_N7601ZM),

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

	SND_PCI_QUIRK(0x1043, 0x12b4, "ASUS B3405CCA / P3405CCA", ALC294_FIXUP_ASUS_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x12e0, "ASUS X541SA", ALC256_FIXUP_ASUS_MIC),

	SND_PCI_QUIRK(0x1043, 0x12f0, "ASUS X541UV", ALC256_FIXUP_ASUS_MIC),

	SND_PCI_QUIRK(0x1043, 0x12e0, "ASUS X541SA", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x12f0, "ASUS X541UV", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x1313, "Asus K42JZ", ALC269VB_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x13b0, "ASUS Z550SA", ALC256_FIXUP_ASUS_MIC),

	SND_PCI_QUIRK(0x1043, 0x13b0, "ASUS Z550SA", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_ASUS_ZENBOOK),

	SND_PCI_QUIRK(0x1043, 0x1433, "ASUS GX650PY/PZ/PV/PU/PYV/PZV/PIV/PVV", ALC285_FIXUP_ASUS_I2C_HEADSET_MIC),

	SND_PCI_QUIRK(0x1043, 0x1460, "Asus VivoBook 15", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),
@@ -10900,7 +10970,7 @@ static const struct hda_quirk alc269_fixup_tbl[] = { 
	SND_PCI_QUIRK(0x1043, 0x1c92, "ASUS ROG Strix G15", ALC285_FIXUP_ASUS_G533Z_PINS),

	SND_PCI_QUIRK(0x1043, 0x1c9f, "ASUS G614JU/JV/JI", ALC285_FIXUP_ASUS_HEADSET_MIC),

	SND_PCI_QUIRK(0x1043, 0x1caf, "ASUS G634JY/JZ/JI/JG", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS),

	SND_PCI_QUIRK(0x1043, 0x1ccd, "ASUS X555UB", ALC256_FIXUP_ASUS_MIC),

	SND_PCI_QUIRK(0x1043, 0x1ccd, "ASUS X555UB", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE),

	SND_PCI_QUIRK(0x1043, 0x1ccf, "ASUS G814JU/JV/JI", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x1cdf, "ASUS G814JY/JZ/JG", ALC245_FIXUP_CS35L41_SPI_2),

	SND_PCI_QUIRK(0x1043, 0x1cef, "ASUS G834JY/JZ/JI/JG", ALC285_FIXUP_ASUS_HEADSET_MIC),
@@ -11494,6 +11564,7 @@ static const struct hda_model_fixup alc269_fixup_models[] = { 
	{.id = ALC295_FIXUP_HP_OMEN, .name = "alc295-hp-omen"},

	{.id = ALC285_FIXUP_HP_SPECTRE_X360, .name = "alc285-hp-spectre-x360"},

	{.id = ALC285_FIXUP_HP_SPECTRE_X360_EB1, .name = "alc285-hp-spectre-x360-eb1"},

	{.id = ALC285_FIXUP_HP_SPECTRE_X360_DF1, .name = "alc285-hp-spectre-x360-df1"},

	{.id = ALC285_FIXUP_HP_ENVY_X360, .name = "alc285-hp-envy-x360"},

	{.id = ALC287_FIXUP_IDEAPAD_BASS_SPK_AMP, .name = "alc287-ideapad-bass-spk-amp"},

	{.id = ALC287_FIXUP_YOGA9_14IAP7_BASS_SPK_PIN, .name = "alc287-yoga9-bass-spk-pin"},