diff mbox series

ASoC: SOF: Add missing dependency on IMX_SCU

Message ID 20200423142805.52757-1-broonie@kernel.org (mailing list archive)
State Accepted
Commit fe57a92c88580ae7894b9c71d2d520ba98eb1591
Headers show
Series ASoC: SOF: Add missing dependency on IMX_SCU | expand

Commit Message

Mark Brown April 23, 2020, 2:28 p.m. UTC
This broke PowerPC allyesconfig.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/sof/imx/Kconfig | 1 +
 1 file changed, 1 insertion(+)

Comments

Daniel Baluta April 23, 2020, 3:21 p.m. UTC | #1
This should no longer be a problem after the following patch is merged:

https://patchwork.kernel.org/patch/11395247/

Also, Pierre already fixed this in SOF tree like this:

https://github.com/thesofproject/linux/commit/5e3103aaf77fd5c985d717a5fe774fd2154e97aa
I think we should go with Pierre's version for now.

Pierre,

Will you send the fixes to Mark? Or should I send them?

Anyone,

What is the exact difference between 'depends on' and 'selects'. This
is a question I try
to clarify for myself for a while. And most important when to use one
or another?


On Thu, Apr 23, 2020 at 5:29 PM Mark Brown <broonie@kernel.org> wrote:
>
> This broke PowerPC allyesconfig.
>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Mark Brown <broonie@kernel.org>
> ---
>  sound/soc/sof/imx/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/sound/soc/sof/imx/Kconfig b/sound/soc/sof/imx/Kconfig
> index 5e0c68b12292..9a5ed1860e4e 100644
> --- a/sound/soc/sof/imx/Kconfig
> +++ b/sound/soc/sof/imx/Kconfig
> @@ -21,6 +21,7 @@ config SND_SOC_SOF_IMX_OF
>
>  config SND_SOC_SOF_IMX8_SUPPORT
>         bool "SOF support for i.MX8"
> +       depends on IMX_SCU
>         help
>           This adds support for Sound Open Firmware for NXP i.MX8 platforms
>           Say Y if you have such a device.
> --
> 2.20.1
>
Mark Brown April 23, 2020, 4:17 p.m. UTC | #2
On Thu, Apr 23, 2020 at 06:21:40PM +0300, Daniel Baluta wrote:

Please don't top post, reply in line with needed context.  This allows
readers to readily follow the flow of conversation and understand what
you are talking about and also helps ensure that everything in the
discussion is being addressed.

> This should no longer be a problem after the following patch is merged:
> 
> https://patchwork.kernel.org/patch/11395247/

That's "firmware: imx: add dummy functions".  That'll fix the issue but
we'll still see stuff in -next unless the firmware tree gets merged
before ASoC.

Please include human readable descriptions of things like commits and
issues being discussed in e-mail in your mails, this makes them much
easier for humans to read especially when they have no internet access.
I do frequently catch up on my mail on flights or while otherwise
travelling so this is even more pressing for me than just being about
making things a bit easier to read.

> Anyone,

> What is the exact difference between 'depends on' and 'selects'. This
> is a question I try
> to clarify for myself for a while. And most important when to use one
> or another?

depends on says "this configuration can't be enabled without X already
being enabled".  select says "force X on" but ignores any dependencies
that X itself has so the thing doing the selecting has to figure those
out.  select is mainly for enabling library type things that users
shouldn't have to deal with directly either because they are libraries
or because they're just not independently useful somehow.
Pierre-Louis Bossart April 23, 2020, 4:25 p.m. UTC | #3
On 4/23/20 9:28 AM, Mark Brown wrote:
> This broke PowerPC allyesconfig.
> 
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Mark Brown <broonie@kernel.org>
> ---
>   sound/soc/sof/imx/Kconfig | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/sound/soc/sof/imx/Kconfig b/sound/soc/sof/imx/Kconfig
> index 5e0c68b12292..9a5ed1860e4e 100644
> --- a/sound/soc/sof/imx/Kconfig
> +++ b/sound/soc/sof/imx/Kconfig
> @@ -21,6 +21,7 @@ config SND_SOC_SOF_IMX_OF
>   
>   config SND_SOC_SOF_IMX8_SUPPORT
>   	bool "SOF support for i.MX8"
> +	depends on IMX_SCU

this works, but there is another issue with IMX_MBOX that's a mandatory 
dependency for IMX_DSP, so another risk of unmet dependency

I can send the additional fix on top of this one or a combined fix, your 
call Mark.
Mark Brown April 23, 2020, 4:27 p.m. UTC | #4
On Thu, 23 Apr 2020 15:28:05 +0100, Mark Brown wrote:
> This broke PowerPC allyesconfig.
> 
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Mark Brown <broonie@kernel.org>
> ---
>  sound/soc/sof/imx/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.8

Thanks!

[1/1] ASoC: SOF: Add missing dependency on IMX_SCU
      commit: fe57a92c88580ae7894b9c71d2d520ba98eb1591

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
Mark Brown April 23, 2020, 4:34 p.m. UTC | #5
On Thu, Apr 23, 2020 at 11:25:41AM -0500, Pierre-Louis Bossart wrote:
> On 4/23/20 9:28 AM, Mark Brown wrote:

> >   	bool "SOF support for i.MX8"
> > +	depends on IMX_SCU

> this works, but there is another issue with IMX_MBOX that's a mandatory
> dependency for IMX_DSP, so another risk of unmet dependency

> I can send the additional fix on top of this one or a combined fix, your
> call Mark.

Please send something incremental, like I said in the other thread this
was just a quick fix for the error Stephen reported to make sure there's
something there for tomorrow's -next.  A better/more comprehensive
replacement would definitely be good.
diff mbox series

Patch

diff --git a/sound/soc/sof/imx/Kconfig b/sound/soc/sof/imx/Kconfig
index 5e0c68b12292..9a5ed1860e4e 100644
--- a/sound/soc/sof/imx/Kconfig
+++ b/sound/soc/sof/imx/Kconfig
@@ -21,6 +21,7 @@  config SND_SOC_SOF_IMX_OF
 
 config SND_SOC_SOF_IMX8_SUPPORT
 	bool "SOF support for i.MX8"
+	depends on IMX_SCU
 	help
 	  This adds support for Sound Open Firmware for NXP i.MX8 platforms
 	  Say Y if you have such a device.