 a0e4467726
			
		
	
	
	a0e4467726
	
	
	
		
			
			While there normally is no reason to have a pull request for asm-generic
 but have all changes get merged through whichever tree needs them, I do
 have a series for 3.19. There are two sets of patches that change
 significant portions of asm/io.h, and this branch contains both in order
 to resolve the conflicts:
 
 - Will Deacon has done a set of patches to ensure that all architectures
   define {read,write}{b,w,l,q}_relaxed() functions or get them by
   including asm-generic/io.h. These functions are commonly used on ARM
   specific drivers to avoid expensive L2 cache synchronization implied by
   the normal {read,write}{b,w,l,q}, but we need to define them on all
   architectures in order to share the drivers across architectures and
   to enable CONFIG_COMPILE_TEST configurations for them
 
 - Thierry Reding has done an unrelated set of patches that extends
   the asm-generic/io.h file to the degree necessary to make it useful
   on ARM64 and potentially other architectures.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIVAwUAVIdwNmCrR//JCVInAQJWuw/9FHt2ThMnI1J1Jqy4CVwtyjWTSa6Y/uVj
 xSytS7AOvmU/nw1quSoba5mN9fcUQUtK9kqjqNcq71WsQcDE6BF9SFpi9cWtjWcI
 ZfWsC+5kqry/mbnuHefENipem9RqBrLbOBJ3LARf5M8rZJuTz1KbdZs9r9+1QsCX
 ou8jeqVvNKUn9J1WyekJBFSrPOtZ4bCUpeyh23JHRfPtJeAHNOuPuymj6WceAz98
 uMV1icRaCBMySsf9HgsHRYW5HwuCm3MrrYj6ukyPpgxYz7FRq4hJLDs6GnlFtAGb
 71g87NpFdB32qbW+y1ntfYaJyUryMHMVHBWcV5H9m0btdHTRHYZjoOGOPuyLHHO8
 +l4/FaOQhnDL8cNDj0HKfhdlyaFylcWgs1wzj68nv31c1dGjcJcQiyCDwry9mJhr
 erh4EewcerUvWzbBMQ4JP1f8syKMsKwbo1bVU61a1RQJxEqVCzJMLweGSOFmqMX2
 6E4ZJVWv81UFLoFTzYx+7+M45K4NWywKNQdzwKmqKHc4OQyvq4ALJI0A7SGFJdDR
 HJ7VqDiLaSdBitgJcJUxNzKcyXij6wE9jE1fBe3YDFE4LrnZXFVLN+MX6hs7AIFJ
 vJM1UpxRxQUMGIH2m7rbDNazOAsvQGxINOjNor23cNLuf6qLY1LrpHVPQDAfJVvA
 6tROM77bwIQ=
 =xUv6
 -----END PGP SIGNATURE-----
Merge tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pull asm-generic asm/io.h rewrite from Arnd Bergmann:
 "While there normally is no reason to have a pull request for
  asm-generic but have all changes get merged through whichever tree
  needs them, I do have a series for 3.19.
  There are two sets of patches that change significant portions of
  asm/io.h, and this branch contains both in order to resolve the
  conflicts:
   - Will Deacon has done a set of patches to ensure that all
     architectures define {read,write}{b,w,l,q}_relaxed() functions or
     get them by including asm-generic/io.h.
     These functions are commonly used on ARM specific drivers to avoid
     expensive L2 cache synchronization implied by the normal
     {read,write}{b,w,l,q}, but we need to define them on all
     architectures in order to share the drivers across architectures
     and to enable CONFIG_COMPILE_TEST configurations for them
   - Thierry Reding has done an unrelated set of patches that extends
     the asm-generic/io.h file to the degree necessary to make it useful
     on ARM64 and potentially other architectures"
* tag 'asm-generic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: (29 commits)
  ARM64: use GENERIC_PCI_IOMAP
  sparc: io: remove duplicate relaxed accessors on sparc32
  ARM: sa11x0: Use void __iomem * in MMIO accessors
  arm64: Use include/asm-generic/io.h
  ARM: Use include/asm-generic/io.h
  asm-generic/io.h: Implement generic {read,write}s*()
  asm-generic/io.h: Reconcile I/O accessor overrides
  /dev/mem: Use more consistent data types
  Change xlate_dev_{kmem,mem}_ptr() prototypes
  ARM: ixp4xx: Properly override I/O accessors
  ARM: ixp4xx: Fix build with IXP4XX_INDIRECT_PCI
  ARM: ebsa110: Properly override I/O accessors
  ARC: Remove redundant PCI_IOBASE declaration
  documentation: memory-barriers: clarify relaxed io accessor semantics
  x86: io: implement dummy relaxed accessor macros for writes
  tile: io: implement dummy relaxed accessor macros for writes
  sparc: io: implement dummy relaxed accessor macros for writes
  powerpc: io: implement dummy relaxed accessor macros for writes
  parisc: io: implement dummy relaxed accessor macros for writes
  mn10300: io: implement dummy relaxed accessor macros for writes
  ...
		
	
			
		
			
				
	
	
		
			214 lines
		
	
	
	
		
			6.8 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			214 lines
		
	
	
	
		
			6.8 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Based on arch/arm/include/asm/io.h
 | |
|  *
 | |
|  * Copyright (C) 1996-2000 Russell King
 | |
|  * Copyright (C) 2012 ARM Ltd.
 | |
|  *
 | |
|  * This program is free software; you can redistribute it and/or modify
 | |
|  * it under the terms of the GNU General Public License version 2 as
 | |
|  * published by the Free Software Foundation.
 | |
|  *
 | |
|  * This program is distributed in the hope that it will be useful,
 | |
|  * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
|  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | |
|  * GNU General Public License for more details.
 | |
|  *
 | |
|  * You should have received a copy of the GNU General Public License
 | |
|  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | |
|  */
 | |
| #ifndef __ASM_IO_H
 | |
| #define __ASM_IO_H
 | |
| 
 | |
| #ifdef __KERNEL__
 | |
| 
 | |
| #include <linux/types.h>
 | |
| #include <linux/blk_types.h>
 | |
| 
 | |
| #include <asm/byteorder.h>
 | |
| #include <asm/barrier.h>
 | |
| #include <asm/pgtable.h>
 | |
| #include <asm/early_ioremap.h>
 | |
| #include <asm/alternative.h>
 | |
| #include <asm/cpufeature.h>
 | |
| 
 | |
| #include <xen/xen.h>
 | |
| 
 | |
| /*
 | |
|  * Generic IO read/write.  These perform native-endian accesses.
 | |
|  */
 | |
| #define __raw_writeb __raw_writeb
 | |
| static inline void __raw_writeb(u8 val, volatile void __iomem *addr)
 | |
| {
 | |
| 	asm volatile("strb %w0, [%1]" : : "r" (val), "r" (addr));
 | |
| }
 | |
| 
 | |
| #define __raw_writew __raw_writew
 | |
| static inline void __raw_writew(u16 val, volatile void __iomem *addr)
 | |
| {
 | |
| 	asm volatile("strh %w0, [%1]" : : "r" (val), "r" (addr));
 | |
| }
 | |
| 
 | |
| #define __raw_writel __raw_writel
 | |
| static inline void __raw_writel(u32 val, volatile void __iomem *addr)
 | |
| {
 | |
| 	asm volatile("str %w0, [%1]" : : "r" (val), "r" (addr));
 | |
| }
 | |
| 
 | |
| #define __raw_writeq __raw_writeq
 | |
| static inline void __raw_writeq(u64 val, volatile void __iomem *addr)
 | |
| {
 | |
| 	asm volatile("str %0, [%1]" : : "r" (val), "r" (addr));
 | |
| }
 | |
| 
 | |
| #define __raw_readb __raw_readb
 | |
| static inline u8 __raw_readb(const volatile void __iomem *addr)
 | |
| {
 | |
| 	u8 val;
 | |
| 	asm volatile(ALTERNATIVE("ldrb %w0, [%1]",
 | |
| 				 "ldarb %w0, [%1]",
 | |
| 				 ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE)
 | |
| 		     : "=r" (val) : "r" (addr));
 | |
| 	return val;
 | |
| }
 | |
| 
 | |
| #define __raw_readw __raw_readw
 | |
| static inline u16 __raw_readw(const volatile void __iomem *addr)
 | |
| {
 | |
| 	u16 val;
 | |
| 
 | |
| 	asm volatile(ALTERNATIVE("ldrh %w0, [%1]",
 | |
| 				 "ldarh %w0, [%1]",
 | |
| 				 ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE)
 | |
| 		     : "=r" (val) : "r" (addr));
 | |
| 	return val;
 | |
| }
 | |
| 
 | |
| #define __raw_readl __raw_readl
 | |
| static inline u32 __raw_readl(const volatile void __iomem *addr)
 | |
| {
 | |
| 	u32 val;
 | |
| 	asm volatile(ALTERNATIVE("ldr %w0, [%1]",
 | |
| 				 "ldar %w0, [%1]",
 | |
| 				 ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE)
 | |
| 		     : "=r" (val) : "r" (addr));
 | |
| 	return val;
 | |
| }
 | |
| 
 | |
| #define __raw_readq __raw_readq
 | |
| static inline u64 __raw_readq(const volatile void __iomem *addr)
 | |
| {
 | |
| 	u64 val;
 | |
| 	asm volatile(ALTERNATIVE("ldr %0, [%1]",
 | |
| 				 "ldar %0, [%1]",
 | |
| 				 ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE)
 | |
| 		     : "=r" (val) : "r" (addr));
 | |
| 	return val;
 | |
| }
 | |
| 
 | |
| /* IO barriers */
 | |
| #define __iormb()		rmb()
 | |
| #define __iowmb()		wmb()
 | |
| 
 | |
| #define mmiowb()		do { } while (0)
 | |
| 
 | |
| /*
 | |
|  * Relaxed I/O memory access primitives. These follow the Device memory
 | |
|  * ordering rules but do not guarantee any ordering relative to Normal memory
 | |
|  * accesses.
 | |
|  */
 | |
| #define readb_relaxed(c)	({ u8  __v = __raw_readb(c); __v; })
 | |
| #define readw_relaxed(c)	({ u16 __v = le16_to_cpu((__force __le16)__raw_readw(c)); __v; })
 | |
| #define readl_relaxed(c)	({ u32 __v = le32_to_cpu((__force __le32)__raw_readl(c)); __v; })
 | |
| #define readq_relaxed(c)	({ u64 __v = le64_to_cpu((__force __le64)__raw_readq(c)); __v; })
 | |
| 
 | |
| #define writeb_relaxed(v,c)	((void)__raw_writeb((v),(c)))
 | |
| #define writew_relaxed(v,c)	((void)__raw_writew((__force u16)cpu_to_le16(v),(c)))
 | |
| #define writel_relaxed(v,c)	((void)__raw_writel((__force u32)cpu_to_le32(v),(c)))
 | |
| #define writeq_relaxed(v,c)	((void)__raw_writeq((__force u64)cpu_to_le64(v),(c)))
 | |
| 
 | |
| /*
 | |
|  * I/O memory access primitives. Reads are ordered relative to any
 | |
|  * following Normal memory access. Writes are ordered relative to any prior
 | |
|  * Normal memory access.
 | |
|  */
 | |
| #define readb(c)		({ u8  __v = readb_relaxed(c); __iormb(); __v; })
 | |
| #define readw(c)		({ u16 __v = readw_relaxed(c); __iormb(); __v; })
 | |
| #define readl(c)		({ u32 __v = readl_relaxed(c); __iormb(); __v; })
 | |
| #define readq(c)		({ u64 __v = readq_relaxed(c); __iormb(); __v; })
 | |
| 
 | |
| #define writeb(v,c)		({ __iowmb(); writeb_relaxed((v),(c)); })
 | |
| #define writew(v,c)		({ __iowmb(); writew_relaxed((v),(c)); })
 | |
| #define writel(v,c)		({ __iowmb(); writel_relaxed((v),(c)); })
 | |
| #define writeq(v,c)		({ __iowmb(); writeq_relaxed((v),(c)); })
 | |
| 
 | |
| /*
 | |
|  *  I/O port access primitives.
 | |
|  */
 | |
| #define arch_has_dev_port()	(1)
 | |
| #define IO_SPACE_LIMIT		(SZ_32M - 1)
 | |
| #define PCI_IOBASE		((void __iomem *)(MODULES_VADDR - SZ_32M))
 | |
| 
 | |
| /*
 | |
|  * String version of I/O memory access operations.
 | |
|  */
 | |
| extern void __memcpy_fromio(void *, const volatile void __iomem *, size_t);
 | |
| extern void __memcpy_toio(volatile void __iomem *, const void *, size_t);
 | |
| extern void __memset_io(volatile void __iomem *, int, size_t);
 | |
| 
 | |
| #define memset_io(c,v,l)	__memset_io((c),(v),(l))
 | |
| #define memcpy_fromio(a,c,l)	__memcpy_fromio((a),(c),(l))
 | |
| #define memcpy_toio(c,a,l)	__memcpy_toio((c),(a),(l))
 | |
| 
 | |
| /*
 | |
|  * I/O memory mapping functions.
 | |
|  */
 | |
| extern void __iomem *__ioremap(phys_addr_t phys_addr, size_t size, pgprot_t prot);
 | |
| extern void __iounmap(volatile void __iomem *addr);
 | |
| extern void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size);
 | |
| 
 | |
| #define ioremap(addr, size)		__ioremap((addr), (size), __pgprot(PROT_DEVICE_nGnRE))
 | |
| #define ioremap_nocache(addr, size)	__ioremap((addr), (size), __pgprot(PROT_DEVICE_nGnRE))
 | |
| #define ioremap_wc(addr, size)		__ioremap((addr), (size), __pgprot(PROT_NORMAL_NC))
 | |
| #define iounmap				__iounmap
 | |
| 
 | |
| /*
 | |
|  * io{read,write}{16,32}be() macros
 | |
|  */
 | |
| #define ioread16be(p)		({ __u16 __v = be16_to_cpu((__force __be16)__raw_readw(p)); __iormb(); __v; })
 | |
| #define ioread32be(p)		({ __u32 __v = be32_to_cpu((__force __be32)__raw_readl(p)); __iormb(); __v; })
 | |
| 
 | |
| #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); })
 | |
| 
 | |
| /*
 | |
|  * Convert a physical pointer to a virtual kernel pointer for /dev/mem
 | |
|  * access
 | |
|  */
 | |
| #define xlate_dev_mem_ptr(p)	__va(p)
 | |
| 
 | |
| /*
 | |
|  * Convert a virtual cached pointer to an uncached pointer
 | |
|  */
 | |
| #define xlate_dev_kmem_ptr(p)	p
 | |
| 
 | |
| #include <asm-generic/io.h>
 | |
| 
 | |
| /*
 | |
|  * More restrictive address range checking than the default implementation
 | |
|  * (PHYS_OFFSET and PHYS_MASK taken into account).
 | |
|  */
 | |
| #define ARCH_HAS_VALID_PHYS_ADDR_RANGE
 | |
| extern int valid_phys_addr_range(phys_addr_t addr, size_t size);
 | |
| extern int valid_mmap_phys_addr_range(unsigned long pfn, size_t size);
 | |
| 
 | |
| extern int devmem_is_allowed(unsigned long pfn);
 | |
| 
 | |
| struct bio_vec;
 | |
| extern bool xen_biovec_phys_mergeable(const struct bio_vec *vec1,
 | |
| 				      const struct bio_vec *vec2);
 | |
| #define BIOVEC_PHYS_MERGEABLE(vec1, vec2)				\
 | |
| 	(__BIOVEC_PHYS_MERGEABLE(vec1, vec2) &&				\
 | |
| 	 (!xen_domain() || xen_biovec_phys_mergeable(vec1, vec2)))
 | |
| 
 | |
| #endif	/* __KERNEL__ */
 | |
| #endif	/* __ASM_IO_H */
 |