Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ffe6646 authored by Mike Frysinger's avatar Mike Frysinger Committed by Bryan Wu
Browse files

Blackfin arch: add an exception request/free api 



add an exception request/free api similar to the interrupt request/fre
api so people can utilize the free software based exceptions for their
own purposes

Signed-off-by: default avatarMike Frysinger <michael.frysinger@analog.com>
Signed-off-by: default avatarBryan Wu <bryan.wu@analog.com>
parent dbcc78be

arch/blackfin/kernel/traps.c

+36 −2
Original line number Diff line number Diff line
@@ -51,8 +51,6 @@ void __init trap_init(void) 
	CSYNC();

}



asmlinkage void trap_c(struct pt_regs *fp);



int kstack_depth_to_print = 48;



#ifdef CONFIG_DEBUG_BFIN_HWTRACE_ON
@@ -693,6 +691,42 @@ asmlinkage int sys_bfin_spinlock(int *spinlock) 
	return ret;

}



int bfin_request_exception(unsigned int exception, void (*handler)(void))

{

	void (*curr_handler)(void);



	if (exception > 0x3F)

		return -EINVAL;



	curr_handler = ex_table[exception];



	if (curr_handler != ex_replaceable)

		return -EBUSY;



	ex_table[exception] = handler;



	return 0;

}

EXPORT_SYMBOL(bfin_request_exception);



int bfin_free_exception(unsigned int exception, void (*handler)(void))

{

	void (*curr_handler)(void);



	if (exception > 0x3F)

		return -EINVAL;



	curr_handler = ex_table[exception];



	if (curr_handler != handler)

		return -EBUSY;



	ex_table[exception] = ex_replaceable;



	return 0;

}

EXPORT_SYMBOL(bfin_free_exception);



void panic_cplb_error(int cplb_panic, struct pt_regs *fp)

{

	switch (cplb_panic) {

arch/blackfin/mach-common/entry.S

+22 −20
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ ENTRY(_ex_single_step) 
	cc = r6 == r7;

	if !cc jump _ex_trap_c;



_return_from_exception:

ENTRY(_return_from_exception)

	DEBUG_START_HWTRACE(p5, r7)

#if ANOMALY_05000257

	R7=LC0;
@@ -171,6 +171,9 @@ ENTRY(_handle_bad_cplb) 
	[--sp] = ASTAT;

	[--sp] = (R7:6, P5:4);



ENTRY(_ex_replaceable)

	nop;



ENTRY(_ex_trap_c)

	/* Call C code (trap_c) to handle the exception, which most

	 * likely involves sending a signal to the current process.
@@ -298,8 +301,8 @@ ENTRY(_trap) /* Exception: 4th entry into system event table(supervisor mode)*/ 
	r6.l = lo(SEQSTAT_EXCAUSE);

	r6.h = hi(SEQSTAT_EXCAUSE);

	r7 = r7 & r6;

	p5.h = _extable;

	p5.l = _extable;

	p5.h = _ex_table;

	p5.l = _ex_table;

	p4 = r7;

	p5 = p5 + (p4 << 2);

	p4 = [p5];
@@ -818,28 +821,27 @@ ENTRY(_software_trace_buff) 
#else

.data

#endif

ALIGN

_extable:

ENTRY(_ex_table)

	/* entry for each EXCAUSE[5:0]

	 * This table must be in sync with the table in ./kernel/traps.c

	 * EXCPT instruction can provide 4 bits of EXCAUSE, allowing 16 to be user defined

	 */

	.long _ex_syscall;      /* 0x00 - User Defined - Linux Syscall */

	.long _ex_syscall       /* 0x00 - User Defined - Linux Syscall */

	.long _ex_soft_bp       /* 0x01 - User Defined - Software breakpoint */

	.long _ex_trap_c        /* 0x02 - User Defined */

	.long _ex_replaceable   /* 0x02 - User Defined */

	.long _ex_trap_c        /* 0x03 - User Defined - userspace stack overflow */

	.long _ex_trap_c        /* 0x04 - User Defined */

	.long _ex_trap_c        /* 0x05 - User Defined */

	.long _ex_trap_c        /* 0x06 - User Defined */

	.long _ex_trap_c        /* 0x07 - User Defined */

	.long _ex_trap_c        /* 0x08 - User Defined */

	.long _ex_trap_c        /* 0x09 - User Defined */

	.long _ex_trap_c        /* 0x0A - User Defined */

	.long _ex_trap_c        /* 0x0B - User Defined */

	.long _ex_trap_c        /* 0x0C - User Defined */

	.long _ex_trap_c        /* 0x0D - User Defined */

	.long _ex_trap_c        /* 0x0E - User Defined */

	.long _ex_trap_c        /* 0x0F - User Defined */

	.long _ex_replaceable   /* 0x04 - User Defined */

	.long _ex_replaceable   /* 0x05 - User Defined */

	.long _ex_replaceable   /* 0x06 - User Defined */

	.long _ex_replaceable   /* 0x07 - User Defined */

	.long _ex_replaceable   /* 0x08 - User Defined */

	.long _ex_replaceable   /* 0x09 - User Defined */

	.long _ex_replaceable   /* 0x0A - User Defined */

	.long _ex_replaceable   /* 0x0B - User Defined */

	.long _ex_replaceable   /* 0x0C - User Defined */

	.long _ex_replaceable   /* 0x0D - User Defined */

	.long _ex_replaceable   /* 0x0E - User Defined */

	.long _ex_replaceable   /* 0x0F - User Defined */

	.long _ex_single_step   /* 0x10 - HW Single step */

#ifdef CONFIG_DEBUG_BFIN_HWTRACE_EXPAND

	.long _ex_trace_buff_full /* 0x11 - Trace Buffer Full */
@@ -893,8 +895,8 @@ _extable: 
	.long _ex_trap_c        /* 0x3D - Reserved */

	.long _ex_trap_c        /* 0x3E - Reserved */

	.long _ex_trap_c        /* 0x3F - Reserved */

END(_ex_table)



ALIGN

ENTRY(_sys_call_table)

	.long _sys_restart_syscall	/* 0 */

	.long _sys_exit

include/asm-blackfin/irq_handler.h

+8 −0
Original line number Diff line number Diff line
@@ -20,5 +20,13 @@ asmlinkage void evt_evt13(void); 
asmlinkage void evt_soft_int1(void);

asmlinkage void evt_system_call(void);

asmlinkage void init_exception_buff(void);

asmlinkage void trap_c(struct pt_regs *fp);

asmlinkage void ex_replaceable(void);



extern void *ex_table[];

extern void return_from_exception(void);



extern int bfin_request_exception(unsigned int exception, void (*handler)(void));

extern int bfin_free_exception(unsigned int exception, void (*handler)(void));



#endif