On Mon, Apr 08, 2024 at 02:12:16PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> After merging the sound-asoc tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
Copying in Amadeusz and Cezary, this is from the recent AVS changes.
>
> In file included from include/linux/bits.h:22,
> from include/linux/gfp_types.h:5,
> from include/linux/gfp.h:5,
> from include/linux/slab.h:16,
> from sound/soc/intel/avs/icl.c:9:
> include/linux/build_bug.h:78:41: error: static assertion failed: "sizeof(struct avs_icl_memwnd2) == 65536"
> 78 | #define __static_assert(expr, msg, ...) _Static_assert(expr, msg)
> | ^~~~~~~~~~~~~~
> include/linux/build_bug.h:77:34: note: in expansion of macro '__static_assert'
> 77 | #define static_assert(expr, ...) __static_assert(expr, ##__VA_ARGS__, #expr)
> | ^~~~~~~~~~~~~~~
> sound/soc/intel/avs/icl.c:73:1: note: in expansion of macro 'static_assert'
> 73 | static_assert(sizeof(struct avs_icl_memwnd2) == 65536);
> | ^~~~~~~~~~~~~
>
> Caused by commit
>
> c2b10acb62c1 ("ASoC: Intel: avs: Add assert_static to guarantee ABI sizes")
>
> PAGE_SIZE is 64K for this build.
>
> I have applied this patch for today:
>
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Mon, 8 Apr 2024 13:50:53 +1000
> Subject: [PATCH] ASoC: Intel: avs: stop building when PAGE_SIZE == 64K
>
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> ---
> sound/soc/intel/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig
> index 4b9e498e3303..abe5cba82d50 100644
> --- a/sound/soc/intel/Kconfig
> +++ b/sound/soc/intel/Kconfig
> @@ -211,7 +211,7 @@ config SND_SOC_INTEL_KEEMBAY
>
> config SND_SOC_INTEL_AVS
> tristate "Intel AVS driver"
> - depends on X86 || COMPILE_TEST
> + depends on X86
> depends on PCI
> depends on COMMON_CLK
> select SND_SOC_ACPI if ACPI
> --
> 2.43.0
>
> --
> Cheers,
> Stephen Rothwell
Attachment:
signature.asc
Description: PGP signature
