Hi all,

After merging the sound-asoc tree, today's linux-next build (powerpc
allyesconfig) failed like this:

sound/soc/intel/avs/path.c: In function 'avs_copier_create':
sound/soc/intel/avs/path.c:186:31: error: invalid use of undefined type 'struct nhlt_specific_cfg'
  186 |                 data = ep_blob->caps;
      |                               ^~
sound/soc/intel/avs/path.c:187:36: error: invalid use of undefined type 'struct nhlt_specific_cfg'
  187 |                 data_size = ep_blob->size;
      |                                    ^~
sound/soc/intel/avs/path.c:210:31: error: invalid use of undefined type 'struct nhlt_specific_cfg'
  210 |                 data = ep_blob->caps;
      |                               ^~
sound/soc/intel/avs/path.c:211:36: error: invalid use of undefined type 'struct nhlt_specific_cfg'
  211 |                 data_size = ep_blob->size;
      |                                    ^~

Caused by commit

  274d79e51875 ("ASoC: Intel: avs: Configure modules according to their type")

I have applied the following patch for today:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 26 Apr 2022 17:49:37 +1000
Subject: [PATCH] fixup for "ASoC: Intel: avs: Configure modules according to their type"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 sound/soc/intel/avs/path.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sound/soc/intel/avs/path.c b/sound/soc/intel/avs/path.c
index 3d46dd5e5bc4..6f47ac44de87 100644
--- a/sound/soc/intel/avs/path.c
+++ b/sound/soc/intel/avs/path.c
@@ -9,6 +9,7 @@
 #include <sound/intel-nhlt.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
+#include <sound/intel-nhlt.h>
 #include "avs.h"
 #include "path.h"
 #include "topology.h"
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

On 4/26/2022 10:30 AM, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the sound-asoc tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> sound/soc/intel/avs/path.c: In function 'avs_copier_create':
> sound/soc/intel/avs/path.c:186:31: error: invalid use of undefined type 'struct nhlt_specific_cfg'
>    186 |                 data = ep_blob->caps;
>        |                               ^~
> sound/soc/intel/avs/path.c:187:36: error: invalid use of undefined type 'struct nhlt_specific_cfg'
>    187 |                 data_size = ep_blob->size;
>        |                                    ^~
> sound/soc/intel/avs/path.c:210:31: error: invalid use of undefined type 'struct nhlt_specific_cfg'
>    210 |                 data = ep_blob->caps;
>        |                               ^~
> sound/soc/intel/avs/path.c:211:36: error: invalid use of undefined type 'struct nhlt_specific_cfg'
>    211 |                 data_size = ep_blob->size;
>        |                                    ^~
> 
> Caused by commit
> 
>    274d79e51875 ("ASoC: Intel: avs: Configure modules according to their type")
> 
> I have applied the following patch for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 26 Apr 2022 17:49:37 +1000
> Subject: [PATCH] fixup for "ASoC: Intel: avs: Configure modules according to their type"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>   sound/soc/intel/avs/path.c | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/sound/soc/intel/avs/path.c b/sound/soc/intel/avs/path.c
> index 3d46dd5e5bc4..6f47ac44de87 100644
> --- a/sound/soc/intel/avs/path.c
> +++ b/sound/soc/intel/avs/path.c
> @@ -9,6 +9,7 @@
>   #include <sound/intel-nhlt.h>
>   #include <sound/pcm_params.h>
>   #include <sound/soc.h>
> +#include <sound/intel-nhlt.h>

This fix seems weird, as same include is 3 lines earlier?

>   #include "avs.h"
>   #include "path.h"
>   #include "topology.h"

Hi Amadeusz,

On Tue, 26 Apr 2022 11:01:18 +0200 Amadeusz Sławiński         <amadeuszx.slawinski@linux.intel.com> wrote:
>
> > I have applied the following patch for today:
> > 
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Tue, 26 Apr 2022 17:49:37 +1000
> > Subject: [PATCH] fixup for "ASoC: Intel: avs: Configure modules according to their type"
> > 
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >   sound/soc/intel/avs/path.c | 1 +
> >   1 file changed, 1 insertion(+)
> > 
> > diff --git a/sound/soc/intel/avs/path.c b/sound/soc/intel/avs/path.c
> > index 3d46dd5e5bc4..6f47ac44de87 100644
> > --- a/sound/soc/intel/avs/path.c
> > +++ b/sound/soc/intel/avs/path.c
> > @@ -9,6 +9,7 @@
> >   #include <sound/intel-nhlt.h>
> >   #include <sound/pcm_params.h>
> >   #include <sound/soc.h>
> > +#include <sound/intel-nhlt.h>  
> 
> This fix seems weird, as same include is 3 lines earlier?

Right.  I applied this at the same time as the previous fix which
probably stopped this file from being built.  The real problem is that
the structure is not defined for !CONFIG_ACPI.

So this fix is not needed.

Sorry for the noise.
-- 
Cheers,
Stephen Rothwell