diff options
author | Arnd Bergmann <arnd@arndb.de> | 2019-08-09 18:33:21 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2019-08-14 15:36:22 +0200 |
commit | a1f487d75c9be17421f1ab10172427dd16e5f56a (patch) | |
tree | cbe8f8cd2927564f2e97e8a91f2b166e2c08b5b0 /arch/arm/plat-iop/cp6.c | |
parent | ba9ef6afc45ff4eb2d9c6e26c6a94279ee3b4348 (diff) |
ARM: iop32x: merge everything into mach-iop32x/
Various bits of iop32x are now in their traditional locations in plat-iop,
mach-iop/include/mach/ and in include/asm/mach/hardware. As nothing
outside of the iop32x mach code references these any more, this can all
be moved into one place now.
The only remaining things in the include/mach/ directory are now the
NR_IRQS definition, the entry-macros.S file and the the decompressor
uart access. After the irqchip code has been converted to SPARSE_IRQ
and GENERIC_IRQ_MULTI_HANDLER, it can be moved to ARCH_MULTIPLATFORM.
Link: https://lore.kernel.org/r/20190809163334.489360-7-arnd@arndb.de
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/plat-iop/cp6.c')
-rw-r--r-- | arch/arm/plat-iop/cp6.c | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/arch/arm/plat-iop/cp6.c b/arch/arm/plat-iop/cp6.c deleted file mode 100644 index ec74b07fb7e3..000000000000 --- a/arch/arm/plat-iop/cp6.c +++ /dev/null @@ -1,38 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * IOP Coprocessor-6 access handler - * Copyright (c) 2006, Intel Corporation. - */ -#include <linux/init.h> -#include <asm/traps.h> -#include <asm/ptrace.h> - -static int cp6_trap(struct pt_regs *regs, unsigned int instr) -{ - u32 temp; - - /* enable cp6 access */ - asm volatile ( - "mrc p15, 0, %0, c15, c1, 0\n\t" - "orr %0, %0, #(1 << 6)\n\t" - "mcr p15, 0, %0, c15, c1, 0\n\t" - : "=r"(temp)); - - return 0; -} - -/* permit kernel space cp6 access - * deny user space cp6 access - */ -static struct undef_hook cp6_hook = { - .instr_mask = 0x0f000ff0, - .instr_val = 0x0e000610, - .cpsr_mask = MODE_MASK, - .cpsr_val = SVC_MODE, - .fn = cp6_trap, -}; - -void __init iop_init_cp6_handler(void) -{ - register_undef_hook(&cp6_hook); -} |