ASoC: SOF: cleanups for 5.10
Subsystems (3)
Kai Vehmanen
reviewercover ASoC: SOF: cleanups for 5.10
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(-)
Signature · 1 line
2.27.0
Kai Vehmanen
reviewerPATCH 1/4 ASoC: SOF: control: remove const in sizeof()
From: Pierre-Louis Bossart <[email protected]>
We should only use the type, the const attribute makes no sense in sizeof().
--- sound/soc/sof/control.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
sound/soc/sof/control.c +10 -10
@@ -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))
Signature · 1 line
2.27.0
Kai Vehmanen
reviewerPATCH 2/4 ASoC: SOF: topology: remove const in sizeof()
In reply to Kai VehmanenFrom: Pierre-Louis Bossart <[email protected]>
We should only use the type, the const attribute makes no sense in sizeof().
--- sound/soc/sof/topology.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/sof/topology.c +1 -1
@@ -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" );
Signature · 1 line
2.27.0
Kai Vehmanen
reviewerPATCH 3/4 ASoC: SOF: sof-audio: remove goto used for force-nocodec support
In reply to Kai VehmanenFrom: Pierre-Louis Bossart <[email protected]>
Address smatch warnings:sound/soc/sof/sof-audio.c:375 sof_machine_check() warn: inconsistent indenting sound/soc/sof/sof-audio.c:380 sof_machine_check() warn: ignoring unreachable code.
No functionality change.
--- sound/soc/sof/sof-audio.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
sound/soc/sof/sof-audio.c +3 -7
@@ -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" );
Signature · 1 line
2.27.0
Kai Vehmanen
reviewerPATCH 4/4 ASoC: SOF: loader: handle all SOF_IPC_EXT types
In reply to Kai VehmanenFrom: Bard Liao <[email protected]>
Do not emit a warning for extended firmware header fields that are not used by kernel. This creates unnecessary noise to kernel logs like:
sof-audio-pci 0000:00:1f.3: warning: unknown ext header type 3 size 0x1c sof-audio-pci 0000:00:1f.3: warning: unknown ext header type 4 size 0x10
--- sound/soc/sof/loader.c | 5 +++++ 1 file changed, 5 insertions(+)
sound/soc/sof/loader.c +5 -0
@@ -118,6 +118,11 @@ int snd_sof_fw_parse_ext_data(struct snd_sof_dev *sdev, u32 bar, u32 offset)case SOF_IPC_EXT_CC_INFO : ret =get_cc_info (sdev, ext_hdr);break ; +case SOF_IPC_EXT_UNUSED : +case SOF_IPC_EXT_PROBE_INFO : +case SOF_IPC_EXT_USER_ABI_INFO : +/* They are supported but we don't do anything here */ +break ;default :dev_warn (sdev->dev,"warning: unknown ext header type %d size 0x%x\n" , ext_hdr->type, ext_hdr->hdr.size);
Signature · 1 line
2.27.0
Dne 30. 09. 20 v 17:20 Kai Vehmanen napsal(a):
Quoted 11 lines
Series with multiple code cleanups, plus one fix to remove unnecessary kernel warnings related to firmware loading.
Bard Liao (1):
ASoC: SOF: loader: handle allSOF_IPC_EXTtypesPierre-Louis Bossart (3):
ASoC: SOF: control: remove const insizeof()
ASoC: SOF: topology: remove const insizeof()
ASoC: SOF: sof-audio: remove goto used for force-nocodec support
Quoted 6 lines
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(-)
Mark, apply, please.
Jaroslav
Signature · 2 lines
Jaroslav Kysela <[email protected]> Linux Sound Maintainer; ALSA Project; Red Hat, Inc.
Mark Brown
maintainerQuoted 6 lines · Kai Vehmanen
Series with multiple code cleanups, plus one fix to remove unnecessary kernel warnings related to firmware loading.
Bard Liao (1):
ASoC: SOF: loader: handle allSOF_IPC_EXTtypes
Quoted 6 lines
Pierre-Louis Bossart (3):
ASoC: SOF: control: remove const insizeof()
ASoC: SOF: topology: remove const insizeof()
ASoC: SOF: sof-audio: remove goto used for force-nocodec support[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/4] ASoC: SOF: control: remove const in sizeof()
(no commit info)
[2/4] ASoC: SOF: topology: remove const in sizeof()
(no commit info)
[3/4] ASoC: SOF: sof-audio: remove goto used for force-nocodec support
(no commit info)
[4/4] ASoC: SOF: loader: handle all SOF_IPC_EXT types
commit: 6e5329c6e6032cd997400b43b8299f607a61883e
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark