Unverified Commit 46bbf461 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: SOF: cleanups for 5.10" from Kai Vehmanen <kai.vehmanen@linux.intel.com>: 

Series with multiple code cleanups, plus one fix to remove
unnecessary kernel warnings related to firmware loading.

Bard Liao (1):
  ASoC: SOF: loader: handle all SOF_IPC_EXT types

Pierre-Louis Bossart (3):
  ASoC: SOF: control: remove const in sizeof()
  ASoC: SOF: topology: remove const in sizeof()
  ASoC: SOF: sof-audio: remove goto used for force-nocodec support

 sound/soc/sof/control.c   | 20 ++++++++++----------
 sound/soc/sof/loader.c    |  5 +++++
 sound/soc/sof/sof-audio.c | 10 +++-------
 sound/soc/sof/topology.c  |  2 +-
 4 files changed, 19 insertions(+), 18 deletions(-)

--
2.27.0
parents 7a25748b 64e2c37e

sound/soc/sof/control.c

+10 −10
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ int snd_sof_bytes_ext_put(struct snd_kcontrol *kcontrol, 
	 * the length (as bytes) is needed to know the correct copy

	 * length of data from tlvd->tlv.

	 */

	if (copy_from_user(&header, tlvd, sizeof(const struct snd_ctl_tlv)))

	if (copy_from_user(&header, tlvd, sizeof(struct snd_ctl_tlv)))

		return -EFAULT;



	/* make sure TLV info is consistent */
@@ -351,7 +351,7 @@ int snd_sof_bytes_ext_put(struct snd_kcontrol *kcontrol, 
	}



	/* be->max has been verified to be >= sizeof(struct sof_abi_hdr) */

	if (cdata->data->size > be->max - sizeof(const struct sof_abi_hdr)) {

	if (cdata->data->size > be->max - sizeof(struct sof_abi_hdr)) {

		dev_err_ratelimited(scomp->dev, "error: Mismatch in ABI data size (truncated?).\n");

		return -EINVAL;

	}
@@ -405,15 +405,15 @@ int snd_sof_bytes_ext_volatile_get(struct snd_kcontrol *kcontrol, unsigned int _ 
		goto out;



	/* check data size doesn't exceed max coming from topology */

	if (cdata->data->size > be->max - sizeof(const struct sof_abi_hdr)) {

	if (cdata->data->size > be->max - sizeof(struct sof_abi_hdr)) {

		dev_err_ratelimited(scomp->dev, "error: user data size %d exceeds max size %zu.\n",

				    cdata->data->size,

				    be->max - sizeof(const struct sof_abi_hdr));

				    be->max - sizeof(struct sof_abi_hdr));

		ret = -EINVAL;

		goto out;

	}



	data_size = cdata->data->size + sizeof(const struct sof_abi_hdr);

	data_size = cdata->data->size + sizeof(struct sof_abi_hdr);



	/* make sure we don't exceed size provided by user space for data */

	if (data_size > size) {
@@ -423,7 +423,7 @@ int snd_sof_bytes_ext_volatile_get(struct snd_kcontrol *kcontrol, unsigned int _ 


	header.numid = scontrol->cmd;

	header.length = data_size;

	if (copy_to_user(tlvd, &header, sizeof(const struct snd_ctl_tlv))) {

	if (copy_to_user(tlvd, &header, sizeof(struct snd_ctl_tlv))) {

		ret = -EFAULT;

		goto out;

	}
@@ -466,14 +466,14 @@ int snd_sof_bytes_ext_get(struct snd_kcontrol *kcontrol, 
	cdata->data->abi = SOF_ABI_VERSION;



	/* check data size doesn't exceed max coming from topology */

	if (cdata->data->size > be->max - sizeof(const struct sof_abi_hdr)) {

	if (cdata->data->size > be->max - sizeof(struct sof_abi_hdr)) {

		dev_err_ratelimited(scomp->dev, "error: user data size %d exceeds max size %zu.\n",

				    cdata->data->size,

				    be->max - sizeof(const struct sof_abi_hdr));

				    be->max - sizeof(struct sof_abi_hdr));

		return -EINVAL;

	}



	data_size = cdata->data->size + sizeof(const struct sof_abi_hdr);

	data_size = cdata->data->size + sizeof(struct sof_abi_hdr);



	/* make sure we don't exceed size provided by user space for data */

	if (data_size > size)
@@ -481,7 +481,7 @@ int snd_sof_bytes_ext_get(struct snd_kcontrol *kcontrol, 


	header.numid = scontrol->cmd;

	header.length = data_size;

	if (copy_to_user(tlvd, &header, sizeof(const struct snd_ctl_tlv)))

	if (copy_to_user(tlvd, &header, sizeof(struct snd_ctl_tlv)))

		return -EFAULT;



	if (copy_to_user(tlvd->tlv, cdata->data, data_size))

sound/soc/sof/sof-audio.c

+3 −7
Original line number Diff line number Diff line
@@ -443,11 +443,7 @@ int sof_machine_check(struct snd_sof_dev *sdev) 
	struct snd_soc_acpi_mach *mach;

	int ret;



	/* force nocodec mode */

#if IS_ENABLED(CONFIG_SND_SOC_SOF_FORCE_NOCODEC_MODE)

		dev_warn(sdev->dev, "Force to use nocodec mode\n");

		goto nocodec;

#endif

#if !IS_ENABLED(CONFIG_SND_SOC_SOF_FORCE_NOCODEC_MODE)



	/* find machine */

	snd_sof_machine_select(sdev);
@@ -460,8 +456,8 @@ int sof_machine_check(struct snd_sof_dev *sdev) 
	dev_err(sdev->dev, "error: no matching ASoC machine driver found - aborting probe\n");

	return -ENODEV;

#endif

#if IS_ENABLED(CONFIG_SND_SOC_SOF_FORCE_NOCODEC_MODE)

nocodec:

#else

	dev_warn(sdev->dev, "Force to use nocodec mode\n");

#endif

	/* select nocodec mode */

	dev_warn(sdev->dev, "Using nocodec machine driver\n");

sound/soc/sof/topology.c

+1 −1
Original line number Diff line number Diff line
@@ -1201,7 +1201,7 @@ static int sof_control_load_bytes(struct snd_soc_component *scomp, 
			ret = -EINVAL;

			goto out_free;

		}

		if (cdata->data->size + sizeof(const struct sof_abi_hdr) !=

		if (cdata->data->size + sizeof(struct sof_abi_hdr) !=

		    le32_to_cpu(control->priv.size)) {

			dev_err(scomp->dev,

				"error: Conflict in bytes vs. priv size.\n");

CRA Git | Maintained and supported by SUSTech CRA and CCSE