feat: synchronizing arch api

命名规范：修改少量Arch接口，命名规范化调整： 1.修改arch/include下接口声明，所有arch对外提供调用函数均以ArchXX命名 2.提取多个架构均有实现的公共函数声明至arch/include对应头文件中以供外部调用，并修改命名格式为ArchXX 3.修改OS_HWI_WITH_ARG为LOSCFG_PLATFORM_HWI_WITH_ARG并移至los_config.h中 4.typedef VOID (*OS_TICK_HANDLER)(VOID);暂时移至arch/include/los_timer.h中 5.实现atomic原子操作相关接口，位于arch/include/los_atomic.h,arm架构部分与汇编指令相关原子操作接口使用ARCH_ARM宏进行控制是否编译 BREAKING CHANGE: 1.修改arch/include下接口，以ArchXX命名函数 2.提取公共函数声明:ArchAtomicXchg32bits、ArchAtomicDecRet、ArchAtomicCmpXchg32bits 3.新增部分原子操作c内联实现 Close #I4N7XV Signed-off-by: LiteOS2021 <dinglu@huawei.com>
2021-12-22 20:47:16 +08:00
parent 4334b3e18b
commit 04bf3a682f
116 changed files with 942 additions and 1042 deletions
--- a/arch/xtensa/lx6/gcc/los_arch_atomic.h
+++ b/arch/xtensa/lx6/gcc/los_arch_atomic.h
@@ -1,143 +0,0 @@
-/*
- * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. 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 of the copyright holder 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 HOLDER 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.
- */
-
-#ifndef _LOS_ARCH_ATOMIC_H
-#define _LOS_ARCH_ATOMIC_H
-
-#include "los_compiler.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-#endif /* __cplusplus */
-
-/**
- * @ingroup  los_arch_atomic
- * @brief Atomic exchange for 32-bit variable.
- *
- * @par Description:
- * This API is used to implement the atomic exchange for 32-bit variable.
- * @attention
- * <ul>The pointer v must not be NULL.</ul>
- *
- * @param  v       [IN] The variable pointer.
- * @param  val     [IN] The exchange value.
- *
- * @retval #INT32       The previous value of the atomic variable
- * @par Dependency:
- * <ul><li>los_arch_atomic.h: the header file that contains the API declaration.</li></ul>
- * @see
- */
-STATIC INLINE INT32 HalAtomicXchg32bits(volatile INT32 *v, INT32 val)
-{
-    UINT32 intSave;
-    INT32 prevVal;
-
-    intSave = LOS_IntLock();
-    prevVal = *v;
-    *v = val;
-    LOS_IntRestore(intSave);
-
-    return prevVal;
-}
-
-/**
- * @ingroup  los_arch_atomic
- * @brief Atomic auto-decrement.
- *
- * @par Description:
- * This API is used to implement the atomic auto-decrement and return the result of auto-decrement.
- * @attention
- * <ul>
- * <li>The pointer v must not be NULL.</li>
- * <li>The value which v point to must not be INT_MIN to avoid overflow after reducing 1.</li>
- * </ul>
- *
- * @param  v      [IN] The addSelf variable pointer.
- *
- * @retval #INT32  The return value of variable auto-decrement.
- * @par Dependency:
- * <ul><li>los_arch_atomic.h: the header file that contains the API declaration.</li></ul>
- * @see
- */
-STATIC INLINE INT32 HalAtomicDecRet(volatile INT32 *v)
-{
-    UINT32 intSave;
-
-    intSave = LOS_IntLock();
-    *v -= 1;
-    LOS_IntRestore(intSave);
-
-    return intSave;
-}
-
-/**
- * @ingroup  los_arch_atomic
- * @brief Atomic exchange for 32-bit variable with compare.
- *
- * @par Description:
- * This API is used to implement the atomic exchange for 32-bit variable, if the value of variable is equal to oldVal.
- * @attention
- * <ul>The pointer v must not be NULL.</ul>
- *
- * @param  v       [IN] The variable pointer.
- * @param  val     [IN] The new value.
- * @param  oldVal  [IN] The old value.
- *
- * @retval TRUE  The previous value of the atomic variable is not equal to oldVal.
- * @retval FALSE The previous value of the atomic variable is equal to oldVal.
- * @par Dependency:
- * <ul><li>los_arch_atomic.h: the header file that contains the API declaration.</li></ul>
- * @see
- */
-STATIC INLINE BOOL HalAtomicCmpXchg32bits(volatile INT32 *v, INT32 val, INT32 oldVal)
-{
-    UINT32 intSave;
-    INT32 prevVal;
-
-    intSave = LOS_IntLock();
-    prevVal = *v;
-    if (prevVal == oldVal) {
-        *v = val;
-    }
-    LOS_IntRestore(intSave);
-
-    return (prevVal != oldVal);
-}
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* __cplusplus */
-
-#endif /* _LOS_ARCH_ATOMIC_H */
--- a/arch/xtensa/lx6/gcc/los_arch_interrupt.h
+++ b/arch/xtensa/lx6/gcc/los_arch_interrupt.h
@@ -199,7 +199,7 @@ extern UINT32 g_intCount;
 */
 #define OS_ERRNO_HWI_FASTMODE_ALREADY_CREATED LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x07)

-#if (OS_HWI_WITH_ARG == 1)
+#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
 /* *
 * @ingroup los_arch_interrupt
 * Set interrupt vector table.
--- a/arch/xtensa/lx6/gcc/los_arch_timer.h
+++ b/arch/xtensa/lx6/gcc/los_arch_timer.h
@@ -34,7 +34,7 @@

 #include "los_config.h"
 #include "los_compiler.h"
-#include "los_context.h"
+#include "los_timer.h"

 #ifdef __cplusplus
 #if __cplusplus
--- a/arch/xtensa/lx6/gcc/los_context.c
+++ b/arch/xtensa/lx6/gcc/los_context.c
@@ -96,19 +96,19 @@ UINT32 g_stackDefault[] = {
    0x00000000,     /* REG_OFF_SPILL_RESERVED */
 };

-LITE_OS_SEC_TEXT_INIT VOID HalArchInit(VOID)
+LITE_OS_SEC_TEXT_INIT VOID ArchInit(VOID)
 {
    HalHwiInit();
 }

-LITE_OS_SEC_TEXT_MINOR VOID HalSysExit(VOID)
+LITE_OS_SEC_TEXT_MINOR VOID ArchSysExit(VOID)
 {
    LOS_IntLock();
    while (1) {
    }
 }

-LITE_OS_SEC_TEXT_INIT VOID *HalTskStackInit(UINT32 taskID, UINT32 stackSize, VOID *topStack)
+LITE_OS_SEC_TEXT_INIT VOID *ArchTskStackInit(UINT32 taskID, UINT32 stackSize, VOID *topStack)
 {
    TaskContext *context = NULL;
    errno_t result;
@@ -141,7 +141,7 @@ VOID HalStartToRun(VOID)
    __asm__ volatile ("call0 OsStartToRun");
 }

-LITE_OS_SEC_TEXT_INIT UINT32 HalStartSchedule(VOID)
+LITE_OS_SEC_TEXT_INIT UINT32 ArchStartSchedule(VOID)
 {
    UINT32 ret;

@@ -157,7 +157,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 HalStartSchedule(VOID)
    return LOS_OK;
 }

-VOID HalTaskSchedule(VOID)
+VOID ArchTaskSchedule(VOID)
 {
    UINT32 intSave;

@@ -180,6 +180,6 @@ VOID HalTaskSchedule(VOID)
 VOID HalIrqEndCheckNeedSched(VOID)
 {
    if (g_sysNeedSched && g_taskScheduled && LOS_CHECK_SCHEDULE) {
-        HalTaskSchedule();
+        ArchTaskSchedule();
    }
 }
--- a/arch/xtensa/lx6/gcc/los_interrupt.c
+++ b/arch/xtensa/lx6/gcc/los_interrupt.c
@@ -50,7 +50,7 @@ UINT32 g_intCount = 0;
 */
 STATIC HWI_PROC_FUNC __attribute__((aligned(0x100))) g_hwiForm[OS_VECTOR_CNT] = {0};

-#if (OS_HWI_WITH_ARG == 1)
+#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)

 typedef struct {
    HWI_PROC_FUNC pfnHandler;
@@ -105,7 +105,7 @@ UINT32 HwiNumValid(UINT32 num)
 * @ingroup los_hwi
 * Lock all interrupt.
 */
-UINT32 HalIntLock(VOID)
+UINT32 ArchIntLock(VOID)
 {
    UINT32 ret;

@@ -117,7 +117,7 @@ UINT32 HalIntLock(VOID)
 * @ingroup los_hwi
 * Restore interrupt status.
 */
-VOID HalIntRestore(UINT32 intSave)
+VOID ArchIntRestore(UINT32 intSave)
 {
    __asm__ volatile("wsr.ps %0; rsync" : : "r"(intSave) : "memory");
 }
@@ -126,7 +126,7 @@ VOID HalIntRestore(UINT32 intSave)
 * @ingroup los_hwi
 * Unlock interrupt.
 */
-UINT32 HalIntUnLock(VOID)
+UINT32 ArchIntUnLock(VOID)
 {
    UINT32 intSave;

@@ -139,7 +139,7 @@ UINT32 HalIntUnLock(VOID)
 * @ingroup los_hwi
 * Determine if the interrupt is locked
 */
-STATIC INLINE UINT32 HalIntLocked(VOID)
+STATIC INLINE UINT32 ArchIntLocked(VOID)
 {
    UINT32 intSave;
    __asm__ volatile("rsr %0, ps " : "=r"(intSave) : : "memory");
@@ -234,7 +234,7 @@ UINT32 HalIrqClear(HWI_HANDLE_T vector)
    return LOS_OK;
 }

-INLINE UINT32 HalIsIntActive(VOID)
+INLINE UINT32 ArchIsIntActive(VOID)
 {
    return (g_intCount > 0);
 }
@@ -286,7 +286,7 @@ VOID HalInterrupt(VOID)

    HalPreInterruptHandler(hwiIndex);

-#if (OS_HWI_WITH_ARG == 1)
+#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
    if (g_hwiHandlerForm[hwiIndex].pfnHandler != 0) {
        g_hwiHandlerForm[hwiIndex].pfnHandler((VOID *)g_hwiHandlerForm[hwiIndex].pParm);
    }
@@ -307,7 +307,7 @@ VOID HalInterrupt(VOID)
 }

 /* ****************************************************************************
- Function    : HalHwiCreate
+ Function    : ArchHwiCreate
 Description : create hardware interrupt
 Input       : hwiNum   --- hwi num to create
               hwiPrio  --- priority of the hwi
@@ -317,11 +317,11 @@ VOID HalInterrupt(VOID)
 Output      : None
 Return      : LOS_OK on success or error code on failure
 **************************************************************************** */
-UINT32 HalHwiCreate(HWI_HANDLE_T hwiNum,
-                    HWI_PRIOR_T hwiPrio,
-                    HWI_MODE_T mode,
-                    HWI_PROC_FUNC handler,
-                    HWI_ARG_T arg)
+UINT32 ArchHwiCreate(HWI_HANDLE_T hwiNum,
+                     HWI_PRIOR_T hwiPrio,
+                     HWI_MODE_T mode,
+                     HWI_PROC_FUNC handler,
+                     HWI_ARG_T arg)
 {
    UINT32 intSave;

@@ -342,7 +342,7 @@ UINT32 HalHwiCreate(HWI_HANDLE_T hwiNum,
    }

    intSave = LOS_IntLock();
-#if (OS_HWI_WITH_ARG == 1)
+#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
    OsSetVector(hwiNum, handler, arg);
 #else
    OsSetVector(hwiNum, handler);
@@ -355,13 +355,13 @@ UINT32 HalHwiCreate(HWI_HANDLE_T hwiNum,
 }

 /* ****************************************************************************
- Function    : HalHwiDelete
+ Function    : ArchHwiDelete
 Description : Delete hardware interrupt
 Input       : hwiNum   --- hwi num to delete
 Output      : None
 Return      : LOS_OK on success or error code on failure
 **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 HalHwiDelete(HWI_HANDLE_T hwiNum)
+LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiDelete(HWI_HANDLE_T hwiNum)
 {
    UINT32 intSave;

@@ -522,7 +522,7 @@ VOID HalExcHandleEntry(UINTPTR faultAddr, EXC_CONTEXT_S *excBufAddr, UINT32 type

    OsDoExcHook(EXC_INTERRUPT);
    OsExcInfoDisplay(&g_excInfo);
-    HalSysExit();
+    ArchSysExit();
 }

 /* Stack protector */
--- a/arch/xtensa/lx6/gcc/los_timer.c
+++ b/arch/xtensa/lx6/gcc/los_timer.c
@@ -82,7 +82,7 @@ WEAK UINT32 HalTickStart(OS_TICK_HANDLER handler)
    }

 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
-#if (OS_HWI_WITH_ARG == 1)
+#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
    OsSetVector(OS_TICK_INT_NUM, (HWI_PROC_FUNC)handler, NULL);
 #else
    OsSetVector(OS_TICK_INT_NUM, (HWI_PROC_FUNC)handler);
@@ -102,7 +102,7 @@ WEAK UINT32 HalTickStart(OS_TICK_HANDLER handler)
    return LOS_OK;
 }

-WEAK VOID HalSysTickReload(UINT64 nextResponseTime)
+WEAK VOID ArchSysTickReload(UINT64 nextResponseTime)
 {
    UINT32 timerL;
    timerL = GetCcount();
@@ -110,7 +110,7 @@ WEAK VOID HalSysTickReload(UINT64 nextResponseTime)
    SetCcompare(timerL);
 }

-WEAK UINT64 HalGetTickCycle(UINT32 *period)
+WEAK UINT64 ArchGetTickCycle(UINT32 *period)
 {
    UINT32 tickCycleH;
    UINT32 tickCycleL;
@@ -132,12 +132,12 @@ WEAK UINT64 HalGetTickCycle(UINT32 *period)
    return tickCycle;
 }

-WEAK VOID HalTickLock(VOID)
+WEAK VOID ArchTickLock(VOID)
 {
    HalIrqMask(OS_TICK_INT_NUM);
 }

-WEAK VOID HalTickUnlock(VOID)
+WEAK VOID ArchTickUnlock(VOID)
 {
    HalIrqUnmask(OS_TICK_INT_NUM);
 }
@@ -152,7 +152,7 @@ VOID Dsb(VOID)
    __asm__ volatile("dsync" : : : "memory");
 }

-UINT32 HalEnterSleep(VOID)
+UINT32 ArchEnterSleep(VOID)
 {
    Dsb();
    Wfi();