1 --- a/arch/powerpc/kernel/Makefile
2 +++ b/arch/powerpc/kernel/Makefile
3 @@ -118,9 +118,11 @@ obj-$(CONFIG_FTRACE_SYSCALLS) += ftrace.
5 obj-$(CONFIG_8XX_MINIMAL_FPEMU) += softemu8xx.o
7 +ifneq ($(CONFIG_RB_IOMAP),y)
8 ifneq ($(CONFIG_PPC_INDIRECT_IO),y)
13 obj-$(CONFIG_PPC64) += $(obj64-y)
14 obj-$(CONFIG_PPC32) += $(obj32-y)
15 --- a/arch/powerpc/platforms/83xx/Makefile
16 +++ b/arch/powerpc/platforms/83xx/Makefile
17 @@ -7,6 +7,7 @@ obj-$(CONFIG_MCU_MPC8349EMITX) += mcu_mp
18 obj-$(CONFIG_MPC830x_RDB) += mpc830x_rdb.o
19 obj-$(CONFIG_MPC831x_RDB) += mpc831x_rdb.o
20 obj-$(CONFIG_MPC832x_RDB) += mpc832x_rdb.o
21 +obj-$(CONFIG_RB_PPC) += rbppc.o
22 obj-$(CONFIG_MPC834x_MDS) += mpc834x_mds.o
23 obj-$(CONFIG_MPC834x_ITX) += mpc834x_itx.o
24 obj-$(CONFIG_MPC836x_MDS) += mpc836x_mds.o
25 --- a/arch/powerpc/platforms/Kconfig
26 +++ b/arch/powerpc/platforms/Kconfig
27 @@ -192,6 +192,10 @@ config PPC_INDIRECT_MMIO
28 config PPC_IO_WORKAROUNDS
35 source "drivers/cpufreq/Kconfig"
37 menu "CPU Frequency drivers"
38 --- a/arch/powerpc/sysdev/Makefile
39 +++ b/arch/powerpc/sysdev/Makefile
40 @@ -69,3 +69,6 @@ subdir-ccflags-$(CONFIG_PPC_WERROR) := -
41 obj-$(CONFIG_PPC_XICS) += xics/
43 obj-$(CONFIG_GE_FPGA) += ge/
45 +obj-$(CONFIG_RB_IOMAP) += rb_iomap.o
48 +++ b/arch/powerpc/sysdev/rb_iomap.c
50 +#include <linux/init.h>
51 +#include <linux/pci.h>
52 +#include <linux/mm.h>
55 +#define LOCALBUS_START 0x40000000
56 +#define LOCALBUS_MASK 0x007fffff
57 +#define LOCALBUS_REGMASK 0x001fffff
59 +static void __iomem *localbus_base;
61 +static inline int is_localbus(void __iomem *addr)
63 + return ((unsigned) addr & ~LOCALBUS_MASK) == LOCALBUS_START;
66 +static inline unsigned localbus_regoff(unsigned reg) {
67 + return (reg << 16) | (((reg ^ 8) & 8) << 17);
70 +static inline void __iomem *localbus_addr(void __iomem *addr)
72 + return localbus_base
73 + + ((unsigned) addr & LOCALBUS_MASK & ~LOCALBUS_REGMASK)
74 + + localbus_regoff((unsigned) addr & LOCALBUS_REGMASK);
77 +unsigned int ioread8(void __iomem *addr)
79 + if (is_localbus(addr))
80 + return in_be16(localbus_addr(addr)) >> 8;
83 +EXPORT_SYMBOL(ioread8);
85 +unsigned int ioread16(void __iomem *addr)
87 + if (is_localbus(addr))
88 + return le16_to_cpu(in_be16(localbus_addr(addr)));
91 +EXPORT_SYMBOL(ioread16);
93 +unsigned int ioread16be(void __iomem *addr)
95 + return in_be16(addr);
97 +EXPORT_SYMBOL(ioread16be);
99 +unsigned int ioread32(void __iomem *addr)
101 + return readl(addr);
103 +EXPORT_SYMBOL(ioread32);
105 +unsigned int ioread32be(void __iomem *addr)
107 + return in_be32(addr);
109 +EXPORT_SYMBOL(ioread32be);
111 +void iowrite8(u8 val, void __iomem *addr)
113 + if (is_localbus(addr))
114 + out_be16(localbus_addr(addr), ((u16) val) << 8);
118 +EXPORT_SYMBOL(iowrite8);
120 +void iowrite16(u16 val, void __iomem *addr)
122 + if (is_localbus(addr))
123 + out_be16(localbus_addr(addr), cpu_to_le16(val));
127 +EXPORT_SYMBOL(iowrite16);
129 +void iowrite16be(u16 val, void __iomem *addr)
131 + out_be16(addr, val);
133 +EXPORT_SYMBOL(iowrite16be);
135 +void iowrite32(u32 val, void __iomem *addr)
139 +EXPORT_SYMBOL(iowrite32);
141 +void iowrite32be(u32 val, void __iomem *addr)
143 + out_be32(addr, val);
145 +EXPORT_SYMBOL(iowrite32be);
147 +void ioread8_rep(void __iomem *addr, void *dst, unsigned long count)
149 + if (is_localbus(addr)) {
151 + void *laddr = localbus_addr(addr);
154 + for (i = 0; i < count; ++i) {
155 + *buf++ = in_be16(laddr) >> 8;
158 + _insb((u8 __iomem *) addr, dst, count);
161 +EXPORT_SYMBOL(ioread8_rep);
163 +void ioread16_rep(void __iomem *addr, void *dst, unsigned long count)
165 + if (is_localbus(addr)) {
167 + void *laddr = localbus_addr(addr);
170 + for (i = 0; i < count; ++i) {
171 + *buf++ = in_be16(laddr);
174 + _insw_ns((u16 __iomem *) addr, dst, count);
177 +EXPORT_SYMBOL(ioread16_rep);
179 +void ioread32_rep(void __iomem *addr, void *dst, unsigned long count)
181 + _insl_ns((u32 __iomem *) addr, dst, count);
183 +EXPORT_SYMBOL(ioread32_rep);
185 +void iowrite8_rep(void __iomem *addr, const void *src, unsigned long count)
187 + if (is_localbus(addr)) {
189 + void *laddr = localbus_addr(addr);
190 + const u8 *buf = src;
192 + for (i = 0; i < count; ++i) {
193 + out_be16(laddr, ((u16) *buf++) << 8);
196 + _outsb((u8 __iomem *) addr, src, count);
199 +EXPORT_SYMBOL(iowrite8_rep);
201 +void iowrite16_rep(void __iomem *addr, const void *src, unsigned long count)
203 + if (is_localbus(addr)) {
205 + void *laddr = localbus_addr(addr);
206 + const u16 *buf = src;
208 + for (i = 0; i < count; ++i) {
209 + out_be16(laddr, *buf++);
212 + _outsw_ns((u16 __iomem *) addr, src, count);
215 +EXPORT_SYMBOL(iowrite16_rep);
217 +void iowrite32_rep(void __iomem *addr, const void *src, unsigned long count)
219 + _outsl_ns((u32 __iomem *) addr, src, count);
221 +EXPORT_SYMBOL(iowrite32_rep);
223 +void __iomem *ioport_map(unsigned long port, unsigned int len)
225 + return (void __iomem *) (port + _IO_BASE);
227 +EXPORT_SYMBOL(ioport_unmap);
229 +void ioport_unmap(void __iomem *addr)
231 + /* Nothing to do */
233 +EXPORT_SYMBOL(ioport_map);
235 +void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
237 + /* Nothing to do */
239 +EXPORT_SYMBOL(pci_iounmap);
241 +void __iomem *localbus_map(unsigned long addr, unsigned int len)
243 + if (!localbus_base)
244 + localbus_base = ioremap(addr & ~LOCALBUS_MASK,
245 + LOCALBUS_MASK + 1);
246 + return (void *) (LOCALBUS_START + (addr & LOCALBUS_MASK));
248 +EXPORT_SYMBOL(localbus_map);
250 +void localbus_unmap(void __iomem *addr)
253 +EXPORT_SYMBOL(localbus_unmap);
254 --- a/arch/powerpc/platforms/83xx/Kconfig
255 +++ b/arch/powerpc/platforms/83xx/Kconfig
256 @@ -44,6 +44,7 @@ config RB_PPC
262 This option enables support for MikroTik RouterBOARD 333/600 series boards.