diff options
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/kernel/traps.c | 5 | ||||
-rw-r--r-- | arch/arm/mach-iop13xx/irq.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/irq.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-iop33x/irq.c | 2 | ||||
-rw-r--r-- | arch/arm/plat-iop/Makefile | 30 | ||||
-rw-r--r-- | arch/arm/plat-iop/cp6.c | 50 | ||||
-rw-r--r-- | arch/arm/plat-iop/io.c | 58 | ||||
-rw-r--r-- | arch/arm/plat-iop/pci.c | 6 |
9 files changed, 150 insertions, 8 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 8136d32cd78f..2c32c8702cfd 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -233,6 +233,8 @@ config ARCH_IOP33X | |||
233 | 233 | ||
234 | config ARCH_IOP13XX | 234 | config ARCH_IOP13XX |
235 | bool "IOP13xx-based" | 235 | bool "IOP13xx-based" |
236 | depends on MMU | ||
237 | select PLAT_IOP | ||
236 | select PCI | 238 | select PCI |
237 | help | 239 | help |
238 | Support for Intel's IOP13XX (XScale) family of processors. | 240 | Support for Intel's IOP13XX (XScale) family of processors. |
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 329609b84d3b..24095601359b 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c | |||
@@ -282,7 +282,10 @@ asmlinkage void do_undefinstr(struct pt_regs *regs) | |||
282 | regs->ARM_pc -= correction; | 282 | regs->ARM_pc -= correction; |
283 | 283 | ||
284 | pc = (void __user *)instruction_pointer(regs); | 284 | pc = (void __user *)instruction_pointer(regs); |
285 | if (thumb_mode(regs)) { | 285 | |
286 | if (processor_mode(regs) == SVC_MODE) { | ||
287 | instr = *(u32 *) pc; | ||
288 | } else if (thumb_mode(regs)) { | ||
286 | get_user(instr, (u16 __user *)pc); | 289 | get_user(instr, (u16 __user *)pc); |
287 | } else { | 290 | } else { |
288 | get_user(instr, (u32 __user *)pc); | 291 | get_user(instr, (u32 __user *)pc); |
diff --git a/arch/arm/mach-iop13xx/irq.c b/arch/arm/mach-iop13xx/irq.c index dbbc07c38b14..162b93214965 100644 --- a/arch/arm/mach-iop13xx/irq.c +++ b/arch/arm/mach-iop13xx/irq.c | |||
@@ -250,11 +250,14 @@ static struct irq_chip iop13xx_irqchip4 = { | |||
250 | .unmask = iop13xx_irq_unmask3, | 250 | .unmask = iop13xx_irq_unmask3, |
251 | }; | 251 | }; |
252 | 252 | ||
253 | extern void iop_init_cp6_handler(void); | ||
254 | |||
253 | void __init iop13xx_init_irq(void) | 255 | void __init iop13xx_init_irq(void) |
254 | { | 256 | { |
255 | unsigned int i; | 257 | unsigned int i; |
256 | 258 | ||
257 | u32 cp_flags = iop13xx_cp6_save(); | 259 | u32 cp_flags = iop13xx_cp6_save(); |
260 | iop_init_cp6_handler(); | ||
258 | 261 | ||
259 | /* disable all interrupts */ | 262 | /* disable all interrupts */ |
260 | write_intctl_0(0); | 263 | write_intctl_0(0); |
diff --git a/arch/arm/mach-iop32x/irq.c b/arch/arm/mach-iop32x/irq.c index 3ec1cd5c4f99..8b0ac5590ae4 100644 --- a/arch/arm/mach-iop32x/irq.c +++ b/arch/arm/mach-iop32x/irq.c | |||
@@ -60,6 +60,8 @@ void __init iop32x_init_irq(void) | |||
60 | { | 60 | { |
61 | int i; | 61 | int i; |
62 | 62 | ||
63 | iop_init_cp6_handler(); | ||
64 | |||
63 | intctl_write(0); | 65 | intctl_write(0); |
64 | intstr_write(0); | 66 | intstr_write(0); |
65 | if (machine_is_glantank() || | 67 | if (machine_is_glantank() || |
diff --git a/arch/arm/mach-iop33x/irq.c b/arch/arm/mach-iop33x/irq.c index 00b37f32d72e..effbe6b782d0 100644 --- a/arch/arm/mach-iop33x/irq.c +++ b/arch/arm/mach-iop33x/irq.c | |||
@@ -110,6 +110,8 @@ void __init iop33x_init_irq(void) | |||
110 | { | 110 | { |
111 | int i; | 111 | int i; |
112 | 112 | ||
113 | iop_init_cp6_handler(); | ||
114 | |||
113 | intctl0_write(0); | 115 | intctl0_write(0); |
114 | intctl1_write(0); | 116 | intctl1_write(0); |
115 | intstr0_write(0); | 117 | intstr0_write(0); |
diff --git a/arch/arm/plat-iop/Makefile b/arch/arm/plat-iop/Makefile index 23da00b11517..3250d732a171 100644 --- a/arch/arm/plat-iop/Makefile +++ b/arch/arm/plat-iop/Makefile | |||
@@ -2,7 +2,29 @@ | |||
2 | # Makefile for the linux kernel. | 2 | # Makefile for the linux kernel. |
3 | # | 3 | # |
4 | 4 | ||
5 | obj-y := gpio.o i2c.o pci.o setup.o time.o | 5 | obj-y := |
6 | obj-m := | 6 | |
7 | obj-n := | 7 | # IOP32X |
8 | obj- := | 8 | obj-$(CONFIG_ARCH_IOP32X) += gpio.o |
9 | obj-$(CONFIG_ARCH_IOP32X) += i2c.o | ||
10 | obj-$(CONFIG_ARCH_IOP32X) += pci.o | ||
11 | obj-$(CONFIG_ARCH_IOP32X) += setup.o | ||
12 | obj-$(CONFIG_ARCH_IOP32X) += time.o | ||
13 | obj-$(CONFIG_ARCH_IOP32X) += io.o | ||
14 | obj-$(CONFIG_ARCH_IOP32X) += cp6.o | ||
15 | |||
16 | # IOP33X | ||
17 | obj-$(CONFIG_ARCH_IOP33X) += gpio.o | ||
18 | obj-$(CONFIG_ARCH_IOP33X) += i2c.o | ||
19 | obj-$(CONFIG_ARCH_IOP33X) += pci.o | ||
20 | obj-$(CONFIG_ARCH_IOP33X) += setup.o | ||
21 | obj-$(CONFIG_ARCH_IOP33X) += time.o | ||
22 | obj-$(CONFIG_ARCH_IOP33X) += io.o | ||
23 | obj-$(CONFIG_ARCH_IOP33X) += cp6.o | ||
24 | |||
25 | # IOP13XX | ||
26 | obj-$(CONFIG_ARCH_IOP13XX) += cp6.o | ||
27 | |||
28 | obj-m := | ||
29 | obj-n := | ||
30 | obj- := | ||
diff --git a/arch/arm/plat-iop/cp6.c b/arch/arm/plat-iop/cp6.c new file mode 100644 index 000000000000..9612a87e2a88 --- /dev/null +++ b/arch/arm/plat-iop/cp6.c | |||
@@ -0,0 +1,50 @@ | |||
1 | /* | ||
2 | * IOP Coprocessor-6 access handler | ||
3 | * Copyright (c) 2006, Intel Corporation. | ||
4 | * | ||
5 | * This program is free software; you can redistribute it and/or modify it | ||
6 | * under the terms and conditions of the GNU General Public License, | ||
7 | * version 2, as published by the Free Software Foundation. | ||
8 | * | ||
9 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
12 | * more details. | ||
13 | * | ||
14 | * You should have received a copy of the GNU General Public License along with | ||
15 | * this program; if not, write to the Free Software Foundation, Inc., 59 Temple | ||
16 | * Place - Suite 330, Boston, MA 02111-1307 USA. | ||
17 | * | ||
18 | */ | ||
19 | #include <linux/init.h> | ||
20 | #include <asm/traps.h> | ||
21 | |||
22 | static int cp6_trap(struct pt_regs *regs, unsigned int instr) | ||
23 | { | ||
24 | u32 temp; | ||
25 | |||
26 | /* enable cp6 access */ | ||
27 | asm volatile ( | ||
28 | "mrc p15, 0, %0, c15, c1, 0\n\t" | ||
29 | "orr %0, %0, #(1 << 6)\n\t" | ||
30 | "mcr p15, 0, %0, c15, c1, 0\n\t" | ||
31 | : "=r"(temp)); | ||
32 | |||
33 | return 0; | ||
34 | } | ||
35 | |||
36 | /* permit kernel space cp6 access | ||
37 | * deny user space cp6 access | ||
38 | */ | ||
39 | static struct undef_hook cp6_hook = { | ||
40 | .instr_mask = 0x0f000ff0, | ||
41 | .instr_val = 0x0e000610, | ||
42 | .cpsr_mask = MODE_MASK, | ||
43 | .cpsr_val = SVC_MODE, | ||
44 | .fn = cp6_trap, | ||
45 | }; | ||
46 | |||
47 | void __init iop_init_cp6_handler(void) | ||
48 | { | ||
49 | register_undef_hook(&cp6_hook); | ||
50 | } | ||
diff --git a/arch/arm/plat-iop/io.c b/arch/arm/plat-iop/io.c new file mode 100644 index 000000000000..f7eccecf2e47 --- /dev/null +++ b/arch/arm/plat-iop/io.c | |||
@@ -0,0 +1,58 @@ | |||
1 | /* | ||
2 | * iop3xx custom ioremap implementation | ||
3 | * Copyright (c) 2006, Intel Corporation. | ||
4 | * | ||
5 | * This program is free software; you can redistribute it and/or modify it | ||
6 | * under the terms and conditions of the GNU General Public License, | ||
7 | * version 2, as published by the Free Software Foundation. | ||
8 | * | ||
9 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
12 | * more details. | ||
13 | * | ||
14 | * You should have received a copy of the GNU General Public License along with | ||
15 | * this program; if not, write to the Free Software Foundation, Inc., 59 Temple | ||
16 | * Place - Suite 330, Boston, MA 02111-1307 USA. | ||
17 | * | ||
18 | */ | ||
19 | #include <linux/kernel.h> | ||
20 | #include <linux/module.h> | ||
21 | #include <asm/hardware.h> | ||
22 | #include <asm/io.h> | ||
23 | |||
24 | void * __iomem __iop3xx_ioremap(unsigned long cookie, size_t size, | ||
25 | unsigned long flags) | ||
26 | { | ||
27 | void __iomem * retval; | ||
28 | |||
29 | switch (cookie) { | ||
30 | case IOP3XX_PCI_LOWER_IO_PA ... IOP3XX_PCI_UPPER_IO_PA: | ||
31 | retval = (void *) IOP3XX_PCI_IO_PHYS_TO_VIRT(cookie); | ||
32 | break; | ||
33 | case IOP3XX_PERIPHERAL_PHYS_BASE ... IOP3XX_PERIPHERAL_UPPER_PA: | ||
34 | retval = (void *) IOP3XX_PMMR_PHYS_TO_VIRT(cookie); | ||
35 | break; | ||
36 | default: | ||
37 | retval = __ioremap(cookie, size, flags); | ||
38 | } | ||
39 | |||
40 | return retval; | ||
41 | } | ||
42 | EXPORT_SYMBOL(__iop3xx_ioremap); | ||
43 | |||
44 | void __iop3xx_iounmap(void __iomem *addr) | ||
45 | { | ||
46 | extern void __iounmap(volatile void __iomem *addr); | ||
47 | |||
48 | switch ((u32) addr) { | ||
49 | case IOP3XX_PCI_LOWER_IO_VA ... IOP3XX_PCI_UPPER_IO_VA: | ||
50 | case IOP3XX_PERIPHERAL_VIRT_BASE ... IOP3XX_PERIPHERAL_UPPER_VA: | ||
51 | goto skip; | ||
52 | } | ||
53 | __iounmap(addr); | ||
54 | |||
55 | skip: | ||
56 | return; | ||
57 | } | ||
58 | EXPORT_SYMBOL(__iop3xx_iounmap); | ||
diff --git a/arch/arm/plat-iop/pci.c b/arch/arm/plat-iop/pci.c index e647812654f2..b5f6ec35aafb 100644 --- a/arch/arm/plat-iop/pci.c +++ b/arch/arm/plat-iop/pci.c | |||
@@ -196,8 +196,8 @@ int iop3xx_pci_setup(int nr, struct pci_sys_data *sys) | |||
196 | if (!res) | 196 | if (!res) |
197 | panic("PCI: unable to alloc resources"); | 197 | panic("PCI: unable to alloc resources"); |
198 | 198 | ||
199 | res[0].start = IOP3XX_PCI_LOWER_IO_VA; | 199 | res[0].start = IOP3XX_PCI_LOWER_IO_PA; |
200 | res[0].end = IOP3XX_PCI_LOWER_IO_VA + IOP3XX_PCI_IO_WINDOW_SIZE - 1; | 200 | res[0].end = IOP3XX_PCI_LOWER_IO_PA + IOP3XX_PCI_IO_WINDOW_SIZE - 1; |
201 | res[0].name = "IOP3XX PCI I/O Space"; | 201 | res[0].name = "IOP3XX PCI I/O Space"; |
202 | res[0].flags = IORESOURCE_IO; | 202 | res[0].flags = IORESOURCE_IO; |
203 | request_resource(&ioport_resource, &res[0]); | 203 | request_resource(&ioport_resource, &res[0]); |
@@ -209,7 +209,7 @@ int iop3xx_pci_setup(int nr, struct pci_sys_data *sys) | |||
209 | request_resource(&iomem_resource, &res[1]); | 209 | request_resource(&iomem_resource, &res[1]); |
210 | 210 | ||
211 | sys->mem_offset = IOP3XX_PCI_LOWER_MEM_PA - IOP3XX_PCI_LOWER_MEM_BA; | 211 | sys->mem_offset = IOP3XX_PCI_LOWER_MEM_PA - IOP3XX_PCI_LOWER_MEM_BA; |
212 | sys->io_offset = IOP3XX_PCI_LOWER_IO_VA - IOP3XX_PCI_LOWER_IO_BA; | 212 | sys->io_offset = IOP3XX_PCI_LOWER_IO_PA - IOP3XX_PCI_LOWER_IO_BA; |
213 | 213 | ||
214 | sys->resource[0] = &res[0]; | 214 | sys->resource[0] = &res[0]; |
215 | sys->resource[1] = &res[1]; | 215 | sys->resource[1] = &res[1]; |