Commit 4a45b746 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/mm: refactor ioremap vm area setup. 



PPC32 and PPC64 are doing the same once SLAB is available.
Create a do_ioremap() function that calls get_vm_area and
do the mapping.

For PPC64, we add the 4K PFN hack sanity check to __ioremap_caller()
in order to avoid using __ioremap_at(). Other checks in __ioremap_at()
are irrelevant for __ioremap_caller().

On PPC64, VM area is allocated in the range [ioremap_bot ; IOREMAP_END]
On PPC32, VM area is allocated in the range [VMALLOC_START ; VMALLOC_END]

Lets define IOREMAP_START is ioremap_bot for PPC64, and alias
IOREMAP_START/END to VMALLOC_START/END on PPC32

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/42e7e36ad32e0fdf76692426cc642799c9f689b8.1566309263.git.christophe.leroy@c-s.fr
parent 191e4206

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

+4 −0
Original line number Diff line number Diff line
@@ -165,6 +165,10 @@ int map_kernel_page(unsigned long va, phys_addr_t pa, pgprot_t prot); 
#define IOREMAP_TOP	KVIRT_TOP

#endif



/* PPC32 shares vmalloc area with ioremap */

#define IOREMAP_START	VMALLOC_START

#define IOREMAP_END	VMALLOC_END



/*

 * Just any arbitrary offset to the start of the vmalloc VM area: the

 * current 16MB value just means that there will be a 64MB "hole" after the

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

+1 −0
Original line number Diff line number Diff line
@@ -316,6 +316,7 @@ extern unsigned long pci_io_base; 
#define  PHB_IO_BASE	(ISA_IO_END)

#define  PHB_IO_END	(KERN_IO_START + FULL_IO_SIZE)

#define IOREMAP_BASE	(PHB_IO_END)

#define IOREMAP_START	(ioremap_bot)

#define IOREMAP_END	(KERN_IO_END)



/* Advertise special mapping type for AGP */

arch/powerpc/include/asm/io.h

+2 −0
Original line number Diff line number Diff line
@@ -723,6 +723,8 @@ void __iomem *ioremap_coherent(phys_addr_t address, unsigned long size); 
extern void iounmap(volatile void __iomem *addr);



int ioremap_range(unsigned long ea, phys_addr_t pa, unsigned long size, pgprot_t prot);

void __iomem *do_ioremap(phys_addr_t pa, phys_addr_t offset, unsigned long size,

			 pgprot_t prot, void *caller);



extern void __iomem *__ioremap_caller(phys_addr_t, unsigned long size,

				      pgprot_t prot, void *caller);

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

+4 −0
Original line number Diff line number Diff line
@@ -93,6 +93,10 @@ int map_kernel_page(unsigned long va, phys_addr_t pa, pgprot_t prot); 
#define IOREMAP_TOP	KVIRT_TOP

#endif



/* PPC32 shares vmalloc area with ioremap */

#define IOREMAP_START	VMALLOC_START

#define IOREMAP_END	VMALLOC_END



/*

 * Just any arbitrary offset to the start of the vmalloc VM area: the

 * current 16MB value just means that there will be a 64MB "hole" after the

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

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#define  PHB_IO_BASE	(ISA_IO_END)

#define  PHB_IO_END	(KERN_IO_START + FULL_IO_SIZE)

#define IOREMAP_BASE	(PHB_IO_END)

#define IOREMAP_START	(ioremap_bot)

#define IOREMAP_END	(KERN_VIRT_START + KERN_VIRT_SIZE)

CRA Git | Maintained and supported by SUSTech CRA and CCSE