Commit 4f222d61 authored by Jan Kiszka's avatar Jan Kiszka Committed by Philippe Gerum
Browse files

arm/ipipe: Fix IPIPE_TRAP_UNDEFINSTR reporting



Something moved the value of this constant but didn't update the
hard-coded instances. Fix this and avoid future problems by using the
proper symbolic value.

That just requires harding asm/ipipe_base.h for assembly use.
Signed-off-by: Jan Kiszka's avatarJan Kiszka <jan.kiszka@siemens.com>
parent b28bec2d
...@@ -23,10 +23,14 @@ ...@@ -23,10 +23,14 @@
#ifndef __ASM_ARM_IPIPE_BASE_H #ifndef __ASM_ARM_IPIPE_BASE_H
#define __ASM_ARM_IPIPE_BASE_H #define __ASM_ARM_IPIPE_BASE_H
#ifndef __ASSEMBLY__
#include <asm-generic/ipipe.h> #include <asm-generic/ipipe.h>
#endif
#ifdef CONFIG_IPIPE #ifdef CONFIG_IPIPE
#ifndef __ASSEMBLY__
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
extern unsigned __ipipe_first_ipi; extern unsigned __ipipe_first_ipi;
...@@ -72,6 +76,8 @@ unsigned __ipipe_processor_id(void); ...@@ -72,6 +76,8 @@ unsigned __ipipe_processor_id(void);
#define ipipe_processor_id() (0) #define ipipe_processor_id() (0)
#endif /* !CONFIG_IPIPE */ #endif /* !CONFIG_IPIPE */
#endif /* !__ASSEMBLY__ */
#define IPIPE_TRAP_MAYDAY 0 /* Internal recovery trap */ #define IPIPE_TRAP_MAYDAY 0 /* Internal recovery trap */
/* ARM traps */ /* ARM traps */
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include "entry-header.S" #include "entry-header.S"
#include <asm/entry-macro-multi.S> #include <asm/entry-macro-multi.S>
#include <asm/probes.h> #include <asm/probes.h>
#include <asm/ipipe_base.h>
/* /*
* Interrupt handling. * Interrupt handling.
...@@ -287,7 +288,7 @@ __und_svc: ...@@ -287,7 +288,7 @@ __und_svc:
#endif #endif
#ifdef CONFIG_IPIPE #ifdef CONFIG_IPIPE
mov r0, #7 @ r0 = IPIPE_TRAP_UNDEFINSTR mov r0, #IPIPE_TRAP_UNDEFINSTR
mov r1, sp @ r1 = &regs mov r1, sp @ r1 = &regs
bl __ipipe_notify_trap @ branch to trap handler bl __ipipe_notify_trap @ branch to trap handler
cmp r0, #0 cmp r0, #0
...@@ -515,7 +516,7 @@ __und_usr: ...@@ -515,7 +516,7 @@ __und_usr:
usr_entry uaccess=0 usr_entry uaccess=0
#ifdef CONFIG_IPIPE #ifdef CONFIG_IPIPE
mov r0, #7 @ r0 = IPIPE_TRAP_UNDEFINSTR mov r0, #IPIPE_TRAP_UNDEFINSTR
mov r1, sp @ r1 = &regs mov r1, sp @ r1 = &regs
bl __ipipe_notify_trap @ branch to trap handler bl __ipipe_notify_trap @ branch to trap handler
cmp r0, #0 cmp r0, #0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment