Unverified Commit c5c3238d authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Arnd Bergmann
Browse files

asm-generic: provide generic page_to_phys and phys_to_page implementations 



page_to_phys is duplicated by all architectures, and from some strange
reason placed in <asm/io.h> where it doesn't fit at all.

phys_to_page is only provided by a few architectures despite having a lot
of open coded users.

Provide generic versions in <asm-generic/memory_model.h> to make these
helpers more easily usable.

Note with this patch powerpc loses the CONFIG_DEBUG_VIRTUAL pfn_valid
check.  It will be added back in a generic version later.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 6f043e75

arch/alpha/include/asm/io.h

+0 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ static inline void * phys_to_virt(unsigned long address) 


#define virt_to_phys		virt_to_phys

#define phys_to_virt		phys_to_virt

#define page_to_phys(page)	page_to_pa(page)



/* Maximum PIO space address supported?  */

#define IO_SPACE_LIMIT 0xffff

arch/arc/include/asm/io.h

+0 −3
Original line number Diff line number Diff line
@@ -42,9 +42,6 @@ static inline void ioport_unmap(void __iomem *addr) 
#define iowrite16be(v,p)	({ __iowmb(); __raw_writew((__force u16)cpu_to_be16(v), p); })

#define iowrite32be(v,p)	({ __iowmb(); __raw_writel((__force u32)cpu_to_be32(v), p); })



/* Change struct page to physical address */

#define page_to_phys(page)		(page_to_pfn(page) << PAGE_SHIFT)



#define __raw_readb __raw_readb

static inline u8 __raw_readb(const volatile void __iomem *addr)

{

arch/arm/include/asm/memory.h

+0 −6
Original line number Diff line number Diff line
@@ -147,12 +147,6 @@ extern unsigned long vectors_base; 
#define DTCM_OFFSET	UL(0xfffe8000)

#endif



/*

 * Convert a page to/from a physical address

 */

#define page_to_phys(page)	(__pfn_to_phys(page_to_pfn(page)))

#define phys_to_page(phys)	(pfn_to_page(__phys_to_pfn(phys)))



/*

 * PLAT_PHYS_OFFSET is the offset (from zero) of the start of physical

 * memory.  This is used for XIP and NoMMU kernels, and on platforms that don't

arch/arm64/include/asm/memory.h

+0 −6
Original line number Diff line number Diff line
@@ -353,12 +353,6 @@ extern phys_addr_t __phys_addr_symbol(unsigned long x); 
#define __phys_to_virt(x)	((unsigned long)((x) - PHYS_OFFSET) | PAGE_OFFSET)

#define __phys_to_kimg(x)	((unsigned long)((x) + kimage_voffset))



/*

 * Convert a page to/from a physical address

 */

#define page_to_phys(page)	(__pfn_to_phys(page_to_pfn(page)))

#define phys_to_page(phys)	(pfn_to_page(__phys_to_pfn(phys)))



/*

 * Note: Drivers should NOT use these.  They are the wrong

 * translation for translating DMA addresses.  Use the driver

arch/csky/include/asm/page.h

+0 −3
Original line number Diff line number Diff line
@@ -43,9 +43,6 @@ extern void *memcpy(void *to, const void *from, size_t l); 
#define clear_page(page)	memset((page), 0, PAGE_SIZE)

#define copy_page(to, from)	memcpy((to), (from), PAGE_SIZE)



#define page_to_phys(page)	(page_to_pfn(page) << PAGE_SHIFT)

#define phys_to_page(paddr)	(pfn_to_page(PFN_DOWN(paddr)))



struct page;



#include <abi/page.h>