Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7dc59bdde7063323b6a70c2f0fadb399ede8038d

Authored by GuanXuetao
1 parent 521cb40b0c
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

asm-generic: fix inX/outX functions for architectures that have PCI 

The definitions for the PC-style PIO functions in asm-generic/io.h were
meant as dummies so you could compile code on architectures without
ISA and PCI buses. However, unicore32 actually wants to use them
with a real PCI bus, so they need to be defined to actually address
the register window holding the I/O ports.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Showing 1 changed file with 19 additions and 14 deletions Side-by-side Diff

include/asm-generic/io.h
Diff comments   View file @ 7dc59bd
... ... @@ -94,6 +94,10 @@
94 94 #define writeq(b,addr) __raw_writeq(__cpu_to_le64(b),addr)
95 95 #endif
96 96  
  97 +#ifndef PCI_IOBASE
  98 +#define PCI_IOBASE ((void __iomem *) 0)
  99 +#endif
  100 +
97 101 /*****************************************************************************/
98 102 /*
99 103 * traditional input/output functions
100 104  
101 105  
102 106  
103 107  
104 108  
... ... @@ -101,32 +105,32 @@
101 105  
102 106 static inline u8 inb(unsigned long addr)
103 107 {
104   - return readb((volatile void __iomem *) addr);
  108 + return readb(addr + PCI_IOBASE);
105 109 }
106 110  
107 111 static inline u16 inw(unsigned long addr)
108 112 {
109   - return readw((volatile void __iomem *) addr);
  113 + return readw(addr + PCI_IOBASE);
110 114 }
111 115  
112 116 static inline u32 inl(unsigned long addr)
113 117 {
114   - return readl((volatile void __iomem *) addr);
  118 + return readl(addr + PCI_IOBASE);
115 119 }
116 120  
117 121 static inline void outb(u8 b, unsigned long addr)
118 122 {
119   - writeb(b, (volatile void __iomem *) addr);
  123 + writeb(b, addr + PCI_IOBASE);
120 124 }
121 125  
122 126 static inline void outw(u16 b, unsigned long addr)
123 127 {
124   - writew(b, (volatile void __iomem *) addr);
  128 + writew(b, addr + PCI_IOBASE);
125 129 }
126 130  
127 131 static inline void outl(u32 b, unsigned long addr)
128 132 {
129   - writel(b, (volatile void __iomem *) addr);
  133 + writel(b, addr + PCI_IOBASE);
130 134 }
131 135  
132 136 #define inb_p(addr) inb(addr)
133 137  
134 138  
135 139  
136 140  
137 141  
... ... @@ -213,32 +217,32 @@
213 217  
214 218 static inline void readsl(const void __iomem *addr, void *buf, int len)
215 219 {
216   - insl((unsigned long)addr, buf, len);
  220 + insl(addr - PCI_IOBASE, buf, len);
217 221 }
218 222  
219 223 static inline void readsw(const void __iomem *addr, void *buf, int len)
220 224 {
221   - insw((unsigned long)addr, buf, len);
  225 + insw(addr - PCI_IOBASE, buf, len);
222 226 }
223 227  
224 228 static inline void readsb(const void __iomem *addr, void *buf, int len)
225 229 {
226   - insb((unsigned long)addr, buf, len);
  230 + insb(addr - PCI_IOBASE, buf, len);
227 231 }
228 232  
229 233 static inline void writesl(const void __iomem *addr, const void *buf, int len)
230 234 {
231   - outsl((unsigned long)addr, buf, len);
  235 + outsl(addr - PCI_IOBASE, buf, len);
232 236 }
233 237  
234 238 static inline void writesw(const void __iomem *addr, const void *buf, int len)
235 239 {
236   - outsw((unsigned long)addr, buf, len);
  240 + outsw(addr - PCI_IOBASE, buf, len);
237 241 }
238 242  
239 243 static inline void writesb(const void __iomem *addr, const void *buf, int len)
240 244 {
241   - outsb((unsigned long)addr, buf, len);
  245 + outsb(addr - PCI_IOBASE, buf, len);
242 246 }
243 247  
244 248 #ifndef CONFIG_GENERIC_IOMAP
... ... @@ -269,8 +273,9 @@
269 273 outsl((unsigned long) (p), (src), (count))
270 274 #endif /* CONFIG_GENERIC_IOMAP */
271 275  
272   -
273   -#define IO_SPACE_LIMIT 0xffffffff
  276 +#ifndef IO_SPACE_LIMIT
  277 +#define IO_SPACE_LIMIT 0xffff
  278 +#endif
274 279  
275 280 #ifdef __KERNEL__
276 281