Merge tag 'xtensa-20181228' of git://github.com/jcmvbkbc/linux-xtensa
Pull Xtensa updates from Max Filippov:
- switch to generated syscall table
- switch ptrace to regsets, use regsets for core dumps
- complete tracehook implementation
- add syscall tracepoints support
- add jumplabels support
- add memtest support
- drop unused/duplicated code from entry.S, ptrace.c, coprocessor.S,
elf.h and syscall.h
- clean up warnings caused by WSR/RSR macros
- clean up DTC warnings about SPI controller node names in xtfpga.dtsi
- simplify coprocessor.S
- get rid of explicit 'l32r' instruction usage in assembly
* tag 'xtensa-20181228' of git://github.com/jcmvbkbc/linux-xtensa: (25 commits)
xtensa: implement jump_label support
xtensa: implement syscall tracepoints
xtensa: implement tracehook functions and enable HAVE_ARCH_TRACEHOOK
xtensa: enable CORE_DUMP_USE_REGSET
xtensa: implement TIE regset
xtensa: implement task_user_regset_view
xtensa: call do_syscall_trace_{enter,leave} selectively
xtensa: use NO_SYSCALL instead of -1
xtensa: define syscall_get_arch()
Move EM_XTENSA to uapi/linux/elf-em.h
xtensa: support memtest
xtensa: don't use l32r opcode directly
xtensa: xtfpga.dtsi: fix dtc warnings about SPI
xtensa: don't clear cpenable unconditionally on release
xtensa: simplify coprocessor.S
xtensa: clean up WSR*/RSR*/get_sr/set_sr
xtensa: drop unused declarations from elf.h
xtensa: clean up syscall.h
xtensa: drop unused coprocessor helper functions
xtensa: drop custom PTRACE_{PEEK,POKE}{TEXT,DATA}
...
This commit is contained in:
Linus Torvalds
@@ -16,6 +16,7 @@ obj-$(CONFIG_SMP) += smp.o mxhead.o
|
||||
obj-$(CONFIG_XTENSA_VARIANT_HAVE_PERF_EVENTS) += perf_event.o
|
||||
obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o
|
||||
obj-$(CONFIG_S32C1I_SELFTEST) += s32c1i_selftest.o
|
||||
obj-$(CONFIG_JUMP_LABEL) += jump_label.o
|
||||
|
||||
# In the Xtensa architecture, assembly generates literals which must always
|
||||
# precede the L32R instruction with a relative offset less than 256 kB.
|
||||
|
||||
@@ -137,8 +137,6 @@ int main(void)
|
||||
DEFINE(EXC_TABLE_DOUBLE_SAVE, offsetof(struct exc_table, double_save));
|
||||
DEFINE(EXC_TABLE_FIXUP, offsetof(struct exc_table, fixup));
|
||||
DEFINE(EXC_TABLE_PARAM, offsetof(struct exc_table, fixup_param));
|
||||
DEFINE(EXC_TABLE_SYSCALL_SAVE,
|
||||
offsetof(struct exc_table, syscall_save));
|
||||
DEFINE(EXC_TABLE_FAST_USER,
|
||||
offsetof(struct exc_table, fast_user_handler));
|
||||
DEFINE(EXC_TABLE_FAST_KERNEL,
|
||||
|
||||
@@ -33,16 +33,16 @@
|
||||
*/
|
||||
|
||||
#define SAVE_CP_REGS(x) \
|
||||
.align 4; \
|
||||
.Lsave_cp_regs_cp##x: \
|
||||
.if XTENSA_HAVE_COPROCESSOR(x); \
|
||||
.align 4; \
|
||||
.Lsave_cp_regs_cp##x: \
|
||||
xchal_cp##x##_store a2 a4 a5 a6 a7; \
|
||||
.endif; \
|
||||
jx a0
|
||||
jx a0; \
|
||||
.endif
|
||||
|
||||
#define SAVE_CP_REGS_TAB(x) \
|
||||
.if XTENSA_HAVE_COPROCESSOR(x); \
|
||||
.long .Lsave_cp_regs_cp##x - .Lsave_cp_regs_jump_table; \
|
||||
.long .Lsave_cp_regs_cp##x; \
|
||||
.else; \
|
||||
.long 0; \
|
||||
.endif; \
|
||||
@@ -50,16 +50,16 @@
|
||||
|
||||
|
||||
#define LOAD_CP_REGS(x) \
|
||||
.align 4; \
|
||||
.Lload_cp_regs_cp##x: \
|
||||
.if XTENSA_HAVE_COPROCESSOR(x); \
|
||||
.align 4; \
|
||||
.Lload_cp_regs_cp##x: \
|
||||
xchal_cp##x##_load a2 a4 a5 a6 a7; \
|
||||
.endif; \
|
||||
jx a0
|
||||
jx a0; \
|
||||
.endif
|
||||
|
||||
#define LOAD_CP_REGS_TAB(x) \
|
||||
.if XTENSA_HAVE_COPROCESSOR(x); \
|
||||
.long .Lload_cp_regs_cp##x - .Lload_cp_regs_jump_table; \
|
||||
.long .Lload_cp_regs_cp##x; \
|
||||
.else; \
|
||||
.long 0; \
|
||||
.endif; \
|
||||
@@ -83,6 +83,7 @@
|
||||
LOAD_CP_REGS(6)
|
||||
LOAD_CP_REGS(7)
|
||||
|
||||
.section ".rodata", "a"
|
||||
.align 4
|
||||
.Lsave_cp_regs_jump_table:
|
||||
SAVE_CP_REGS_TAB(0)
|
||||
@@ -104,64 +105,20 @@
|
||||
LOAD_CP_REGS_TAB(6)
|
||||
LOAD_CP_REGS_TAB(7)
|
||||
|
||||
/*
|
||||
* coprocessor_save(buffer, index)
|
||||
* a2 a3
|
||||
* coprocessor_load(buffer, index)
|
||||
* a2 a3
|
||||
*
|
||||
* Save or load coprocessor registers for coprocessor 'index'.
|
||||
* The register values are saved to or loaded from them 'buffer' address.
|
||||
*
|
||||
* Note that these functions don't update the coprocessor_owner information!
|
||||
*
|
||||
*/
|
||||
|
||||
ENTRY(coprocessor_save)
|
||||
|
||||
entry a1, 32
|
||||
s32i a0, a1, 0
|
||||
movi a0, .Lsave_cp_regs_jump_table
|
||||
addx8 a3, a3, a0
|
||||
l32i a3, a3, 0
|
||||
beqz a3, 1f
|
||||
add a0, a0, a3
|
||||
callx0 a0
|
||||
1: l32i a0, a1, 0
|
||||
retw
|
||||
|
||||
ENDPROC(coprocessor_save)
|
||||
|
||||
ENTRY(coprocessor_load)
|
||||
|
||||
entry a1, 32
|
||||
s32i a0, a1, 0
|
||||
movi a0, .Lload_cp_regs_jump_table
|
||||
addx4 a3, a3, a0
|
||||
l32i a3, a3, 0
|
||||
beqz a3, 1f
|
||||
add a0, a0, a3
|
||||
callx0 a0
|
||||
1: l32i a0, a1, 0
|
||||
retw
|
||||
|
||||
ENDPROC(coprocessor_load)
|
||||
.previous
|
||||
|
||||
/*
|
||||
* coprocessor_flush(struct task_info*, index)
|
||||
* coprocessor_flush(struct thread_info*, index)
|
||||
* a2 a3
|
||||
* coprocessor_restore(struct task_info*, index)
|
||||
* a2 a3
|
||||
*
|
||||
* Save or load coprocessor registers for coprocessor 'index'.
|
||||
* Save coprocessor registers for coprocessor 'index'.
|
||||
* The register values are saved to or loaded from the coprocessor area
|
||||
* inside the task_info structure.
|
||||
*
|
||||
* Note that these functions don't update the coprocessor_owner information!
|
||||
* Note that this function doesn't update the coprocessor_owner information!
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
ENTRY(coprocessor_flush)
|
||||
|
||||
entry a1, 32
|
||||
@@ -172,29 +129,12 @@ ENTRY(coprocessor_flush)
|
||||
l32i a3, a3, 0
|
||||
add a2, a2, a4
|
||||
beqz a3, 1f
|
||||
add a0, a0, a3
|
||||
callx0 a0
|
||||
callx0 a3
|
||||
1: l32i a0, a1, 0
|
||||
retw
|
||||
|
||||
ENDPROC(coprocessor_flush)
|
||||
|
||||
ENTRY(coprocessor_restore)
|
||||
entry a1, 32
|
||||
s32i a0, a1, 0
|
||||
movi a0, .Lload_cp_regs_jump_table
|
||||
addx4 a3, a3, a0
|
||||
l32i a4, a3, 4
|
||||
l32i a3, a3, 0
|
||||
add a2, a2, a4
|
||||
beqz a3, 1f
|
||||
add a0, a0, a3
|
||||
callx0 a0
|
||||
1: l32i a0, a1, 0
|
||||
retw
|
||||
|
||||
ENDPROC(coprocessor_restore)
|
||||
|
||||
/*
|
||||
* Entry condition:
|
||||
*
|
||||
@@ -274,10 +214,9 @@ ENTRY(fast_coprocessor)
|
||||
movi a0, 2f # a0: 'return' address
|
||||
addx8 a3, a3, a5 # a3: coprocessor number
|
||||
l32i a2, a3, 4 # a2: xtregs offset
|
||||
l32i a3, a3, 0 # a3: jump offset
|
||||
l32i a3, a3, 0 # a3: jump address
|
||||
add a2, a2, a4
|
||||
add a4, a3, a5 # a4: address of save routine
|
||||
jx a4
|
||||
jx a3
|
||||
|
||||
/* Note that only a0 and a1 were preserved. */
|
||||
|
||||
@@ -297,10 +236,9 @@ ENTRY(fast_coprocessor)
|
||||
movi a0, 1f
|
||||
addx8 a3, a3, a5
|
||||
l32i a2, a3, 4 # a2: xtregs offset
|
||||
l32i a3, a3, 0 # a3: jump offset
|
||||
l32i a3, a3, 0 # a3: jump address
|
||||
add a2, a2, a4
|
||||
add a4, a3, a5
|
||||
jx a4
|
||||
jx a3
|
||||
|
||||
/* Restore all registers and return from exception handler. */
|
||||
|
||||
|
||||
@@ -364,7 +364,7 @@ common_exception:
|
||||
s32i a2, a1, PT_DEBUGCAUSE
|
||||
s32i a3, a1, PT_PC
|
||||
|
||||
movi a2, -1
|
||||
movi a2, NO_SYSCALL
|
||||
rsr a3, excvaddr
|
||||
s32i a2, a1, PT_SYSCALL
|
||||
movi a2, 0
|
||||
@@ -1022,25 +1022,6 @@ ENDPROC(fast_alloca)
|
||||
* excsave_1: dispatch table
|
||||
*/
|
||||
|
||||
ENTRY(fast_syscall_kernel)
|
||||
|
||||
/* Skip syscall. */
|
||||
|
||||
rsr a0, epc1
|
||||
addi a0, a0, 3
|
||||
wsr a0, epc1
|
||||
|
||||
l32i a0, a2, PT_DEPC
|
||||
bgeui a0, VALID_DOUBLE_EXCEPTION_ADDRESS, fast_syscall_unrecoverable
|
||||
|
||||
rsr a0, depc # get syscall-nr
|
||||
_beqz a0, fast_syscall_spill_registers
|
||||
_beqi a0, __NR_xtensa, fast_syscall_xtensa
|
||||
|
||||
j kernel_exception
|
||||
|
||||
ENDPROC(fast_syscall_kernel)
|
||||
|
||||
ENTRY(fast_syscall_user)
|
||||
|
||||
/* Skip syscall. */
|
||||
@@ -1865,20 +1846,28 @@ ENTRY(system_call)
|
||||
|
||||
/* regs->syscall = regs->areg[2] */
|
||||
|
||||
l32i a3, a2, PT_AREG2
|
||||
mov a6, a2
|
||||
s32i a3, a2, PT_SYSCALL
|
||||
call4 do_syscall_trace_enter
|
||||
mov a3, a6
|
||||
l32i a7, a2, PT_AREG2
|
||||
s32i a7, a2, PT_SYSCALL
|
||||
|
||||
GET_THREAD_INFO(a4, a1)
|
||||
l32i a3, a4, TI_FLAGS
|
||||
movi a4, _TIF_WORK_MASK
|
||||
and a3, a3, a4
|
||||
beqz a3, 1f
|
||||
|
||||
mov a6, a2
|
||||
call4 do_syscall_trace_enter
|
||||
l32i a7, a2, PT_SYSCALL
|
||||
|
||||
1:
|
||||
/* syscall = sys_call_table[syscall_nr] */
|
||||
|
||||
movi a4, sys_call_table
|
||||
movi a5, __NR_syscall_count
|
||||
movi a5, __NR_syscalls
|
||||
movi a6, -ENOSYS
|
||||
bgeu a3, a5, 1f
|
||||
bgeu a7, a5, 1f
|
||||
|
||||
addx4 a4, a3, a4
|
||||
addx4 a4, a7, a4
|
||||
l32i a4, a4, 0
|
||||
movi a5, sys_ni_syscall;
|
||||
beq a4, a5, 1f
|
||||
@@ -1900,6 +1889,10 @@ ENTRY(system_call)
|
||||
1: /* regs->areg[2] = return_value */
|
||||
|
||||
s32i a6, a2, PT_AREG2
|
||||
bnez a3, 1f
|
||||
retw
|
||||
|
||||
1:
|
||||
mov a6, a2
|
||||
call4 do_syscall_trace_leave
|
||||
retw
|
||||
|
||||
@@ -59,10 +59,6 @@ ENTRY(_start)
|
||||
|
||||
.align 4
|
||||
.literal_position
|
||||
.Lstartup:
|
||||
.word _startup
|
||||
|
||||
.align 4
|
||||
_SetupOCD:
|
||||
/*
|
||||
* Initialize WB, WS, and clear PS.EXCM (to allow loop instructions).
|
||||
@@ -99,12 +95,12 @@ _SetupMMU:
|
||||
1:
|
||||
#endif
|
||||
#endif
|
||||
.end no-absolute-literals
|
||||
|
||||
l32r a0, .Lstartup
|
||||
movi a0, _startup
|
||||
jx a0
|
||||
|
||||
ENDPROC(_start)
|
||||
.end no-absolute-literals
|
||||
|
||||
__REF
|
||||
.literal_position
|
||||
|
||||
@@ -101,30 +101,30 @@ static void xtensa_wsr(unsigned long v, u8 sr)
|
||||
switch (sr) {
|
||||
#if XCHAL_NUM_IBREAK > 0
|
||||
case SREG_IBREAKA + 0:
|
||||
WSR(v, SREG_IBREAKA + 0);
|
||||
xtensa_set_sr(v, SREG_IBREAKA + 0);
|
||||
break;
|
||||
#endif
|
||||
#if XCHAL_NUM_IBREAK > 1
|
||||
case SREG_IBREAKA + 1:
|
||||
WSR(v, SREG_IBREAKA + 1);
|
||||
xtensa_set_sr(v, SREG_IBREAKA + 1);
|
||||
break;
|
||||
#endif
|
||||
|
||||
#if XCHAL_NUM_DBREAK > 0
|
||||
case SREG_DBREAKA + 0:
|
||||
WSR(v, SREG_DBREAKA + 0);
|
||||
xtensa_set_sr(v, SREG_DBREAKA + 0);
|
||||
break;
|
||||
case SREG_DBREAKC + 0:
|
||||
WSR(v, SREG_DBREAKC + 0);
|
||||
xtensa_set_sr(v, SREG_DBREAKC + 0);
|
||||
break;
|
||||
#endif
|
||||
#if XCHAL_NUM_DBREAK > 1
|
||||
case SREG_DBREAKA + 1:
|
||||
WSR(v, SREG_DBREAKA + 1);
|
||||
xtensa_set_sr(v, SREG_DBREAKA + 1);
|
||||
break;
|
||||
|
||||
case SREG_DBREAKC + 1:
|
||||
WSR(v, SREG_DBREAKC + 1);
|
||||
xtensa_set_sr(v, SREG_DBREAKC + 1);
|
||||
break;
|
||||
#endif
|
||||
}
|
||||
@@ -150,8 +150,8 @@ static void set_ibreak_regs(int reg, struct perf_event *bp)
|
||||
unsigned long ibreakenable;
|
||||
|
||||
xtensa_wsr(info->address, SREG_IBREAKA + reg);
|
||||
RSR(ibreakenable, SREG_IBREAKENABLE);
|
||||
WSR(ibreakenable | (1 << reg), SREG_IBREAKENABLE);
|
||||
ibreakenable = xtensa_get_sr(SREG_IBREAKENABLE);
|
||||
xtensa_set_sr(ibreakenable | (1 << reg), SREG_IBREAKENABLE);
|
||||
}
|
||||
|
||||
static void set_dbreak_regs(int reg, struct perf_event *bp)
|
||||
@@ -214,8 +214,9 @@ void arch_uninstall_hw_breakpoint(struct perf_event *bp)
|
||||
/* Breakpoint */
|
||||
i = free_slot(this_cpu_ptr(bp_on_reg), XCHAL_NUM_IBREAK, bp);
|
||||
if (i >= 0) {
|
||||
RSR(ibreakenable, SREG_IBREAKENABLE);
|
||||
WSR(ibreakenable & ~(1 << i), SREG_IBREAKENABLE);
|
||||
ibreakenable = xtensa_get_sr(SREG_IBREAKENABLE);
|
||||
xtensa_set_sr(ibreakenable & ~(1 << i),
|
||||
SREG_IBREAKENABLE);
|
||||
}
|
||||
} else {
|
||||
/* Watchpoint */
|
||||
|
||||
99
arch/xtensa/kernel/jump_label.c
Normal file
99
arch/xtensa/kernel/jump_label.c
Normal file
@@ -0,0 +1,99 @@
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
// Copyright (C) 2018 Cadence Design Systems Inc.
|
||||
|
||||
#include <linux/cpu.h>
|
||||
#include <linux/jump_label.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/memory.h>
|
||||
#include <linux/stop_machine.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
#include <asm/cacheflush.h>
|
||||
|
||||
#ifdef HAVE_JUMP_LABEL
|
||||
|
||||
#define J_OFFSET_MASK 0x0003ffff
|
||||
#define J_SIGN_MASK (~(J_OFFSET_MASK >> 1))
|
||||
|
||||
#if defined(__XTENSA_EL__)
|
||||
#define J_INSN 0x6
|
||||
#define NOP_INSN 0x0020f0
|
||||
#elif defined(__XTENSA_EB__)
|
||||
#define J_INSN 0x60000000
|
||||
#define NOP_INSN 0x0f020000
|
||||
#else
|
||||
#error Unsupported endianness.
|
||||
#endif
|
||||
|
||||
struct patch {
|
||||
atomic_t cpu_count;
|
||||
unsigned long addr;
|
||||
size_t sz;
|
||||
const void *data;
|
||||
};
|
||||
|
||||
static void local_patch_text(unsigned long addr, const void *data, size_t sz)
|
||||
{
|
||||
memcpy((void *)addr, data, sz);
|
||||
local_flush_icache_range(addr, addr + sz);
|
||||
}
|
||||
|
||||
static int patch_text_stop_machine(void *data)
|
||||
{
|
||||
struct patch *patch = data;
|
||||
|
||||
if (atomic_inc_return(&patch->cpu_count) == 1) {
|
||||
local_patch_text(patch->addr, patch->data, patch->sz);
|
||||
atomic_inc(&patch->cpu_count);
|
||||
} else {
|
||||
while (atomic_read(&patch->cpu_count) <= num_online_cpus())
|
||||
cpu_relax();
|
||||
__invalidate_icache_range(patch->addr, patch->sz);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void patch_text(unsigned long addr, const void *data, size_t sz)
|
||||
{
|
||||
if (IS_ENABLED(CONFIG_SMP)) {
|
||||
struct patch patch = {
|
||||
.cpu_count = ATOMIC_INIT(0),
|
||||
.addr = addr,
|
||||
.sz = sz,
|
||||
.data = data,
|
||||
};
|
||||
stop_machine_cpuslocked(patch_text_stop_machine,
|
||||
&patch, NULL);
|
||||
} else {
|
||||
unsigned long flags;
|
||||
|
||||
local_irq_save(flags);
|
||||
local_patch_text(addr, data, sz);
|
||||
local_irq_restore(flags);
|
||||
}
|
||||
}
|
||||
|
||||
void arch_jump_label_transform(struct jump_entry *e,
|
||||
enum jump_label_type type)
|
||||
{
|
||||
u32 d = (jump_entry_target(e) - (jump_entry_code(e) + 4));
|
||||
u32 insn;
|
||||
|
||||
/* Jump only works within 128K of the J instruction. */
|
||||
BUG_ON(!((d & J_SIGN_MASK) == 0 ||
|
||||
(d & J_SIGN_MASK) == J_SIGN_MASK));
|
||||
|
||||
if (type == JUMP_LABEL_JMP) {
|
||||
#if defined(__XTENSA_EL__)
|
||||
insn = ((d & J_OFFSET_MASK) << 6) | J_INSN;
|
||||
#elif defined(__XTENSA_EB__)
|
||||
insn = ((d & J_OFFSET_MASK) << 8) | J_INSN;
|
||||
#endif
|
||||
} else {
|
||||
insn = NOP_INSN;
|
||||
}
|
||||
|
||||
patch_text(jump_entry_code(e), &insn, JUMP_LABEL_NOP_SIZE);
|
||||
}
|
||||
|
||||
#endif /* HAVE_JUMP_LABEL */
|
||||
@@ -87,7 +87,8 @@ void coprocessor_release_all(struct thread_info *ti)
|
||||
}
|
||||
|
||||
ti->cpenable = cpenable;
|
||||
coprocessor_clear_cpenable();
|
||||
if (ti == current_thread_info())
|
||||
xtensa_set_sr(0, cpenable);
|
||||
|
||||
preempt_enable();
|
||||
}
|
||||
@@ -99,16 +100,16 @@ void coprocessor_flush_all(struct thread_info *ti)
|
||||
|
||||
preempt_disable();
|
||||
|
||||
RSR_CPENABLE(old_cpenable);
|
||||
old_cpenable = xtensa_get_sr(cpenable);
|
||||
cpenable = ti->cpenable;
|
||||
WSR_CPENABLE(cpenable);
|
||||
xtensa_set_sr(cpenable, cpenable);
|
||||
|
||||
for (i = 0; i < XCHAL_CP_MAX; i++) {
|
||||
if ((cpenable & 1) != 0 && coprocessor_owner[i] == ti)
|
||||
coprocessor_flush(ti, i);
|
||||
cpenable >>= 1;
|
||||
}
|
||||
WSR_CPENABLE(old_cpenable);
|
||||
xtensa_set_sr(old_cpenable, cpenable);
|
||||
|
||||
preempt_enable();
|
||||
}
|
||||
@@ -325,49 +326,3 @@ unsigned long get_wchan(struct task_struct *p)
|
||||
} while (count++ < 16);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* xtensa_gregset_t and 'struct pt_regs' are vastly different formats
|
||||
* of processor registers. Besides different ordering,
|
||||
* xtensa_gregset_t contains non-live register information that
|
||||
* 'struct pt_regs' does not. Exception handling (primarily) uses
|
||||
* 'struct pt_regs'. Core files and ptrace use xtensa_gregset_t.
|
||||
*
|
||||
*/
|
||||
|
||||
void xtensa_elf_core_copy_regs (xtensa_gregset_t *elfregs, struct pt_regs *regs)
|
||||
{
|
||||
unsigned long wb, ws, wm;
|
||||
int live, last;
|
||||
|
||||
wb = regs->windowbase;
|
||||
ws = regs->windowstart;
|
||||
wm = regs->wmask;
|
||||
ws = ((ws >> wb) | (ws << (WSBITS - wb))) & ((1 << WSBITS) - 1);
|
||||
|
||||
/* Don't leak any random bits. */
|
||||
|
||||
memset(elfregs, 0, sizeof(*elfregs));
|
||||
|
||||
/* Note: PS.EXCM is not set while user task is running; its
|
||||
* being set in regs->ps is for exception handling convenience.
|
||||
*/
|
||||
|
||||
elfregs->pc = regs->pc;
|
||||
elfregs->ps = (regs->ps & ~(1 << PS_EXCM_BIT));
|
||||
elfregs->lbeg = regs->lbeg;
|
||||
elfregs->lend = regs->lend;
|
||||
elfregs->lcount = regs->lcount;
|
||||
elfregs->sar = regs->sar;
|
||||
elfregs->windowstart = ws;
|
||||
|
||||
live = (wm & 2) ? 4 : (wm & 4) ? 8 : (wm & 8) ? 12 : 16;
|
||||
last = XCHAL_NUM_AREGS - (wm >> 4) * 4;
|
||||
memcpy(elfregs->a, regs->areg, live * 4);
|
||||
memcpy(elfregs->a + last, regs->areg + last, (wm >> 4) * 16);
|
||||
}
|
||||
|
||||
int dump_fpu(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
#include <linux/mm.h>
|
||||
#include <linux/perf_event.h>
|
||||
#include <linux/ptrace.h>
|
||||
#include <linux/regset.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/sched/task_stack.h>
|
||||
#include <linux/security.h>
|
||||
@@ -26,12 +27,201 @@
|
||||
#include <linux/tracehook.h>
|
||||
#include <linux/uaccess.h>
|
||||
|
||||
#define CREATE_TRACE_POINTS
|
||||
#include <trace/events/syscalls.h>
|
||||
|
||||
#include <asm/coprocessor.h>
|
||||
#include <asm/elf.h>
|
||||
#include <asm/page.h>
|
||||
#include <asm/pgtable.h>
|
||||
#include <asm/ptrace.h>
|
||||
|
||||
static int gpr_get(struct task_struct *target,
|
||||
const struct user_regset *regset,
|
||||
unsigned int pos, unsigned int count,
|
||||
void *kbuf, void __user *ubuf)
|
||||
{
|
||||
struct pt_regs *regs = task_pt_regs(target);
|
||||
struct user_pt_regs newregs = {
|
||||
.pc = regs->pc,
|
||||
.ps = regs->ps & ~(1 << PS_EXCM_BIT),
|
||||
.lbeg = regs->lbeg,
|
||||
.lend = regs->lend,
|
||||
.lcount = regs->lcount,
|
||||
.sar = regs->sar,
|
||||
.threadptr = regs->threadptr,
|
||||
.windowbase = regs->windowbase,
|
||||
.windowstart = regs->windowstart,
|
||||
};
|
||||
|
||||
memcpy(newregs.a,
|
||||
regs->areg + XCHAL_NUM_AREGS - regs->windowbase * 4,
|
||||
regs->windowbase * 16);
|
||||
memcpy(newregs.a + regs->windowbase * 4,
|
||||
regs->areg,
|
||||
(WSBITS - regs->windowbase) * 16);
|
||||
|
||||
return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
|
||||
&newregs, 0, -1);
|
||||
}
|
||||
|
||||
static int gpr_set(struct task_struct *target,
|
||||
const struct user_regset *regset,
|
||||
unsigned int pos, unsigned int count,
|
||||
const void *kbuf, const void __user *ubuf)
|
||||
{
|
||||
int ret;
|
||||
struct user_pt_regs newregs = {0};
|
||||
struct pt_regs *regs;
|
||||
const u32 ps_mask = PS_CALLINC_MASK | PS_OWB_MASK;
|
||||
|
||||
ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, &newregs, 0, -1);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
if (newregs.windowbase >= XCHAL_NUM_AREGS / 4)
|
||||
return -EINVAL;
|
||||
|
||||
regs = task_pt_regs(target);
|
||||
regs->pc = newregs.pc;
|
||||
regs->ps = (regs->ps & ~ps_mask) | (newregs.ps & ps_mask);
|
||||
regs->lbeg = newregs.lbeg;
|
||||
regs->lend = newregs.lend;
|
||||
regs->lcount = newregs.lcount;
|
||||
regs->sar = newregs.sar;
|
||||
regs->threadptr = newregs.threadptr;
|
||||
|
||||
if (newregs.windowbase != regs->windowbase ||
|
||||
newregs.windowstart != regs->windowstart) {
|
||||
u32 rotws, wmask;
|
||||
|
||||
rotws = (((newregs.windowstart |
|
||||
(newregs.windowstart << WSBITS)) >>
|
||||
newregs.windowbase) &
|
||||
((1 << WSBITS) - 1)) & ~1;
|
||||
wmask = ((rotws ? WSBITS + 1 - ffs(rotws) : 0) << 4) |
|
||||
(rotws & 0xF) | 1;
|
||||
regs->windowbase = newregs.windowbase;
|
||||
regs->windowstart = newregs.windowstart;
|
||||
regs->wmask = wmask;
|
||||
}
|
||||
|
||||
memcpy(regs->areg + XCHAL_NUM_AREGS - newregs.windowbase * 4,
|
||||
newregs.a, newregs.windowbase * 16);
|
||||
memcpy(regs->areg, newregs.a + newregs.windowbase * 4,
|
||||
(WSBITS - newregs.windowbase) * 16);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int tie_get(struct task_struct *target,
|
||||
const struct user_regset *regset,
|
||||
unsigned int pos, unsigned int count,
|
||||
void *kbuf, void __user *ubuf)
|
||||
{
|
||||
int ret;
|
||||
struct pt_regs *regs = task_pt_regs(target);
|
||||
struct thread_info *ti = task_thread_info(target);
|
||||
elf_xtregs_t *newregs = kzalloc(sizeof(elf_xtregs_t), GFP_KERNEL);
|
||||
|
||||
if (!newregs)
|
||||
return -ENOMEM;
|
||||
|
||||
newregs->opt = regs->xtregs_opt;
|
||||
newregs->user = ti->xtregs_user;
|
||||
|
||||
#if XTENSA_HAVE_COPROCESSORS
|
||||
/* Flush all coprocessor registers to memory. */
|
||||
coprocessor_flush_all(ti);
|
||||
newregs->cp0 = ti->xtregs_cp.cp0;
|
||||
newregs->cp1 = ti->xtregs_cp.cp1;
|
||||
newregs->cp2 = ti->xtregs_cp.cp2;
|
||||
newregs->cp3 = ti->xtregs_cp.cp3;
|
||||
newregs->cp4 = ti->xtregs_cp.cp4;
|
||||
newregs->cp5 = ti->xtregs_cp.cp5;
|
||||
newregs->cp6 = ti->xtregs_cp.cp6;
|
||||
newregs->cp7 = ti->xtregs_cp.cp7;
|
||||
#endif
|
||||
ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,
|
||||
newregs, 0, -1);
|
||||
kfree(newregs);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int tie_set(struct task_struct *target,
|
||||
const struct user_regset *regset,
|
||||
unsigned int pos, unsigned int count,
|
||||
const void *kbuf, const void __user *ubuf)
|
||||
{
|
||||
int ret;
|
||||
struct pt_regs *regs = task_pt_regs(target);
|
||||
struct thread_info *ti = task_thread_info(target);
|
||||
elf_xtregs_t *newregs = kzalloc(sizeof(elf_xtregs_t), GFP_KERNEL);
|
||||
|
||||
if (!newregs)
|
||||
return -ENOMEM;
|
||||
|
||||
ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
|
||||
newregs, 0, -1);
|
||||
|
||||
if (ret)
|
||||
goto exit;
|
||||
regs->xtregs_opt = newregs->opt;
|
||||
ti->xtregs_user = newregs->user;
|
||||
|
||||
#if XTENSA_HAVE_COPROCESSORS
|
||||
/* Flush all coprocessors before we overwrite them. */
|
||||
coprocessor_flush_all(ti);
|
||||
coprocessor_release_all(ti);
|
||||
ti->xtregs_cp.cp0 = newregs->cp0;
|
||||
ti->xtregs_cp.cp1 = newregs->cp1;
|
||||
ti->xtregs_cp.cp2 = newregs->cp2;
|
||||
ti->xtregs_cp.cp3 = newregs->cp3;
|
||||
ti->xtregs_cp.cp4 = newregs->cp4;
|
||||
ti->xtregs_cp.cp5 = newregs->cp5;
|
||||
ti->xtregs_cp.cp6 = newregs->cp6;
|
||||
ti->xtregs_cp.cp7 = newregs->cp7;
|
||||
#endif
|
||||
exit:
|
||||
kfree(newregs);
|
||||
return ret;
|
||||
}
|
||||
|
||||
enum xtensa_regset {
|
||||
REGSET_GPR,
|
||||
REGSET_TIE,
|
||||
};
|
||||
|
||||
static const struct user_regset xtensa_regsets[] = {
|
||||
[REGSET_GPR] = {
|
||||
.core_note_type = NT_PRSTATUS,
|
||||
.n = sizeof(struct user_pt_regs) / sizeof(u32),
|
||||
.size = sizeof(u32),
|
||||
.align = sizeof(u32),
|
||||
.get = gpr_get,
|
||||
.set = gpr_set,
|
||||
},
|
||||
[REGSET_TIE] = {
|
||||
.core_note_type = NT_PRFPREG,
|
||||
.n = sizeof(elf_xtregs_t) / sizeof(u32),
|
||||
.size = sizeof(u32),
|
||||
.align = sizeof(u32),
|
||||
.get = tie_get,
|
||||
.set = tie_set,
|
||||
},
|
||||
};
|
||||
|
||||
static const struct user_regset_view user_xtensa_view = {
|
||||
.name = "xtensa",
|
||||
.e_machine = EM_XTENSA,
|
||||
.regsets = xtensa_regsets,
|
||||
.n = ARRAY_SIZE(xtensa_regsets)
|
||||
};
|
||||
|
||||
const struct user_regset_view *task_user_regset_view(struct task_struct *task)
|
||||
{
|
||||
return &user_xtensa_view;
|
||||
}
|
||||
|
||||
void user_enable_single_step(struct task_struct *child)
|
||||
{
|
||||
@@ -54,161 +244,26 @@ void ptrace_disable(struct task_struct *child)
|
||||
|
||||
static int ptrace_getregs(struct task_struct *child, void __user *uregs)
|
||||
{
|
||||
struct pt_regs *regs = task_pt_regs(child);
|
||||
xtensa_gregset_t __user *gregset = uregs;
|
||||
unsigned long wb = regs->windowbase;
|
||||
int i;
|
||||
|
||||
if (!access_ok(VERIFY_WRITE, uregs, sizeof(xtensa_gregset_t)))
|
||||
return -EIO;
|
||||
|
||||
__put_user(regs->pc, &gregset->pc);
|
||||
__put_user(regs->ps & ~(1 << PS_EXCM_BIT), &gregset->ps);
|
||||
__put_user(regs->lbeg, &gregset->lbeg);
|
||||
__put_user(regs->lend, &gregset->lend);
|
||||
__put_user(regs->lcount, &gregset->lcount);
|
||||
__put_user(regs->windowstart, &gregset->windowstart);
|
||||
__put_user(regs->windowbase, &gregset->windowbase);
|
||||
__put_user(regs->threadptr, &gregset->threadptr);
|
||||
|
||||
for (i = 0; i < XCHAL_NUM_AREGS; i++)
|
||||
__put_user(regs->areg[i],
|
||||
gregset->a + ((wb * 4 + i) % XCHAL_NUM_AREGS));
|
||||
|
||||
return 0;
|
||||
return copy_regset_to_user(child, &user_xtensa_view, REGSET_GPR,
|
||||
0, sizeof(xtensa_gregset_t), uregs);
|
||||
}
|
||||
|
||||
static int ptrace_setregs(struct task_struct *child, void __user *uregs)
|
||||
{
|
||||
struct pt_regs *regs = task_pt_regs(child);
|
||||
xtensa_gregset_t *gregset = uregs;
|
||||
const unsigned long ps_mask = PS_CALLINC_MASK | PS_OWB_MASK;
|
||||
unsigned long ps;
|
||||
unsigned long wb, ws;
|
||||
|
||||
if (!access_ok(VERIFY_WRITE, uregs, sizeof(xtensa_gregset_t)))
|
||||
return -EIO;
|
||||
|
||||
__get_user(regs->pc, &gregset->pc);
|
||||
__get_user(ps, &gregset->ps);
|
||||
__get_user(regs->lbeg, &gregset->lbeg);
|
||||
__get_user(regs->lend, &gregset->lend);
|
||||
__get_user(regs->lcount, &gregset->lcount);
|
||||
__get_user(ws, &gregset->windowstart);
|
||||
__get_user(wb, &gregset->windowbase);
|
||||
__get_user(regs->threadptr, &gregset->threadptr);
|
||||
|
||||
regs->ps = (regs->ps & ~ps_mask) | (ps & ps_mask) | (1 << PS_EXCM_BIT);
|
||||
|
||||
if (wb >= XCHAL_NUM_AREGS / 4)
|
||||
return -EFAULT;
|
||||
|
||||
if (wb != regs->windowbase || ws != regs->windowstart) {
|
||||
unsigned long rotws, wmask;
|
||||
|
||||
rotws = (((ws | (ws << WSBITS)) >> wb) &
|
||||
((1 << WSBITS) - 1)) & ~1;
|
||||
wmask = ((rotws ? WSBITS + 1 - ffs(rotws) : 0) << 4) |
|
||||
(rotws & 0xF) | 1;
|
||||
regs->windowbase = wb;
|
||||
regs->windowstart = ws;
|
||||
regs->wmask = wmask;
|
||||
}
|
||||
|
||||
if (wb != 0 && __copy_from_user(regs->areg + XCHAL_NUM_AREGS - wb * 4,
|
||||
gregset->a, wb * 16))
|
||||
return -EFAULT;
|
||||
|
||||
if (__copy_from_user(regs->areg, gregset->a + wb * 4,
|
||||
(WSBITS - wb) * 16))
|
||||
return -EFAULT;
|
||||
|
||||
return 0;
|
||||
return copy_regset_from_user(child, &user_xtensa_view, REGSET_GPR,
|
||||
0, sizeof(xtensa_gregset_t), uregs);
|
||||
}
|
||||
|
||||
|
||||
#if XTENSA_HAVE_COPROCESSORS
|
||||
#define CP_OFFSETS(cp) \
|
||||
{ \
|
||||
.elf_xtregs_offset = offsetof(elf_xtregs_t, cp), \
|
||||
.ti_offset = offsetof(struct thread_info, xtregs_cp.cp), \
|
||||
.sz = sizeof(xtregs_ ## cp ## _t), \
|
||||
}
|
||||
|
||||
static const struct {
|
||||
size_t elf_xtregs_offset;
|
||||
size_t ti_offset;
|
||||
size_t sz;
|
||||
} cp_offsets[] = {
|
||||
CP_OFFSETS(cp0),
|
||||
CP_OFFSETS(cp1),
|
||||
CP_OFFSETS(cp2),
|
||||
CP_OFFSETS(cp3),
|
||||
CP_OFFSETS(cp4),
|
||||
CP_OFFSETS(cp5),
|
||||
CP_OFFSETS(cp6),
|
||||
CP_OFFSETS(cp7),
|
||||
};
|
||||
#endif
|
||||
|
||||
static int ptrace_getxregs(struct task_struct *child, void __user *uregs)
|
||||
{
|
||||
struct pt_regs *regs = task_pt_regs(child);
|
||||
struct thread_info *ti = task_thread_info(child);
|
||||
elf_xtregs_t __user *xtregs = uregs;
|
||||
int ret = 0;
|
||||
int i __maybe_unused;
|
||||
|
||||
if (!access_ok(VERIFY_WRITE, uregs, sizeof(elf_xtregs_t)))
|
||||
return -EIO;
|
||||
|
||||
#if XTENSA_HAVE_COPROCESSORS
|
||||
/* Flush all coprocessor registers to memory. */
|
||||
coprocessor_flush_all(ti);
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(cp_offsets); ++i)
|
||||
ret |= __copy_to_user((char __user *)xtregs +
|
||||
cp_offsets[i].elf_xtregs_offset,
|
||||
(const char *)ti +
|
||||
cp_offsets[i].ti_offset,
|
||||
cp_offsets[i].sz);
|
||||
#endif
|
||||
ret |= __copy_to_user(&xtregs->opt, ®s->xtregs_opt,
|
||||
sizeof(xtregs->opt));
|
||||
ret |= __copy_to_user(&xtregs->user,&ti->xtregs_user,
|
||||
sizeof(xtregs->user));
|
||||
|
||||
return ret ? -EFAULT : 0;
|
||||
return copy_regset_to_user(child, &user_xtensa_view, REGSET_TIE,
|
||||
0, sizeof(elf_xtregs_t), uregs);
|
||||
}
|
||||
|
||||
static int ptrace_setxregs(struct task_struct *child, void __user *uregs)
|
||||
{
|
||||
struct thread_info *ti = task_thread_info(child);
|
||||
struct pt_regs *regs = task_pt_regs(child);
|
||||
elf_xtregs_t *xtregs = uregs;
|
||||
int ret = 0;
|
||||
int i __maybe_unused;
|
||||
|
||||
if (!access_ok(VERIFY_READ, uregs, sizeof(elf_xtregs_t)))
|
||||
return -EFAULT;
|
||||
|
||||
#if XTENSA_HAVE_COPROCESSORS
|
||||
/* Flush all coprocessors before we overwrite them. */
|
||||
coprocessor_flush_all(ti);
|
||||
coprocessor_release_all(ti);
|
||||
|
||||
for (i = 0; i < ARRAY_SIZE(cp_offsets); ++i)
|
||||
ret |= __copy_from_user((char *)ti + cp_offsets[i].ti_offset,
|
||||
(const char __user *)xtregs +
|
||||
cp_offsets[i].elf_xtregs_offset,
|
||||
cp_offsets[i].sz);
|
||||
#endif
|
||||
ret |= __copy_from_user(®s->xtregs_opt, &xtregs->opt,
|
||||
sizeof(xtregs->opt));
|
||||
ret |= __copy_from_user(&ti->xtregs_user, &xtregs->user,
|
||||
sizeof(xtregs->user));
|
||||
|
||||
return ret ? -EFAULT : 0;
|
||||
return copy_regset_from_user(child, &user_xtensa_view, REGSET_TIE,
|
||||
0, sizeof(elf_xtregs_t), uregs);
|
||||
}
|
||||
|
||||
static int ptrace_peekusr(struct task_struct *child, long regno,
|
||||
@@ -447,20 +502,10 @@ long arch_ptrace(struct task_struct *child, long request,
|
||||
void __user *datap = (void __user *) data;
|
||||
|
||||
switch (request) {
|
||||
case PTRACE_PEEKTEXT: /* read word at location addr. */
|
||||
case PTRACE_PEEKDATA:
|
||||
ret = generic_ptrace_peekdata(child, addr, data);
|
||||
break;
|
||||
|
||||
case PTRACE_PEEKUSR: /* read register specified by addr. */
|
||||
ret = ptrace_peekusr(child, addr, datap);
|
||||
break;
|
||||
|
||||
case PTRACE_POKETEXT: /* write the word at location addr. */
|
||||
case PTRACE_POKEDATA:
|
||||
ret = generic_ptrace_pokedata(child, addr, data);
|
||||
break;
|
||||
|
||||
case PTRACE_POKEUSR: /* write register specified by addr. */
|
||||
ret = ptrace_pokeusr(child, addr, data);
|
||||
break;
|
||||
@@ -497,19 +542,23 @@ long arch_ptrace(struct task_struct *child, long request,
|
||||
return ret;
|
||||
}
|
||||
|
||||
unsigned long do_syscall_trace_enter(struct pt_regs *regs)
|
||||
void do_syscall_trace_enter(struct pt_regs *regs)
|
||||
{
|
||||
if (test_thread_flag(TIF_SYSCALL_TRACE) &&
|
||||
tracehook_report_syscall_entry(regs))
|
||||
return -1;
|
||||
regs->syscall = NO_SYSCALL;
|
||||
|
||||
return regs->areg[2];
|
||||
if (test_thread_flag(TIF_SYSCALL_TRACEPOINT))
|
||||
trace_sys_enter(regs, syscall_get_nr(current, regs));
|
||||
}
|
||||
|
||||
void do_syscall_trace_leave(struct pt_regs *regs)
|
||||
{
|
||||
int step;
|
||||
|
||||
if (test_thread_flag(TIF_SYSCALL_TRACEPOINT))
|
||||
trace_sys_exit(regs, regs_return_value(regs));
|
||||
|
||||
step = test_thread_flag(TIF_SINGLESTEP);
|
||||
|
||||
if (step || test_thread_flag(TIF_SYSCALL_TRACE))
|
||||
|
||||
@@ -318,9 +318,9 @@ static inline int mem_reserve(unsigned long start, unsigned long end)
|
||||
void __init setup_arch(char **cmdline_p)
|
||||
{
|
||||
pr_info("config ID: %08x:%08x\n",
|
||||
get_sr(SREG_EPC), get_sr(SREG_EXCSAVE));
|
||||
if (get_sr(SREG_EPC) != XCHAL_HW_CONFIGID0 ||
|
||||
get_sr(SREG_EXCSAVE) != XCHAL_HW_CONFIGID1)
|
||||
xtensa_get_sr(SREG_EPC), xtensa_get_sr(SREG_EXCSAVE));
|
||||
if (xtensa_get_sr(SREG_EPC) != XCHAL_HW_CONFIGID0 ||
|
||||
xtensa_get_sr(SREG_EXCSAVE) != XCHAL_HW_CONFIGID1)
|
||||
pr_info("built for config ID: %08x:%08x\n",
|
||||
XCHAL_HW_CONFIGID0, XCHAL_HW_CONFIGID1);
|
||||
|
||||
@@ -596,7 +596,7 @@ c_show(struct seq_file *f, void *slot)
|
||||
num_online_cpus(),
|
||||
cpumask_pr_args(cpu_online_mask),
|
||||
XCHAL_BUILD_UNIQUE_ID,
|
||||
get_sr(SREG_EPC), get_sr(SREG_EXCSAVE),
|
||||
xtensa_get_sr(SREG_EPC), xtensa_get_sr(SREG_EXCSAVE),
|
||||
XCHAL_HAVE_BE ? "big" : "little",
|
||||
ccount_freq/1000000,
|
||||
(ccount_freq/10000) % 100,
|
||||
|
||||
@@ -185,13 +185,13 @@ restore_sigcontext(struct pt_regs *regs, struct rt_sigframe __user *frame)
|
||||
COPY(sar);
|
||||
#undef COPY
|
||||
|
||||
/* All registers were flushed to stack. Start with a prestine frame. */
|
||||
/* All registers were flushed to stack. Start with a pristine frame. */
|
||||
|
||||
regs->wmask = 1;
|
||||
regs->windowbase = 0;
|
||||
regs->windowstart = 1;
|
||||
|
||||
regs->syscall = -1; /* disable syscall checks */
|
||||
regs->syscall = NO_SYSCALL; /* disable syscall checks */
|
||||
|
||||
/* For PS, restore only PS.CALLINC.
|
||||
* Assume that all other bits are either the same as for the signal
|
||||
@@ -423,7 +423,7 @@ static void do_signal(struct pt_regs *regs)
|
||||
|
||||
/* Are we from a system call? */
|
||||
|
||||
if ((signed)regs->syscall >= 0) {
|
||||
if (regs->syscall != NO_SYSCALL) {
|
||||
|
||||
/* If so, check system call restarting.. */
|
||||
|
||||
@@ -462,7 +462,7 @@ static void do_signal(struct pt_regs *regs)
|
||||
}
|
||||
|
||||
/* Did we come from a system call? */
|
||||
if ((signed) regs->syscall >= 0) {
|
||||
if (regs->syscall != NO_SYSCALL) {
|
||||
/* Restart the system call - no handlers present */
|
||||
switch (regs->areg[2]) {
|
||||
case -ERESTARTNOHAND:
|
||||
|
||||
@@ -28,13 +28,12 @@
|
||||
#include <linux/sched/mm.h>
|
||||
#include <linux/shm.h>
|
||||
|
||||
typedef void (*syscall_t)(void);
|
||||
syscall_t sys_call_table[__NR_syscalls] /* FIXME __cacheline_aligned */= {
|
||||
[0 ... __NR_syscalls - 1] = (syscall_t)&sys_ni_syscall,
|
||||
|
||||
syscall_t sys_call_table[__NR_syscall_count] /* FIXME __cacheline_aligned */= {
|
||||
[0 ... __NR_syscall_count - 1] = (syscall_t)&sys_ni_syscall,
|
||||
|
||||
#define __SYSCALL(nr,symbol,nargs) [ nr ] = (syscall_t)symbol,
|
||||
#include <uapi/asm/unistd.h>
|
||||
#define __SYSCALL(nr, entry, nargs)[nr] = (syscall_t)entry,
|
||||
#include <asm/syscall_table.h>
|
||||
#undef __SYSCALL
|
||||
};
|
||||
|
||||
#define COLOUR_ALIGN(addr, pgoff) \
|
||||
|
||||
38
arch/xtensa/kernel/syscalls/Makefile
Normal file
38
arch/xtensa/kernel/syscalls/Makefile
Normal file
@@ -0,0 +1,38 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
kapi := arch/$(SRCARCH)/include/generated/asm
|
||||
uapi := arch/$(SRCARCH)/include/generated/uapi/asm
|
||||
|
||||
_dummy := $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)') \
|
||||
$(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)')
|
||||
|
||||
syscall := $(srctree)/$(src)/syscall.tbl
|
||||
syshdr := $(srctree)/$(src)/syscallhdr.sh
|
||||
systbl := $(srctree)/$(src)/syscalltbl.sh
|
||||
|
||||
quiet_cmd_syshdr = SYSHDR $@
|
||||
cmd_syshdr = $(CONFIG_SHELL) '$(syshdr)' '$<' '$@' \
|
||||
'$(syshdr_abis_$(basetarget))' \
|
||||
'$(syshdr_pfx_$(basetarget))' \
|
||||
'$(syshdr_offset_$(basetarget))'
|
||||
|
||||
quiet_cmd_systbl = SYSTBL $@
|
||||
cmd_systbl = $(CONFIG_SHELL) '$(systbl)' '$<' '$@' \
|
||||
'$(systbl_abis_$(basetarget))' \
|
||||
'$(systbl_abi_$(basetarget))' \
|
||||
'$(systbl_offset_$(basetarget))'
|
||||
|
||||
$(uapi)/unistd_32.h: $(syscall) $(syshdr)
|
||||
$(call if_changed,syshdr)
|
||||
|
||||
$(kapi)/syscall_table.h: $(syscall) $(systbl)
|
||||
$(call if_changed,systbl)
|
||||
|
||||
uapisyshdr-y += unistd_32.h
|
||||
kapisyshdr-y += syscall_table.h
|
||||
|
||||
targets += $(uapisyshdr-y) $(kapisyshdr-y)
|
||||
|
||||
PHONY += all
|
||||
all: $(addprefix $(uapi)/,$(uapisyshdr-y))
|
||||
all: $(addprefix $(kapi)/,$(kapisyshdr-y))
|
||||
@:
|
||||
374
arch/xtensa/kernel/syscalls/syscall.tbl
Normal file
374
arch/xtensa/kernel/syscalls/syscall.tbl
Normal file
@@ -0,0 +1,374 @@
|
||||
# SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note
|
||||
#
|
||||
# system call numbers and entry vectors for xtensa
|
||||
#
|
||||
# The format is:
|
||||
# <number> <abi> <name> <entry point>
|
||||
#
|
||||
# The <abi> is always "common" for this file
|
||||
#
|
||||
0 common spill sys_ni_syscall
|
||||
1 common xtensa sys_ni_syscall
|
||||
2 common available4 sys_ni_syscall
|
||||
3 common available5 sys_ni_syscall
|
||||
4 common available6 sys_ni_syscall
|
||||
5 common available7 sys_ni_syscall
|
||||
6 common available8 sys_ni_syscall
|
||||
7 common available9 sys_ni_syscall
|
||||
# File Operations
|
||||
8 common open sys_open
|
||||
9 common close sys_close
|
||||
10 common dup sys_dup
|
||||
11 common dup2 sys_dup2
|
||||
12 common read sys_read
|
||||
13 common write sys_write
|
||||
14 common select sys_select
|
||||
15 common lseek sys_lseek
|
||||
16 common poll sys_poll
|
||||
17 common _llseek sys_llseek
|
||||
18 common epoll_wait sys_epoll_wait
|
||||
19 common epoll_ctl sys_epoll_ctl
|
||||
20 common epoll_create sys_epoll_create
|
||||
21 common creat sys_creat
|
||||
22 common truncate sys_truncate
|
||||
23 common ftruncate sys_ftruncate
|
||||
24 common readv sys_readv
|
||||
25 common writev sys_writev
|
||||
26 common fsync sys_fsync
|
||||
27 common fdatasync sys_fdatasync
|
||||
28 common truncate64 sys_truncate64
|
||||
29 common ftruncate64 sys_ftruncate64
|
||||
30 common pread64 sys_pread64
|
||||
31 common pwrite64 sys_pwrite64
|
||||
32 common link sys_link
|
||||
33 common rename sys_rename
|
||||
34 common symlink sys_symlink
|
||||
35 common readlink sys_readlink
|
||||
36 common mknod sys_mknod
|
||||
37 common pipe sys_pipe
|
||||
38 common unlink sys_unlink
|
||||
39 common rmdir sys_rmdir
|
||||
40 common mkdir sys_mkdir
|
||||
41 common chdir sys_chdir
|
||||
42 common fchdir sys_fchdir
|
||||
43 common getcwd sys_getcwd
|
||||
44 common chmod sys_chmod
|
||||
45 common chown sys_chown
|
||||
46 common stat sys_newstat
|
||||
47 common stat64 sys_stat64
|
||||
48 common lchown sys_lchown
|
||||
49 common lstat sys_newlstat
|
||||
50 common lstat64 sys_lstat64
|
||||
51 common available51 sys_ni_syscall
|
||||
52 common fchmod sys_fchmod
|
||||
53 common fchown sys_fchown
|
||||
54 common fstat sys_newfstat
|
||||
55 common fstat64 sys_fstat64
|
||||
56 common flock sys_flock
|
||||
57 common access sys_access
|
||||
58 common umask sys_umask
|
||||
59 common getdents sys_getdents
|
||||
60 common getdents64 sys_getdents64
|
||||
61 common fcntl64 sys_fcntl64
|
||||
62 common fallocate sys_fallocate
|
||||
63 common fadvise64_64 xtensa_fadvise64_64
|
||||
64 common utime sys_utime
|
||||
65 common utimes sys_utimes
|
||||
66 common ioctl sys_ioctl
|
||||
67 common fcntl sys_fcntl
|
||||
68 common setxattr sys_setxattr
|
||||
69 common getxattr sys_getxattr
|
||||
70 common listxattr sys_listxattr
|
||||
71 common removexattr sys_removexattr
|
||||
72 common lsetxattr sys_lsetxattr
|
||||
73 common lgetxattr sys_lgetxattr
|
||||
74 common llistxattr sys_llistxattr
|
||||
75 common lremovexattr sys_lremovexattr
|
||||
76 common fsetxattr sys_fsetxattr
|
||||
77 common fgetxattr sys_fgetxattr
|
||||
78 common flistxattr sys_flistxattr
|
||||
79 common fremovexattr sys_fremovexattr
|
||||
# File Map / Shared Memory Operations
|
||||
80 common mmap2 sys_mmap_pgoff
|
||||
81 common munmap sys_munmap
|
||||
82 common mprotect sys_mprotect
|
||||
83 common brk sys_brk
|
||||
84 common mlock sys_mlock
|
||||
85 common munlock sys_munlock
|
||||
86 common mlockall sys_mlockall
|
||||
87 common munlockall sys_munlockall
|
||||
88 common mremap sys_mremap
|
||||
89 common msync sys_msync
|
||||
90 common mincore sys_mincore
|
||||
91 common madvise sys_madvise
|
||||
92 common shmget sys_shmget
|
||||
93 common shmat xtensa_shmat
|
||||
94 common shmctl sys_shmctl
|
||||
95 common shmdt sys_shmdt
|
||||
# Socket Operations
|
||||
96 common socket sys_socket
|
||||
97 common setsockopt sys_setsockopt
|
||||
98 common getsockopt sys_getsockopt
|
||||
99 common shutdown sys_shutdown
|
||||
100 common bind sys_bind
|
||||
101 common connect sys_connect
|
||||
102 common listen sys_listen
|
||||
103 common accept sys_accept
|
||||
104 common getsockname sys_getsockname
|
||||
105 common getpeername sys_getpeername
|
||||
106 common sendmsg sys_sendmsg
|
||||
107 common recvmsg sys_recvmsg
|
||||
108 common send sys_send
|
||||
109 common recv sys_recv
|
||||
110 common sendto sys_sendto
|
||||
111 common recvfrom sys_recvfrom
|
||||
112 common socketpair sys_socketpair
|
||||
113 common sendfile sys_sendfile
|
||||
114 common sendfile64 sys_sendfile64
|
||||
115 common sendmmsg sys_sendmmsg
|
||||
# Process Operations
|
||||
116 common clone sys_clone
|
||||
117 common execve sys_execve
|
||||
118 common exit sys_exit
|
||||
119 common exit_group sys_exit_group
|
||||
120 common getpid sys_getpid
|
||||
121 common wait4 sys_wait4
|
||||
122 common waitid sys_waitid
|
||||
123 common kill sys_kill
|
||||
124 common tkill sys_tkill
|
||||
125 common tgkill sys_tgkill
|
||||
126 common set_tid_address sys_set_tid_address
|
||||
127 common gettid sys_gettid
|
||||
128 common setsid sys_setsid
|
||||
129 common getsid sys_getsid
|
||||
130 common prctl sys_prctl
|
||||
131 common personality sys_personality
|
||||
132 common getpriority sys_getpriority
|
||||
133 common setpriority sys_setpriority
|
||||
134 common setitimer sys_setitimer
|
||||
135 common getitimer sys_getitimer
|
||||
136 common setuid sys_setuid
|
||||
137 common getuid sys_getuid
|
||||
138 common setgid sys_setgid
|
||||
139 common getgid sys_getgid
|
||||
140 common geteuid sys_geteuid
|
||||
141 common getegid sys_getegid
|
||||
142 common setreuid sys_setreuid
|
||||
143 common setregid sys_setregid
|
||||
144 common setresuid sys_setresuid
|
||||
145 common getresuid sys_getresuid
|
||||
146 common setresgid sys_setresgid
|
||||
147 common getresgid sys_getresgid
|
||||
148 common setpgid sys_setpgid
|
||||
149 common getpgid sys_getpgid
|
||||
150 common getppid sys_getppid
|
||||
151 common getpgrp sys_getpgrp
|
||||
# 152 was set_thread_area
|
||||
152 common reserved152 sys_ni_syscall
|
||||
# 153 was get_thread_area
|
||||
153 common reserved153 sys_ni_syscall
|
||||
154 common times sys_times
|
||||
155 common acct sys_acct
|
||||
156 common sched_setaffinity sys_sched_setaffinity
|
||||
157 common sched_getaffinity sys_sched_getaffinity
|
||||
158 common capget sys_capget
|
||||
159 common capset sys_capset
|
||||
160 common ptrace sys_ptrace
|
||||
161 common semtimedop sys_semtimedop
|
||||
162 common semget sys_semget
|
||||
163 common semop sys_semop
|
||||
164 common semctl sys_semctl
|
||||
165 common available165 sys_ni_syscall
|
||||
166 common msgget sys_msgget
|
||||
167 common msgsnd sys_msgsnd
|
||||
168 common msgrcv sys_msgrcv
|
||||
169 common msgctl sys_msgctl
|
||||
170 common available170 sys_ni_syscall
|
||||
# File System
|
||||
171 common umount2 sys_umount
|
||||
172 common mount sys_mount
|
||||
173 common swapon sys_swapon
|
||||
174 common chroot sys_chroot
|
||||
175 common pivot_root sys_pivot_root
|
||||
176 common umount sys_oldumount
|
||||
177 common swapoff sys_swapoff
|
||||
178 common sync sys_sync
|
||||
179 common syncfs sys_syncfs
|
||||
180 common setfsuid sys_setfsuid
|
||||
181 common setfsgid sys_setfsgid
|
||||
182 common sysfs sys_sysfs
|
||||
183 common ustat sys_ustat
|
||||
184 common statfs sys_statfs
|
||||
185 common fstatfs sys_fstatfs
|
||||
186 common statfs64 sys_statfs64
|
||||
187 common fstatfs64 sys_fstatfs64
|
||||
# System
|
||||
188 common setrlimit sys_setrlimit
|
||||
189 common getrlimit sys_getrlimit
|
||||
190 common getrusage sys_getrusage
|
||||
191 common futex sys_futex
|
||||
192 common gettimeofday sys_gettimeofday
|
||||
193 common settimeofday sys_settimeofday
|
||||
194 common adjtimex sys_adjtimex
|
||||
195 common nanosleep sys_nanosleep
|
||||
196 common getgroups sys_getgroups
|
||||
197 common setgroups sys_setgroups
|
||||
198 common sethostname sys_sethostname
|
||||
199 common setdomainname sys_setdomainname
|
||||
200 common syslog sys_syslog
|
||||
201 common vhangup sys_vhangup
|
||||
202 common uselib sys_uselib
|
||||
203 common reboot sys_reboot
|
||||
204 common quotactl sys_quotactl
|
||||
# 205 was old nfsservctl
|
||||
205 common nfsservctl sys_ni_syscall
|
||||
206 common _sysctl sys_sysctl
|
||||
207 common bdflush sys_bdflush
|
||||
208 common uname sys_newuname
|
||||
209 common sysinfo sys_sysinfo
|
||||
210 common init_module sys_init_module
|
||||
211 common delete_module sys_delete_module
|
||||
212 common sched_setparam sys_sched_setparam
|
||||
213 common sched_getparam sys_sched_getparam
|
||||
214 common sched_setscheduler sys_sched_setscheduler
|
||||
215 common sched_getscheduler sys_sched_getscheduler
|
||||
216 common sched_get_priority_max sys_sched_get_priority_max
|
||||
217 common sched_get_priority_min sys_sched_get_priority_min
|
||||
218 common sched_rr_get_interval sys_sched_rr_get_interval
|
||||
219 common sched_yield sys_sched_yield
|
||||
222 common available222 sys_ni_syscall
|
||||
# Signal Handling
|
||||
223 common restart_syscall sys_restart_syscall
|
||||
224 common sigaltstack sys_sigaltstack
|
||||
225 common rt_sigreturn xtensa_rt_sigreturn
|
||||
226 common rt_sigaction sys_rt_sigaction
|
||||
227 common rt_sigprocmask sys_rt_sigprocmask
|
||||
228 common rt_sigpending sys_rt_sigpending
|
||||
229 common rt_sigtimedwait sys_rt_sigtimedwait
|
||||
230 common rt_sigqueueinfo sys_rt_sigqueueinfo
|
||||
231 common rt_sigsuspend sys_rt_sigsuspend
|
||||
# Message
|
||||
232 common mq_open sys_mq_open
|
||||
233 common mq_unlink sys_mq_unlink
|
||||
234 common mq_timedsend sys_mq_timedsend
|
||||
235 common mq_timedreceive sys_mq_timedreceive
|
||||
236 common mq_notify sys_mq_notify
|
||||
237 common mq_getsetattr sys_mq_getsetattr
|
||||
238 common available238 sys_ni_syscall
|
||||
239 common io_setup sys_io_setup
|
||||
# IO
|
||||
240 common io_destroy sys_io_destroy
|
||||
241 common io_submit sys_io_submit
|
||||
242 common io_getevents sys_io_getevents
|
||||
243 common io_cancel sys_io_cancel
|
||||
244 common clock_settime sys_clock_settime
|
||||
245 common clock_gettime sys_clock_gettime
|
||||
246 common clock_getres sys_clock_getres
|
||||
247 common clock_nanosleep sys_clock_nanosleep
|
||||
# Timer
|
||||
248 common timer_create sys_timer_create
|
||||
249 common timer_delete sys_timer_delete
|
||||
250 common timer_settime sys_timer_settime
|
||||
251 common timer_gettime sys_timer_gettime
|
||||
252 common timer_getoverrun sys_timer_getoverrun
|
||||
# System
|
||||
253 common reserved253 sys_ni_syscall
|
||||
254 common lookup_dcookie sys_lookup_dcookie
|
||||
255 common available255 sys_ni_syscall
|
||||
256 common add_key sys_add_key
|
||||
257 common request_key sys_request_key
|
||||
258 common keyctl sys_keyctl
|
||||
259 common available259 sys_ni_syscall
|
||||
260 common readahead sys_readahead
|
||||
261 common remap_file_pages sys_remap_file_pages
|
||||
262 common migrate_pages sys_migrate_pages
|
||||
263 common mbind sys_mbind
|
||||
264 common get_mempolicy sys_get_mempolicy
|
||||
265 common set_mempolicy sys_set_mempolicy
|
||||
266 common unshare sys_unshare
|
||||
267 common move_pages sys_move_pages
|
||||
268 common splice sys_splice
|
||||
269 common tee sys_tee
|
||||
270 common vmsplice sys_vmsplice
|
||||
271 common available271 sys_ni_syscall
|
||||
272 common pselect6 sys_pselect6
|
||||
273 common ppoll sys_ppoll
|
||||
274 common epoll_pwait sys_epoll_pwait
|
||||
275 common epoll_create1 sys_epoll_create1
|
||||
276 common inotify_init sys_inotify_init
|
||||
277 common inotify_add_watch sys_inotify_add_watch
|
||||
278 common inotify_rm_watch sys_inotify_rm_watch
|
||||
279 common inotify_init1 sys_inotify_init1
|
||||
280 common getcpu sys_getcpu
|
||||
281 common kexec_load sys_ni_syscall
|
||||
282 common ioprio_set sys_ioprio_set
|
||||
283 common ioprio_get sys_ioprio_get
|
||||
284 common set_robust_list sys_set_robust_list
|
||||
285 common get_robust_list sys_get_robust_list
|
||||
286 common available286 sys_ni_syscall
|
||||
287 common available287 sys_ni_syscall
|
||||
# Relative File Operations
|
||||
288 common openat sys_openat
|
||||
289 common mkdirat sys_mkdirat
|
||||
290 common mknodat sys_mknodat
|
||||
291 common unlinkat sys_unlinkat
|
||||
292 common renameat sys_renameat
|
||||
293 common linkat sys_linkat
|
||||
294 common symlinkat sys_symlinkat
|
||||
295 common readlinkat sys_readlinkat
|
||||
296 common utimensat sys_utimensat
|
||||
297 common fchownat sys_fchownat
|
||||
298 common futimesat sys_futimesat
|
||||
299 common fstatat64 sys_fstatat64
|
||||
300 common fchmodat sys_fchmodat
|
||||
301 common faccessat sys_faccessat
|
||||
302 common available302 sys_ni_syscall
|
||||
303 common available303 sys_ni_syscall
|
||||
304 common signalfd sys_signalfd
|
||||
# 305 was timerfd
|
||||
306 common eventfd sys_eventfd
|
||||
307 common recvmmsg sys_recvmmsg
|
||||
308 common setns sys_setns
|
||||
309 common signalfd4 sys_signalfd4
|
||||
310 common dup3 sys_dup3
|
||||
311 common pipe2 sys_pipe2
|
||||
312 common timerfd_create sys_timerfd_create
|
||||
313 common timerfd_settime sys_timerfd_settime
|
||||
314 common timerfd_gettime sys_timerfd_gettime
|
||||
315 common available315 sys_ni_syscall
|
||||
316 common eventfd2 sys_eventfd2
|
||||
317 common preadv sys_preadv
|
||||
318 common pwritev sys_pwritev
|
||||
319 common available319 sys_ni_syscall
|
||||
320 common fanotify_init sys_fanotify_init
|
||||
321 common fanotify_mark sys_fanotify_mark
|
||||
322 common process_vm_readv sys_process_vm_readv
|
||||
323 common process_vm_writev sys_process_vm_writev
|
||||
324 common name_to_handle_at sys_name_to_handle_at
|
||||
325 common open_by_handle_at sys_open_by_handle_at
|
||||
326 common sync_file_range2 sys_sync_file_range2
|
||||
327 common perf_event_open sys_perf_event_open
|
||||
328 common rt_tgsigqueueinfo sys_rt_tgsigqueueinfo
|
||||
329 common clock_adjtime sys_clock_adjtime
|
||||
330 common prlimit64 sys_prlimit64
|
||||
331 common kcmp sys_kcmp
|
||||
332 common finit_module sys_finit_module
|
||||
333 common accept4 sys_accept4
|
||||
334 common sched_setattr sys_sched_setattr
|
||||
335 common sched_getattr sys_sched_getattr
|
||||
336 common renameat2 sys_renameat2
|
||||
337 common seccomp sys_seccomp
|
||||
338 common getrandom sys_getrandom
|
||||
339 common memfd_create sys_memfd_create
|
||||
340 common bpf sys_bpf
|
||||
341 common execveat sys_execveat
|
||||
342 common userfaultfd sys_userfaultfd
|
||||
343 common membarrier sys_membarrier
|
||||
344 common mlock2 sys_mlock2
|
||||
345 common copy_file_range sys_copy_file_range
|
||||
346 common preadv2 sys_preadv2
|
||||
347 common pwritev2 sys_pwritev2
|
||||
348 common pkey_mprotect sys_pkey_mprotect
|
||||
349 common pkey_alloc sys_pkey_alloc
|
||||
350 common pkey_free sys_pkey_free
|
||||
351 common statx sys_statx
|
||||
36
arch/xtensa/kernel/syscalls/syscallhdr.sh
Normal file
36
arch/xtensa/kernel/syscalls/syscallhdr.sh
Normal file
@@ -0,0 +1,36 @@
|
||||
#!/bin/sh
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
|
||||
in="$1"
|
||||
out="$2"
|
||||
my_abis=`echo "($3)" | tr ',' '|'`
|
||||
prefix="$4"
|
||||
offset="$5"
|
||||
|
||||
fileguard=_UAPI_ASM_XTENSA_`basename "$out" | sed \
|
||||
-e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \
|
||||
-e 's/[^A-Z0-9_]/_/g' -e 's/__/_/g'`
|
||||
grep -E "^[0-9A-Fa-fXx]+[[:space:]]+${my_abis}" "$in" | sort -n | (
|
||||
printf "#ifndef %s\n" "${fileguard}"
|
||||
printf "#define %s\n" "${fileguard}"
|
||||
printf "\n"
|
||||
|
||||
nxt=0
|
||||
while read nr abi name entry ; do
|
||||
if [ -z "$offset" ]; then
|
||||
printf "#define __NR_%s%s\t%s\n" \
|
||||
"${prefix}" "${name}" "${nr}"
|
||||
else
|
||||
printf "#define __NR_%s%s\t(%s + %s)\n" \
|
||||
"${prefix}" "${name}" "${offset}" "${nr}"
|
||||
fi
|
||||
nxt=$((nr+1))
|
||||
done
|
||||
|
||||
printf "\n"
|
||||
printf "#ifdef __KERNEL__\n"
|
||||
printf "#define __NR_syscalls\t%s\n" "${nxt}"
|
||||
printf "#endif\n"
|
||||
printf "\n"
|
||||
printf "#endif /* %s */" "${fileguard}"
|
||||
) > "$out"
|
||||
32
arch/xtensa/kernel/syscalls/syscalltbl.sh
Normal file
32
arch/xtensa/kernel/syscalls/syscalltbl.sh
Normal file
@@ -0,0 +1,32 @@
|
||||
#!/bin/sh
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
|
||||
in="$1"
|
||||
out="$2"
|
||||
my_abis=`echo "($3)" | tr ',' '|'`
|
||||
my_abi="$4"
|
||||
offset="$5"
|
||||
|
||||
emit() {
|
||||
t_nxt="$1"
|
||||
t_nr="$2"
|
||||
t_entry="$3"
|
||||
|
||||
while [ $t_nxt -lt $t_nr ]; do
|
||||
printf "__SYSCALL(%s, sys_ni_syscall, )\n" "${t_nxt}"
|
||||
t_nxt=$((t_nxt+1))
|
||||
done
|
||||
printf "__SYSCALL(%s, %s, )\n" "${t_nxt}" "${t_entry}"
|
||||
}
|
||||
|
||||
grep -E "^[0-9A-Fa-fXx]+[[:space:]]+${my_abis}" "$in" | sort -n | (
|
||||
nxt=0
|
||||
if [ -z "$offset" ]; then
|
||||
offset=0
|
||||
fi
|
||||
|
||||
while read nr abi name entry ; do
|
||||
emit $((nxt+offset)) $((nr+offset)) $entry
|
||||
nxt=$((nr+1))
|
||||
done
|
||||
) > "$out"
|
||||
@@ -51,7 +51,6 @@
|
||||
extern void kernel_exception(void);
|
||||
extern void user_exception(void);
|
||||
|
||||
extern void fast_syscall_kernel(void);
|
||||
extern void fast_syscall_user(void);
|
||||
extern void fast_alloca(void);
|
||||
extern void fast_unaligned(void);
|
||||
@@ -89,7 +88,6 @@ typedef struct {
|
||||
static dispatch_init_table_t __initdata dispatch_init_table[] = {
|
||||
|
||||
{ EXCCAUSE_ILLEGAL_INSTRUCTION, 0, do_illegal_instruction},
|
||||
{ EXCCAUSE_SYSTEM_CALL, KRNL, fast_syscall_kernel },
|
||||
{ EXCCAUSE_SYSTEM_CALL, USER, fast_syscall_user },
|
||||
{ EXCCAUSE_SYSTEM_CALL, 0, system_call },
|
||||
/* EXCCAUSE_INSTRUCTION_FETCH unhandled */
|
||||
@@ -215,8 +213,8 @@ extern void do_IRQ(int, struct pt_regs *);
|
||||
|
||||
static inline void check_valid_nmi(void)
|
||||
{
|
||||
unsigned intread = get_sr(interrupt);
|
||||
unsigned intenable = get_sr(intenable);
|
||||
unsigned intread = xtensa_get_sr(interrupt);
|
||||
unsigned intenable = xtensa_get_sr(intenable);
|
||||
|
||||
BUG_ON(intread & intenable &
|
||||
~(XTENSA_INTLEVEL_ANDBELOW_MASK(PROFILING_INTLEVEL) ^
|
||||
@@ -273,8 +271,8 @@ void do_interrupt(struct pt_regs *regs)
|
||||
irq_enter();
|
||||
|
||||
for (;;) {
|
||||
unsigned intread = get_sr(interrupt);
|
||||
unsigned intenable = get_sr(intenable);
|
||||
unsigned intread = xtensa_get_sr(interrupt);
|
||||
unsigned intenable = xtensa_get_sr(intenable);
|
||||
unsigned int_at_level = intread & intenable;
|
||||
unsigned level;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user