summaryrefslogtreecommitdiffstats
path: root/bsps/arm/shared
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2018-06-01 07:11:12 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2018-06-27 08:58:16 +0200
commit7ee59313932398aa2781503d25154c56301b9b73 (patch)
treeefaeaf7fa038f3de1b58676deb16d52744c0b373 /bsps/arm/shared
parentRemove unused CPU_MODES_INTERRUPT_LEVEL (diff)
downloadrtems-7ee59313932398aa2781503d25154c56301b9b73.tar.bz2
Remove Clock_driver_support_shutdown_hardware()
The aim of this clock driver hook was to stop clock tick interrupts at some late point in the exit() procedure. The use of atexit() pulls in malloc() which pulls in errno. It is incompatible with the intention of the CONFIGURE_DISABLE_NEWLIB_REENTRANCY configuration option. The exit() function must be called from thread context, so accompanied clock tick interrupts should cause no harm. On the contrary, someone may assume a normal operating system operation, e.g. working timeouts. Remove the Clock_driver_support_shutdown_hardware() clock driver hook. Close #3436.
Diffstat (limited to 'bsps/arm/shared')
-rw-r--r--bsps/arm/shared/clock/clock-a9mpcore.c35
-rw-r--r--bsps/arm/shared/clock/clock-armv7m.c10
-rw-r--r--bsps/arm/shared/clock/clock-nxp-lpc.c20
3 files changed, 0 insertions, 65 deletions
diff --git a/bsps/arm/shared/clock/clock-a9mpcore.c b/bsps/arm/shared/clock/clock-a9mpcore.c
index a68a627c5b..05d3c0961d 100644
--- a/bsps/arm/shared/clock/clock-a9mpcore.c
+++ b/bsps/arm/shared/clock/clock-a9mpcore.c
@@ -169,38 +169,6 @@ CPU_Counter_ticks _CPU_Counter_read(void)
return gt->cntrlower;
}
-static void a9mpcore_clock_cleanup_isr(void *arg)
-{
- volatile a9mpcore_gt *gt = A9MPCORE_GT;
-
- (void) arg;
-
- gt->ctrl &= A9MPCORE_GT_CTRL_TMR_EN;
- gt->irqst = A9MPCORE_GT_IRQST_EFLG;
-}
-
-static void a9mpcore_clock_cleanup(void)
-{
- rtems_status_code sc;
-
- /*
- * The relevant registers / bits of the global timer are banked and chances
- * are on an SPM system, that we are executing on the wrong CPU to reset
- * them. Thus we will have the actual cleanup done with the next clock tick.
- * The ISR will execute on the right CPU for the cleanup.
- */
- sc = rtems_interrupt_handler_install(
- A9MPCORE_IRQ_GT,
- "Clock",
- RTEMS_INTERRUPT_REPLACE,
- a9mpcore_clock_cleanup_isr,
- NULL
- );
- if (sc != RTEMS_SUCCESSFUL) {
- bsp_fatal(BSP_ARM_A9MPCORE_FATAL_CLOCK_IRQ_REMOVE);
- }
-}
-
#define Clock_driver_support_at_tick() \
a9mpcore_clock_at_tick()
@@ -210,8 +178,5 @@ static void a9mpcore_clock_cleanup(void)
#define Clock_driver_support_install_isr(isr) \
a9mpcore_clock_handler_install()
-#define Clock_driver_support_shutdown_hardware() \
- a9mpcore_clock_cleanup()
-
/* Include shared source clock driver code */
#include "../../shared/dev/clock/clockimpl.h"
diff --git a/bsps/arm/shared/clock/clock-armv7m.c b/bsps/arm/shared/clock/clock-armv7m.c
index 2efe4c2654..7a51690562 100644
--- a/bsps/arm/shared/clock/clock-armv7m.c
+++ b/bsps/arm/shared/clock/clock-armv7m.c
@@ -88,22 +88,12 @@ RTEMS_SYSINIT_ITEM(
RTEMS_SYSINIT_ORDER_FIRST
);
-static void _ARMV7M_Clock_cleanup(void)
-{
- volatile ARMV7M_Systick *systick = _ARMV7M_Systick;
-
- systick->csr = 0;
-}
-
#define Clock_driver_support_initialize_hardware() \
_ARMV7M_Clock_initialize()
#define Clock_driver_support_install_isr(isr) \
_ARMV7M_Clock_handler_install()
-#define Clock_driver_support_shutdown_hardware() \
- _ARMV7M_Clock_cleanup()
-
/* Include shared source clock driver code */
#include "../../../shared/dev/clock/clockimpl.h"
diff --git a/bsps/arm/shared/clock/clock-nxp-lpc.c b/bsps/arm/shared/clock/clock-nxp-lpc.c
index c551f75f68..feb7f83ff8 100644
--- a/bsps/arm/shared/clock/clock-nxp-lpc.c
+++ b/bsps/arm/shared/clock/clock-nxp-lpc.c
@@ -105,31 +105,11 @@ static void lpc_clock_initialize(void)
rtems_timecounter_install(&lpc_clock_tc);
}
-static void lpc_clock_cleanup(void)
-{
- rtems_status_code sc = RTEMS_SUCCESSFUL;
-
- /* Disable timer */
- lpc_clock->tcr = 0x0;
-
- /* Remove interrupt handler */
- sc = rtems_interrupt_handler_remove(
- LPC_CLOCK_INTERRUPT,
- (rtems_interrupt_handler) Clock_isr,
- NULL
- );
- if (sc != RTEMS_SUCCESSFUL) {
- rtems_fatal_error_occurred(0xdeadbeef);
- }
-}
-
#define Clock_driver_support_at_tick() lpc_clock_at_tick()
#define Clock_driver_support_initialize_hardware() lpc_clock_initialize()
#define Clock_driver_support_install_isr(isr) \
lpc_clock_handler_install()
-#define Clock_driver_support_shutdown_hardware() lpc_clock_cleanup()
-
/* Include shared source clock driver code */
#include "../../../shared/dev/clock/clockimpl.h"