Unverified Commit 86f26aca authored by Mark Brown's avatar Mark Brown
Browse files

ALSA: cirrus: Tidy up of firmware control read/write 

Merge series from Richard Fitzgerald <rf@opensource.cirrus.com>:

This set of patches factors out some repeated code to clean up
firmware control read/write functions, and removes some redundant
control notification code.

base-commit: f193957b
parents b9cfeeb9 d641def1

drivers/firmware/cirrus/cs_dsp.c

+54 −0
Original line number Diff line number Diff line
@@ -819,6 +819,33 @@ int cs_dsp_coeff_write_ctrl(struct cs_dsp_coeff_ctl *ctl, 
}

EXPORT_SYMBOL_NS_GPL(cs_dsp_coeff_write_ctrl, FW_CS_DSP);



/**

 * cs_dsp_coeff_lock_and_write_ctrl() - Writes the given buffer to the given coefficient control

 * @ctl: pointer to coefficient control

 * @off: word offset at which data should be written

 * @buf: the buffer to write to the given control

 * @len: the length of the buffer in bytes

 *

 * Same as cs_dsp_coeff_write_ctrl() but takes pwr_lock.

 *

 * Return: A negative number on error, 1 when the control value changed and 0 when it has not.

 */

int cs_dsp_coeff_lock_and_write_ctrl(struct cs_dsp_coeff_ctl *ctl,

				     unsigned int off, const void *buf, size_t len)

{

	struct cs_dsp *dsp = ctl->dsp;

	int ret;



	lockdep_assert_not_held(&dsp->pwr_lock);



	mutex_lock(&dsp->pwr_lock);

	ret = cs_dsp_coeff_write_ctrl(ctl, off, buf, len);

	mutex_unlock(&dsp->pwr_lock);



	return ret;

}

EXPORT_SYMBOL_GPL(cs_dsp_coeff_lock_and_write_ctrl);



static int cs_dsp_coeff_read_ctrl_raw(struct cs_dsp_coeff_ctl *ctl,

				      unsigned int off, void *buf, size_t len)

{
@@ -891,6 +918,33 @@ int cs_dsp_coeff_read_ctrl(struct cs_dsp_coeff_ctl *ctl, 
}

EXPORT_SYMBOL_NS_GPL(cs_dsp_coeff_read_ctrl, FW_CS_DSP);



/**

 * cs_dsp_coeff_lock_and_read_ctrl() - Reads the given coefficient control into the given buffer

 * @ctl: pointer to coefficient control

 * @off: word offset at which data should be read

 * @buf: the buffer to store to the given control

 * @len: the length of the buffer in bytes

 *

 * Same as cs_dsp_coeff_read_ctrl() but takes pwr_lock.

 *

 * Return: Zero for success, a negative number on error.

 */

int cs_dsp_coeff_lock_and_read_ctrl(struct cs_dsp_coeff_ctl *ctl,

				    unsigned int off, void *buf, size_t len)

{

	struct cs_dsp *dsp = ctl->dsp;

	int ret;



	lockdep_assert_not_held(&dsp->pwr_lock);



	mutex_lock(&dsp->pwr_lock);

	ret = cs_dsp_coeff_read_ctrl(ctl, off, buf, len);

	mutex_unlock(&dsp->pwr_lock);



	return ret;

}

EXPORT_SYMBOL_GPL(cs_dsp_coeff_lock_and_read_ctrl);



static int cs_dsp_coeff_init_control_caches(struct cs_dsp *dsp)

{

	struct cs_dsp_coeff_ctl *ctl;

include/linux/firmware/cirrus/cs_dsp.h

+4 −0
Original line number Diff line number Diff line
@@ -238,8 +238,12 @@ void cs_dsp_cleanup_debugfs(struct cs_dsp *dsp); 
int cs_dsp_coeff_write_acked_control(struct cs_dsp_coeff_ctl *ctl, unsigned int event_id);

int cs_dsp_coeff_write_ctrl(struct cs_dsp_coeff_ctl *ctl, unsigned int off,

			    const void *buf, size_t len);

int cs_dsp_coeff_lock_and_write_ctrl(struct cs_dsp_coeff_ctl *ctl, unsigned int off,

				     const void *buf, size_t len);

int cs_dsp_coeff_read_ctrl(struct cs_dsp_coeff_ctl *ctl, unsigned int off,

			   void *buf, size_t len);

int cs_dsp_coeff_lock_and_read_ctrl(struct cs_dsp_coeff_ctl *ctl, unsigned int off,

				    void *buf, size_t len);

struct cs_dsp_coeff_ctl *cs_dsp_get_ctl(struct cs_dsp *dsp, const char *name, int type,

					unsigned int alg);

sound/pci/hda/hda_cs_dsp_ctl.c

+2 −20
Original line number Diff line number Diff line
@@ -51,13 +51,8 @@ static int hda_cs_dsp_coeff_put(struct snd_kcontrol *kctl, struct snd_ctl_elem_v 
	struct hda_cs_dsp_coeff_ctl *ctl = (struct hda_cs_dsp_coeff_ctl *)snd_kcontrol_chip(kctl);

	struct cs_dsp_coeff_ctl *cs_ctl = ctl->cs_ctl;

	char *p = ucontrol->value.bytes.data;

	int ret = 0;



	mutex_lock(&cs_ctl->dsp->pwr_lock);

	ret = cs_dsp_coeff_write_ctrl(cs_ctl, 0, p, cs_ctl->len);

	mutex_unlock(&cs_ctl->dsp->pwr_lock);



	return ret;

	return cs_dsp_coeff_lock_and_write_ctrl(cs_ctl, 0, p, cs_ctl->len);

}



static int hda_cs_dsp_coeff_get(struct snd_kcontrol *kctl, struct snd_ctl_elem_value *ucontrol)
@@ -65,13 +60,8 @@ static int hda_cs_dsp_coeff_get(struct snd_kcontrol *kctl, struct snd_ctl_elem_v 
	struct hda_cs_dsp_coeff_ctl *ctl = (struct hda_cs_dsp_coeff_ctl *)snd_kcontrol_chip(kctl);

	struct cs_dsp_coeff_ctl *cs_ctl = ctl->cs_ctl;

	char *p = ucontrol->value.bytes.data;

	int ret;



	mutex_lock(&cs_ctl->dsp->pwr_lock);

	ret = cs_dsp_coeff_read_ctrl(cs_ctl, 0, p, cs_ctl->len);

	mutex_unlock(&cs_ctl->dsp->pwr_lock);



	return ret;

	return cs_dsp_coeff_lock_and_read_ctrl(cs_ctl, 0, p, cs_ctl->len);

}



static unsigned int wmfw_convert_flags(unsigned int in)
@@ -211,7 +201,6 @@ int hda_cs_dsp_write_ctl(struct cs_dsp *dsp, const char *name, int type, 
			 unsigned int alg, const void *buf, size_t len)

{

	struct cs_dsp_coeff_ctl *cs_ctl;

	struct hda_cs_dsp_coeff_ctl *ctl;

	int ret;



	mutex_lock(&dsp->pwr_lock);
@@ -221,13 +210,6 @@ int hda_cs_dsp_write_ctl(struct cs_dsp *dsp, const char *name, int type, 
	if (ret < 0)

		return ret;



	if (ret == 0 || (cs_ctl->flags & WMFW_CTL_FLAG_SYS))

		return 0;



	ctl = cs_ctl->priv;



	snd_ctl_notify(ctl->card, SNDRV_CTL_EVENT_MASK_VALUE, &ctl->kctl->id);



	return 0;

}

EXPORT_SYMBOL_NS_GPL(hda_cs_dsp_write_ctl, SND_HDA_CS_DSP_CONTROLS);

sound/soc/codecs/wm_adsp.c

+7 −25
Original line number Diff line number Diff line
@@ -403,13 +403,8 @@ static int wm_coeff_put(struct snd_kcontrol *kctl, 
	struct wm_coeff_ctl *ctl = bytes_ext_to_ctl(bytes_ext);

	struct cs_dsp_coeff_ctl *cs_ctl = ctl->cs_ctl;

	char *p = ucontrol->value.bytes.data;

	int ret = 0;



	mutex_lock(&cs_ctl->dsp->pwr_lock);

	ret = cs_dsp_coeff_write_ctrl(cs_ctl, 0, p, cs_ctl->len);

	mutex_unlock(&cs_ctl->dsp->pwr_lock);



	return ret;

	return cs_dsp_coeff_lock_and_write_ctrl(cs_ctl, 0, p, cs_ctl->len);

}



static int wm_coeff_tlv_put(struct snd_kcontrol *kctl,
@@ -426,13 +421,11 @@ static int wm_coeff_tlv_put(struct snd_kcontrol *kctl, 
	if (!scratch)

		return -ENOMEM;



	if (copy_from_user(scratch, bytes, size)) {

	if (copy_from_user(scratch, bytes, size))

		ret = -EFAULT;

	} else {

		mutex_lock(&cs_ctl->dsp->pwr_lock);

		ret = cs_dsp_coeff_write_ctrl(cs_ctl, 0, scratch, size);

		mutex_unlock(&cs_ctl->dsp->pwr_lock);

	}

	else

		ret = cs_dsp_coeff_lock_and_write_ctrl(cs_ctl, 0, scratch, size);



	vfree(scratch);



	return ret;
@@ -474,13 +467,8 @@ static int wm_coeff_get(struct snd_kcontrol *kctl, 
	struct wm_coeff_ctl *ctl = bytes_ext_to_ctl(bytes_ext);

	struct cs_dsp_coeff_ctl *cs_ctl = ctl->cs_ctl;

	char *p = ucontrol->value.bytes.data;

	int ret;



	mutex_lock(&cs_ctl->dsp->pwr_lock);

	ret = cs_dsp_coeff_read_ctrl(cs_ctl, 0, p, cs_ctl->len);

	mutex_unlock(&cs_ctl->dsp->pwr_lock);



	return ret;

	return cs_dsp_coeff_lock_and_read_ctrl(cs_ctl, 0, p, cs_ctl->len);

}



static int wm_coeff_tlv_get(struct snd_kcontrol *kctl,
@@ -684,7 +672,6 @@ int wm_adsp_write_ctl(struct wm_adsp *dsp, const char *name, int type, 
		      unsigned int alg, void *buf, size_t len)

{

	struct cs_dsp_coeff_ctl *cs_ctl;

	struct wm_coeff_ctl *ctl;

	int ret;



	mutex_lock(&dsp->cs_dsp.pwr_lock);
@@ -695,12 +682,7 @@ int wm_adsp_write_ctl(struct wm_adsp *dsp, const char *name, int type, 
	if (ret < 0)

		return ret;



	if (ret == 0 || (cs_ctl->flags & WMFW_CTL_FLAG_SYS))

	return 0;



	ctl = cs_ctl->priv;



	return snd_soc_component_notify_control(dsp->component, ctl->name);

}

EXPORT_SYMBOL_GPL(wm_adsp_write_ctl);