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

Commit 80b9ece1 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Ingo Molnar
Browse files

x86/io: Define IO accessors by preprocessor 



As a preparatory to use generic IO accessor helpers we need to define
architecture dependent functions via preprocessor to let world know we
have them.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: default avatarWolfram Sang <wsa@the-dreams.de>
Cc: Baolin Wang <baolin.wang@spreadtrum.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: intel-gfx@lists.freedesktop.org
Cc: linux-i2c@vger.kernel.org
Link: http://lkml.kernel.org/r/20170630170934.83028-2-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 76846bf3

arch/x86/include/asm/io.h

+41 −0
Original line number Diff line number Diff line
@@ -69,6 +69,9 @@ build_mmio_write(__writeb, "b", unsigned char, "q", ) 
build_mmio_write(__writew, "w", unsigned short, "r", )

build_mmio_write(__writel, "l", unsigned int, "r", )



#define readb readb

#define readw readw

#define readl readl

#define readb_relaxed(a) __readb(a)

#define readw_relaxed(a) __readw(a)

#define readl_relaxed(a) __readl(a)
@@ -76,6 +79,9 @@ build_mmio_write(__writel, "l", unsigned int, "r", ) 
#define __raw_readw __readw

#define __raw_readl __readl



#define writeb writeb

#define writew writew

#define writel writel

#define writeb_relaxed(v, a) __writeb(v, a)

#define writew_relaxed(v, a) __writew(v, a)

#define writel_relaxed(v, a) __writel(v, a)
@@ -119,6 +125,7 @@ static inline phys_addr_t virt_to_phys(volatile void *address) 
{

	return __pa(address);

}

#define virt_to_phys virt_to_phys



/**

 *	phys_to_virt	-	map physical address to virtual
@@ -137,6 +144,7 @@ static inline void *phys_to_virt(phys_addr_t address) 
{

	return __va(address);

}

#define phys_to_virt phys_to_virt



/*

 * Change "struct page" to physical address.
@@ -169,11 +177,14 @@ static inline unsigned int isa_virt_to_bus(volatile void *address) 
 * else, you probably want one of the following.

 */

extern void __iomem *ioremap_nocache(resource_size_t offset, unsigned long size);

#define ioremap_nocache ioremap_nocache

extern void __iomem *ioremap_uc(resource_size_t offset, unsigned long size);

#define ioremap_uc ioremap_uc



extern void __iomem *ioremap_cache(resource_size_t offset, unsigned long size);

#define ioremap_cache ioremap_cache

extern void __iomem *ioremap_prot(resource_size_t offset, unsigned long size, unsigned long prot_val);

#define ioremap_prot ioremap_prot



/**

 * ioremap     -   map bus memory into CPU space
@@ -193,8 +204,10 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size) 
{

	return ioremap_nocache(offset, size);

}

#define ioremap ioremap



extern void iounmap(volatile void __iomem *addr);

#define iounmap iounmap



extern void set_iounmap_nonlazy(void);
@@ -220,6 +233,7 @@ memset_io(volatile void __iomem *addr, unsigned char val, size_t count) 
{

	memset((void __force *)addr, val, count);

}

#define memset_io(dst,c,count) memset_io(dst,c,count)



/**

 * memcpy_fromio	Copy a block of data from I/O memory
@@ -234,6 +248,7 @@ memcpy_fromio(void *dst, const volatile void __iomem *src, size_t count) 
{

	memcpy(dst, (const void __force *)src, count);

}

#define memcpy_fromio(to,from,count) memcpy_fromio(to,from,count)



/**

 * memcpy_toio		Copy a block of data into I/O memory
@@ -248,6 +263,7 @@ memcpy_toio(volatile void __iomem *dst, const void *src, size_t count) 
{

	memcpy((void __force *)dst, src, count);

}

#define memcpy_toio(to,from,count) memcpy_toio(to,from,count)



/*

 * ISA space is 'always mapped' on a typical x86 system, no need to
@@ -341,13 +357,38 @@ BUILDIO(b, b, char) 
BUILDIO(w, w, short)

BUILDIO(l, , int)



#define inb inb

#define inw inw

#define inl inl

#define inb_p inb_p

#define inw_p inw_p

#define inl_p inl_p

#define insb insb

#define insw insw

#define insl insl



#define outb outb

#define outw outw

#define outl outl

#define outb_p outb_p

#define outw_p outw_p

#define outl_p outl_p

#define outsb outsb

#define outsw outsw

#define outsl outsl



extern void *xlate_dev_mem_ptr(phys_addr_t phys);

extern void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr);



#define xlate_dev_mem_ptr xlate_dev_mem_ptr

#define unxlate_dev_mem_ptr unxlate_dev_mem_ptr



extern int ioremap_change_attr(unsigned long vaddr, unsigned long size,

				enum page_cache_mode pcm);

extern void __iomem *ioremap_wc(resource_size_t offset, unsigned long size);

#define ioremap_wc ioremap_wc

extern void __iomem *ioremap_wt(resource_size_t offset, unsigned long size);

#define ioremap_wt ioremap_wt



extern bool is_early_ioremap_ptep(pte_t *ptep);