diff options
| author | Sebastian Ott | 2019-04-14 15:38:01 +0200 |
|---|---|---|
| committer | Martin Schwidefsky | 2019-04-29 10:47:01 +0200 |
| commit | 71ba41c9b1d91042960e9d92a5c8f52dc8531eda (patch) | |
| tree | c0d4f5379684fb236526127730073d5fe1d44ea3 /arch/s390/include/asm/io.h | |
| parent | s390/ism: move oddities of device IO to wrapper function (diff) | |
| download | kernel-qcow2-linux-71ba41c9b1d91042960e9d92a5c8f52dc8531eda.tar.gz kernel-qcow2-linux-71ba41c9b1d91042960e9d92a5c8f52dc8531eda.tar.xz kernel-qcow2-linux-71ba41c9b1d91042960e9d92a5c8f52dc8531eda.zip | |
s390/pci: provide support for MIO instructions
Provide support for PCI I/O instructions that work on mapped IO addresses.
Signed-off-by: Sebastian Ott <sebott@linux.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/include/asm/io.h')
| -rw-r--r-- | arch/s390/include/asm/io.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/arch/s390/include/asm/io.h b/arch/s390/include/asm/io.h index f34d729347e4..ca421614722f 100644 --- a/arch/s390/include/asm/io.h +++ b/arch/s390/include/asm/io.h @@ -30,14 +30,8 @@ void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr); #define ioremap_wc ioremap_nocache #define ioremap_wt ioremap_nocache -static inline void __iomem *ioremap(unsigned long offset, unsigned long size) -{ - return (void __iomem *) offset; -} - -static inline void iounmap(volatile void __iomem *addr) -{ -} +void __iomem *ioremap(unsigned long offset, unsigned long size); +void iounmap(volatile void __iomem *addr); static inline void __iomem *ioport_map(unsigned long port, unsigned int nr) { @@ -57,14 +51,17 @@ static inline void ioport_unmap(void __iomem *p) * the corresponding device and create the mapping cookie. */ #define pci_iomap pci_iomap +#define pci_iomap_range pci_iomap_range #define pci_iounmap pci_iounmap -#define pci_iomap_wc pci_iomap -#define pci_iomap_wc_range pci_iomap_range +#define pci_iomap_wc pci_iomap_wc +#define pci_iomap_wc_range pci_iomap_wc_range #define memcpy_fromio(dst, src, count) zpci_memcpy_fromio(dst, src, count) #define memcpy_toio(dst, src, count) zpci_memcpy_toio(dst, src, count) #define memset_io(dst, val, count) zpci_memset_io(dst, val, count) +#define mmiowb() zpci_barrier() + #define __raw_readb zpci_read_u8 #define __raw_readw zpci_read_u16 #define __raw_readl zpci_read_u32 |