Unverified Commit 805a3ebe authored by Jisheng Zhang's avatar Jisheng Zhang Committed by Palmer Dabbelt
Browse files

riscv: mm: init: try best to remove #ifdef CONFIG_XIP_KERNEL usage 



Currently, the #ifdef CONFIG_XIP_KERNEL usage can be divided into the
following three types:

The first one is for functions/declarations only used in XIP case.

The second one is for XIP_FIXUP case. Something as below:
|foo_type foo;
|#ifdef CONFIG_XIP_KERNEL
|#define foo    (*(foo_type *)XIP_FIXUP(&foo))
|#endif

Usually, it's better to let the foo macro sit with the foo var
together. But if various foos are defined adjacently, we can
save some #ifdef CONFIG_XIP_KERNEL usage by grouping them together.

The third one is for different implementations for XIP, usually, this
is a #ifdef...#else...#endif case.

This patch moves the pt_ops macro to adjacent #ifdef CONFIG_XIP_KERNEL
and group first type usage cases into one.

Signed-off-by: default avatarJisheng Zhang <jszhang@kernel.org>
Reviewed-by: default avatarAlexandre Ghiti <alex@ghiti.fr>
Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent fe036db7

arch/riscv/mm/init.c

+3 −8
Original line number Diff line number Diff line
@@ -40,10 +40,6 @@ EXPORT_SYMBOL(kernel_map); 
phys_addr_t phys_ram_base __ro_after_init;

EXPORT_SYMBOL(phys_ram_base);



#ifdef CONFIG_XIP_KERNEL

extern char _xiprom[], _exiprom[], __data_loc;

#endif



unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]

							__page_aligned_bss;

EXPORT_SYMBOL(empty_zero_page);
@@ -227,10 +223,6 @@ static void __init setup_bootmem(void) 
#ifdef CONFIG_MMU

static struct pt_alloc_ops pt_ops __initdata;



#ifdef CONFIG_XIP_KERNEL

#define pt_ops (*(struct pt_alloc_ops *)XIP_FIXUP(&pt_ops))

#endif



unsigned long riscv_pfn_base __ro_after_init;

EXPORT_SYMBOL(riscv_pfn_base);
@@ -242,6 +234,7 @@ pgd_t early_pg_dir[PTRS_PER_PGD] __initdata __aligned(PAGE_SIZE); 
static pmd_t __maybe_unused early_dtb_pmd[PTRS_PER_PMD] __initdata __aligned(PAGE_SIZE);



#ifdef CONFIG_XIP_KERNEL

#define pt_ops			(*(struct pt_alloc_ops *)XIP_FIXUP(&pt_ops))

#define trampoline_pg_dir      ((pgd_t *)XIP_FIXUP(trampoline_pg_dir))

#define fixmap_pte             ((pte_t *)XIP_FIXUP(fixmap_pte))

#define early_pg_dir           ((pgd_t *)XIP_FIXUP(early_pg_dir))
@@ -446,6 +439,8 @@ static uintptr_t __init best_map_size(phys_addr_t base, phys_addr_t size) 
}



#ifdef CONFIG_XIP_KERNEL

extern char _xiprom[], _exiprom[], __data_loc;



/* called from head.S with MMU off */

asmlinkage void __init __copy_data(void)

{