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

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

Pull sound fixes from Takashi Iwai:
 "A small set of HD-audio and USB-audio fixes as well as a couple of
  ALSA core fixes. Most of them are fix-ups for the newly added CS35L41
  codec"

* tag 'sound-fix-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
  ALSA: hda/cs8409: Add new Warlock SKUs to patch_cs8409
  ALSA: core: Simplify snd_power_ref_and_wait() with the standard macro
  ALSA: hda: cs35l41: Make cs35l41_hda_remove() return void
  ALSA: hda: cs35l41: Tidyup code
  ALSA: hda: cs35l41: Make use of the helper function dev_err_probe()
  ALSA: hda: cs35l41: Add missing default cases
  ALSA: hda: cs35l41: Move cs35l41* calls to its own symbol namespace
  ALSA: hda: cs35l41: Add calls to newly added test key function
  ALSA: hda: cs35l41: Avoid overwriting register patch
  ALSA: core: Fix SSID quirk lookup for subvendor=0
  ALSA: usb-audio: add mapping for MSI MPG X570S Carbon Max Wifi.
  ALSA: hda/realtek: fix speakers and micmute on HP 855 G8
parents 75242f31 2a1355f0

sound/core/init.c

+5 −20
Original line number Diff line number Diff line
@@ -1111,29 +1111,14 @@ EXPORT_SYMBOL(snd_card_file_remove); 
 */

int snd_power_ref_and_wait(struct snd_card *card)

{

	wait_queue_entry_t wait;

	int result = 0;



	snd_power_ref(card);

	/* fastpath */

	if (snd_power_get_state(card) == SNDRV_CTL_POWER_D0)

		return 0;

	init_waitqueue_entry(&wait, current);

	add_wait_queue(&card->power_sleep, &wait);

	while (1) {

		if (card->shutdown) {

			result = -ENODEV;

			break;

		}

		if (snd_power_get_state(card) == SNDRV_CTL_POWER_D0)

			break;

		snd_power_unref(card);

		set_current_state(TASK_UNINTERRUPTIBLE);

		schedule_timeout(30 * HZ);

		snd_power_ref(card);

	}

	remove_wait_queue(&card->power_sleep, &wait);

	return result;

	wait_event_cmd(card->power_sleep,

		       card->shutdown ||

		       snd_power_get_state(card) == SNDRV_CTL_POWER_D0,

		       snd_power_unref(card), snd_power_ref(card));

	return card->shutdown ? -ENODEV : 0;

}

EXPORT_SYMBOL_GPL(snd_power_ref_and_wait);

sound/core/misc.c

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ snd_pci_quirk_lookup_id(u16 vendor, u16 device, 
{

	const struct snd_pci_quirk *q;



	for (q = list; q->subvendor; q++) {

	for (q = list; q->subvendor || q->subdevice; q++) {

		if (q->subvendor != vendor)

			continue;

		if (!q->subdevice ||

sound/pci/hda/cs35l41_hda.c

+74 −60
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

//

// cs35l41.c -- CS35l41 ALSA HDA audio driver

// CS35l41 ALSA HDA audio driver

//

// Copyright 2021 Cirrus Logic, Inc.

//
@@ -161,11 +161,13 @@ static void cs35l41_hda_playback_hook(struct device *dev, int action) 
		if (reg_seq->close)

			ret = regmap_multi_reg_write(reg, reg_seq->close, reg_seq->num_close);

		break;

	default:

		ret = -EINVAL;

		break;

	}



	if (ret)

		dev_warn(cs35l41->dev, "Failed to apply multi reg write: %d\n", ret);



}



static int cs35l41_hda_channel_map(struct device *dev, unsigned int tx_num, unsigned int *tx_slot,
@@ -182,20 +184,19 @@ static int cs35l41_hda_bind(struct device *dev, struct device *master, void *mas 
	struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);

	struct hda_component *comps = master_data;



	if (comps && cs35l41->index >= 0 && cs35l41->index < HDA_MAX_COMPONENTS)

		comps = &comps[cs35l41->index];

	else

	if (!comps || cs35l41->index < 0 || cs35l41->index >= HDA_MAX_COMPONENTS)

		return -EINVAL;



	if (!comps->dev) {

	comps = &comps[cs35l41->index];

	if (comps->dev)

		return -EBUSY;



	comps->dev = dev;

	strscpy(comps->name, dev_name(dev), sizeof(comps->name));

	comps->playback_hook = cs35l41_hda_playback_hook;

	comps->set_channel_map = cs35l41_hda_channel_map;

		return 0;

	}



	return -EBUSY;

	return 0;

}



static void cs35l41_hda_unbind(struct device *dev, struct device *master, void *master_data)
@@ -227,6 +228,8 @@ static int cs35l41_hda_apply_properties(struct cs35l41_hda *cs35l41, 
		internal_boost = true;



	switch (hw_cfg->gpio1_func) {

	case CS35L41_NOT_USED:

		break;

	case CS35l41_VSPK_SWITCH:

		regmap_update_bits(cs35l41->regmap, CS35L41_GPIO_PAD_CONTROL,

				   CS35L41_GPIO1_CTRL_MASK, 1 << CS35L41_GPIO1_CTRL_SHIFT);
@@ -235,13 +238,21 @@ static int cs35l41_hda_apply_properties(struct cs35l41_hda *cs35l41, 
		regmap_update_bits(cs35l41->regmap, CS35L41_GPIO_PAD_CONTROL,

				   CS35L41_GPIO1_CTRL_MASK, 2 << CS35L41_GPIO1_CTRL_SHIFT);

		break;

	default:

		dev_err(cs35l41->dev, "Invalid function %d for GPIO1\n", hw_cfg->gpio1_func);

		return -EINVAL;

	}



	switch (hw_cfg->gpio2_func) {

	case CS35L41_NOT_USED:

		break;

	case CS35L41_INTERRUPT:

		regmap_update_bits(cs35l41->regmap, CS35L41_GPIO_PAD_CONTROL,

				   CS35L41_GPIO2_CTRL_MASK, 2 << CS35L41_GPIO2_CTRL_SHIFT);

		break;

	default:

		dev_err(cs35l41->dev, "Invalid function %d for GPIO2\n", hw_cfg->gpio2_func);

		return -EINVAL;

	}



	if (internal_boost) {
@@ -256,11 +267,7 @@ static int cs35l41_hda_apply_properties(struct cs35l41_hda *cs35l41, 
		cs35l41->reg_seq = &cs35l41_hda_reg_seq_ext_bst;

	}



	ret = cs35l41_hda_channel_map(cs35l41->dev, 0, NULL, 1, (unsigned int *)&hw_cfg->spk_pos);

	if (ret)

		return ret;



	return 0;

	return cs35l41_hda_channel_map(cs35l41->dev, 0, NULL, 1, (unsigned int *)&hw_cfg->spk_pos);

}



static struct cs35l41_hda_hw_config *cs35l41_hda_read_acpi(struct cs35l41_hda *cs35l41,
@@ -269,7 +276,7 @@ static struct cs35l41_hda_hw_config *cs35l41_hda_read_acpi(struct cs35l41_hda *c 
	struct cs35l41_hda_hw_config *hw_cfg;

	u32 values[HDA_MAX_COMPONENTS];

	struct acpi_device *adev;

	struct device *acpi_dev;

	struct device *physdev;

	char *property;

	size_t nval;

	int i, ret;
@@ -280,11 +287,11 @@ static struct cs35l41_hda_hw_config *cs35l41_hda_read_acpi(struct cs35l41_hda *c 
		return ERR_PTR(-ENODEV);

	}



	acpi_dev = get_device(acpi_get_first_physical_node(adev));

	physdev = get_device(acpi_get_first_physical_node(adev));

	acpi_dev_put(adev);



	property = "cirrus,dev-index";

	ret = device_property_count_u32(acpi_dev, property);

	ret = device_property_count_u32(physdev, property);

	if (ret <= 0)

		goto no_acpi_dsd;
@@ -294,7 +301,7 @@ static struct cs35l41_hda_hw_config *cs35l41_hda_read_acpi(struct cs35l41_hda *c 
	}

	nval = ret;



	ret = device_property_read_u32_array(acpi_dev, property, values, nval);

	ret = device_property_read_u32_array(physdev, property, values, nval);

	if (ret)

		goto err;
@@ -311,7 +318,9 @@ static struct cs35l41_hda_hw_config *cs35l41_hda_read_acpi(struct cs35l41_hda *c 
		goto err;

	}



	/* No devm_ version as CLSA0100, in no_acpi_dsd case, can't use devm version */

	/* To use the same release code for all laptop variants we can't use devm_ version of

	 * gpiod_get here, as CLSA010* don't have a fully functional bios with an _DSD node

	 */

	cs35l41->reset_gpio = fwnode_gpiod_get_index(&adev->fwnode, "reset", cs35l41->index,

						     GPIOD_OUT_LOW, "cs35l41-reset");
@@ -322,46 +331,46 @@ static struct cs35l41_hda_hw_config *cs35l41_hda_read_acpi(struct cs35l41_hda *c 
	}



	property = "cirrus,speaker-position";

	ret = device_property_read_u32_array(acpi_dev, property, values, nval);

	ret = device_property_read_u32_array(physdev, property, values, nval);

	if (ret)

		goto err_free;

	hw_cfg->spk_pos = values[cs35l41->index];



	property = "cirrus,gpio1-func";

	ret = device_property_read_u32_array(acpi_dev, property, values, nval);

	ret = device_property_read_u32_array(physdev, property, values, nval);

	if (ret)

		goto err_free;

	hw_cfg->gpio1_func = values[cs35l41->index];



	property = "cirrus,gpio2-func";

	ret = device_property_read_u32_array(acpi_dev, property, values, nval);

	ret = device_property_read_u32_array(physdev, property, values, nval);

	if (ret)

		goto err_free;

	hw_cfg->gpio2_func = values[cs35l41->index];



	property = "cirrus,boost-peak-milliamp";

	ret = device_property_read_u32_array(acpi_dev, property, values, nval);

	ret = device_property_read_u32_array(physdev, property, values, nval);

	if (ret == 0)

		hw_cfg->bst_ipk = values[cs35l41->index];



	property = "cirrus,boost-ind-nanohenry";

	ret = device_property_read_u32_array(acpi_dev, property, values, nval);

	ret = device_property_read_u32_array(physdev, property, values, nval);

	if (ret == 0)

		hw_cfg->bst_ind = values[cs35l41->index];



	property = "cirrus,boost-cap-microfarad";

	ret = device_property_read_u32_array(acpi_dev, property, values, nval);

	ret = device_property_read_u32_array(physdev, property, values, nval);

	if (ret == 0)

		hw_cfg->bst_cap = values[cs35l41->index];



	put_device(acpi_dev);

	put_device(physdev);



	return hw_cfg;



err_free:

	kfree(hw_cfg);

err:

	put_device(acpi_dev);

	put_device(physdev);

	dev_err(cs35l41->dev, "Failed property %s: %d\n", property, ret);



	return ERR_PTR(ret);
@@ -370,18 +379,18 @@ static struct cs35l41_hda_hw_config *cs35l41_hda_read_acpi(struct cs35l41_hda *c 
	/*

	 * Device CLSA0100 doesn't have _DSD so a gpiod_get by the label reset won't work.

	 * And devices created by i2c-multi-instantiate don't have their device struct pointing to

	 * the correct fwnode, so acpi_dev must be used here

	 * the correct fwnode, so acpi_dev must be used here.

	 * And devm functions expect that the device requesting the resource has the correct

	 * fwnode

	 * fwnode.

	 */

	if (strncmp(hid, "CLSA0100", 8) != 0)

		return ERR_PTR(-EINVAL);



	/* check I2C address to assign the index */

	cs35l41->index = id == 0x40 ? 0 : 1;

	cs35l41->reset_gpio = gpiod_get_index(acpi_dev, NULL, 0, GPIOD_OUT_HIGH);

	cs35l41->reset_gpio = gpiod_get_index(physdev, NULL, 0, GPIOD_OUT_HIGH);

	cs35l41->vspk_always_on = true;

	put_device(acpi_dev);

	put_device(physdev);



	return NULL;

}
@@ -416,8 +425,7 @@ int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int i 
		if (ret == -EBUSY) {

			dev_info(cs35l41->dev, "Reset line busy, assuming shared reset\n");

		} else {

			if (ret != -EPROBE_DEFER)

				dev_err(cs35l41->dev, "Failed to get reset GPIO: %d\n", ret);

			dev_err_probe(cs35l41->dev, ret, "Failed to get reset GPIO: %d\n", ret);

			goto err;

		}

	}
@@ -437,7 +445,8 @@ int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int i 


	ret = regmap_read(cs35l41->regmap, CS35L41_IRQ1_STATUS3, &int_sts);

	if (ret || (int_sts & CS35L41_OTP_BOOT_ERR)) {

		dev_err(cs35l41->dev, "OTP Boot error\n");

		dev_err(cs35l41->dev, "OTP Boot status %x error: %d\n",

			int_sts & CS35L41_OTP_BOOT_ERR, ret);

		ret = -EIO;

		goto err;

	}
@@ -463,6 +472,10 @@ int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int i 
		goto err;

	}



	ret = cs35l41_test_key_unlock(cs35l41->dev, cs35l41->regmap);

	if (ret)

		goto err;



	ret = cs35l41_register_errata_patch(cs35l41->dev, cs35l41->regmap, reg_revid);

	if (ret)

		goto err;
@@ -473,6 +486,10 @@ int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int i 
		goto err;

	}



	ret = cs35l41_test_key_lock(cs35l41->dev, cs35l41->regmap);

	if (ret)

		goto err;



	ret = cs35l41_hda_apply_properties(cs35l41, acpi_hw_cfg);

	if (ret)

		goto err;
@@ -480,7 +497,7 @@ int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int i 
	acpi_hw_cfg = NULL;



	if (cs35l41->reg_seq->probe) {

		ret = regmap_register_patch(cs35l41->regmap, cs35l41->reg_seq->probe,

		ret = regmap_multi_reg_write(cs35l41->regmap, cs35l41->reg_seq->probe,

					     cs35l41->reg_seq->num_probe);

		if (ret) {

			dev_err(cs35l41->dev, "Fail to apply probe reg patch: %d\n", ret);
@@ -506,9 +523,9 @@ int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int i 


	return ret;

}

EXPORT_SYMBOL_GPL(cs35l41_hda_probe);

EXPORT_SYMBOL_NS_GPL(cs35l41_hda_probe, SND_HDA_SCODEC_CS35L41);



int cs35l41_hda_remove(struct device *dev)

void cs35l41_hda_remove(struct device *dev)

{

	struct cs35l41_hda *cs35l41 = dev_get_drvdata(dev);
@@ -517,11 +534,8 @@ int cs35l41_hda_remove(struct device *dev) 
	if (!cs35l41->vspk_always_on)

		gpiod_set_value_cansleep(cs35l41->reset_gpio, 0);

	gpiod_put(cs35l41->reset_gpio);



	return 0;

}

EXPORT_SYMBOL_GPL(cs35l41_hda_remove);



EXPORT_SYMBOL_NS_GPL(cs35l41_hda_remove, SND_HDA_SCODEC_CS35L41);



MODULE_DESCRIPTION("CS35L41 HDA Driver");

MODULE_AUTHOR("Lucas Tanure, Cirrus Logic Inc, <tanureal@opensource.cirrus.com>");

sound/pci/hda/cs35l41_hda.h

+2 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0

 *

 * cs35l41_hda.h -- CS35L41 ALSA HDA audio driver

 * CS35L41 ALSA HDA audio driver

 *

 * Copyright 2021 Cirrus Logic, Inc.

 *
@@ -64,6 +64,6 @@ struct cs35l41_hda { 


int cs35l41_hda_probe(struct device *dev, const char *device_name, int id, int irq,

		      struct regmap *regmap);

int cs35l41_hda_remove(struct device *dev);

void cs35l41_hda_remove(struct device *dev);



#endif /*__CS35L41_HDA_H__*/

sound/pci/hda/cs35l41_hda_i2c.c

+4 −2
Original line number Diff line number Diff line
@@ -32,7 +32,9 @@ static int cs35l41_hda_i2c_probe(struct i2c_client *clt, const struct i2c_device 


static int cs35l41_hda_i2c_remove(struct i2c_client *clt)

{

	return cs35l41_hda_remove(&clt->dev);

	cs35l41_hda_remove(&clt->dev);



	return 0;

}



static const struct i2c_device_id cs35l41_hda_i2c_id[] = {
@@ -58,9 +60,9 @@ static struct i2c_driver cs35l41_i2c_driver = { 
	.probe		= cs35l41_hda_i2c_probe,

	.remove		= cs35l41_hda_i2c_remove,

};



module_i2c_driver(cs35l41_i2c_driver);



MODULE_DESCRIPTION("HDA CS35L41 driver");

MODULE_IMPORT_NS(SND_HDA_SCODEC_CS35L41);

MODULE_AUTHOR("Lucas Tanure <tanureal@opensource.cirrus.com>");

MODULE_LICENSE("GPL");