Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f1e9e94 authored by Anup Patel's avatar Anup Patel Committed by Anup Patel
Browse files

RISC-V: Move setup_vm() to mm/init.c 



The setup_vm() is responsible for setting up initial page table hence
should be placed in mm/init.c.

Signed-off-by: default avatarAnup Patel <anup.patel@wdc.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarPalmer Dabbelt <palmer@sifive.com>
parent 0651c263

arch/riscv/kernel/setup.c

+0 −49
Original line number Diff line number Diff line
@@ -69,55 +69,6 @@ void __init smp_setup_processor_id(void) 
	cpuid_to_hartid_map(0) = boot_cpu_hartid;

}



pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_bss;

pgd_t trampoline_pg_dir[PTRS_PER_PGD] __initdata __aligned(PAGE_SIZE);



#ifndef __PAGETABLE_PMD_FOLDED

#define NUM_SWAPPER_PMDS ((uintptr_t)-PAGE_OFFSET >> PGDIR_SHIFT)

pmd_t swapper_pmd[PTRS_PER_PMD*((-PAGE_OFFSET)/PGDIR_SIZE)] __page_aligned_bss;

pmd_t trampoline_pmd[PTRS_PER_PGD] __initdata __aligned(PAGE_SIZE);

#endif



asmlinkage void __init setup_vm(void)

{

	extern char _start;

	uintptr_t i;

	uintptr_t pa = (uintptr_t) &_start;

	pgprot_t prot = __pgprot(pgprot_val(PAGE_KERNEL) | _PAGE_EXEC);



	va_pa_offset = PAGE_OFFSET - pa;

	pfn_base = PFN_DOWN(pa);



	/* Sanity check alignment and size */

	BUG_ON((PAGE_OFFSET % PGDIR_SIZE) != 0);

	BUG_ON((pa % (PAGE_SIZE * PTRS_PER_PTE)) != 0);



#ifndef __PAGETABLE_PMD_FOLDED

	trampoline_pg_dir[(PAGE_OFFSET >> PGDIR_SHIFT) % PTRS_PER_PGD] =

		pfn_pgd(PFN_DOWN((uintptr_t)trampoline_pmd),

			__pgprot(_PAGE_TABLE));

	trampoline_pmd[0] = pfn_pmd(PFN_DOWN(pa), prot);



	for (i = 0; i < (-PAGE_OFFSET)/PGDIR_SIZE; ++i) {

		size_t o = (PAGE_OFFSET >> PGDIR_SHIFT) % PTRS_PER_PGD + i;

		swapper_pg_dir[o] =

			pfn_pgd(PFN_DOWN((uintptr_t)swapper_pmd) + i,

				__pgprot(_PAGE_TABLE));

	}

	for (i = 0; i < ARRAY_SIZE(swapper_pmd); i++)

		swapper_pmd[i] = pfn_pmd(PFN_DOWN(pa + i * PMD_SIZE), prot);

#else

	trampoline_pg_dir[(PAGE_OFFSET >> PGDIR_SHIFT) % PTRS_PER_PGD] =

		pfn_pgd(PFN_DOWN(pa), prot);



	for (i = 0; i < (-PAGE_OFFSET)/PGDIR_SIZE; ++i) {

		size_t o = (PAGE_OFFSET >> PGDIR_SHIFT) % PTRS_PER_PGD + i;

		swapper_pg_dir[o] =

			pfn_pgd(PFN_DOWN(pa + i * PGDIR_SIZE), prot);

	}

#endif

}



void __init parse_dtb(unsigned int hartid, void *dtb)

{

	if (!early_init_dt_scan(__va(dtb)))

arch/riscv/mm/init.c

+49 −0
Original line number Diff line number Diff line
@@ -140,3 +140,52 @@ void __init setup_bootmem(void) 
				  &memblock.memory, 0);

	}

}



pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_bss;

pgd_t trampoline_pg_dir[PTRS_PER_PGD] __initdata __aligned(PAGE_SIZE);



#ifndef __PAGETABLE_PMD_FOLDED

#define NUM_SWAPPER_PMDS ((uintptr_t)-PAGE_OFFSET >> PGDIR_SHIFT)

pmd_t swapper_pmd[PTRS_PER_PMD*((-PAGE_OFFSET)/PGDIR_SIZE)] __page_aligned_bss;

pmd_t trampoline_pmd[PTRS_PER_PGD] __initdata __aligned(PAGE_SIZE);

#endif



asmlinkage void __init setup_vm(void)

{

	extern char _start;

	uintptr_t i;

	uintptr_t pa = (uintptr_t) &_start;

	pgprot_t prot = __pgprot(pgprot_val(PAGE_KERNEL) | _PAGE_EXEC);



	va_pa_offset = PAGE_OFFSET - pa;

	pfn_base = PFN_DOWN(pa);



	/* Sanity check alignment and size */

	BUG_ON((PAGE_OFFSET % PGDIR_SIZE) != 0);

	BUG_ON((pa % (PAGE_SIZE * PTRS_PER_PTE)) != 0);



#ifndef __PAGETABLE_PMD_FOLDED

	trampoline_pg_dir[(PAGE_OFFSET >> PGDIR_SHIFT) % PTRS_PER_PGD] =

		pfn_pgd(PFN_DOWN((uintptr_t)trampoline_pmd),

			__pgprot(_PAGE_TABLE));

	trampoline_pmd[0] = pfn_pmd(PFN_DOWN(pa), prot);



	for (i = 0; i < (-PAGE_OFFSET)/PGDIR_SIZE; ++i) {

		size_t o = (PAGE_OFFSET >> PGDIR_SHIFT) % PTRS_PER_PGD + i;

		swapper_pg_dir[o] =

			pfn_pgd(PFN_DOWN((uintptr_t)swapper_pmd) + i,

				__pgprot(_PAGE_TABLE));

	}

	for (i = 0; i < ARRAY_SIZE(swapper_pmd); i++)

		swapper_pmd[i] = pfn_pmd(PFN_DOWN(pa + i * PMD_SIZE), prot);

#else

	trampoline_pg_dir[(PAGE_OFFSET >> PGDIR_SHIFT) % PTRS_PER_PGD] =

		pfn_pgd(PFN_DOWN(pa), prot);



	for (i = 0; i < (-PAGE_OFFSET)/PGDIR_SIZE; ++i) {

		size_t o = (PAGE_OFFSET >> PGDIR_SHIFT) % PTRS_PER_PGD + i;

		swapper_pg_dir[o] =

			pfn_pgd(PFN_DOWN(pa + i * PGDIR_SIZE), prot);

	}

#endif

}