summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/powerpc/mpc8260ads
diff options
context:
space:
mode:
authorThomas Doerfler <Thomas.Doerfler@embedded-brains.de>2009-10-23 07:32:46 +0000
committerThomas Doerfler <Thomas.Doerfler@embedded-brains.de>2009-10-23 07:32:46 +0000
commit2d2de4eba16374ea05fc7ee9cd257ad0d4ebf2ca (patch)
tree45161e8d9a9d0a9c483b84d915085c0230b09ea0 /c/src/lib/libbsp/powerpc/mpc8260ads
parent2009-10-23 Ralf Corsépius <ralf.corsepius@rtems.org> (diff)
downloadrtems-2d2de4eba16374ea05fc7ee9cd257ad0d4ebf2ca.tar.bz2
Update for exception support changes.
Diffstat (limited to 'c/src/lib/libbsp/powerpc/mpc8260ads')
-rw-r--r--c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog9
-rw-r--r--c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am22
-rw-r--r--c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c686
-rw-r--r--c/src/lib/libbsp/powerpc/mpc8260ads/make/custom/mpc8260ads.cfg3
-rw-r--r--c/src/lib/libbsp/powerpc/mpc8260ads/preinstall.am14
-rw-r--r--c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c42
-rw-r--r--c/src/lib/libbsp/powerpc/mpc8260ads/startup/linkcmds40
7 files changed, 342 insertions, 474 deletions
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
index fe6e646958..e8ca505728 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-22 Sebastian Huber <sebastian.huber@embedded-brains.de>
+
+ * include/irq-config.h: New file.
+ * Makefile.am, preinstall.am: Update for exception support changes.
+ Use generic interrupt support.
+ * make/custom/mpc8260ads.cfg, startup/linkcmds: Enable EABI.
+ * irq/irq.c, startup/bspstart.c: Converted to generic interrupt
+ support. Update for exception support changes.
+
2009-10-21 Ralf Corsépius <ralf.corsepius@rtems.org>
* make/custom/mpc8260ads.cfg: Remove RTEMS_BSP_FAMILY.
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
index b9bb0c9eb9..9fa5325019 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am
@@ -35,11 +35,19 @@ libbsp_a_SOURCES += clock/p_clock.c
# console
libbsp_a_SOURCES += console/console.c
-include_bsp_HEADERS = irq/irq.h
+include_bsp_HEADERS = irq/irq.h \
+ include/irq-config.h \
+ ../../shared/include/irq-generic.h \
+ ../../shared/include/irq-info.h
+
# irq
-libbsp_a_SOURCES += irq/irq.c irq/irq_init.c irq/irq.h irq/irq_asm.S
+libbsp_a_SOURCES += irq/irq.c \
+ ../../shared/src/irq-generic.c \
+ ../../shared/src/irq-legacy.c \
+ ../../shared/src/irq-info.c \
+ ../../shared/src/irq-shell.c \
+ ../../shared/src/irq-server.c
-include_bsp_HEADERS += vectors/vectors.h
# startup
libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsplibc.c \
../../shared/bsppredriverhook.c ../../shared/bsppost.c \
@@ -47,10 +55,6 @@ libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bsplibc.c \
../../shared/sbrk.c ../../shared/gnatinstallhandler.c startup/cpuinit.c \
../../shared/bspgetworkarea.c ../../shared/bsppretaskinghook.c
-# vectors
-libbsp_a_SOURCES += vectors/vectors_init.c vectors/vectors.h \
- vectors/vectors.S
-
if HAS_NETWORKING
network_CPPFLAGS = -D__INSIDE_RTEMS_BSD_TCPIP_STACK__
network_CPPFLAGS += -D__BSD_VISIBLE
@@ -63,12 +67,12 @@ endif
libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \
../../../libcpu/@RTEMS_CPU@/shared/cache.rel \
../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \
+ ../../../libcpu/@RTEMS_CPU@/@exceptions@/exc_bspsupport.rel \
../../../libcpu/@RTEMS_CPU@/mpc8260/clock.rel \
../../../libcpu/@RTEMS_CPU@/mpc8260/console-generic.rel \
../../../libcpu/@RTEMS_CPU@/mpc8260/cpm.rel \
../../../libcpu/@RTEMS_CPU@/mpc8260/mmu.rel \
- ../../../libcpu/@RTEMS_CPU@/mpc8260/timer.rel \
- ../../../libcpu/@RTEMS_CPU@/@exceptions@/raw_exception.rel
+ ../../../libcpu/@RTEMS_CPU@/mpc8260/timer.rel
if HAS_NETWORKING
libbsp_a_LIBADD += network.rel
endif
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c
index 0859e00626..e7b212177e 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/irq/irq.c
@@ -6,9 +6,9 @@
*
* Modified for mpc8260 Andy Dachs <a.dachs@sstl.co.uk>
* Surrey Satellite Technology Limited, 2000
-+ * 21/4/2002 Added support for nested interrupts and improved
-+ * masking operations. Now we compute priority mask based
-+ * on table in irq_init.c
+ * 21/4/2002 Added support for nested interrupts and improved
+ * masking operations. Now we compute priority mask based
+ * on table in irq_init.c
*
* The license and distribution terms for this file may be
* found in found in the file LICENSE in this distribution or at
@@ -19,140 +19,118 @@
#include <bsp.h>
#include <bsp/irq.h>
+#include <bsp/irq-generic.h>
#include <rtems.h>
-#include <rtems/score/apiext.h>
#include <rtems/bspIo.h>
-#include <libcpu/raw_exception.h>
#include <bsp/vectors.h>
#include <mpc8260.h>
/*
- * default handler connected on each irq after bsp initialization
- */
-static rtems_irq_connect_data default_rtems_entry;
-
-/*
- * location used to store initial tables used for interrupt
- * management.
- */
-static rtems_irq_global_settings* internal_config;
-static rtems_irq_connect_data* rtems_hdl_tbl;
-
-/*
* Check if symbolic IRQ name is an CPM IRQ
*/
static inline int is_cpm_irq(const rtems_irq_number irqLine)
{
- return (((int) irqLine <= BSP_CPM_IRQ_MAX_OFFSET) &
- ((int) irqLine >= BSP_CPM_IRQ_LOWEST_OFFSET)
- );
-}
-
-/*
- * Check if symbolic IRQ name is a Processor IRQ
- */
-static inline int is_processor_irq(const rtems_irq_number irqLine)
-{
- return (((int) irqLine <= BSP_PROCESSOR_IRQ_MAX_OFFSET) &
- ((int) irqLine >= BSP_PROCESSOR_IRQ_LOWEST_OFFSET)
- );
+ return (((int) irqLine <= BSP_CPM_IRQ_MAX_OFFSET) &
+ ((int) irqLine >= BSP_CPM_IRQ_LOWEST_OFFSET)
+ );
}
typedef struct {
- uint32_t mask_h; /* mask for sipnr_h and simr_h */
- uint32_t mask_l; /* mask for sipnr_l and simr_l */
- uint32_t priority_h; /* mask this and lower priority ints */
- uint32_t priority_l;
+ uint32_t mask_h; /* mask for sipnr_h and simr_h */
+ uint32_t mask_l; /* mask for sipnr_l and simr_l */
+ uint32_t priority_h; /* mask this and lower priority ints */
+ uint32_t priority_l;
} m82xxIrqMasks_t;
+static unsigned char irqPrioTable[BSP_CPM_IRQ_NUMBER]={
+ /*
+ * actual priorities for interrupt :
+ */
+ /*
+ * CPM Interrupts
+ */
+ 0, 45, 63, 44, 66, 68, 35, 39, 50, 62, 34, 0, 30, 40, 52, 58,
+ 2, 3, 0, 5, 15, 16, 17, 18, 49, 51, 0, 0, 0, 0, 0, 0,
+ 6, 7, 8, 0, 11, 12, 0, 0, 20, 21, 22, 23, 0, 0, 0, 0,
+ 29, 31, 33, 37, 38, 41, 47, 48, 55, 56, 57, 60, 64, 65, 69, 70,
+
+};
+
/*
* Mask fields should have a '1' in the bit position for that
* interrupt.
- * Priority masks calculated later based on priority table
+ * Priority masks calculated later based on priority table
*/
static m82xxIrqMasks_t SIU_MaskBit[BSP_CPM_IRQ_NUMBER] =
{
- { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* err */
- { 0x00000000, 0x00008000, 0x00000000, 0x00000000 }, /* i2c */
- { 0x00000000, 0x00004000, 0x00000000, 0x00000000 }, /* spi */
- { 0x00000000, 0x00002000, 0x00000000, 0x00000000 }, /* rtt */
- { 0x00000000, 0x00001000, 0x00000000, 0x00000000 }, /* smc1 */
- { 0x00000000, 0x00000800, 0x00000000, 0x00000000 }, /* smc2 */
- { 0x00000000, 0x00000400, 0x00000000, 0x00000000 }, /* idma1 */
- { 0x00000000, 0x00000200, 0x00000000, 0x00000000 }, /* idma2 */
- { 0x00000000, 0x00000100, 0x00000000, 0x00000000 }, /* idma3 */
- { 0x00000000, 0x00000080, 0x00000000, 0x00000000 }, /* idma4 */
- { 0x00000000, 0x00000040, 0x00000000, 0x00000000 }, /* sdma */
- { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
- { 0x00000000, 0x00000010, 0x00000000, 0x00000000 }, /* tmr1 */
- { 0x00000000, 0x00000008, 0x00000000, 0x00000000 }, /* tmr2 */
- { 0x00000000, 0x00000004, 0x00000000, 0x00000000 }, /* tmr3 */
- { 0x00000000, 0x00000002, 0x00000000, 0x00000000 }, /* tmr4 */
- { 0x00000004, 0x00000000, 0x00000000, 0x00000000 }, /* tmcnt */
- { 0x00000002, 0x00000000, 0x00000000, 0x00000000 }, /* pit */
- { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
- { 0x00004000, 0x00000000, 0x00000000, 0x00000000 }, /* irq1 */
- { 0x00002000, 0x00000000, 0x00000000, 0x00000000 }, /* irq2 */
- { 0x00001000, 0x00000000, 0x00000000, 0x00000000 }, /* irq3 */
- { 0x00000800, 0x00000000, 0x00000000, 0x00000000 }, /* irq4 */
- { 0x00000400, 0x00000000, 0x00000000, 0x00000000 }, /* irq5 */
- { 0x00000200, 0x00000000, 0x00000000, 0x00000000 }, /* irq6 */
- { 0x00000100, 0x00000000, 0x00000000, 0x00000000 }, /* irq7 */
- { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
- { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
- { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
- { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
- { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
- { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
- { 0x00000000, 0x80000000, 0x00000000, 0x00000000 }, /* fcc1 */
- { 0x00000000, 0x40000000, 0x00000000, 0x00000000 }, /* fcc2 */
- { 0x00000000, 0x20000000, 0x00000000, 0x00000000 }, /* fcc3 */
- { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
- { 0x00000000, 0x08000000, 0x00000000, 0x00000000 }, /* mcc1 */
- { 0x00000000, 0x04000000, 0x00000000, 0x00000000 }, /* mcc2 */
- { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
- { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
- { 0x00000000, 0x00800000, 0x00000000, 0x00000000 }, /* scc1 */
- { 0x00000000, 0x00400000, 0x00000000, 0x00000000 }, /* scc2 */
- { 0x00000000, 0x00200000, 0x00000000, 0x00000000 }, /* scc3 */
- { 0x00000000, 0x00100000, 0x00000000, 0x00000000 }, /* scc4 */
- { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
- { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
- { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
- { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
- { 0x00010000, 0x00000000, 0x00000000, 0x00000000 }, /* pc15 */
- { 0x00020000, 0x00000000, 0x00000000, 0x00000000 }, /* pc14 */
- { 0x00040000, 0x00000000, 0x00000000, 0x00000000 }, /* pc13 */
- { 0x00080000, 0x00000000, 0x00000000, 0x00000000 }, /* pc12 */
- { 0x00100000, 0x00000000, 0x00000000, 0x00000000 }, /* pc11 */
- { 0x00200000, 0x00000000, 0x00000000, 0x00000000 }, /* pc10 */
- { 0x00400000, 0x00000000, 0x00000000, 0x00000000 }, /* pc9 */
- { 0x00800000, 0x00000000, 0x00000000, 0x00000000 }, /* pc8 */
- { 0x01000000, 0x00000000, 0x00000000, 0x00000000 }, /* pc7 */
- { 0x02000000, 0x00000000, 0x00000000, 0x00000000 }, /* pc6 */
- { 0x04000000, 0x00000000, 0x00000000, 0x00000000 }, /* pc5 */
- { 0x08000000, 0x00000000, 0x00000000, 0x00000000 }, /* pc4 */
- { 0x10000000, 0x00000000, 0x00000000, 0x00000000 }, /* pc3 */
- { 0x20000000, 0x00000000, 0x00000000, 0x00000000 }, /* pc2 */
- { 0x40000000, 0x00000000, 0x00000000, 0x00000000 }, /* pc1 */
- { 0x80000000, 0x00000000, 0x00000000, 0x00000000 }, /* pc0 */
+ { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* err */
+ { 0x00000000, 0x00008000, 0x00000000, 0x00000000 }, /* i2c */
+ { 0x00000000, 0x00004000, 0x00000000, 0x00000000 }, /* spi */
+ { 0x00000000, 0x00002000, 0x00000000, 0x00000000 }, /* rtt */
+ { 0x00000000, 0x00001000, 0x00000000, 0x00000000 }, /* smc1 */
+ { 0x00000000, 0x00000800, 0x00000000, 0x00000000 }, /* smc2 */
+ { 0x00000000, 0x00000400, 0x00000000, 0x00000000 }, /* idma1 */
+ { 0x00000000, 0x00000200, 0x00000000, 0x00000000 }, /* idma2 */
+ { 0x00000000, 0x00000100, 0x00000000, 0x00000000 }, /* idma3 */
+ { 0x00000000, 0x00000080, 0x00000000, 0x00000000 }, /* idma4 */
+ { 0x00000000, 0x00000040, 0x00000000, 0x00000000 }, /* sdma */
+ { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
+ { 0x00000000, 0x00000010, 0x00000000, 0x00000000 }, /* tmr1 */
+ { 0x00000000, 0x00000008, 0x00000000, 0x00000000 }, /* tmr2 */
+ { 0x00000000, 0x00000004, 0x00000000, 0x00000000 }, /* tmr3 */
+ { 0x00000000, 0x00000002, 0x00000000, 0x00000000 }, /* tmr4 */
+ { 0x00000004, 0x00000000, 0x00000000, 0x00000000 }, /* tmcnt */
+ { 0x00000002, 0x00000000, 0x00000000, 0x00000000 }, /* pit */
+ { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
+ { 0x00004000, 0x00000000, 0x00000000, 0x00000000 }, /* irq1 */
+ { 0x00002000, 0x00000000, 0x00000000, 0x00000000 }, /* irq2 */
+ { 0x00001000, 0x00000000, 0x00000000, 0x00000000 }, /* irq3 */
+ { 0x00000800, 0x00000000, 0x00000000, 0x00000000 }, /* irq4 */
+ { 0x00000400, 0x00000000, 0x00000000, 0x00000000 }, /* irq5 */
+ { 0x00000200, 0x00000000, 0x00000000, 0x00000000 }, /* irq6 */
+ { 0x00000100, 0x00000000, 0x00000000, 0x00000000 }, /* irq7 */
+ { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
+ { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
+ { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
+ { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
+ { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
+ { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
+ { 0x00000000, 0x80000000, 0x00000000, 0x00000000 }, /* fcc1 */
+ { 0x00000000, 0x40000000, 0x00000000, 0x00000000 }, /* fcc2 */
+ { 0x00000000, 0x20000000, 0x00000000, 0x00000000 }, /* fcc3 */
+ { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
+ { 0x00000000, 0x08000000, 0x00000000, 0x00000000 }, /* mcc1 */
+ { 0x00000000, 0x04000000, 0x00000000, 0x00000000 }, /* mcc2 */
+ { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
+ { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
+ { 0x00000000, 0x00800000, 0x00000000, 0x00000000 }, /* scc1 */
+ { 0x00000000, 0x00400000, 0x00000000, 0x00000000 }, /* scc2 */
+ { 0x00000000, 0x00200000, 0x00000000, 0x00000000 }, /* scc3 */
+ { 0x00000000, 0x00100000, 0x00000000, 0x00000000 }, /* scc4 */
+ { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
+ { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
+ { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
+ { 0x00000000, 0x00000000, 0x00000000, 0x00000000 }, /* reserved */
+ { 0x00010000, 0x00000000, 0x00000000, 0x00000000 }, /* pc15 */
+ { 0x00020000, 0x00000000, 0x00000000, 0x00000000 }, /* pc14 */
+ { 0x00040000, 0x00000000, 0x00000000, 0x00000000 }, /* pc13 */
+ { 0x00080000, 0x00000000, 0x00000000, 0x00000000 }, /* pc12 */
+ { 0x00100000, 0x00000000, 0x00000000, 0x00000000 }, /* pc11 */
+ { 0x00200000, 0x00000000, 0x00000000, 0x00000000 }, /* pc10 */
+ { 0x00400000, 0x00000000, 0x00000000, 0x00000000 }, /* pc9 */
+ { 0x00800000, 0x00000000, 0x00000000, 0x00000000 }, /* pc8 */
+ { 0x01000000, 0x00000000, 0x00000000, 0x00000000 }, /* pc7 */
+ { 0x02000000, 0x00000000, 0x00000000, 0x00000000 }, /* pc6 */
+ { 0x04000000, 0x00000000, 0x00000000, 0x00000000 }, /* pc5 */
+ { 0x08000000, 0x00000000, 0x00000000, 0x00000000 }, /* pc4 */
+ { 0x10000000, 0x00000000, 0x00000000, 0x00000000 }, /* pc3 */
+ { 0x20000000, 0x00000000, 0x00000000, 0x00000000 }, /* pc2 */
+ { 0x40000000, 0x00000000, 0x00000000, 0x00000000 }, /* pc1 */
+ { 0x80000000, 0x00000000, 0x00000000, 0x00000000 }, /* pc0 */
};
-void dump_irq_masks(void )
-{
- int i;
- for( i=0; i<BSP_CPM_IRQ_NUMBER;i++ )
- {
- printk( "%04d: %08X %08X\n",
- i,
- SIU_MaskBit[i].priority_h,
- SIU_MaskBit[i].priority_l
- );
- }
-}
-
/*
* ------------------------ RTEMS Irq helper functions ----------------
*/
@@ -164,255 +142,68 @@ void dump_irq_masks(void )
*/
static void compute_SIU_IvectMask_from_prio (void)
{
- /*
- * The actual masks defined
- * correspond to the priorities defined
- * for the SIU in irq_init.c.
- */
-
- int i,j;
-
- for( i=0; i<BSP_CPM_IRQ_NUMBER; i++ )
- {
- for( j=0;j<BSP_CPM_IRQ_NUMBER; j++ )
- if( internal_config->irqPrioTbl[j] < internal_config->irqPrioTbl[i] )
- {
- SIU_MaskBit[i].priority_h |= SIU_MaskBit[j].mask_h;
- SIU_MaskBit[i].priority_l |= SIU_MaskBit[j].mask_l;
- }
- }
+ /*
+ * The actual masks defined
+ * correspond to the priorities defined
+ * for the SIU in irq_init.c.
+ */
+
+ int i,j;
+
+ for( i=0; i<BSP_CPM_IRQ_NUMBER; i++ )
+ {
+ for( j=0;j<BSP_CPM_IRQ_NUMBER; j++ )
+ if( irqPrioTable[j] < irqPrioTable[i] )
+ {
+ SIU_MaskBit[i].priority_h |= SIU_MaskBit[j].mask_h;
+ SIU_MaskBit[i].priority_l |= SIU_MaskBit[j].mask_l;
+ }
+ }
}
-/*
- * This function check that the value given for the irq line
- * is valid.
- */
-
-static int isValidInterrupt(int irq)
-{
- if ( (irq < BSP_LOWEST_OFFSET) || (irq > BSP_MAX_OFFSET) )
- return 0;
- return 1;
-}
int BSP_irq_enable_at_cpm(const rtems_irq_number irqLine)
{
- int cpm_irq_index;
+ int cpm_irq_index;
- if (!is_cpm_irq(irqLine))
- return 1;
+ if (!is_cpm_irq(irqLine))
+ return 1;
- cpm_irq_index = ((int) (irqLine) - BSP_CPM_IRQ_LOWEST_OFFSET);
+ cpm_irq_index = ((int) (irqLine) - BSP_CPM_IRQ_LOWEST_OFFSET);
- m8260.simr_h |= SIU_MaskBit[cpm_irq_index].mask_h;
- m8260.simr_l |= SIU_MaskBit[cpm_irq_index].mask_l;
+ m8260.simr_h |= SIU_MaskBit[cpm_irq_index].mask_h;
+ m8260.simr_l |= SIU_MaskBit[cpm_irq_index].mask_l;
- return 0;
+ return 0;
}
int BSP_irq_disable_at_cpm(const rtems_irq_number irqLine)
{
- int cpm_irq_index;
-
- if (!is_cpm_irq(irqLine))
- return 1;
-
- cpm_irq_index = ((int) (irqLine) - BSP_CPM_IRQ_LOWEST_OFFSET);
-
- m8260.simr_h &= ~(SIU_MaskBit[cpm_irq_index].mask_h);
- m8260.simr_l &= ~(SIU_MaskBit[cpm_irq_index].mask_l);
-
- return 0;
-}
-
-int BSP_irq_enabled_at_cpm(const rtems_irq_number irqLine)
-{
- int cpm_irq_index;
-
- if (!is_cpm_irq(irqLine))
- return 0;
-
- cpm_irq_index = ((int) (irqLine) - BSP_CPM_IRQ_LOWEST_OFFSET);
-
- return ((m8260.simr_h & SIU_MaskBit[cpm_irq_index].mask_h) ||
- (m8260.simr_l & SIU_MaskBit[cpm_irq_index].mask_l));
-}
-
-/*
- * ------------------------ RTEMS Single Irq Handler Mngt Routines ----------------
- */
-
-int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq)
-{
- rtems_interrupt_level level;
-
- if (!isValidInterrupt(irq->name)) {
- printk( "not a valid intr\n" ) ;
- return 0;
- }
- /*
- * Check if default handler is actually connected. If not issue an error.
- * You must first get the current handler via i386_get_current_idt_entry
- * and then disconnect it using i386_delete_idt_entry.
- * RATIONALE : to always have the same transition by forcing the user
- * to get the previous handler before accepting to disconnect.
- */
- if (rtems_hdl_tbl[irq->name].hdl != default_rtems_entry.hdl) {
- printk( "Default handler not there\n" );
- return 0;
- }
-
- rtems_interrupt_disable(level);
-
- /*
- * store the data provided by user
- */
- rtems_hdl_tbl[irq->name] = *irq;
-
- if (is_cpm_irq(irq->name)) {
- /*
- * Enable interrupt at PIC level
- */
- BSP_irq_enable_at_cpm (irq->name);
- }
-
-#if 0
- if (is_processor_irq(irq->name)) {
- /*
- * Should Enable exception at processor level but not needed. Will restore
- * EE flags at the end of the routine anyway.
- */
- }
-#endif
-
- /*
- * Enable interrupt on device
- */
- if (irq->on)
- irq->on(irq);
-
- rtems_interrupt_enable(level);
-
- /*
- printk( "Enabled\n" );
- */
- return 1;
-}
+ int cpm_irq_index;
-int BSP_get_current_rtems_irq_handler (rtems_irq_connect_data* irq)
-{
- if (!isValidInterrupt(irq->name)) {
- return 0;
- }
- *irq = rtems_hdl_tbl[irq->name];
- return 1;
-}
+ if (!is_cpm_irq(irqLine))
+ return 1;
-int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq)
-{
- rtems_interrupt_level level;
-
- if (!isValidInterrupt(irq->name)) {
- return 0;
- }
- /*
- * Check if default handler is actually connected. If not issue an error.
- * You must first get the current handler via i386_get_current_idt_entry
- * and then disconnect it using i386_delete_idt_entry.
- * RATIONALE : to always have the same transition by forcing the user
- * to get the previous handler before accepting to disconnect.
- */
- if (rtems_hdl_tbl[irq->name].hdl != irq->hdl) {
- return 0;
- }
- rtems_interrupt_disable(level);
-
- if (is_cpm_irq(irq->name)) {
- /*
- * disable interrupt at PIC level
- */
- BSP_irq_disable_at_cpm (irq->name);
- }
-
- if (is_processor_irq(irq->name)) {
- /*
- * disable exception at processor level
- */
- }
-
- /*
- * Disable interrupt on device
- */
- if (irq->off)
- irq->off(irq);
-
- /*
- * restore the default irq value
- */
- rtems_hdl_tbl[irq->name] = default_rtems_entry;
-
- rtems_interrupt_enable(level);
-
- return 1;
-}
+ cpm_irq_index = ((int) (irqLine) - BSP_CPM_IRQ_LOWEST_OFFSET);
-/*
- * ------------------------ RTEMS Global Irq Handler Mngt Routines ----------------
- */
+ m8260.simr_h &= ~(SIU_MaskBit[cpm_irq_index].mask_h);
+ m8260.simr_l &= ~(SIU_MaskBit[cpm_irq_index].mask_l);
-int BSP_rtems_irq_mngt_set(rtems_irq_global_settings* config)
-{
- int i;
- rtems_interrupt_level level;
-
- /*
- * Store various code accelerators
- */
- internal_config = config;
- default_rtems_entry = config->defaultEntry;
- rtems_hdl_tbl = config->irqHdlTbl;
-
- /* Fill in priority masks */
- compute_SIU_IvectMask_from_prio();
-
- rtems_interrupt_disable(level);
- /*
- * start with CPM IRQ
- */
- for (i=BSP_CPM_IRQ_LOWEST_OFFSET; i < BSP_CPM_IRQ_LOWEST_OFFSET + BSP_CPM_IRQ_NUMBER ; i++) {
- if (rtems_hdl_tbl[i].hdl != default_rtems_entry.hdl) {
- BSP_irq_enable_at_cpm (i);
- if (rtems_hdl_tbl[i].on)
- rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]);
- } else {
- if (rtems_hdl_tbl[i].off)
- rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]);
- BSP_irq_disable_at_cpm (i);
- }
- }
-
- /*
- * finish with Processor exceptions handled like IRQ
- */
- for (i=BSP_PROCESSOR_IRQ_LOWEST_OFFSET; i < BSP_PROCESSOR_IRQ_LOWEST_OFFSET + BSP_PROCESSOR_IRQ_NUMBER; i++) {
- if (rtems_hdl_tbl[i].hdl != default_rtems_entry.hdl) {
- if (rtems_hdl_tbl[i].on)
- rtems_hdl_tbl[i].on(&rtems_hdl_tbl[i]);
- } else {
- if (rtems_hdl_tbl[i].off)
- rtems_hdl_tbl[i].off(&rtems_hdl_tbl[i]);
- }
- }
-
- rtems_interrupt_enable(level);
- return 1;
+ return 0;
}
-
-int BSP_rtems_irq_mngt_get(rtems_irq_global_settings** config)
-{
- *config = internal_config;
- return 0;
+
+int BSP_irq_enabled_at_cpm(const rtems_irq_number irqLine)
+{
+ int cpm_irq_index;
+
+ if (!is_cpm_irq(irqLine))
+ return 0;
+
+ cpm_irq_index = ((int) (irqLine) - BSP_CPM_IRQ_LOWEST_OFFSET);
+
+ return ((m8260.simr_h & SIU_MaskBit[cpm_irq_index].mask_h) ||
+ (m8260.simr_l & SIU_MaskBit[cpm_irq_index].mask_l));
}
#ifdef DISPATCH_HANDLER_STAT
@@ -424,116 +215,165 @@ volatile unsigned int maxLoop = 0;
*/
int C_dispatch_irq_handler (CPU_Interrupt_frame *frame, unsigned int excNum)
{
- register unsigned int irq;
+ register unsigned int irq;
#if 0
- register unsigned oldMask; /* old siu pic masks */
+ register unsigned oldMask; /* old siu pic masks */
#endif
- register unsigned msr;
- register unsigned new_msr;
- register unsigned old_simr_h;
- register unsigned old_simr_l;
+ register unsigned msr;
+ register unsigned new_msr;
+ register unsigned old_simr_h;
+ register unsigned old_simr_l;
#ifdef DISPATCH_HANDLER_STAT
- unsigned loopCounter;
+ unsigned loopCounter;
#endif
- /*
- * Handle decrementer interrupt
- */
- if (excNum == ASM_DEC_VECTOR) {
- _CPU_MSR_GET(msr);
- new_msr = msr | MSR_EE;
- _CPU_MSR_SET(new_msr);
+ /*
+ * Handle decrementer interrupt
+ */
+ if (excNum == ASM_DEC_VECTOR) {
+ _CPU_MSR_GET(msr);
+ new_msr = msr | MSR_EE;
+ _CPU_MSR_SET(new_msr);
- rtems_hdl_tbl[BSP_DECREMENTER].hdl(rtems_hdl_tbl[BSP_DECREMENTER].handle);
+ bsp_interrupt_handler_dispatch(BSP_DECREMENTER);
- _CPU_MSR_SET(msr);
+ _CPU_MSR_SET(msr);
- return 0;
- }
+ return 0;
+ }
- /*
- * Handle external interrupt generated by SIU on PPC core
- */
+ /*
+ * Handle external interrupt generated by SIU on PPC core
+ */
#ifdef DISPATCH_HANDLER_STAT
- loopCounter = 0;
+ loopCounter = 0;
#endif
- while (1) {
+ while (1) {
- if( ((m8260.sipnr_h & m8260.simr_h) | (m8260.sipnr_l & m8260.simr_l)) == 0 ) {
+ if( ((m8260.sipnr_h & m8260.simr_h) | (m8260.sipnr_l & m8260.simr_l)) == 0 ) {
#ifdef DISPATCH_HANDLER_STAT
- if (loopCounter > maxLoop) maxLoop = loopCounter;
+ if (loopCounter > maxLoop) maxLoop = loopCounter;
#endif
- break;
- }
+ break;
+ }
- irq = (m8260.sivec >> 26) + BSP_CPM_IRQ_LOWEST_OFFSET;
+ irq = (m8260.sivec >> 26) + BSP_CPM_IRQ_LOWEST_OFFSET;
- /* Clear mask and pending register */
- if( irq <= BSP_CPM_IRQ_MAX_OFFSET ) {
- /* save interrupt masks */
- old_simr_h = m8260.simr_h;
- old_simr_l = m8260.simr_l;
+ /* Clear mask and pending register */
+ if( irq <= BSP_CPM_IRQ_MAX_OFFSET ) {
+ /* save interrupt masks */
+ old_simr_h = m8260.simr_h;
+ old_simr_l = m8260.simr_l;
- /* mask off current interrupt and lower priority ones */
- m8260.simr_h &= SIU_MaskBit[irq].priority_h;
- m8260.simr_l &= SIU_MaskBit[irq].priority_l;
+ /* mask off current interrupt and lower priority ones */
+ m8260.simr_h &= SIU_MaskBit[irq].priority_h;
+ m8260.simr_l &= SIU_MaskBit[irq].priority_l;
- /* clear pending bit */
- m8260.sipnr_h |= SIU_MaskBit[irq].mask_h;
- m8260.sipnr_l |= SIU_MaskBit[irq].mask_l;
+ /* clear pending bit */
+ m8260.sipnr_h |= SIU_MaskBit[irq].mask_h;
+ m8260.sipnr_l |= SIU_MaskBit[irq].mask_l;
- /*
- * make sure, that the masking operations in
- * ICTL and MSR are executed in order
- */
- asm volatile("sync":::"memory");
+ /*
+ * make sure, that the masking operations in
+ * ICTL and MSR are executed in order
+ */
+ asm volatile("sync":::"memory");
- /* re-enable external exceptions */
- _CPU_MSR_GET(msr);
- new_msr = msr | MSR_EE;
- _CPU_MSR_SET(new_msr);
+ /* re-enable external exceptions */
+ _CPU_MSR_GET(msr);
+ new_msr = msr | MSR_EE;
+ _CPU_MSR_SET(new_msr);
- /* call handler */
- rtems_hdl_tbl[irq].hdl(rtems_hdl_tbl[irq].handle);
+ /* call handler */
+ bsp_interrupt_handler_dispatch(irq);
- /* disable exceptions again */
- _CPU_MSR_SET(msr);
+ /* disable exceptions again */
+ _CPU_MSR_SET(msr);
- /*
- * make sure, that the masking operations in
- * ICTL and MSR are executed in order
- */
- asm volatile("sync":::"memory");
+ /*
+ * make sure, that the masking operations in
+ * ICTL and MSR are executed in order
+ */
+ asm volatile("sync":::"memory");
- /* restore interrupt masks */
- m8260.simr_h = old_simr_h;
- m8260.simr_l = old_simr_l;
+ /* restore interrupt masks */
+ m8260.simr_h = old_simr_h;
+ m8260.simr_l = old_simr_l;
- }
+ }
#ifdef DISPATCH_HANDLER_STAT
- ++ loopCounter;
+ ++ loopCounter;
#endif
- }
- return 0;
+ }
+ return 0;
+}
+
+/*
+ * Initialize CPM interrupt management
+ */
+void
+BSP_CPM_irq_init(void)
+{
+ m8260.simr_l = 0;
+ m8260.simr_h = 0;
+ m8260.sipnr_l = 0xffffffff;
+ m8260.sipnr_h = 0xffffffff;
+ m8260.sicr = 0;
+
+ /*
+ * Initialize the interrupt priorities.
+ */
+ m8260.siprr = 0x05309770; /* reset value */
+ m8260.scprr_h = 0x05309770; /* reset value */
+ m8260.scprr_l = 0x05309770; /* reset value */
+
+}
+
+rtems_status_code bsp_interrupt_vector_enable( rtems_vector_number irqnum)
+{
+ if (is_cpm_irq(irqnum)) {
+ /*
+ * Enable interrupt at PIC level
+ */
+ BSP_irq_enable_at_cpm (irqnum);
+ }
+
+ return RTEMS_SUCCESSFUL;
+}
+
+rtems_status_code bsp_interrupt_vector_disable( rtems_vector_number irqnum)
+{
+ if (is_cpm_irq(irqnum)) {
+ /*
+ * disable interrupt at PIC level
+ */
+ BSP_irq_disable_at_cpm (irqnum);
+ }
+
+ return RTEMS_SUCCESSFUL;
+}
+
+rtems_status_code bsp_interrupt_facility_initialize()
+{
+ /* Install exception handler */
+ if (ppc_exc_set_handler( ASM_EXT_VECTOR, C_dispatch_irq_handler)) {
+ return RTEMS_IO_ERROR;
+ }
+ if (ppc_exc_set_handler( ASM_DEC_VECTOR, C_dispatch_irq_handler)) {
+ return RTEMS_IO_ERROR;
+ }
+
+ /* Fill in priority masks */
+ compute_SIU_IvectMask_from_prio();
+
+ /* Initialize the interrupt controller */
+ BSP_CPM_irq_init();
+
+ return RTEMS_SUCCESSFUL;
}
-void _ThreadProcessSignalsFromIrq (BSP_Exception_frame* ctx)
+void bsp_interrupt_handler_default( rtems_vector_number vector)
{
- /*
- * Process pending signals that have not already been
- * processed by _Thread_Displatch. This happens quite
- * unfrequently : the ISR must have posted an action
- * to the current running thread.
- */
- if ( _Thread_Do_post_task_switch_extension ||
- _Thread_Executing->do_post_task_switch_extension ) {
- _Thread_Executing->do_post_task_switch_extension = false;
- _API_extensions_Run_postswitch();
- }
-
- /*
- * I plan to process other thread related events here.
- * This will include DEBUG session requested from keyboard...
- */
+ printk( "Spurious interrupt: 0x%08x\n", vector);
}
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/make/custom/mpc8260ads.cfg b/c/src/lib/libbsp/powerpc/mpc8260ads/make/custom/mpc8260ads.cfg
index 00eb8d4de5..bfb6ab2362 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/make/custom/mpc8260ads.cfg
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/make/custom/mpc8260ads.cfg
@@ -14,7 +14,8 @@ RTEMS_CPU_MODEL=mpc8260
# and (hopefully) optimize for it.
#
# CPU_CFLAGS = -mcpu=$(8XX_CPU_TYPE) -mstrict-align
-CPU_CFLAGS = -mcpu=603e -mstrict-align -Dmpc8260
+CPU_CFLAGS = -mcpu=603e -mstrict-align -Dmpc8260 \
+ -meabi -msdata -fno-common
# optimize flag: typically -O2
CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/preinstall.am b/c/src/lib/libbsp/powerpc/mpc8260ads/preinstall.am
index 369b491c12..d43f129cd1 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/preinstall.am
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/preinstall.am
@@ -69,7 +69,15 @@ $(PROJECT_INCLUDE)/bsp/irq.h: irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
-$(PROJECT_INCLUDE)/bsp/vectors.h: vectors/vectors.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/vectors.h
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/vectors.h
+$(PROJECT_INCLUDE)/bsp/irq-config.h: include/irq-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-config.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-config.h
+
+$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
+
+$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c
index 194aeb542f..fc48062bbc 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c
@@ -35,8 +35,6 @@
* $Id$
*/
-#warning The interrupt disable mask is now stored in SPRG0, please verify that this is compatible to this BSP (see also bootcard.c).
-
#include <bsp.h>
/*
@@ -55,8 +53,6 @@
SPR_RW(SPRG1)
-extern unsigned long intrStackPtr;
-
/*
* Driver configuration parameters
*/
@@ -74,7 +70,9 @@ bool bsp_timer_internal_clock; /* TRUE, when timer runs with CPU clk */
void _BSP_GPLED1_on(void);
void _BSP_GPLED0_on(void);
void cpu_init(void);
-void initialize_exceptions(void);
+
+extern char IntrStack_start [];
+extern char intrStack [];
void BSP_panic(char *s)
{
@@ -150,10 +148,10 @@ void _BSP_Uart2_disable()
void bsp_start(void)
{
+ rtems_status_code sc = RTEMS_SUCCESSFUL;
extern void *_WorkspaceBase;
ppc_cpu_id_t myCpu;
ppc_cpu_revision_t myCpuRevision;
- register unsigned char* intrStack;
/* Set MPC8260ADS board LEDS and Uart enable lines */
_BSP_GPLED0_off();
@@ -173,21 +171,24 @@ void bsp_start(void)
/*
mmu_init();
*/
- /*
- * Initialize some SPRG registers related to irq handling
- */
- intrStack = (((unsigned char*)&intrStackPtr) - PPC_MINIMUM_STACK_FRAME_SIZE);
- _write_SPRG1((unsigned int)intrStack);
+ /* Initialize exception handler */
+ /* FIXME: Interrupt stack begin and size */
+ sc = ppc_exc_initialize(
+ PPC_INTERRUPT_DISABLE_MASK_DEFAULT,
+ (uintptr_t) IntrStack_start,
+ (uintptr_t) intrStack - (uintptr_t) IntrStack_start
+ );
+ if (sc != RTEMS_SUCCESSFUL) {
+ BSP_panic("cannot intitialize exceptions");
+ }
-/*
- printk( "About to call initialize_exceptions\n" );
-*/
- /*
- * Install our own set of exception vectors
- */
+ /* Initalize interrupt support */
+ sc = bsp_interrupt_initialize();
+ if (sc != RTEMS_SUCCESSFUL) {
+ BSP_panic("cannot intitialize interrupts");
+ }
- initialize_exceptions();
/*
mmu_init();
@@ -227,11 +228,6 @@ void bsp_start(void)
m8260.brgc1 = M8260_BRG_EN + (uint32_t)(((uint16_t)((40016384)/(32768)) - 1) << 1) + 0;
*/
- /*
- * Initalize RTEMS IRQ system
- */
- BSP_rtems_irq_mng_init(0);
-
#ifdef SHOW_MORE_INIT_SETTINGS
printk("Exit from bspstart\n");
#endif
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/linkcmds b/c/src/lib/libbsp/powerpc/mpc8260ads/startup/linkcmds
index e194a19f9c..ca9d47d3cd 100644
--- a/c/src/lib/libbsp/powerpc/mpc8260ads/startup/linkcmds
+++ b/c/src/lib/libbsp/powerpc/mpc8260ads/startup/linkcmds
@@ -208,29 +208,39 @@ SECTIONS
.fixup : { *(.fixup) } >ram
PROVIDE (_FIXUP_END_ = .);
PROVIDE (__FIXUP_END__ = .);
+
+ .sdata : {
+ PROVIDE (_SDA_BASE_ = 32768);
+ *(.sdata .sdata.* .gnu.linkonce.s.*)
+ } > ram
+
+ .sbss : {
+ __bss_start = .;
+
+ PROVIDE (__sbss_start = .); PROVIDE (___sbss_start = .);
+ *(.scommon)
+ *(.dynsbss)
+ *(.sbss .sbss.* .gnu.linkonce.sb.*)
+ PROVIDE (__sbss_end = .); PROVIDE (___sbss_end = .);
+ } > ram
+
+ .sdata2 : {
+ PROVIDE (_SDA2_BASE_ = 32768);
+
+ *(.sdata2 .sdata2.* .gnu.linkonce.s2.*)
+ } > ram =0
+
+ .sbss2 : {
+ *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*)
+ } > ram =0
- PROVIDE (__SDATA2_START__ = .);
- .sdata2 : { *(.sdata2) *(.gnu.linkonce.s2.*) } >ram
- .sbss2 : { *(.sbss2) *(.gnu.linkonce.sb2.*) } >ram
- PROVIDE (__SBSS2_END__ = .);
-
- .sbss2 : { *(.sbss2) } >ram
- PROVIDE (__SBSS2_END__ = .);
-
- __SBSS_START__ = .;
.bss :
{
bss.start = .;
*(.bss .bss* .gnu.linkonce.b*)
- *(.sbss*) *(COMMON)
. = ALIGN(4);
bss.end = .;
} > ram
- __SBSS_END__ = .;
-
-
-
-
/* R/W Data */
.data ( . ) :