Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-05 15:15:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

2003-07-18 Till Straumann <strauman@slac.stanford.edu>

Browse Source 
PR 288/rtems
	* irq/irq_asm.S, startup/bspstart.c: _ISR_Nest_level is now properly
	maintained.
This commit is contained in:
Joel Sherrill
2003-07-18 17:24:18 +00:00
parent 674b94973e
commit ae20a3e22e
6 changed files with 80 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
c/src/lib/libbsp/powerpc/eth_comm/ChangeLog
View File

@@ -1,3 +1,9 @@
2003-07-18 Till Straumann <strauman@slac.stanford.edu>
PR 288/rtems
* irq/irq_asm.S, startup/bspstart.c: _ISR_Nest_level is now properly
maintained.
2003-03-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2003-03-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Remove AC_CONFIG_AUX_DIR. * configure.ac: Remove AC_CONFIG_AUX_DIR.

27
c/src/lib/libbsp/powerpc/eth_comm/irq/irq_asm.S
View File

@@ -9,6 +9,9 @@
* Modified to support the MCP750. * Modified to support the MCP750.
* Modifications Copyright (C) 1999 Eric Valette. valette@crf.canon.fr * Modifications Copyright (C) 1999 Eric Valette. valette@crf.canon.fr
* *
* Till Straumann <strauman@slac.stanford.edu>, 2003/7:
* - store isr nesting level in _ISR_Nest_level rather than
* SPRG0 - RTEMS relies on that variable.
* *
* $Id$ * $Id$
*/ */
@@ -136,10 +139,18 @@ SYM (shared_raw_irq_code_entry):
* store part of _Thread_Dispatch_disable_level address in R15 * store part of _Thread_Dispatch_disable_level address in R15
*/ */
addis r15,0, _Thread_Dispatch_disable_level@ha addis r15,0, _Thread_Dispatch_disable_level@ha
#if BROKEN_ISR_NEST_LEVEL
/* /*
* Get current nesting level in R2 * Get current nesting level in R2
*/ */
mfspr r2, SPRG0 mfspr r2, SPRG0
#else
/*
* Retrieve current nesting level from _ISR_Nest_level
*/
lis r7, _ISR_Nest_level@ha
lwz r2, _ISR_Nest_level@l(r7)
#endif
/* /*
* Check if stack switch is necessary * Check if stack switch is necessary
*/ */
@@ -156,10 +167,15 @@ nested:
* Start Incrementing _Thread_Dispatch_disable_level R4 = _Thread_Dispatch_disable_level * Start Incrementing _Thread_Dispatch_disable_level R4 = _Thread_Dispatch_disable_level
*/ */
lwz r6,_Thread_Dispatch_disable_level@l(r15) lwz r6,_Thread_Dispatch_disable_level@l(r15)
#if BROKEN_ISR_NEST_LEVEL
/* /*
* store new nesting level in SPRG0 * Store new nesting level in SPRG0
*/ */
mtspr SPRG0, r2 mtspr SPRG0, r2
#else
/* store new nesting level in _ISR_Nest_level */
stw r2, _ISR_Nest_level@l(r7)
#endif
addi r6, r6, 1 addi r6, r6, 1
mfmsr r5 mfmsr r5
@@ -183,14 +199,23 @@ nested:
* value as an easy exit condition because if interrupt nesting level > 1 * value as an easy exit condition because if interrupt nesting level > 1
* then _Thread_Dispatch_disable_level > 1 * then _Thread_Dispatch_disable_level > 1
*/ */
#if BROKEN_ISR_NEST_LEVEL
mfspr r2, SPRG0 mfspr r2, SPRG0
#else
lis r7, _ISR_Nest_level@ha
lwz r2, _ISR_Nest_level@l(r7)
#endif
/* /*
* start decrementing _Thread_Dispatch_disable_level * start decrementing _Thread_Dispatch_disable_level
*/ */
lwz r3,_Thread_Dispatch_disable_level@l(r15) lwz r3,_Thread_Dispatch_disable_level@l(r15)
addi r2, r2, -1 /* Continue decrementing nesting level */ addi r2, r2, -1 /* Continue decrementing nesting level */
addi r3, r3, -1 /* Continue decrementing _Thread_Dispatch_disable_level */ addi r3, r3, -1 /* Continue decrementing _Thread_Dispatch_disable_level */
#if BROKEN_ISR_NEST_LEVEL
mtspr SPRG0, r2 /* End decrementing nesting level */ mtspr SPRG0, r2 /* End decrementing nesting level */
#else
stw r2, _ISR_Nest_level@l(r7) /* End decrementing nesting level */
#endif
stw r3,_Thread_Dispatch_disable_level@l(r15) /* End decrementing _Thread_Dispatch_disable_level */ stw r3,_Thread_Dispatch_disable_level@l(r15) /* End decrementing _Thread_Dispatch_disable_level */
cmpwi r3, 0 cmpwi r3, 0
/* /*

11
c/src/lib/libbsp/powerpc/eth_comm/startup/bspstart.c
View File

@@ -25,6 +25,7 @@
#include <rtems/libcsupport.h> #include <rtems/libcsupport.h>
#include <info.h> #include <info.h>
#include <libcpu/cpuIdent.h> #include <libcpu/cpuIdent.h>
#include <libcpu/spr.h>
#include <rtems/bspIo.h> #include <rtems/bspIo.h>
boardinfo_t M860_binfo; boardinfo_t M860_binfo;
@@ -108,6 +109,8 @@ bsp_pretasking_hook(void)
#endif #endif
} }
SPR_RW(SPRG0)
SPR_RW(SPRG1)
void bsp_start(void) void bsp_start(void)
{ {
@@ -117,7 +120,6 @@ void bsp_start(void)
ppc_cpu_id_t myCpu; ppc_cpu_id_t myCpu;
ppc_cpu_revision_t myCpuRevision; ppc_cpu_revision_t myCpuRevision;
register unsigned char* intrStack; register unsigned char* intrStack;
register unsigned int intrNestingLevel = 0;
extern void cpu_init(void); extern void cpu_init(void);
/* /*
@@ -134,8 +136,11 @@ void bsp_start(void)
*/ */
intrStack = (((unsigned char*)&intrStackPtr) - CPU_MINIMUM_STACK_FRAME_SIZE); intrStack = (((unsigned char*)&intrStackPtr) - CPU_MINIMUM_STACK_FRAME_SIZE);
asm volatile ("mtspr 273, %0" : "=r" (intrStack) : "0" (intrStack));
asm volatile ("mtspr 272, %0" : "=r" (intrNestingLevel) : "0" (intrNestingLevel)); _write_SPRG1((unsigned int)intrStack);
/* Signal them that this BSP has fixed PR288 - eventually, this should go away */
_write_SPRG0(PPC_BSP_HAS_FIXED_PR288);
/* /*
* Install our own set of exception vectors * Install our own set of exception vectors

6
c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
View File

@@ -1,3 +1,9 @@
2003-07-18 Till Straumann <strauman@slac.stanford.edu>
PR 288/rtems
* irq/irq_asm.S, startup/bspstart.c: _ISR_Nest_level is now properly
maintained.
2003-04-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2003-04-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* ide/.cvsignore: Add. * ide/.cvsignore: Add.

27
c/src/lib/libbsp/powerpc/mbx8xx/irq/irq_asm.S
View File

@@ -9,6 +9,9 @@
* Modified to support the MCP750. * Modified to support the MCP750.
* Modifications Copyright (C) 1999 Eric Valette. valette@crf.canon.fr * Modifications Copyright (C) 1999 Eric Valette. valette@crf.canon.fr
* *
* Till Straumann <strauman@slac.stanford.edu>, 2003/7:
* - store isr nesting level in _ISR_Nest_level rather than
* SPRG0 - RTEMS relies on that variable.
* *
* $Id$ * $Id$
*/ */
@@ -176,10 +179,18 @@ SYM (shared_raw_irq_code_entry):
* store part of _Thread_Dispatch_disable_level address in R15 * store part of _Thread_Dispatch_disable_level address in R15
*/ */
addis r15,0, _Thread_Dispatch_disable_level@ha addis r15,0, _Thread_Dispatch_disable_level@ha
#if BROKEN_ISR_NEST_LEVEL
/* /*
* Get current nesting level in R2 * Get current nesting level in R2
*/ */
mfspr r2, SPRG0 mfspr r2, SPRG0
#else
/*
* Retrieve current nesting level from _ISR_Nest_level
*/
lis r7, _ISR_Nest_level@ha
lwz r2, _ISR_Nest_level@l(r7)
#endif
/* /*
* Check if stack switch is necessary * Check if stack switch is necessary
*/ */
@@ -196,10 +207,15 @@ nested:
* Start Incrementing _Thread_Dispatch_disable_level R4 = _Thread_Dispatch_disable_level * Start Incrementing _Thread_Dispatch_disable_level R4 = _Thread_Dispatch_disable_level
*/ */
lwz r6,_Thread_Dispatch_disable_level@l(r15) lwz r6,_Thread_Dispatch_disable_level@l(r15)
#if BROKEN_ISR_NEST_LEVEL
/* /*
* store new nesting level in SPRG0 * Store new nesting level in SPRG0
*/ */
mtspr SPRG0, r2 mtspr SPRG0, r2
#else
/* store new nesting level in _ISR_Nest_level */
stw r2, _ISR_Nest_level@l(r7)
#endif
addi r6, r6, 1 addi r6, r6, 1
mfmsr r5 mfmsr r5
@@ -223,14 +239,23 @@ nested:
* value as an easy exit condition because if interrupt nesting level > 1 * value as an easy exit condition because if interrupt nesting level > 1
* then _Thread_Dispatch_disable_level > 1 * then _Thread_Dispatch_disable_level > 1
*/ */
#if BROKEN_ISR_NEST_LEVEL
mfspr r2, SPRG0 mfspr r2, SPRG0
#else
lis r7, _ISR_Nest_level@ha
lwz r2, _ISR_Nest_level@l(r7)
#endif
/* /*
* start decrementing _Thread_Dispatch_disable_level * start decrementing _Thread_Dispatch_disable_level
*/ */
lwz r3,_Thread_Dispatch_disable_level@l(r15) lwz r3,_Thread_Dispatch_disable_level@l(r15)
addi r2, r2, -1 /* Continue decrementing nesting level */ addi r2, r2, -1 /* Continue decrementing nesting level */
addi r3, r3, -1 /* Continue decrementing _Thread_Dispatch_disable_level */ addi r3, r3, -1 /* Continue decrementing _Thread_Dispatch_disable_level */
#if BROKEN_ISR_NEST_LEVEL
mtspr SPRG0, r2 /* End decrementing nesting level */ mtspr SPRG0, r2 /* End decrementing nesting level */
#else
stw r2, _ISR_Nest_level@l(r7) /* End decrementing nesting level */
#endif
stw r3,_Thread_Dispatch_disable_level@l(r15) /* End decrementing _Thread_Dispatch_disable_level */ stw r3,_Thread_Dispatch_disable_level@l(r15) /* End decrementing _Thread_Dispatch_disable_level */
cmpwi r3, 0 cmpwi r3, 0
/* /*

11
c/src/lib/libbsp/powerpc/mbx8xx/startup/bspstart.c
View File

@@ -26,6 +26,11 @@
#include <rtems/libcsupport.h> #include <rtems/libcsupport.h>
#include <rtems/bspIo.h> #include <rtems/bspIo.h>
#include <libcpu/cpuIdent.h> #include <libcpu/cpuIdent.h>
#include <libcpu/spr.h>
SPR_RW(SPRG0)
SPR_RW(SPRG1)
/* /*
* The original table from the application (in ROM) and our copy of it with * The original table from the application (in ROM) and our copy of it with
@@ -134,7 +139,6 @@ void bsp_start(void)
ppc_cpu_id_t myCpu; ppc_cpu_id_t myCpu;
ppc_cpu_revision_t myCpuRevision; ppc_cpu_revision_t myCpuRevision;
register unsigned char* intrStack; register unsigned char* intrStack;
register unsigned int intrNestingLevel = 0;
/* /*
* Get CPU identification dynamically. Note that the get_ppc_cpu_type() function * Get CPU identification dynamically. Note that the get_ppc_cpu_type() function
@@ -166,8 +170,9 @@ void bsp_start(void)
*/ */
intrStack = (((unsigned char*)&intrStackPtr) - CPU_MINIMUM_STACK_FRAME_SIZE); intrStack = (((unsigned char*)&intrStackPtr) - CPU_MINIMUM_STACK_FRAME_SIZE);
asm volatile ("mtspr 273, %0" : "=r" (intrStack) : "0" (intrStack)); _write_SPRG1((unsigned int)intrStack);
asm volatile ("mtspr 272, %0" : "=r" (intrNestingLevel) : "0" (intrNestingLevel)); /* signal them that we have fixed PR288 - eventually, this should go away */
_write_SPRG0(PPC_BSP_HAS_FIXED_PR288);
/* /*
* Install our own set of exception vectors * Install our own set of exception vectors