On 17.05.23 11:03, Sascha Hauer wrote:
> Move create_flat_mapping() and create_sections() into the c file
> rather than having them as static inline functions in the header file.
>
> Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx>
Reviewed-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>
> ---
> arch/arm/cpu/mmu_32.c | 19 +++++++++++++++++++
> arch/arm/cpu/mmu_32.h | 20 --------------------
> 2 files changed, 19 insertions(+), 20 deletions(-)
>
> diff --git a/arch/arm/cpu/mmu_32.c b/arch/arm/cpu/mmu_32.c
> index 829139574c..0762bd55a3 100644
> --- a/arch/arm/cpu/mmu_32.c
> +++ b/arch/arm/cpu/mmu_32.c
> @@ -318,6 +318,25 @@ int arch_remap_range(void *start, size_t size, unsigned map_type)
> return 0;
> }
>
> +static void create_sections(uint32_t *ttb, unsigned long first,
> + unsigned long last, unsigned int flags)
> +{
> + unsigned long ttb_start = pgd_index(first);
> + unsigned long ttb_end = pgd_index(last) + 1;
> + unsigned int i, addr = first;
> +
> + for (i = ttb_start; i < ttb_end; i++) {
> + ttb[i] = addr | flags;
> + addr += PGDIR_SIZE;
> + }
> +}
> +
> +static void create_flat_mapping(uint32_t *ttb)
> +{
> + /* create a flat mapping using 1MiB sections */
> + create_sections(ttb, 0, 0xffffffff, attrs_uncached_mem());
> +}
> +
> void *map_io_sections(unsigned long phys, void *_start, size_t size)
> {
> unsigned long start = (unsigned long)_start, sec;
> diff --git a/arch/arm/cpu/mmu_32.h b/arch/arm/cpu/mmu_32.h
> index 1499b70dd6..607d9e8608 100644
> --- a/arch/arm/cpu/mmu_32.h
> +++ b/arch/arm/cpu/mmu_32.h
> @@ -56,20 +56,6 @@ static inline void set_domain(unsigned val)
> asm volatile ("mcr p15,0,%0,c3,c0,0" : : "r"(val) /*:*/);
> }
>
> -static inline void
> -create_sections(uint32_t *ttb, unsigned long first,
> - unsigned long last, unsigned int flags)
> -{
> - unsigned long ttb_start = pgd_index(first);
> - unsigned long ttb_end = pgd_index(last) + 1;
> - unsigned int i, addr = first;
> -
> - for (i = ttb_start; i < ttb_end; i++) {
> - ttb[i] = addr | flags;
> - addr += PGDIR_SIZE;
> - }
> -}
> -
> #define PMD_SECT_DEF_UNCACHED (PMD_SECT_AP_WRITE | PMD_SECT_AP_READ | PMD_TYPE_SECT)
> #define PMD_SECT_DEF_CACHED (PMD_SECT_WB | PMD_SECT_DEF_UNCACHED)
>
> @@ -83,10 +69,4 @@ static inline unsigned long attrs_uncached_mem(void)
> return flags;
> }
>
> -static inline void create_flat_mapping(uint32_t *ttb)
> -{
> - /* create a flat mapping using 1MiB sections */
> - create_sections(ttb, 0, 0xffffffff, attrs_uncached_mem());
> -}
> -
> #endif /* __ARM_MMU_H */
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
