On 2021/3/30 22:54, Marc Zyngier wrote: > #define SMCCC_ARCH_WORKAROUND_RET_UNAFFECTED 1 I think it'd be better to keep this definition together with other wa Function IDs. It's only a cosmetic comment anyway. Zenghui