sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Standard configuration variables used to enable interupt controller debug; SAMA5: Correct handling of spurious interrupts

Browse Source
This commit is contained in:
Gregory Nutt 2013-08-03 08:22:37 -06:00
parent 3c404ea742
commit 6422792f57
14 changed files with 319 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -5269,5 +5269,8 @@
After initialization, the page table entries are modified so After initialization, the page table entries are modified so
that DRAM is fully cache-able (2018-8-2). that DRAM is fully cache-able (2018-8-2).
* arch/arm/src/sama5/chip/sam_mpddrc.h: Correct typos in the * arch/arm/src/sama5/chip/sam_mpddrc.h: Correct typos in the
SAMA5 DDR controller register definitions (2013-9-2013). SAMA5 DDR controller register definitions (2013-8-2).
* arch/arm/src/sama5/sam_irq.c: Correct handling of spurious
interrupts (2013-8-3).
* arch/*/src/*/*_irq.c: Standardize configuration variables used
to enable interrupt controller debug output (2013-8-3).

57
Kconfig
View File

@ -327,64 +327,75 @@ config DEBUG_VERBOSE
comment "Subsystem Debug Options" comment "Subsystem Debug Options"
config DEBUG_MM config DEBUG_MM
bool "Enable Memory Manager Debug Output" bool "Memory Manager Debug Output"
default n default n
---help--- ---help---
Enable memory management debug SYSLOG output (disabled by default) Enable memory management debug SYSLOG output (disabled by default)
config DEBUG_SCHED config DEBUG_SCHED
bool "Enable Scheduler Debug Output" bool "Scheduler Debug Output"
default n default n
---help--- ---help---
Enable OS debug SYSLOG output (disabled by default) Enable OS debug SYSLOG output (disabled by default)
config DEBUG_PAGING config DEBUG_PAGING
bool "Enable Demand Paging Debug Output" bool "Demand Paging Debug Output"
default n default n
depends on PAGING depends on PAGING
---help--- ---help---
Enable demand paging debug SYSLOG output (disabled by default) Enable demand paging debug SYSLOG output (disabled by default)
config DEBUG_NET config DEBUG_NET
bool "Enable Network Debug Output" bool "Network Debug Output"
default n default n
depends on NET depends on NET
---help--- ---help---
Enable network debug SYSLOG output (disabled by default) Enable network debug SYSLOG output (disabled by default)
config DEBUG_USB config DEBUG_USB
bool "Enable USB Debug Output" bool "USB Debug Output"
default n default n
depends on USBDEV || USBHOST depends on USBDEV || USBHOST
---help--- ---help---
Enable usb debug SYSLOG output (disabled by default) Enable usb debug SYSLOG output (disabled by default)
config DEBUG_FS config DEBUG_FS
bool "Enable File System Debug Output" bool "File System Debug Output"
default n default n
---help--- ---help---
Enable file system debug SYSLOG output (disabled by default) Enable file system debug SYSLOG output (disabled by default)
config DEBUG_LIB config DEBUG_LIB
bool "Enable C Library Debug Output" bool "C Library Debug Output"
default n default n
---help--- ---help---
Enable C library debug SYSLOG output (disabled by default) Enable C library debug SYSLOG output (disabled by default)
config DEBUG_BINFMT config DEBUG_BINFMT
bool "Enable Binary Loader Debug Output" bool "Binary Loader Debug Output"
default n default n
---help--- ---help---
Enable binary loader debug SYSLOG output (disabled by default) Enable binary loader debug SYSLOG output (disabled by default)
config DEBUG_GRAPHICS config DEBUG_GRAPHICS
bool "Enable Graphics Debug Output" bool "Graphics Debug Output"
default n default n
---help--- ---help---
Enable NX graphics debug SYSLOG output (disabled by default) Enable NX graphics debug SYSLOG output (disabled by default)
config DEBUG_IRQ
bool "Interrupt Controller Debug Output"
default n
---help---
Some (but not all) architectures support debug output to verify
interrupt controller logic. If supported, then option will enable
that output. This may interfere with normal operations! You
should *not* enable interrupt controller debug unless you suspect
that here is a problem with that logic. On some platforms, this
option may even cause crashes! Use with care!
config DEBUG_SYSCALL config DEBUG_SYSCALL
bool "Enable SYSCALL Debug Output" bool "SYSCALL Debug Output"
default n default n
depends on NUTTX_KERNEL depends on NUTTX_KERNEL
---help--- ---help---
@ -394,7 +405,7 @@ config DEBUG_SYSCALL
comment "Driver Debug Options" comment "Driver Debug Options"
config DEBUG_LCD config DEBUG_LCD
bool "Enable Low-level LCD Debug Output" bool "Low-level LCD Debug Output"
default n default n
depends on LCD depends on LCD
---help--- ---help---
@ -403,7 +414,7 @@ config DEBUG_LCD
may not be available for some boards. may not be available for some boards.
config DEBUG_LEDS config DEBUG_LEDS
bool "Enable Low-level LED Debug Output" bool "Low-level LED Debug Output"
default n default n
depends on ARCH_HAVE_LEDS depends on ARCH_HAVE_LEDS
---help--- ---help---
@ -412,7 +423,7 @@ config DEBUG_LEDS
some boards. some boards.
config DEBUG_INPUT config DEBUG_INPUT
bool "Enable Input Device Debug Output" bool "Input Device Debug Output"
default n default n
depends on INPUT depends on INPUT
---help--- ---help---
@ -422,7 +433,7 @@ config DEBUG_INPUT
some boards. some boards.
config DEBUG_ANALOG config DEBUG_ANALOG
bool "Enable Analog Device Debug Output" bool "Analog Device Debug Output"
default n default n
---help--- ---help---
Enable low level debug SYSLOG output from the analog device drivers Enable low level debug SYSLOG output from the analog device drivers
@ -431,7 +442,7 @@ config DEBUG_ANALOG
for some MCUs. for some MCUs.
config DEBUG_I2C config DEBUG_I2C
bool "Enable I2C Debug Output" bool "I2C Debug Output"
default n default n
depends on I2C depends on I2C
---help--- ---help---
@ -440,7 +451,7 @@ config DEBUG_I2C
be available for some MCUs. be available for some MCUs.
config DEBUG_SPI config DEBUG_SPI
bool "Enable SPI Debug Output" bool "SPI Debug Output"
default n default n
depends on SPI depends on SPI
---help--- ---help---
@ -449,7 +460,7 @@ config DEBUG_SPI
be available for some MCUs. be available for some MCUs.
config DEBUG_CAN config DEBUG_CAN
bool "Enable CAN Debug Output" bool "CAN Debug Output"
default n default n
depends on CAN depends on CAN
---help--- ---help---
@ -458,7 +469,7 @@ config DEBUG_CAN
be available for some MCUs. be available for some MCUs.
config DEBUG_SDIO config DEBUG_SDIO
bool "Enable SDIO Debug Output" bool "SDIO Debug Output"
default n default n
depends on MMCSD_SDIO depends on MMCSD_SDIO
---help--- ---help---
@ -467,7 +478,7 @@ config DEBUG_SDIO
be available for some MCUs. be available for some MCUs.
config DEBUG_GPIO config DEBUG_GPIO
bool "Enable GPIO Debug Output" bool "GPIO Debug Output"
default n default n
---help--- ---help---
Enable GPIO-releated debug SYSLOG output (disabled by default). Enable GPIO-releated debug SYSLOG output (disabled by default).
@ -475,7 +486,7 @@ config DEBUG_GPIO
be available for some MCUs. be available for some MCUs.
config DEBUG_DMA config DEBUG_DMA
bool "Enable DMA Debug Output" bool "DMA Debug Output"
default n default n
depends on ARCH_DMA depends on ARCH_DMA
---help--- ---help---
@ -484,7 +495,7 @@ config DEBUG_DMA
be available for some MCUs. be available for some MCUs.
config DEBUG_WATCHDOG config DEBUG_WATCHDOG
bool "Enable Watchdog Timer Debug Output" bool "Watchdog Timer Debug Output"
default n default n
depends on WATCHDOG depends on WATCHDOG
---help--- ---help---
@ -493,7 +504,7 @@ config DEBUG_WATCHDOG
be available for some MCUs. be available for some MCUs.
config DEBUG_AUDIO config DEBUG_AUDIO
bool "Enable Audio Device Debug Output" bool "Audio Device Debug Output"
default n default n
---help--- ---help---
Enable low level debug SYSLOG output from the audio subsystem and Enable low level debug SYSLOG output from the audio subsystem and
@ -503,7 +514,7 @@ config DEBUG_AUDIO
endif endif
config DEBUG_SYMBOLS config DEBUG_SYMBOLS
bool "Enable Debug Symbols" bool "Generate Debug Symbols"
default n default n
---help--- ---help---
Build without optimization and with debug symbols (needed Build without optimization and with debug symbols (needed

52
arch/arm/src/kinetis/kinetis_irq.c
View File

@ -58,12 +58,6 @@
* Definitions * Definitions
****************************************************************************/ ****************************************************************************/
/* Enable NVIC debug features that are probably only desireable during
* bringup
*/
#undef KINETIS_IRQ_DEBUG
/* Get a 32-bit version of the default priority */ /* Get a 32-bit version of the default priority */
#define DEFPRIORITY32 \ #define DEFPRIORITY32 \
@ -94,51 +88,49 @@ volatile uint32_t *current_regs;
* *
****************************************************************************/ ****************************************************************************/
#if defined(KINETIS_IRQ_DEBUG) && defined (CONFIG_DEBUG) #if defined(CONFIG_DEBUG_IRQ)
static void kinetis_dumpnvic(const char *msg, int irq) static void kinetis_dumpnvic(const char *msg, int irq)
{ {
irqstate_t flags; irqstate_t flags;
flags = irqsave(); flags = irqsave();
slldbg("NVIC (%s, irq=%d):\n", msg, irq); lldbg("NVIC (%s, irq=%d):\n", msg, irq);
slldbg(" INTCTRL: %08x VECTAB: %08x\n", lldbg(" INTCTRL: %08x VECTAB: %08x\n",
getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB)); getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB));
#if 0 #if 0
slldbg(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n", lldbg(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n",
getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA), getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA),
getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE)); getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE));
#endif #endif
slldbg(" IRQ ENABLE: %08x %08x %08x %08x\n", lldbg(" IRQ ENABLE: %08x %08x %08x %08x\n",
getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE); getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE);
getreg32(NVIC_IRQ64_95_ENABLE), getreg32(NVIC_IRQ96_127_ENABLE)); getreg32(NVIC_IRQ64_95_ENABLE), getreg32(NVIC_IRQ96_127_ENABLE));
slldbg(" SYSH_PRIO: %08x %08x %08x\n", lldbg(" SYSH_PRIO: %08x %08x %08x\n",
getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY), getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY),
getreg32(NVIC_SYSH12_15_PRIORITY)); getreg32(NVIC_SYSH12_15_PRIORITY));
slldbg(" IRQ PRIO: %08x %08x %08x %08x\n", lldbg(" IRQ PRIO: %08x %08x %08x %08x\n",
getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY), getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY),
getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY)); getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY));
slldbg(" %08x %08x %08x %08x\n", lldbg(" %08x %08x %08x %08x\n",
getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY), getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY),
getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY)); getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY));
slldbg(" %08x %08x %08x %08x\n", lldbg(" %08x %08x %08x %08x\n",
getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY), getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY),
getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY)); getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY));
lldbg(" %08x %08x %08x %08x\n",
slldbg(" %08x %08x %08x %08x\n",
getreg32(NVIC_IRQ48_51_PRIORITY), getreg32(NVIC_IRQ52_55_PRIORITY), getreg32(NVIC_IRQ48_51_PRIORITY), getreg32(NVIC_IRQ52_55_PRIORITY),
getreg32(NVIC_IRQ56_59_PRIORITY), getreg32(NVIC_IRQ60_63_PRIORITY)); getreg32(NVIC_IRQ56_59_PRIORITY), getreg32(NVIC_IRQ60_63_PRIORITY));
slldbg(" %08x %08x %08x %08x\n", lldbg(" %08x %08x %08x %08x\n",
getreg32(NVIC_IRQ64_67_PRIORITY), getreg32(NVIC_IRQ68_71_PRIORITY), getreg32(NVIC_IRQ64_67_PRIORITY), getreg32(NVIC_IRQ68_71_PRIORITY),
getreg32(NVIC_IRQ72_75_PRIORITY), getreg32(NVIC_IRQ76_79_PRIORITY)); getreg32(NVIC_IRQ72_75_PRIORITY), getreg32(NVIC_IRQ76_79_PRIORITY));
lldbg(" %08x %08x %08x %08x\n",
slldbg(" %08x %08x %08x %08x\n",
getreg32(NVIC_IRQ80_83_PRIORITY), getreg32(NVIC_IRQ84_87_PRIORITY), getreg32(NVIC_IRQ80_83_PRIORITY), getreg32(NVIC_IRQ84_87_PRIORITY),
getreg32(NVIC_IRQ88_91_PRIORITY), getreg32(NVIC_IRQ92_95_PRIORITY)); getreg32(NVIC_IRQ88_91_PRIORITY), getreg32(NVIC_IRQ92_95_PRIORITY));
slldbg(" %08x %08x %08x %08x\n", lldbg(" %08x %08x %08x %08x\n",
getreg32(NVIC_IRQ96_99_PRIORITY), getreg32(NVIC_IRQ100_103_PRIORITY), getreg32(NVIC_IRQ96_99_PRIORITY), getreg32(NVIC_IRQ100_103_PRIORITY),
getreg32(NVIC_IRQ104_107_PRIORITY), getreg32(NVIC_IRQ108_111_PRIORITY)); getreg32(NVIC_IRQ104_107_PRIORITY), getreg32(NVIC_IRQ108_111_PRIORITY));
#if NR_VECTORS > 111 #if NR_VECTORS > 111
slldbg(" %08x %08x\n", lldbg(" %08x %08x\n",
getreg32(NVIC_IRQ112_115_PRIORITY), getreg32(NVIC_IRQ116_119_PRIORITY)); getreg32(NVIC_IRQ112_115_PRIORITY), getreg32(NVIC_IRQ116_119_PRIORITY));
#endif #endif
@ -423,7 +415,7 @@ void up_irqinitialize(void)
/* Initialize logic to support a second level of interrupt decoding for /* Initialize logic to support a second level of interrupt decoding for
* configured pin interrupts. * configured pin interrupts.
*/ */
#ifdef CONFIG_GPIO_IRQ #ifdef CONFIG_GPIO_IRQ
kinetis_pinirqinitialize(); kinetis_pinirqinitialize();
#endif #endif

34
arch/arm/src/kl/kl_irq.c
View File

@ -86,34 +86,34 @@ volatile uint32_t *current_regs;
* *
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_DEBUG_IRQ) && defined (CONFIG_DEBUG) #if defined(CONFIG_DEBUG_IRQ)
static void kl_dumpnvic(const char *msg, int irq) static void kl_dumpnvic(const char *msg, int irq)
{ {
irqstate_t flags; irqstate_t flags;
flags = irqsave(); flags = irqsave();
slldbg("NVIC (%s, irq=%d):\n", msg, irq); lldbg("NVIC (%s, irq=%d):\n", msg, irq);
slldbg(" ISER: %08x ICER: %08x\n", lldbg(" ISER: %08x ICER: %08x\n",
getreg32(ARMV6M_NVIC_ISER), getreg32(ARMV6M_NVIC_ICER)); getreg32(ARMV6M_NVIC_ISER), getreg32(ARMV6M_NVIC_ICER));
slldbg(" ISPR: %08x ICPR: %08x\n", lldbg(" ISPR: %08x ICPR: %08x\n",
getreg32(ARMV6M_NVIC_ISPR), getreg32(ARMV6M_NVIC_ICPR)); getreg32(ARMV6M_NVIC_ISPR), getreg32(ARMV6M_NVIC_ICPR));
slldbg(" IRQ PRIO: %08x %08x %08x %08x\n", lldbg(" IRQ PRIO: %08x %08x %08x %08x\n",
getreg32(ARMV6M_NVIC_IPR0), getreg32(ARMV6M_NVIC_IPR1), getreg32(ARMV6M_NVIC_IPR0), getreg32(ARMV6M_NVIC_IPR1),
getreg32(ARMV6M_NVIC_IPR2), getreg32(ARMV6M_NVIC_IPR3)); getreg32(ARMV6M_NVIC_IPR2), getreg32(ARMV6M_NVIC_IPR3));
slldbg(" %08x %08x %08x %08x\n", lldbg(" %08x %08x %08x %08x\n",
getreg32(ARMV6M_NVIC_IPR4), getreg32(ARMV6M_NVIC_IPR5), getreg32(ARMV6M_NVIC_IPR4), getreg32(ARMV6M_NVIC_IPR5),
getreg32(ARMV6M_NVIC_IPR6), getreg32(ARMV6M_NVIC_IPR7)); getreg32(ARMV6M_NVIC_IPR6), getreg32(ARMV6M_NVIC_IPR7));
slldbg("SYSCON:\n"); lldbg("SYSCON:\n");
slldbg(" CPUID: %08x\n", lldbg(" CPUID: %08x\n",
getreg32(ARMV6M_SYSCON_CPUID)); getreg32(ARMV6M_SYSCON_CPUID));
slldbg(" ICSR: %08x AIRCR: %08x\n", lldbg(" ICSR: %08x AIRCR: %08x\n",
getreg32(ARMV6M_SYSCON_ICSR), getreg32(ARMV6M_SYSCON_AIRCR)); getreg32(ARMV6M_SYSCON_ICSR), getreg32(ARMV6M_SYSCON_AIRCR));
slldbg(" SCR: %08x CCR: %08x\n", lldbg(" SCR: %08x CCR: %08x\n",
getreg32(ARMV6M_SYSCON_SCR), getreg32(ARMV6M_SYSCON_CCR)); getreg32(ARMV6M_SYSCON_SCR), getreg32(ARMV6M_SYSCON_CCR));
slldbg(" SHPR2: %08x SHPR3: %08x\n", lldbg(" SHPR2: %08x SHPR3: %08x\n",
getreg32(ARMV6M_SYSCON_SHPR2), getreg32(ARMV6M_SYSCON_SHPR3)); getreg32(ARMV6M_SYSCON_SHPR2), getreg32(ARMV6M_SYSCON_SHPR3));
irqrestore(flags); irqrestore(flags);
} }

36
arch/arm/src/lm/lm_irq.c
View File

@ -60,12 +60,6 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Enable NVIC debug features that are probably only desireable during
* bringup
*/
#undef LM_IRQ_DEBUG
/* Get a 32-bit version of the default priority */ /* Get a 32-bit version of the default priority */
#define DEFPRIORITY32 \ #define DEFPRIORITY32 \
@ -96,32 +90,32 @@ volatile uint32_t *current_regs;
* *
****************************************************************************/ ****************************************************************************/
#if defined(LM_IRQ_DEBUG) && defined (CONFIG_DEBUG) #if defined(CONFIG_DEBUG_IRQ)
static void lm_dumpnvic(const char *msg, int irq) static void lm_dumpnvic(const char *msg, int irq)
{ {
irqstate_t flags; irqstate_t flags;
flags = irqsave(); flags = irqsave();
slldbg("NVIC (%s, irq=%d):\n", msg, irq); lldbg("NVIC (%s, irq=%d):\n", msg, irq);
slldbg(" INTCTRL: %08x VECTAB: %08x\n", lldbg(" INTCTRL: %08x VECTAB: %08x\n",
getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB)); getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB));
#if 0 #if 0
slldbg(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n", lldbg(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n",
getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA), getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA),
getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE)); getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE));
#endif #endif
slldbg(" IRQ ENABLE: %08x %08x\n", lldbg(" IRQ ENABLE: %08x %08x\n",
getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE)); getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE));
slldbg(" SYSH_PRIO: %08x %08x %08x\n", lldbg(" SYSH_PRIO: %08x %08x %08x\n",
getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY), getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY),
getreg32(NVIC_SYSH12_15_PRIORITY)); getreg32(NVIC_SYSH12_15_PRIORITY));
slldbg(" IRQ PRIO: %08x %08x %08x %08x\n", lldbg(" IRQ PRIO: %08x %08x %08x %08x\n",
getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY), getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY),
getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY)); getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY));
slldbg(" %08x %08x %08x %08x\n", lldbg(" %08x %08x %08x %08x\n",
getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY), getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY),
getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY)); getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY));
slldbg(" %08x %08x %08x %08x\n", lldbg(" %08x %08x %08x %08x\n",
getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY), getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY),
getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY)); getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY));
irqrestore(flags); irqrestore(flags);

37
arch/arm/src/lpc17xx/lpc17_irq.c
View File

@ -59,13 +59,6 @@
/**************************************************************************** /****************************************************************************
* Definitions * Definitions
****************************************************************************/ ****************************************************************************/
/* Enable NVIC debug features that are probably only desireable during
* bringup
*/
#undef LPC17_IRQ_DEBUG
/* Get a 32-bit version of the default priority */ /* Get a 32-bit version of the default priority */
#define DEFPRIORITY32 \ #define DEFPRIORITY32 \
@ -96,31 +89,31 @@ volatile uint32_t *current_regs;
* *
****************************************************************************/ ****************************************************************************/
#if defined(LPC17_IRQ_DEBUG) && defined (CONFIG_DEBUG) #if defined(CONFIG_DEBUG_IRQ)
static void lpc17_dumpnvic(const char *msg, int irq) static void lpc17_dumpnvic(const char *msg, int irq)
{ {
irqstate_t flags; irqstate_t flags;
flags = irqsave(); flags = irqsave();
slldbg("NVIC (%s, irq=%d):\n", msg, irq); lldbg("NVIC (%s, irq=%d):\n", msg, irq);
slldbg(" INTCTRL: %08x VECTAB: %08x\n", lldbg(" INTCTRL: %08x VECTAB: %08x\n",
getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB)); getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB));
#if 0 #if 0
slldbg(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n", lldbg(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n",
getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA), getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA),
getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE)); getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE));
#endif #endif
slldbg(" IRQ ENABLE: %08x\n", getreg32(NVIC_IRQ0_31_ENABLE)); lldbg(" IRQ ENABLE: %08x\n", getreg32(NVIC_IRQ0_31_ENABLE));
slldbg(" SYSH_PRIO: %08x %08x %08x\n", lldbg(" SYSH_PRIO: %08x %08x %08x\n",
getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY), getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY),
getreg32(NVIC_SYSH12_15_PRIORITY)); getreg32(NVIC_SYSH12_15_PRIORITY));
slldbg(" IRQ PRIO: %08x %08x %08x %08x\n", lldbg(" IRQ PRIO: %08x %08x %08x %08x\n",
getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY), getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY),
getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY)); getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY));
slldbg(" %08x %08x %08x %08x\n", lldbg(" %08x %08x %08x %08x\n",
getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY), getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY),
getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY)); getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY));
slldbg(" %08x %08x %08x %08x\n", lldbg(" %08x %08x %08x %08x\n",
getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY), getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY),
getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY)); getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY));
irqrestore(flags); irqrestore(flags);
@ -369,7 +362,7 @@ void up_irqinitialize(void)
/* Initialize logic to support a second level of interrupt decoding for /* Initialize logic to support a second level of interrupt decoding for
* GPIO pins. * GPIO pins.
*/ */
#ifdef CONFIG_GPIO_IRQ #ifdef CONFIG_GPIO_IRQ
lpc17_gpioirqinitialize(); lpc17_gpioirqinitialize();
#endif #endif

32
arch/arm/src/lpc43xx/lpc43_irq.c
View File

@ -94,35 +94,35 @@ extern unsigned _vectors[];
* *
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_DEBUG_IRQ) && defined (CONFIG_DEBUG) #if defined(CONFIG_DEBUG_IRQ)
static void lpc43_dumpnvic(const char *msg, int irq) static void lpc43_dumpnvic(const char *msg, int irq)
{ {
irqstate_t flags; irqstate_t flags;
flags = irqsave(); flags = irqsave();
slldbg("NVIC (%s, irq=%d):\n", msg, irq); lldbg("NVIC (%s, irq=%d):\n", msg, irq);
slldbg(" INTCTRL: %08x VECTAB: %08x\n", lldbg(" INTCTRL: %08x VECTAB: %08x\n",
getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB)); getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB));
#if 0 #if 0
slldbg(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n", lldbg(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n",
getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA), getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA),
getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE)); getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE));
#endif #endif
slldbg(" IRQ ENABLE: %08x %08x\n", lldbg(" IRQ ENABLE: %08x %08x\n",
getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE)); getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE));
slldbg(" SYSH_PRIO: %08x %08x %08x\n", lldbg(" SYSH_PRIO: %08x %08x %08x\n",
getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY), getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY),
getreg32(NVIC_SYSH12_15_PRIORITY)); getreg32(NVIC_SYSH12_15_PRIORITY));
slldbg(" IRQ PRIO: %08x %08x %08x %08x\n", lldbg(" IRQ PRIO: %08x %08x %08x %08x\n",
getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY), getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY),
getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY)); getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY));
slldbg(" %08x %08x %08x %08x\n", lldbg(" %08x %08x %08x %08x\n",
getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY), getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY),
getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY)); getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY));
slldbg(" %08x %08x %08x %08x\n", lldbg(" %08x %08x %08x %08x\n",
getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY), getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY),
getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY)); getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY));
slldbg(" %08x %08x %08x\n", lldbg(" %08x %08x %08x\n",
getreg32(NVIC_IRQ48_51_PRIORITY), getreg32(NVIC_IRQ52_55_PRIORITY), getreg32(NVIC_IRQ48_51_PRIORITY), getreg32(NVIC_IRQ52_55_PRIORITY),
getreg32(NVIC_IRQ56_59_PRIORITY)); getreg32(NVIC_IRQ56_59_PRIORITY));
irqrestore(flags); irqrestore(flags);

34
arch/arm/src/nuc1xx/nuc_irq.c
View File

@ -86,34 +86,34 @@ volatile uint32_t *current_regs;
* *
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_DEBUG_IRQ) && defined (CONFIG_DEBUG) #if defined(CONFIG_DEBUG_IRQ)
static void nuc_dumpnvic(const char *msg, int irq) static void nuc_dumpnvic(const char *msg, int irq)
{ {
irqstate_t flags; irqstate_t flags;
flags = irqsave(); flags = irqsave();
slldbg("NVIC (%s, irq=%d):\n", msg, irq); lldbg("NVIC (%s, irq=%d):\n", msg, irq);
slldbg(" ISER: %08x ICER: %08x\n", lldbg(" ISER: %08x ICER: %08x\n",
getreg32(ARMV6M_NVIC_ISER), getreg32(ARMV6M_NVIC_ICER)); getreg32(ARMV6M_NVIC_ISER), getreg32(ARMV6M_NVIC_ICER));
slldbg(" ISPR: %08x ICPR: %08x\n", lldbg(" ISPR: %08x ICPR: %08x\n",
getreg32(ARMV6M_NVIC_ISPR), getreg32(ARMV6M_NVIC_ICPR)); getreg32(ARMV6M_NVIC_ISPR), getreg32(ARMV6M_NVIC_ICPR));
slldbg(" IRQ PRIO: %08x %08x %08x %08x\n", lldbg(" IRQ PRIO: %08x %08x %08x %08x\n",
getreg32(ARMV6M_NVIC_IPR0), getreg32(ARMV6M_NVIC_IPR1), getreg32(ARMV6M_NVIC_IPR0), getreg32(ARMV6M_NVIC_IPR1),
getreg32(ARMV6M_NVIC_IPR2), getreg32(ARMV6M_NVIC_IPR3)); getreg32(ARMV6M_NVIC_IPR2), getreg32(ARMV6M_NVIC_IPR3));
slldbg(" %08x %08x %08x %08x\n", lldbg(" %08x %08x %08x %08x\n",
getreg32(ARMV6M_NVIC_IPR4), getreg32(ARMV6M_NVIC_IPR5), getreg32(ARMV6M_NVIC_IPR4), getreg32(ARMV6M_NVIC_IPR5),
getreg32(ARMV6M_NVIC_IPR6), getreg32(ARMV6M_NVIC_IPR7)); getreg32(ARMV6M_NVIC_IPR6), getreg32(ARMV6M_NVIC_IPR7));
slldbg("SYSCON:\n"); lldbg("SYSCON:\n");
slldbg(" CPUID: %08x\n", lldbg(" CPUID: %08x\n",
getreg32(ARMV6M_SYSCON_CPUID)); getreg32(ARMV6M_SYSCON_CPUID));
slldbg(" ICSR: %08x AIRCR: %08x\n", lldbg(" ICSR: %08x AIRCR: %08x\n",
getreg32(ARMV6M_SYSCON_ICSR), getreg32(ARMV6M_SYSCON_AIRCR)); getreg32(ARMV6M_SYSCON_ICSR), getreg32(ARMV6M_SYSCON_AIRCR));
slldbg(" SCR: %08x CCR: %08x\n", lldbg(" SCR: %08x CCR: %08x\n",
getreg32(ARMV6M_SYSCON_SCR), getreg32(ARMV6M_SYSCON_CCR)); getreg32(ARMV6M_SYSCON_SCR), getreg32(ARMV6M_SYSCON_CCR));
slldbg(" SHPR2: %08x SHPR3: %08x\n", lldbg(" SHPR2: %08x SHPR3: %08x\n",
getreg32(ARMV6M_SYSCON_SHPR2), getreg32(ARMV6M_SYSCON_SHPR3)); getreg32(ARMV6M_SYSCON_SHPR2), getreg32(ARMV6M_SYSCON_SHPR3));
irqrestore(flags); irqrestore(flags);
} }

32
arch/arm/src/sam34/sam_irq.c
View File

@ -60,12 +60,6 @@
* Definitions * Definitions
****************************************************************************/ ****************************************************************************/
/* Enable NVIC debug features that are probably only desireable during
* bringup
*/
#undef SAM_IRQ_DEBUG
/* Get a 32-bit version of the default priority */ /* Get a 32-bit version of the default priority */
#define DEFPRIORITY32 \ #define DEFPRIORITY32 \
@ -96,28 +90,28 @@ volatile uint32_t *current_regs;
* *
****************************************************************************/ ****************************************************************************/
#if defined(SAM_IRQ_DEBUG) && defined (CONFIG_DEBUG) #if defined(CONFIG_DEBUG_IRQ)
static void sam_dumpnvic(const char *msg, int irq) static void sam_dumpnvic(const char *msg, int irq)
{ {
irqstate_t flags; irqstate_t flags;
flags = irqsave(); flags = irqsave();
slldbg("NVIC (%s, irq=%d):\n", msg, irq); lldbg("NVIC (%s, irq=%d):\n", msg, irq);
slldbg(" INTCTRL: %08x VECTAB: %08x\n", lldbg(" INTCTRL: %08x VECTAB: %08x\n",
getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB)); getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB));
#if 0 #if 0
slldbg(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n", lldbg(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n",
getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA), getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA),
getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE)); getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE));
#endif #endif
slldbg(" IRQ ENABLE: %08x\n", getreg32(NVIC_IRQ0_31_ENABLE)); lldbg(" IRQ ENABLE: %08x\n", getreg32(NVIC_IRQ0_31_ENABLE));
slldbg(" SYSH_PRIO: %08x %08x %08x\n", lldbg(" SYSH_PRIO: %08x %08x %08x\n",
getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY), getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY),
getreg32(NVIC_SYSH12_15_PRIORITY)); getreg32(NVIC_SYSH12_15_PRIORITY));
slldbg(" IRQ PRIO: %08x %08x %08x %08x\n", lldbg(" IRQ PRIO: %08x %08x %08x %08x\n",
getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY), getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY),
getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY)); getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY));
slldbg(" %08x %08x %08x %08x\n", lldbg(" %08x %08x %08x %08x\n",
getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY), getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY),
getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY)); getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY));
irqrestore(flags); irqrestore(flags);

1
arch/arm/src/sama5/sam_boot.c
View File

@ -58,6 +58,7 @@
#include "chip/sam_wdt.h" #include "chip/sam_wdt.h"
#include "sam_clockconfig.h" #include "sam_clockconfig.h"
#include "sam_lowputc.h" #include "sam_lowputc.h"
#include "sam_serial.h"
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions

94
arch/arm/src/sama5/sam_irq.c
View File

@ -61,14 +61,14 @@
#include "sam_irq.h" #include "sam_irq.h"
/**************************************************************************** /****************************************************************************
* Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Enable NVIC debug features that are probably only desireable during /****************************************************************************
* bringup * Private types
*/ ****************************************************************************/
#undef SAM_IRQ_DEBUG typedef uint32_t *(*doirq_t)(int irq, uint32_t *regs);
/**************************************************************************** /****************************************************************************
* Public Data * Public Data
@ -97,34 +97,34 @@ static const uint8_t g_srctype[SCRTYPE_NTYPES] =
* *
****************************************************************************/ ****************************************************************************/
#if defined(SAM_IRQ_DEBUG) && defined (CONFIG_DEBUG) #if defined(CONFIG_DEBUG_IRQ)
static void sam_dumpaic(const char *msg, int irq) static void sam_dumpaic(const char *msg, int irq)
{ {
irqstate_t flags; irqstate_t flags;
flags = irqsave(); flags = irqsave();
slldbg("AIC (%s, irq=%d):\n", msg, irq); lldbg("AIC (%s, irq=%d):\n", msg, irq);
/* Select the register set associated with this irq */ /* Select the register set associated with this irq */
putreg32(irq, SAM_AIC_SSR) putreg32(irq, SAM_AIC_SSR);
/* Then dump all of the (readable) register contents */ /* Then dump all of the (readable) register contents */
slldbg(" SSR: %08x SMR: %08x SVR: %08x IVR: %08x\n", lldbg(" SSR: %08x SMR: %08x SVR: %08x IVR: %08x\n",
getreg32(SAM_AIC_SSR), getreg32(SAM_AIC_SMR), getreg32(SAM_AIC_SSR), getreg32(SAM_AIC_SMR),
getreg32(SAM_AIC_SVR), getreg32(SAM_AIC_IVR)); getreg32(SAM_AIC_SVR), getreg32(SAM_AIC_IVR));
slldbg(" FVR: %08x ISR: %08x\n", lldbg(" FVR: %08x ISR: %08x\n",
getreg32(SAM_AIC_FVR), getreg32(SAM_AIC_ISR)); getreg32(SAM_AIC_FVR), getreg32(SAM_AIC_ISR));
slldbg(" IPR: %08x %08x %08x %08x\n", lldbg(" IPR: %08x %08x %08x %08x\n",
getreg32(SAM_AIC_IPR0), getreg32(SAM_AIC_IPR1), getreg32(SAM_AIC_IPR0), getreg32(SAM_AIC_IPR1),
getreg32(SAM_AIC_IPR2), getreg32(SAM_AIC_IPR3)); getreg32(SAM_AIC_IPR2), getreg32(SAM_AIC_IPR3));
slldbg(" IMR: %08x CISR: %08x SPU: %08x FFSR: %08x\n", lldbg(" IMR: %08x CISR: %08x SPU: %08x FFSR: %08x\n",
getreg32(SAM_AIC_IMR), getreg32(SAM_AIC_CISR), getreg32(SAM_AIC_IMR), getreg32(SAM_AIC_CISR),
getreg32(SAM_AIC_SPU), getreg32(SAM_AIC_FFSR)); getreg32(SAM_AIC_SPU), getreg32(SAM_AIC_FFSR));
slldbg(" DCR: %08x WPMR: %08x WPMR: %08x\n", lldbg(" DCR: %08x WPMR: %08x WPMR: %08x\n",
getreg32(SAM_AIC_DCR), getreg32(SAM_AIC_WPMR), getreg32(SAM_AIC_DCR), getreg32(SAM_AIC_WPMR),
getreg32(SAM_AIC_WPMR)); getreg32(SAM_AIC_WPMR));
irqrestore(flags); irqrestore(flags);
} }
#else #else
@ -161,14 +161,16 @@ static void sam_dumpaic(const char *msg, int irq)
* *
****************************************************************************/ ****************************************************************************/
static void sam_spurious(void) static uint32_t *sam_spurious(int irq, uint32_t *regs)
{ {
/* This is probably irrevelant since true vectored interrupts are not used /* This is probably irrevelant since true vectored interrupts are not used
* in this implementation. The value of AIC_IVR is ignored. * in this implementation. The value of AIC_IVR is ignored.
*/ */
lldbg("Spurious interrupt\n"); #if defined(CONFIG_DEBUG_IRQ)
PANIC(); lldbg("Spurious interrupt: IRQ %d\n", irq);
#endif
return regs;
} }
/**************************************************************************** /****************************************************************************
@ -179,32 +181,17 @@ static void sam_spurious(void)
* *
****************************************************************************/ ****************************************************************************/
static void sam_fiqhandler(void) static uint32_t *sam_fiqhandler(int irq, uint32_t *regs)
{ {
/* This is probably irrevelant since true vectored interrupts are not used /* This is probably irrevelant since FIQs are not used in this
* in this implementation. The value of AIC_IVR is ignored. * implementation.
*/ */
lldbg("FIQ\n"); #if defined(CONFIG_DEBUG_IRQ) || defined(CONFIG_ARCH_STACKDUMP)
PANIC(); lldbg("FIQ?: IRQ: %d\n");
} #endif
/****************************************************************************
* Name: sam_irqhandler
*
* Description:
* Default IRQ interrupt handler.
*
****************************************************************************/
static void sam_irqhandler( void )
{
/* This is probably irrevelant since true vectored interrupts are not used
* in this implementation. The value of AIC_IVR is ignored.
*/
lldbg("IRQ\n");
PANIC(); PANIC();
return regs; /* Won't get here */
} }
/**************************************************************************** /****************************************************************************
@ -254,7 +241,7 @@ void up_irqinitialize(void)
} }
else else
{ {
putreg32((uint32_t)sam_irqhandler, SAM_AIC_SVR); putreg32((uint32_t)arm_doirq, SAM_AIC_SVR);
} }
/* Set the default interrupt priority */ /* Set the default interrupt priority */
@ -357,7 +344,8 @@ void up_irqinitialize(void)
uint32_t *arm_decodeirq(uint32_t *regs) uint32_t *arm_decodeirq(uint32_t *regs)
{ {
uint32_t regval; uint32_t irqid;
uint32_t ivr;
/* Paragraph 17.8.5 Protect Mode: "The Protect Mode permits reading the /* Paragraph 17.8.5 Protect Mode: "The Protect Mode permits reading the
* Interrupt Vector Register without performing the associated automatic * Interrupt Vector Register without performing the associated automatic
@ -391,18 +379,18 @@ uint32_t *arm_decodeirq(uint32_t *regs)
/* Write in the IVR to support Protect Mode */ /* Write in the IVR to support Protect Mode */
regval = getreg32(SAM_AIC_IVR); ivr = getreg32(SAM_AIC_IVR);
putreg32(regval, SAM_AIC_IVR); putreg32(ivr, SAM_AIC_IVR);
/* Get the IRQ number from the interrrupt status register. NOTE that the /* Get the IRQ number from the interrrupt status register. NOTE that the
* IRQ number is the same is the peripheral ID (PID). * IRQ number is the same is the peripheral ID (PID).
*/ */
regval = getreg32(SAM_AIC_ISR) & AIC_ISR_MASK; irqid = getreg32(SAM_AIC_ISR) & AIC_ISR_MASK;
/* Dispatch the interrupt */ /* Dispatch the interrupt */
regs = arm_doirq((int)regval, regs); regs = ((doirq_t)ivr)((int)irqid, regs);
/* Acknowledge interrupt */ /* Acknowledge interrupt */

98
arch/arm/src/sama5/sam_serial.h Normal file
View File

@ -0,0 +1,98 @@
/****************************************************************************
* arch/arm/src/sama5/sam_serial.h
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
* 3. Neither the name NuttX nor the names of its contributors may be
* used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
****************************************************************************/
#ifndef __ARCH_ARM_SRC_SAMA5_SAM_SERIAL_H
#define __ARCH_ARM_SRC_SAMA5_SAM_SERIAL_H
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include "up_internal.h"
/****************************************************************************
* Pre-processor Definitions
****************************************************************************/
/****************************************************************************
* Public Types
****************************************************************************/
/****************************************************************************
* Inline Functions
****************************************************************************/
#ifndef __ASSEMBLY__
/****************************************************************************
* Public Data
****************************************************************************/
#undef EXTERN
#if defined(__cplusplus)
#define EXTERN extern "C"
extern "C"
{
#else
#define EXTERN extern
#endif
/****************************************************************************
* Public Function Prototypes
****************************************************************************/
/****************************************************************************
* Name: sam_earlyserialinit
*
* Description:
* Performs the low level USART initialization early in debug so that the
* serial console will be available during bootup. This must be called
* before up_serialinit.
*
****************************************************************************/
#ifdef USE_EARLYSERIALINIT
void sam_earlyserialinit(void);
#endif
#undef EXTERN
#if defined(__cplusplus)
}
#endif
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_ARM_SRC_SAMA5_SAM_SERIAL_H */

36
arch/arm/src/stm32/stm32_irq.c
View File

@ -88,39 +88,39 @@ volatile uint32_t *current_regs;
* *
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_DEBUG_IRQ) && defined (CONFIG_DEBUG) #if defined(CONFIG_DEBUG_IRQ)
static void stm32_dumpnvic(const char *msg, int irq) static void stm32_dumpnvic(const char *msg, int irq)
{ {
irqstate_t flags; irqstate_t flags;
flags = irqsave(); flags = irqsave();
slldbg("NVIC (%s, irq=%d):\n", msg, irq); lldbg("NVIC (%s, irq=%d):\n", msg, irq);
slldbg(" INTCTRL: %08x VECTAB: %08x\n", lldbg(" INTCTRL: %08x VECTAB: %08x\n",
getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB)); getreg32(NVIC_INTCTRL), getreg32(NVIC_VECTAB));
#if 0 #if 0
slldbg(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n", lldbg(" SYSH ENABLE MEMFAULT: %08x BUSFAULT: %08x USGFAULT: %08x SYSTICK: %08x\n",
getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA), getreg32(NVIC_SYSHCON_MEMFAULTENA), getreg32(NVIC_SYSHCON_BUSFAULTENA),
getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE)); getreg32(NVIC_SYSHCON_USGFAULTENA), getreg32(NVIC_SYSTICK_CTRL_ENABLE));
#endif #endif
slldbg(" IRQ ENABLE: %08x %08x %08x\n", lldbg(" IRQ ENABLE: %08x %08x %08x\n",
getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE), getreg32(NVIC_IRQ0_31_ENABLE), getreg32(NVIC_IRQ32_63_ENABLE),
getreg32(NVIC_IRQ64_95_ENABLE)); getreg32(NVIC_IRQ64_95_ENABLE));
slldbg(" SYSH_PRIO: %08x %08x %08x\n", lldbg(" SYSH_PRIO: %08x %08x %08x\n",
getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY), getreg32(NVIC_SYSH4_7_PRIORITY), getreg32(NVIC_SYSH8_11_PRIORITY),
getreg32(NVIC_SYSH12_15_PRIORITY)); getreg32(NVIC_SYSH12_15_PRIORITY));
slldbg(" IRQ PRIO: %08x %08x %08x %08x\n", lldbg(" IRQ PRIO: %08x %08x %08x %08x\n",
getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY), getreg32(NVIC_IRQ0_3_PRIORITY), getreg32(NVIC_IRQ4_7_PRIORITY),
getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY)); getreg32(NVIC_IRQ8_11_PRIORITY), getreg32(NVIC_IRQ12_15_PRIORITY));
slldbg(" %08x %08x %08x %08x\n", lldbg(" %08x %08x %08x %08x\n",
getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY), getreg32(NVIC_IRQ16_19_PRIORITY), getreg32(NVIC_IRQ20_23_PRIORITY),
getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY)); getreg32(NVIC_IRQ24_27_PRIORITY), getreg32(NVIC_IRQ28_31_PRIORITY));
slldbg(" %08x %08x %08x %08x\n", lldbg(" %08x %08x %08x %08x\n",
getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY), getreg32(NVIC_IRQ32_35_PRIORITY), getreg32(NVIC_IRQ36_39_PRIORITY),
getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY)); getreg32(NVIC_IRQ40_43_PRIORITY), getreg32(NVIC_IRQ44_47_PRIORITY));
slldbg(" %08x %08x %08x %08x\n", lldbg(" %08x %08x %08x %08x\n",
getreg32(NVIC_IRQ48_51_PRIORITY), getreg32(NVIC_IRQ52_55_PRIORITY), getreg32(NVIC_IRQ48_51_PRIORITY), getreg32(NVIC_IRQ52_55_PRIORITY),
getreg32(NVIC_IRQ56_59_PRIORITY), getreg32(NVIC_IRQ60_63_PRIORITY)); getreg32(NVIC_IRQ56_59_PRIORITY), getreg32(NVIC_IRQ60_63_PRIORITY));
slldbg(" %08x\n", lldbg(" %08x\n",
getreg32(NVIC_IRQ64_67_PRIORITY)); getreg32(NVIC_IRQ64_67_PRIORITY));
irqrestore(flags); irqrestore(flags);
} }

13
configs/sama5d3x-ek/README.txt
View File

@ -927,12 +927,13 @@ Configurations
That configuration runs out of internal SRAM and, as a result, this That configuration runs out of internal SRAM and, as a result, this
configuration needs to be recalibrated. configuration needs to be recalibrated.
2013-8-31: SDRAM configuration and RAM test usage are documented, 2013-8-3: SDRAM configuration and RAM test usage have been verified
but only partially functional. SDRAM is accessible but many regions and are functional. I not some issues now; Occassionally, SDRAM is
on the SDRAM fail the RAM test. Most likely there is some error in not functional on initial boot. Or is initially not functional but
the SDRAM timing configuration. I am also seeing occasional crashes improves with accesses. Clearly, more work needs to be done.
involving unexpected interrupts and the UART when running the RAM
test. Not sure what to make of that yet Here is another strange observation: SDRAM accesses tend to
generate occasional spurious interrupts! No idea why.
ostest: ostest:
This configuration directory, performs a simple OS test using This configuration directory, performs a simple OS test using