diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-08-28 07:00:37 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-08-28 07:00:37 -0600 |
commit | 2325c6f550b616e4a9ec58747c35a4cae6374ade (patch) | |
tree | 3233edc697adf88242690245d5f58e7d0e97af2f | |
parent | e1d27f684c0048d0100dd3206c0ef6d97a994c30 (diff) | |
download | nuttx-2325c6f550b616e4a9ec58747c35a4cae6374ade.tar.gz nuttx-2325c6f550b616e4a9ec58747c35a4cae6374ade.tar.bz2 nuttx-2325c6f550b616e4a9ec58747c35a4cae6374ade.zip |
AVR32: Move address environment switch from the task switchers to the interrupt handler. That may save doing the actin multiple times per interrupt
-rw-r--r-- | nuttx/arch/avr/src/avr32/up_blocktask.c | 15 | ||||
-rw-r--r-- | nuttx/arch/avr/src/avr32/up_doirq.c | 53 | ||||
-rw-r--r-- | nuttx/arch/avr/src/avr32/up_unblocktask.c | 15 |
3 files changed, 45 insertions, 38 deletions
diff --git a/nuttx/arch/avr/src/avr32/up_blocktask.c b/nuttx/arch/avr/src/avr32/up_blocktask.c index 0013cedff..c9d49c8d7 100644 --- a/nuttx/arch/avr/src/avr32/up_blocktask.c +++ b/nuttx/arch/avr/src/avr32/up_blocktask.c @@ -137,19 +137,12 @@ void up_block_task(struct tcb_s *tcb, tstate_t task_state) rtcb = (struct tcb_s*)g_readytorun.head; - /* Then switch contexts */ + /* Then switch contexts. Any new address environment needed by + * the new thread will be instantiated before the return from + * interrupt. + */ up_restorestate(rtcb->xcp.regs); - -#ifdef CONFIG_ARCH_ADDRENV - /* Make sure that the address environment for the previously - * running task is closed down gracefully (data caches dump, - * MMU flushed) and set up the address environment for the new - * thread at the head of the ready-to-run list. - */ - - (void)group_addrenv(rtcb); -#endif } /* No, then we will need to perform the user context switch */ diff --git a/nuttx/arch/avr/src/avr32/up_doirq.c b/nuttx/arch/avr/src/avr32/up_doirq.c index 5cd115de3..f7e7a759f 100644 --- a/nuttx/arch/avr/src/avr32/up_doirq.c +++ b/nuttx/arch/avr/src/avr32/up_doirq.c @@ -1,7 +1,7 @@ /**************************************************************************** * arch/avr/src/avr32/up_doirq.c * - * Copyright (C) 2010-2011 Gregory Nutt. All rights reserved. + * Copyright (C) 2010-2011, 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -49,6 +49,8 @@ #include "up_arch.h" #include "up_internal.h" +#include "group/group.h" + /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ @@ -75,27 +77,47 @@ uint32_t *up_doirq(int irq, uint32_t *regs) #ifdef CONFIG_SUPPRESS_INTERRUPTS PANIC(); #else - uint32_t *savestate; - - /* Nested interrupts are not supported in this implementation. If you want - * to implement nested interrupts, you would have to (1) change the way that - * current_regs is handled and (2) the design associated with - * CONFIG_ARCH_INTERRUPTSTACK. The savestate variable will not work for - * that purpose as implemented here because only the outermost nested - * interrupt can result in a context switch (it can probably be deleted). - */ - /* Current regs non-zero indicates that we are processing an interrupt; * current_regs is also used to manage interrupt level context switches. + * + * Nested interrupts are not supported. */ - savestate = (uint32_t*)current_regs; + DEBUGASSERT(current_regs == NULL); current_regs = regs; /* Deliver the IRQ */ irq_dispatch(irq, regs); +#if defined(CONFIG_ARCH_FPU) || defined(CONFIG_ARCH_ADDRENV) + /* Check for a context switch. If a context switch occurred, then + * current_regs will have a different value than it did on entry. + * If an interrupt level context switch has occurred, then restore + * the floating point state and the establish the correct address + * environment before returning from the interrupt. + */ + + if (regs != current_regs) + { +#ifdef CONFIG_ARCH_FPU + /* Restore floating point registers */ + + up_restorefpu((uint32_t*)current_regs); +#endif + +#ifdef CONFIG_ARCH_ADDRENV + /* Make sure that the address environment for the previously + * running task is closed down gracefully (data caches dump, + * MMU flushed) and set up the address environment for the new + * thread at the head of the ready-to-run list. + */ + + (void)group_addrenv(rtcb); +#endif + } +#endif + /* If a context switch occurred while processing the interrupt then * current_regs may have change value. If we return any value different * from the input regs, then the lower level will know that a context @@ -104,12 +126,11 @@ uint32_t *up_doirq(int irq, uint32_t *regs) regs = current_regs; - /* Restore the previous value of current_regs. NULL would indicate that - * we are no longer in an interrupt handler. It will be non-NULL if we - * are returning from a nested interrupt. + /* Set current_regs to NULL to indicate that we are no longer in + * an interrupt handler. */ - current_regs = savestate; + current_regs = NULL; #endif board_led_off(LED_INIRQ); return regs; diff --git a/nuttx/arch/avr/src/avr32/up_unblocktask.c b/nuttx/arch/avr/src/avr32/up_unblocktask.c index 20e6d3bdf..d6e5ded76 100644 --- a/nuttx/arch/avr/src/avr32/up_unblocktask.c +++ b/nuttx/arch/avr/src/avr32/up_unblocktask.c @@ -127,19 +127,12 @@ void up_unblock_task(struct tcb_s *tcb) rtcb = (struct tcb_s*)g_readytorun.head; - /* Then switch contexts */ + /* Then switch contexts. Any new address environment needed by + * the new thread will be instantiated before the return from + * interrupt. + */ up_restorestate(rtcb->xcp.regs); - -#ifdef CONFIG_ARCH_ADDRENV - /* Make sure that the address environment for the previously - * running task is closed down gracefully (data caches dump, - * MMU flushed) and set up the address environment for the new - * thread at the head of the ready-to-run list. - */ - - (void)group_addrenv(rtcb); -#endif } /* No, then we will need to perform the user context switch */ |