Commit 3194ac6e authored by David Daney's avatar David Daney Committed by Will Deacon
Browse files

arm64: Move unflatten_device_tree() call earlier. 



In order to extract NUMA information from the device tree, we need to
have the tree in its unflattened form.

Move the call to bootmem_init() in the tail of paging_init() into
setup_arch, and adjust header files so that its declaration is
visible.

Move the unflatten_device_tree() call between the calls to
paging_init() and bootmem_init().  Follow on patches add NUMA handling
to bootmem_init().

Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 298535c0

arch/arm64/include/asm/mmu.h

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ typedef struct { 
#define ASID(mm)	((mm)->context.id.counter & 0xffff)



extern void paging_init(void);

extern void bootmem_init(void);

extern void __iomem *early_io_map(phys_addr_t phys, unsigned long virt);

extern void init_mem_pgprot(void);

extern void create_pgd_mapping(struct mm_struct *mm, phys_addr_t phys,

arch/arm64/kernel/setup.c

+8 −4
Original line number Diff line number Diff line
@@ -265,18 +265,22 @@ void __init setup_arch(char **cmdline_p) 


	paging_init();



	if (acpi_disabled)

		unflatten_device_tree();



	bootmem_init();



	kasan_init();



	request_standard_resources();



	early_ioremap_reset();



	if (acpi_disabled) {

		unflatten_device_tree();

	if (acpi_disabled)

		psci_dt_init();

	} else {

	else

		psci_acpi_init();

	}



	xen_early_init();



	cpu_read_bootcpu_ops();

arch/arm64/mm/mm.h

+0 −1
Original line number Diff line number Diff line 
extern void __init bootmem_init(void);



void fixup_init(void);

arch/arm64/mm/mmu.c

+0 −2
Original line number Diff line number Diff line
@@ -564,8 +564,6 @@ void __init paging_init(void) 
	 */

	memblock_free(__pa(swapper_pg_dir) + PAGE_SIZE,

		      SWAPPER_DIR_SIZE - PAGE_SIZE);



	bootmem_init();

}



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE