Re: linux-next: build failure after merge of the scmi tree

From: Sudeep Holla
Date: Fri Oct 06 2023 - 02:52:04 EST


On Fri, Oct 06, 2023 at 10:39:29AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the scmi tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> In file included from drivers/tee/optee/ffa_abi.c:8:
> include/linux/arm_ffa.h: In function 'ffa_mem_desc_offset':
> include/linux/arm_ffa.h:105:10: error: implicit declaration of function 'FIELD_PREP' [-Werror=implicit-function-declaration]
> 105 | (FIELD_PREP(FFA_MAJOR_VERSION_MASK, (major)) | \
> | ^~~~~~~~~~
> include/linux/arm_ffa.h:107:33: note: in expansion of macro 'FFA_PACK_VERSION_INFO'
> 107 | #define FFA_VERSION_1_0 FFA_PACK_VERSION_INFO(1, 0)
> | ^~~~~~~~~~~~~~~~~~~~~
> include/linux/arm_ffa.h:368:28: note: in expansion of macro 'FFA_VERSION_1_0'
> 368 | if (ffa_version <= FFA_VERSION_1_0)
> | ^~~~~~~~~~~~~~~
>
> Exposed by commit
>
> 0624de756f75 ("firmware: arm_ffa: Update memory descriptor to support v1.1 format")
>
> This has been possible for a while, and arm_ffa.h needs to include
> linus/bitfoeld.h ...
>

Indeed.

> I have used the scmi tree from next-20231005 for today.
>

Thanks for the report, will fix it up.

> --
> Cheers,
> Stephen Rothwell



--
Regards,
Sudeep