ARM: 7694/1: ARM, TCM: initialize TCM in paging_init(), instead of setup_arch() (de40614e) · Commits · 戴 / test

tcm_init() call iotable_init() and it use early_alloc variants which do memblock allocation. Directly using memblock allocation after initializing bootmem should not permitted, because bootmem can't know where are additinally reserved. So move tcm_init() to a safe place before initalizing bootmem. (On the U300) Tested-by:

Linus Walleij <linus.walleij@linaro.org> Signed-off-by:

Joonsoo Kim <iamjoonsoo.kim@lge.com> Signed-off-by:

Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/kernel/setup.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -56,7 +56,6 @@
		#include <asm/virt.h>

		#include "atags.h"
		#include "tcm.h"


		#if defined(CONFIG_FPE_NWFPE) \|\| defined(CONFIG_FPE_FASTFPE)
		@@ -798,8 +797,6 @@ void __init setup_arch(char **cmdline_p)

		reserve_crashkernel();

		tcm_init();

		#ifdef CONFIG_MULTI_IRQ_HANDLER
		handle_arch_irq = mdesc->handle_irq;
		#endif

arch/arm/kernel/tcm.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		#include <asm/mach/map.h>
		#include <asm/memory.h>
		#include <asm/system_info.h>
		#include "tcm.h"

		static struct gen_pool *tcm_pool;
		static bool dtcm_present;

arch/arm/mm/mmu.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@
		#include <asm/mach/pci.h>

		#include "mm.h"
		#include "tcm.h"

		/*
		* empty_zero_page is a special page that is used for
		@@ -1277,6 +1278,7 @@ void __init paging_init(struct machine_desc *mdesc)
		dma_contiguous_remap();
		devicemaps_init(mdesc);
		kmap_init();
		tcm_init();

		top_pmd = pmd_off_k(0xffff0000);

arch/arm/kernel/tcm.h→arch/arm/mm/tcm.h

+0 −0

File moved.

View file

Admin message