* Build failure after merge of the sound-current
@ 2019-09-17 10:38 Mark Brown
2019-09-17 19:57 ` Mark Brown
2019-09-17 20:56 ` [alsa-devel] " Pierre-Louis Bossart
0 siblings, 2 replies; 6+ messages in thread
From: Mark Brown @ 2019-09-17 10:38 UTC (permalink / raw)
To: Takashi Iwai, Jaroslav Kysela, Mac Chiang, Pierre-Louis Bossart
Cc: alsa-devel, linux-next, linux-kernel, Liam Girdwood
[-- Attachment #1: Type: text/plain, Size: 4647 bytes --]
After merging the sound-current tree, today's linux-next build for x86
allmodconfig failed like this:
In file included from /home/broonie/next/next/sound/soc/intel/boards/sof_rt5682.c:23:
/home/broonie/next/next/sound/soc/intel/boards/../common/soc-intel-quirks.h: In function 'soc_intel_is_cml':
/home/broonie/next/next/sound/soc/intel/boards/../common/soc-intel-quirks.h:39:23: error: 'INTEL_FAM6_KABYLAKE_MOBILE' undeclared (first use in this function); did you mean 'INTEL_FAM6_KABYLAKE_L'?
SOC_INTEL_IS_CPU(cml, INTEL_FAM6_KABYLAKE_MOBILE);
^~~~~~~~~~~~~~~~~~~~~~~~~~
/home/broonie/next/next/sound/soc/intel/boards/../common/soc-intel-quirks.h:18:44: note: in definition of macro 'ICPU'
#define ICPU(model) { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, }
^~~~~
/home/broonie/next/next/sound/soc/intel/boards/../common/soc-intel-quirks.h:39:1: note: in expansion of macro 'SOC_INTEL_IS_CPU'
SOC_INTEL_IS_CPU(cml, INTEL_FAM6_KABYLAKE_MOBILE);
^~~~~~~~~~~~~~~~
/home/broonie/next/next/sound/soc/intel/boards/../common/soc-intel-quirks.h:39:23: note: each undeclared identifier is reported only once for each function it appears in
SOC_INTEL_IS_CPU(cml, INTEL_FAM6_KABYLAKE_MOBILE);
^~~~~~~~~~~~~~~~~~~~~~~~~~
/home/broonie/next/next/sound/soc/intel/boards/../common/soc-intel-quirks.h:18:44: note: in definition of macro 'ICPU'
#define ICPU(model) { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, }
^~~~~
/home/broonie/next/next/sound/soc/intel/boards/../common/soc-intel-quirks.h:39:1: note: in expansion of macro 'SOC_INTEL_IS_CPU'
SOC_INTEL_IS_CPU(cml, INTEL_FAM6_KABYLAKE_MOBILE);
^~~~~~~~~~~~~~~~
make[5]: *** [/home/broonie/next/next/scripts/Makefile.build:281: sound/soc/intel/boards/sof_rt5682.o] Error 1
make[4]: *** [/home/broonie/next/next/scripts/Makefile.build:497: sound/soc/intel/boards] Error 2
make[4]: *** Waiting for unfinished jobs....
In file included from /home/broonie/next/next/sound/soc/intel/atom/sst/sst_acpi.c:35:
/home/broonie/next/next/sound/soc/intel/atom/sst/../../common/soc-intel-quirks.h: In function 'soc_intel_is_cml':
/home/broonie/next/next/sound/soc/intel/atom/sst/../../common/soc-intel-quirks.h:39:23: error: 'INTEL_FAM6_KABYLAKE_MOBILE' undeclared (first use in this function); did you mean 'INTEL_FAM6_KABYLAKE_L'?
SOC_INTEL_IS_CPU(cml, INTEL_FAM6_KABYLAKE_MOBILE);
^~~~~~~~~~~~~~~~~~~~~~~~~~
/home/broonie/next/next/sound/soc/intel/atom/sst/../../common/soc-intel-quirks.h:18:44: note: in definition of macro 'ICPU'
#define ICPU(model) { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, }
^~~~~
/home/broonie/next/next/sound/soc/intel/atom/sst/../../common/soc-intel-quirks.h:39:1: note: in expansion of macro 'SOC_INTEL_IS_CPU'
SOC_INTEL_IS_CPU(cml, INTEL_FAM6_KABYLAKE_MOBILE);
^~~~~~~~~~~~~~~~
/home/broonie/next/next/sound/soc/intel/atom/sst/../../common/soc-intel-quirks.h:39:23: note: each undeclared identifier is reported only once for each function it appears in
SOC_INTEL_IS_CPU(cml, INTEL_FAM6_KABYLAKE_MOBILE);
^~~~~~~~~~~~~~~~~~~~~~~~~~
/home/broonie/next/next/sound/soc/intel/atom/sst/../../common/soc-intel-quirks.h:18:44: note: in definition of macro 'ICPU'
#define ICPU(model) { X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, }
^~~~~
/home/broonie/next/next/sound/soc/intel/atom/sst/../../common/soc-intel-quirks.h:39:1: note: in expansion of macro 'SOC_INTEL_IS_CPU'
SOC_INTEL_IS_CPU(cml, INTEL_FAM6_KABYLAKE_MOBILE);
^~~~~~~~~~~~~~~~
make[6]: *** [/home/broonie/next/next/scripts/Makefile.build:281: sound/soc/intel/atom/sst/sst_acpi.o] Error 1
make[5]: *** [/home/broonie/next/next/scripts/Makefile.build:497: sound/soc/intel/atom/sst] Error 2
make[4]: *** [/home/broonie/next/next/scripts/Makefile.build:497: sound/soc/intel/atom] Error 2
make[3]: *** [/home/broonie/next/next/scripts/Makefile.build:497: sound/soc/intel] Error 2
make[3]: *** Waiting for unfinished jobs....
make[2]: *** [/home/broonie/next/next/scripts/Makefile.build:497: sound/soc] Error 2
make[1]: *** [/home/broonie/next/next/Makefile:1087: sound] Error 2
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:179: sub-make] Error 2
Command exited with non-zero status 2
caused by commit
c643c189f0fec116 (ASoC: Intel: boards: Add Cometlake machine driver support)
IIRC there was some previous discussion of a dependency on other changes
here but I thought that was resolved? I've reverted that commit for
today.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: Build failure after merge of the sound-current
2019-09-17 10:38 Build failure after merge of the sound-current Mark Brown
@ 2019-09-17 19:57 ` Mark Brown
2019-09-17 20:56 ` Takashi Iwai
2019-09-17 20:56 ` [alsa-devel] " Pierre-Louis Bossart
1 sibling, 1 reply; 6+ messages in thread
From: Mark Brown @ 2019-09-17 19:57 UTC (permalink / raw)
To: Takashi Iwai, Jaroslav Kysela, Mac Chiang, Pierre-Louis Bossart
Cc: alsa-devel, linux-next, linux-kernel, Liam Girdwood
[-- Attachment #1: Type: text/plain, Size: 406 bytes --]
On Tue, Sep 17, 2019 at 11:38:58AM +0100, Mark Brown wrote:
> IIRC there was some previous discussion of a dependency on other changes
> here but I thought that was resolved? I've reverted that commit for
> today.
This wasn't resolved, Stephen's been carrying a patch for it in -next.
I didn't see this mentioned in the pull request for sound to Linus...
might be an issue if it gets pulled before tip.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Build failure after merge of the sound-current
2019-09-17 19:57 ` Mark Brown
@ 2019-09-17 20:56 ` Takashi Iwai
0 siblings, 0 replies; 6+ messages in thread
From: Takashi Iwai @ 2019-09-17 20:56 UTC (permalink / raw)
To: Mark Brown
Cc: Jaroslav Kysela, Mac Chiang, Pierre-Louis Bossart, alsa-devel,
linux-next, linux-kernel, Liam Girdwood
On Tue, 17 Sep 2019 21:57:23 +0200,
Mark Brown wrote:
>
> On Tue, Sep 17, 2019 at 11:38:58AM +0100, Mark Brown wrote:
>
> > IIRC there was some previous discussion of a dependency on other changes
> > here but I thought that was resolved? I've reverted that commit for
> > today.
>
> This wasn't resolved, Stephen's been carrying a patch for it in -next.
> I didn't see this mentioned in the pull request for sound to Linus...
> might be an issue if it gets pulled before tip.
Hm, strange, I couldn't get the warning when I tested allyesconfig on
the tree merged onto 5.3...
Takashi
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [alsa-devel] Build failure after merge of the sound-current
2019-09-17 10:38 Build failure after merge of the sound-current Mark Brown
2019-09-17 19:57 ` Mark Brown
@ 2019-09-17 20:56 ` Pierre-Louis Bossart
2019-09-17 21:02 ` Takashi Iwai
1 sibling, 1 reply; 6+ messages in thread
From: Pierre-Louis Bossart @ 2019-09-17 20:56 UTC (permalink / raw)
To: Mark Brown, Takashi Iwai, Jaroslav Kysela, Mac Chiang
Cc: alsa-devel, linux-next, linux-kernel, Liam Girdwood
On 9/17/19 5:38 AM, Mark Brown wrote:
> After merging the sound-current tree, today's linux-next build for x86
> allmodconfig failed like this:
>
> In file included from /home/broonie/next/next/sound/soc/intel/boards/sof_rt5682.c:23:
> /home/broonie/next/next/sound/soc/intel/boards/../common/soc-intel-quirks.h: In function 'soc_intel_is_cml':
> /home/broonie/next/next/sound/soc/intel/boards/../common/soc-intel-quirks.h:39:23: error: 'INTEL_FAM6_KABYLAKE_MOBILE' undeclared (first use in this function); did you mean 'INTEL_FAM6_KABYLAKE_L'?
> SOC_INTEL_IS_CPU(cml, INTEL_FAM6_KABYLAKE_MOBILE);
> caused by commit
>
> c643c189f0fec116 (ASoC: Intel: boards: Add Cometlake machine driver support)
>
> IIRC there was some previous discussion of a dependency on other changes
> here but I thought that was resolved? I've reverted that commit for
> today.
Seems like a conflict with
af239c44e3f97 ('x86/intel: Aggregate big core mobile naming')
maybe we can have a temporary fix in the ASoC tree along the lines of
#ifdef INTEL_FAM6_KABYLAKE_L
#define INTEL_FAM6_KABYLAKE_MOBILE INTEL_FAM6_KABYLAKE_L
#endif
and remove it when the initial patch is in an rc1?
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [alsa-devel] Build failure after merge of the sound-current
2019-09-17 20:56 ` [alsa-devel] " Pierre-Louis Bossart
@ 2019-09-17 21:02 ` Takashi Iwai
2019-09-17 21:09 ` Mark Brown
0 siblings, 1 reply; 6+ messages in thread
From: Takashi Iwai @ 2019-09-17 21:02 UTC (permalink / raw)
To: Pierre-Louis Bossart
Cc: Mark Brown, Jaroslav Kysela, Mac Chiang, alsa-devel, linux-next,
linux-kernel, Liam Girdwood, Linus Torvalds
On Tue, 17 Sep 2019 22:56:55 +0200,
Pierre-Louis Bossart wrote:
>
>
>
> On 9/17/19 5:38 AM, Mark Brown wrote:
> > After merging the sound-current tree, today's linux-next build for x86
> > allmodconfig failed like this:
> >
> > In file included from /home/broonie/next/next/sound/soc/intel/boards/sof_rt5682.c:23:
> > /home/broonie/next/next/sound/soc/intel/boards/../common/soc-intel-quirks.h: In function 'soc_intel_is_cml':
> > /home/broonie/next/next/sound/soc/intel/boards/../common/soc-intel-quirks.h:39:23: error: 'INTEL_FAM6_KABYLAKE_MOBILE' undeclared (first use in this function); did you mean 'INTEL_FAM6_KABYLAKE_L'?
> > SOC_INTEL_IS_CPU(cml, INTEL_FAM6_KABYLAKE_MOBILE);
>
> > caused by commit
> >
> > c643c189f0fec116 (ASoC: Intel: boards: Add Cometlake machine driver support)
> >
> > IIRC there was some previous discussion of a dependency on other changes
> > here but I thought that was resolved? I've reverted that commit for
> > today.
>
> Seems like a conflict with
>
> af239c44e3f97 ('x86/intel: Aggregate big core mobile naming')
>
> maybe we can have a temporary fix in the ASoC tree along the lines of
>
> #ifdef INTEL_FAM6_KABYLAKE_L
> #define INTEL_FAM6_KABYLAKE_MOBILE INTEL_FAM6_KABYLAKE_L
> #endif
>
> and remove it when the initial patch is in an rc1?
Ah thanks, that's the piece I've missed. The conflict appears *after*
the merge with tip. I have tested only the merge result with Linus
tree, so it didn't appear in my build tests.
Putting Linus to Cc, so that he can see the possible conflicts
beforehand.
thanks,
Takashi
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [alsa-devel] Build failure after merge of the sound-current
2019-09-17 21:02 ` Takashi Iwai
@ 2019-09-17 21:09 ` Mark Brown
0 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2019-09-17 21:09 UTC (permalink / raw)
To: Takashi Iwai
Cc: Pierre-Louis Bossart, Jaroslav Kysela, Mac Chiang, alsa-devel,
linux-next, linux-kernel, Liam Girdwood, Linus Torvalds
[-- Attachment #1: Type: text/plain, Size: 1990 bytes --]
On Tue, Sep 17, 2019 at 11:02:07PM +0200, Takashi Iwai wrote:
> Pierre-Louis Bossart wrote:
> > Seems like a conflict with
> >
> > af239c44e3f97 ('x86/intel: Aggregate big core mobile naming')
> > maybe we can have a temporary fix in the ASoC tree along the lines of
> Ah thanks, that's the piece I've missed. The conflict appears *after*
> the merge with tip. I have tested only the merge result with Linus
> tree, so it didn't appear in my build tests.
> Putting Linus to Cc, so that he can see the possible conflicts
> beforehand.
FWIW -next has been carrying the patch below (it was added against the
tip tree so I didn't notice it when it blew up today after takashi moved
the merge window stuff so the new code appears earlier in the merge
process), sorry about that. I should start carrying it again tomorrow.
From 7e613e2a042c3cd7e3b69c11f52e046257ba5cbd Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 29 Aug 2019 16:08:49 +1000
Subject: [PATCH] ASoC: Intel: boards: merge fix for INTEL_FAM6_KABYLAKE_MOBILE
-> INTEL_FAM6_KABYLAKE_L change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Mark Brown <broonie@kerenl.org>
---
sound/soc/intel/common/soc-intel-quirks.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/intel/common/soc-intel-quirks.h b/sound/soc/intel/common/soc-intel-quirks.h
index e6357d306cb8..863a477d3405 100644
--- a/sound/soc/intel/common/soc-intel-quirks.h
+++ b/sound/soc/intel/common/soc-intel-quirks.h
@@ -36,7 +36,7 @@ SOC_INTEL_IS_CPU(byt, INTEL_FAM6_ATOM_SILVERMONT);
SOC_INTEL_IS_CPU(cht, INTEL_FAM6_ATOM_AIRMONT);
SOC_INTEL_IS_CPU(apl, INTEL_FAM6_ATOM_GOLDMONT);
SOC_INTEL_IS_CPU(glk, INTEL_FAM6_ATOM_GOLDMONT_PLUS);
-SOC_INTEL_IS_CPU(cml, INTEL_FAM6_KABYLAKE_MOBILE);
+SOC_INTEL_IS_CPU(cml, INTEL_FAM6_KABYLAKE_L);
static inline bool soc_intel_is_byt_cr(struct platform_device *pdev)
{
--
2.20.1
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-09-17 21:09 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-17 10:38 Build failure after merge of the sound-current Mark Brown
2019-09-17 19:57 ` Mark Brown
2019-09-17 20:56 ` Takashi Iwai
2019-09-17 20:56 ` [alsa-devel] " Pierre-Louis Bossart
2019-09-17 21:02 ` Takashi Iwai
2019-09-17 21:09 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).