This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 15804c340a6786750f96d0db880331826b411993 Author: buxiasen <[email protected]> AuthorDate: Thu Oct 17 15:13:19 2024 +0800 arm/sam4cm: use custom vectors to make smp_call work with exception_common Signed-off-by: buxiasen <[email protected]> --- arch/arm/src/sam34/Kconfig | 1 + arch/arm/src/sam34/Make.defs | 4 ++ arch/arm/src/sam34/sam_vectors.c | 113 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 118 insertions(+) diff --git a/arch/arm/src/sam34/Kconfig b/arch/arm/src/sam34/Kconfig index 05164e2e9e..90ed10e8d8 100644 --- a/arch/arm/src/sam34/Kconfig +++ b/arch/arm/src/sam34/Kconfig @@ -247,6 +247,7 @@ config ARCH_CHIP_SAM4CM default n select ARCH_HAVE_MULTICPU select ARCH_HAVE_TICKLESS + select ARCH_HAVE_CUSTOM_VECTORS config ARCH_CHIP_SAM4L bool diff --git a/arch/arm/src/sam34/Make.defs b/arch/arm/src/sam34/Make.defs index ed156e1908..909160debe 100644 --- a/arch/arm/src/sam34/Make.defs +++ b/arch/arm/src/sam34/Make.defs @@ -29,6 +29,10 @@ include armv7-m/Make.defs CHIP_CSRCS = sam_allocateheap.c sam_irq.c sam_lowputc.c sam_serial.c CHIP_CSRCS += sam_start.c +ifeq ($(CONFIG_ARCH_HAVE_CUSTOM_VECTORS),y) +CHIP_CSRCS += sam_vectors.c +endif + # Configuration-dependent SAM3/4 files ifneq ($(CONFIG_SCHED_TICKLESS),y) diff --git a/arch/arm/src/sam34/sam_vectors.c b/arch/arm/src/sam34/sam_vectors.c new file mode 100644 index 0000000000..5932f869b1 --- /dev/null +++ b/arch/arm/src/sam34/sam_vectors.c @@ -0,0 +1,113 @@ +/**************************************************************************** + * arch/arm/src/sam34/sam_vectors.c + * + * Copyright (C) 2012 Michael Smith. All rights reserved. + * + * 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. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> +#include <nuttx/irq.h> + +#include "chip.h" +#include "arm_internal.h" +#include "ram_vectors.h" +#include "nvic.h" + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +#define IDLE_STACK (_ebss + CONFIG_IDLETHREAD_STACKSIZE) + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/* Chip-specific entrypoint */ + +extern void __start(void); + +static void start(void) +{ + /* Zero lr to mark the end of backtrace */ + + asm volatile ("mov lr, #0\n\t" + "b __start\n\t"); +} + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/* Common exception entrypoint */ + +extern void exception_common(void); +extern void exception_direct(void); + +/**************************************************************************** + * Public data + ****************************************************************************/ + +/* The v7m vector table consists of an array of function pointers, with the + * first slot (vector zero) used to hold the initial stack pointer. + * + * As all exceptions (interrupts) are routed via exception_common, we just + * need to fill this array with pointers to it. + * + * Note that the [ ... ] designated initializer is a GCC extension. + */ + +const void * const _vectors[] locate_data(".vectors") + aligned_data(VECTAB_ALIGN) = +{ + /* Initial stack */ + + IDLE_STACK, + + /* Reset exception handler */ + + start, + + /* Vectors 2 - n point directly at the generic handler */ + + [2 ... NVIC_IRQ_PENDSV] = &exception_common, + [(NVIC_IRQ_PENDSV + 1) ... (SAM_IRQ_SMP_CALL0 - 1)] + = &exception_direct, + [SAM_IRQ_SMP_CALL0] = &exception_common, + [(SAM_IRQ_SMP_CALL0 + 1) ... (SAM_IRQ_SMP_CALL1 - 1)] + = &exception_direct, + [SAM_IRQ_SMP_CALL1] = &exception_common, + [(SAM_IRQ_SMP_CALL1 + 1) ... (15 + ARMV7M_PERIPHERAL_INTERRUPTS)] + = &exception_direct +};
