RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2007-09-12 Joel Sherrill <joel.sherrill@OARcorp.com>

Browse Source 
PR 1257/bsps
	* irq/irq.c: Code outside of cpukit should use the public API for
	rtems_interrupt_disable/rtems_interrupt_enable. By bypassing the
	public API and directly accessing _CPU_ISR_Disable and
	_CPU_ISR_Enable, they were bypassing the compiler memory barrier
	directive which could lead to problems. This patch also changes the
	type of the variable passed into these routines and addresses minor
	style issues.
This commit is contained in:
Joel Sherrill
2007-09-12 15:16:36 +00:00
parent dc7271fa9e
commit ec1d0b9ddb
12 changed files with 181 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
c/src/lib/libbsp/powerpc/ep1a/ChangeLog
View File

@@ -1,3 +1,14 @@
2007-09-12 Joel Sherrill <joel.sherrill@OARcorp.com>
PR 1257/bsps
* irq/irq.c: Code outside of cpukit should use the public API for
rtems_interrupt_disable/rtems_interrupt_enable. By bypassing the
public API and directly accessing _CPU_ISR_Disable and
_CPU_ISR_Enable, they were bypassing the compiler memory barrier
directive which could lead to problems. This patch also changes the
type of the variable passed into these routines and addresses minor
style issues.
2007-08-01 Joel Sherrill <joel.sherrill@oarcorp.com> 2007-08-01 Joel Sherrill <joel.sherrill@oarcorp.com>
* Makefile.am, startup/bspstart.c: Use shared ShowBATS() method. * Makefile.am, startup/bspstart.c: Use shared ShowBATS() method.

59
c/src/lib/libbsp/powerpc/ep1a/irq/irq.c
View File

@@ -100,7 +100,7 @@ static int isValidInterrupt(int irq)
*/ */
int BSP_install_rtems_shared_irq_handler (const rtems_irq_connect_data* irq) int BSP_install_rtems_shared_irq_handler (const rtems_irq_connect_data* irq)
{ {
unsigned int level; rtems_interrupt_level level;
rtems_irq_connect_data* vchain; rtems_irq_connect_data* vchain;
if (!isValidInterrupt(irq->name)) { if (!isValidInterrupt(irq->name)) {
@@ -109,10 +109,10 @@ int BSP_install_rtems_shared_irq_handler (const rtems_irq_connect_data* irq)
} }
printk("Install Shared interrupt %d\n", irq->name); printk("Install Shared interrupt %d\n", irq->name);
_CPU_ISR_Disable(level); rtems_interrupt_disable(level);
if ( (int)rtems_hdl_tbl[irq->name].next_handler == -1 ) { if ( (int)rtems_hdl_tbl[irq->name].next_handler == -1 ) {
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
printk("IRQ vector %d already connected to an unshared handler\n",irq->name); printk("IRQ vector %d already connected to an unshared handler\n",irq->name);
return 0; return 0;
} }
@@ -156,7 +156,7 @@ int BSP_install_rtems_shared_irq_handler (const rtems_irq_connect_data* irq)
*/ */
irq->on(irq); irq->on(irq);
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 1; return 1;
} }
@@ -168,7 +168,7 @@ int BSP_install_rtems_shared_irq_handler (const rtems_irq_connect_data* irq)
int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq) int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq)
{ {
unsigned int level; rtems_interrupt_level level;
if (!isValidInterrupt(irq->name)) { if (!isValidInterrupt(irq->name)) {
printk("Invalid interrupt vector %d\n",irq->name); printk("Invalid interrupt vector %d\n",irq->name);
@@ -181,9 +181,9 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq)
* RATIONALE : to always have the same transition by forcing the user * RATIONALE : to always have the same transition by forcing the user
* to get the previous handler before accepting to disconnect. * to get the previous handler before accepting to disconnect.
*/ */
_CPU_ISR_Disable(level); rtems_interrupt_disable(level);
if (rtems_hdl_tbl[irq->name].hdl != default_rtems_entry.hdl) { if (rtems_hdl_tbl[irq->name].hdl != default_rtems_entry.hdl) {
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
printk("IRQ vector %d already connected\n",irq->name); printk("IRQ vector %d already connected\n",irq->name);
return 0; return 0;
} }
@@ -218,7 +218,7 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq)
*/ */
irq->on(irq); irq->on(irq);
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 1; return 1;
} }
@@ -226,21 +226,21 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq)
int BSP_get_current_rtems_irq_handler (rtems_irq_connect_data* irq) int BSP_get_current_rtems_irq_handler (rtems_irq_connect_data* irq)
{ {
unsigned int level; rtems_interrupt_level level;
if (!isValidInterrupt(irq->name)) { if (!isValidInterrupt(irq->name)) {
return 0; return 0;
} }
_CPU_ISR_Disable(level); rtems_interrupt_disable(level);
*irq = rtems_hdl_tbl[irq->name]; *irq = rtems_hdl_tbl[irq->name];
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 1; return 1;
} }
int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq) int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
{ {
rtems_irq_connect_data *pchain= NULL, *vchain = NULL; rtems_irq_connect_data *pchain= NULL, *vchain = NULL;
unsigned int level; rtems_interrupt_level level;
if (!isValidInterrupt(irq->name)) { if (!isValidInterrupt(irq->name)) {
return 0; return 0;
@@ -252,9 +252,9 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
* RATIONALE : to always have the same transition by forcing the user * RATIONALE : to always have the same transition by forcing the user
* to get the previous handler before accepting to disconnect. * to get the previous handler before accepting to disconnect.
*/ */
_CPU_ISR_Disable(level); rtems_interrupt_disable(level);
if (rtems_hdl_tbl[irq->name].hdl != irq->hdl) { if (rtems_hdl_tbl[irq->name].hdl != irq->hdl) {
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 0; return 0;
} }
@@ -274,7 +274,7 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
if( !found ) if( !found )
{ {
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 0; return 0;
} }
} }
@@ -282,7 +282,7 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
{ {
if (rtems_hdl_tbl[irq->name].hdl != irq->hdl) if (rtems_hdl_tbl[irq->name].hdl != irq->hdl)
{ {
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 0; return 0;
} }
} }
@@ -335,7 +335,7 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
free(vchain); free(vchain);
} }
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 1; return 1;
} }
@@ -346,17 +346,18 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config) int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
{ {
int i; int i;
unsigned int level; rtems_interrupt_level level;
/*
* Store various code accelerators /*
*/ * Store various code accelerators
*/
internal_config = config; internal_config = config;
default_rtems_entry = config->defaultEntry; default_rtems_entry = config->defaultEntry;
rtems_hdl_tbl = config->irqHdlTbl; rtems_hdl_tbl = config->irqHdlTbl;
return 1; return 1;
_CPU_ISR_Disable(level); rtems_interrupt_disable(level);
/* /*
* set up internal tables used by rtems interrupt prologue * set up internal tables used by rtems interrupt prologue
*/ */
@@ -428,7 +429,7 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
} }
} }
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 1; return 1;
} }

11
c/src/lib/libbsp/powerpc/gen5200/ChangeLog
View File

@@ -1,3 +1,14 @@
2007-09-12 Joel Sherrill <joel.sherrill@OARcorp.com>
PR 1257/bsps
* irq/irq.c: Code outside of cpukit should use the public API for
rtems_interrupt_disable/rtems_interrupt_enable. By bypassing the
public API and directly accessing _CPU_ISR_Disable and
_CPU_ISR_Enable, they were bypassing the compiler memory barrier
directive which could lead to problems. This patch also changes the
type of the variable passed into these routines and addresses minor
style issues.
2007-09-05 Joel Sherrill <joel.sherrill@oarcorp.com> 2007-09-05 Joel Sherrill <joel.sherrill@oarcorp.com>
* irq/irq.h: Reformat -- make things line up. * irq/irq.h: Reformat -- make things line up.

24
c/src/lib/libbsp/powerpc/gen5200/irq/irq.c
View File

@@ -490,7 +490,7 @@ int BSP_irq_disable_at_siu(const rtems_irq_symbolic_name irqLine)
*/ */
int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq) int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq)
{ {
unsigned int level; rtems_interrupt_level level;
if(!isValidInterrupt(irq->name)) if(!isValidInterrupt(irq->name))
{ {
@@ -513,7 +513,7 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq)
} }
_CPU_ISR_Disable(level); rtems_interrupt_disable(level);
/* /*
* store the data provided by user * store the data provided by user
@@ -558,7 +558,7 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq)
*/ */
irq->on(irq); irq->on(irq);
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 1; return 1;
@@ -589,7 +589,7 @@ int BSP_get_current_rtems_irq_handler (rtems_irq_connect_data* irq)
*/ */
int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq) int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
{ {
unsigned int level; rtems_interrupt_level level;
if(!isValidInterrupt(irq->name)) if(!isValidInterrupt(irq->name))
{ {
@@ -610,7 +610,7 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
} }
_CPU_ISR_Disable(level); rtems_interrupt_disable(level);
if(is_siu_irq(irq->name)) if(is_siu_irq(irq->name))
{ {
@@ -639,7 +639,7 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
*/ */
rtems_hdl_tbl[irq->name] = default_rtems_entry; rtems_hdl_tbl[irq->name] = default_rtems_entry;
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 1; return 1;
@@ -655,17 +655,17 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
*/ */
int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config) int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
{ {
int i; int i;
unsigned int level; rtems_interrupt_level level;
/* /*
* Store various code accelerators * Store various code accelerators
*/ */
internal_config = config; internal_config = config;
default_rtems_entry = config->defaultEntry; default_rtems_entry = config->defaultEntry;
rtems_hdl_tbl = config->irqHdlTbl; rtems_hdl_tbl = config->irqHdlTbl;
_CPU_ISR_Disable(level); rtems_interrupt_disable(level);
/* /*
* start with SIU IRQs * start with SIU IRQs
@@ -711,7 +711,7 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
} }
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 1; return 1;
} }

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

@@ -1,3 +1,14 @@
2007-09-12 Joel Sherrill <joel.sherrill@OARcorp.com>
PR 1257/bsps
* irq/irq.c: Code outside of cpukit should use the public API for
rtems_interrupt_disable/rtems_interrupt_enable. By bypassing the
public API and directly accessing _CPU_ISR_Disable and
_CPU_ISR_Enable, they were bypassing the compiler memory barrier
directive which could lead to problems. This patch also changes the
type of the variable passed into these routines and addresses minor
style issues.
2007-07-12 Joel Sherrill <joel.sherrill@OARcorp.com> 2007-07-12 Joel Sherrill <joel.sherrill@OARcorp.com>
* Makefile.am: Correct so it now links. * Makefile.am: Correct so it now links.

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

@@ -197,7 +197,7 @@ int BSP_irq_enabled_at_siu (const rtems_irq_number irqLine)
int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq) int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq)
{ {
unsigned int level; rtems_interrupt_level level;
if (!isValidInterrupt(irq->name)) { if (!isValidInterrupt(irq->name)) {
return 0; return 0;
@@ -213,7 +213,7 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq)
return 0; return 0;
} }
_CPU_ISR_Disable(level); rtems_interrupt_disable(level);
/* /*
* store the data provided by user * store the data provided by user
@@ -245,7 +245,7 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq)
*/ */
irq->on(irq); irq->on(irq);
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 1; return 1;
} }
@@ -261,7 +261,7 @@ int BSP_get_current_rtems_irq_handler (rtems_irq_connect_data* irq)
int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq) int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
{ {
unsigned int level; rtems_interrupt_level level;
if (!isValidInterrupt(irq->name)) { if (!isValidInterrupt(irq->name)) {
return 0; return 0;
@@ -276,7 +276,7 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
if (rtems_hdl_tbl[irq->name].hdl != irq->hdl) { if (rtems_hdl_tbl[irq->name].hdl != irq->hdl) {
return 0; return 0;
} }
_CPU_ISR_Disable(level); rtems_interrupt_disable(level);
if (is_cpm_irq(irq->name)) { if (is_cpm_irq(irq->name)) {
/* /*
@@ -306,7 +306,7 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
*/ */
rtems_hdl_tbl[irq->name] = default_rtems_entry; rtems_hdl_tbl[irq->name] = default_rtems_entry;
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 1; return 1;
} }
@@ -317,16 +317,17 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config) int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
{ {
int i; int i;
unsigned int level; rtems_interrupt_level level;
/*
* Store various code accelerators /*
*/ * Store various code accelerators
*/
internal_config = config; internal_config = config;
default_rtems_entry = config->defaultEntry; default_rtems_entry = config->defaultEntry;
rtems_hdl_tbl = config->irqHdlTbl; rtems_hdl_tbl = config->irqHdlTbl;
_CPU_ISR_Disable(level); rtems_interrupt_disable(level);
/* /*
* start with CPM IRQ * start with CPM IRQ
*/ */
@@ -376,7 +377,7 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]); rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]);
} }
} }
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 1; return 1;
} }

11
c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
View File

@@ -1,3 +1,14 @@
2007-09-12 Joel Sherrill <joel.sherrill@OARcorp.com>
PR 1257/bsps
* irq/irq.c: Code outside of cpukit should use the public API for
rtems_interrupt_disable/rtems_interrupt_enable. By bypassing the
public API and directly accessing _CPU_ISR_Disable and
_CPU_ISR_Enable, they were bypassing the compiler memory barrier
directive which could lead to problems. This patch also changes the
type of the variable passed into these routines and addresses minor
style issues.
2007-07-10 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> 2007-07-10 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
* vectors/vectors_init.c, irq/irq_init.c: * vectors/vectors_init.c, irq/irq_init.c:

21
c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c
View File

@@ -245,7 +245,7 @@ int BSP_irq_enabled_at_cpm(const rtems_irq_number irqLine)
int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq) int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq)
{ {
unsigned int level; rtems_interrupt_level level;
if (!isValidInterrupt(irq->name)) { if (!isValidInterrupt(irq->name)) {
printk( "not a valid intr\n" ) ; printk( "not a valid intr\n" ) ;
@@ -263,7 +263,7 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq)
return 0; return 0;
} }
_CPU_ISR_Disable(level); rtems_interrupt_disable(level);
/* /*
* store the data provided by user * store the data provided by user
@@ -291,7 +291,7 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq)
*/ */
irq->on(irq); irq->on(irq);
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
/* /*
printk( "Enabled\n" ); printk( "Enabled\n" );
@@ -310,7 +310,7 @@ int BSP_get_current_rtems_irq_handler (rtems_irq_connect_data* irq)
int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq) int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
{ {
unsigned int level; rtems_interrupt_level level;
if (!isValidInterrupt(irq->name)) { if (!isValidInterrupt(irq->name)) {
return 0; return 0;
@@ -325,7 +325,7 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
if (rtems_hdl_tbl[irq->name].hdl != irq->hdl) { if (rtems_hdl_tbl[irq->name].hdl != irq->hdl) {
return 0; return 0;
} }
_CPU_ISR_Disable(level); rtems_interrupt_disable(level);
if (is_cpm_irq(irq->name)) { if (is_cpm_irq(irq->name)) {
/* /*
@@ -350,7 +350,7 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
*/ */
rtems_hdl_tbl[irq->name] = default_rtems_entry; rtems_hdl_tbl[irq->name] = default_rtems_entry;
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 1; return 1;
} }
@@ -361,8 +361,9 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config) int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
{ {
int i; int i;
unsigned int level; rtems_interrupt_level level;
/* /*
* Store various code accelerators * Store various code accelerators
*/ */
@@ -373,7 +374,7 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
/* Fill in priority masks */ /* Fill in priority masks */
compute_SIU_IvectMask_from_prio(); compute_SIU_IvectMask_from_prio();
_CPU_ISR_Disable(level); rtems_interrupt_disable(level);
/* /*
* start with CPM IRQ * start with CPM IRQ
*/ */
@@ -398,7 +399,7 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
} }
} }
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 1; return 1;
} }

11
c/src/lib/libbsp/powerpc/psim/ChangeLog
View File

@@ -1,3 +1,14 @@
2007-09-12 Joel Sherrill <joel.sherrill@OARcorp.com>
PR 1257/bsps
* irq/irq.c: Code outside of cpukit should use the public API for
rtems_interrupt_disable/rtems_interrupt_enable. By bypassing the
public API and directly accessing _CPU_ISR_Disable and
_CPU_ISR_Enable, they were bypassing the compiler memory barrier
directive which could lead to problems. This patch also changes the
type of the variable passed into these routines and addresses minor
style issues.
2007-07-06 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> 2007-07-06 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
* irq_init.c, Makefile.am: adapted to shared exception code * irq_init.c, Makefile.am: adapted to shared exception code

36
c/src/lib/libbsp/powerpc/psim/irq/irq.c
View File

@@ -114,7 +114,7 @@ int BSP_install_rtems_shared_irq_handler (const rtems_irq_connect_data* irq)
int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq) int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq)
{ {
unsigned int level; rtems_interrupt_level level;
if (!isValidInterrupt(irq->name)) { if (!isValidInterrupt(irq->name)) {
printk("Invalid interrupt vector %d\n",irq->name); printk("Invalid interrupt vector %d\n",irq->name);
@@ -127,9 +127,9 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq)
* RATIONALE : to always have the same transition by forcing the user * RATIONALE : to always have the same transition by forcing the user
* to get the previous handler before accepting to disconnect. * to get the previous handler before accepting to disconnect.
*/ */
_CPU_ISR_Disable(level); rtems_interrupt_disable(level);
if (rtems_hdl_tbl[irq->name].hdl != default_rtems_entry.hdl) { if (rtems_hdl_tbl[irq->name].hdl != default_rtems_entry.hdl) {
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
printk("IRQ vector %d already connected\n",irq->name); printk("IRQ vector %d already connected\n",irq->name);
return 0; return 0;
} }
@@ -154,7 +154,7 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq)
*/ */
irq->on(irq); irq->on(irq);
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 1; return 1;
} }
@@ -162,21 +162,21 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq)
int BSP_get_current_rtems_irq_handler (rtems_irq_connect_data* irq) int BSP_get_current_rtems_irq_handler (rtems_irq_connect_data* irq)
{ {
unsigned int level; rtems_interrupt_level level;
if (!isValidInterrupt(irq->name)) { if (!isValidInterrupt(irq->name)) {
return 0; return 0;
} }
_CPU_ISR_Disable(level); rtems_interrupt_disable(level);
*irq = rtems_hdl_tbl[irq->name]; *irq = rtems_hdl_tbl[irq->name];
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 1; return 1;
} }
int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq) int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
{ {
rtems_irq_connect_data *pchain= NULL, *vchain = NULL; rtems_irq_connect_data *pchain= NULL, *vchain = NULL;
unsigned int level; rtems_interrupt_level level;
if (!isValidInterrupt(irq->name)) { if (!isValidInterrupt(irq->name)) {
return 0; return 0;
@@ -188,9 +188,9 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
* RATIONALE : to always have the same transition by forcing the user * RATIONALE : to always have the same transition by forcing the user
* to get the previous handler before accepting to disconnect. * to get the previous handler before accepting to disconnect.
*/ */
_CPU_ISR_Disable(level); rtems_interrupt_disable(level);
if (rtems_hdl_tbl[irq->name].hdl != irq->hdl) { if (rtems_hdl_tbl[irq->name].hdl != irq->hdl) {
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 0; return 0;
} }
@@ -210,7 +210,7 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
if( !found ) if( !found )
{ {
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 0; return 0;
} }
} }
@@ -218,7 +218,7 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
{ {
if (rtems_hdl_tbl[irq->name].hdl != irq->hdl) if (rtems_hdl_tbl[irq->name].hdl != irq->hdl)
{ {
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 0; return 0;
} }
} }
@@ -262,7 +262,7 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
free(vchain); free(vchain);
} }
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 1; return 1;
} }

11
c/src/lib/libbsp/powerpc/score603e/ChangeLog
View File

@@ -1,3 +1,14 @@
2007-09-12 Joel Sherrill <joel.sherrill@OARcorp.com>
PR 1257/bsps
* irq/irq.c: Code outside of cpukit should use the public API for
rtems_interrupt_disable/rtems_interrupt_enable. By bypassing the
public API and directly accessing _CPU_ISR_Disable and
_CPU_ISR_Enable, they were bypassing the compiler memory barrier
directive which could lead to problems. This patch also changes the
type of the variable passed into these routines and addresses minor
style issues.
2007-07-10 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> 2007-07-10 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
* irq/irq_init.c: adapted to shared exception code * irq/irq_init.c: adapted to shared exception code

59
c/src/lib/libbsp/powerpc/score603e/irq/irq.c
View File

@@ -86,7 +86,7 @@ static int isValidInterrupt(int irq)
*/ */
int BSP_install_rtems_shared_irq_handler (const rtems_irq_connect_data* irq) int BSP_install_rtems_shared_irq_handler (const rtems_irq_connect_data* irq)
{ {
unsigned int level; rtems_interrupt_level level;
rtems_irq_connect_data* vchain; rtems_irq_connect_data* vchain;
if (!isValidInterrupt(irq->name)) { if (!isValidInterrupt(irq->name)) {
@@ -94,10 +94,10 @@ int BSP_install_rtems_shared_irq_handler (const rtems_irq_connect_data* irq)
return 0; return 0;
} }
_CPU_ISR_Disable(level); rtems_interrupt_disable(level);
if ( (int)rtems_hdl_tbl[irq->name].next_handler == -1 ) { if ( (int)rtems_hdl_tbl[irq->name].next_handler == -1 ) {
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
printk("IRQ vector %d already connected to an unshared handler\n",irq->name); printk("IRQ vector %d already connected to an unshared handler\n",irq->name);
return 0; return 0;
} }
@@ -131,7 +131,7 @@ int BSP_install_rtems_shared_irq_handler (const rtems_irq_connect_data* irq)
*/ */
irq->on(irq); irq->on(irq);
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 1; return 1;
} }
@@ -142,7 +142,7 @@ int BSP_install_rtems_shared_irq_handler (const rtems_irq_connect_data* irq)
int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq) int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq)
{ {
unsigned int level; rtems_interrupt_level level;
if (!isValidInterrupt(irq->name)) { if (!isValidInterrupt(irq->name)) {
printk("Invalid interrupt vector %d\n",irq->name); printk("Invalid interrupt vector %d\n",irq->name);
@@ -155,9 +155,9 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq)
* RATIONALE : to always have the same transition by forcing the user * RATIONALE : to always have the same transition by forcing the user
* to get the previous handler before accepting to disconnect. * to get the previous handler before accepting to disconnect.
*/ */
_CPU_ISR_Disable(level); rtems_interrupt_disable(level);
if (rtems_hdl_tbl[irq->name].hdl != default_rtems_entry.hdl) { if (rtems_hdl_tbl[irq->name].hdl != default_rtems_entry.hdl) {
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
printk("IRQ vector %d already connected\n",irq->name); printk("IRQ vector %d already connected\n",irq->name);
return 0; return 0;
} }
@@ -185,28 +185,28 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq)
*/ */
irq->on(irq); irq->on(irq);
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 1; return 1;
} }
int BSP_get_current_rtems_irq_handler (rtems_irq_connect_data* irq) int BSP_get_current_rtems_irq_handler (rtems_irq_connect_data* irq)
{ {
unsigned int level; rtems_interrupt_level level;
if (!isValidInterrupt(irq->name)) { if (!isValidInterrupt(irq->name)) {
return 0; return 0;
} }
_CPU_ISR_Disable(level); rtems_interrupt_disable(level);
*irq = rtems_hdl_tbl[irq->name]; *irq = rtems_hdl_tbl[irq->name];
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 1; return 1;
} }
int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq) int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
{ {
rtems_irq_connect_data *pchain= NULL, *vchain = NULL; rtems_irq_connect_data *pchain= NULL, *vchain = NULL;
unsigned int level; rtems_interrupt_level level;
if (!isValidInterrupt(irq->name)) { if (!isValidInterrupt(irq->name)) {
return 0; return 0;
@@ -218,9 +218,9 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
* RATIONALE : to always have the same transition by forcing the user * RATIONALE : to always have the same transition by forcing the user
* to get the previous handler before accepting to disconnect. * to get the previous handler before accepting to disconnect.
*/ */
_CPU_ISR_Disable(level); rtems_interrupt_disable(level);
if (rtems_hdl_tbl[irq->name].hdl != irq->hdl) { if (rtems_hdl_tbl[irq->name].hdl != irq->hdl) {
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 0; return 0;
} }
@@ -240,7 +240,7 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
if( !found ) if( !found )
{ {
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 0; return 0;
} }
} }
@@ -248,7 +248,7 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
{ {
if (rtems_hdl_tbl[irq->name].hdl != irq->hdl) if (rtems_hdl_tbl[irq->name].hdl != irq->hdl)
{ {
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 0; return 0;
} }
} }
@@ -295,7 +295,7 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
free(vchain); free(vchain);
} }
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 1; return 1;
} }
@@ -306,16 +306,17 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config) int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
{ {
int i; int i;
unsigned int level; rtems_interrupt_level level;
/*
* Store various code accelerators /*
*/ * Store various code accelerators
*/
internal_config = config; internal_config = config;
default_rtems_entry = config->defaultEntry; default_rtems_entry = config->defaultEntry;
rtems_hdl_tbl = config->irqHdlTbl; rtems_hdl_tbl = config->irqHdlTbl;
_CPU_ISR_Disable(level); rtems_interrupt_disable(level);
/* /*
* set up internal tables used by rtems interrupt prologue * set up internal tables used by rtems interrupt prologue
*/ */
@@ -378,7 +379,7 @@ int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
} }
} }
_CPU_ISR_Enable(level); rtems_interrupt_enable(level);
return 1; return 1;
} }