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

Commit 7cd9b317 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/mm: make ioremap_bot common to all 



Drop multiple definitions of ioremap_bot and make one common to
all subarches.

Only CONFIG_PPC_BOOK3E_64 had a global static init value for
ioremap_bot. Now ioremap_bot is set in early_init_mmu_global().

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/920eebfd9f36f14c79d1755847f5bf7c83703bdd.1566309262.git.christophe.leroy@c-s.fr
parent edfe1a56

arch/powerpc/include/asm/book3s/32/pgtable.h

+0 −2
Original line number Diff line number Diff line
@@ -201,8 +201,6 @@ int map_kernel_page(unsigned long va, phys_addr_t pa, pgprot_t prot); 
#include <linux/sched.h>

#include <linux/threads.h>



extern unsigned long ioremap_bot;



/* Bits to mask out from a PGD to get to the PUD page */

#define PGD_MASKED_BITS		0

arch/powerpc/include/asm/book3s/64/pgtable.h

+0 −1
Original line number Diff line number Diff line
@@ -289,7 +289,6 @@ extern unsigned long __kernel_io_end; 
#define KERN_IO_END __kernel_io_end



extern struct page *vmemmap;

extern unsigned long ioremap_bot;

extern unsigned long pci_io_base;

#endif /* __ASSEMBLY__ */

arch/powerpc/include/asm/nohash/32/pgtable.h

+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ 
#include <asm/mmu.h>			/* For sub-arch specific PPC_PIN_SIZE */

#include <asm/asm-405.h>



extern unsigned long ioremap_bot;



#ifdef CONFIG_44x

extern int icache_44x_need_flush;

#endif

arch/powerpc/include/asm/pgtable.h

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ extern pgd_t swapper_pg_dir[]; 


extern void paging_init(void);



extern unsigned long ioremap_bot;



/*

 * kern_addr_valid is intended to indicate whether an address is a valid

 * kernel address.  Most 32-bit archs define it as always true (like this)

arch/powerpc/mm/ioremap.c

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ 
#include <linux/io.h>

#include <asm/io-workarounds.h>



unsigned long ioremap_bot;

EXPORT_SYMBOL(ioremap_bot);



void __iomem *ioremap(phys_addr_t addr, unsigned long size)

{

	pgprot_t prot = pgprot_noncached(PAGE_KERNEL);