2023-05-16 15:52:04

by Arnd Bergmann

Subject: [PATCH 06/16] ARM: tcm: move tcm_init() prototype to asm/tcm.h

From: Arnd Bergmann <[email protected]>

The function definition is in a file that does not include the
header with the declaration:

arch/arm/kernel/tcm.c:256:13: error: no previous prototype for 'tcm_init'

Move the declaration to a global header where it can actually be
included.

Fixes: de40614e92bf ("ARM: 7694/1: ARM, TCM: initialize TCM in paging_init(), instead of setup_arch()")
Signed-off-by: Arnd Bergmann <[email protected]>
---
arch/arm/include/asm/tcm.h | 11 ++++++++---
arch/arm/mm/mmu.c | 2 +-
arch/arm/mm/tcm.h | 17 -----------------
3 files changed, 9 insertions(+), 21 deletions(-)
delete mode 100644 arch/arm/mm/tcm.h

diff --git a/arch/arm/include/asm/tcm.h b/arch/arm/include/asm/tcm.h
index d8bd8a4b0ede..e1f7dca86a22 100644
--- a/arch/arm/include/asm/tcm.h
+++ b/arch/arm/include/asm/tcm.h
@@ -9,9 +9,7 @@
#ifndef __ASMARM_TCM_H
#define __ASMARM_TCM_H

-#ifndef CONFIG_HAVE_TCM
-#error "You should not be including tcm.h unless you have a TCM!"
-#endif
+#ifdef CONFIG_HAVE_TCM

#include <linux/compiler.h>

@@ -29,4 +27,11 @@ void tcm_free(void *addr, size_t len);
bool tcm_dtcm_present(void);
bool tcm_itcm_present(void);

+void __init tcm_init(void);
+#else
+/* No TCM support, just blank inlines to be optimized out */
+static inline void tcm_init(void)
+{
+}
+#endif
#endif
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 463fc2a8448f..f3a52c08a200 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -21,6 +21,7 @@
#include <asm/sections.h>
#include <asm/setup.h>
#include <asm/smp_plat.h>
+#include <asm/tcm.h>
#include <asm/tlb.h>
#include <asm/highmem.h>
#include <asm/system_info.h>
@@ -37,7 +38,6 @@

#include "fault.h"
#include "mm.h"
-#include "tcm.h"

extern unsigned long __atags_pointer;

diff --git a/arch/arm/mm/tcm.h b/arch/arm/mm/tcm.h
deleted file mode 100644
index 6b80a760d875..000000000000
--- a/arch/arm/mm/tcm.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (C) 2008-2009 ST-Ericsson AB
- * TCM memory handling for ARM systems
- *
- * Author: Linus Walleij <[email protected]>
- * Author: Rickard Andersson <[email protected]>
- */
-
-#ifdef CONFIG_HAVE_TCM
-void __init tcm_init(void);
-#else
-/* No TCM support, just blank inlines to be optimized out */
-static inline void tcm_init(void)
-{
-}
-#endif
--
2.39.2

2023-05-22 07:51:28

by Linus Walleij

Subject: Re: [PATCH 06/16] ARM: tcm: move tcm_init() prototype to asm/tcm.h

On Tue, May 16, 2023 at 5:46 PM Arnd Bergmann <[email protected]> wrote:

> From: Arnd Bergmann <[email protected]>
>
> The function definition is in a file that does not include the
> header with the declaration:
>
> arch/arm/kernel/tcm.c:256:13: error: no previous prototype for 'tcm_init'
>
> Move the declaration to a global header where it can actually be
> included.
>
> Fixes: de40614e92bf ("ARM: 7694/1: ARM, TCM: initialize TCM in paging_init(), instead of setup_arch()")
> Signed-off-by: Arnd Bergmann <[email protected]>

Reviewed-by: Linus Walleij <[email protected]>

Yours,
Linus Walleij