lkml.org 
[lkml]   [2022]   [Nov]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: [PATCH] ARM: at91: fix build for SAMA5D3 w/o L2 cache
Date
On 12.11.2022 17:40, Peter Rosin wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> The L2 cache is present on the newer SAMA5D2 and SAMA5D4 families, but
> apparently not for the older SAMA5D3. At least not always.
>
> Solves a build-time regression with the following symptom:
>
> sama5.c:(.init.text+0x48): undefined reference to `outer_cache'
>
> Fixes: 3b5a7ca7d252 ("ARM: at91: setup outer cache .write_sec() callback if needed")
> Signed-off-by: Peter Rosin <peda@axentia.se>

Applied to at91-fixes, thanks!

> ---
> arch/arm/mach-at91/sama5.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> Hi!
>
> I'm not sure this is the correct solution? Maybe SAMA5D3 should bring
> in CONFIG_OUTER_CACHE unconditionally instead? But that seems like a
> bigger change, and not just a tweak of the regressing commit...
>
> Cheers,
> Peter
>
> diff --git a/arch/arm/mach-at91/sama5.c b/arch/arm/mach-at91/sama5.c
> index 67ed68fbe3a5..bf2b5c6a18c6 100644
> --- a/arch/arm/mach-at91/sama5.c
> +++ b/arch/arm/mach-at91/sama5.c
> @@ -26,7 +26,7 @@ static void sama5_l2c310_write_sec(unsigned long val, unsigned reg)
> static void __init sama5_secure_cache_init(void)
> {
> sam_secure_init();
> - if (sam_linux_is_optee_available())
> + if (IS_ENABLED(CONFIG_OUTER_CACHE) && sam_linux_is_optee_available())
> outer_cache.write_sec = sama5_l2c310_write_sec;
> }
>
> --
> 2.20.1
>

\
 
 \ /
  Last update: 2022-11-24 11:53    [W:0.168 / U:0.020 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site