This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 8203806812f135eadfe5f239762a9f471447b97c Author: Yanfeng Liu <[email protected]> AuthorDate: Tue Feb 18 11:09:36 2025 +0800 arch/armv8-r: fix QEMU_CORTEXR52 build This adds smp.h and macro defs in gic.h to fix QEMU_CORTEXR52 build issues. Signed-off-by: Yanfeng Liu <[email protected]> --- arch/arm/src/armv8-r/gic.h | 4 ++ arch/arm/src/armv8-r/smp.h | 130 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 134 insertions(+) diff --git a/arch/arm/src/armv8-r/gic.h b/arch/arm/src/armv8-r/gic.h index a55dfb71873..2f2a8e01b95 100644 --- a/arch/arm/src/armv8-r/gic.h +++ b/arch/arm/src/armv8-r/gic.h @@ -326,6 +326,10 @@ * Public Function Prototypes ****************************************************************************/ +/* redirect to arm_gic_initialize() beofre SMP added */ + +#define arm_gic0_initialize arm_gic_initialize + bool arm_gic_irq_is_enabled(unsigned int intid); int arm_gic_initialize(void); void arm_gic_irq_set_priority(unsigned int intid, unsigned int prio, diff --git a/arch/arm/src/armv8-r/smp.h b/arch/arm/src/armv8-r/smp.h new file mode 100644 index 00000000000..ac3a0c6248e --- /dev/null +++ b/arch/arm/src/armv8-r/smp.h @@ -0,0 +1,130 @@ +/**************************************************************************** + * arch/arm/src/armv8-r/smp.h + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. The + * ASF licenses this file to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the + * License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + ****************************************************************************/ + +#ifndef __ARCH_ARM_SRC_ARMV8_R_SMP_H +#define __ARCH_ARM_SRC_ARMV8_R_SMP_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include <nuttx/config.h> + +#ifdef CONFIG_SMP + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/* ARM requires at least a 4-byte stack alignment. For use with EABI and + * floating point, the stack must be aligned to 8-byte addresses. We will + * always use the EABI stack alignment + */ + +#define SMP_STACK_ALIGNMENT 8 +#define SMP_STACK_MASK 7 +#define SMP_STACK_SIZE ((CONFIG_IDLETHREAD_STACKSIZE + 7) & ~7) +#define SMP_STACK_WORDS (SMP_STACK_SIZE >> 2) + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +#ifndef __ASSEMBLY__ + +#if CONFIG_SMP_NCPUS > 1 +extern uint32_t g_cpu1_idlestack[SMP_STACK_WORDS]; +#if CONFIG_SMP_NCPUS > 2 +extern uint32_t g_cpu2_idlestack[SMP_STACK_WORDS]; +#if CONFIG_SMP_NCPUS > 3 +extern uint32_t g_cpu3_idlestack[SMP_STACK_WORDS]; +#if CONFIG_SMP_NCPUS > 4 +# error This logic needs to extended for CONFIG_SMP_NCPUS > 4 +#endif /* CONFIG_SMP_NCPUS > 4 */ +#endif /* CONFIG_SMP_NCPUS > 3 */ +#endif /* CONFIG_SMP_NCPUS > 2 */ +#endif /* CONFIG_SMP_NCPUS > 1 */ + +/**************************************************************************** + * Public Function Prototypes + ****************************************************************************/ + +/**************************************************************************** + * Name: __cpu[n]_start + * + * Description: + * Boot functions for each CPU (other than CPU0). These functions set up + * the ARM operating mode, the initial stack, and configure co-processor + * registers. At the end of the boot, arm_cpu_boot() is called. + * + * These functions are provided by the common ARMv7-R logic. + * + * Input Parameters: + * None + * + * Returned Value: + * Do not return. + * + ****************************************************************************/ + +void __start(void); + +#if CONFIG_SMP_NCPUS > 1 +void __cpu1_start(void); +#endif + +#if CONFIG_SMP_NCPUS > 2 +void __cpu2_start(void); +#endif + +#if CONFIG_SMP_NCPUS > 3 +void __cpu3_start(void); +#endif + +#if CONFIG_SMP_NCPUS > 4 +# error This logic needs to extended for CONFIG_SMP_NCPUS > 4 +#endif + +/**************************************************************************** + * Name: arm_cpu_boot + * + * Description: + * Continues the C-level initialization started by the assembly language + * __cpu[n]_start function. At a minimum, this function needs to + * initialize interrupt handling and, perhaps, wait on WFI for + * arm_cpu_start() to issue an SGI. + * + * This function must be provided by the each ARMv7-R MCU and implement + * MCU-specific initialization logic. + * + * Input Parameters: + * cpu - The CPU index. This is the same value that would be obtained by + * calling this_cpu(); + * + * Returned Value: + * Does not return. + * + ****************************************************************************/ + +void arm_cpu_boot(int cpu); + +#endif /* __ASSEMBLY__ */ +#endif /* CONFIG_SMP */ +#endif /* __ARCH_ARM_SRC_ARMV8_R_SMP_H */
