openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

microblaze: simplify pte_alloc_one_kernel() 

The microblaze's implementation of pte_alloc_one_kernel() used
memblock_alloc_try_nid_raw() along with clear_page() to allocated a zeroed
page during early setup.

Replace calls of these functions with a call to memblock_alloc_try_nid()
that already returns zeroed page and respects the same allocation limits
as memblock_alloc_try_nid_raw().

While on it drop early_get_page() wrapper that was only used in
pte_alloc_one_kernel().

Link: https://lkml.kernel.org/r/20210714123739.16493-3-rppt@kernel.org
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Cc: Michal Simek <monstr@monstr.eu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Mike Rapoport 2021-09-02 14:57:59 -07:00 committed by Linus Torvalds
parent c3ab6baf6a
commit 22e7878102
3 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/microblaze/include/asm/pgtable.h
View File

@ -443,8 +443,6 @@ extern int mem_init_done;
asmlinkage void __init mmu_init(void); asmlinkage void __init mmu_init(void);
void __init *early_get_page(void);
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */

12
arch/microblaze/mm/init.c
View File

@ -265,18 +265,6 @@ asmlinkage void __init mmu_init(void)
dma_contiguous_reserve(memory_start + lowmem_size - 1); dma_contiguous_reserve(memory_start + lowmem_size - 1);
} }
/* This is only called until mem_init is done. */
void __init *early_get_page(void)
{
/*
* Mem start + kernel_tlb -> here is limit
* because of mem mapping from head.S
*/
return memblock_alloc_try_nid_raw(PAGE_SIZE, PAGE_SIZE,
MEMBLOCK_LOW_LIMIT, memory_start + kernel_tlb,
NUMA_NO_NODE);
}
void * __ref zalloc_maybe_bootmem(size_t size, gfp_t mask) void * __ref zalloc_maybe_bootmem(size_t size, gfp_t mask)
{ {
void *p; void *p;

17
arch/microblaze/mm/pgtable.c
View File

@ -33,6 +33,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/mm_types.h> #include <linux/mm_types.h>
#include <linux/pgtable.h> #include <linux/pgtable.h>
#include <linux/memblock.h>
#include <asm/pgalloc.h> #include <asm/pgalloc.h>
#include <linux/io.h> #include <linux/io.h>
@ -242,15 +243,13 @@ unsigned long iopa(unsigned long addr)
__ref pte_t *pte_alloc_one_kernel(struct mm_struct *mm) __ref pte_t *pte_alloc_one_kernel(struct mm_struct *mm)
{ {
pte_t *pte; if (mem_init_done)
if (mem_init_done) { return (pte_t *)__get_free_page(GFP_KERNEL | __GFP_ZERO);
pte = (pte_t *)__get_free_page(GFP_KERNEL | __GFP_ZERO); else
} else { return memblock_alloc_try_nid(PAGE_SIZE, PAGE_SIZE,
pte = (pte_t *)early_get_page(); MEMBLOCK_LOW_LIMIT,
if (pte) memory_start + kernel_tlb,
clear_page(pte); NUMA_NO_NODE);
}
return pte;
} }
void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t flags) void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t flags)