write in 30M

hc

2024-02-20 ea08eeccae9297f7aabd2ef7f0c2517ac4549acc

 kernel/arch/s390/include/asm/io.h
..
..
@@ -12,6 +12,7 @@
12
12
 
13
13
 #include <linux/kernel.h>
14
14
 #include <asm/page.h>
15
+#include <asm/pgtable.h>
15
16
 #include <asm/pci_io.h>
16
17
 
17
18
 #define xlate_dev_mem_ptr xlate_dev_mem_ptr
..
..
@@ -26,18 +27,11 @@
26
27
 
27
28
 #define IO_SPACE_LIMIT 0
28
29
 
29
-#define ioremap_nocache(addr, size)	ioremap(addr, size)
30
-#define ioremap_wc			ioremap_nocache
31
-#define ioremap_wt			ioremap_nocache
32
-
33
-static inline void __iomem *ioremap(unsigned long offset, unsigned long size)
34
-{
35
-	return (void __iomem *) offset;
36
-}
37
-
38
-static inline void iounmap(volatile void __iomem *addr)
39
-{
40
-}
30
+void __iomem *ioremap_prot(phys_addr_t addr, size_t size, unsigned long prot);
31
+void __iomem *ioremap(phys_addr_t addr, size_t size);
32
+void __iomem *ioremap_wc(phys_addr_t addr, size_t size);
33
+void __iomem *ioremap_wt(phys_addr_t addr, size_t size);
34
+void iounmap(volatile void __iomem *addr);
41
35
 
42
36
 static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
43
37
 {
..
..
@@ -57,14 +51,21 @@
57
51
  * the corresponding device and create the mapping cookie.
58
52
  */
59
53
 #define pci_iomap pci_iomap
54
+#define pci_iomap_range pci_iomap_range
60
55
 #define pci_iounmap pci_iounmap
61
-#define pci_iomap_wc pci_iomap
62
-#define pci_iomap_wc_range pci_iomap_range
56
+#define pci_iomap_wc pci_iomap_wc
57
+#define pci_iomap_wc_range pci_iomap_wc_range
58
+
59
+#define ioremap ioremap
60
+#define ioremap_wt ioremap_wt
61
+#define ioremap_wc ioremap_wc
63
62
 
64
63
 #define memcpy_fromio(dst, src, count)	zpci_memcpy_fromio(dst, src, count)
65
64
 #define memcpy_toio(dst, src, count)	zpci_memcpy_toio(dst, src, count)
66
65
 #define memset_io(dst, val, count)	zpci_memset_io(dst, val, count)
67
66
 
67
+#define mmiowb()	zpci_barrier()
68
+
68
69
 #define __raw_readb	zpci_read_u8
69
70
 #define __raw_readw	zpci_read_u16
70
71
 #define __raw_readl	zpci_read_u32