michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arm/arm64: Fix misc and trivials for ARM/ARM64 split

Browse source 
Fix the header guards, comments, github labeler, CODEOWNERS and
MAINTAINERS files.

Signed-off-by: Carlo Caione <ccaione@baylibre.com>
This commit is contained in:
Carlo Caione 2021-03-26 15:22:59 +01:00 • committed by Kumar Gala
commit a43f3bade8
27 changed files with 99 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/arch/arm64/arch.h
View file

@ -10,11 +10,11 @@
*
* This header contains the ARM64 specific kernel interface. It is
* included by the kernel interface architecture-abstraction header
* (include/arm/aarch64/cpu.h)
* (include/arm64/cpu.h)
*/
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ARCH_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ARCH_H_
#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_ARCH_H_
#define ZEPHYR_INCLUDE_ARCH_ARM64_ARCH_H_
/* Add include for DTS generated information */
#include <devicetree.h>
@ -49,7 +49,7 @@ extern "C" {
* The macros are to be stored in k_mem_partition_attr_t
* objects. The format of a k_mem_partition_attr_t object
* is an uint32_t composed by permission and attribute flags
* located in include/arch/arm/aarch64/arm_mmu.h
* located in include/arch/arm64/arm_mmu.h
*/
/* Read-Write access permission attributes */
@ -82,4 +82,4 @@ struct arch_mem_domain {
}
#endif
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ARCH_H_ */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_ARCH_H_ */

6
include/arch/arm64/arch_inlines.h
View file

@ -4,8 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ARCH_INLINES_H
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ARCH_INLINES_H
#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_ARCH_INLINES_H
#define ZEPHYR_INCLUDE_ARCH_ARM64_ARCH_INLINES_H
#ifndef _ASMLANGUAGE
@ -28,4 +28,4 @@ static ALWAYS_INLINE _cpu_t *arch_curr_cpu(void)
}
#endif /* !_ASMLANGUAGE */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ARCH_INLINES_H */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_ARCH_INLINES_H */

6
include/arch/arm64/arm-smccc.h
View file

@ -4,8 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_ARM_SMCCC_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_ARM_SMCCC_H_
#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_SMCCC_H_
#define ZEPHYR_INCLUDE_ARCH_ARM64_SMCCC_H_
/*
* Result from SMC/HVC call
@ -56,4 +56,4 @@ void arm_smccc_smc(unsigned long a0, unsigned long a1,
unsigned long a6, unsigned long a7,
struct arm_smccc_res *res);
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_ARM_SMCCC_H_ */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_SMCCC_H_ */

6
include/arch/arm64/arm_mmu.h
View file

@ -4,8 +4,8 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_MMU_ARM_MMU_H_
#define ZEPHYR_INCLUDE_ARCH_ARM64_MMU_ARM_MMU_H_
#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_ARM_MMU_H_
#define ZEPHYR_INCLUDE_ARCH_ARM64_ARM_MMU_H_
/* Following Memory types supported through MAIR encodings can be passed
* by user through "attrs"(attributes) field of specified memory region.
@ -201,4 +201,4 @@ void z_arm64_swap_ptables(struct k_thread *thread);
#endif /* _ASMLANGUAGE */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_MMU_ARM_MMU_H_ */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_ARM_MMU_H_ */

6
include/arch/arm64/asm_inline.h
View file

@ -4,8 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ASM_INLINE_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ASM_INLINE_H_
#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_ASM_INLINE_H_
#define ZEPHYR_INCLUDE_ARCH_ARM64_ASM_INLINE_H_
/*
* The file must not be included directly
@ -18,4 +18,4 @@
#include <arch/arm/asm_inline_other.h>
#endif
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ASM_INLINE_H_ */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_ASM_INLINE_H_ */

6
include/arch/arm64/asm_inline_gcc.h
View file

@ -6,8 +6,8 @@
/* Either public functions or macros or invoked by public functions */
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ASM_INLINE_GCC_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ASM_INLINE_GCC_H_
#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_ASM_INLINE_GCC_H_
#define ZEPHYR_INCLUDE_ARCH_ARM64_ASM_INLINE_GCC_H_
/*
* The file must not be included directly
@ -54,4 +54,4 @@ static ALWAYS_INLINE bool arch_irq_unlocked(unsigned int key)
#endif /* _ASMLANGUAGE */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ASM_INLINE_GCC_H_ */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_ASM_INLINE_GCC_H_ */

6
include/arch/arm64/cpu.h
View file

@ -4,8 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_CPU_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_CPU_H_
#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_CPU_H_
#define ZEPHYR_INCLUDE_ARCH_ARM64_CPU_H_
#include <sys/util.h>
@ -206,4 +206,4 @@
#define L1_CACHE_BYTES BIT(L1_CACHE_SHIFT)
#define ARM64_CPU_INIT_SIZE L1_CACHE_BYTES
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_CPU_H_ */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_CPU_H_ */

6
include/arch/arm64/error.h
View file

@ -11,8 +11,8 @@
* ARM AArch64-specific kernel error handling interface. Included by arch.h.
*/
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ERROR_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ERROR_H_
#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_ERROR_H_
#define ZEPHYR_INCLUDE_ARCH_ARM64_ERROR_H_
#include <arch/arm64/syscall.h>
#include <arch/arm64/exc.h>
@ -37,4 +37,4 @@ do { \
}
#endif
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_ERROR_H_ */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_ERROR_H_ */

6
include/arch/arm64/exc.h
View file

@ -11,8 +11,8 @@
* ARM-specific kernel exception handling interface. Included by arm64/arch.h.
*/
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_EXC_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_EXC_H_
#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_EXC_H_
#define ZEPHYR_INCLUDE_ARCH_ARM64_EXC_H_
/* for assembler, only works with constants */
@ -60,4 +60,4 @@ typedef struct __esf z_arch_esf_t;
#endif /* _ASMLANGUAGE */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_EXC_H_ */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_EXC_H_ */

8
include/arch/arm64/irq.h
View file

@ -9,11 +9,11 @@
* @brief Cortex-A public interrupt handling
*
* ARM64-specific kernel interrupt handling interface.
* Included by arm/aarch64/arch.h.
* Included by arm64/arch.h.
*/
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_IRQ_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_IRQ_H_
#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_IRQ_H_
#define ZEPHYR_INCLUDE_ARCH_ARM64_IRQ_H_
#include <irq.h>
#include <sw_isr_table.h>
@ -111,4 +111,4 @@ extern void _isr_wrapper(void);
}
#endif
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_IRQ_H_ */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_IRQ_H_ */

6
include/arch/arm64/lib_helpers.h
View file

@ -4,8 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_LIB_HELPERS_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_LIB_HELPERS_H_
#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_LIB_HELPERS_H_
#define ZEPHYR_INCLUDE_ARCH_ARM64_LIB_HELPERS_H_
#ifndef _ASMLANGUAGE
@ -183,4 +183,4 @@ static inline bool is_in_secure_state(void)
#endif /* !_ASMLANGUAGE */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_LIB_HELPERS_H_ */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_LIB_HELPERS_H_ */

6
include/arch/arm64/macro.inc
View file

@ -4,8 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_MACRO_INC_
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_MACRO_INC_
#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_MACRO_INC_
#define ZEPHYR_INCLUDE_ARCH_ARM64_MACRO_INC_
#ifdef _ASMLANGUAGE
@ -44,4 +44,4 @@
.endm
#endif /* _ASMLANGUAGE */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_MACRO_INC_ */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_MACRO_INC_ */

8
include/arch/arm64/misc.h
View file

@ -9,11 +9,11 @@
* @brief Cortex-A public kernel miscellaneous
*
* ARM64-specific kernel miscellaneous interface. Included by
* arm/aarch64/arch.h.
* arm64/arch.h.
*/
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_MISC_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_MISC_H_
#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_MISC_H_
#define ZEPHYR_INCLUDE_ARCH_ARM64_MISC_H_
#ifdef __cplusplus
extern "C" {
@ -38,4 +38,4 @@ static ALWAYS_INLINE void arch_nop(void)
}
#endif
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_MISC_H_ */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_MISC_H_ */

6
include/arch/arm64/sys_io.h
View file

@ -9,8 +9,8 @@
* gcc builtins)
*/
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_SYS_IO_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_SYS_IO_H_
#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_SYS_IO_H_
#define ZEPHYR_INCLUDE_ARCH_ARM64_SYS_IO_H_
#ifndef _ASMLANGUAGE
@ -87,4 +87,4 @@ static ALWAYS_INLINE void sys_write32(uint32_t data, mem_addr_t addr)
#endif /* _ASMLANGUAGE */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_SYS_IO_H_ */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_SYS_IO_H_ */

8
include/arch/arm64/syscall.h
View file

@ -10,11 +10,11 @@
*
* This header contains the ARM64 specific syscall interface. It is
* included by the syscall interface architecture-abstraction header
* (include/arch/aarch64/syscall.h)
* (include/arch64/syscall.h)
*/
#ifndef ZEPHYR_INCLUDE_ARCH_AARCH64_ARM_SYSCALL_H_
#define ZEPHYR_INCLUDE_ARCH_AARCH64_ARM_SYSCALL_H_
#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_SYSCALL_H_
#define ZEPHYR_INCLUDE_ARCH_ARM64_SYSCALL_H_
#define _SVC_CALL_CONTEXT_SWITCH 0
#define _SVC_CALL_IRQ_OFFLOAD 1
@ -179,4 +179,4 @@ static inline bool arch_is_user_context(void)
#endif /* _ASMLANGUAGE */
#endif /* CONFIG_USERSPACE */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_SYSCALL_H_ */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_SYSCALL_H_ */

6
include/arch/arm64/thread.h
View file

@ -16,8 +16,8 @@
* necessary to instantiate instances of struct k_thread.
*/
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_THREAD_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_THREAD_H_
#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_THREAD_H_
#define ZEPHYR_INCLUDE_ARCH_ARM64_THREAD_H_
#ifndef _ASMLANGUAGE
#include <zephyr/types.h>
@ -50,4 +50,4 @@ typedef struct _thread_arch _thread_arch_t;
#endif /* _ASMLANGUAGE */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_THREAD_H_ */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_THREAD_H_ */

6
include/arch/arm64/thread_stack.h
View file

@ -4,8 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_THREAD_STACK_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_THREAD_STACK_H_
#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_THREAD_STACK_H_
#define ZEPHYR_INCLUDE_ARCH_ARM64_THREAD_STACK_H_
#define ARCH_STACK_PTR_ALIGN 16
@ -55,4 +55,4 @@ struct z_arm64_thread_stack_header {
#endif /* _ASMLANGUAGE */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_THREAD_STACK_H_ */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_THREAD_STACK_H_ */

6
include/arch/arm64/timer.h
View file

@ -4,8 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
#ifndef ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_TIMER_H_
#define ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_TIMER_H_
#ifndef ZEPHYR_INCLUDE_ARCH_ARM64_TIMER_H_
#define ZEPHYR_INCLUDE_ARCH_ARM64_TIMER_H_
#ifndef _ASMLANGUAGE
@ -70,4 +70,4 @@ static ALWAYS_INLINE uint64_t arm_arch_timer_count(void)
#endif /* _ASMLANGUAGE */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM_AARCH64_TIMER_H_ */
#endif /* ZEPHYR_INCLUDE_ARCH_ARM64_TIMER_H_ */