!1079 liteos_m内核xts用例补齐net、time以及部分cmsis

Merge pull request !1079 from zwx1232718/master

BUILD.gn

@@ -137,8 +137,8 @@ config("public") {
   ]
 
   if (BOARD_SOC_FEATURE) {
-    configs += [ "//device/board/$device_company:public" ]
-    configs += [ "//device/soc/$LOSCFG_SOC_COMPANY:public" ]
+    configs += [ "$DEVICE_BOARD_DIR/$device_company:public" ]
+    configs += [ "$DEVICE_SOC_DIR/$LOSCFG_SOC_COMPANY:public" ]
   } else {
     if (HAVE_DEVICE_SDK) {
       configs += [ "$device_path:public" ]
@@ -158,8 +158,8 @@ group("modules") {
   ]
 
   if (BOARD_SOC_FEATURE) {
-    deps += [ "//device/board/$device_company" ]
-    deps += [ "//device/soc/$LOSCFG_SOC_COMPANY" ]
+    deps += [ "$DEVICE_BOARD_DIR/$device_company" ]
+    deps += [ "$DEVICE_SOC_DIR/$LOSCFG_SOC_COMPANY" ]
   } else {
     if (HAVE_DEVICE_SDK) {
       deps += [ device_path ]

arch/arm/BUILD.gn

@@ -1,5 +1,5 @@
 # Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
+# Copyright (c) 2020-2023 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:
@@ -34,10 +34,11 @@ config("arm_config") {
 }
 
 module_group("arm") {
+  modules = [ "common" ]
   if (defined(LOSCFG_COMPILER_ICCARM)) {
-    modules = [ "$board_cpu/iar" ]
+    modules += [ "$board_cpu/iar" ]
   } else {
-    modules = [ "$board_cpu/gcc" ]
+    modules += [ "$board_cpu/gcc" ]
   }
   configs = [ ":arm_config" ]
 }

arch/arm/arm9/gcc/los_arch_interrupt.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -32,9 +32,7 @@
 #ifndef _LOS_ARCH_INTERRUPT_H
 #define _LOS_ARCH_INTERRUPT_H
 
-#include "los_config.h"
-#include "los_compiler.h"
-#include "los_interrupt.h"
+#include "los_common_interrupt.h"
 
 #ifdef __cplusplus
 #if __cplusplus
@@ -42,14 +40,6 @@ extern "C" {
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
-/* *
- * @ingroup los_arch_interrupt
- * Maximum number of used hardware interrupts.
- */
-#ifndef OS_HWI_MAX_NUM
-#define OS_HWI_MAX_NUM                        LOSCFG_PLATFORM_HWI_LIMIT
-#endif
-
 /* *
  * @ingroup los_arch_interrupt
  * Highest priority of a hardware interrupt.
@@ -66,19 +56,6 @@ extern "C" {
 #define OS_HWI_PRIO_LOWEST                    7
 #endif
 
-
-/* *
- * @ingroup  los_arch_interrupt
- * Define the type of a hardware interrupt vector table function.
- */
-typedef VOID (**HWI_VECTOR_FUNC)(void);
-
-/* *
- * @ingroup los_arch_interrupt
- * Count of interrupts.
- */
-extern UINT32 g_intCount;
-
 /* *
  * @ingroup los_arch_interrupt
  * Count of arm9 system interrupt vector.
@@ -174,19 +151,15 @@ extern UINT32 g_intCount;
  */
 #define OS_ERRNO_HWI_FASTMODE_ALREADY_CREATED LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x07)
 
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
 /* *
- * @ingroup los_hwi
- * Set interrupt vector table.
+ * @ingroup los_arch_interrupt
+ * Hardware interrupt error code: Invalid interrupt operation function.
+ *
+ * Value: 0x0200090c
+ *
+ * Solution: Set a valid interrupt operation function
  */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg);
-#else
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
-#endif
+#define OS_ERRNO_HWI_OPS_FUNC_NULL            LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x0c)
 
 /* *
  * @ingroup  los_arch_interrupt
@@ -207,35 +180,6 @@ extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
  */
 extern VOID HalInterrupt(VOID);
 
-/* *
- * @ingroup  los_arch_interrupt
- * @brief: Default vector handling function.
- *
- * @par Description:
- * This API is used to configure interrupt for null function.
- *
- * @attention:
- * <ul><li>None.</li></ul>
- *
- * @param:None.
- *
- * @retval:None.
- * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li
-></ul>
- * @see None.
- */
-extern VOID HalHwiDefaultHandler(VOID);
-
-#define OS_EXC_IN_INIT                      0
-#define OS_EXC_IN_TASK                      1
-#define OS_EXC_IN_HWI                       2
-
-#define OS_EXC_FLAG_FAULTADDR_VALID         0x01
-#define OS_EXC_FLAG_IN_HWI                  0x02
-
-#define OS_EXC_IMPRECISE_ACCESS_ADDR        0xABABABAB
-
 /**
  * @ingroup los_exc
  * the struct of register files
@@ -325,7 +269,6 @@ typedef struct TagExcInfo {
     EXC_CONTEXT_S *context;
 } ExcInfo;
 
-extern UINT32 g_intCount;
 extern ExcInfo g_excInfo;
 
 #ifdef __cplusplus

arch/arm/arm9/gcc/los_interrupt.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -28,12 +28,10 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include "los_interrupt.h"
 #include <stdarg.h>
 #include "securec.h"
 #include "los_context.h"
 #include "los_arch_interrupt.h"
-#include "los_debug.h"
 #include "los_hook.h"
 #include "los_task.h"
 #include "los_sched.h"
@@ -42,7 +40,6 @@
 #if (LOSCFG_CPUP_INCLUDE_IRQ == 1)
 #include "los_cpup.h"
 #endif
-#include "los_reg.h"
 
 #define OS_INT_IRQ_ENABLE           (1U << 0)
 #define OS_INT_FIQ_ENABLE           (1U << 1)
@@ -55,86 +52,8 @@
 #define OS_ARM_INSTR_LEN            4
 #define OS_THUMB_INSTR_LEN          2
 
-UINT32 g_intCount = 0;
 ExcInfo g_excInfo = {0};
 
-/* *
- * @ingroup los_hwi
- * hardware interrupt form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC g_hwiForm[OS_VECTOR_CNT] = {0};
-
-#if (LOSCFG_DEBUG_TOOLS == 1)
-STATIC UINT32 g_hwiFormCnt[OS_HWI_MAX_NUM] = {0};
-STATIC CHAR *g_hwiFormName[OS_HWI_MAX_NUM] = {0};
-
-UINT32 OsGetHwiFormCnt(UINT32 index)
-{
-    return g_hwiFormCnt[index];
-}
-
-CHAR *OsGetHwiFormName(UINT32 index)
-{
-    return g_hwiFormName[index];
-}
-
-BOOL OsGetHwiCreated(UINT32 index)
-{
-    if (g_hwiForm[index] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return TRUE;
-    }
-
-    return FALSE;
-}
-#endif
-
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-
-typedef struct {
-    HWI_PROC_FUNC pfnHandler;
-    VOID *pParm;
-} HWI_HANDLER_FUNC;
-
-/* *
- * @ingroup los_hwi
- * hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pfnHandler = vector;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pParm = arg;
-    }
-}
-
-#else
-/* *
- * @ingroup los_hwi
- * hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {0};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT] = vector;
-    }
-}
-#endif
-
-
 /* ****************************************************************************
  Function    : HwiNumGet
  Description : Get an interrupt number
@@ -153,10 +72,6 @@ STATIC UINT32 HwiNumGet(VOID)
 
 STATIC UINT32 HwiUnmask(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     *((volatile UINT32 *)OS_INT_ENABLE_ADDR) |= (1U << (hwiNum));
 
     return LOS_OK;
@@ -164,48 +79,28 @@ STATIC UINT32 HwiUnmask(HWI_HANDLE_T hwiNum)
 
 STATIC UINT32 HwiMask(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     *((volatile UINT32 *)OS_INT_ENABLE_ADDR) &= ~(1U << (hwiNum));
 
     return LOS_OK;
 }
 
-HwiControllerOps g_archHwiOps = {
+STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
+{
+    (VOID)hwiPrio;
+    HwiUnmask(hwiNum);
+    return LOS_OK;
+}
+
+STATIC HwiControllerOps g_archHwiOps = {
     .enableIrq      = HwiUnmask,
     .disableIrq     = HwiMask,
     .getCurIrqNum   = HwiNumGet,
+    .createIrq      = HwiCreate,
 };
 
-inline UINT32 ArchIsIntActive(VOID)
+HwiControllerOps *ArchIntOpsGet(VOID)
 {
-    return (g_intCount > 0);
-}
-/* ****************************************************************************
- Function    : HalHwiDefaultHandler
- Description : default handler of the hardware interrupt
- Input       : None
- Output      : None
- Return      : None
- **************************************************************************** */
-LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
-{
-    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());
-    while (1) {}
-}
-
-WEAK VOID HalPreInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
-}
-
-WEAK VOID HalAftInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
+    return &g_archHwiOps;
 }
 
 /* ****************************************************************************
@@ -264,87 +159,6 @@ LITE_OS_SEC_TEXT VOID HalInterrupt(VOID)
     LOS_IntRestore(intSave);
 }
 
-/* ****************************************************************************
- Function    : ArchHwiCreate
- Description : create hardware interrupt
- Input       : hwiNum   --- hwi num to create
-               hwiPrio  --- priority of the hwi
-               hwiMode  --- unused
-               hwiHandler  --- hwi handler
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiCreate(HWI_HANDLE_T hwiNum,
-                                           HWI_PRIOR_T hwiPrio,
-                                           HWI_MODE_T hwiMode,
-                                           HWI_PROC_FUNC hwiHandler,
-                                           HwiIrqParam *irqParam)
-{
-    (VOID)hwiMode;
-    UINT32 intSave;
-
-    if (hwiHandler == NULL) {
-        return OS_ERRNO_HWI_PROC_FUNC_NULL;
-    }
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return OS_ERRNO_HWI_ALREADY_CREATED;
-    }
-
-    intSave = LOS_IntLock();
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-    if (irqParam != NULL) {
-        OsSetVector(hwiNum, hwiHandler, irqParam->pDevId);
-    } else {
-        OsSetVector(hwiNum, hwiHandler, NULL);
-    }
-#else
-    (VOID)irqParam;
-    OsSetVector(hwiNum, hwiHandler);
-#endif
-#if (LOSCFG_DEBUG_TOOLS == 1)
-    if ((irqParam != NULL) && (irqParam->pName != NULL)) {
-        g_hwiFormName[hwiNum + OS_SYS_VECTOR_CNT] = (CHAR *)irqParam->pName;
-    }
-    g_hwiFormCnt[hwiNum + OS_SYS_VECTOR_CNT] = 0;
-#endif
-    HwiUnmask(hwiNum);
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
-/* ****************************************************************************
- Function    : ArchHwiDelete
- Description : Delete hardware interrupt
- Input       : hwiNum   --- hwi num to delete
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiDelete(HWI_HANDLE_T hwiNum, HwiIrqParam *irqParam)
-{
-    (VOID)irqParam;
-    UINT32 intSave;
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    HwiMask(hwiNum);
-
-    intSave = LOS_IntLock();
-    g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
 #if (LOSCFG_KERNEL_PRINTF != 0)
 STATIC VOID OsExcTypeInfo(const ExcInfo *excInfo)
 {
@@ -511,13 +325,14 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
     UINT32 reg;
     UINT32 val;
+    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
 
     for (val = OS_SYS_VECTOR_CNT; val < OS_VECTOR_CNT; val++) {
 #if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-        g_hwiForm[val].pfnHook = HalHwiDefaultHandler;
-        g_hwiForm[val].uwParam = 0;
+        hwiForm[val].pfnHook = HalHwiDefaultHandler;
+        hwiForm[val].uwParam = 0;
 #else
-        g_hwiForm[val] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+        hwiForm[val] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
 #endif
     }
 
@@ -560,4 +375,3 @@ UINT32 ArchIntUnLock(VOID)
                          : "memory");
     return intSave;
 }
-

arch/arm/common/BUILD.gn

@@ -0,0 +1,39 @@
+# Copyright (c) 2023-2023 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.
+
+import("//kernel/liteos_m/liteos.gni")
+
+module_name = "common"
+kernel_module(module_name) {
+  sources = [ "los_common_interrupt.c" ]
+  configs += [ "$LITEOSTOPDIR:warn_config" ]
+}
+
+config("public") {
+  include_dirs = [ "." ]
+}

arch/arm/common/los_common_interrupt.c

@@ -0,0 +1,328 @@
+/*
+ * Copyright (c) 2023-2023 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.
+ */
+
+#include "los_arch_interrupt.h"
+#include "los_debug.h"
+
+#ifdef __ICCARM__
+#pragma location = ".data.vector"
+#pragma data_alignment = LOSCFG_ARCH_HWI_VECTOR_ALIGN
+/* *
+ * @ingroup los_hwi
+ * Hardware interrupt form mapping handling function array.
+ */
+HWI_PROC_FUNC g_hwiForm[OS_VECTOR_CNT] = {0};
+#elif defined(__CC_ARM) || defined(__GNUC__)
+LITE_OS_SEC_VEC
+/* *
+ * @ingroup los_hwi
+ * Hardware interrupt form mapping handling function array.
+ */
+HWI_PROC_FUNC __attribute__((aligned(LOSCFG_ARCH_HWI_VECTOR_ALIGN))) g_hwiForm[OS_VECTOR_CNT] = {0};
+#endif
+
+VOID *ArchGetHwiFrom(VOID)
+{
+    return g_hwiForm;
+}
+
+UINT32 g_intCount = 0;
+
+/* ****************************************************************************
+ Function    : HalHwiDefaultHandler
+ Description : default handler of the hardware interrupt
+ Input       : None
+ Output      : None
+ Return      : None
+ **************************************************************************** */
+LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
+{
+    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, ArchIntCurIrqNum());
+    while (1) {}
+}
+
+WEAK VOID HalPreInterruptHandler(UINT32 arg)
+{
+    (VOID)arg;
+    return;
+}
+
+WEAK VOID HalAftInterruptHandler(UINT32 arg)
+{
+    (VOID)arg;
+    return;
+}
+
+#if (LOSCFG_DEBUG_TOOLS == 1)
+STATIC UINT32 g_hwiFormCnt[OS_HWI_MAX_NUM] = {0};
+STATIC CHAR *g_hwiFormName[OS_HWI_MAX_NUM] = {0};
+
+UINT32 OsGetHwiFormCnt(UINT32 index)
+{
+    return g_hwiFormCnt[index];
+}
+
+CHAR *OsGetHwiFormName(UINT32 index)
+{
+    return g_hwiFormName[index];
+}
+
+BOOL OsHwiIsCreated(UINT32 index)
+{
+    if (g_hwiForm[index] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
+        return TRUE;
+    }
+
+    return FALSE;
+}
+#endif
+
+#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
+typedef struct {
+    HWI_PROC_FUNC pfnHandler;
+    VOID *pParm;
+} HWI_HANDLER_FUNC;
+
+/* *
+ * @ingroup los_hwi
+ * Hardware interrupt handler form mapping handling function array.
+ */
+HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};
+
+/* *
+ * @ingroup los_hwi
+ * Set interrupt vector table.
+ */
+VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg)
+{
+    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
+        g_hwiForm[num + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalInterrupt;
+        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pfnHandler = vector;
+        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pParm = arg;
+    }
+}
+#else
+/* *
+ * @ingroup los_hwi
+ * hardware interrupt handler form mapping handling function array.
+ */
+HWI_PROC_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {0};
+
+/* *
+ * @ingroup los_hwi
+ * Set interrupt vector table.
+ */
+VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector)
+{
+    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
+        g_hwiForm[num + OS_SYS_VECTOR_CNT] = HalInterrupt;
+        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT] = vector;
+    }
+}
+#endif
+
+UINT32 ArchIntTrigger(HWI_HANDLE_T hwiNum)
+{
+    if (hwiNum >= OS_HWI_MAX_NUM) {
+        return OS_ERRNO_HWI_NUM_INVALID;
+    }
+
+    HwiControllerOps *hwiOps = ArchIntOpsGet();
+    if (hwiOps->triggerIrq == NULL) {
+        return OS_ERRNO_HWI_OPS_FUNC_NULL;
+    }
+
+    return hwiOps->triggerIrq(hwiNum);
+}
+
+UINT32 ArchIntEnable(HWI_HANDLE_T hwiNum)
+{
+    if (hwiNum >= OS_HWI_MAX_NUM) {
+        return OS_ERRNO_HWI_NUM_INVALID;
+    }
+
+    HwiControllerOps *hwiOps = ArchIntOpsGet();
+    if (hwiOps->enableIrq == NULL) {
+        return OS_ERRNO_HWI_OPS_FUNC_NULL;
+    }
+
+    return hwiOps->enableIrq(hwiNum);
+}
+
+UINT32 ArchIntDisable(HWI_HANDLE_T hwiNum)
+{
+    if (hwiNum >= OS_HWI_MAX_NUM) {
+        return OS_ERRNO_HWI_NUM_INVALID;
+    }
+
+    HwiControllerOps *hwiOps = ArchIntOpsGet();
+    if (hwiOps->disableIrq == NULL) {
+        return OS_ERRNO_HWI_OPS_FUNC_NULL;
+    }
+
+    return hwiOps->disableIrq(hwiNum);
+}
+
+UINT32 ArchIntClear(HWI_HANDLE_T hwiNum)
+{
+    if (hwiNum >= OS_HWI_MAX_NUM) {
+        return OS_ERRNO_HWI_NUM_INVALID;
+    }
+
+    HwiControllerOps *hwiOps = ArchIntOpsGet();
+    if (hwiOps->clearIrq == NULL) {
+        return OS_ERRNO_HWI_OPS_FUNC_NULL;
+    }
+
+    return hwiOps->clearIrq(hwiNum);
+}
+
+UINT32 ArchIntSetPriority(HWI_HANDLE_T hwiNum, HWI_PRIOR_T priority)
+{
+    if (hwiNum >= OS_HWI_MAX_NUM) {
+        return OS_ERRNO_HWI_NUM_INVALID;
+    }
+
+    if (priority > OS_HWI_PRIO_LOWEST) {
+        return OS_ERRNO_HWI_PRIO_INVALID;
+    }
+
+    HwiControllerOps *hwiOps = ArchIntOpsGet();
+    if (hwiOps->setIrqPriority == NULL) {
+        return OS_ERRNO_HWI_OPS_FUNC_NULL;
+    }
+
+    return hwiOps->setIrqPriority(hwiNum, priority);
+}
+
+UINT32 ArchIntCurIrqNum(VOID)
+{
+    HwiControllerOps *hwiOps = ArchIntOpsGet();
+    return hwiOps->getCurIrqNum();
+}
+
+/* ****************************************************************************
+ Function    : ArchHwiCreate
+ Description : create hardware interrupt
+ Input       : hwiNum   --- hwi num to create
+               hwiPrio  --- priority of the hwi
+               hwiMode  --- unused
+               hwiHandler --- hwi handler
+               irqParam --- param of the hwi handler
+ Output      : None
+ Return      : LOS_OK on success or error code on failure
+ **************************************************************************** */
+LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio,
+                                           HWI_MODE_T hwiMode, HWI_PROC_FUNC hwiHandler,
+                                           HwiIrqParam *irqParam)
+{
+    (VOID)hwiMode;
+    UINT32 intSave;
+
+    if (hwiHandler == NULL) {
+        return OS_ERRNO_HWI_PROC_FUNC_NULL;
+    }
+
+    if (hwiNum >= OS_HWI_MAX_NUM) {
+        return OS_ERRNO_HWI_NUM_INVALID;
+    }
+
+    if (g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
+        return OS_ERRNO_HWI_ALREADY_CREATED;
+    }
+
+    if (hwiPrio > OS_HWI_PRIO_LOWEST) {
+        return OS_ERRNO_HWI_PRIO_INVALID;
+    }
+
+    intSave = LOS_IntLock();
+
+#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
+    if (irqParam != NULL) {
+        OsSetVector(hwiNum, hwiHandler, irqParam->pDevId);
+    } else {
+        OsSetVector(hwiNum, hwiHandler, NULL);
+    }
+#else
+    (VOID)irqParam;
+    OsSetVector(hwiNum, hwiHandler);
+#endif
+
+#if (LOSCFG_DEBUG_TOOLS == 1)
+    if ((irqParam != NULL) && (irqParam->pName != NULL)) {
+        g_hwiFormName[hwiNum + OS_SYS_VECTOR_CNT] = (CHAR *)irqParam->pName;
+    }
+    g_hwiFormCnt[hwiNum + OS_SYS_VECTOR_CNT] = 0;
+#endif
+
+    HwiControllerOps *hwiOps = ArchIntOpsGet();
+    if (hwiOps->createIrq == NULL) {
+        LOS_IntRestore(intSave);
+        return OS_ERRNO_HWI_OPS_FUNC_NULL;
+    }
+    hwiOps->createIrq(hwiNum, hwiPrio);
+
+    LOS_IntRestore(intSave);
+
+    return LOS_OK;
+}
+
+/* ****************************************************************************
+ Function    : ArchHwiDelete
+ Description : Delete hardware interrupt
+ Input       : hwiNum   --- hwi num to delete
+               irqParam --- param of the hwi handler
+ Output      : None
+ Return      : LOS_OK on success or error code on failure
+ **************************************************************************** */
+LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiDelete(HWI_HANDLE_T hwiNum, HwiIrqParam *irqParam)
+{
+    (VOID)irqParam;
+    UINT32 intSave;
+
+    if (hwiNum >= OS_HWI_MAX_NUM) {
+        return OS_ERRNO_HWI_NUM_INVALID;
+    }
+
+    ArchIntDisable((IRQn_Type)hwiNum);
+
+    intSave = LOS_IntLock();
+
+    g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+
+    LOS_IntRestore(intSave);
+
+    return LOS_OK;
+}
+
+INLINE UINT32 ArchIsIntActive(VOID)
+{
+    return (g_intCount > 0);
+}

arch/arm/common/los_common_interrupt.h

@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2023-2023 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_COMMON_INTERRUPT_H
+#define _LOS_COMMON_INTERRUPT_H
+
+#include "los_config.h"
+#include "los_compiler.h"
+#include "los_interrupt.h"
+#include "los_error.h"
+
+#ifdef __cplusplus
+#if __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+#endif /* __cplusplus */
+
+/* *
+ * @ingroup  los_arch_interrupt
+ * Define the type of a hardware interrupt vector table function.
+ */
+typedef VOID (**HWI_VECTOR_FUNC)(VOID);
+
+/* *
+ * @ingroup los_arch_interrupt
+ * Count of interrupts.
+ */
+extern UINT32 g_intCount;
+
+/* *
+ * @ingroup los_arch_interrupt
+ * Maximum number of used hardware interrupts.
+ */
+#ifndef OS_HWI_MAX_NUM
+#define OS_HWI_MAX_NUM                        LOSCFG_PLATFORM_HWI_LIMIT
+#endif
+
+#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
+/* *
+ * @ingroup los_arch_interrupt
+ * Set interrupt vector table.
+ */
+extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg);
+extern HWI_HANDLER_FUNC g_hwiHandlerForm[];
+#else
+/* *
+ * @ingroup los_arch_interrupt
+ * Set interrupt vector table.
+ */
+extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
+extern HWI_PROC_FUNC g_hwiHandlerForm[];
+#endif
+
+#define OS_EXC_IN_INIT                      0
+#define OS_EXC_IN_TASK                      1
+#define OS_EXC_IN_HWI                       2
+#define OS_EXC_FLAG_FAULTADDR_VALID         0x01
+#define OS_EXC_FLAG_IN_HWI                  0x02
+#define OS_EXC_IMPRECISE_ACCESS_ADDR        0xABABABAB
+#define OS_EXC_EVENT                        0x00000001
+
+/* *
+ * @ingroup  los_arch_interrupt
+ * @brief: Default vector handling function.
+ *
+ * @par Description:
+ * This API is used to configure interrupt for null function.
+ *
+ * @attention:
+ * <ul><li>None.</li></ul>
+ *
+ * @param:None.
+ *
+ * @retval:None.
+ * @par Dependency:
+ * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
+ * @see None.
+ */
+extern VOID HalHwiDefaultHandler(VOID);
+
+VOID HalPreInterruptHandler(UINT32 arg);
+VOID HalAftInterruptHandler(UINT32 arg);
+VOID *ArchGetHwiFrom(VOID);
+
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* __cplusplus */
+
+#endif /* _LOS_COMMON_INTERRUPT_H */

arch/arm/cortex-m3/keil/los_arch_interrupt.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -42,14 +42,6 @@ extern "C" {
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
-/* *
- * @ingroup los_arch_interrupt
- * Maximum number of used hardware interrupts.
- */
-#ifndef OS_HWI_MAX_NUM
-#define OS_HWI_MAX_NUM                        LOSCFG_PLATFORM_HWI_LIMIT
-#endif
-
 /* *
  * @ingroup los_arch_interrupt
  * Highest priority of a hardware interrupt.
@@ -66,19 +58,6 @@ extern "C" {
 #define OS_HWI_PRIO_LOWEST                    7
 #endif
 
-
-/* *
- * @ingroup  los_arch_interrupt
- * Define the type of a hardware interrupt vector table function.
- */
-typedef VOID (**HWI_VECTOR_FUNC)(void);
-
-/* *
- * @ingroup los_arch_interrupt
- * Count of interrupts.
- */
-extern UINT32 g_intCount;
-
 /* *
  * @ingroup los_arch_interrupt
  * Count of M-Core system interrupt vector.
@@ -186,6 +165,16 @@ extern UINT32 _BootVectors[];
  */
 #define OS_ERRNO_HWI_FASTMODE_ALREADY_CREATED LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x07)
 
+/* *
+ * @ingroup los_arch_interrupt
+ * Hardware interrupt error code: Invalid interrupt operation function.
+ *
+ * Value: 0x0200090c
+ *
+ * Solution: Set a valid interrupt operation function
+ */
+#define OS_ERRNO_HWI_OPS_FUNC_NULL            LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x0c)
+
 /* *
  * @ingroup los_arch_interrupt
  * SysTick control and status register.
@@ -312,20 +301,6 @@ extern UINT32 _BootVectors[];
  */
 #define OS_EXC_SYS_TICK                       15
 
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-/* *
- * @ingroup los_arch_interrupt
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg);
-#else
-/* *
- * @ingroup los_arch_interrupt
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
-#endif
-
 /* *
  * @ingroup  los_arch_interrupt
  * @brief: Hardware interrupt entry function.
@@ -345,25 +320,6 @@ extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
  */
 extern VOID HalInterrupt(VOID);
 
-/* *
- * @ingroup  los_arch_interrupt
- * @brief: Default vector handling function.
- *
- * @par Description:
- * This API is used to configure interrupt for null function.
- *
- * @attention:
- * <ul><li>None.</li></ul>
- *
- * @param:None.
- *
- * @retval:None.
- * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
- * @see None.
- */
-extern VOID HalHwiDefaultHandler(VOID);
-
 /* *
  * @ingroup  los_arch_interrupt
  * @brief: Reset the vector table.
@@ -403,17 +359,12 @@ extern VOID Reset_Handler(VOID);
  */
 extern VOID HalPendSV(VOID);
 
-
-#define OS_EXC_IN_INIT                      0
-#define OS_EXC_IN_TASK                      1
-#define OS_EXC_IN_HWI                       2
-
 #define OS_EXC_MAX_BUF_LEN                  25
 #define OS_EXC_MAX_NEST_DEPTH               1
+#define OS_EXC_FLAG_NO_FLOAT                0x10000000
 
 #define OS_NVIC_SHCSR                       0xE000ED24
 #define OS_NVIC_CCR                         0xE000ED14
-
 #define OS_NVIC_INT_ENABLE_SIZE             0x20
 #define OS_NVIC_INT_PRI_SIZE                0xF0
 #define OS_NVIC_EXCPRI_SIZE                 0xC
@@ -423,14 +374,6 @@ extern VOID HalPendSV(VOID);
 #define OS_NVIC_INT_PEND_SIZE               OS_NVIC_INT_ACT_SIZE
 #define OS_NVIC_INT_ACT_SIZE                OS_NVIC_INT_ENABLE_SIZE
 
-#define OS_EXC_FLAG_NO_FLOAT                0x10000000
-#define OS_EXC_FLAG_FAULTADDR_VALID         0x01
-#define OS_EXC_FLAG_IN_HWI                  0x02
-
-#define OS_EXC_IMPRECISE_ACCESS_ADDR        0xABABABAB
-
-#define OS_EXC_EVENT                        0x00000001
-
 /**
  * @ingroup los_exc
  * the struct of register files
@@ -503,7 +446,6 @@ typedef struct TagExcContext {
 
 typedef VOID (*EXC_PROC_FUNC)(UINT32, EXC_CONTEXT_S *);
 VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, UINT32 pid, EXC_CONTEXT_S *excBufAddr);
-
 VOID HalExcNMI(VOID);
 VOID HalExcHardFault(VOID);
 VOID HalExcMemFault(VOID);
@@ -668,7 +610,6 @@ typedef struct TagExcInfo {
 } ExcInfo;
 
 extern UINT32 g_curNestCount;
-extern UINT32 g_intCount;
 extern UINT8 g_uwExcTbl[32];
 extern ExcInfo g_excInfo;
 

arch/arm/cortex-m3/keil/los_interrupt.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -28,12 +28,10 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include "los_interrupt.h"
 #include <stdarg.h>
 #include "securec.h"
 #include "los_context.h"
 #include "los_arch_interrupt.h"
-#include "los_debug.h"
 #include "los_hook.h"
 #include "los_task.h"
 #include "los_sched.h"
@@ -43,95 +41,6 @@
 #include "los_cpup.h"
 #endif
 
-UINT32 g_intCount = 0;
-
-#ifdef __ICCARM__
-#pragma location = ".data.vector"
-#elif defined(__CC_ARM) || defined(__GNUC__)
-#pragma data_alignment = LOSCFG_ARCH_HWI_VECTOR_ALIGN
-LITE_OS_SEC_VEC
-#endif
-/* *
- * @ingroup los_hwi
- * Hardware interrupt form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC g_hwiForm[OS_VECTOR_CNT] = {0};
-
-#if (LOSCFG_DEBUG_TOOLS == 1)
-STATIC UINT32 g_hwiFormCnt[OS_HWI_MAX_NUM] = {0};
-STATIC CHAR *g_hwiFormName[OS_HWI_MAX_NUM] = {0};
-
-UINT32 OsGetHwiFormCnt(UINT32 index)
-{
-    return g_hwiFormCnt[index];
-}
-
-CHAR *OsGetHwiFormName(UINT32 index)
-{
-    return g_hwiFormName[index];
-}
-
-BOOL OsGetHwiCreated(UINT32 index)
-{
-    if (g_hwiForm[index] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return TRUE;
-    }
-
-    return FALSE;
-}
-#endif
-
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-
-typedef struct {
-    HWI_PROC_FUNC pfnHandler;
-    VOID *pParm;
-} HWI_HANDLER_FUNC;
-
-/* *
- * @ingroup los_hwi
- * Hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pfnHandler = vector;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pParm = arg;
-    }
-}
-
-#else
-/* *
- * @ingroup los_hwi
- * hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {0};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT] = vector;
-    }
-}
-#endif
-
-WEAK VOID SysTick_Handler(VOID)
-{
-    return;
-}
-
 /* ****************************************************************************
  Function    : HwiNumGet
  Description : Get an interrupt number
@@ -146,99 +55,54 @@ STATIC UINT32 HwiNumGet(VOID)
 
 STATIC UINT32 HwiUnmask(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_EnableIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiMask(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_DisableIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiSetPriority(HWI_HANDLE_T hwiNum, UINT8 priority)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (priority > OS_HWI_PRIO_LOWEST) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-
     NVIC_SetPriority((IRQn_Type)hwiNum, priority);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiPending(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_SetPendingIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiClear(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_ClearPendingIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
-HwiControllerOps g_archHwiOps = {
+STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
+{
+    HwiSetPriority(hwiNum, hwiPrio);
+    HwiUnmask(hwiNum);
+    return LOS_OK;
+}
+
+STATIC HwiControllerOps g_archHwiOps = {
     .enableIrq      = HwiUnmask,
     .disableIrq     = HwiMask,
     .setIrqPriority = HwiSetPriority,
     .getCurIrqNum   = HwiNumGet,
     .triggerIrq     = HwiPending,
     .clearIrq       = HwiClear,
+    .createIrq      = HwiCreate,
 };
 
-inline UINT32 ArchIsIntActive(VOID)
+HwiControllerOps *ArchIntOpsGet(VOID)
 {
-    return (g_intCount > 0);
-}
-/* ****************************************************************************
- Function    : HalHwiDefaultHandler
- Description : default handler of the hardware interrupt
- Input       : None
- Output      : None
- Return      : None
- **************************************************************************** */
-LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
-{
-    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());
-    while (1) {}
-}
-
-WEAK VOID HalPreInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
-}
-
-WEAK VOID HalAftInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
+    return &g_archHwiOps;
 }
 
 /* ****************************************************************************
@@ -297,97 +161,6 @@ LITE_OS_SEC_TEXT VOID HalInterrupt(VOID)
     LOS_IntRestore(intSave);
 }
 
-/* ****************************************************************************
- Function    : ArchHwiCreate
- Description : create hardware interrupt
- Input       : hwiNum   --- hwi num to create
-               hwiPrio  --- priority of the hwi
-               hwiMode  --- unused
-               hwiHandler --- hwi handler
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiCreate(HWI_HANDLE_T hwiNum,
-                                           HWI_PRIOR_T hwiPrio,
-                                           HWI_MODE_T hwiMode,
-                                           HWI_PROC_FUNC hwiHandler,
-                                           HwiIrqParam *irqParam)
-{
-    (VOID)hwiMode;
-    UINT32 intSave;
-
-    if (hwiHandler == NULL) {
-        return OS_ERRNO_HWI_PROC_FUNC_NULL;
-    }
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return OS_ERRNO_HWI_ALREADY_CREATED;
-    }
-
-    if (hwiPrio > OS_HWI_PRIO_LOWEST) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-
-    intSave = LOS_IntLock();
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-    if (irqParam != NULL) {
-        OsSetVector(hwiNum, hwiHandler, irqParam->pDevId);
-    } else {
-        OsSetVector(hwiNum, hwiHandler, NULL);
-    }
-#else
-    (VOID)irqParam;
-    OsSetVector(hwiNum, hwiHandler);
-#endif
-
-#if (LOSCFG_DEBUG_TOOLS == 1)
-    if ((irqParam != NULL) && (irqParam->pName != NULL)) {
-        g_hwiFormName[hwiNum + OS_SYS_VECTOR_CNT] = (CHAR *)irqParam->pName;
-    }
-    g_hwiFormCnt[hwiNum + OS_SYS_VECTOR_CNT] = 0;
-#endif
-
-    HwiUnmask((IRQn_Type)hwiNum);
-    HwiSetPriority((IRQn_Type)hwiNum, hwiPrio);
-
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
-/* ****************************************************************************
- Function    : ArchHwiDelete
- Description : Delete hardware interrupt
- Input       : hwiNum   --- hwi num to delete
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiDelete(HWI_HANDLE_T hwiNum, HwiIrqParam *irqParam)
-{
-    (VOID)irqParam;
-    UINT32 intSave;
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    HwiMask((IRQn_Type)hwiNum);
-
-    intSave = LOS_IntLock();
-
-    g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
-
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
 #define FAULT_STATUS_REG_BIT            32
 #define USGFAULT                        (1 << 18)
 #define BUSFAULT                        (1 << 17)
@@ -610,6 +383,11 @@ LITE_OS_SEC_TEXT_INIT VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, U
     ArchSysExit();
 }
 
+WEAK VOID SysTick_Handler(VOID)
+{
+    return;
+}
+
 /* ****************************************************************************
  Function    : HalHwiInit
  Description : initialization of the hardware interrupt
@@ -621,23 +399,24 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
     UINT32 index;
-    g_hwiForm[0] = 0;             /* [0] Top of Stack */
-    g_hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
+    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
+    hwiForm[0] = 0;             /* [0] Top of Stack */
+    hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
     for (index = 2; index < OS_VECTOR_CNT; index++) { /* 2: The starting position of the interrupt */
-        g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+        hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
     }
     /* Exception handler register */
-    g_hwiForm[NonMaskableInt_IRQn + OS_SYS_VECTOR_CNT]   = (HWI_PROC_FUNC)HalExcNMI;
-    g_hwiForm[HARDFAULT_IRQN + OS_SYS_VECTOR_CNT]        = (HWI_PROC_FUNC)HalExcHardFault;
-    g_hwiForm[MemoryManagement_IRQn + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalExcMemFault;
-    g_hwiForm[BusFault_IRQn + OS_SYS_VECTOR_CNT]         = (HWI_PROC_FUNC)HalExcBusFault;
-    g_hwiForm[UsageFault_IRQn + OS_SYS_VECTOR_CNT]       = (HWI_PROC_FUNC)HalExcUsageFault;
-    g_hwiForm[SVCall_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalExcSvcCall;
-    g_hwiForm[PendSV_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalPendSV;
-    g_hwiForm[SysTick_IRQn + OS_SYS_VECTOR_CNT]          = (HWI_PROC_FUNC)SysTick_Handler;
+    hwiForm[NonMaskableInt_IRQn + OS_SYS_VECTOR_CNT]   = (HWI_PROC_FUNC)HalExcNMI;
+    hwiForm[HARDFAULT_IRQN + OS_SYS_VECTOR_CNT]        = (HWI_PROC_FUNC)HalExcHardFault;
+    hwiForm[MemoryManagement_IRQn + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalExcMemFault;
+    hwiForm[BusFault_IRQn + OS_SYS_VECTOR_CNT]         = (HWI_PROC_FUNC)HalExcBusFault;
+    hwiForm[UsageFault_IRQn + OS_SYS_VECTOR_CNT]       = (HWI_PROC_FUNC)HalExcUsageFault;
+    hwiForm[SVCall_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalExcSvcCall;
+    hwiForm[PendSV_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalPendSV;
+    hwiForm[SysTick_IRQn + OS_SYS_VECTOR_CNT]          = (HWI_PROC_FUNC)SysTick_Handler;
 
     /* Interrupt vector table location */
-    SCB->VTOR = (UINT32)(UINTPTR)g_hwiForm;
+    SCB->VTOR = (UINT32)(UINTPTR)hwiForm;
 #endif
 #if (__CORTEX_M >= 0x03U) /* only for Cortex-M3 and above */
     NVIC_SetPriorityGrouping(OS_NVIC_AIRCR_PRIGROUP);
@@ -655,4 +434,3 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 
     return;
 }
-

arch/arm/cortex-m33/gcc/NTZ/los_arch_interrupt.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -32,9 +32,7 @@
 #ifndef _LOS_ARCH_INTERRUPT_H
 #define _LOS_ARCH_INTERRUPT_H
 
-#include "los_config.h"
-#include "los_compiler.h"
-#include "los_interrupt.h"
+#include "los_common_interrupt.h"
 
 #ifdef __cplusplus
 #if __cplusplus
@@ -42,14 +40,6 @@ extern "C" {
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
-/* *
- * @ingroup los_arch_interrupt
- * Maximum number of used hardware interrupts.
- */
-#ifndef OS_HWI_MAX_NUM
-#define OS_HWI_MAX_NUM                        LOSCFG_PLATFORM_HWI_LIMIT
-#endif
-
 /* *
  * @ingroup los_arch_interrupt
  * Highest priority of a hardware interrupt.
@@ -66,18 +56,17 @@ extern "C" {
 #define OS_HWI_PRIO_LOWEST                    7
 #endif
 
-
 /* *
- * @ingroup  los_arch_interrupt
- * Define the type of a hardware interrupt vector table function.
+ * @ingroup los_arch_interrupt
+ * AIRCR register priority group parameter .
  */
-typedef VOID (**HWI_VECTOR_FUNC)(void);
+#define OS_NVIC_AIRCR_PRIGROUP                7
 
 /* *
  * @ingroup los_arch_interrupt
- * Count of interrupts.
+ * Boot interrupt vector table.
  */
-extern UINT32 g_intCount;
+extern UINT32 _BootVectors[];
 
 /* *
  * @ingroup los_arch_interrupt
@@ -91,18 +80,6 @@ extern UINT32 g_intCount;
  */
 #define OS_VECTOR_CNT                         (OS_SYS_VECTOR_CNT + OS_HWI_MAX_NUM)
 
-/* *
- * @ingroup los_arch_interrupt
- * AIRCR register priority group parameter .
- */
-#define OS_NVIC_AIRCR_PRIGROUP                7
-
-/* *
- * @ingroup los_arch_interrupt
- * Boot interrupt vector table.
- */
-extern UINT32 _BootVectors[];
-
 /* *
  * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Invalid interrupt number.
@@ -110,7 +87,7 @@ extern UINT32 _BootVectors[];
  * Value: 0x02000900
  *
  * Solution: Ensure that the interrupt number is valid.
- * The value range of the interrupt number applicable for a Cortex-M33 platform is [OS_USER_HWI_MIN,OS_USER_HWI_MAX].
+ * The value range of the interrupt number applicable for a Cortex-M33  platform is [OS_USER_HWI_MIN,OS_USER_HWI_MAX].
  */
 #define OS_ERRNO_HWI_NUM_INVALID              LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x00)
 
@@ -186,6 +163,16 @@ extern UINT32 _BootVectors[];
  */
 #define OS_ERRNO_HWI_FASTMODE_ALREADY_CREATED LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x07)
 
+/* *
+ * @ingroup los_arch_interrupt
+ * Hardware interrupt error code: Invalid interrupt operation function.
+ *
+ * Value: 0x0200090c
+ *
+ * Solution: Set a valid interrupt operation function
+ */
+#define OS_ERRNO_HWI_OPS_FUNC_NULL            LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x0c)
+
 /* *
  * @ingroup los_arch_interrupt
  * SysTick control and status register.
@@ -312,20 +299,6 @@ extern UINT32 _BootVectors[];
  */
 #define OS_EXC_SYS_TICK                       15
 
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-/* *
- * @ingroup los_arch_interrupt
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg);
-#else
-/* *
- * @ingroup los_arch_interrupt
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
-#endif
-
 /* *
  * @ingroup  los_arch_interrupt
  * @brief: Hardware interrupt entry function.
@@ -345,25 +318,6 @@ extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
  */
 extern VOID HalInterrupt(VOID);
 
-/* *
- * @ingroup  los_arch_interrupt
- * @brief: Default vector handling function.
- *
- * @par Description:
- * This API is used to configure interrupt for null function.
- *
- * @attention:
- * <ul><li>None.</li></ul>
- *
- * @param:None.
- *
- * @retval:None.
- * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
- * @see None.
- */
-extern VOID HalHwiDefaultHandler(VOID);
-
 /* *
  * @ingroup  los_arch_interrupt
  * @brief: Reset the vector table.
@@ -403,34 +357,20 @@ extern VOID Reset_Handler(VOID);
  */
 extern VOID HalPendSV(VOID);
 
-
-#define OS_EXC_IN_INIT                      0
-#define OS_EXC_IN_TASK                      1
-#define OS_EXC_IN_HWI                       2
-
 #define OS_EXC_MAX_BUF_LEN                  25
 #define OS_EXC_MAX_NEST_DEPTH               1
+#define OS_EXC_FLAG_NO_FLOAT                0x10000000
 
 #define OS_NVIC_SHCSR                       0xE000ED24
 #define OS_NVIC_CCR                         0xE000ED14
-
 #define OS_NVIC_INT_ENABLE_SIZE             0x20
 #define OS_NVIC_INT_PRI_SIZE                0xF0
 #define OS_NVIC_EXCPRI_SIZE                 0xC
 #define OS_NVIC_INT_CTRL_SIZE               4
 #define OS_NVIC_SHCSR_SIZE                  4
-
 #define OS_NVIC_INT_PEND_SIZE               OS_NVIC_INT_ACT_SIZE
 #define OS_NVIC_INT_ACT_SIZE                OS_NVIC_INT_ENABLE_SIZE
 
-#define OS_EXC_FLAG_NO_FLOAT                0x10000000
-#define OS_EXC_FLAG_FAULTADDR_VALID         0x01
-#define OS_EXC_FLAG_IN_HWI                  0x02
-
-#define OS_EXC_IMPRECISE_ACCESS_ADDR        0xABABABAB
-
-#define OS_EXC_EVENT                        0x00000001
-
 /**
  * @ingroup los_exc
  * the struct of register files
@@ -503,7 +443,6 @@ typedef struct TagExcContext {
 
 typedef VOID (*EXC_PROC_FUNC)(UINT32, EXC_CONTEXT_S *);
 VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, UINT32 pid, EXC_CONTEXT_S *excBufAddr);
-
 VOID HalExcNMI(VOID);
 VOID HalExcHardFault(VOID);
 VOID HalExcMemFault(VOID);
@@ -667,10 +606,9 @@ typedef struct TagExcInfo {
     EXC_CONTEXT_S *context;
 } ExcInfo;
 
-extern UINT32 g_curNestCount;
-extern UINT32 g_intCount;
-extern UINT8 g_uwExcTbl[32];
 extern ExcInfo g_excInfo;
+extern UINT32 g_curNestCount;
+extern UINT8 g_uwExcTbl[32];
 
 #define MAX_INT_INFO_SIZE       (8 + 0x164)
 

arch/arm/cortex-m33/gcc/NTZ/los_interrupt.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -28,12 +28,10 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include "los_interrupt.h"
 #include <stdarg.h>
 #include "securec.h"
 #include "los_context.h"
 #include "los_arch_interrupt.h"
-#include "los_debug.h"
 #include "los_hook.h"
 #include "los_task.h"
 #include "los_sched.h"
@@ -44,84 +42,6 @@
 #endif
 
 #define DEF_HANDLER_START_INDEX 2
-UINT32 g_intCount = 0;
-
-
-/* *
- * @ingroup los_hwi
- * Hardware interrupt form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC __attribute__((aligned(LOSCFG_ARCH_HWI_VECTOR_ALIGN))) g_hwiForm[OS_VECTOR_CNT] = {0};
-
-#if (LOSCFG_DEBUG_TOOLS == 1)
-STATIC UINT32 g_hwiFormCnt[OS_HWI_MAX_NUM] = {0};
-STATIC CHAR *g_hwiFormName[OS_HWI_MAX_NUM] = {0};
-
-UINT32 OsGetHwiFormCnt(UINT32 index)
-{
-    return g_hwiFormCnt[index];
-}
-
-CHAR *OsGetHwiFormName(UINT32 index)
-{
-    return g_hwiFormName[index];
-}
-
-BOOL OsGetHwiCreated(UINT32 index)
-{
-    if (g_hwiForm[index] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return TRUE;
-    }
-
-    return FALSE;
-}
-#endif
-
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-
-typedef struct {
-    HWI_PROC_FUNC pfnHandler;
-    VOID *pParm;
-} HWI_HANDLER_FUNC;
-
-/* *
- * @ingroup los_hwi
- * Hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pfnHandler = vector;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pParm = arg;
-    }
-}
-
-#else
-/* *
- * @ingroup los_hwi
- * hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {0};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT] = vector;
-    }
-}
-#endif
 
 /* ****************************************************************************
  Function    : HwiNumGet
@@ -137,99 +57,54 @@ STATIC UINT32 HwiNumGet(VOID)
 
 STATIC UINT32 HwiUnmask(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_EnableIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiMask(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_DisableIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiSetPriority(HWI_HANDLE_T hwiNum, UINT8 priority)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (priority > OS_HWI_PRIO_LOWEST) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-
     NVIC_SetPriority((IRQn_Type)hwiNum, priority);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiPending(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_SetPendingIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiClear(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_ClearPendingIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
-HwiControllerOps g_archHwiOps = {
+STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
+{
+    HwiSetPriority(hwiNum, hwiPrio);
+    HwiUnmask(hwiNum);
+    return LOS_OK;
+}
+
+STATIC HwiControllerOps g_archHwiOps = {
     .enableIrq      = HwiUnmask,
     .disableIrq     = HwiMask,
     .setIrqPriority = HwiSetPriority,
     .getCurIrqNum   = HwiNumGet,
     .triggerIrq     = HwiPending,
     .clearIrq       = HwiClear,
+    .createIrq      = HwiCreate,
 };
 
-inline UINT32 ArchIsIntActive(VOID)
+HwiControllerOps *ArchIntOpsGet(VOID)
 {
-    return (g_intCount > 0);
-}
-/* ****************************************************************************
- Function    : HalHwiDefaultHandler
- Description : default handler of the hardware interrupt
- Input       : None
- Output      : None
- Return      : None
- **************************************************************************** */
-LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
-{
-    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());
-    while (1) {}
-}
-
-WEAK VOID HalPreInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
-}
-
-WEAK VOID HalAftInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
+    return &g_archHwiOps;
 }
 
 /* ****************************************************************************
@@ -288,97 +163,6 @@ LITE_OS_SEC_TEXT VOID HalInterrupt(VOID)
     LOS_IntRestore(intSave);
 }
 
-/* ****************************************************************************
- Function    : ArchHwiCreate
- Description : create hardware interrupt
- Input       : hwiNum   --- hwi num to create
-               hwiPrio  --- priority of the hwi
-               hwiMode  --- unused
-               hwiHandler --- hwi handler
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiCreate(HWI_HANDLE_T hwiNum,
-                                           HWI_PRIOR_T hwiPrio,
-                                           HWI_MODE_T hwiMode,
-                                           HWI_PROC_FUNC hwiHandler,
-                                           HwiIrqParam *irqParam)
-{
-    (VOID)hwiMode;
-    UINT32 intSave;
-
-    if (hwiHandler == NULL) {
-        return OS_ERRNO_HWI_PROC_FUNC_NULL;
-    }
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return OS_ERRNO_HWI_ALREADY_CREATED;
-    }
-
-    if (hwiPrio > OS_HWI_PRIO_LOWEST) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-
-    intSave = LOS_IntLock();
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-    if (irqParam != NULL) {
-        OsSetVector(hwiNum, hwiHandler, irqParam->pDevId);
-    } else {
-        OsSetVector(hwiNum, hwiHandler, NULL);
-    }
-#else
-    (VOID)irqParam;
-    OsSetVector(hwiNum, hwiHandler);
-#endif
-
-#if (LOSCFG_DEBUG_TOOLS == 1)
-    if ((irqParam != NULL) && (irqParam->pName != NULL)) {
-        g_hwiFormName[hwiNum + OS_SYS_VECTOR_CNT] = (CHAR *)irqParam->pName;
-    }
-    g_hwiFormCnt[hwiNum + OS_SYS_VECTOR_CNT] = 0;
-#endif
-
-    HwiUnmask((IRQn_Type)hwiNum);
-    HwiSetPriority((IRQn_Type)hwiNum, hwiPrio);
-
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
-/* ****************************************************************************
- Function    : ArchHwiDelete
- Description : Delete hardware interrupt
- Input       : hwiNum   --- hwi num to delete
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiDelete(HWI_HANDLE_T hwiNum, HwiIrqParam *irqParam)
-{
-    (VOID)irqParam;
-    UINT32 intSave;
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    HwiMask((IRQn_Type)hwiNum);
-
-    intSave = LOS_IntLock();
-
-    g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
-
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
 #define FAULT_STATUS_REG_BIT            32
 #define USGFAULT                        (1 << 18)
 #define BUSFAULT                        (1 << 17)
@@ -612,23 +396,24 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
     UINT32 index;
-    g_hwiForm[0] = 0;             /* [0] Top of Stack */
-    g_hwiForm[1] = 0; /* [1] reset */
+    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
+    hwiForm[0] = 0;             /* [0] Top of Stack */
+    hwiForm[1] = 0; /* [1] reset */
     for (index = DEF_HANDLER_START_INDEX; index < OS_VECTOR_CNT; index++) {
-        g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+        hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
     }
     /* Exception handler register */
-    g_hwiForm[NonMaskableInt_IRQn + OS_SYS_VECTOR_CNT]   = (HWI_PROC_FUNC)HalExcNMI;
-    g_hwiForm[HARDFAULT_IRQN + OS_SYS_VECTOR_CNT]        = (HWI_PROC_FUNC)HalExcHardFault;
-    g_hwiForm[MemoryManagement_IRQn + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalExcMemFault;
-    g_hwiForm[BusFault_IRQn + OS_SYS_VECTOR_CNT]         = (HWI_PROC_FUNC)HalExcBusFault;
-    g_hwiForm[UsageFault_IRQn + OS_SYS_VECTOR_CNT]       = (HWI_PROC_FUNC)HalExcUsageFault;
-    g_hwiForm[SVCall_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalSVCHandler;
-    g_hwiForm[PendSV_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalPendSV;
-    g_hwiForm[SysTick_IRQn + OS_SYS_VECTOR_CNT]          = (HWI_PROC_FUNC)OsTickHandler;
+    hwiForm[NonMaskableInt_IRQn + OS_SYS_VECTOR_CNT]   = (HWI_PROC_FUNC)HalExcNMI;
+    hwiForm[HARDFAULT_IRQN + OS_SYS_VECTOR_CNT]        = (HWI_PROC_FUNC)HalExcHardFault;
+    hwiForm[MemoryManagement_IRQn + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalExcMemFault;
+    hwiForm[BusFault_IRQn + OS_SYS_VECTOR_CNT]         = (HWI_PROC_FUNC)HalExcBusFault;
+    hwiForm[UsageFault_IRQn + OS_SYS_VECTOR_CNT]       = (HWI_PROC_FUNC)HalExcUsageFault;
+    hwiForm[SVCall_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalSVCHandler;
+    hwiForm[PendSV_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalPendSV;
+    hwiForm[SysTick_IRQn + OS_SYS_VECTOR_CNT]          = (HWI_PROC_FUNC)OsTickHandler;
 
     /* Interrupt vector table location */
-    SCB->VTOR = (UINT32)(UINTPTR)g_hwiForm;
+    SCB->VTOR = (UINT32)(UINTPTR)hwiForm;
 #endif
 #if (__CORTEX_M >= 0x03U) /* only for Cortex-M3 and above */
     NVIC_SetPriorityGrouping(OS_NVIC_AIRCR_PRIGROUP);
@@ -646,4 +431,3 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 
     return;
 }
-

arch/arm/cortex-m33/gcc/TZ/non_secure/los_arch_interrupt.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -32,9 +32,7 @@
 #ifndef _LOS_ARCH_INTERRUPT_H
 #define _LOS_ARCH_INTERRUPT_H
 
-#include "los_config.h"
-#include "los_compiler.h"
-#include "los_interrupt.h"
+#include "los_common_interrupt.h"
 
 #ifdef __cplusplus
 #if __cplusplus
@@ -42,14 +40,6 @@ extern "C" {
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
-/* *
- * @ingroup los_arch_interrupt
- * Maximum number of used hardware interrupts.
- */
-#ifndef OS_HWI_MAX_NUM
-#define OS_HWI_MAX_NUM                        LOSCFG_PLATFORM_HWI_LIMIT
-#endif
-
 /* *
  * @ingroup los_arch_interrupt
  * Highest priority of a hardware interrupt.
@@ -66,18 +56,17 @@ extern "C" {
 #define OS_HWI_PRIO_LOWEST                    7
 #endif
 
-
 /* *
- * @ingroup  los_arch_interrupt
- * Define the type of a hardware interrupt vector table function.
+ * @ingroup los_arch_interrupt
+ * AIRCR register priority group parameter .
  */
-typedef VOID (**HWI_VECTOR_FUNC)(void);
+#define OS_NVIC_AIRCR_PRIGROUP                7
 
 /* *
  * @ingroup los_arch_interrupt
- * Count of interrupts.
+ * Boot interrupt vector table.
  */
-extern UINT32 g_intCount;
+extern UINT32 _BootVectors[];
 
 /* *
  * @ingroup los_arch_interrupt
@@ -91,18 +80,6 @@ extern UINT32 g_intCount;
  */
 #define OS_VECTOR_CNT                         (OS_SYS_VECTOR_CNT + OS_HWI_MAX_NUM)
 
-/* *
- * @ingroup los_arch_interrupt
- * AIRCR register priority group parameter .
- */
-#define OS_NVIC_AIRCR_PRIGROUP                7
-
-/* *
- * @ingroup los_arch_interrupt
- * Boot interrupt vector table.
- */
-extern UINT32 _BootVectors[];
-
 /* *
  * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Invalid interrupt number.
@@ -110,7 +87,7 @@ extern UINT32 _BootVectors[];
  * Value: 0x02000900
  *
  * Solution: Ensure that the interrupt number is valid.
- * The value range of the interrupt number applicable for a Cortex-M33 platform is [OS_USER_HWI_MIN,OS_USER_HWI_MAX].
+ * The value range of the interrupt number applicable for a Cortex-M33  platform is [OS_USER_HWI_MIN,OS_USER_HWI_MAX].
  */
 #define OS_ERRNO_HWI_NUM_INVALID              LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x00)
 
@@ -186,6 +163,16 @@ extern UINT32 _BootVectors[];
  */
 #define OS_ERRNO_HWI_FASTMODE_ALREADY_CREATED LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x07)
 
+/* *
+ * @ingroup los_arch_interrupt
+ * Hardware interrupt error code: Invalid interrupt operation function.
+ *
+ * Value: 0x0200090c
+ *
+ * Solution: Set a valid interrupt operation function
+ */
+#define OS_ERRNO_HWI_OPS_FUNC_NULL            LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x0c)
+
 /* *
  * @ingroup los_arch_interrupt
  * SysTick control and status register.
@@ -312,20 +299,6 @@ extern UINT32 _BootVectors[];
  */
 #define OS_EXC_SYS_TICK                       15
 
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-/* *
- * @ingroup los_arch_interrupt
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg);
-#else
-/* *
- * @ingroup los_arch_interrupt
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
-#endif
-
 /* *
  * @ingroup  los_arch_interrupt
  * @brief: Hardware interrupt entry function.
@@ -345,25 +318,6 @@ extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
  */
 extern VOID HalInterrupt(VOID);
 
-/* *
- * @ingroup  los_arch_interrupt
- * @brief: Default vector handling function.
- *
- * @par Description:
- * This API is used to configure interrupt for null function.
- *
- * @attention:
- * <ul><li>None.</li></ul>
- *
- * @param:None.
- *
- * @retval:None.
- * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
- * @see None.
- */
-extern VOID HalHwiDefaultHandler(VOID);
-
 /* *
  * @ingroup  los_arch_interrupt
  * @brief: Reset the vector table.
@@ -403,34 +357,20 @@ extern VOID Reset_Handler(VOID);
  */
 extern VOID HalPendSV(VOID);
 
-
-#define OS_EXC_IN_INIT                      0
-#define OS_EXC_IN_TASK                      1
-#define OS_EXC_IN_HWI                       2
-
 #define OS_EXC_MAX_BUF_LEN                  25
 #define OS_EXC_MAX_NEST_DEPTH               1
+#define OS_EXC_FLAG_NO_FLOAT                0x10000000
 
 #define OS_NVIC_SHCSR                       0xE000ED24
 #define OS_NVIC_CCR                         0xE000ED14
-
 #define OS_NVIC_INT_ENABLE_SIZE             0x20
 #define OS_NVIC_INT_PRI_SIZE                0xF0
 #define OS_NVIC_EXCPRI_SIZE                 0xC
 #define OS_NVIC_INT_CTRL_SIZE               4
 #define OS_NVIC_SHCSR_SIZE                  4
-
 #define OS_NVIC_INT_PEND_SIZE               OS_NVIC_INT_ACT_SIZE
 #define OS_NVIC_INT_ACT_SIZE                OS_NVIC_INT_ENABLE_SIZE
 
-#define OS_EXC_FLAG_NO_FLOAT                0x10000000
-#define OS_EXC_FLAG_FAULTADDR_VALID         0x01
-#define OS_EXC_FLAG_IN_HWI                  0x02
-
-#define OS_EXC_IMPRECISE_ACCESS_ADDR        0xABABABAB
-
-#define OS_EXC_EVENT                        0x00000001
-
 /**
  * @ingroup los_exc
  * the struct of register files
@@ -503,7 +443,6 @@ typedef struct TagExcContext {
 
 typedef VOID (*EXC_PROC_FUNC)(UINT32, EXC_CONTEXT_S *);
 VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, UINT32 pid, EXC_CONTEXT_S *excBufAddr);
-
 VOID HalExcNMI(VOID);
 VOID HalExcHardFault(VOID);
 VOID HalExcMemFault(VOID);
@@ -667,10 +606,9 @@ typedef struct TagExcInfo {
     EXC_CONTEXT_S *context;
 } ExcInfo;
 
-extern UINT32 g_curNestCount;
-extern UINT32 g_intCount;
-extern UINT8 g_uwExcTbl[32];
 extern ExcInfo g_excInfo;
+extern UINT32 g_curNestCount;
+extern UINT8 g_uwExcTbl[32];
 
 #define MAX_INT_INFO_SIZE       (8 + 0x164)
 

arch/arm/cortex-m33/gcc/TZ/non_secure/los_interrupt.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -28,12 +28,10 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include "los_interrupt.h"
 #include <stdarg.h>
 #include "securec.h"
 #include "los_context.h"
 #include "los_arch_interrupt.h"
-#include "los_debug.h"
 #include "los_hook.h"
 #include "los_task.h"
 #include "los_sched.h"
@@ -44,83 +42,6 @@
 #endif
 
 #define DEF_HANDLER_START_INDEX 2
-UINT32 g_intCount = 0;
-
-/* *
- * @ingroup los_hwi
- * Hardware interrupt form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC __attribute__((aligned(LOSCFG_ARCH_HWI_VECTOR_ALIGN))) g_hwiForm[OS_VECTOR_CNT] = {0};
-
-#if (LOSCFG_DEBUG_TOOLS == 1)
-STATIC UINT32 g_hwiFormCnt[OS_HWI_MAX_NUM] = {0};
-STATIC CHAR *g_hwiFormName[OS_HWI_MAX_NUM] = {0};
-
-UINT32 OsGetHwiFormCnt(UINT32 index)
-{
-    return g_hwiFormCnt[index];
-}
-
-CHAR *OsGetHwiFormName(UINT32 index)
-{
-    return g_hwiFormName[index];
-}
-
-BOOL OsGetHwiCreated(UINT32 index)
-{
-    if (g_hwiForm[index] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return TRUE;
-    }
-
-    return FALSE;
-}
-#endif
-
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-
-typedef struct {
-    HWI_PROC_FUNC pfnHandler;
-    VOID *pParm;
-} HWI_HANDLER_FUNC;
-
-/* *
- * @ingroup los_hwi
- * Hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pfnHandler = vector;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pParm = arg;
-    }
-}
-
-#else
-/* *
- * @ingroup los_hwi
- * hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {0};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT] = vector;
-    }
-}
-#endif
 
 /* ****************************************************************************
  Function    : HwiNumGet
@@ -136,100 +57,54 @@ STATIC UINT32 HwiNumGet(VOID)
 
 STATIC UINT32 HwiUnmask(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_EnableIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiMask(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_DisableIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiSetPriority(HWI_HANDLE_T hwiNum, UINT8 priority)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (priority > OS_HWI_PRIO_LOWEST) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-
     NVIC_SetPriority((IRQn_Type)hwiNum, priority);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiPending(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_SetPendingIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiClear(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_ClearPendingIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
-HwiControllerOps g_archHwiOps = {
+STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
+{
+    HwiSetPriority(hwiNum, hwiPrio);
+    HwiUnmask(hwiNum);
+    return LOS_OK;
+}
+
+STATIC HwiControllerOps g_archHwiOps = {
     .enableIrq      = HwiUnmask,
     .disableIrq     = HwiMask,
     .setIrqPriority = HwiSetPriority,
     .getCurIrqNum   = HwiNumGet,
     .triggerIrq     = HwiPending,
     .clearIrq       = HwiClear,
+    .createIrq      = HwiCreate,
 };
 
-inline UINT32 ArchIsIntActive(VOID)
+HwiControllerOps *ArchIntOpsGet(VOID)
 {
-    return (g_intCount > 0);
-}
-/* ****************************************************************************
- Function    : HalHwiDefaultHandler
- Description : default handler of the hardware interrupt
- Input       : None
- Output      : None
- Return      : None
- **************************************************************************** */
-/*lint -e529*/
-LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
-{
-    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());
-    while (1) {}
-}
-
-WEAK VOID HalPreInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
-}
-
-WEAK VOID HalAftInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
+    return &g_archHwiOps;
 }
 
 /* ****************************************************************************
@@ -288,97 +163,6 @@ LITE_OS_SEC_TEXT VOID HalInterrupt(VOID)
     LOS_IntRestore(intSave);
 }
 
-/* ****************************************************************************
- Function    : ArchHwiCreate
- Description : create hardware interrupt
- Input       : hwiNum   --- hwi num to create
-               hwiPrio  --- priority of the hwi
-               hwiMode  --- unused
-               hwiHandler --- hwi handler
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiCreate(HWI_HANDLE_T hwiNum,
-                                           HWI_PRIOR_T hwiPrio,
-                                           HWI_MODE_T hwiMode,
-                                           HWI_PROC_FUNC hwiHandler,
-                                           HwiIrqParam *irqParam)
-{
-    (VOID)hwiMode;
-    UINT32 intSave;
-
-    if (hwiHandler == NULL) {
-        return OS_ERRNO_HWI_PROC_FUNC_NULL;
-    }
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return OS_ERRNO_HWI_ALREADY_CREATED;
-    }
-
-    if (hwiPrio > OS_HWI_PRIO_LOWEST) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-
-    intSave = LOS_IntLock();
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-    if (irqParam != NULL) {
-        OsSetVector(hwiNum, hwiHandler, irqParam->pDevId);
-    } else {
-        OsSetVector(hwiNum, hwiHandler, NULL);
-    }
-#else
-    (VOID)irqParam;
-    OsSetVector(hwiNum, hwiHandler);
-#endif
-
-#if (LOSCFG_DEBUG_TOOLS == 1)
-    if ((irqParam != NULL) && (irqParam->pName != NULL)) {
-        g_hwiFormName[hwiNum + OS_SYS_VECTOR_CNT] = (CHAR *)irqParam->pName;
-    }
-    g_hwiFormCnt[hwiNum + OS_SYS_VECTOR_CNT] = 0;
-#endif
-
-    HwiUnmask((IRQn_Type)hwiNum);
-    HwiSetPriority((IRQn_Type)hwiNum, hwiPrio);
-
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
-/* ****************************************************************************
- Function    : ArchHwiDelete
- Description : Delete hardware interrupt
- Input       : hwiNum   --- hwi num to delete
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiDelete(HWI_HANDLE_T hwiNum, HwiIrqParam *irqParam)
-{
-    (VOID)irqParam;
-    UINT32 intSave;
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    NVIC_DisableIRQ((IRQn_Type)hwiNum);
-
-    intSave = LOS_IntLock();
-
-    g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
-
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
 #define FAULT_STATUS_REG_BIT            32
 #define USGFAULT                        (1 << 18)
 #define BUSFAULT                        (1 << 17)
@@ -612,23 +396,24 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
     UINT32 index;
-    g_hwiForm[0] = 0; /* [0] Top of Stack */
-    g_hwiForm[1] = 0; /* [1] reset */
+    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
+    hwiForm[0] = 0; /* [0] Top of Stack */
+    hwiForm[1] = 0; /* [1] reset */
     for (index = DEF_HANDLER_START_INDEX; index < OS_VECTOR_CNT; index++) {
-        g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+        hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
     }
     /* Exception handler register */
-    g_hwiForm[NonMaskableInt_IRQn + OS_SYS_VECTOR_CNT]   = (HWI_PROC_FUNC)HalExcNMI;
-    g_hwiForm[HARDFAULT_IRQN + OS_SYS_VECTOR_CNT]        = (HWI_PROC_FUNC)HalExcHardFault;
-    g_hwiForm[MemoryManagement_IRQn + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalExcMemFault;
-    g_hwiForm[BusFault_IRQn + OS_SYS_VECTOR_CNT]         = (HWI_PROC_FUNC)HalExcBusFault;
-    g_hwiForm[UsageFault_IRQn + OS_SYS_VECTOR_CNT]       = (HWI_PROC_FUNC)HalExcUsageFault;
-    g_hwiForm[SVCall_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalSVCHandler;
-    g_hwiForm[PendSV_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalPendSV;
-    g_hwiForm[SysTick_IRQn + OS_SYS_VECTOR_CNT]          = (HWI_PROC_FUNC)OsTickHandler;
+    hwiForm[NonMaskableInt_IRQn + OS_SYS_VECTOR_CNT]   = (HWI_PROC_FUNC)HalExcNMI;
+    hwiForm[HARDFAULT_IRQN + OS_SYS_VECTOR_CNT]        = (HWI_PROC_FUNC)HalExcHardFault;
+    hwiForm[MemoryManagement_IRQn + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalExcMemFault;
+    hwiForm[BusFault_IRQn + OS_SYS_VECTOR_CNT]         = (HWI_PROC_FUNC)HalExcBusFault;
+    hwiForm[UsageFault_IRQn + OS_SYS_VECTOR_CNT]       = (HWI_PROC_FUNC)HalExcUsageFault;
+    hwiForm[SVCall_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalSVCHandler;
+    hwiForm[PendSV_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalPendSV;
+    hwiForm[SysTick_IRQn + OS_SYS_VECTOR_CNT]          = (HWI_PROC_FUNC)OsTickHandler;
 
     /* Interrupt vector table location */
-    SCB->VTOR = (UINT32)(UINTPTR)g_hwiForm;
+    SCB->VTOR = (UINT32)(UINTPTR)hwiForm;
 #endif
 #if (__CORTEX_M >= 0x03U) /* only for Cortex-M3 and above */
     NVIC_SetPriorityGrouping(OS_NVIC_AIRCR_PRIGROUP);
@@ -646,4 +431,3 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 
     return;
 }
-

arch/arm/cortex-m33/iar/NTZ/los_arch_interrupt.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -29,12 +29,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LOS_EXC_H
-#define _LOS_EXC_H
+#ifndef _LOS_ARCH_INTERRUPT_H
+#define _LOS_ARCH_INTERRUPT_H
 
-#include "los_config.h"
-#include "los_compiler.h"
-#include "los_interrupt.h"
+#include "los_common_interrupt.h"
 
 #ifdef __cplusplus
 #if __cplusplus
@@ -43,15 +41,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 /* *
- * @ingroup los_hwi
- * Maximum number of used hardware interrupts.
- */
-#ifndef OS_HWI_MAX_NUM
-#define OS_HWI_MAX_NUM                        LOSCFG_PLATFORM_HWI_LIMIT
-#endif
-
-/* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Highest priority of a hardware interrupt.
  */
 #ifndef OS_HWI_PRIO_HIGHEST
@@ -59,63 +49,50 @@ extern "C" {
 #endif
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Lowest priority of a hardware interrupt.
  */
 #ifndef OS_HWI_PRIO_LOWEST
 #define OS_HWI_PRIO_LOWEST                    7
 #endif
 
-
 /* *
- * @ingroup  los_hwi
- * Define the type of a hardware interrupt vector table function.
- */
-typedef VOID (**HWI_VECTOR_FUNC)(void);
-
-/* *
- * @ingroup los_hwi
- * Count of interrupts.
- */
-extern UINT32 g_intCount;
-
-/* *
- * @ingroup los_hwi
- * Count of M-Core system interrupt vector.
- */
-#define OS_SYS_VECTOR_CNT                     16
-
-/* *
- * @ingroup los_hwi
- * Count of M-Core interrupt vector.
- */
-#define OS_VECTOR_CNT                         (OS_SYS_VECTOR_CNT + OS_HWI_MAX_NUM)
-
-/* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * AIRCR register priority group parameter .
  */
 #define OS_NVIC_AIRCR_PRIGROUP                7
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Boot interrupt vector table.
  */
 extern UINT32 _BootVectors[];
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
+ * Count of M-Core system interrupt vector.
+ */
+#define OS_SYS_VECTOR_CNT                     16
+
+/* *
+ * @ingroup los_arch_interrupt
+ * Count of M-Core interrupt vector.
+ */
+#define OS_VECTOR_CNT                         (OS_SYS_VECTOR_CNT + OS_HWI_MAX_NUM)
+
+/* *
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Invalid interrupt number.
  *
  * Value: 0x02000900
  *
  * Solution: Ensure that the interrupt number is valid.
- * The value range of the interrupt number applicable for a Cortex-M33 platform is [OS_USER_HWI_MIN,OS_USER_HWI_MAX].
+ * The value range of the interrupt number applicable for a Cortex-M33  platform is [OS_USER_HWI_MIN,OS_USER_HWI_MAX].
  */
 #define OS_ERRNO_HWI_NUM_INVALID              LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x00)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Null hardware interrupt handling function.
  *
  * Value: 0x02000901
@@ -125,7 +102,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_PROC_FUNC_NULL           LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x01)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Insufficient interrupt resources for hardware interrupt creation.
  *
  * Value: 0x02000902
@@ -135,7 +112,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_CB_UNAVAILABLE           LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x02)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Insufficient memory for hardware interrupt initialization.
  *
  * Value: 0x02000903
@@ -145,7 +122,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_NO_MEMORY                LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x03)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: The interrupt has already been created.
  *
  * Value: 0x02000904
@@ -155,7 +132,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_ALREADY_CREATED          LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x04)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Invalid interrupt priority.
  *
  * Value: 0x02000905
@@ -166,7 +143,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_PRIO_INVALID             LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x05)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Incorrect interrupt creation mode.
  *
  * Value: 0x02000906
@@ -177,7 +154,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_MODE_INVALID             LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x06)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: The interrupt has already been created as a fast interrupt.
  *
  * Value: 0x02000907
@@ -187,7 +164,17 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_FASTMODE_ALREADY_CREATED LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x07)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
+ * Hardware interrupt error code: Invalid interrupt operation function.
+ *
+ * Value: 0x0200090c
+ *
+ * Solution: Set a valid interrupt operation function
+ */
+#define OS_ERRNO_HWI_OPS_FUNC_NULL            LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x0c)
+
+/* *
+ * @ingroup los_arch_interrupt
  * SysTick control and status register.
  */
 #define OS_SYSTICK_CONTROL_REG                0xE000E010
@@ -199,133 +186,119 @@ extern UINT32 _BootVectors[];
 #define OS_SYSTICK_CURRENT_REG                0xE000E018
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt Priority-Level Registers.
  */
 #define OS_NVIC_PRI_BASE                      0xE000E400
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt enable register for 0-31.
  */
 #define OS_NVIC_SETENA_BASE                   0xE000E100
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * interrupt pending register.
  */
 #define OS_NVIC_SETPEND_BASE                  0xE000E200
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt active register.
  */
 #define OS_NVIC_INT_ACT_BASE                  0xE000E300
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt disable register for 0-31.
  */
 #define OS_NVIC_CLRENA_BASE                   0xE000E180
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt control and status register.
  */
 #define OS_NVIC_INT_CTRL                      0xE000ED04
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Vector table offset register.
  */
 #define OS_NVIC_VTOR                          0xE000ED08
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Application interrupt and reset control register
  */
 #define OS_NVIC_AIRCR                         0xE000ED0C
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * System exception priority register.
  */
 #define OS_NVIC_EXCPRI_BASE                   0xE000ED18
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 1 :reset.
  */
 #define OS_EXC_RESET                          1
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 2 :Non-Maskable Interrupt.
  */
 #define OS_EXC_NMI                            2
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 3 :(hard)fault.
  */
 #define OS_EXC_HARD_FAULT                     3
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 4 :MemManage fault.
  */
 #define OS_EXC_MPU_FAULT                      4
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 5 :Bus fault.
  */
 #define OS_EXC_BUS_FAULT                      5
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 6 :Usage fault.
  */
 #define OS_EXC_USAGE_FAULT                    6
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 11 :SVCall.
  */
 #define OS_EXC_SVC_CALL                       11
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 12 :Debug monitor.
  */
 #define OS_EXC_DBG_MONITOR                    12
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 14 :PendSV.
  */
 #define OS_EXC_PEND_SV                        14
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 15 :SysTick.
  */
 #define OS_EXC_SYS_TICK                       15
 
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg);
-#else
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
-#endif
-
 /* *
  * @ingroup  los_hwi
  * @brief: Hardware interrupt entry function.
@@ -346,27 +319,7 @@ extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
 extern VOID HalInterrupt(VOID);
 
 /* *
- * @ingroup  los_hwi
- * @brief: Default vector handling function.
- *
- * @par Description:
- * This API is used to configure interrupt for null function.
- *
- * @attention:
- * <ul><li>None.</li></ul>
- *
- * @param:None.
- *
- * @retval:None.
- * @par Dependency:
- * <ul><li>los_hwi.h: the header file that contains the API declaration.</li
-></ul>
- * @see None.
- */
-extern VOID HalHwiDefaultHandler(VOID);
-
-/* *
- * @ingroup  los_hwi
+ * @ingroup  los_arch_interrupt
  * @brief: Reset the vector table.
  *
  * @par Description:
@@ -379,13 +332,13 @@ extern VOID HalHwiDefaultHandler(VOID);
  *
  * @retval:None.
  * @par Dependency:
- * <ul><li>los_hwi.h: the header file that contains the API declaration.</li></ul>
+ * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
  * @see None.
  */
 extern VOID Reset_Handler(VOID);
 
 /* *
- * @ingroup  los_hwi
+ * @ingroup  los_arch_interrupt
  * @brief: Pended System Call.
  *
  * @par Description:
@@ -399,39 +352,25 @@ extern VOID Reset_Handler(VOID);
  *
  * @retval:None.
  * @par Dependency:
- * <ul><li>los_hwi.h: the header file that contains the API declaration.</li></ul>
+ * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
  * @see None.
  */
 extern VOID HalPendSV(VOID);
 
-
-#define OS_EXC_IN_INIT                      0
-#define OS_EXC_IN_TASK                      1
-#define OS_EXC_IN_HWI                       2
-
 #define OS_EXC_MAX_BUF_LEN                  25
 #define OS_EXC_MAX_NEST_DEPTH               1
+#define OS_EXC_FLAG_NO_FLOAT                0x10000000
 
 #define OS_NVIC_SHCSR                       0xE000ED24
 #define OS_NVIC_CCR                         0xE000ED14
-
 #define OS_NVIC_INT_ENABLE_SIZE             0x20
 #define OS_NVIC_INT_PRI_SIZE                0xF0
 #define OS_NVIC_EXCPRI_SIZE                 0xC
 #define OS_NVIC_INT_CTRL_SIZE               4
 #define OS_NVIC_SHCSR_SIZE                  4
-
 #define OS_NVIC_INT_PEND_SIZE               OS_NVIC_INT_ACT_SIZE
 #define OS_NVIC_INT_ACT_SIZE                OS_NVIC_INT_ENABLE_SIZE
 
-#define OS_EXC_FLAG_NO_FLOAT                0x10000000
-#define OS_EXC_FLAG_FAULTADDR_VALID         0x01
-#define OS_EXC_FLAG_IN_HWI                  0x02
-
-#define OS_EXC_IMPRECISE_ACCESS_ADDR        0xABABABAB
-
-#define OS_EXC_EVENT                        0x00000001
-
 /**
  * @ingroup los_exc
  * the struct of register files
@@ -500,11 +439,10 @@ typedef struct TagExcContext {
     UINT32 FPSCR;
     UINT32 NO_NAME;
 #endif
-}EXC_CONTEXT_S;
+} EXC_CONTEXT_S;
 
 typedef VOID (*EXC_PROC_FUNC)(UINT32, EXC_CONTEXT_S *);
 VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, UINT32 pid, EXC_CONTEXT_S *excBufAddr);
-
 VOID HalExcNMI(VOID);
 VOID HalExcHardFault(VOID);
 VOID HalExcMemFault(VOID);
@@ -645,7 +583,7 @@ VOID HalHwiInit(VOID);
  * @ingroup los_exc
  * Exception information structure
  *
- * Description: Exception information saved when an exception is triggered on the Cortex-M4 platform.
+ * Description: Exception information saved when an exception is triggered on the Cortex-M33 platform.
  *
  */
 typedef struct TagExcInfo {
@@ -668,10 +606,9 @@ typedef struct TagExcInfo {
     EXC_CONTEXT_S *context;
 } ExcInfo;
 
-extern UINT32 g_curNestCount;
-extern UINT32 g_intCount;
-extern UINT8 g_uwExcTbl[32];
 extern ExcInfo g_excInfo;
+extern UINT32 g_curNestCount;
+extern UINT8 g_uwExcTbl[32];
 
 #define MAX_INT_INFO_SIZE       (8 + 0x164)
 
@@ -681,4 +618,4 @@ extern ExcInfo g_excInfo;
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
-#endif /* _LOS_EXC_H */
+#endif /* _LOS_ARCH_INTERRUPT_H */

arch/arm/cortex-m33/iar/NTZ/los_interrupt.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -29,12 +29,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "los_interrupt.h"
-#include "securec.h"
 #include <stdarg.h>
-#include "los_arch_interrupt.h"
+#include "securec.h"
 #include "los_context.h"
-#include "los_debug.h"
+#include "los_arch_interrupt.h"
 #include "los_hook.h"
 #include "los_task.h"
 #include "los_sched.h"
@@ -44,93 +42,6 @@
 #include "los_cpup.h"
 #endif
 
-/*lint -save -e40 -e522 -e533*/
-UINT32 g_intCount = 0;
-
-/*lint -restore*/
-#pragma location = ".data.vector"
-#pragma data_alignment = LOSCFG_ARCH_HWI_VECTOR_ALIGN
-/* *
- * @ingroup los_hwi
- * hardware interrupt form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC g_hwiForm[OS_VECTOR_CNT] = {0};
-
-#if (LOSCFG_DEBUG_TOOLS == 1)
-STATIC UINT32 g_hwiFormCnt[OS_HWI_MAX_NUM] = {0};
-STATIC CHAR *g_hwiFormName[OS_HWI_MAX_NUM] = {0};
-
-UINT32 OsGetHwiFormCnt(UINT32 index)
-{
-    return g_hwiFormCnt[index];
-}
-
-CHAR *OsGetHwiFormName(UINT32 index)
-{
-    return g_hwiFormName[index];
-}
-
-BOOL OsGetHwiCreated(UINT32 index)
-{
-    if (g_hwiForm[index] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return TRUE;
-    }
-
-    return FALSE;
-}
-#endif
-
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-
-typedef struct {
-    HWI_PROC_FUNC pfnHandler;
-    VOID *pParm;
-} HWI_HANDLER_FUNC;
-
-/* *
- * @ingroup los_hwi
- * hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pfnHandler = vector;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pParm = arg;
-    }
-}
-
-#else
-/* *
- * @ingroup los_hwi
- * hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {0};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT] = vector;
-    }
-}
-#endif
-
-WEAK VOID SysTick_Handler(VOID)
-{
-    return;
-}
-
 /* ****************************************************************************
  Function    : HwiNumGet
  Description : Get an interrupt number
@@ -145,100 +56,54 @@ STATIC UINT32 HwiNumGet(VOID)
 
 STATIC UINT32 HwiUnmask(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_EnableIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiMask(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_DisableIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiSetPriority(HWI_HANDLE_T hwiNum, UINT8 priority)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (priority > OS_HWI_PRIO_LOWEST) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-
     NVIC_SetPriority((IRQn_Type)hwiNum, priority);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiPending(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_SetPendingIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiClear(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_ClearPendingIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
-HwiControllerOps g_archHwiOps = {
+STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
+{
+    HwiSetPriority(hwiNum, hwiPrio);
+    HwiUnmask(hwiNum);
+    return LOS_OK;
+}
+
+STATIC HwiControllerOps g_archHwiOps = {
     .enableIrq      = HwiUnmask,
     .disableIrq     = HwiMask,
     .setIrqPriority = HwiSetPriority,
     .getCurIrqNum   = HwiNumGet,
     .triggerIrq     = HwiPending,
     .clearIrq       = HwiClear,
+    .createIrq      = HwiCreate,
 };
 
-inline UINT32 ArchIsIntActive(VOID)
+HwiControllerOps *ArchIntOpsGet(VOID)
 {
-    return (g_intCount > 0);
-}
-/* ****************************************************************************
- Function    : HalHwiDefaultHandler
- Description : default handler of the hardware interrupt
- Input       : None
- Output      : None
- Return      : None
- **************************************************************************** */
-/*lint -e529*/
-LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
-{
-    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());
-    while (1) {}
-}
-
-WEAK VOID HalPreInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
-}
-
-WEAK VOID HalAftInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
+    return &g_archHwiOps;
 }
 
 /* ****************************************************************************
@@ -299,97 +164,6 @@ LITE_OS_SEC_TEXT VOID HalInterrupt(VOID)
     LOS_IntRestore(intSave);
 }
 
-/* ****************************************************************************
- Function    : ArchHwiCreate
- Description : create hardware interrupt
- Input       : hwiNum   --- hwi num to create
-               hwiPrio  --- priority of the hwi
-               hwiMode  --- unused
-               hwiHandler --- hwi handler
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiCreate(HWI_HANDLE_T hwiNum,
-                                           HWI_PRIOR_T hwiPrio,
-                                           HWI_MODE_T hwiMode,
-                                           HWI_PROC_FUNC hwiHandler,
-                                           HwiIrqParam *irqParam)
-{
-    (VOID)hwiMode;
-    UINTPTR intSave;
-
-    if (hwiHandler == NULL) {
-        return OS_ERRNO_HWI_PROC_FUNC_NULL;
-    }
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return OS_ERRNO_HWI_ALREADY_CREATED;
-    }
-
-    if (hwiPrio > OS_HWI_PRIO_LOWEST) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-
-    intSave = LOS_IntLock();
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-    if (irqParam != NULL) {
-        OsSetVector(hwiNum, hwiHandler, irqParam->pDevId);
-    } else {
-        OsSetVector(hwiNum, hwiHandler, NULL);
-    }
-#else
-    (VOID)irqParam;
-    OsSetVector(hwiNum, hwiHandler);
-#endif
-
-#if (LOSCFG_DEBUG_TOOLS == 1)
-    if ((irqParam != NULL) && (irqParam->pName != NULL)) {
-        g_hwiFormName[hwiNum + OS_SYS_VECTOR_CNT] = (CHAR *)irqParam->pName;
-    }
-    g_hwiFormCnt[hwiNum + OS_SYS_VECTOR_CNT] = 0;
-#endif
-
-    HwiUnmask((IRQn_Type)hwiNum);
-    HwiSetPriority((IRQn_Type)hwiNum, hwiPrio);
-
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
-/* ****************************************************************************
- Function    : ArchHwiDelete
- Description : Delete hardware interrupt
- Input       : hwiNum   --- hwi num to delete
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiDelete(HWI_HANDLE_T hwiNum, HwiIrqParam *irqParam)
-{
-    (VOID)irqParam;
-    UINT32 intSave;
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    NVIC_DisableIRQ((IRQn_Type)hwiNum);
-
-    intSave = LOS_IntLock();
-
-    g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
-
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
 #define FAULT_STATUS_REG_BIT            32
 #define USGFAULT                        (1 << 18)
 #define BUSFAULT                        (1 << 17)
@@ -611,6 +385,11 @@ LITE_OS_SEC_TEXT_INIT VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, U
     ArchSysExit();
 }
 
+WEAK VOID SysTick_Handler(VOID)
+{
+    return;
+}
+
 /* ****************************************************************************
  Function    : HalHwiInit
  Description : initialization of the hardware interrupt
@@ -622,23 +401,24 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
     UINT32 index;
-    g_hwiForm[0] = 0;             /* [0] Top of Stack */
-    g_hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
+    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
+    hwiForm[0] = 0;             /* [0] Top of Stack */
+    hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
     for (index = 2; index < OS_VECTOR_CNT; index++) { /* 2: The starting position of the interrupt */
-        g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+        hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
     }
     /* Exception handler register */
-    g_hwiForm[NonMaskableInt_IRQn + OS_SYS_VECTOR_CNT]   = (HWI_PROC_FUNC)HalExcNMI;
-    g_hwiForm[HARDFAULT_IRQN + OS_SYS_VECTOR_CNT]        = (HWI_PROC_FUNC)HalExcHardFault;
-    g_hwiForm[MemoryManagement_IRQn + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalExcMemFault;
-    g_hwiForm[BusFault_IRQn + OS_SYS_VECTOR_CNT]         = (HWI_PROC_FUNC)HalExcBusFault;
-    g_hwiForm[UsageFault_IRQn + OS_SYS_VECTOR_CNT]       = (HWI_PROC_FUNC)HalExcUsageFault;
-    g_hwiForm[SVCall_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalSVCHandler;
-    g_hwiForm[PendSV_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalPendSV;
-    g_hwiForm[SysTick_IRQn + OS_SYS_VECTOR_CNT]          = (HWI_PROC_FUNC)SysTick_Handler;
+    hwiForm[NonMaskableInt_IRQn + OS_SYS_VECTOR_CNT]   = (HWI_PROC_FUNC)HalExcNMI;
+    hwiForm[HARDFAULT_IRQN + OS_SYS_VECTOR_CNT]        = (HWI_PROC_FUNC)HalExcHardFault;
+    hwiForm[MemoryManagement_IRQn + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalExcMemFault;
+    hwiForm[BusFault_IRQn + OS_SYS_VECTOR_CNT]         = (HWI_PROC_FUNC)HalExcBusFault;
+    hwiForm[UsageFault_IRQn + OS_SYS_VECTOR_CNT]       = (HWI_PROC_FUNC)HalExcUsageFault;
+    hwiForm[SVCall_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalSVCHandler;
+    hwiForm[PendSV_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalPendSV;
+    hwiForm[SysTick_IRQn + OS_SYS_VECTOR_CNT]          = (HWI_PROC_FUNC)SysTick_Handler;
 
     /* Interrupt vector table location */
-    SCB->VTOR = (UINT32)(UINTPTR)g_hwiForm;
+    SCB->VTOR = (UINT32)(UINTPTR)hwiForm;
 #endif
 #if (__CORTEX_M >= 0x03U) /* only for Cortex-M3 and above */
     NVIC_SetPriorityGrouping(OS_NVIC_AIRCR_PRIGROUP);
@@ -651,4 +431,3 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 
     return;
 }
-

arch/arm/cortex-m33/iar/TZ/non_secure/los_arch_interrupt.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -29,12 +29,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LOS_EXC_H
-#define _LOS_EXC_H
+#ifndef _LOS_ARCH_INTERRUPT_H
+#define _LOS_ARCH_INTERRUPT_H
 
-#include "los_config.h"
-#include "los_compiler.h"
-#include "los_interrupt.h"
+#include "los_common_interrupt.h"
 
 #ifdef __cplusplus
 #if __cplusplus
@@ -43,15 +41,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 /* *
- * @ingroup los_hwi
- * Maximum number of used hardware interrupts.
- */
-#ifndef OS_HWI_MAX_NUM
-#define OS_HWI_MAX_NUM                        LOSCFG_PLATFORM_HWI_LIMIT
-#endif
-
-/* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Highest priority of a hardware interrupt.
  */
 #ifndef OS_HWI_PRIO_HIGHEST
@@ -59,63 +49,50 @@ extern "C" {
 #endif
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Lowest priority of a hardware interrupt.
  */
 #ifndef OS_HWI_PRIO_LOWEST
 #define OS_HWI_PRIO_LOWEST                    7
 #endif
 
-
 /* *
- * @ingroup  los_hwi
- * Define the type of a hardware interrupt vector table function.
- */
-typedef VOID (**HWI_VECTOR_FUNC)(void);
-
-/* *
- * @ingroup los_hwi
- * Count of interrupts.
- */
-extern UINT32 g_intCount;
-
-/* *
- * @ingroup los_hwi
- * Count of M-Core system interrupt vector.
- */
-#define OS_SYS_VECTOR_CNT                     16
-
-/* *
- * @ingroup los_hwi
- * Count of M-Core interrupt vector.
- */
-#define OS_VECTOR_CNT                         (OS_SYS_VECTOR_CNT + OS_HWI_MAX_NUM)
-
-/* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * AIRCR register priority group parameter .
  */
 #define OS_NVIC_AIRCR_PRIGROUP                7
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Boot interrupt vector table.
  */
 extern UINT32 _BootVectors[];
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
+ * Count of M-Core system interrupt vector.
+ */
+#define OS_SYS_VECTOR_CNT                     16
+
+/* *
+ * @ingroup los_arch_interrupt
+ * Count of M-Core interrupt vector.
+ */
+#define OS_VECTOR_CNT                         (OS_SYS_VECTOR_CNT + OS_HWI_MAX_NUM)
+
+/* *
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Invalid interrupt number.
  *
  * Value: 0x02000900
  *
  * Solution: Ensure that the interrupt number is valid.
- * The value range of the interrupt number applicable for a Cortex-M33 platform is [OS_USER_HWI_MIN,OS_USER_HWI_MAX].
+ * The value range of the interrupt number applicable for a Cortex-M33  platform is [OS_USER_HWI_MIN,OS_USER_HWI_MAX].
  */
 #define OS_ERRNO_HWI_NUM_INVALID              LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x00)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Null hardware interrupt handling function.
  *
  * Value: 0x02000901
@@ -125,7 +102,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_PROC_FUNC_NULL           LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x01)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Insufficient interrupt resources for hardware interrupt creation.
  *
  * Value: 0x02000902
@@ -135,7 +112,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_CB_UNAVAILABLE           LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x02)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Insufficient memory for hardware interrupt initialization.
  *
  * Value: 0x02000903
@@ -145,7 +122,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_NO_MEMORY                LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x03)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: The interrupt has already been created.
  *
  * Value: 0x02000904
@@ -155,7 +132,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_ALREADY_CREATED          LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x04)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Invalid interrupt priority.
  *
  * Value: 0x02000905
@@ -166,7 +143,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_PRIO_INVALID             LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x05)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Incorrect interrupt creation mode.
  *
  * Value: 0x02000906
@@ -177,7 +154,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_MODE_INVALID             LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x06)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: The interrupt has already been created as a fast interrupt.
  *
  * Value: 0x02000907
@@ -187,7 +164,17 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_FASTMODE_ALREADY_CREATED LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x07)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
+ * Hardware interrupt error code: Invalid interrupt operation function.
+ *
+ * Value: 0x0200090c
+ *
+ * Solution: Set a valid interrupt operation function
+ */
+#define OS_ERRNO_HWI_OPS_FUNC_NULL            LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x0c)
+
+/* *
+ * @ingroup los_arch_interrupt
  * SysTick control and status register.
  */
 #define OS_SYSTICK_CONTROL_REG                0xE000E010
@@ -199,133 +186,119 @@ extern UINT32 _BootVectors[];
 #define OS_SYSTICK_CURRENT_REG                0xE000E018
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt Priority-Level Registers.
  */
 #define OS_NVIC_PRI_BASE                      0xE000E400
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt enable register for 0-31.
  */
 #define OS_NVIC_SETENA_BASE                   0xE000E100
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * interrupt pending register.
  */
 #define OS_NVIC_SETPEND_BASE                  0xE000E200
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt active register.
  */
 #define OS_NVIC_INT_ACT_BASE                  0xE000E300
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt disable register for 0-31.
  */
 #define OS_NVIC_CLRENA_BASE                   0xE000E180
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt control and status register.
  */
 #define OS_NVIC_INT_CTRL                      0xE000ED04
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Vector table offset register.
  */
 #define OS_NVIC_VTOR                          0xE000ED08
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Application interrupt and reset control register
  */
 #define OS_NVIC_AIRCR                         0xE000ED0C
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * System exception priority register.
  */
 #define OS_NVIC_EXCPRI_BASE                   0xE000ED18
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 1 :reset.
  */
 #define OS_EXC_RESET                          1
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 2 :Non-Maskable Interrupt.
  */
 #define OS_EXC_NMI                            2
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 3 :(hard)fault.
  */
 #define OS_EXC_HARD_FAULT                     3
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 4 :MemManage fault.
  */
 #define OS_EXC_MPU_FAULT                      4
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 5 :Bus fault.
  */
 #define OS_EXC_BUS_FAULT                      5
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 6 :Usage fault.
  */
 #define OS_EXC_USAGE_FAULT                    6
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 11 :SVCall.
  */
 #define OS_EXC_SVC_CALL                       11
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 12 :Debug monitor.
  */
 #define OS_EXC_DBG_MONITOR                    12
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 14 :PendSV.
  */
 #define OS_EXC_PEND_SV                        14
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 15 :SysTick.
  */
 #define OS_EXC_SYS_TICK                       15
 
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg);
-#else
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
-#endif
-
 /* *
  * @ingroup  los_hwi
  * @brief: Hardware interrupt entry function.
@@ -346,27 +319,7 @@ extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
 extern VOID HalInterrupt(VOID);
 
 /* *
- * @ingroup  los_hwi
- * @brief: Default vector handling function.
- *
- * @par Description:
- * This API is used to configure interrupt for null function.
- *
- * @attention:
- * <ul><li>None.</li></ul>
- *
- * @param:None.
- *
- * @retval:None.
- * @par Dependency:
- * <ul><li>los_hwi.h: the header file that contains the API declaration.</li
-></ul>
- * @see None.
- */
-extern VOID HalHwiDefaultHandler(VOID);
-
-/* *
- * @ingroup  los_hwi
+ * @ingroup  los_arch_interrupt
  * @brief: Reset the vector table.
  *
  * @par Description:
@@ -379,13 +332,13 @@ extern VOID HalHwiDefaultHandler(VOID);
  *
  * @retval:None.
  * @par Dependency:
- * <ul><li>los_hwi.h: the header file that contains the API declaration.</li></ul>
+ * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
  * @see None.
  */
 extern VOID Reset_Handler(VOID);
 
 /* *
- * @ingroup  los_hwi
+ * @ingroup  los_arch_interrupt
  * @brief: Pended System Call.
  *
  * @par Description:
@@ -399,39 +352,25 @@ extern VOID Reset_Handler(VOID);
  *
  * @retval:None.
  * @par Dependency:
- * <ul><li>los_hwi.h: the header file that contains the API declaration.</li></ul>
+ * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
  * @see None.
  */
 extern VOID HalPendSV(VOID);
 
-
-#define OS_EXC_IN_INIT                      0
-#define OS_EXC_IN_TASK                      1
-#define OS_EXC_IN_HWI                       2
-
 #define OS_EXC_MAX_BUF_LEN                  25
 #define OS_EXC_MAX_NEST_DEPTH               1
+#define OS_EXC_FLAG_NO_FLOAT                0x10000000
 
 #define OS_NVIC_SHCSR                       0xE000ED24
 #define OS_NVIC_CCR                         0xE000ED14
-
 #define OS_NVIC_INT_ENABLE_SIZE             0x20
 #define OS_NVIC_INT_PRI_SIZE                0xF0
 #define OS_NVIC_EXCPRI_SIZE                 0xC
 #define OS_NVIC_INT_CTRL_SIZE               4
 #define OS_NVIC_SHCSR_SIZE                  4
-
 #define OS_NVIC_INT_PEND_SIZE               OS_NVIC_INT_ACT_SIZE
 #define OS_NVIC_INT_ACT_SIZE                OS_NVIC_INT_ENABLE_SIZE
 
-#define OS_EXC_FLAG_NO_FLOAT                0x10000000
-#define OS_EXC_FLAG_FAULTADDR_VALID         0x01
-#define OS_EXC_FLAG_IN_HWI                  0x02
-
-#define OS_EXC_IMPRECISE_ACCESS_ADDR        0xABABABAB
-
-#define OS_EXC_EVENT                        0x00000001
-
 /**
  * @ingroup los_exc
  * the struct of register files
@@ -500,11 +439,10 @@ typedef struct TagExcContext {
     UINT32 FPSCR;
     UINT32 NO_NAME;
 #endif
-}EXC_CONTEXT_S;
+} EXC_CONTEXT_S;
 
 typedef VOID (*EXC_PROC_FUNC)(UINT32, EXC_CONTEXT_S *);
 VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, UINT32 pid, EXC_CONTEXT_S *excBufAddr);
-
 VOID HalExcNMI(VOID);
 VOID HalExcHardFault(VOID);
 VOID HalExcMemFault(VOID);
@@ -645,7 +583,7 @@ VOID HalHwiInit(VOID);
  * @ingroup los_exc
  * Exception information structure
  *
- * Description: Exception information saved when an exception is triggered on the Cortex-M4 platform.
+ * Description: Exception information saved when an exception is triggered on the Cortex-M33 platform.
  *
  */
 typedef struct TagExcInfo {
@@ -668,10 +606,9 @@ typedef struct TagExcInfo {
     EXC_CONTEXT_S *context;
 } ExcInfo;
 
-extern UINT32 g_curNestCount;
-extern UINT32 g_intCount;
-extern UINT8 g_uwExcTbl[32];
 extern ExcInfo g_excInfo;
+extern UINT32 g_curNestCount;
+extern UINT8 g_uwExcTbl[32];
 
 #define MAX_INT_INFO_SIZE       (8 + 0x164)
 
@@ -681,4 +618,4 @@ extern ExcInfo g_excInfo;
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
-#endif /* _LOS_EXC_H */
+#endif /* _LOS_ARCH_INTERRUPT_H */

arch/arm/cortex-m33/iar/TZ/non_secure/los_interrupt.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -29,12 +29,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "los_interrupt.h"
-#include "securec.h"
 #include <stdarg.h>
-#include "los_arch_interrupt.h"
+#include "securec.h"
 #include "los_context.h"
-#include "los_debug.h"
+#include "los_arch_interrupt.h"
 #include "los_hook.h"
 #include "los_task.h"
 #include "los_sched.h"
@@ -44,93 +42,6 @@
 #include "los_cpup.h"
 #endif
 
-/*lint -save -e40 -e522 -e533*/
-UINT32 g_intCount = 0;
-
-/*lint -restore*/
-#pragma location = ".data.vector"
-#pragma data_alignment = LOSCFG_ARCH_HWI_VECTOR_ALIGN
-/* *
- * @ingroup los_hwi
- * hardware interrupt form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC g_hwiForm[OS_VECTOR_CNT] = {0};
-
-#if (LOSCFG_DEBUG_TOOLS == 1)
-STATIC UINT32 g_hwiFormCnt[OS_HWI_MAX_NUM] = {0};
-STATIC CHAR *g_hwiFormName[OS_HWI_MAX_NUM] = {0};
-
-UINT32 OsGetHwiFormCnt(UINT32 index)
-{
-    return g_hwiFormCnt[index];
-}
-
-CHAR *OsGetHwiFormName(UINT32 index)
-{
-    return g_hwiFormName[index];
-}
-
-BOOL OsGetHwiCreated(UINT32 index)
-{
-    if (g_hwiForm[index] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return TRUE;
-    }
-
-    return FALSE;
-}
-#endif
-
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-
-typedef struct {
-    HWI_PROC_FUNC pfnHandler;
-    VOID *pParm;
-} HWI_HANDLER_FUNC;
-
-/* *
- * @ingroup los_hwi
- * hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pfnHandler = vector;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pParm = arg;
-    }
-}
-
-#else
-/* *
- * @ingroup los_hwi
- * hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {0};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT] = vector;
-    }
-}
-#endif
-
-WEAK VOID SysTick_Handler(VOID)
-{
-    return;
-}
-
 /* ****************************************************************************
  Function    : HwiNumGet
  Description : Get an interrupt number
@@ -145,100 +56,54 @@ STATIC UINT32 HwiNumGet(VOID)
 
 STATIC UINT32 HwiUnmask(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_EnableIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiMask(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_DisableIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiSetPriority(HWI_HANDLE_T hwiNum, UINT8 priority)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (priority > OS_HWI_PRIO_LOWEST) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-
     NVIC_SetPriority((IRQn_Type)hwiNum, priority);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiPending(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_SetPendingIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiClear(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_ClearPendingIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
-HwiControllerOps g_archHwiOps = {
+STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
+{
+    HwiSetPriority(hwiNum, hwiPrio);
+    HwiUnmask(hwiNum);
+    return LOS_OK;
+}
+
+STATIC HwiControllerOps g_archHwiOps = {
     .enableIrq      = HwiUnmask,
     .disableIrq     = HwiMask,
     .setIrqPriority = HwiSetPriority,
     .getCurIrqNum   = HwiNumGet,
     .triggerIrq     = HwiPending,
     .clearIrq       = HwiClear,
+    .createIrq      = HwiCreate,
 };
 
-inline UINT32 ArchIsIntActive(VOID)
+HwiControllerOps *ArchIntOpsGet(VOID)
 {
-    return (g_intCount > 0);
-}
-/* ****************************************************************************
- Function    : HalHwiDefaultHandler
- Description : default handler of the hardware interrupt
- Input       : None
- Output      : None
- Return      : None
- **************************************************************************** */
-/*lint -e529*/
-LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
-{
-    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());
-    while (1) {}
-}
-
-WEAK VOID HalPreInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
-}
-
-WEAK VOID HalAftInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
+    return &g_archHwiOps;
 }
 
 /* ****************************************************************************
@@ -299,97 +164,6 @@ LITE_OS_SEC_TEXT VOID HalInterrupt(VOID)
     LOS_IntRestore(intSave);
 }
 
-/* ****************************************************************************
- Function    : ArchHwiCreate
- Description : create hardware interrupt
- Input       : hwiNum   --- hwi num to create
-               hwiPrio  --- priority of the hwi
-               hwiMode  --- unused
-               hwiHandler --- hwi handler
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiCreate(HWI_HANDLE_T hwiNum,
-                                           HWI_PRIOR_T hwiPrio,
-                                           HWI_MODE_T hwiMode,
-                                           HWI_PROC_FUNC hwiHandler,
-                                           HwiIrqParam *irqParam)
-{
-    (VOID)hwiMode;
-    UINTPTR intSave;
-
-    if (hwiHandler == NULL) {
-        return OS_ERRNO_HWI_PROC_FUNC_NULL;
-    }
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return OS_ERRNO_HWI_ALREADY_CREATED;
-    }
-
-    if (hwiPrio > OS_HWI_PRIO_LOWEST) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-
-    intSave = LOS_IntLock();
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-    if (irqParam != NULL) {
-        OsSetVector(hwiNum, hwiHandler, irqParam->pDevId);
-    } else {
-        OsSetVector(hwiNum, hwiHandler, NULL);
-    }
-#else
-    (VOID)irqParam;
-    OsSetVector(hwiNum, hwiHandler);
-#endif
-
-#if (LOSCFG_DEBUG_TOOLS == 1)
-    if ((irqParam != NULL) && (irqParam->pName != NULL)) {
-        g_hwiFormName[hwiNum + OS_SYS_VECTOR_CNT] = (CHAR *)irqParam->pName;
-    }
-    g_hwiFormCnt[hwiNum + OS_SYS_VECTOR_CNT] = 0;
-#endif
-
-    HwiUnmask((IRQn_Type)hwiNum);
-    HwiSetPriority((IRQn_Type)hwiNum, hwiPrio);
-
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
-/* ****************************************************************************
- Function    : ArchHwiDelete
- Description : Delete hardware interrupt
- Input       : hwiNum   --- hwi num to delete
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiDelete(HWI_HANDLE_T hwiNum, HwiIrqParam *irqParam)
-{
-    (VOID)irqParam;
-    UINT32 intSave;
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    NVIC_DisableIRQ((IRQn_Type)hwiNum);
-
-    intSave = LOS_IntLock();
-
-    g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
-
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
 #define FAULT_STATUS_REG_BIT            32
 #define USGFAULT                        (1 << 18)
 #define BUSFAULT                        (1 << 17)
@@ -611,6 +385,11 @@ LITE_OS_SEC_TEXT_INIT VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, U
     ArchSysExit();
 }
 
+WEAK VOID SysTick_Handler(VOID)
+{
+    return;
+}
+
 /* ****************************************************************************
  Function    : HalHwiInit
  Description : initialization of the hardware interrupt
@@ -622,23 +401,24 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
     UINT32 index;
-    g_hwiForm[0] = 0;             /* [0] Top of Stack */
-    g_hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
+    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
+    hwiForm[0] = 0;             /* [0] Top of Stack */
+    hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
     for (index = 2; index < OS_VECTOR_CNT; index++) { /* 2: The starting position of the interrupt */
-        g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+        hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
     }
     /* Exception handler register */
-    g_hwiForm[NonMaskableInt_IRQn + OS_SYS_VECTOR_CNT]   = (HWI_PROC_FUNC)HalExcNMI;
-    g_hwiForm[HARDFAULT_IRQN + OS_SYS_VECTOR_CNT]        = (HWI_PROC_FUNC)HalExcHardFault;
-    g_hwiForm[MemoryManagement_IRQn + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalExcMemFault;
-    g_hwiForm[BusFault_IRQn + OS_SYS_VECTOR_CNT]         = (HWI_PROC_FUNC)HalExcBusFault;
-    g_hwiForm[UsageFault_IRQn + OS_SYS_VECTOR_CNT]       = (HWI_PROC_FUNC)HalExcUsageFault;
-    g_hwiForm[SVCall_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalSVCHandler;
-    g_hwiForm[PendSV_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalPendSV;
-    g_hwiForm[SysTick_IRQn + OS_SYS_VECTOR_CNT]          = (HWI_PROC_FUNC)SysTick_Handler;
+    hwiForm[NonMaskableInt_IRQn + OS_SYS_VECTOR_CNT]   = (HWI_PROC_FUNC)HalExcNMI;
+    hwiForm[HARDFAULT_IRQN + OS_SYS_VECTOR_CNT]        = (HWI_PROC_FUNC)HalExcHardFault;
+    hwiForm[MemoryManagement_IRQn + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalExcMemFault;
+    hwiForm[BusFault_IRQn + OS_SYS_VECTOR_CNT]         = (HWI_PROC_FUNC)HalExcBusFault;
+    hwiForm[UsageFault_IRQn + OS_SYS_VECTOR_CNT]       = (HWI_PROC_FUNC)HalExcUsageFault;
+    hwiForm[SVCall_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalSVCHandler;
+    hwiForm[PendSV_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalPendSV;
+    hwiForm[SysTick_IRQn + OS_SYS_VECTOR_CNT]          = (HWI_PROC_FUNC)SysTick_Handler;
 
     /* Interrupt vector table location */
-    SCB->VTOR = (UINT32)(UINTPTR)g_hwiForm;
+    SCB->VTOR = (UINT32)(UINTPTR)hwiForm;
 #endif
 #if (__CORTEX_M >= 0x03U) /* only for Cortex-M3 and above */
     NVIC_SetPriorityGrouping(OS_NVIC_AIRCR_PRIGROUP);
@@ -651,4 +431,3 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 
     return;
 }
-

arch/arm/cortex-m4/gcc/los_arch_interrupt.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -32,9 +32,7 @@
 #ifndef _LOS_ARCH_INTERRUPT_H
 #define _LOS_ARCH_INTERRUPT_H
 
-#include "los_config.h"
-#include "los_compiler.h"
-#include "los_interrupt.h"
+#include "los_common_interrupt.h"
 
 #ifdef __cplusplus
 #if __cplusplus
@@ -42,14 +40,6 @@ extern "C" {
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
-/* *
- * @ingroup los_arch_interrupt
- * Maximum number of used hardware interrupts.
- */
-#ifndef OS_HWI_MAX_NUM
-#define OS_HWI_MAX_NUM                        LOSCFG_PLATFORM_HWI_LIMIT
-#endif
-
 /* *
  * @ingroup los_arch_interrupt
  * Highest priority of a hardware interrupt.
@@ -66,18 +56,17 @@ extern "C" {
 #define OS_HWI_PRIO_LOWEST                    7
 #endif
 
-
 /* *
- * @ingroup  los_arch_interrupt
- * Define the type of a hardware interrupt vector table function.
+ * @ingroup los_arch_interrupt
+ * AIRCR register priority group parameter .
  */
-typedef VOID (**HWI_VECTOR_FUNC)(void);
+#define OS_NVIC_AIRCR_PRIGROUP                7
 
 /* *
  * @ingroup los_arch_interrupt
- * Count of interrupts.
+ * Boot interrupt vector table.
  */
-extern UINT32 g_intCount;
+extern UINT32 _BootVectors[];
 
 /* *
  * @ingroup los_arch_interrupt
@@ -91,18 +80,6 @@ extern UINT32 g_intCount;
  */
 #define OS_VECTOR_CNT                         (OS_SYS_VECTOR_CNT + OS_HWI_MAX_NUM)
 
-/* *
- * @ingroup los_arch_interrupt
- * AIRCR register priority group parameter .
- */
-#define OS_NVIC_AIRCR_PRIGROUP                7
-
-/* *
- * @ingroup los_arch_interrupt
- * Boot interrupt vector table.
- */
-extern UINT32 _BootVectors[];
-
 /* *
  * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Invalid interrupt number.
@@ -110,7 +87,7 @@ extern UINT32 _BootVectors[];
  * Value: 0x02000900
  *
  * Solution: Ensure that the interrupt number is valid.
- * The value range of the interrupt number applicable for a Cortex-M4 platform is [OS_USER_HWI_MIN,OS_USER_HWI_MAX].
+ * The value range of the interrupt number applicable for a Cortex-M4  platform is [OS_USER_HWI_MIN,OS_USER_HWI_MAX].
  */
 #define OS_ERRNO_HWI_NUM_INVALID              LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x00)
 
@@ -186,6 +163,16 @@ extern UINT32 _BootVectors[];
  */
 #define OS_ERRNO_HWI_FASTMODE_ALREADY_CREATED LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x07)
 
+/* *
+ * @ingroup los_arch_interrupt
+ * Hardware interrupt error code: Invalid interrupt operation function.
+ *
+ * Value: 0x0200090c
+ *
+ * Solution: Set a valid interrupt operation function
+ */
+#define OS_ERRNO_HWI_OPS_FUNC_NULL            LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x0c)
+
 /* *
  * @ingroup los_arch_interrupt
  * SysTick control and status register.
@@ -312,20 +299,6 @@ extern UINT32 _BootVectors[];
  */
 #define OS_EXC_SYS_TICK                       15
 
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-/* *
- * @ingroup los_arch_interrupt
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg);
-#else
-/* *
- * @ingroup los_arch_interrupt
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
-#endif
-
 /* *
  * @ingroup  los_arch_interrupt
  * @brief: Hardware interrupt entry function.
@@ -345,25 +318,6 @@ extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
  */
 extern VOID HalInterrupt(VOID);
 
-/* *
- * @ingroup  los_arch_interrupt
- * @brief: Default vector handling function.
- *
- * @par Description:
- * This API is used to configure interrupt for null function.
- *
- * @attention:
- * <ul><li>None.</li></ul>
- *
- * @param:None.
- *
- * @retval:None.
- * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
- * @see None.
- */
-extern VOID HalHwiDefaultHandler(VOID);
-
 /* *
  * @ingroup  los_arch_interrupt
  * @brief: Reset the vector table.
@@ -403,34 +357,20 @@ extern VOID Reset_Handler(VOID);
  */
 extern VOID HalPendSV(VOID);
 
-
-#define OS_EXC_IN_INIT                      0
-#define OS_EXC_IN_TASK                      1
-#define OS_EXC_IN_HWI                       2
-
 #define OS_EXC_MAX_BUF_LEN                  25
 #define OS_EXC_MAX_NEST_DEPTH               1
+#define OS_EXC_FLAG_NO_FLOAT                0x10000000
 
 #define OS_NVIC_SHCSR                       0xE000ED24
 #define OS_NVIC_CCR                         0xE000ED14
-
 #define OS_NVIC_INT_ENABLE_SIZE             0x20
 #define OS_NVIC_INT_PRI_SIZE                0xF0
 #define OS_NVIC_EXCPRI_SIZE                 0xC
 #define OS_NVIC_INT_CTRL_SIZE               4
 #define OS_NVIC_SHCSR_SIZE                  4
-
 #define OS_NVIC_INT_PEND_SIZE               OS_NVIC_INT_ACT_SIZE
 #define OS_NVIC_INT_ACT_SIZE                OS_NVIC_INT_ENABLE_SIZE
 
-#define OS_EXC_FLAG_NO_FLOAT                0x10000000
-#define OS_EXC_FLAG_FAULTADDR_VALID         0x01
-#define OS_EXC_FLAG_IN_HWI                  0x02
-
-#define OS_EXC_IMPRECISE_ACCESS_ADDR        0xABABABAB
-
-#define OS_EXC_EVENT                        0x00000001
-
 /**
  * @ingroup los_exc
  * the struct of register files
@@ -503,7 +443,6 @@ typedef struct TagExcContext {
 
 typedef VOID (*EXC_PROC_FUNC)(UINT32, EXC_CONTEXT_S *);
 VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, UINT32 pid, EXC_CONTEXT_S *excBufAddr);
-
 VOID HalExcNMI(VOID);
 VOID HalExcHardFault(VOID);
 VOID HalExcMemFault(VOID);
@@ -667,10 +606,9 @@ typedef struct TagExcInfo {
     EXC_CONTEXT_S *context;
 } ExcInfo;
 
-extern UINT32 g_curNestCount;
-extern UINT32 g_intCount;
-extern UINT8 g_uwExcTbl[32];
 extern ExcInfo g_excInfo;
+extern UINT32 g_curNestCount;
+extern UINT8 g_uwExcTbl[32];
 
 #define MAX_INT_INFO_SIZE       (8 + 0x164)
 

arch/arm/cortex-m4/gcc/los_interrupt.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -28,12 +28,11 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include "los_interrupt.h"
+
 #include <stdarg.h>
 #include "securec.h"
 #include "los_context.h"
 #include "los_arch_interrupt.h"
-#include "los_debug.h"
 #include "los_hook.h"
 #include "los_task.h"
 #include "los_sched.h"
@@ -43,89 +42,6 @@
 #include "los_cpup.h"
 #endif
 
-UINT32 g_intCount = 0;
-
-/* *
- * @ingroup los_hwi
- * Hardware interrupt form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC __attribute__((aligned(LOSCFG_ARCH_HWI_VECTOR_ALIGN))) g_hwiForm[OS_VECTOR_CNT] = {0};
-
-#if (LOSCFG_DEBUG_TOOLS == 1)
-STATIC UINT32 g_hwiFormCnt[OS_HWI_MAX_NUM] = {0};
-STATIC CHAR *g_hwiFormName[OS_HWI_MAX_NUM] = {0};
-
-UINT32 OsGetHwiFormCnt(UINT32 index)
-{
-    return g_hwiFormCnt[index];
-}
-
-CHAR *OsGetHwiFormName(UINT32 index)
-{
-    return g_hwiFormName[index];
-}
-
-BOOL OsGetHwiCreated(UINT32 index)
-{
-    if (g_hwiForm[index] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return TRUE;
-    }
-
-    return FALSE;
-}
-#endif
-
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-
-typedef struct {
-    HWI_PROC_FUNC pfnHandler;
-    VOID *pParm;
-} HWI_HANDLER_FUNC;
-
-/* *
- * @ingroup los_hwi
- * Hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pfnHandler = vector;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pParm = arg;
-    }
-}
-
-#else
-/* *
- * @ingroup los_hwi
- * hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {0};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT] = vector;
-    }
-}
-#endif
-
-WEAK VOID SysTick_Handler(VOID)
-{
-    return;
-}
-
 /* ****************************************************************************
  Function    : HwiNumGet
  Description : Get an interrupt number
@@ -140,99 +56,54 @@ STATIC UINT32 HwiNumGet(VOID)
 
 STATIC UINT32 HwiUnmask(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_EnableIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiMask(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_DisableIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiSetPriority(HWI_HANDLE_T hwiNum, UINT8 priority)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (priority > OS_HWI_PRIO_LOWEST) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-
     NVIC_SetPriority((IRQn_Type)hwiNum, priority);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiPending(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_SetPendingIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiClear(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_ClearPendingIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
-HwiControllerOps g_archHwiOps = {
+STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
+{
+    HwiSetPriority(hwiNum, hwiPrio);
+    HwiUnmask(hwiNum);
+    return LOS_OK;
+}
+
+STATIC HwiControllerOps g_archHwiOps = {
     .enableIrq      = HwiUnmask,
     .disableIrq     = HwiMask,
     .setIrqPriority = HwiSetPriority,
     .getCurIrqNum   = HwiNumGet,
     .triggerIrq     = HwiPending,
     .clearIrq       = HwiClear,
+    .createIrq      = HwiCreate,
 };
 
-inline UINT32 ArchIsIntActive(VOID)
+HwiControllerOps *ArchIntOpsGet(VOID)
 {
-    return (g_intCount > 0);
-}
-/* ****************************************************************************
- Function    : HalHwiDefaultHandler
- Description : default handler of the hardware interrupt
- Input       : None
- Output      : None
- Return      : None
- **************************************************************************** */
-LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
-{
-    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());
-    while (1) {}
-}
-
-WEAK VOID HalPreInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
-}
-
-WEAK VOID HalAftInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
+    return &g_archHwiOps;
 }
 
 /* ****************************************************************************
@@ -291,97 +162,6 @@ LITE_OS_SEC_TEXT VOID HalInterrupt(VOID)
     LOS_IntRestore(intSave);
 }
 
-/* ****************************************************************************
- Function    : ArchHwiCreate
- Description : create hardware interrupt
- Input       : hwiNum   --- hwi num to create
-               hwiPrio  --- priority of the hwi
-               hwiMode  --- unused
-               hwiHandler --- hwi handler
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiCreate(HWI_HANDLE_T hwiNum,
-                                           HWI_PRIOR_T hwiPrio,
-                                           HWI_MODE_T hwiMode,
-                                           HWI_PROC_FUNC hwiHandler,
-                                           HwiIrqParam *irqParam)
-{
-    (VOID)hwiMode;
-    UINT32 intSave;
-
-    if (hwiHandler == NULL) {
-        return OS_ERRNO_HWI_PROC_FUNC_NULL;
-    }
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return OS_ERRNO_HWI_ALREADY_CREATED;
-    }
-
-    if (hwiPrio > OS_HWI_PRIO_LOWEST) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-
-    intSave = LOS_IntLock();
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-    if (irqParam != NULL) {
-        OsSetVector(hwiNum, hwiHandler, irqParam->pDevId);
-    } else {
-        OsSetVector(hwiNum, hwiHandler, NULL);
-    }
-#else
-    (VOID)irqParam;
-    OsSetVector(hwiNum, hwiHandler);
-#endif
-
-#if (LOSCFG_DEBUG_TOOLS == 1)
-    if ((irqParam != NULL) && (irqParam->pName != NULL)) {
-        g_hwiFormName[hwiNum + OS_SYS_VECTOR_CNT] = (CHAR *)irqParam->pName;
-    }
-    g_hwiFormCnt[hwiNum + OS_SYS_VECTOR_CNT] = 0;
-#endif
-
-    HwiUnmask((IRQn_Type)hwiNum);
-    HwiSetPriority((IRQn_Type)hwiNum, hwiPrio);
-
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
-/* ****************************************************************************
- Function    : ArchHwiDelete
- Description : Delete hardware interrupt
- Input       : hwiNum   --- hwi num to delete
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiDelete(HWI_HANDLE_T hwiNum, HwiIrqParam *irqParam)
-{
-    (VOID)irqParam;
-    UINT32 intSave;
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    HwiMask((IRQn_Type)hwiNum);
-
-    intSave = LOS_IntLock();
-
-    g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
-
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
 #define FAULT_STATUS_REG_BIT            32
 #define USGFAULT                        (1 << 18)
 #define BUSFAULT                        (1 << 17)
@@ -614,6 +394,11 @@ WEAK VOID __stack_chk_fail(VOID)
               __builtin_return_address(0));
 }
 
+WEAK VOID SysTick_Handler(VOID)
+{
+    return;
+}
+
 /* ****************************************************************************
  Function    : HalHwiInit
  Description : initialization of the hardware interrupt
@@ -625,23 +410,24 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
     UINT32 index;
-    g_hwiForm[0] = 0;             /* [0] Top of Stack */
-    g_hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
+    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
+    hwiForm[0] = 0; /* [0] Top of Stack */
+    hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
     for (index = 2; index < OS_VECTOR_CNT; index++) { /* 2: The starting position of the interrupt */
-        g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+        hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
     }
     /* Exception handler register */
-    g_hwiForm[NonMaskableInt_IRQn + OS_SYS_VECTOR_CNT]   = (HWI_PROC_FUNC)HalExcNMI;
-    g_hwiForm[HARDFAULT_IRQN + OS_SYS_VECTOR_CNT]        = (HWI_PROC_FUNC)HalExcHardFault;
-    g_hwiForm[MemoryManagement_IRQn + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalExcMemFault;
-    g_hwiForm[BusFault_IRQn + OS_SYS_VECTOR_CNT]         = (HWI_PROC_FUNC)HalExcBusFault;
-    g_hwiForm[UsageFault_IRQn + OS_SYS_VECTOR_CNT]       = (HWI_PROC_FUNC)HalExcUsageFault;
-    g_hwiForm[SVCall_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalExcSvcCall;
-    g_hwiForm[PendSV_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalPendSV;
-    g_hwiForm[SysTick_IRQn + OS_SYS_VECTOR_CNT]          = (HWI_PROC_FUNC)SysTick_Handler;
+    hwiForm[NonMaskableInt_IRQn + OS_SYS_VECTOR_CNT]   = (HWI_PROC_FUNC)HalExcNMI;
+    hwiForm[HARDFAULT_IRQN + OS_SYS_VECTOR_CNT]        = (HWI_PROC_FUNC)HalExcHardFault;
+    hwiForm[MemoryManagement_IRQn + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalExcMemFault;
+    hwiForm[BusFault_IRQn + OS_SYS_VECTOR_CNT]         = (HWI_PROC_FUNC)HalExcBusFault;
+    hwiForm[UsageFault_IRQn + OS_SYS_VECTOR_CNT]       = (HWI_PROC_FUNC)HalExcUsageFault;
+    hwiForm[SVCall_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalExcSvcCall;
+    hwiForm[PendSV_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalPendSV;
+    hwiForm[SysTick_IRQn + OS_SYS_VECTOR_CNT]          = (HWI_PROC_FUNC)SysTick_Handler;
 
     /* Interrupt vector table location */
-    SCB->VTOR = (UINT32)(UINTPTR)g_hwiForm;
+    SCB->VTOR = (UINT32)(UINTPTR)hwiForm;
 #endif
 #if (__CORTEX_M >= 0x03U) /* only for Cortex-M3 and above */
     NVIC_SetPriorityGrouping(OS_NVIC_AIRCR_PRIGROUP);
@@ -659,4 +445,3 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 
     return;
 }
-

arch/arm/cortex-m4/iar/los_arch_interrupt.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -32,9 +32,7 @@
 #ifndef _LOS_ARCH_INTERRUPT_H
 #define _LOS_ARCH_INTERRUPT_H
 
-#include "los_config.h"
-#include "los_compiler.h"
-#include "los_interrupt.h"
+#include "los_common_interrupt.h"
 
 #ifdef __cplusplus
 #if __cplusplus
@@ -42,14 +40,6 @@ extern "C" {
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
-/* *
- * @ingroup los_arch_interrupt
- * Maximum number of used hardware interrupts.
- */
-#ifndef OS_HWI_MAX_NUM
-#define OS_HWI_MAX_NUM                        LOSCFG_PLATFORM_HWI_LIMIT
-#endif
-
 /* *
  * @ingroup los_arch_interrupt
  * Highest priority of a hardware interrupt.
@@ -66,18 +56,17 @@ extern "C" {
 #define OS_HWI_PRIO_LOWEST                    7
 #endif
 
-
 /* *
- * @ingroup  los_arch_interrupt
- * Define the type of a hardware interrupt vector table function.
+ * @ingroup los_arch_interrupt
+ * AIRCR register priority group parameter .
  */
-typedef VOID (**HWI_VECTOR_FUNC)(void);
+#define OS_NVIC_AIRCR_PRIGROUP                7
 
 /* *
  * @ingroup los_arch_interrupt
- * Count of interrupts.
+ * Boot interrupt vector table.
  */
-extern UINT32 g_intCount;
+extern UINT32 _BootVectors[];
 
 /* *
  * @ingroup los_arch_interrupt
@@ -91,18 +80,6 @@ extern UINT32 g_intCount;
  */
 #define OS_VECTOR_CNT                         (OS_SYS_VECTOR_CNT + OS_HWI_MAX_NUM)
 
-/* *
- * @ingroup los_arch_interrupt
- * AIRCR register priority group parameter .
- */
-#define OS_NVIC_AIRCR_PRIGROUP                7
-
-/* *
- * @ingroup los_arch_interrupt
- * Boot interrupt vector table.
- */
-extern UINT32 _BootVectors[];
-
 /* *
  * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Invalid interrupt number.
@@ -110,7 +87,7 @@ extern UINT32 _BootVectors[];
  * Value: 0x02000900
  *
  * Solution: Ensure that the interrupt number is valid.
- * The value range of the interrupt number applicable for a Cortex-M4 platform is [OS_USER_HWI_MIN,OS_USER_HWI_MAX].
+ * The value range of the interrupt number applicable for a Cortex-M4  platformis [OS_USER_HWI_MIN,OS_USER_HWI_MAX].
  */
 #define OS_ERRNO_HWI_NUM_INVALID              LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x00)
 
@@ -186,6 +163,16 @@ extern UINT32 _BootVectors[];
  */
 #define OS_ERRNO_HWI_FASTMODE_ALREADY_CREATED LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x07)
 
+/* *
+ * @ingroup los_arch_interrupt
+ * Hardware interrupt error code: Invalid interrupt operation function.
+ *
+ * Value: 0x0200090c
+ *
+ * Solution: Set a valid interrupt operation function
+ */
+#define OS_ERRNO_HWI_OPS_FUNC_NULL            LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x0c)
+
 /* *
  * @ingroup los_arch_interrupt
  * SysTick control and status register.
@@ -312,20 +299,6 @@ extern UINT32 _BootVectors[];
  */
 #define OS_EXC_SYS_TICK                       15
 
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-/* *
- * @ingroup los_arch_interrupt
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg);
-#else
-/* *
- * @ingroup los_arch_interrupt
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
-#endif
-
 /* *
  * @ingroup  los_arch_interrupt
  * @brief: Hardware interrupt entry function.
@@ -345,25 +318,6 @@ extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
  */
 extern VOID HalInterrupt(VOID);
 
-/* *
- * @ingroup  los_arch_interrupt
- * @brief: Default vector handling function.
- *
- * @par Description:
- * This API is used to configure interrupt for null function.
- *
- * @attention:
- * <ul><li>None.</li></ul>
- *
- * @param:None.
- *
- * @retval:None.
- * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
- * @see None.
- */
-extern VOID HalHwiDefaultHandler(VOID);
-
 /* *
  * @ingroup  los_arch_interrupt
  * @brief: Reset the vector table.
@@ -403,34 +357,20 @@ extern VOID Reset_Handler(VOID);
  */
 extern VOID HalPendSV(VOID);
 
-
-#define OS_EXC_IN_INIT                      0
-#define OS_EXC_IN_TASK                      1
-#define OS_EXC_IN_HWI                       2
-
 #define OS_EXC_MAX_BUF_LEN                  25
 #define OS_EXC_MAX_NEST_DEPTH               1
+#define OS_EXC_FLAG_NO_FLOAT                0x10000000
 
 #define OS_NVIC_SHCSR                       0xE000ED24
 #define OS_NVIC_CCR                         0xE000ED14
-
 #define OS_NVIC_INT_ENABLE_SIZE             0x20
 #define OS_NVIC_INT_PRI_SIZE                0xF0
 #define OS_NVIC_EXCPRI_SIZE                 0xC
 #define OS_NVIC_INT_CTRL_SIZE               4
 #define OS_NVIC_SHCSR_SIZE                  4
-
 #define OS_NVIC_INT_PEND_SIZE               OS_NVIC_INT_ACT_SIZE
 #define OS_NVIC_INT_ACT_SIZE                OS_NVIC_INT_ENABLE_SIZE
 
-#define OS_EXC_FLAG_NO_FLOAT                0x10000000
-#define OS_EXC_FLAG_FAULTADDR_VALID         0x01
-#define OS_EXC_FLAG_IN_HWI                  0x02
-
-#define OS_EXC_IMPRECISE_ACCESS_ADDR        0xABABABAB
-
-#define OS_EXC_EVENT                        0x00000001
-
 /**
  * @ingroup los_exc
  * the struct of register files
@@ -503,7 +443,6 @@ typedef struct TagExcContext {
 
 typedef VOID (*EXC_PROC_FUNC)(UINT32, EXC_CONTEXT_S *);
 VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, UINT32 pid, EXC_CONTEXT_S *excBufAddr);
-
 VOID HalExcNMI(VOID);
 VOID HalExcHardFault(VOID);
 VOID HalExcMemFault(VOID);
@@ -667,10 +606,9 @@ typedef struct TagExcInfo {
     EXC_CONTEXT_S *context;
 } ExcInfo;
 
-extern UINT32 g_curNestCount;
-extern UINT32 g_intCount;
-extern UINT8 g_uwExcTbl[32];
 extern ExcInfo g_excInfo;
+extern UINT32 g_curNestCount;
+extern UINT8 g_uwExcTbl[32];
 
 #define MAX_INT_INFO_SIZE       (8 + 0x164)
 

arch/arm/cortex-m4/iar/los_interrupt.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -29,12 +29,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "los_interrupt.h"
-#include "securec.h"
 #include <stdarg.h>
-#include "los_arch_interrupt.h"
+#include "securec.h"
 #include "los_context.h"
-#include "los_debug.h"
+#include "los_arch_interrupt.h"
 #include "los_hook.h"
 #include "los_task.h"
 #include "los_sched.h"
@@ -44,95 +42,6 @@
 #include "los_cpup.h"
 #endif
 
-UINT32 g_intCount = 0;
-
-#ifdef __ICCARM__
-#pragma location = ".data.vector"
-#pragma data_alignment = LOSCFG_ARCH_HWI_VECTOR_ALIGN
-#elif defined(__CC_ARM) || defined(__GNUC__)
-LITE_OS_SEC_VEC
-#endif
-/* *
- * @ingroup los_hwi
- * Hardware interrupt form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC g_hwiForm[OS_VECTOR_CNT] = {0};
-
-#if (LOSCFG_DEBUG_TOOLS == 1)
-STATIC UINT32 g_hwiFormCnt[OS_HWI_MAX_NUM] = {0};
-STATIC CHAR *g_hwiFormName[OS_HWI_MAX_NUM] = {0};
-
-UINT32 OsGetHwiFormCnt(UINT32 index)
-{
-    return g_hwiFormCnt[index];
-}
-
-CHAR *OsGetHwiFormName(UINT32 index)
-{
-    return g_hwiFormName[index];
-}
-
-BOOL OsGetHwiCreated(UINT32 index)
-{
-    if (g_hwiForm[index] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return TRUE;
-    }
-
-    return FALSE;
-}
-#endif
-
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-
-typedef struct {
-    HWI_PROC_FUNC pfnHandler;
-    VOID *pParm;
-} HWI_HANDLER_FUNC;
-
-/* *
- * @ingroup los_hwi
- * Hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pfnHandler = vector;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pParm = arg;
-    }
-}
-
-#else
-/* *
- * @ingroup los_hwi
- * hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {0};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT] = vector;
-    }
-}
-#endif
-
-WEAK VOID SysTick_Handler(VOID)
-{
-    return;
-}
-
 /* ****************************************************************************
  Function    : HwiNumGet
  Description : Get an interrupt number
@@ -147,100 +56,54 @@ STATIC UINT32 HwiNumGet(VOID)
 
 STATIC UINT32 HwiUnmask(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_EnableIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiMask(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_DisableIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiSetPriority(HWI_HANDLE_T hwiNum, UINT8 priority)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (priority > OS_HWI_PRIO_LOWEST) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-
     NVIC_SetPriority((IRQn_Type)hwiNum, priority);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiPending(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_SetPendingIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiClear(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_ClearPendingIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
-HwiControllerOps g_archHwiOps = {
+STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
+{
+    HwiSetPriority(hwiNum, hwiPrio);
+    HwiUnmask(hwiNum);
+    return LOS_OK;
+}
+
+STATIC HwiControllerOps g_archHwiOps = {
     .enableIrq      = HwiUnmask,
     .disableIrq     = HwiMask,
     .setIrqPriority = HwiSetPriority,
     .getCurIrqNum   = HwiNumGet,
     .triggerIrq     = HwiPending,
     .clearIrq       = HwiClear,
+    .createIrq      = HwiCreate,
 };
 
-inline UINT32 ArchIsIntActive(VOID)
+HwiControllerOps *ArchIntOpsGet(VOID)
 {
-    return (g_intCount > 0);
-}
-/* ****************************************************************************
- Function    : HalHwiDefaultHandler
- Description : default handler of the hardware interrupt
- Input       : None
- Output      : None
- Return      : None
- **************************************************************************** */
-/*lint -e529*/
-LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
-{
-    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());
-    while (1) {}
-}
-
-WEAK VOID HalPreInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
-}
-
-WEAK VOID HalAftInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
+    return &g_archHwiOps;
 }
 
 /* ****************************************************************************
@@ -299,97 +162,6 @@ LITE_OS_SEC_TEXT VOID HalInterrupt(VOID)
     LOS_IntRestore(intSave);
 }
 
-/* ****************************************************************************
- Function    : ArchHwiCreate
- Description : create hardware interrupt
- Input       : hwiNum   --- hwi num to create
-               hwiPrio  --- priority of the hwi
-               hwiMode  --- unused
-               hwiHandler --- hwi handler
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiCreate(HWI_HANDLE_T hwiNum,
-                                           HWI_PRIOR_T hwiPrio,
-                                           HWI_MODE_T hwiMode,
-                                           HWI_PROC_FUNC hwiHandler,
-                                           HwiIrqParam *irqParam)
-{
-    (VOID)hwiMode;
-    UINT32 intSave;
-
-    if (hwiHandler == NULL) {
-        return OS_ERRNO_HWI_PROC_FUNC_NULL;
-    }
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return OS_ERRNO_HWI_ALREADY_CREATED;
-    }
-
-    if (hwiPrio > OS_HWI_PRIO_LOWEST) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-
-    intSave = LOS_IntLock();
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-    if (irqParam != NULL) {
-        OsSetVector(hwiNum, hwiHandler, irqParam->pDevId);
-    } else {
-        OsSetVector(hwiNum, hwiHandler, NULL);
-    }
-#else
-    (VOID)irqParam;
-    OsSetVector(hwiNum, hwiHandler);
-#endif
-
-#if (LOSCFG_DEBUG_TOOLS == 1)
-    if ((irqParam != NULL) && (irqParam->pName != NULL)) {
-        g_hwiFormName[hwiNum + OS_SYS_VECTOR_CNT] = (CHAR *)irqParam->pName;
-    }
-    g_hwiFormCnt[hwiNum + OS_SYS_VECTOR_CNT] = 0;
-#endif
-
-    HwiUnmask((IRQn_Type)hwiNum);
-    HwiSetPriority((IRQn_Type)hwiNum, hwiPrio);
-
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
-/* ****************************************************************************
- Function    : ArchHwiDelete
- Description : Delete hardware interrupt
- Input       : hwiNum   --- hwi num to delete
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiDelete(HWI_HANDLE_T hwiNum, HwiIrqParam *irqParam)
-{
-    (VOID)irqParam;
-    UINT32 intSave;
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    NVIC_DisableIRQ((IRQn_Type)hwiNum);
-
-    intSave = LOS_IntLock();
-
-    g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
-
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
 #define FAULT_STATUS_REG_BIT            32
 #define USGFAULT                        (1 << 18)
 #define BUSFAULT                        (1 << 17)
@@ -612,6 +384,11 @@ LITE_OS_SEC_TEXT_INIT VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, U
     ArchSysExit();
 }
 
+WEAK VOID SysTick_Handler(VOID)
+{
+    return;
+}
+
 /* ****************************************************************************
  Function    : HalHwiInit
  Description : initialization of the hardware interrupt
@@ -623,23 +400,24 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
     UINT32 index;
-    g_hwiForm[0] = 0;             /* [0] Top of Stack */
-    g_hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
+    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
+    hwiForm[0] = 0;             /* [0] Top of Stack */
+    hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
     for (index = 2; index < OS_VECTOR_CNT; index++) { /* 2: The starting position of the interrupt */
-        g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+        hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
     }
     /* Exception handler register */
-    g_hwiForm[NonMaskableInt_IRQn + OS_SYS_VECTOR_CNT]   = (HWI_PROC_FUNC)HalExcNMI;
-    g_hwiForm[HARDFAULT_IRQN + OS_SYS_VECTOR_CNT]        = (HWI_PROC_FUNC)HalExcHardFault;
-    g_hwiForm[MemoryManagement_IRQn + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalExcMemFault;
-    g_hwiForm[BusFault_IRQn + OS_SYS_VECTOR_CNT]         = (HWI_PROC_FUNC)HalExcBusFault;
-    g_hwiForm[UsageFault_IRQn + OS_SYS_VECTOR_CNT]       = (HWI_PROC_FUNC)HalExcUsageFault;
-    g_hwiForm[SVCall_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalExcSvcCall;
-    g_hwiForm[PendSV_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalPendSV;
-    g_hwiForm[SysTick_IRQn + OS_SYS_VECTOR_CNT]          = (HWI_PROC_FUNC)SysTick_Handler;
+    hwiForm[NonMaskableInt_IRQn + OS_SYS_VECTOR_CNT]   = (HWI_PROC_FUNC)HalExcNMI;
+    hwiForm[HARDFAULT_IRQN + OS_SYS_VECTOR_CNT]        = (HWI_PROC_FUNC)HalExcHardFault;
+    hwiForm[MemoryManagement_IRQn + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalExcMemFault;
+    hwiForm[BusFault_IRQn + OS_SYS_VECTOR_CNT]         = (HWI_PROC_FUNC)HalExcBusFault;
+    hwiForm[UsageFault_IRQn + OS_SYS_VECTOR_CNT]       = (HWI_PROC_FUNC)HalExcUsageFault;
+    hwiForm[SVCall_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalExcSvcCall;
+    hwiForm[PendSV_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalPendSV;
+    hwiForm[SysTick_IRQn + OS_SYS_VECTOR_CNT]          = (HWI_PROC_FUNC)SysTick_Handler;
 
     /* Interrupt vector table location */
-    SCB->VTOR = (UINT32)(UINTPTR)g_hwiForm;
+    SCB->VTOR = (UINT32)(UINTPTR)hwiForm;
 #endif
 #if (__CORTEX_M >= 0x03U) /* only for Cortex-M3 and above */
     NVIC_SetPriorityGrouping(OS_NVIC_AIRCR_PRIGROUP);
@@ -657,4 +435,3 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 
     return;
 }
-

arch/arm/cortex-m55/gcc/NTZ/los_arch_interrupt.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2022 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2022-2023 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:
@@ -31,9 +31,7 @@
 #ifndef _LOS_ARCH_INTERRUPT_H
 #define _LOS_ARCH_INTERRUPT_H
 
-#include "los_config.h"
-#include "los_compiler.h"
-#include "los_interrupt.h"
+#include "los_common_interrupt.h"
 
 #ifdef __cplusplus
 #if __cplusplus
@@ -41,14 +39,6 @@ extern "C" {
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
-/* *
- * @ingroup los_arch_interrupt
- * Maximum number of used hardware interrupts.
- */
-#ifndef OS_HWI_MAX_NUM
-#define OS_HWI_MAX_NUM                        LOSCFG_PLATFORM_HWI_LIMIT
-#endif
-
 /* *
  * @ingroup los_arch_interrupt
  * Highest priority of a hardware interrupt.
@@ -65,18 +55,11 @@ extern "C" {
 #define OS_HWI_PRIO_LOWEST                    7
 #endif
 
-
-/* *
- * @ingroup  los_arch_interrupt
- * Define the type of a hardware interrupt vector table function.
- */
-typedef VOID (**HWI_VECTOR_FUNC)(void);
-
 /* *
  * @ingroup los_arch_interrupt
- * Count of interrupts.
+ * AIRCR register priority group parameter .
  */
-extern UINT32 g_intCount;
+#define OS_NVIC_AIRCR_PRIGROUP                7
 
 /* *
  * @ingroup los_arch_interrupt
@@ -90,12 +73,6 @@ extern UINT32 g_intCount;
  */
 #define OS_VECTOR_CNT                         (OS_SYS_VECTOR_CNT + OS_HWI_MAX_NUM)
 
-/* *
- * @ingroup los_arch_interrupt
- * AIRCR register priority group parameter .
- */
-#define OS_NVIC_AIRCR_PRIGROUP                7
-
 /* *
  * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Invalid interrupt number.
@@ -103,7 +80,7 @@ extern UINT32 g_intCount;
  * Value: 0x02000900
  *
  * Solution: Ensure that the interrupt number is valid.
- * The value range of the interrupt number applicable for a Cortex-M33 platform is [OS_USER_HWI_MIN,OS_USER_HWI_MAX].
+ * The value range of the interrupt number applicable for a Cortex-M55  platformis [OS_USER_HWI_MIN,OS_USER_HWI_MAX].
  */
 #define OS_ERRNO_HWI_NUM_INVALID              LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x00)
 
@@ -154,7 +131,7 @@ extern UINT32 g_intCount;
  * Value: 0x02000905
  *
  * Solution: Ensure that the interrupt priority is valid.
- * The value range of the interrupt priority applicable for a Cortex-M33 platform is [0,15].
+ * The value range of the interrupt priority applicable for a Cortex-M55 platform is [0,15].
  */
 #define OS_ERRNO_HWI_PRIO_INVALID             LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x05)
 
@@ -179,6 +156,16 @@ extern UINT32 g_intCount;
  */
 #define OS_ERRNO_HWI_FASTMODE_ALREADY_CREATED LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x07)
 
+/* *
+ * @ingroup los_arch_interrupt
+ * Hardware interrupt error code: Invalid interrupt operation function.
+ *
+ * Value: 0x0200090c
+ *
+ * Solution: Set a valid interrupt operation function
+ */
+#define OS_ERRNO_HWI_OPS_FUNC_NULL            LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x0c)
+
 /* *
  * @ingroup los_arch_interrupt
  * SysTick control and status register.
@@ -305,20 +292,6 @@ extern UINT32 g_intCount;
  */
 #define OS_EXC_SYS_TICK                       15
 
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-/* *
- * @ingroup los_arch_interrupt
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg);
-#else
-/* *
- * @ingroup los_arch_interrupt
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
-#endif
-
 /* *
  * @ingroup  los_arch_interrupt
  * @brief: Hardware interrupt entry function.
@@ -338,25 +311,6 @@ extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
  */
 extern VOID HalInterrupt(VOID);
 
-/* *
- * @ingroup  los_arch_interrupt
- * @brief: Default vector handling function.
- *
- * @par Description:
- * This API is used to configure interrupt for null function.
- *
- * @attention:
- * <ul><li>None.</li></ul>
- *
- * @param:None.
- *
- * @retval:None.
- * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
- * @see None.
- */
-extern VOID HalHwiDefaultHandler(VOID);
-
 /* *
  * @ingroup  los_arch_interrupt
  * @brief: Reset the vector table.
@@ -396,34 +350,20 @@ extern VOID Reset_Handler(VOID);
  */
 extern VOID HalPendSV(VOID);
 
-
-#define OS_EXC_IN_INIT                      0
-#define OS_EXC_IN_TASK                      1
-#define OS_EXC_IN_HWI                       2
-
 #define OS_EXC_MAX_BUF_LEN                  25
 #define OS_EXC_MAX_NEST_DEPTH               1
+#define OS_EXC_FLAG_NO_FLOAT                0x10000000
 
 #define OS_NVIC_SHCSR                       0xE000ED24
 #define OS_NVIC_CCR                         0xE000ED14
-
 #define OS_NVIC_INT_ENABLE_SIZE             0x20
 #define OS_NVIC_INT_PRI_SIZE                0xF0
 #define OS_NVIC_EXCPRI_SIZE                 0xC
 #define OS_NVIC_INT_CTRL_SIZE               4
 #define OS_NVIC_SHCSR_SIZE                  4
-
 #define OS_NVIC_INT_PEND_SIZE               OS_NVIC_INT_ACT_SIZE
 #define OS_NVIC_INT_ACT_SIZE                OS_NVIC_INT_ENABLE_SIZE
 
-#define OS_EXC_FLAG_NO_FLOAT                0x10000000
-#define OS_EXC_FLAG_FAULTADDR_VALID         0x01
-#define OS_EXC_FLAG_IN_HWI                  0x02
-
-#define OS_EXC_IMPRECISE_ACCESS_ADDR        0xABABABAB
-
-#define OS_EXC_EVENT                        0x00000001
-
 /**
  * @ingroup los_exc
  * the struct of register files
@@ -496,7 +436,6 @@ typedef struct TagExcContext {
 
 typedef VOID (*EXC_PROC_FUNC)(UINT32, EXC_CONTEXT_S *);
 VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, UINT32 pid, EXC_CONTEXT_S *excBufAddr);
-
 VOID HalExcNMI(VOID);
 VOID HalExcHardFault(VOID);
 VOID HalExcMemFault(VOID);
@@ -654,7 +593,7 @@ VOID HalHwiInit(VOID);
  * @ingroup los_exc
  * Exception information structure
  *
- * Description: Exception information saved when an exception is triggered on the Cortex-M33 platform.
+ * Description: Exception information saved when an exception is triggered on the Cortex-M55 platform.
  *
  */
 typedef struct TagExcInfo {
@@ -677,10 +616,9 @@ typedef struct TagExcInfo {
     EXC_CONTEXT_S *context;
 } ExcInfo;
 
-extern UINT32 g_curNestCount;
-extern UINT32 g_intCount;
-extern UINT8 g_uwExcTbl[32];
 extern ExcInfo g_excInfo;
+extern UINT32 g_curNestCount;
+extern UINT8 g_uwExcTbl[32];
 
 #define MAX_INT_INFO_SIZE       (8 + 0x164)
 

arch/arm/cortex-m55/gcc/NTZ/los_interrupt.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2022 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2022-2023 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:
@@ -27,12 +27,10 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include "los_interrupt.h"
 #include <stdarg.h>
 #include "securec.h"
 #include "los_context.h"
 #include "los_arch_interrupt.h"
-#include "los_debug.h"
 #include "los_hook.h"
 #include "los_task.h"
 #include "los_sched.h"
@@ -43,89 +41,6 @@
 #endif
 
 #define DEF_HANDLER_START_INDEX 2
-UINT32 g_intCount = 0;
-
-
-/* *
- * @ingroup los_hwi
- * Hardware interrupt form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC __attribute__((aligned(LOSCFG_ARCH_HWI_VECTOR_ALIGN))) g_hwiForm[OS_VECTOR_CNT] = {0};
-
-#if (LOSCFG_DEBUG_TOOLS == 1)
-STATIC UINT32 g_hwiFormCnt[OS_HWI_MAX_NUM] = {0};
-STATIC CHAR *g_hwiFormName[OS_HWI_MAX_NUM] = {0};
-
-UINT32 OsGetHwiFormCnt(UINT32 index)
-{
-    return g_hwiFormCnt[index];
-}
-
-CHAR *OsGetHwiFormName(UINT32 index)
-{
-    return g_hwiFormName[index];
-}
-
-BOOL OsGetHwiCreated(UINT32 index)
-{
-    if (g_hwiForm[index] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return TRUE;
-    }
-
-    return FALSE;
-}
-#endif
-
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-
-typedef struct {
-    HWI_PROC_FUNC pfnHandler;
-    VOID *pParm;
-} HWI_HANDLER_FUNC;
-
-/* *
- * @ingroup los_hwi
- * Hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pfnHandler = vector;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pParm = arg;
-    }
-}
-
-#else
-/* *
- * @ingroup los_hwi
- * hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {0};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT] = vector;
-    }
-}
-#endif
-
-WEAK VOID SysTick_Handler(VOID)
-{
-    return;
-}
 
 /* ****************************************************************************
  Function    : HwiNumGet
@@ -141,99 +56,54 @@ STATIC UINT32 HwiNumGet(VOID)
 
 STATIC UINT32 HwiUnmask(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_EnableIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiMask(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_DisableIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiSetPriority(HWI_HANDLE_T hwiNum, UINT8 priority)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (priority > OS_HWI_PRIO_LOWEST) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-
     NVIC_SetPriority((IRQn_Type)hwiNum, priority);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiPending(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_SetPendingIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiClear(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_ClearPendingIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
-HwiControllerOps g_archHwiOps = {
+STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
+{
+    HwiSetPriority(hwiNum, hwiPrio);
+    HwiUnmask(hwiNum);
+    return LOS_OK;
+}
+
+STATIC HwiControllerOps g_archHwiOps = {
     .enableIrq      = HwiUnmask,
     .disableIrq     = HwiMask,
     .setIrqPriority = HwiSetPriority,
     .getCurIrqNum   = HwiNumGet,
     .triggerIrq     = HwiPending,
     .clearIrq       = HwiClear,
+    .createIrq      = HwiCreate,
 };
 
-inline UINT32 ArchIsIntActive(VOID)
+HwiControllerOps *ArchIntOpsGet(VOID)
 {
-    return (g_intCount > 0);
-}
-/* ****************************************************************************
- Function    : HalHwiDefaultHandler
- Description : default handler of the hardware interrupt
- Input       : None
- Output      : None
- Return      : None
- **************************************************************************** */
-LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
-{
-    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());
-    while (1) {}
-}
-
-WEAK VOID HalPreInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
-}
-
-WEAK VOID HalAftInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
+    return &g_archHwiOps;
 }
 
 /* ****************************************************************************
@@ -292,97 +162,6 @@ LITE_OS_SEC_TEXT VOID HalInterrupt(VOID)
     LOS_IntRestore(intSave);
 }
 
-/* ****************************************************************************
- Function    : ArchHwiCreate
- Description : create hardware interrupt
- Input       : hwiNum   --- hwi num to create
-               hwiPrio  --- priority of the hwi
-               hwiMode  --- unused
-               hwiHandler --- hwi handler
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiCreate(HWI_HANDLE_T hwiNum,
-                                           HWI_PRIOR_T hwiPrio,
-                                           HWI_MODE_T hwiMode,
-                                           HWI_PROC_FUNC hwiHandler,
-                                           HwiIrqParam *irqParam)
-{
-    (VOID)hwiMode;
-    UINT32 intSave;
-
-    if (hwiHandler == NULL) {
-        return OS_ERRNO_HWI_PROC_FUNC_NULL;
-    }
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return OS_ERRNO_HWI_ALREADY_CREATED;
-    }
-
-    if (hwiPrio > OS_HWI_PRIO_LOWEST) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-
-    intSave = LOS_IntLock();
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-    if (irqParam != NULL) {
-        OsSetVector(hwiNum, hwiHandler, irqParam->pDevId);
-    } else {
-        OsSetVector(hwiNum, hwiHandler, NULL);
-    }
-#else
-    (VOID)irqParam;
-    OsSetVector(hwiNum, hwiHandler);
-#endif
-
-#if (LOSCFG_DEBUG_TOOLS == 1)
-    if ((irqParam != NULL) && (irqParam->pName != NULL)) {
-        g_hwiFormName[hwiNum + OS_SYS_VECTOR_CNT] = (CHAR *)irqParam->pName;
-    }
-    g_hwiFormCnt[hwiNum + OS_SYS_VECTOR_CNT] = 0;
-#endif
-
-    HwiUnmask((IRQn_Type)hwiNum);
-    HwiSetPriority((IRQn_Type)hwiNum, hwiPrio);
-
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
-/* ****************************************************************************
- Function    : ArchHwiDelete
- Description : Delete hardware interrupt
- Input       : hwiNum   --- hwi num to delete
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiDelete(HWI_HANDLE_T hwiNum, HwiIrqParam *irqParam)
-{
-    (VOID)irqParam;
-    UINT32 intSave;
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    HwiMask((IRQn_Type)hwiNum);
-
-    intSave = LOS_IntLock();
-
-    g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
-
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
 #define FAULT_STATUS_REG_BIT            32
 #define USGFAULT                        (1 << 18)
 #define BUSFAULT                        (1 << 17)
@@ -609,6 +388,11 @@ LITE_OS_SEC_TEXT_INIT VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, U
     ArchSysExit();
 }
 
+WEAK VOID SysTick_Handler(VOID)
+{
+    return;
+}
+
 /* ****************************************************************************
  Function    : HalHwiInit
  Description : initialization of the hardware interrupt
@@ -620,23 +404,24 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
     UINT32 index;
-    g_hwiForm[0] = 0;             /* [0] Top of Stack */
-    g_hwiForm[1] = 0; /* [1] reset */
+    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
+    hwiForm[0] = 0;             /* [0] Top of Stack */
+    hwiForm[1] = 0; /* [1] reset */
     for (index = DEF_HANDLER_START_INDEX; index < OS_VECTOR_CNT; index++) {
-        g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+        hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
     }
     /* Exception handler register */
-    g_hwiForm[NonMaskableInt_IRQn + OS_SYS_VECTOR_CNT]   = (HWI_PROC_FUNC)HalExcNMI;
-    g_hwiForm[HARDFAULT_IRQN + OS_SYS_VECTOR_CNT]        = (HWI_PROC_FUNC)HalExcHardFault;
-    g_hwiForm[MemoryManagement_IRQn + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalExcMemFault;
-    g_hwiForm[BusFault_IRQn + OS_SYS_VECTOR_CNT]         = (HWI_PROC_FUNC)HalExcBusFault;
-    g_hwiForm[UsageFault_IRQn + OS_SYS_VECTOR_CNT]       = (HWI_PROC_FUNC)HalExcUsageFault;
-    g_hwiForm[SVCall_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalSVCHandler;
-    g_hwiForm[PendSV_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalPendSV;
-    g_hwiForm[SysTick_IRQn + OS_SYS_VECTOR_CNT]          = (HWI_PROC_FUNC)OsTickHandler;
+    hwiForm[NonMaskableInt_IRQn + OS_SYS_VECTOR_CNT]   = (HWI_PROC_FUNC)HalExcNMI;
+    hwiForm[HARDFAULT_IRQN + OS_SYS_VECTOR_CNT]        = (HWI_PROC_FUNC)HalExcHardFault;
+    hwiForm[MemoryManagement_IRQn + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalExcMemFault;
+    hwiForm[BusFault_IRQn + OS_SYS_VECTOR_CNT]         = (HWI_PROC_FUNC)HalExcBusFault;
+    hwiForm[UsageFault_IRQn + OS_SYS_VECTOR_CNT]       = (HWI_PROC_FUNC)HalExcUsageFault;
+    hwiForm[SVCall_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalSVCHandler;
+    hwiForm[PendSV_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalPendSV;
+    hwiForm[SysTick_IRQn + OS_SYS_VECTOR_CNT]          = (HWI_PROC_FUNC)OsTickHandler;
 
     /* Interrupt vector table location */
-    SCB->VTOR = (UINT32)(UINTPTR)g_hwiForm;
+    SCB->VTOR = (UINT32)(UINTPTR)hwiForm;
 #endif
 #if (__CORTEX_M >= 0x03U) /* only for Cortex-M3 and above */
     NVIC_SetPriorityGrouping(OS_NVIC_AIRCR_PRIGROUP);
@@ -654,4 +439,3 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 
     return;
 }
-

arch/arm/cortex-m55/gcc/TZ/non_secure/los_arch_interrupt.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -32,9 +32,7 @@
 #ifndef _LOS_ARCH_INTERRUPT_H
 #define _LOS_ARCH_INTERRUPT_H
 
-#include "los_config.h"
-#include "los_compiler.h"
-#include "los_interrupt.h"
+#include "los_common_interrupt.h"
 
 #ifdef __cplusplus
 #if __cplusplus
@@ -42,14 +40,6 @@ extern "C" {
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
-/* *
- * @ingroup los_arch_interrupt
- * Maximum number of used hardware interrupts.
- */
-#ifndef OS_HWI_MAX_NUM
-#define OS_HWI_MAX_NUM                        LOSCFG_PLATFORM_HWI_LIMIT
-#endif
-
 /* *
  * @ingroup los_arch_interrupt
  * Highest priority of a hardware interrupt.
@@ -66,18 +56,17 @@ extern "C" {
 #define OS_HWI_PRIO_LOWEST                    7
 #endif
 
-
 /* *
- * @ingroup  los_arch_interrupt
- * Define the type of a hardware interrupt vector table function.
+ * @ingroup los_arch_interrupt
+ * AIRCR register priority group parameter .
  */
-typedef VOID (**HWI_VECTOR_FUNC)(void);
+#define OS_NVIC_AIRCR_PRIGROUP                7
 
 /* *
  * @ingroup los_arch_interrupt
- * Count of interrupts.
+ * Boot interrupt vector table.
  */
-extern UINT32 g_intCount;
+extern UINT32 _BootVectors[];
 
 /* *
  * @ingroup los_arch_interrupt
@@ -91,18 +80,6 @@ extern UINT32 g_intCount;
  */
 #define OS_VECTOR_CNT                         (OS_SYS_VECTOR_CNT + OS_HWI_MAX_NUM)
 
-/* *
- * @ingroup los_arch_interrupt
- * AIRCR register priority group parameter .
- */
-#define OS_NVIC_AIRCR_PRIGROUP                7
-
-/* *
- * @ingroup los_arch_interrupt
- * Boot interrupt vector table.
- */
-extern UINT32 _BootVectors[];
-
 /* *
  * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Invalid interrupt number.
@@ -110,7 +87,7 @@ extern UINT32 _BootVectors[];
  * Value: 0x02000900
  *
  * Solution: Ensure that the interrupt number is valid.
- * The value range of the interrupt number applicable for a Cortex-M33 platform is [OS_USER_HWI_MIN,OS_USER_HWI_MAX].
+ * The value range of the interrupt number applicable for a Cortex-M33  platform is [OS_USER_HWI_MIN,OS_USER_HWI_MAX].
  */
 #define OS_ERRNO_HWI_NUM_INVALID              LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x00)
 
@@ -186,6 +163,16 @@ extern UINT32 _BootVectors[];
  */
 #define OS_ERRNO_HWI_FASTMODE_ALREADY_CREATED LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x07)
 
+/* *
+ * @ingroup los_arch_interrupt
+ * Hardware interrupt error code: Invalid interrupt operation function.
+ *
+ * Value: 0x0200090c
+ *
+ * Solution: Set a valid interrupt operation function
+ */
+#define OS_ERRNO_HWI_OPS_FUNC_NULL            LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x0c)
+
 /* *
  * @ingroup los_arch_interrupt
  * SysTick control and status register.
@@ -312,20 +299,6 @@ extern UINT32 _BootVectors[];
  */
 #define OS_EXC_SYS_TICK                       15
 
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-/* *
- * @ingroup los_arch_interrupt
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg);
-#else
-/* *
- * @ingroup los_arch_interrupt
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
-#endif
-
 /* *
  * @ingroup  los_arch_interrupt
  * @brief: Hardware interrupt entry function.
@@ -345,25 +318,6 @@ extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
  */
 extern VOID HalInterrupt(VOID);
 
-/* *
- * @ingroup  los_arch_interrupt
- * @brief: Default vector handling function.
- *
- * @par Description:
- * This API is used to configure interrupt for null function.
- *
- * @attention:
- * <ul><li>None.</li></ul>
- *
- * @param:None.
- *
- * @retval:None.
- * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
- * @see None.
- */
-extern VOID HalHwiDefaultHandler(VOID);
-
 /* *
  * @ingroup  los_arch_interrupt
  * @brief: Reset the vector table.
@@ -403,34 +357,20 @@ extern VOID Reset_Handler(VOID);
  */
 extern VOID HalPendSV(VOID);
 
-
-#define OS_EXC_IN_INIT                      0
-#define OS_EXC_IN_TASK                      1
-#define OS_EXC_IN_HWI                       2
-
 #define OS_EXC_MAX_BUF_LEN                  25
 #define OS_EXC_MAX_NEST_DEPTH               1
+#define OS_EXC_FLAG_NO_FLOAT                0x10000000
 
 #define OS_NVIC_SHCSR                       0xE000ED24
 #define OS_NVIC_CCR                         0xE000ED14
-
 #define OS_NVIC_INT_ENABLE_SIZE             0x20
 #define OS_NVIC_INT_PRI_SIZE                0xF0
 #define OS_NVIC_EXCPRI_SIZE                 0xC
 #define OS_NVIC_INT_CTRL_SIZE               4
 #define OS_NVIC_SHCSR_SIZE                  4
-
 #define OS_NVIC_INT_PEND_SIZE               OS_NVIC_INT_ACT_SIZE
 #define OS_NVIC_INT_ACT_SIZE                OS_NVIC_INT_ENABLE_SIZE
 
-#define OS_EXC_FLAG_NO_FLOAT                0x10000000
-#define OS_EXC_FLAG_FAULTADDR_VALID         0x01
-#define OS_EXC_FLAG_IN_HWI                  0x02
-
-#define OS_EXC_IMPRECISE_ACCESS_ADDR        0xABABABAB
-
-#define OS_EXC_EVENT                        0x00000001
-
 /**
  * @ingroup los_exc
  * the struct of register files
@@ -503,7 +443,6 @@ typedef struct TagExcContext {
 
 typedef VOID (*EXC_PROC_FUNC)(UINT32, EXC_CONTEXT_S *);
 VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, UINT32 pid, EXC_CONTEXT_S *excBufAddr);
-
 VOID HalExcNMI(VOID);
 VOID HalExcHardFault(VOID);
 VOID HalExcMemFault(VOID);
@@ -644,7 +583,7 @@ VOID HalHwiInit(VOID);
  * @ingroup los_exc
  * Exception information structure
  *
- * Description: Exception information saved when an exception is triggered on the Cortex-M33 platform.
+ * Description: Exception information saved when an exception is triggered on the Cortex-M55 platform.
  *
  */
 typedef struct TagExcInfo {
@@ -667,10 +606,9 @@ typedef struct TagExcInfo {
     EXC_CONTEXT_S *context;
 } ExcInfo;
 
-extern UINT32 g_curNestCount;
-extern UINT32 g_intCount;
-extern UINT8 g_uwExcTbl[32];
 extern ExcInfo g_excInfo;
+extern UINT32 g_curNestCount;
+extern UINT8 g_uwExcTbl[32];
 
 #define MAX_INT_INFO_SIZE       (8 + 0x164)
 

arch/arm/cortex-m55/gcc/TZ/non_secure/los_interrupt.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -28,99 +28,20 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include "los_interrupt.h"
 #include <stdarg.h>
 #include "securec.h"
 #include "los_context.h"
 #include "los_arch_interrupt.h"
-#include "los_debug.h"
-#include "los_hook.h"
 #include "los_task.h"
 #include "los_sched.h"
 #include "los_memory.h"
 #include "los_membox.h"
+#include "los_hook.h"
 #if (LOSCFG_CPUP_INCLUDE_IRQ == 1)
 #include "los_cpup.h"
 #endif
 
 #define DEF_HANDLER_START_INDEX 2
-UINT32 g_intCount = 0;
-
-/* *
- * @ingroup los_hwi
- * Hardware interrupt form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC __attribute__((aligned(LOSCFG_ARCH_HWI_VECTOR_ALIGN))) g_hwiForm[OS_VECTOR_CNT] = {0};
-
-#if (LOSCFG_DEBUG_TOOLS == 1)
-STATIC UINT32 g_hwiFormCnt[OS_HWI_MAX_NUM] = {0};
-STATIC CHAR *g_hwiFormName[OS_HWI_MAX_NUM] = {0};
-
-UINT32 OsGetHwiFormCnt(UINT32 index)
-{
-    return g_hwiFormCnt[index];
-}
-
-CHAR *OsGetHwiFormName(UINT32 index)
-{
-    return g_hwiFormName[index];
-}
-
-BOOL OsGetHwiCreated(UINT32 index)
-{
-    if (g_hwiForm[index] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return TRUE;
-    }
-
-    return FALSE;
-}
-#endif
-
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-
-typedef struct {
-    HWI_PROC_FUNC pfnHandler;
-    VOID *pParm;
-} HWI_HANDLER_FUNC;
-
-/* *
- * @ingroup los_hwi
- * Hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pfnHandler = vector;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pParm = arg;
-    }
-}
-
-#else
-/* *
- * @ingroup los_hwi
- * hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {0};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT] = vector;
-    }
-}
-#endif
 
 /* ****************************************************************************
  Function    : HwiNumGet
@@ -136,100 +57,54 @@ STATIC UINT32 HwiNumGet(VOID)
 
 STATIC UINT32 HwiUnmask(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_EnableIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiMask(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_DisableIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiSetPriority(HWI_HANDLE_T hwiNum, UINT8 priority)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (priority > OS_HWI_PRIO_LOWEST) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-
     NVIC_SetPriority((IRQn_Type)hwiNum, priority);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiPending(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_SetPendingIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiClear(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_ClearPendingIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
-HwiControllerOps g_archHwiOps = {
+STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
+{
+    HwiSetPriority(hwiNum, hwiPrio);
+    HwiUnmask(hwiNum);
+    return LOS_OK;
+}
+
+STATIC HwiControllerOps g_archHwiOps = {
     .enableIrq      = HwiUnmask,
     .disableIrq     = HwiMask,
     .setIrqPriority = HwiSetPriority,
     .getCurIrqNum   = HwiNumGet,
     .triggerIrq     = HwiPending,
     .clearIrq       = HwiClear,
+    .createIrq      = HwiCreate,
 };
 
-inline UINT32 ArchIsIntActive(VOID)
+HwiControllerOps *ArchIntOpsGet(VOID)
 {
-    return (g_intCount > 0);
-}
-/* ****************************************************************************
- Function    : HalHwiDefaultHandler
- Description : default handler of the hardware interrupt
- Input       : None
- Output      : None
- Return      : None
- **************************************************************************** */
-/*lint -e529*/
-LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
-{
-    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());
-    while (1) {}
-}
-
-WEAK VOID HalPreInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
-}
-
-WEAK VOID HalAftInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
+    return &g_archHwiOps;
 }
 
 /* ****************************************************************************
@@ -288,97 +163,6 @@ LITE_OS_SEC_TEXT VOID HalInterrupt(VOID)
     LOS_IntRestore(intSave);
 }
 
-/* ****************************************************************************
- Function    : ArchHwiCreate
- Description : create hardware interrupt
- Input       : hwiNum   --- hwi num to create
-               hwiPrio  --- priority of the hwi
-               hwiMode  --- unused
-               hwiHandler --- hwi handler
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiCreate(HWI_HANDLE_T hwiNum,
-                                           HWI_PRIOR_T hwiPrio,
-                                           HWI_MODE_T hwiMode,
-                                           HWI_PROC_FUNC hwiHandler,
-                                           HwiIrqParam *irqParam)
-{
-    (VOID)hwiMode;
-    UINT32 intSave;
-
-    if (hwiHandler == NULL) {
-        return OS_ERRNO_HWI_PROC_FUNC_NULL;
-    }
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return OS_ERRNO_HWI_ALREADY_CREATED;
-    }
-
-    if (hwiPrio > OS_HWI_PRIO_LOWEST) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-
-    intSave = LOS_IntLock();
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-    if (irqParam != NULL) {
-        OsSetVector(hwiNum, hwiHandler, irqParam->pDevId);
-    } else {
-        OsSetVector(hwiNum, hwiHandler, NULL);
-    }
-#else
-    (VOID)irqParam;
-    OsSetVector(hwiNum, hwiHandler);
-#endif
-
-#if (LOSCFG_DEBUG_TOOLS == 1)
-    if ((irqParam != NULL) && (irqParam->pName != NULL)) {
-        g_hwiFormName[hwiNum + OS_SYS_VECTOR_CNT] = (CHAR *)irqParam->pName;
-    }
-    g_hwiFormCnt[hwiNum + OS_SYS_VECTOR_CNT] = 0;
-#endif
-
-    HwiUnmask((IRQn_Type)hwiNum);
-    HwiSetPriority((IRQn_Type)hwiNum, hwiPrio);
-
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
-/* ****************************************************************************
- Function    : ArchHwiDelete
- Description : Delete hardware interrupt
- Input       : hwiNum   --- hwi num to delete
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiDelete(HWI_HANDLE_T hwiNum, HwiIrqParam *irqParam)
-{
-    (VOID)irqParam;
-    UINT32 intSave;
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    NVIC_DisableIRQ((IRQn_Type)hwiNum);
-
-    intSave = LOS_IntLock();
-
-    g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
-
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
 #define FAULT_STATUS_REG_BIT            32
 #define USGFAULT                        (1 << 18)
 #define BUSFAULT                        (1 << 17)
@@ -612,23 +396,24 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
     UINT32 index;
-    g_hwiForm[0] = 0; /* [0] Top of Stack */
-    g_hwiForm[1] = 0; /* [1] reset */
+    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
+    hwiForm[0] = 0;   /* [0] Top of Stack */
+    hwiForm[1] = 0;   /* [1] reset */
     for (index = DEF_HANDLER_START_INDEX; index < OS_VECTOR_CNT; index++) {
-        g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+        hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
     }
     /* Exception handler register */
-    g_hwiForm[NonMaskableInt_IRQn + OS_SYS_VECTOR_CNT]   = (HWI_PROC_FUNC)HalExcNMI;
-    g_hwiForm[HARDFAULT_IRQN + OS_SYS_VECTOR_CNT]        = (HWI_PROC_FUNC)HalExcHardFault;
-    g_hwiForm[MemoryManagement_IRQn + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalExcMemFault;
-    g_hwiForm[BusFault_IRQn + OS_SYS_VECTOR_CNT]         = (HWI_PROC_FUNC)HalExcBusFault;
-    g_hwiForm[UsageFault_IRQn + OS_SYS_VECTOR_CNT]       = (HWI_PROC_FUNC)HalExcUsageFault;
-    g_hwiForm[SVCall_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalSVCHandler;
-    g_hwiForm[PendSV_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalPendSV;
-    g_hwiForm[SysTick_IRQn + OS_SYS_VECTOR_CNT]          = (HWI_PROC_FUNC)OsTickHandler;
+    hwiForm[NonMaskableInt_IRQn + OS_SYS_VECTOR_CNT]   = (HWI_PROC_FUNC)HalExcNMI;
+    hwiForm[HARDFAULT_IRQN + OS_SYS_VECTOR_CNT]        = (HWI_PROC_FUNC)HalExcHardFault;
+    hwiForm[MemoryManagement_IRQn + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalExcMemFault;
+    hwiForm[BusFault_IRQn + OS_SYS_VECTOR_CNT]         = (HWI_PROC_FUNC)HalExcBusFault;
+    hwiForm[UsageFault_IRQn + OS_SYS_VECTOR_CNT]       = (HWI_PROC_FUNC)HalExcUsageFault;
+    hwiForm[SVCall_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalSVCHandler;
+    hwiForm[PendSV_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalPendSV;
+    hwiForm[SysTick_IRQn + OS_SYS_VECTOR_CNT]          = (HWI_PROC_FUNC)OsTickHandler;
 
     /* Interrupt vector table location */
-    SCB->VTOR = (UINT32)(UINTPTR)g_hwiForm;
+    SCB->VTOR = (UINT32)(UINTPTR)hwiForm;
 #endif
 #if (__CORTEX_M >= 0x03U) /* only for Cortex-M3 and above */
     NVIC_SetPriorityGrouping(OS_NVIC_AIRCR_PRIGROUP);
@@ -646,4 +431,3 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 
     return;
 }
-

arch/arm/cortex-m55/iar/NTZ/los_arch_interrupt.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -29,12 +29,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LOS_EXC_H
-#define _LOS_EXC_H
+#ifndef _LOS_ARCH_INTERRUPT_H
+#define _LOS_ARCH_INTERRUPT_H
 
-#include "los_config.h"
-#include "los_compiler.h"
-#include "los_interrupt.h"
+#include "los_common_interrupt.h"
 
 #ifdef __cplusplus
 #if __cplusplus
@@ -43,15 +41,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 /* *
- * @ingroup los_hwi
- * Maximum number of used hardware interrupts.
- */
-#ifndef OS_HWI_MAX_NUM
-#define OS_HWI_MAX_NUM                        LOSCFG_PLATFORM_HWI_LIMIT
-#endif
-
-/* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Highest priority of a hardware interrupt.
  */
 #ifndef OS_HWI_PRIO_HIGHEST
@@ -59,63 +49,50 @@ extern "C" {
 #endif
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Lowest priority of a hardware interrupt.
  */
 #ifndef OS_HWI_PRIO_LOWEST
 #define OS_HWI_PRIO_LOWEST                    7
 #endif
 
-
 /* *
- * @ingroup  los_hwi
- * Define the type of a hardware interrupt vector table function.
- */
-typedef VOID (**HWI_VECTOR_FUNC)(void);
-
-/* *
- * @ingroup los_hwi
- * Count of interrupts.
- */
-extern UINT32 g_intCount;
-
-/* *
- * @ingroup los_hwi
- * Count of M-Core system interrupt vector.
- */
-#define OS_SYS_VECTOR_CNT                     16
-
-/* *
- * @ingroup los_hwi
- * Count of M-Core interrupt vector.
- */
-#define OS_VECTOR_CNT                         (OS_SYS_VECTOR_CNT + OS_HWI_MAX_NUM)
-
-/* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * AIRCR register priority group parameter .
  */
 #define OS_NVIC_AIRCR_PRIGROUP                7
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Boot interrupt vector table.
  */
 extern UINT32 _BootVectors[];
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
+ * Count of M-Core system interrupt vector.
+ */
+#define OS_SYS_VECTOR_CNT                     16
+
+/* *
+ * @ingroup los_arch_interrupt
+ * Count of M-Core interrupt vector.
+ */
+#define OS_VECTOR_CNT                         (OS_SYS_VECTOR_CNT + OS_HWI_MAX_NUM)
+
+/* *
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Invalid interrupt number.
  *
  * Value: 0x02000900
  *
  * Solution: Ensure that the interrupt number is valid.
- * The value range of the interrupt number applicable for a Cortex-M33 platform is [OS_USER_HWI_MIN,OS_USER_HWI_MAX].
+ * The value range of the interrupt number applicable for a Cortex-M33  platform is [OS_USER_HWI_MIN,OS_USER_HWI_MAX].
  */
 #define OS_ERRNO_HWI_NUM_INVALID              LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x00)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Null hardware interrupt handling function.
  *
  * Value: 0x02000901
@@ -125,7 +102,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_PROC_FUNC_NULL           LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x01)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Insufficient interrupt resources for hardware interrupt creation.
  *
  * Value: 0x02000902
@@ -135,7 +112,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_CB_UNAVAILABLE           LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x02)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Insufficient memory for hardware interrupt initialization.
  *
  * Value: 0x02000903
@@ -145,7 +122,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_NO_MEMORY                LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x03)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: The interrupt has already been created.
  *
  * Value: 0x02000904
@@ -155,7 +132,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_ALREADY_CREATED          LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x04)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Invalid interrupt priority.
  *
  * Value: 0x02000905
@@ -166,7 +143,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_PRIO_INVALID             LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x05)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Incorrect interrupt creation mode.
  *
  * Value: 0x02000906
@@ -177,7 +154,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_MODE_INVALID             LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x06)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: The interrupt has already been created as a fast interrupt.
  *
  * Value: 0x02000907
@@ -187,7 +164,17 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_FASTMODE_ALREADY_CREATED LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x07)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
+ * Hardware interrupt error code: Invalid interrupt operation function.
+ *
+ * Value: 0x0200090c
+ *
+ * Solution: Set a valid interrupt operation function
+ */
+#define OS_ERRNO_HWI_OPS_FUNC_NULL            LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x0c)
+
+/* *
+ * @ingroup los_arch_interrupt
  * SysTick control and status register.
  */
 #define OS_SYSTICK_CONTROL_REG                0xE000E010
@@ -199,133 +186,119 @@ extern UINT32 _BootVectors[];
 #define OS_SYSTICK_CURRENT_REG                0xE000E018
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt Priority-Level Registers.
  */
 #define OS_NVIC_PRI_BASE                      0xE000E400
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt enable register for 0-31.
  */
 #define OS_NVIC_SETENA_BASE                   0xE000E100
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * interrupt pending register.
  */
 #define OS_NVIC_SETPEND_BASE                  0xE000E200
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt active register.
  */
 #define OS_NVIC_INT_ACT_BASE                  0xE000E300
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt disable register for 0-31.
  */
 #define OS_NVIC_CLRENA_BASE                   0xE000E180
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt control and status register.
  */
 #define OS_NVIC_INT_CTRL                      0xE000ED04
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Vector table offset register.
  */
 #define OS_NVIC_VTOR                          0xE000ED08
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Application interrupt and reset control register
  */
 #define OS_NVIC_AIRCR                         0xE000ED0C
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * System exception priority register.
  */
 #define OS_NVIC_EXCPRI_BASE                   0xE000ED18
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 1 :reset.
  */
 #define OS_EXC_RESET                          1
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 2 :Non-Maskable Interrupt.
  */
 #define OS_EXC_NMI                            2
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 3 :(hard)fault.
  */
 #define OS_EXC_HARD_FAULT                     3
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 4 :MemManage fault.
  */
 #define OS_EXC_MPU_FAULT                      4
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 5 :Bus fault.
  */
 #define OS_EXC_BUS_FAULT                      5
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 6 :Usage fault.
  */
 #define OS_EXC_USAGE_FAULT                    6
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 11 :SVCall.
  */
 #define OS_EXC_SVC_CALL                       11
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 12 :Debug monitor.
  */
 #define OS_EXC_DBG_MONITOR                    12
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 14 :PendSV.
  */
 #define OS_EXC_PEND_SV                        14
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 15 :SysTick.
  */
 #define OS_EXC_SYS_TICK                       15
 
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg);
-#else
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
-#endif
-
 /* *
  * @ingroup  los_hwi
  * @brief: Hardware interrupt entry function.
@@ -346,27 +319,7 @@ extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
 extern VOID HalInterrupt(VOID);
 
 /* *
- * @ingroup  los_hwi
- * @brief: Default vector handling function.
- *
- * @par Description:
- * This API is used to configure interrupt for null function.
- *
- * @attention:
- * <ul><li>None.</li></ul>
- *
- * @param:None.
- *
- * @retval:None.
- * @par Dependency:
- * <ul><li>los_hwi.h: the header file that contains the API declaration.</li
-></ul>
- * @see None.
- */
-extern VOID HalHwiDefaultHandler(VOID);
-
-/* *
- * @ingroup  los_hwi
+ * @ingroup  los_arch_interrupt
  * @brief: Reset the vector table.
  *
  * @par Description:
@@ -379,13 +332,13 @@ extern VOID HalHwiDefaultHandler(VOID);
  *
  * @retval:None.
  * @par Dependency:
- * <ul><li>los_hwi.h: the header file that contains the API declaration.</li></ul>
+ * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
  * @see None.
  */
 extern VOID Reset_Handler(VOID);
 
 /* *
- * @ingroup  los_hwi
+ * @ingroup  los_arch_interrupt
  * @brief: Pended System Call.
  *
  * @par Description:
@@ -399,39 +352,25 @@ extern VOID Reset_Handler(VOID);
  *
  * @retval:None.
  * @par Dependency:
- * <ul><li>los_hwi.h: the header file that contains the API declaration.</li></ul>
+ * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
  * @see None.
  */
 extern VOID HalPendSV(VOID);
 
-
-#define OS_EXC_IN_INIT                      0
-#define OS_EXC_IN_TASK                      1
-#define OS_EXC_IN_HWI                       2
-
 #define OS_EXC_MAX_BUF_LEN                  25
 #define OS_EXC_MAX_NEST_DEPTH               1
+#define OS_EXC_FLAG_NO_FLOAT                0x10000000
 
 #define OS_NVIC_SHCSR                       0xE000ED24
 #define OS_NVIC_CCR                         0xE000ED14
-
 #define OS_NVIC_INT_ENABLE_SIZE             0x20
 #define OS_NVIC_INT_PRI_SIZE                0xF0
 #define OS_NVIC_EXCPRI_SIZE                 0xC
 #define OS_NVIC_INT_CTRL_SIZE               4
 #define OS_NVIC_SHCSR_SIZE                  4
-
 #define OS_NVIC_INT_PEND_SIZE               OS_NVIC_INT_ACT_SIZE
 #define OS_NVIC_INT_ACT_SIZE                OS_NVIC_INT_ENABLE_SIZE
 
-#define OS_EXC_FLAG_NO_FLOAT                0x10000000
-#define OS_EXC_FLAG_FAULTADDR_VALID         0x01
-#define OS_EXC_FLAG_IN_HWI                  0x02
-
-#define OS_EXC_IMPRECISE_ACCESS_ADDR        0xABABABAB
-
-#define OS_EXC_EVENT                        0x00000001
-
 /**
  * @ingroup los_exc
  * the struct of register files
@@ -500,11 +439,10 @@ typedef struct TagExcContext {
     UINT32 FPSCR;
     UINT32 NO_NAME;
 #endif
-}EXC_CONTEXT_S;
+} EXC_CONTEXT_S;
 
 typedef VOID (*EXC_PROC_FUNC)(UINT32, EXC_CONTEXT_S *);
 VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, UINT32 pid, EXC_CONTEXT_S *excBufAddr);
-
 VOID HalExcNMI(VOID);
 VOID HalExcHardFault(VOID);
 VOID HalExcMemFault(VOID);
@@ -645,7 +583,7 @@ VOID HalHwiInit(VOID);
  * @ingroup los_exc
  * Exception information structure
  *
- * Description: Exception information saved when an exception is triggered on the Cortex-M4 platform.
+ * Description: Exception information saved when an exception is triggered on the Cortex-M55 platform.
  *
  */
 typedef struct TagExcInfo {
@@ -668,10 +606,9 @@ typedef struct TagExcInfo {
     EXC_CONTEXT_S *context;
 } ExcInfo;
 
-extern UINT32 g_curNestCount;
-extern UINT32 g_intCount;
-extern UINT8 g_uwExcTbl[32];
 extern ExcInfo g_excInfo;
+extern UINT32 g_curNestCount;
+extern UINT8 g_uwExcTbl[32];
 
 #define MAX_INT_INFO_SIZE       (8 + 0x164)
 
@@ -681,4 +618,4 @@ extern ExcInfo g_excInfo;
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
-#endif /* _LOS_EXC_H */
+#endif /* _LOS_ARCH_INTERRUPT_H */

arch/arm/cortex-m55/iar/NTZ/los_interrupt.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -29,12 +29,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "los_interrupt.h"
-#include "securec.h"
 #include <stdarg.h>
-#include "los_arch_interrupt.h"
+#include "securec.h"
 #include "los_context.h"
-#include "los_debug.h"
+#include "los_arch_interrupt.h"
 #include "los_hook.h"
 #include "los_task.h"
 #include "los_sched.h"
@@ -44,93 +42,6 @@
 #include "los_cpup.h"
 #endif
 
-/*lint -save -e40 -e522 -e533*/
-UINT32 g_intCount = 0;
-
-/*lint -restore*/
-#pragma location = ".data.vector"
-#pragma data_alignment = LOSCFG_ARCH_HWI_VECTOR_ALIGN
-/* *
- * @ingroup los_hwi
- * hardware interrupt form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC g_hwiForm[OS_VECTOR_CNT] = {0};
-
-#if (LOSCFG_DEBUG_TOOLS == 1)
-STATIC UINT32 g_hwiFormCnt[OS_HWI_MAX_NUM] = {0};
-STATIC CHAR *g_hwiFormName[OS_HWI_MAX_NUM] = {0};
-
-UINT32 OsGetHwiFormCnt(UINT32 index)
-{
-    return g_hwiFormCnt[index];
-}
-
-CHAR *OsGetHwiFormName(UINT32 index)
-{
-    return g_hwiFormName[index];
-}
-
-BOOL OsGetHwiCreated(UINT32 index)
-{
-    if (g_hwiForm[index] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return TRUE;
-    }
-
-    return FALSE;
-}
-#endif
-
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-
-typedef struct {
-    HWI_PROC_FUNC pfnHandler;
-    VOID *pParm;
-} HWI_HANDLER_FUNC;
-
-/* *
- * @ingroup los_hwi
- * hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pfnHandler = vector;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pParm = arg;
-    }
-}
-
-#else
-/* *
- * @ingroup los_hwi
- * hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {0};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT] = vector;
-    }
-}
-#endif
-
-WEAK VOID SysTick_Handler(VOID)
-{
-    return;
-}
-
 /* ****************************************************************************
  Function    : HwiNumGet
  Description : Get an interrupt number
@@ -145,100 +56,54 @@ STATIC UINT32 HwiNumGet(VOID)
 
 STATIC UINT32 HwiUnmask(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_EnableIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiMask(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_DisableIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiSetPriority(HWI_HANDLE_T hwiNum, UINT8 priority)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (priority > OS_HWI_PRIO_LOWEST) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-
     NVIC_SetPriority((IRQn_Type)hwiNum, priority);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiPending(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_SetPendingIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiClear(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_ClearPendingIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
-HwiControllerOps g_archHwiOps = {
+STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
+{
+    HwiSetPriority(hwiNum, hwiPrio);
+    HwiUnmask(hwiNum);
+    return LOS_OK;
+}
+
+STATIC HwiControllerOps g_archHwiOps = {
     .enableIrq      = HwiUnmask,
     .disableIrq     = HwiMask,
     .setIrqPriority = HwiSetPriority,
     .getCurIrqNum   = HwiNumGet,
     .triggerIrq     = HwiPending,
     .clearIrq       = HwiClear,
+    .createIrq      = HwiCreate,
 };
 
-inline UINT32 ArchIsIntActive(VOID)
+HwiControllerOps *ArchIntOpsGet(VOID)
 {
-    return (g_intCount > 0);
-}
-/* ****************************************************************************
- Function    : HalHwiDefaultHandler
- Description : default handler of the hardware interrupt
- Input       : None
- Output      : None
- Return      : None
- **************************************************************************** */
-/*lint -e529*/
-LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
-{
-    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());
-    while (1) {}
-}
-
-WEAK VOID HalPreInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
-}
-
-WEAK VOID HalAftInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
+    return &g_archHwiOps;
 }
 
 /* ****************************************************************************
@@ -299,97 +164,6 @@ LITE_OS_SEC_TEXT VOID HalInterrupt(VOID)
     LOS_IntRestore(intSave);
 }
 
-/* ****************************************************************************
- Function    : ArchHwiCreate
- Description : create hardware interrupt
- Input       : hwiNum   --- hwi num to create
-               hwiPrio  --- priority of the hwi
-               hwiMode  --- unused
-               hwiHandler --- hwi handler
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiCreate(HWI_HANDLE_T hwiNum,
-                                           HWI_PRIOR_T hwiPrio,
-                                           HWI_MODE_T hwiMode,
-                                           HWI_PROC_FUNC hwiHandler,
-                                           HwiIrqParam *irqParam)
-{
-    (VOID)hwiMode;
-    UINTPTR intSave;
-
-    if (hwiHandler == NULL) {
-        return OS_ERRNO_HWI_PROC_FUNC_NULL;
-    }
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return OS_ERRNO_HWI_ALREADY_CREATED;
-    }
-
-    if (hwiPrio > OS_HWI_PRIO_LOWEST) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-
-    intSave = LOS_IntLock();
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-    if (irqParam != NULL) {
-        OsSetVector(hwiNum, hwiHandler, irqParam->pDevId);
-    } else {
-        OsSetVector(hwiNum, hwiHandler, NULL);
-    }
-#else
-    (VOID)irqParam;
-    OsSetVector(hwiNum, hwiHandler);
-#endif
-
-#if (LOSCFG_DEBUG_TOOLS == 1)
-    if ((irqParam != NULL) && (irqParam->pName != NULL)) {
-        g_hwiFormName[hwiNum + OS_SYS_VECTOR_CNT] = (CHAR *)irqParam->pName;
-    }
-    g_hwiFormCnt[hwiNum + OS_SYS_VECTOR_CNT] = 0;
-#endif
-
-    HwiUnmask((IRQn_Type)hwiNum);
-    HwiSetPriority((IRQn_Type)hwiNum, hwiPrio);
-
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
-/* ****************************************************************************
- Function    : ArchHwiDelete
- Description : Delete hardware interrupt
- Input       : hwiNum   --- hwi num to delete
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiDelete(HWI_HANDLE_T hwiNum, HwiIrqParam *irqParam)
-{
-    (VOID)irqParam;
-    UINT32 intSave;
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    NVIC_DisableIRQ((IRQn_Type)hwiNum);
-
-    intSave = LOS_IntLock();
-
-    g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
-
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
 #define FAULT_STATUS_REG_BIT            32
 #define USGFAULT                        (1 << 18)
 #define BUSFAULT                        (1 << 17)
@@ -611,6 +385,11 @@ LITE_OS_SEC_TEXT_INIT VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, U
     ArchSysExit();
 }
 
+WEAK VOID SysTick_Handler(VOID)
+{
+    return;
+}
+
 /* ****************************************************************************
  Function    : HalHwiInit
  Description : initialization of the hardware interrupt
@@ -622,23 +401,24 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
     UINT32 index;
-    g_hwiForm[0] = 0;             /* [0] Top of Stack */
-    g_hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
+    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
+    hwiForm[0] = 0;             /* [0] Top of Stack */
+    hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
     for (index = 2; index < OS_VECTOR_CNT; index++) { /* 2: The starting position of the interrupt */
-        g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+        hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
     }
     /* Exception handler register */
-    g_hwiForm[NonMaskableInt_IRQn + OS_SYS_VECTOR_CNT]   = (HWI_PROC_FUNC)HalExcNMI;
-    g_hwiForm[HARDFAULT_IRQN + OS_SYS_VECTOR_CNT]        = (HWI_PROC_FUNC)HalExcHardFault;
-    g_hwiForm[MemoryManagement_IRQn + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalExcMemFault;
-    g_hwiForm[BusFault_IRQn + OS_SYS_VECTOR_CNT]         = (HWI_PROC_FUNC)HalExcBusFault;
-    g_hwiForm[UsageFault_IRQn + OS_SYS_VECTOR_CNT]       = (HWI_PROC_FUNC)HalExcUsageFault;
-    g_hwiForm[SVCall_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalSVCHandler;
-    g_hwiForm[PendSV_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalPendSV;
-    g_hwiForm[SysTick_IRQn + OS_SYS_VECTOR_CNT]          = (HWI_PROC_FUNC)SysTick_Handler;
+    hwiForm[NonMaskableInt_IRQn + OS_SYS_VECTOR_CNT]   = (HWI_PROC_FUNC)HalExcNMI;
+    hwiForm[HARDFAULT_IRQN + OS_SYS_VECTOR_CNT]        = (HWI_PROC_FUNC)HalExcHardFault;
+    hwiForm[MemoryManagement_IRQn + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalExcMemFault;
+    hwiForm[BusFault_IRQn + OS_SYS_VECTOR_CNT]         = (HWI_PROC_FUNC)HalExcBusFault;
+    hwiForm[UsageFault_IRQn + OS_SYS_VECTOR_CNT]       = (HWI_PROC_FUNC)HalExcUsageFault;
+    hwiForm[SVCall_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalSVCHandler;
+    hwiForm[PendSV_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalPendSV;
+    hwiForm[SysTick_IRQn + OS_SYS_VECTOR_CNT]          = (HWI_PROC_FUNC)SysTick_Handler;
 
     /* Interrupt vector table location */
-    SCB->VTOR = (UINT32)(UINTPTR)g_hwiForm;
+    SCB->VTOR = (UINT32)(UINTPTR)hwiForm;
 #endif
 #if (__CORTEX_M >= 0x03U) /* only for Cortex-M3 and above */
     NVIC_SetPriorityGrouping(OS_NVIC_AIRCR_PRIGROUP);
@@ -651,4 +431,3 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 
     return;
 }
-

arch/arm/cortex-m55/iar/TZ/BUILD.gn

@@ -1,5 +1,5 @@
 # Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+# Copyright (c) 2020-2023 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:
@@ -32,15 +32,21 @@ import("//kernel/liteos_m/liteos.gni")
 module_name = "arch"
 kernel_module(module_name) {
   sources = [
-    "los_context.c",
-    "los_dispatch.S",
-    "los_exc.S",
-    "los_interrupt.c",
-    "los_timer.c",
+    "non_secure/los_context.c",
+    "non_secure/los_dispatch.S",
+    "non_secure/los_exc.S",
+    "non_secure/los_interrupt.c",
+    "non_secure/los_timer.c",
+    "non_secure/los_trustzone.c",
   ]
   configs += [ "$LITEOSTOPDIR:warn_config" ]
+
+  include_dirs = [
+    "non_secure",
+    "secure",
+  ]
 }
 
 config("public") {
-  include_dirs = [ "." ]
+  include_dirs = [ "non_secure" ]
 }

arch/arm/cortex-m55/iar/TZ/non_secure/los_arch_interrupt.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -29,12 +29,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _LOS_EXC_H
-#define _LOS_EXC_H
+#ifndef _LOS_ARCH_INTERRUPT_H
+#define _LOS_ARCH_INTERRUPT_H
 
-#include "los_config.h"
-#include "los_compiler.h"
-#include "los_interrupt.h"
+#include "los_common_interrupt.h"
 
 #ifdef __cplusplus
 #if __cplusplus
@@ -43,15 +41,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 /* *
- * @ingroup los_hwi
- * Maximum number of used hardware interrupts.
- */
-#ifndef OS_HWI_MAX_NUM
-#define OS_HWI_MAX_NUM                        LOSCFG_PLATFORM_HWI_LIMIT
-#endif
-
-/* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Highest priority of a hardware interrupt.
  */
 #ifndef OS_HWI_PRIO_HIGHEST
@@ -59,63 +49,50 @@ extern "C" {
 #endif
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Lowest priority of a hardware interrupt.
  */
 #ifndef OS_HWI_PRIO_LOWEST
 #define OS_HWI_PRIO_LOWEST                    7
 #endif
 
-
 /* *
- * @ingroup  los_hwi
- * Define the type of a hardware interrupt vector table function.
- */
-typedef VOID (**HWI_VECTOR_FUNC)(void);
-
-/* *
- * @ingroup los_hwi
- * Count of interrupts.
- */
-extern UINT32 g_intCount;
-
-/* *
- * @ingroup los_hwi
- * Count of M-Core system interrupt vector.
- */
-#define OS_SYS_VECTOR_CNT                     16
-
-/* *
- * @ingroup los_hwi
- * Count of M-Core interrupt vector.
- */
-#define OS_VECTOR_CNT                         (OS_SYS_VECTOR_CNT + OS_HWI_MAX_NUM)
-
-/* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * AIRCR register priority group parameter .
  */
 #define OS_NVIC_AIRCR_PRIGROUP                7
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Boot interrupt vector table.
  */
 extern UINT32 _BootVectors[];
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
+ * Count of M-Core system interrupt vector.
+ */
+#define OS_SYS_VECTOR_CNT                     16
+
+/* *
+ * @ingroup los_arch_interrupt
+ * Count of M-Core interrupt vector.
+ */
+#define OS_VECTOR_CNT                         (OS_SYS_VECTOR_CNT + OS_HWI_MAX_NUM)
+
+/* *
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Invalid interrupt number.
  *
  * Value: 0x02000900
  *
  * Solution: Ensure that the interrupt number is valid.
- * The value range of the interrupt number applicable for a Cortex-M33 platform is [OS_USER_HWI_MIN,OS_USER_HWI_MAX].
+ * The value range of the interrupt number applicable for a Cortex-M33  platform is [OS_USER_HWI_MIN,OS_USER_HWI_MAX].
  */
 #define OS_ERRNO_HWI_NUM_INVALID              LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x00)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Null hardware interrupt handling function.
  *
  * Value: 0x02000901
@@ -125,7 +102,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_PROC_FUNC_NULL           LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x01)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Insufficient interrupt resources for hardware interrupt creation.
  *
  * Value: 0x02000902
@@ -135,7 +112,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_CB_UNAVAILABLE           LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x02)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Insufficient memory for hardware interrupt initialization.
  *
  * Value: 0x02000903
@@ -145,7 +122,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_NO_MEMORY                LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x03)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: The interrupt has already been created.
  *
  * Value: 0x02000904
@@ -155,7 +132,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_ALREADY_CREATED          LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x04)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Invalid interrupt priority.
  *
  * Value: 0x02000905
@@ -166,7 +143,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_PRIO_INVALID             LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x05)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Incorrect interrupt creation mode.
  *
  * Value: 0x02000906
@@ -177,7 +154,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_MODE_INVALID             LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x06)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Hardware interrupt error code: The interrupt has already been created as a fast interrupt.
  *
  * Value: 0x02000907
@@ -187,7 +164,17 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_FASTMODE_ALREADY_CREATED LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x07)
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
+ * Hardware interrupt error code: Invalid interrupt operation function.
+ *
+ * Value: 0x0200090c
+ *
+ * Solution: Set a valid interrupt operation function
+ */
+#define OS_ERRNO_HWI_OPS_FUNC_NULL            LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x0c)
+
+/* *
+ * @ingroup los_arch_interrupt
  * SysTick control and status register.
  */
 #define OS_SYSTICK_CONTROL_REG                0xE000E010
@@ -199,133 +186,119 @@ extern UINT32 _BootVectors[];
 #define OS_SYSTICK_CURRENT_REG                0xE000E018
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt Priority-Level Registers.
  */
 #define OS_NVIC_PRI_BASE                      0xE000E400
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt enable register for 0-31.
  */
 #define OS_NVIC_SETENA_BASE                   0xE000E100
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * interrupt pending register.
  */
 #define OS_NVIC_SETPEND_BASE                  0xE000E200
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt active register.
  */
 #define OS_NVIC_INT_ACT_BASE                  0xE000E300
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt disable register for 0-31.
  */
 #define OS_NVIC_CLRENA_BASE                   0xE000E180
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt control and status register.
  */
 #define OS_NVIC_INT_CTRL                      0xE000ED04
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Vector table offset register.
  */
 #define OS_NVIC_VTOR                          0xE000ED08
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Application interrupt and reset control register
  */
 #define OS_NVIC_AIRCR                         0xE000ED0C
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * System exception priority register.
  */
 #define OS_NVIC_EXCPRI_BASE                   0xE000ED18
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 1 :reset.
  */
 #define OS_EXC_RESET                          1
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 2 :Non-Maskable Interrupt.
  */
 #define OS_EXC_NMI                            2
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 3 :(hard)fault.
  */
 #define OS_EXC_HARD_FAULT                     3
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 4 :MemManage fault.
  */
 #define OS_EXC_MPU_FAULT                      4
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 5 :Bus fault.
  */
 #define OS_EXC_BUS_FAULT                      5
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 6 :Usage fault.
  */
 #define OS_EXC_USAGE_FAULT                    6
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 11 :SVCall.
  */
 #define OS_EXC_SVC_CALL                       11
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 12 :Debug monitor.
  */
 #define OS_EXC_DBG_MONITOR                    12
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 14 :PendSV.
  */
 #define OS_EXC_PEND_SV                        14
 
 /* *
- * @ingroup los_hwi
+ * @ingroup los_arch_interrupt
  * Interrupt No. 15 :SysTick.
  */
 #define OS_EXC_SYS_TICK                       15
 
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg);
-#else
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
-#endif
-
 /* *
  * @ingroup  los_hwi
  * @brief: Hardware interrupt entry function.
@@ -346,27 +319,7 @@ extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
 extern VOID HalInterrupt(VOID);
 
 /* *
- * @ingroup  los_hwi
- * @brief: Default vector handling function.
- *
- * @par Description:
- * This API is used to configure interrupt for null function.
- *
- * @attention:
- * <ul><li>None.</li></ul>
- *
- * @param:None.
- *
- * @retval:None.
- * @par Dependency:
- * <ul><li>los_hwi.h: the header file that contains the API declaration.</li
-></ul>
- * @see None.
- */
-extern VOID HalHwiDefaultHandler(VOID);
-
-/* *
- * @ingroup  los_hwi
+ * @ingroup  los_arch_interrupt
  * @brief: Reset the vector table.
  *
  * @par Description:
@@ -379,13 +332,13 @@ extern VOID HalHwiDefaultHandler(VOID);
  *
  * @retval:None.
  * @par Dependency:
- * <ul><li>los_hwi.h: the header file that contains the API declaration.</li></ul>
+ * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
  * @see None.
  */
 extern VOID Reset_Handler(VOID);
 
 /* *
- * @ingroup  los_hwi
+ * @ingroup  los_arch_interrupt
  * @brief: Pended System Call.
  *
  * @par Description:
@@ -399,39 +352,25 @@ extern VOID Reset_Handler(VOID);
  *
  * @retval:None.
  * @par Dependency:
- * <ul><li>los_hwi.h: the header file that contains the API declaration.</li></ul>
+ * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
  * @see None.
  */
 extern VOID HalPendSV(VOID);
 
-
-#define OS_EXC_IN_INIT                      0
-#define OS_EXC_IN_TASK                      1
-#define OS_EXC_IN_HWI                       2
-
 #define OS_EXC_MAX_BUF_LEN                  25
 #define OS_EXC_MAX_NEST_DEPTH               1
+#define OS_EXC_FLAG_NO_FLOAT                0x10000000
 
 #define OS_NVIC_SHCSR                       0xE000ED24
 #define OS_NVIC_CCR                         0xE000ED14
-
 #define OS_NVIC_INT_ENABLE_SIZE             0x20
 #define OS_NVIC_INT_PRI_SIZE                0xF0
 #define OS_NVIC_EXCPRI_SIZE                 0xC
 #define OS_NVIC_INT_CTRL_SIZE               4
 #define OS_NVIC_SHCSR_SIZE                  4
-
 #define OS_NVIC_INT_PEND_SIZE               OS_NVIC_INT_ACT_SIZE
 #define OS_NVIC_INT_ACT_SIZE                OS_NVIC_INT_ENABLE_SIZE
 
-#define OS_EXC_FLAG_NO_FLOAT                0x10000000
-#define OS_EXC_FLAG_FAULTADDR_VALID         0x01
-#define OS_EXC_FLAG_IN_HWI                  0x02
-
-#define OS_EXC_IMPRECISE_ACCESS_ADDR        0xABABABAB
-
-#define OS_EXC_EVENT                        0x00000001
-
 /**
  * @ingroup los_exc
  * the struct of register files
@@ -500,11 +439,10 @@ typedef struct TagExcContext {
     UINT32 FPSCR;
     UINT32 NO_NAME;
 #endif
-}EXC_CONTEXT_S;
+} EXC_CONTEXT_S;
 
 typedef VOID (*EXC_PROC_FUNC)(UINT32, EXC_CONTEXT_S *);
 VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, UINT32 pid, EXC_CONTEXT_S *excBufAddr);
-
 VOID HalExcNMI(VOID);
 VOID HalExcHardFault(VOID);
 VOID HalExcMemFault(VOID);
@@ -645,7 +583,7 @@ VOID HalHwiInit(VOID);
  * @ingroup los_exc
  * Exception information structure
  *
- * Description: Exception information saved when an exception is triggered on the Cortex-M4 platform.
+ * Description: Exception information saved when an exception is triggered on the Cortex-M55 platform.
  *
  */
 typedef struct TagExcInfo {
@@ -668,10 +606,9 @@ typedef struct TagExcInfo {
     EXC_CONTEXT_S *context;
 } ExcInfo;
 
-extern UINT32 g_curNestCount;
-extern UINT32 g_intCount;
-extern UINT8 g_uwExcTbl[32];
 extern ExcInfo g_excInfo;
+extern UINT32 g_curNestCount;
+extern UINT8 g_uwExcTbl[32];
 
 #define MAX_INT_INFO_SIZE       (8 + 0x164)
 
@@ -681,4 +618,4 @@ extern ExcInfo g_excInfo;
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
-#endif /* _LOS_EXC_H */
+#endif /* _LOS_ARCH_INTERRUPT_H */

arch/arm/cortex-m55/iar/TZ/non_secure/los_interrupt.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -28,13 +28,10 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-#include "los_interrupt.h"
-#include "securec.h"
 #include <stdarg.h>
-#include "los_arch_interrupt.h"
+#include "securec.h"
 #include "los_context.h"
-#include "los_debug.h"
+#include "los_arch_interrupt.h"
 #include "los_hook.h"
 #include "los_task.h"
 #include "los_sched.h"
@@ -44,92 +41,7 @@
 #include "los_cpup.h"
 #endif
 
-/*lint -save -e40 -e522 -e533*/
-UINT32 g_intCount = 0;
-
-/*lint -restore*/
-#pragma location = ".data.vector"
-#pragma data_alignment = LOSCFG_ARCH_HWI_VECTOR_ALIGN
-/* *
- * @ingroup los_hwi
- * hardware interrupt form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC g_hwiForm[OS_VECTOR_CNT] = {0};
-
-#if (LOSCFG_DEBUG_TOOLS == 1)
-STATIC UINT32 g_hwiFormCnt[OS_HWI_MAX_NUM] = {0};
-STATIC CHAR *g_hwiFormName[OS_HWI_MAX_NUM] = {0};
-
-UINT32 OsGetHwiFormCnt(UINT32 index)
-{
-    return g_hwiFormCnt[index];
-}
-
-CHAR *OsGetHwiFormName(UINT32 index)
-{
-    return g_hwiFormName[index];
-}
-
-BOOL OsGetHwiCreated(UINT32 index)
-{
-    if (g_hwiForm[index] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return TRUE;
-    }
-
-    return FALSE;
-}
-#endif
-
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-
-typedef struct {
-    HWI_PROC_FUNC pfnHandler;
-    VOID *pParm;
-} HWI_HANDLER_FUNC;
-
-/* *
- * @ingroup los_hwi
- * hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pfnHandler = vector;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pParm = arg;
-    }
-}
-
-#else
-/* *
- * @ingroup los_hwi
- * hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {0};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT] = vector;
-    }
-}
-#endif
-
-WEAK VOID SysTick_Handler(VOID)
-{
-    return;
-}
+#define DEF_HANDLER_START_INDEX 2
 
 /* ****************************************************************************
  Function    : HwiNumGet
@@ -145,100 +57,54 @@ STATIC UINT32 HwiNumGet(VOID)
 
 STATIC UINT32 HwiUnmask(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_EnableIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiMask(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_DisableIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiSetPriority(HWI_HANDLE_T hwiNum, UINT8 priority)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (priority > OS_HWI_PRIO_LOWEST) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-
     NVIC_SetPriority((IRQn_Type)hwiNum, priority);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiPending(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_SetPendingIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiClear(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_ClearPendingIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
-HwiControllerOps g_archHwiOps = {
+STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
+{
+    HwiSetPriority(hwiNum, hwiPrio);
+    HwiUnmask(hwiNum);
+    return LOS_OK;
+}
+
+STATIC HwiControllerOps g_archHwiOps = {
     .enableIrq      = HwiUnmask,
     .disableIrq     = HwiMask,
     .setIrqPriority = HwiSetPriority,
     .getCurIrqNum   = HwiNumGet,
     .triggerIrq     = HwiPending,
     .clearIrq       = HwiClear,
+    .createIrq      = HwiCreate,
 };
 
-inline UINT32 ArchIsIntActive(VOID)
+HwiControllerOps *ArchIntOpsGet(VOID)
 {
-    return (g_intCount > 0);
-}
-/* ****************************************************************************
- Function    : HalHwiDefaultHandler
- Description : default handler of the hardware interrupt
- Input       : None
- Output      : None
- Return      : None
- **************************************************************************** */
-/*lint -e529*/
-LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
-{
-    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());
-    while (1) {}
-}
-
-WEAK VOID HalPreInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
-}
-
-WEAK VOID HalAftInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
+    return &g_archHwiOps;
 }
 
 /* ****************************************************************************
@@ -299,97 +165,6 @@ LITE_OS_SEC_TEXT VOID HalInterrupt(VOID)
     LOS_IntRestore(intSave);
 }
 
-/* ****************************************************************************
- Function    : ArchHwiCreate
- Description : create hardware interrupt
- Input       : hwiNum   --- hwi num to create
-               hwiPrio  --- priority of the hwi
-               hwiMode  --- unused
-               hwiHandler --- hwi handler
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiCreate(HWI_HANDLE_T hwiNum,
-                                           HWI_PRIOR_T hwiPrio,
-                                           HWI_MODE_T hwiMode,
-                                           HWI_PROC_FUNC hwiHandler,
-                                           HwiIrqParam *irqParam)
-{
-    (VOID)hwiMode;
-    UINTPTR intSave;
-
-    if (hwiHandler == NULL) {
-        return OS_ERRNO_HWI_PROC_FUNC_NULL;
-    }
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return OS_ERRNO_HWI_ALREADY_CREATED;
-    }
-
-    if (hwiPrio > OS_HWI_PRIO_LOWEST) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-
-    intSave = LOS_IntLock();
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-    if (irqParam != NULL) {
-        OsSetVector(hwiNum, hwiHandler, irqParam->pDevId);
-    } else {
-        OsSetVector(hwiNum, hwiHandler, NULL);
-    }
-#else
-    (VOID)irqParam;
-    OsSetVector(hwiNum, hwiHandler);
-#endif
-
-#if (LOSCFG_DEBUG_TOOLS == 1)
-    if ((irqParam != NULL) && (irqParam->pName != NULL)) {
-        g_hwiFormName[hwiNum + OS_SYS_VECTOR_CNT] = (CHAR *)irqParam->pName;
-    }
-    g_hwiFormCnt[hwiNum + OS_SYS_VECTOR_CNT] = 0;
-#endif
-
-    HwiUnmask((IRQn_Type)hwiNum);
-    HwiSetPriority((IRQn_Type)hwiNum, hwiPrio);
-
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
-/* ****************************************************************************
- Function    : ArchHwiDelete
- Description : Delete hardware interrupt
- Input       : hwiNum   --- hwi num to delete
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiDelete(HWI_HANDLE_T hwiNum, HwiIrqParam *irqParam)
-{
-    (VOID)irqParam;
-    UINT32 intSave;
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    NVIC_DisableIRQ((IRQn_Type)hwiNum);
-
-    intSave = LOS_IntLock();
-
-    g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
-
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
 #define FAULT_STATUS_REG_BIT            32
 #define USGFAULT                        (1 << 18)
 #define BUSFAULT                        (1 << 17)
@@ -622,23 +397,24 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
     UINT32 index;
-    g_hwiForm[0] = 0;             /* [0] Top of Stack */
-    g_hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
+    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
+    hwiForm[0] = 0;             /* [0] Top of Stack */
+    hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
     for (index = 2; index < OS_VECTOR_CNT; index++) { /* 2: The starting position of the interrupt */
-        g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+        hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
     }
     /* Exception handler register */
-    g_hwiForm[NonMaskableInt_IRQn + OS_SYS_VECTOR_CNT]   = (HWI_PROC_FUNC)HalExcNMI;
-    g_hwiForm[HARDFAULT_IRQN + OS_SYS_VECTOR_CNT]        = (HWI_PROC_FUNC)HalExcHardFault;
-    g_hwiForm[MemoryManagement_IRQn + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalExcMemFault;
-    g_hwiForm[BusFault_IRQn + OS_SYS_VECTOR_CNT]         = (HWI_PROC_FUNC)HalExcBusFault;
-    g_hwiForm[UsageFault_IRQn + OS_SYS_VECTOR_CNT]       = (HWI_PROC_FUNC)HalExcUsageFault;
-    g_hwiForm[SVCall_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalSVCHandler;
-    g_hwiForm[PendSV_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalPendSV;
-    g_hwiForm[SysTick_IRQn + OS_SYS_VECTOR_CNT]          = (HWI_PROC_FUNC)SysTick_Handler;
+    hwiForm[NonMaskableInt_IRQn + OS_SYS_VECTOR_CNT]   = (HWI_PROC_FUNC)HalExcNMI;
+    hwiForm[HARDFAULT_IRQN + OS_SYS_VECTOR_CNT]        = (HWI_PROC_FUNC)HalExcHardFault;
+    hwiForm[MemoryManagement_IRQn + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalExcMemFault;
+    hwiForm[BusFault_IRQn + OS_SYS_VECTOR_CNT]         = (HWI_PROC_FUNC)HalExcBusFault;
+    hwiForm[UsageFault_IRQn + OS_SYS_VECTOR_CNT]       = (HWI_PROC_FUNC)HalExcUsageFault;
+    hwiForm[SVCall_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalSVCHandler;
+    hwiForm[PendSV_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalPendSV;
+    hwiForm[SysTick_IRQn + OS_SYS_VECTOR_CNT]          = (HWI_PROC_FUNC)SysTick_Handler;
 
     /* Interrupt vector table location */
-    SCB->VTOR = (UINT32)(UINTPTR)g_hwiForm;
+    SCB->VTOR = (UINT32)(UINTPTR)hwiForm;
 #endif
 #if (__CORTEX_M >= 0x03U) /* only for Cortex-M3 and above */
     NVIC_SetPriorityGrouping(OS_NVIC_AIRCR_PRIGROUP);
@@ -651,4 +427,3 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 
     return;
 }
-

arch/arm/cortex-m7/gcc/los_arch_interrupt.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -32,9 +32,7 @@
 #ifndef _LOS_ARCH_INTERRUPT_H
 #define _LOS_ARCH_INTERRUPT_H
 
-#include "los_config.h"
-#include "los_compiler.h"
-#include "los_interrupt.h"
+#include "los_common_interrupt.h"
 
 #ifdef __cplusplus
 #if __cplusplus
@@ -42,14 +40,6 @@ extern "C" {
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
-/* *
- * @ingroup los_arch_interrupt
- * Maximum number of used hardware interrupts.
- */
-#ifndef OS_HWI_MAX_NUM
-#define OS_HWI_MAX_NUM                        LOSCFG_PLATFORM_HWI_LIMIT
-#endif
-
 /* *
  * @ingroup los_arch_interrupt
  * Highest priority of a hardware interrupt.
@@ -66,19 +56,6 @@ extern "C" {
 #define OS_HWI_PRIO_LOWEST                    7
 #endif
 
-
-/* *
- * @ingroup  los_arch_interrupt
- * Define the type of a hardware interrupt vector table function.
- */
-typedef VOID (**HWI_VECTOR_FUNC)(void);
-
-/* *
- * @ingroup los_arch_interrupt
- * Count of interrupts.
- */
-extern UINT32 g_intCount;
-
 /* *
  * @ingroup los_arch_interrupt
  * Count of M-Core system interrupt vector.
@@ -110,7 +87,7 @@ extern UINT32 _BootVectors[];
  * Value: 0x02000900
  *
  * Solution: Ensure that the interrupt number is valid.
- * The value range of the interrupt number applicable for a Cortex-M7 platform is [OS_USER_HWI_MIN,OS_USER_HWI_MAX].
+ * The value range of the interrupt number applicable for a Cortex-M7  platformis [OS_USER_HWI_MIN,OS_USER_HWI_MAX].
  */
 #define OS_ERRNO_HWI_NUM_INVALID              LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x00)
 
@@ -186,6 +163,16 @@ extern UINT32 _BootVectors[];
  */
 #define OS_ERRNO_HWI_FASTMODE_ALREADY_CREATED LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x07)
 
+/* *
+ * @ingroup los_arch_interrupt
+ * Hardware interrupt error code: Invalid interrupt operation function.
+ *
+ * Value: 0x0200090c
+ *
+ * Solution: Set a valid interrupt operation function
+ */
+#define OS_ERRNO_HWI_OPS_FUNC_NULL            LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x0c)
+
 /* *
  * @ingroup los_arch_interrupt
  * SysTick control and status register.
@@ -312,20 +299,6 @@ extern UINT32 _BootVectors[];
  */
 #define OS_EXC_SYS_TICK                       15
 
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-/* *
- * @ingroup los_arch_interrupt
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg);
-#else
-/* *
- * @ingroup los_arch_interrupt
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
-#endif
-
 /* *
  * @ingroup  los_arch_interrupt
  * @brief: Hardware interrupt entry function.
@@ -345,25 +318,6 @@ extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
  */
 extern VOID HalInterrupt(VOID);
 
-/* *
- * @ingroup  los_arch_interrupt
- * @brief: Default vector handling function.
- *
- * @par Description:
- * This API is used to configure interrupt for null function.
- *
- * @attention:
- * <ul><li>None.</li></ul>
- *
- * @param:None.
- *
- * @retval:None.
- * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
- * @see None.
- */
-extern VOID HalHwiDefaultHandler(VOID);
-
 /* *
  * @ingroup  los_arch_interrupt
  * @brief: Reset the vector table.
@@ -403,34 +357,20 @@ extern VOID Reset_Handler(VOID);
  */
 extern VOID HalPendSV(VOID);
 
-
-#define OS_EXC_IN_INIT                      0
-#define OS_EXC_IN_TASK                      1
-#define OS_EXC_IN_HWI                       2
-
 #define OS_EXC_MAX_BUF_LEN                  25
 #define OS_EXC_MAX_NEST_DEPTH               1
+#define OS_EXC_FLAG_NO_FLOAT                0x10000000
 
 #define OS_NVIC_SHCSR                       0xE000ED24
 #define OS_NVIC_CCR                         0xE000ED14
-
 #define OS_NVIC_INT_ENABLE_SIZE             0x20
 #define OS_NVIC_INT_PRI_SIZE                0xF0
 #define OS_NVIC_EXCPRI_SIZE                 0xC
 #define OS_NVIC_INT_CTRL_SIZE               4
 #define OS_NVIC_SHCSR_SIZE                  4
-
 #define OS_NVIC_INT_PEND_SIZE               OS_NVIC_INT_ACT_SIZE
 #define OS_NVIC_INT_ACT_SIZE                OS_NVIC_INT_ENABLE_SIZE
 
-#define OS_EXC_FLAG_NO_FLOAT                0x10000000
-#define OS_EXC_FLAG_FAULTADDR_VALID         0x01
-#define OS_EXC_FLAG_IN_HWI                  0x02
-
-#define OS_EXC_IMPRECISE_ACCESS_ADDR        0xABABABAB
-
-#define OS_EXC_EVENT                        0x00000001
-
 /**
  * @ingroup los_exc
  * the struct of register files
@@ -503,7 +443,6 @@ typedef struct TagExcContext {
 
 typedef VOID (*EXC_PROC_FUNC)(UINT32, EXC_CONTEXT_S *);
 VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, UINT32 pid, EXC_CONTEXT_S *excBufAddr);
-
 VOID HalExcNMI(VOID);
 VOID HalExcHardFault(VOID);
 VOID HalExcMemFault(VOID);
@@ -667,10 +606,9 @@ typedef struct TagExcInfo {
     EXC_CONTEXT_S *context;
 } ExcInfo;
 
-extern UINT32 g_curNestCount;
-extern UINT32 g_intCount;
-extern UINT8 g_uwExcTbl[32];
 extern ExcInfo g_excInfo;
+extern UINT32 g_curNestCount;
+extern UINT8 g_uwExcTbl[32];
 
 #define MAX_INT_INFO_SIZE       (8 + 0x164)
 

arch/arm/cortex-m7/gcc/los_interrupt.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -28,12 +28,10 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include "los_interrupt.h"
 #include <stdarg.h>
 #include "securec.h"
 #include "los_context.h"
 #include "los_arch_interrupt.h"
-#include "los_debug.h"
 #include "los_hook.h"
 #include "los_task.h"
 #include "los_sched.h"
@@ -43,84 +41,6 @@
 #include "los_cpup.h"
 #endif
 
-UINT32 g_intCount = 0;
-
-/* *
- * @ingroup los_hwi
- * Hardware interrupt form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC __attribute__((aligned(LOSCFG_ARCH_HWI_VECTOR_ALIGN))) g_hwiForm[OS_VECTOR_CNT] = {0};
-
-#if (LOSCFG_DEBUG_TOOLS == 1)
-STATIC UINT32 g_hwiFormCnt[OS_HWI_MAX_NUM] = {0};
-STATIC CHAR *g_hwiFormName[OS_HWI_MAX_NUM] = {0};
-
-UINT32 OsGetHwiFormCnt(UINT32 index)
-{
-    return g_hwiFormCnt[index];
-}
-
-CHAR *OsGetHwiFormName(UINT32 index)
-{
-    return g_hwiFormName[index];
-}
-
-BOOL OsGetHwiCreated(UINT32 index)
-{
-    if (g_hwiForm[index] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return TRUE;
-    }
-
-    return FALSE;
-}
-#endif
-
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-
-typedef struct {
-    HWI_PROC_FUNC pfnHandler;
-    VOID *pParm;
-} HWI_HANDLER_FUNC;
-
-/* *
- * @ingroup los_hwi
- * Hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pfnHandler = vector;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pParm = arg;
-    }
-}
-
-#else
-/* *
- * @ingroup los_hwi
- * hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {0};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT] = vector;
-    }
-}
-#endif
-
 /* ****************************************************************************
  Function    : HwiNumGet
  Description : Get an interrupt number
@@ -135,99 +55,54 @@ STATIC UINT32 HwiNumGet(VOID)
 
 STATIC UINT32 HwiUnmask(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_EnableIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiMask(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_DisableIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiSetPriority(HWI_HANDLE_T hwiNum, UINT8 priority)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (priority > OS_HWI_PRIO_LOWEST) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-
     NVIC_SetPriority((IRQn_Type)hwiNum, priority);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiPending(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_SetPendingIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiClear(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_ClearPendingIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
-HwiControllerOps g_archHwiOps = {
+STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
+{
+    HwiSetPriority(hwiNum, hwiPrio);
+    HwiUnmask(hwiNum);
+    return LOS_OK;
+}
+
+STATIC HwiControllerOps g_archHwiOps = {
     .enableIrq      = HwiUnmask,
     .disableIrq     = HwiMask,
     .setIrqPriority = HwiSetPriority,
     .getCurIrqNum   = HwiNumGet,
     .triggerIrq     = HwiPending,
     .clearIrq       = HwiClear,
+    .createIrq      = HwiCreate,
 };
 
-inline UINT32 ArchIsIntActive(VOID)
+HwiControllerOps *ArchIntOpsGet(VOID)
 {
-    return (g_intCount > 0);
-}
-/* ****************************************************************************
- Function    : HalHwiDefaultHandler
- Description : default handler of the hardware interrupt
- Input       : None
- Output      : None
- Return      : None
- **************************************************************************** */
-LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
-{
-    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());
-    while (1) {}
-}
-
-WEAK VOID HalPreInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
-}
-
-WEAK VOID HalAftInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
+    return &g_archHwiOps;
 }
 
 /* ****************************************************************************
@@ -286,97 +161,6 @@ LITE_OS_SEC_TEXT VOID HalInterrupt(VOID)
     LOS_IntRestore(intSave);
 }
 
-/* ****************************************************************************
- Function    : ArchHwiCreate
- Description : create hardware interrupt
- Input       : hwiNum   --- hwi num to create
-               hwiPrio  --- priority of the hwi
-               hwiMode  --- unused
-               hwiHandler --- hwi handler
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiCreate(HWI_HANDLE_T hwiNum,
-                                           HWI_PRIOR_T hwiPrio,
-                                           HWI_MODE_T hwiMode,
-                                           HWI_PROC_FUNC hwiHandler,
-                                           HwiIrqParam *irqParam)
-{
-    (VOID)hwiMode;
-    UINT32 intSave;
-
-    if (hwiHandler == NULL) {
-        return OS_ERRNO_HWI_PROC_FUNC_NULL;
-    }
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return OS_ERRNO_HWI_ALREADY_CREATED;
-    }
-
-    if (hwiPrio > OS_HWI_PRIO_LOWEST) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-
-    intSave = LOS_IntLock();
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-    if (irqParam != NULL) {
-        OsSetVector(hwiNum, hwiHandler, irqParam->pDevId);
-    } else {
-        OsSetVector(hwiNum, hwiHandler, NULL);
-    }
-#else
-    (VOID)irqParam;
-    OsSetVector(hwiNum, hwiHandler);
-#endif
-
-#if (LOSCFG_DEBUG_TOOLS == 1)
-    if ((irqParam != NULL) && (irqParam->pName != NULL)) {
-        g_hwiFormName[hwiNum + OS_SYS_VECTOR_CNT] = (CHAR *)irqParam->pName;
-    }
-    g_hwiFormCnt[hwiNum + OS_SYS_VECTOR_CNT] = 0;
-#endif
-
-    HwiUnmask((IRQn_Type)hwiNum);
-    HwiSetPriority((IRQn_Type)hwiNum, hwiPrio);
-
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
-/* ****************************************************************************
- Function    : ArchHwiDelete
- Description : Delete hardware interrupt
- Input       : hwiNum   --- hwi num to delete
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiDelete(HWI_HANDLE_T hwiNum, HwiIrqParam *irqParam)
-{
-    (VOID)irqParam;
-    UINT32 intSave;
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    NVIC_DisableIRQ((IRQn_Type)hwiNum);
-
-    intSave = LOS_IntLock();
-
-    g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
-
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
 #define FAULT_STATUS_REG_BIT            32
 #define USGFAULT                        (1 << 18)
 #define BUSFAULT                        (1 << 17)
@@ -599,6 +383,11 @@ LITE_OS_SEC_TEXT_INIT VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, U
     ArchSysExit();
 }
 
+WEAK VOID SysTick_Handler(VOID)
+{
+    return;
+}
+
 /* ****************************************************************************
  Function    : HalHwiInit
  Description : initialization of the hardware interrupt
@@ -610,23 +399,24 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
     UINT32 index;
-    g_hwiForm[0] = 0;             /* [0] Top of Stack */
-    g_hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
+    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
+    hwiForm[0] = 0;             /* [0] Top of Stack */
+    hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
     for (index = 2; index < OS_VECTOR_CNT; index++) { /* 2: The starting position of the interrupt */
-        g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+        hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
     }
     /* Exception handler register */
-    g_hwiForm[NonMaskableInt_IRQn + OS_SYS_VECTOR_CNT]   = (HWI_PROC_FUNC)HalExcNMI;
-    g_hwiForm[HARDFAULT_IRQN + OS_SYS_VECTOR_CNT]        = (HWI_PROC_FUNC)HalExcHardFault;
-    g_hwiForm[MemoryManagement_IRQn + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalExcMemFault;
-    g_hwiForm[BusFault_IRQn + OS_SYS_VECTOR_CNT]         = (HWI_PROC_FUNC)HalExcBusFault;
-    g_hwiForm[UsageFault_IRQn + OS_SYS_VECTOR_CNT]       = (HWI_PROC_FUNC)HalExcUsageFault;
-    g_hwiForm[SVCall_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalExcSvcCall;
-    g_hwiForm[PendSV_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalPendSV;
-    g_hwiForm[SysTick_IRQn + OS_SYS_VECTOR_CNT]          = (HWI_PROC_FUNC)SysTick_Handler;
+    hwiForm[NonMaskableInt_IRQn + OS_SYS_VECTOR_CNT]   = (HWI_PROC_FUNC)HalExcNMI;
+    hwiForm[HARDFAULT_IRQN + OS_SYS_VECTOR_CNT]        = (HWI_PROC_FUNC)HalExcHardFault;
+    hwiForm[MemoryManagement_IRQn + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalExcMemFault;
+    hwiForm[BusFault_IRQn + OS_SYS_VECTOR_CNT]         = (HWI_PROC_FUNC)HalExcBusFault;
+    hwiForm[UsageFault_IRQn + OS_SYS_VECTOR_CNT]       = (HWI_PROC_FUNC)HalExcUsageFault;
+    hwiForm[SVCall_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalExcSvcCall;
+    hwiForm[PendSV_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalPendSV;
+    hwiForm[SysTick_IRQn + OS_SYS_VECTOR_CNT]          = (HWI_PROC_FUNC)SysTick_Handler;
 
     /* Interrupt vector table location */
-    SCB->VTOR = (UINT32)(UINTPTR)g_hwiForm;
+    SCB->VTOR = (UINT32)(UINTPTR)hwiForm;
 #endif
 #if (__CORTEX_M >= 0x03U) /* only for Cortex-M3 and above */
     NVIC_SetPriorityGrouping(OS_NVIC_AIRCR_PRIGROUP);
@@ -644,4 +434,3 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 
     return;
 }
-

arch/arm/cortex-m7/iar/los_arch_interrupt.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -32,9 +32,7 @@
 #ifndef _LOS_ARCH_INTERRUPT_H
 #define _LOS_ARCH_INTERRUPT_H
 
-#include "los_config.h"
-#include "los_compiler.h"
-#include "los_interrupt.h"
+#include "los_common_interrupt.h"
 
 #ifdef __cplusplus
 #if __cplusplus
@@ -42,14 +40,6 @@ extern "C" {
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
-/* *
- * @ingroup los_arch_interrupt
- * Maximum number of used hardware interrupts.
- */
-#ifndef OS_HWI_MAX_NUM
-#define OS_HWI_MAX_NUM                        LOSCFG_PLATFORM_HWI_LIMIT
-#endif
-
 /* *
  * @ingroup los_arch_interrupt
  * Highest priority of a hardware interrupt.
@@ -66,18 +56,17 @@ extern "C" {
 #define OS_HWI_PRIO_LOWEST                    7
 #endif
 
-
 /* *
- * @ingroup  los_arch_interrupt
- * Define the type of a hardware interrupt vector table function.
+ * @ingroup los_arch_interrupt
+ * AIRCR register priority group parameter .
  */
-typedef VOID (**HWI_VECTOR_FUNC)(void);
+#define OS_NVIC_AIRCR_PRIGROUP                7
 
 /* *
  * @ingroup los_arch_interrupt
- * Count of interrupts.
+ * Boot interrupt vector table.
  */
-extern UINT32 g_intCount;
+extern UINT32 _BootVectors[];
 
 /* *
  * @ingroup los_arch_interrupt
@@ -91,18 +80,6 @@ extern UINT32 g_intCount;
  */
 #define OS_VECTOR_CNT                         (OS_SYS_VECTOR_CNT + OS_HWI_MAX_NUM)
 
-/* *
- * @ingroup los_arch_interrupt
- * AIRCR register priority group parameter .
- */
-#define OS_NVIC_AIRCR_PRIGROUP                7
-
-/* *
- * @ingroup los_arch_interrupt
- * Boot interrupt vector table.
- */
-extern UINT32 _BootVectors[];
-
 /* *
  * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Invalid interrupt number.
@@ -110,7 +87,7 @@ extern UINT32 _BootVectors[];
  * Value: 0x02000900
  *
  * Solution: Ensure that the interrupt number is valid.
- * The value range of the interrupt number applicable for a Cortex-M7 platform is [OS_USER_HWI_MIN,OS_USER_HWI_MAX].
+ * The value range of the interrupt number applicable for a Cortex-M7  platformis [OS_USER_HWI_MIN,OS_USER_HWI_MAX].
  */
 #define OS_ERRNO_HWI_NUM_INVALID              LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x00)
 
@@ -186,6 +163,16 @@ extern UINT32 _BootVectors[];
  */
 #define OS_ERRNO_HWI_FASTMODE_ALREADY_CREATED LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x07)
 
+/* *
+ * @ingroup los_arch_interrupt
+ * Hardware interrupt error code: Invalid interrupt operation function.
+ *
+ * Value: 0x0200090c
+ *
+ * Solution: Set a valid interrupt operation function
+ */
+#define OS_ERRNO_HWI_OPS_FUNC_NULL            LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x0c)
+
 /* *
  * @ingroup los_arch_interrupt
  * SysTick control and status register.
@@ -312,20 +299,6 @@ extern UINT32 _BootVectors[];
  */
 #define OS_EXC_SYS_TICK                       15
 
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-/* *
- * @ingroup los_arch_interrupt
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg);
-#else
-/* *
- * @ingroup los_arch_interrupt
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
-#endif
-
 /* *
  * @ingroup  los_arch_interrupt
  * @brief: Hardware interrupt entry function.
@@ -345,25 +318,6 @@ extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
  */
 extern VOID HalInterrupt(VOID);
 
-/* *
- * @ingroup  los_arch_interrupt
- * @brief: Default vector handling function.
- *
- * @par Description:
- * This API is used to configure interrupt for null function.
- *
- * @attention:
- * <ul><li>None.</li></ul>
- *
- * @param:None.
- *
- * @retval:None.
- * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
- * @see None.
- */
-extern VOID HalHwiDefaultHandler(VOID);
-
 /* *
  * @ingroup  los_arch_interrupt
  * @brief: Reset the vector table.
@@ -403,34 +357,20 @@ extern VOID Reset_Handler(VOID);
  */
 extern VOID HalPendSV(VOID);
 
-
-#define OS_EXC_IN_INIT                      0
-#define OS_EXC_IN_TASK                      1
-#define OS_EXC_IN_HWI                       2
-
 #define OS_EXC_MAX_BUF_LEN                  25
 #define OS_EXC_MAX_NEST_DEPTH               1
+#define OS_EXC_FLAG_NO_FLOAT                0x10000000
 
 #define OS_NVIC_SHCSR                       0xE000ED24
 #define OS_NVIC_CCR                         0xE000ED14
-
 #define OS_NVIC_INT_ENABLE_SIZE             0x20
 #define OS_NVIC_INT_PRI_SIZE                0xF0
 #define OS_NVIC_EXCPRI_SIZE                 0xC
 #define OS_NVIC_INT_CTRL_SIZE               4
 #define OS_NVIC_SHCSR_SIZE                  4
-
 #define OS_NVIC_INT_PEND_SIZE               OS_NVIC_INT_ACT_SIZE
 #define OS_NVIC_INT_ACT_SIZE                OS_NVIC_INT_ENABLE_SIZE
 
-#define OS_EXC_FLAG_NO_FLOAT                0x10000000
-#define OS_EXC_FLAG_FAULTADDR_VALID         0x01
-#define OS_EXC_FLAG_IN_HWI                  0x02
-
-#define OS_EXC_IMPRECISE_ACCESS_ADDR        0xABABABAB
-
-#define OS_EXC_EVENT                        0x00000001
-
 /**
  * @ingroup los_exc
  * the struct of register files
@@ -503,7 +443,6 @@ typedef struct TagExcContext {
 
 typedef VOID (*EXC_PROC_FUNC)(UINT32, EXC_CONTEXT_S *);
 VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, UINT32 pid, EXC_CONTEXT_S *excBufAddr);
-
 VOID HalExcNMI(VOID);
 VOID HalExcHardFault(VOID);
 VOID HalExcMemFault(VOID);
@@ -667,10 +606,9 @@ typedef struct TagExcInfo {
     EXC_CONTEXT_S *context;
 } ExcInfo;
 
-extern UINT32 g_curNestCount;
-extern UINT32 g_intCount;
-extern UINT8 g_uwExcTbl[32];
 extern ExcInfo g_excInfo;
+extern UINT32 g_curNestCount;
+extern UINT8 g_uwExcTbl[32];
 
 #define MAX_INT_INFO_SIZE       (8 + 0x164)
 

arch/arm/cortex-m7/iar/los_interrupt.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -29,12 +29,10 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "los_interrupt.h"
-#include "securec.h"
 #include <stdarg.h>
-#include "los_arch_interrupt.h"
+#include "securec.h"
 #include "los_context.h"
-#include "los_debug.h"
+#include "los_arch_interrupt.h"
 #include "los_hook.h"
 #include "los_task.h"
 #include "los_sched.h"
@@ -44,90 +42,8 @@
 #include "los_cpup.h"
 #endif
 
-UINT32 g_intCount = 0;
-
 #pragma location = ".data.vector"
 #pragma data_alignment = LOSCFG_ARCH_HWI_VECTOR_ALIGN
-/* *
- * @ingroup los_hwi
- * Hardware interrupt form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC g_hwiForm[OS_VECTOR_CNT] = {0};
-
-#if (LOSCFG_DEBUG_TOOLS == 1)
-STATIC UINT32 g_hwiFormCnt[OS_HWI_MAX_NUM] = {0};
-STATIC CHAR *g_hwiFormName[OS_HWI_MAX_NUM] = {0};
-
-UINT32 OsGetHwiFormCnt(UINT32 index)
-{
-    return g_hwiFormCnt[index];
-}
-
-CHAR *OsGetHwiFormName(UINT32 index)
-{
-    return g_hwiFormName[index];
-}
-
-BOOL OsGetHwiCreated(UINT32 index)
-{
-    if (g_hwiForm[index] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return TRUE;
-    }
-
-    return FALSE;
-}
-#endif
-
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-
-typedef struct {
-    HWI_PROC_FUNC pfnHandler;
-    VOID *pParm;
-} HWI_HANDLER_FUNC;
-
-/* *
- * @ingroup los_hwi
- * Hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pfnHandler = vector;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pParm = arg;
-    }
-}
-
-#else
-/* *
- * @ingroup los_hwi
- * hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {0};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT] = vector;
-    }
-}
-#endif
-
-WEAK VOID SysTick_Handler(VOID)
-{
-    return;
-}
 
 /* ****************************************************************************
  Function    : HwiNumGet
@@ -143,100 +59,54 @@ STATIC UINT32 HwiNumGet(VOID)
 
 STATIC UINT32 HwiUnmask(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_EnableIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiMask(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_DisableIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiSetPriority(HWI_HANDLE_T hwiNum, UINT8 priority)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (priority > OS_HWI_PRIO_LOWEST) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-
     NVIC_SetPriority((IRQn_Type)hwiNum, priority);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiPending(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_SetPendingIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
 STATIC UINT32 HwiClear(HWI_HANDLE_T hwiNum)
 {
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     NVIC_ClearPendingIRQ((IRQn_Type)hwiNum);
-
     return LOS_OK;
 }
 
-HwiControllerOps g_archHwiOps = {
+STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
+{
+    HwiSetPriority(hwiNum, hwiPrio);
+    HwiUnmask(hwiNum);
+    return LOS_OK;
+}
+
+STATIC HwiControllerOps g_archHwiOps = {
     .enableIrq      = HwiUnmask,
     .disableIrq     = HwiMask,
     .setIrqPriority = HwiSetPriority,
     .getCurIrqNum   = HwiNumGet,
     .triggerIrq     = HwiPending,
     .clearIrq       = HwiClear,
+    .createIrq      = HwiCreate,
 };
 
-inline UINT32 ArchIsIntActive(VOID)
+HwiControllerOps *ArchIntOpsGet(VOID)
 {
-    return (g_intCount > 0);
-}
-/* ****************************************************************************
- Function    : HalHwiDefaultHandler
- Description : default handler of the hardware interrupt
- Input       : None
- Output      : None
- Return      : None
- **************************************************************************** */
-/*lint -e529*/
-LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
-{
-    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());
-    while (1) {}
-}
-
-WEAK VOID HalPreInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
-}
-
-WEAK VOID HalAftInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
+    return &g_archHwiOps;
 }
 
 /* ****************************************************************************
@@ -295,97 +165,6 @@ LITE_OS_SEC_TEXT VOID HalInterrupt(VOID)
     LOS_IntRestore(intSave);
 }
 
-/* ****************************************************************************
- Function    : ArchHwiCreate
- Description : create hardware interrupt
- Input       : hwiNum   --- hwi num to create
-               hwiPrio  --- priority of the hwi
-               hwiMode  --- unused
-               hwiHandler --- hwi handler
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiCreate(HWI_HANDLE_T hwiNum,
-                                           HWI_PRIOR_T hwiPrio,
-                                           HWI_MODE_T hwiMode,
-                                           HWI_PROC_FUNC hwiHandler,
-                                           HwiIrqParam *irqParam)
-{
-    (VOID)hwiMode;
-    UINT32 intSave;
-
-    if (hwiHandler == NULL) {
-        return OS_ERRNO_HWI_PROC_FUNC_NULL;
-    }
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return OS_ERRNO_HWI_ALREADY_CREATED;
-    }
-
-    if (hwiPrio > OS_HWI_PRIO_LOWEST) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-
-    intSave = LOS_IntLock();
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-    if (irqParam != NULL) {
-        OsSetVector(hwiNum, hwiHandler, irqParam->pDevId);
-    } else {
-        OsSetVector(hwiNum, hwiHandler, NULL);
-    }
-#else
-    (VOID)irqParam;
-    OsSetVector(hwiNum, hwiHandler);
-#endif
-
-#if (LOSCFG_DEBUG_TOOLS == 1)
-    if ((irqParam != NULL) && (irqParam->pName != NULL)) {
-        g_hwiFormName[hwiNum + OS_SYS_VECTOR_CNT] = (CHAR *)irqParam->pName;
-    }
-    g_hwiFormCnt[hwiNum + OS_SYS_VECTOR_CNT] = 0;
-#endif
-
-    HwiUnmask((IRQn_Type)hwiNum);
-    HwiSetPriority((IRQn_Type)hwiNum, hwiPrio);
-
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
-/* ****************************************************************************
- Function    : ArchHwiDelete
- Description : Delete hardware interrupt
- Input       : hwiNum   --- hwi num to delete
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiDelete(HWI_HANDLE_T hwiNum, HwiIrqParam *irqParam)
-{
-    (VOID)irqParam;
-    UINT32 intSave;
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    NVIC_DisableIRQ((IRQn_Type)hwiNum);
-
-    intSave = LOS_IntLock();
-
-    g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
-
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
 #define FAULT_STATUS_REG_BIT            32
 #define USGFAULT                        (1 << 18)
 #define BUSFAULT                        (1 << 17)
@@ -608,6 +387,11 @@ LITE_OS_SEC_TEXT_INIT VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, U
     ArchSysExit();
 }
 
+WEAK VOID SysTick_Handler(VOID)
+{
+    return;
+}
+
 /* ****************************************************************************
  Function    : HalHwiInit
  Description : initialization of the hardware interrupt
@@ -619,23 +403,24 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
     UINT32 index;
-    g_hwiForm[0] = 0;             /* [0] Top of Stack */
-    g_hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
+    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
+    hwiForm[0] = 0;             /* [0] Top of Stack */
+    hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
     for (index = 2; index < OS_VECTOR_CNT; index++) { /* 2: The starting position of the interrupt */
-        g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+        hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
     }
     /* Exception handler register */
-    g_hwiForm[NonMaskableInt_IRQn + OS_SYS_VECTOR_CNT]   = (HWI_PROC_FUNC)HalExcNMI;
-    g_hwiForm[HARDFAULT_IRQN + OS_SYS_VECTOR_CNT]        = (HWI_PROC_FUNC)HalExcHardFault;
-    g_hwiForm[MemoryManagement_IRQn + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalExcMemFault;
-    g_hwiForm[BusFault_IRQn + OS_SYS_VECTOR_CNT]         = (HWI_PROC_FUNC)HalExcBusFault;
-    g_hwiForm[UsageFault_IRQn + OS_SYS_VECTOR_CNT]       = (HWI_PROC_FUNC)HalExcUsageFault;
-    g_hwiForm[SVCall_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalExcSvcCall;
-    g_hwiForm[PendSV_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalPendSV;
-    g_hwiForm[SysTick_IRQn + OS_SYS_VECTOR_CNT]          = (HWI_PROC_FUNC)SysTick_Handler;
+    hwiForm[NonMaskableInt_IRQn + OS_SYS_VECTOR_CNT]   = (HWI_PROC_FUNC)HalExcNMI;
+    hwiForm[HARDFAULT_IRQN + OS_SYS_VECTOR_CNT]        = (HWI_PROC_FUNC)HalExcHardFault;
+    hwiForm[MemoryManagement_IRQn + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalExcMemFault;
+    hwiForm[BusFault_IRQn + OS_SYS_VECTOR_CNT]         = (HWI_PROC_FUNC)HalExcBusFault;
+    hwiForm[UsageFault_IRQn + OS_SYS_VECTOR_CNT]       = (HWI_PROC_FUNC)HalExcUsageFault;
+    hwiForm[SVCall_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalExcSvcCall;
+    hwiForm[PendSV_IRQn + OS_SYS_VECTOR_CNT]           = (HWI_PROC_FUNC)HalPendSV;
+    hwiForm[SysTick_IRQn + OS_SYS_VECTOR_CNT]          = (HWI_PROC_FUNC)SysTick_Handler;
 
     /* Interrupt vector table location */
-    SCB->VTOR = (UINT32)(UINTPTR)g_hwiForm;
+    SCB->VTOR = (UINT32)(UINTPTR)hwiForm;
 #endif
 #if (__CORTEX_M >= 0x03U) /* only for Cortex-M3 and above */
     NVIC_SetPriorityGrouping(OS_NVIC_AIRCR_PRIGROUP);
@@ -649,4 +434,3 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 
     return;
 }
-

arch/csky/BUILD.gn

@@ -1,5 +1,5 @@
 # Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+# Copyright (c) 2020-2023 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:
@@ -30,5 +30,8 @@
 import("//kernel/liteos_m/liteos.gni")
 
 module_group("csky") {
-  modules = [ "v2/gcc" ]
+  modules = [
+    "common",
+    "v2/gcc",
+  ]
 }

arch/csky/common/BUILD.gn

@@ -0,0 +1,39 @@
+# Copyright (c) 2023-2023 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.
+
+import("//kernel/liteos_m/liteos.gni")
+
+module_name = "common"
+kernel_module(module_name) {
+  sources = [ "los_common_interrupt.c" ]
+  configs += [ "$LITEOSTOPDIR:warn_config" ]
+}
+
+config("public") {
+  include_dirs = [ "." ]
+}

arch/csky/common/los_common_interrupt.c

@@ -0,0 +1,289 @@
+/*
+ * Copyright (c) 2023-2023 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.
+ */
+
+#include "los_arch_interrupt.h"
+#include "los_debug.h"
+
+/* *
+ * @ingroup los_hwi
+ * Hardware interrupt form mapping handling function array.
+ */
+HWI_PROC_FUNC __attribute__((aligned(HWI_ALIGNSIZE))) g_hwiForm[OS_VECTOR_CNT] = {0};
+
+VOID *ArchGetHwiFrom(VOID)
+{
+    return g_hwiForm;
+}
+
+UINT32 volatile g_intCount = 0;
+
+/* ****************************************************************************
+ Function    : HalHwiDefaultHandler
+ Description : default handler of the hardware interrupt
+ Input       : None
+ Output      : None
+ Return      : None
+ **************************************************************************** */
+LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
+{
+    PRINT_ERR("%s irqnum:%x\n", __FUNCTION__, ArchIntCurIrqNum());
+    while (1) {}
+}
+
+WEAK VOID HalPreInterruptHandler(UINT32 arg)
+{
+    (VOID)arg;
+    return;
+}
+
+WEAK VOID HalAftInterruptHandler(UINT32 arg)
+{
+    (VOID)arg;
+    return;
+}
+
+STATIC UINT32 HwiNumValid(UINT32 num)
+{
+    return ((num) >= OS_USER_HWI_MIN) && ((num) <= OS_USER_HWI_MAX);
+}
+
+UINT32 ArchIntTrigger(HWI_HANDLE_T hwiNum)
+{
+    if (!HwiNumValid(hwiNum)) {
+        return LOS_ERRNO_HWI_NUM_INVALID;
+    }
+
+    HwiControllerOps *hwiOps = ArchIntOpsGet();
+    if (hwiOps->triggerIrq == NULL) {
+        return OS_ERRNO_HWI_OPS_FUNC_NULL;
+    }
+
+    return hwiOps->triggerIrq(hwiNum);
+}
+
+UINT32 ArchIntEnable(HWI_HANDLE_T hwiNum)
+{
+    if (!HwiNumValid(hwiNum)) {
+        return LOS_ERRNO_HWI_NUM_INVALID;
+    }
+
+    HwiControllerOps *hwiOps = ArchIntOpsGet();
+    if (hwiOps->enableIrq == NULL) {
+        return OS_ERRNO_HWI_OPS_FUNC_NULL;
+    }
+
+    return hwiOps->enableIrq(hwiNum);
+}
+
+UINT32 ArchIntDisable(HWI_HANDLE_T hwiNum)
+{
+    if (!HwiNumValid(hwiNum)) {
+        return LOS_ERRNO_HWI_NUM_INVALID;
+    }
+
+    HwiControllerOps *hwiOps = ArchIntOpsGet();
+    if (hwiOps->disableIrq == NULL) {
+        return OS_ERRNO_HWI_OPS_FUNC_NULL;
+    }
+
+    return hwiOps->disableIrq(hwiNum);
+}
+
+UINT32 ArchIntClear(HWI_HANDLE_T hwiNum)
+{
+    if (!HwiNumValid(hwiNum)) {
+        return LOS_ERRNO_HWI_NUM_INVALID;
+    }
+
+    HwiControllerOps *hwiOps = ArchIntOpsGet();
+    if (hwiOps->clearIrq == NULL) {
+        return OS_ERRNO_HWI_OPS_FUNC_NULL;
+    }
+
+    return hwiOps->clearIrq(hwiNum);
+}
+
+UINT32 ArchIntSetPriority(HWI_HANDLE_T hwiNum, HWI_PRIOR_T priority)
+{
+    if (!HwiNumValid(hwiNum)) {
+        return LOS_ERRNO_HWI_NUM_INVALID;
+    }
+
+    if (!HWI_PRI_VALID(priority)) {
+        return OS_ERRNO_HWI_PRIO_INVALID;
+    }
+
+    HwiControllerOps *hwiOps = ArchIntOpsGet();
+    if (hwiOps->setIrqPriority == NULL) {
+        return OS_ERRNO_HWI_OPS_FUNC_NULL;
+    }
+
+    return hwiOps->setIrqPriority(hwiNum, priority);
+}
+
+UINT32 ArchIntCurIrqNum(VOID)
+{
+    HwiControllerOps *hwiOps = ArchIntOpsGet();
+    return hwiOps->getCurIrqNum();
+}
+
+#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
+typedef struct {
+    HWI_PROC_FUNC pfnHandler;
+    VOID *pParm;
+} HWI_HANDLER_FUNC;
+
+/* *
+ * @ingroup los_hwi
+ * Hardware interrupt handler form mapping handling function array.
+ */
+HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};
+
+/* *
+ * @ingroup los_hwi
+ * Set interrupt vector table.
+ */
+VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg)
+{
+    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
+        g_hwiForm[num + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)IrqEntry;
+        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pfnHandler = vector;
+        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pParm = arg;
+        ArchIntEnable(num);
+    }
+}
+#else
+/* *
+ * @ingroup los_hwi
+ * Hardware interrupt handler form mapping handling function array.
+ */
+HWI_PROC_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {0};
+
+/* *
+ * @ingroup los_hwi
+ * Set interrupt vector table.
+ */
+VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector)
+{
+    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
+        g_hwiForm[num + OS_SYS_VECTOR_CNT] = IrqEntry;
+        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT] = vector;
+        ArchIntEnable(num);
+    }
+}
+#endif
+
+/* ****************************************************************************
+ Function    : ArchHwiCreate
+ Description : create hardware interrupt
+ Input       : hwiNum   --- hwi num to create
+               hwiPrio  --- priority of the hwi
+               hwiMode  --- unused
+               hwiHandler  --- hwi handler
+               irqParam --- param of the hwi handler
+ Output      : None
+ Return      : LOS_OK on success or error code on failure
+ **************************************************************************** */
+LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio,
+                                           HWI_MODE_T hwiMode, HWI_PROC_FUNC hwiHandler,
+                                           HwiIrqParam *irqParam)
+{
+    (VOID)hwiMode;
+    UINT32 intSave;
+
+    if (hwiHandler == NULL) {
+        return OS_ERRNO_HWI_PROC_FUNC_NULL;
+    }
+    if (hwiNum >= OS_HWI_MAX_NUM) {
+        return OS_ERRNO_HWI_NUM_INVALID;
+    }
+    if (g_hwiHandlerForm[hwiNum + OS_SYS_VECTOR_CNT] != 0) {
+        return OS_ERRNO_HWI_ALREADY_CREATED;
+    }
+    if (g_hwiHandlerForm[hwiNum + OS_SYS_VECTOR_CNT] != 0) {
+        return OS_ERRNO_HWI_ALREADY_CREATED;
+    }
+    if (hwiPrio > OS_HWI_PRIO_LOWEST) {
+        return OS_ERRNO_HWI_PRIO_INVALID;
+    }
+    intSave = LOS_IntLock();
+#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
+    if (irqParam != NULL) {
+        OsSetVector(hwiNum, hwiHandler, irqParam->pDevId);
+    } else {
+        OsSetVector(hwiNum, hwiHandler, NULL);
+    }
+#else
+    (VOID)irqParam;
+    OsSetVector(hwiNum, hwiHandler);
+#endif
+
+    HwiControllerOps *hwiOps = ArchIntOpsGet();
+    if (hwiOps->createIrq == NULL) {
+        LOS_IntRestore(intSave);
+        return OS_ERRNO_HWI_OPS_FUNC_NULL;
+    }
+    hwiOps->createIrq(hwiNum, hwiPrio);
+
+    LOS_IntRestore(intSave);
+
+    return LOS_OK;
+}
+
+/* ****************************************************************************
+ Function    : ArchHwiDelete
+ Description : Delete hardware interrupt
+ Input       : hwiNum   --- hwi num to delete
+               irqParam --- param of the hwi handler
+ Output      : None
+ Return      : LOS_OK on success or error code on failure
+ **************************************************************************** */
+LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiDelete(HWI_HANDLE_T hwiNum, HwiIrqParam *irqParam)
+{
+    (VOID)irqParam;
+    UINT32 intSave;
+
+    if (hwiNum >= OS_HWI_MAX_NUM) {
+        return OS_ERRNO_HWI_NUM_INVALID;
+    }
+
+    ArchIntDisable((IRQn_Type)hwiNum);
+
+    intSave = LOS_IntLock();
+    g_hwiHandlerForm[hwiNum + OS_SYS_VECTOR_CNT] = 0;
+    LOS_IntRestore(intSave);
+
+    return LOS_OK;
+}
+
+UINT32 ArchIsIntActive(VOID)
+{
+    return (g_intCount > 0);
+}

arch/csky/common/los_common_interrupt.h

@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2023-2023 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_COMMON_INTERRUPT_H
+#define _LOS_COMMON_INTERRUPT_H
+
+#include "los_config.h"
+#include "los_compiler.h"
+#include "los_interrupt.h"
+#include "los_error.h"
+
+#ifdef __cplusplus
+#if __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+#endif /* __cplusplus */
+
+/* *
+ * @ingroup  los_arch_interrupt
+ * Define the type of a hardware interrupt vector table function.
+ */
+typedef VOID (**HWI_VECTOR_FUNC)(VOID);
+
+/* *
+ * @ingroup los_arch_interrupt
+ * Count of interrupts.
+ */
+extern volatile UINT32 g_intCount;
+
+/* *
+ * @ingroup los_arch_interrupt
+ * Maximum number of used hardware interrupts.
+ */
+#ifndef OS_HWI_MAX_NUM
+#define OS_HWI_MAX_NUM                        LOSCFG_PLATFORM_HWI_LIMIT
+#endif
+
+#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
+/* *
+ * @ingroup los_arch_interrupt
+ * Set interrupt vector table.
+ */
+extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg);
+extern HWI_HANDLER_FUNC g_hwiHandlerForm[];
+#else
+/* *
+ * @ingroup los_arch_interrupt
+ * Set interrupt vector table.
+ */
+extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
+extern HWI_PROC_FUNC g_hwiHandlerForm[];
+#endif
+
+#define OS_EXC_IN_INIT                      0
+#define OS_EXC_IN_TASK                      1
+#define OS_EXC_IN_HWI                       2
+#define OS_EXC_FLAG_FAULTADDR_VALID         0x01
+#define OS_EXC_IMPRECISE_ACCESS_ADDR        0xABABABAB
+
+/* *
+ * @ingroup  los_arch_interrupt
+ * @brief: Default vector handling function.
+ *
+ * @par Description:
+ * This API is used to configure interrupt for null function.
+ *
+ * @attention:
+ * <ul><li>None.</li></ul>
+ *
+ * @param:None.
+ *
+ * @retval:None.
+ * @par Dependency:
+ * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
+ * @see None.
+ */
+extern VOID HalHwiDefaultHandler(VOID);
+
+VOID HalPreInterruptHandler(UINT32 arg);
+VOID HalAftInterruptHandler(UINT32 arg);
+VOID *ArchGetHwiFrom(VOID);
+
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* __cplusplus */
+
+#endif /* _LOS_COMMON_INTERRUPT_H */

arch/csky/v2/gcc/los_arch_interrupt.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -32,9 +32,7 @@
 #ifndef _LOS_ARCH_INTERRUPT_H
 #define _LOS_ARCH_INTERRUPT_H
 
-#include "los_config.h"
-#include "los_compiler.h"
-#include "los_interrupt.h"
+#include "los_common_interrupt.h"
 
 #ifdef __cplusplus
 #if __cplusplus
@@ -42,14 +40,6 @@ extern "C" {
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
-/* *
- * @ingroup los_arch_interrupt
- * Maximum number of used hardware interrupts.
- */
-#ifndef OS_HWI_MAX_NUM
-#define OS_HWI_MAX_NUM                        LOSCFG_PLATFORM_HWI_LIMIT
-#endif
-
 /* *
  * @ingroup los_arch_interrupt
  * Highest priority of a hardware interrupt.
@@ -72,18 +62,6 @@ extern "C" {
  */
 #define HWI_PRI_VALID(pri)              (((pri) >= OS_HWI_PRIO_HIGHEST) && ((pri) <= OS_HWI_PRIO_LOWEST))
 
-/* *
- * @ingroup  los_arch_interrupt
- * Define the type of a hardware interrupt vector table function.
- */
-typedef VOID (**HWI_VECTOR_FUNC)(VOID);
-
-/* *
- * @ingroup los_arch_interrupt
- * Count of interrupts.
- */
-extern volatile UINT32 g_intCount;
-
 /* *
  * @ingroup los_arch_interrupt
  * Count of C-sky system interrupt vector.
@@ -96,6 +74,11 @@ extern volatile UINT32 g_intCount;
  */
 #define OS_VECTOR_CNT                         (OS_SYS_VECTOR_CNT + OS_HWI_MAX_NUM)
 
+#define OS_USER_HWI_MIN                 0
+#define OS_USER_HWI_MAX                 (LOSCFG_PLATFORM_HWI_LIMIT - 1)
+
+#define HWI_ALIGNSIZE                   0x400
+
 #define PSR_VEC_OFFSET                         16U
 #define VIC_REG_BASE                           0xE000E100UL
 
@@ -208,6 +191,16 @@ extern VIC_TYPE *VIC_REG;
  */
 #define OS_ERRNO_HWI_FASTMODE_ALREADY_CREATED LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x07)
 
+/* *
+ * @ingroup los_arch_interrupt
+ * Hardware interrupt error code: Invalid interrupt operation function.
+ *
+ * Value: 0x0200090c
+ *
+ * Solution: Set a valid interrupt operation function
+ */
+#define OS_ERRNO_HWI_OPS_FUNC_NULL            LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x0c)
+
 /* *
  * @ingroup los_arch_interrupt
  * Hardware interrupt error code: Invalid interrupt number.
@@ -218,20 +211,6 @@ extern VIC_TYPE *VIC_REG;
  */
 #define LOS_ERRNO_HWI_NUM_INVALID             OS_ERRNO_HWI_NUM_INVALID
 
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-/* *
- * @ingroup los_arch_interrupt
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg);
-#else
-/* *
- * @ingroup los_arch_interrupt
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
-#endif
-
 /* *
  * @ingroup  los_arch_interrupt
  * @brief: Hardware interrupt entry function.
@@ -251,29 +230,6 @@ extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
  */
 extern VOID HalInterrupt(VOID);
 
-/* *
- * @ingroup  los_arch_interrupt
- * @brief: Default vector handling function.
- *
- * @par Description:
- * This API is used to configure interrupt for null function.
- *
- * @attention:
- * <ul><li>None.</li></ul>
- *
- * @param:None.
- *
- * @retval:None.
- * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
- * @see None.
- */
-extern VOID HalHwiDefaultHandler(VOID);
-
-#define OS_EXC_IN_INIT                      0
-#define OS_EXC_IN_TASK                      1
-#define OS_EXC_IN_HWI                       2
-
 #define OS_VIC_INT_ENABLE_SIZE             0x4
 #define OS_VIC_INT_WAKER_SIZE              0x4
 #define OS_VIC_INT_ICER_SIZE               0x4
@@ -283,10 +239,6 @@ extern VOID HalHwiDefaultHandler(VOID);
 #define OS_VIC_INT_ISR_SIZE                0x4
 #define OS_VIC_INT_IPTR_SIZE               0x4
 
-#define OS_EXC_FLAG_FAULTADDR_VALID         0x01
-
-#define OS_EXC_IMPRECISE_ACCESS_ADDR        0xABABABAB
-
 /**
  * @ingroup los_exc
  * the struct of register files

arch/csky/v2/gcc/los_interrupt.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -29,7 +29,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "los_interrupt.h"
 #include <stdarg.h>
 #include "securec.h"
 #include "los_context.h"
@@ -53,20 +52,10 @@
 #define MASK_32_BITS     0xFFFFFFFF
 #define BYTES_OF_128_INT 4
 
-#define OS_USER_HWI_MIN                 0
-#define OS_USER_HWI_MAX                 (LOSCFG_PLATFORM_HWI_LIMIT - 1)
-#define HWI_ALIGNSIZE                   0x400
-
-UINT32 volatile g_intCount = 0;
 CHAR g_trapStackBase[OS_TRAP_STACK_SIZE];
 
 VIC_TYPE *VIC_REG = (VIC_TYPE *)VIC_REG_BASE;
 
-UINT32 HwiNumValid(UINT32 num)
-{
-    return ((num) >= OS_USER_HWI_MIN) && ((num) <= OS_USER_HWI_MAX);
-}
-
 UINT32 HalGetPsr(VOID)
 {
     UINT32 intSave;
@@ -120,10 +109,6 @@ STATIC UINT32 HwiUnmask(HWI_HANDLE_T hwiNum)
 {
     UINT32 intSave;
 
-    if (!HwiNumValid(hwiNum)) {
-        return LOS_ERRNO_HWI_NUM_INVALID;
-    }
-
     intSave = LOS_IntLock();
     VIC_REG->ISER[hwiNum / OS_SYS_VECTOR_CNT] = (UINT32)(1UL << (hwiNum % OS_SYS_VECTOR_CNT));
     VIC_REG->ISSR[hwiNum / OS_SYS_VECTOR_CNT] = (UINT32)(1UL << (hwiNum % OS_SYS_VECTOR_CNT));
@@ -136,14 +121,6 @@ STATIC UINT32 HwiSetPriority(HWI_HANDLE_T hwiNum, UINT8 priority)
 {
     UINT32 intSave;
 
-    if (!HwiNumValid(hwiNum)) {
-        return LOS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (!HWI_PRI_VALID(priority)) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-
     intSave = LOS_IntLock();
     VIC_REG->IPR[hwiNum / PRI_PER_REG] |= (((priority << PRI_OFF_IN_REG) << (hwiNum % PRI_PER_REG)) * PRI_OFF_PER_INT);
     LOS_IntRestore(intSave);
@@ -155,10 +132,6 @@ STATIC UINT32 HwiMask(HWI_HANDLE_T hwiNum)
 {
     UINT32 intSave;
 
-    if (!HwiNumValid(hwiNum)) {
-        return LOS_ERRNO_HWI_NUM_INVALID;
-    }
-
     intSave = LOS_IntLock();
     VIC_REG->ICER[hwiNum / OS_SYS_VECTOR_CNT] = (UINT32)(1UL << (hwiNum % OS_SYS_VECTOR_CNT));
     LOS_IntRestore(intSave);
@@ -170,10 +143,6 @@ STATIC UINT32 HwiPending(HWI_HANDLE_T hwiNum)
 {
     UINT32 intSave;
 
-    if (!HwiNumValid(hwiNum)) {
-        return LOS_ERRNO_HWI_NUM_INVALID;
-    }
-
     intSave = LOS_IntLock();
     VIC_REG->ISPR[hwiNum / OS_SYS_VECTOR_CNT] = (UINT32)(1UL << (hwiNum % OS_SYS_VECTOR_CNT));
     LOS_IntRestore(intSave);
@@ -183,69 +152,11 @@ STATIC UINT32 HwiPending(HWI_HANDLE_T hwiNum)
 
 STATIC UINT32 HwiClear(HWI_HANDLE_T hwiNum)
 {
-    if (!HwiNumValid(hwiNum)) {
-        return LOS_ERRNO_HWI_NUM_INVALID;
-    }
-
     VIC_REG->ICPR[hwiNum / OS_SYS_VECTOR_CNT] = (UINT32)(1UL << (hwiNum % OS_SYS_VECTOR_CNT));
 
     return LOS_OK;
 }
 
-/* *
- * @ingroup los_hwi
- * Hardware interrupt form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC __attribute__((aligned(HWI_ALIGNSIZE))) g_hwiForm[OS_VECTOR_CNT] = {0};
-
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-
-typedef struct {
-    HWI_PROC_FUNC pfnHandler;
-    VOID *pParm;
-} HWI_HANDLER_FUNC;
-
-/* *
- * @ingroup los_hwi
- * Hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)IrqEntry;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pfnHandler = vector;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pParm = arg;
-        HwiUnmask(num);
-    }
-}
-
-#else
-/* *
- * @ingroup los_hwi
- * Hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {0};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = IrqEntry;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT] = vector;
-        HwiUnmask(num);
-    }
-}
-#endif
-
 /* ****************************************************************************
  Function    : HwiNumGet
  Description : Get an interrupt number
@@ -258,43 +169,26 @@ STATIC UINT32 HwiNumGet(VOID)
     return (HalGetPsr() >> PSR_VEC_OFFSET) & MASK_8_BITS;
 }
 
-HwiControllerOps g_archHwiOps = {
-    .triggerIrq     = HwiPending,
+STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
+{
+    HwiSetPriority(hwiNum, (UINT8)hwiPrio);
+    HwiUnmask(hwiNum);
+    return LOS_OK;
+}
+
+STATIC HwiControllerOps g_archHwiOps = {
     .enableIrq      = HwiUnmask,
     .disableIrq     = HwiMask,
     .setIrqPriority = HwiSetPriority,
     .getCurIrqNum   = HwiNumGet,
+    .triggerIrq     = HwiPending,
     .clearIrq       = HwiClear,
+    .createIrq      = HwiCreate,
 };
 
-inline UINT32 ArchIsIntActive(VOID)
+HwiControllerOps *ArchIntOpsGet(VOID)
 {
-    return (g_intCount > 0);
-}
-
-/* ****************************************************************************
- Function    : HalHwiDefaultHandler
- Description : default handler of the hardware interrupt
- Input       : None
- Output      : None
- Return      : None
- **************************************************************************** */
-LITE_OS_SEC_TEXT_MINOR VOID HalHwiDefaultHandler(VOID)
-{
-    PRINT_ERR("%s irqnum:%x\n", __FUNCTION__, HwiNumGet());
-    while (1) {}
-}
-
-WEAK VOID HalPreInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
-}
-
-WEAK VOID HalAftInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
+    return &g_archHwiOps;
 }
 
 /* ****************************************************************************
@@ -339,83 +233,6 @@ LITE_OS_SEC_TEXT VOID HalInterrupt(VOID)
     LOS_IntRestore(intSave);
 }
 
-/* ****************************************************************************
- Function    : ArchHwiCreate
- Description : create hardware interrupt
- Input       : hwiNum   --- hwi num to create
-               hwiPrio  --- priority of the hwi
-               hwiMode  --- unused
-               hwiHandler  --- hwi handler
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiCreate(HWI_HANDLE_T hwiNum,
-                                           HWI_PRIOR_T hwiPrio,
-                                           HWI_MODE_T hwiMode,
-                                           HWI_PROC_FUNC hwiHandler,
-                                           HwiIrqParam *irqParam)
-{
-    (VOID)hwiMode;
-    UINT32 intSave;
-
-    if (hwiHandler == NULL) {
-        return OS_ERRNO_HWI_PROC_FUNC_NULL;
-    }
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-    if (g_hwiHandlerForm[hwiNum + OS_SYS_VECTOR_CNT] != 0) {
-        return OS_ERRNO_HWI_ALREADY_CREATED;
-    }
-    if (g_hwiHandlerForm[hwiNum + OS_SYS_VECTOR_CNT] != 0) {
-        return OS_ERRNO_HWI_ALREADY_CREATED;
-    }
-    if (hwiPrio > OS_HWI_PRIO_LOWEST) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-    intSave = LOS_IntLock();
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-    if (irqParam != NULL) {
-        OsSetVector(hwiNum, hwiHandler, irqParam->pDevId);
-    } else {
-        OsSetVector(hwiNum, hwiHandler, NULL);
-    }
-#else
-    (VOID)irqParam;
-    OsSetVector(hwiNum, hwiHandler);
-#endif
-    HwiUnmask(hwiNum);
-    (VOID)HwiSetPriority(hwiNum, (UINT8)hwiPrio);
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
-/* ****************************************************************************
- Function    : ArchHwiDelete
- Description : Delete hardware interrupt
- Input       : hwiNum   --- hwi num to delete
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiDelete(HWI_HANDLE_T hwiNum, HwiIrqParam *irqParam)
-{
-    (VOID)irqParam;
-    UINT32 intSave;
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-    HwiMask(hwiNum);
-    intSave = LOS_IntLock();
-    g_hwiHandlerForm[hwiNum + OS_SYS_VECTOR_CNT] = 0;
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
 ExcInfo g_excInfo = {0};
 
 #if (LOSCFG_KERNEL_PRINTF != 0)
@@ -602,16 +419,17 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
     UINT32 i;
 
+    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
     for (i = 1; i < OS_SYS_VECTOR_CNT; i++) {
-        g_hwiForm[i] = (HWI_PROC_FUNC)HandleEntry;
+        hwiForm[i] = (HWI_PROC_FUNC)HandleEntry;
     }
 
     for (i = OS_SYS_VECTOR_CNT; i < (LOSCFG_PLATFORM_HWI_LIMIT + OS_SYS_VECTOR_CNT); i++) {
-        g_hwiForm[i] = (HWI_PROC_FUNC)IrqEntry;
+        hwiForm[i] = (HWI_PROC_FUNC)IrqEntry;
     }
-    HalHwiHandleReInit((UINT32)&g_hwiForm);
+    HalHwiHandleReInit((UINT32)hwiForm);
 
-    HalSetVbr((UINT32)&g_hwiForm);
+    HalSetVbr((UINT32)hwiForm);
     for (i = 0; i < BYTES_OF_128_INT; i++) {
         VIC_REG->IABR[i] = 0x0;
         VIC_REG->ICPR[i] = MASK_32_BITS;

arch/include/los_interrupt.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -31,6 +31,7 @@
 
 #ifndef _LOS_INTERRUPT_H
 #define _LOS_INTERRUPT_H
+
 #include "los_config.h"
 #include "los_compiler.h"
 
@@ -41,11 +42,8 @@ extern "C" {
 #endif /* __cplusplus */
 
 typedef UINT32 HWI_HANDLE_T;
-
 typedef UINT16 HWI_PRIOR_T;
-
 typedef UINT16 HWI_MODE_T;
-
 typedef UINT32 HWI_ARG_T;
 
 #if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
@@ -53,6 +51,7 @@ typedef VOID (*HWI_PROC_FUNC)(VOID *parm);
 #else
 typedef VOID (*HWI_PROC_FUNC)(void);
 #endif
+
 typedef struct tagIrqParam {
     int swIrq;         /**< The interrupt number */
     VOID *pDevId;      /**< The pointer to the device ID that launches the interrupt */
@@ -66,37 +65,17 @@ typedef struct {
     UINT32 (*disableIrq)(HWI_HANDLE_T hwiNum);
     UINT32 (*setIrqPriority)(HWI_HANDLE_T hwiNum, UINT8 priority);
     UINT32 (*getCurIrqNum)(VOID);
+    UINT32 (*createIrq)(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio);
 } HwiControllerOps;
 
-extern HwiControllerOps g_archHwiOps;
-
 /* stack protector */
 extern UINT32 __stack_chk_guard;
-
 extern VOID __stack_chk_fail(VOID);
-
-UINT32 ArchIsIntActive(VOID);
-#define OS_INT_ACTIVE    (ArchIsIntActive())
-#define OS_INT_INACTIVE  (!(OS_INT_ACTIVE))
-#define LOS_HwiCreate ArchHwiCreate
-#define LOS_HwiDelete ArchHwiDelete
-#define LOS_HwiTrigger ArchIntTrigger
-#define LOS_HwiEnable ArchIntEnable
-#define LOS_HwiDisable ArchIntDisable
-#define LOS_HwiClear ArchIntClear
-#define LOS_HwiSetPriority ArchIntSetPriority
-#define LOS_HwiCurIrqNum ArchIntCurIrqNum
-
-UINT32 ArchIntLock(VOID);
-#define LOS_IntLock ArchIntLock
-
-VOID ArchIntRestore(UINT32 intSave);
-#define LOS_IntRestore ArchIntRestore
-
-UINT32 ArchIntUnLock(VOID);
-#define LOS_IntUnLock ArchIntUnLock
-
-#define LOS_HwiOpsGet ArchIntOpsGet
+#if (LOSCFG_DEBUG_TOOLS == 1)
+extern UINT32 OsGetHwiFormCnt(UINT32 index);
+extern CHAR *OsGetHwiFormName(UINT32 index);
+extern BOOL OsHwiIsCreated(UINT32 index);
+#endif
 
 /**
  * @ingroup  los_interrupt
@@ -162,70 +141,34 @@ UINT32 ArchHwiDelete(HWI_HANDLE_T hwiNum, HwiIrqParam *irqParam);
  * <ul><li>los_interrupt.h: the header file that contains the API declaration.</li></ul>
  * @see None.
  */
-UINT32 ArchHwiCreate(HWI_HANDLE_T hwiNum,
-                     HWI_PRIOR_T hwiPrio,
-                     HWI_MODE_T mode,
-                     HWI_PROC_FUNC handler,
-                     HwiIrqParam *irqParam);
+UINT32 ArchHwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio, HWI_MODE_T mode,
+                     HWI_PROC_FUNC handler, HwiIrqParam *irqParam);
+UINT32 ArchIsIntActive(VOID);
+UINT32 ArchIntLock(VOID);
+UINT32 ArchIntUnLock(VOID);
+VOID ArchIntRestore(UINT32 intSave);
+UINT32 ArchIntTrigger(HWI_HANDLE_T hwiNum);
+UINT32 ArchIntEnable(HWI_HANDLE_T hwiNum);
+UINT32 ArchIntDisable(HWI_HANDLE_T hwiNum);
+UINT32 ArchIntClear(HWI_HANDLE_T hwiNum);
+UINT32 ArchIntSetPriority(HWI_HANDLE_T hwiNum, HWI_PRIOR_T priority);
+UINT32 ArchIntCurIrqNum(VOID);
+HwiControllerOps *ArchIntOpsGet(VOID);
 
-STATIC INLINE UINT32 ArchIntTrigger(HWI_HANDLE_T hwiNum)
-{
-    if (g_archHwiOps.triggerIrq == NULL) {
-        return LOS_NOK;
-    }
-    return g_archHwiOps.triggerIrq(hwiNum);
-}
-
-STATIC INLINE UINT32 ArchIntEnable(HWI_HANDLE_T hwiNum)
-{
-    if (g_archHwiOps.enableIrq == NULL) {
-        return LOS_NOK;
-    }
-    return g_archHwiOps.enableIrq(hwiNum);
-}
-
-STATIC INLINE UINT32 ArchIntDisable(HWI_HANDLE_T hwiNum)
-{
-    if (g_archHwiOps.disableIrq == NULL) {
-        return LOS_NOK;
-    }
-    return g_archHwiOps.disableIrq(hwiNum);
-}
-
-STATIC INLINE UINT32 ArchIntClear(HWI_HANDLE_T hwiNum)
-{
-    if (g_archHwiOps.clearIrq == NULL) {
-        return LOS_NOK;
-    }
-    return g_archHwiOps.clearIrq(hwiNum);
-}
-
-STATIC INLINE UINT32 ArchIntSetPriority(HWI_HANDLE_T hwiNum, HWI_PRIOR_T priority)
-{
-    if (g_archHwiOps.setIrqPriority == NULL) {
-        return LOS_NOK;
-    }
-    return g_archHwiOps.setIrqPriority(hwiNum, priority);
-}
-
-STATIC INLINE UINT32 ArchIntCurIrqNum(VOID)
-{
-    if (g_archHwiOps.getCurIrqNum == NULL) {
-        return LOS_NOK;
-    }
-    return g_archHwiOps.getCurIrqNum();
-}
-
-STATIC INLINE HwiControllerOps *ArchIntOpsGet(VOID)
-{
-    return &g_archHwiOps;
-}
-
-#if (LOSCFG_DEBUG_TOOLS == 1)
-extern UINT32 OsGetHwiFormCnt(UINT32 index);
-extern CHAR *OsGetHwiFormName(UINT32 index);
-extern BOOL OsGetHwiCreated(UINT32 index);
-#endif
+#define OS_INT_ACTIVE           (ArchIsIntActive())
+#define OS_INT_INACTIVE         (!(OS_INT_ACTIVE))
+#define LOS_IntLock             ArchIntLock
+#define LOS_IntRestore          ArchIntRestore
+#define LOS_IntUnLock           ArchIntUnLock
+#define LOS_HwiDelete           ArchHwiDelete
+#define LOS_HwiCreate           ArchHwiCreate
+#define LOS_HwiTrigger          ArchIntTrigger
+#define LOS_HwiEnable           ArchIntEnable
+#define LOS_HwiDisable          ArchIntDisable
+#define LOS_HwiClear            ArchIntClear
+#define LOS_HwiSetPriority      ArchIntSetPriority
+#define LOS_HwiCurIrqNum        ArchIntCurIrqNum
+#define LOS_HwiOpsGet           ArchIntOpsGet
 
 #ifdef __cplusplus
 #if __cplusplus

arch/risc-v/BUILD.gn

@@ -30,5 +30,8 @@
 import("//kernel/liteos_m/liteos.gni")
 
 module_group("risc-v") {
-  modules = [ "riscv32/gcc" ]
+  modules = [
+    "common",
+    "riscv32/gcc",
+  ]
 }

arch/risc-v/common/BUILD.gn

@@ -0,0 +1,39 @@
+# Copyright (c) 2023-2023 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.
+
+import("//kernel/liteos_m/liteos.gni")
+
+module_name = "common"
+kernel_module(module_name) {
+  sources = [ "los_common_interrupt.c" ]
+  configs += [ "$LITEOSTOPDIR:warn_config" ]
+}
+
+config("public") {
+  include_dirs = [ "." ]
+}

arch/risc-v/common/los_common_interrupt.c

@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2023-2023 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.
+ */
+
+#include "los_arch_interrupt.h"
+#include "los_debug.h"
+
+LITE_OS_SEC_BSS UINT32  g_intCount = 0;
+
+UINT32 ArchIsIntActive(VOID)
+{
+    return (g_intCount > 0);
+}
+
+LITE_OS_SEC_TEXT_INIT VOID HalHwiDefaultHandler(VOID *arg)
+{
+    (VOID)arg;
+    PRINT_ERR("default handler\n");
+    while (1) {
+    }
+}
+
+UINT32 ArchIntTrigger(HWI_HANDLE_T hwiNum)
+{
+    HwiControllerOps *hwiOps = ArchIntOpsGet();
+    if (hwiOps->triggerIrq == NULL) {
+        return OS_ERRNO_HWI_OPS_FUNC_NULL;
+    }
+
+    return hwiOps->triggerIrq(hwiNum);
+}
+
+UINT32 ArchIntEnable(HWI_HANDLE_T hwiNum)
+{
+    HwiControllerOps *hwiOps = ArchIntOpsGet();
+    if (hwiOps->enableIrq == NULL) {
+        return OS_ERRNO_HWI_OPS_FUNC_NULL;
+    }
+
+    return hwiOps->enableIrq(hwiNum);
+}
+
+UINT32 ArchIntDisable(HWI_HANDLE_T hwiNum)
+{
+    HwiControllerOps *hwiOps = ArchIntOpsGet();
+    if (hwiOps->disableIrq == NULL) {
+        return OS_ERRNO_HWI_OPS_FUNC_NULL;
+    }
+
+    return hwiOps->disableIrq(hwiNum);
+}
+
+UINT32 ArchIntClear(HWI_HANDLE_T hwiNum)
+{
+    HwiControllerOps *hwiOps = ArchIntOpsGet();
+    if (hwiOps->clearIrq == NULL) {
+        return OS_ERRNO_HWI_OPS_FUNC_NULL;
+    }
+
+    return hwiOps->clearIrq(hwiNum);
+}
+
+UINT32 ArchIntSetPriority(HWI_HANDLE_T hwiNum, HWI_PRIOR_T priority)
+{
+    HwiControllerOps *hwiOps = ArchIntOpsGet();
+    if (hwiOps->setIrqPriority == NULL) {
+        return OS_ERRNO_HWI_OPS_FUNC_NULL;
+    }
+
+    return hwiOps->setIrqPriority(hwiNum, priority);
+}
+
+UINT32 ArchIntCurIrqNum(VOID)
+{
+    HwiControllerOps *hwiOps = ArchIntOpsGet();
+    return hwiOps->getCurIrqNum();
+}

arch/risc-v/common/los_common_interrupt.h

@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2023-2023 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_COMMON_INTERRUPT_H
+#define _LOS_COMMON_INTERRUPT_H
+
+#include "los_config.h"
+#include "los_compiler.h"
+#include "los_interrupt.h"
+#include "los_arch_context.h"
+#include "los_error.h"
+
+#ifdef __cplusplus
+#if __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+#endif /* __cplusplus */
+
+/* *
+ * @ingroup los_arch_interrupt
+ * Count of interrupts.
+ */
+extern UINT32 g_intCount;
+
+extern VOID HalHwiDefaultHandler(VOID *arg);
+
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* __cplusplus */
+
+#endif /* _LOS_COMMON_INTERRUPT_H */

arch/risc-v/nuclei/gcc/los_arch_interrupt.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2020, Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 Huawei Device Co., Ltd. All rights reserved.
  * Copyright (c) 2021 Nuclei Limited. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -29,14 +29,12 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef _LOS_HWI_H
-#define _LOS_HWI_H
 
+#ifndef _LOS_ARCH_INTERRUPT_H
+#define _LOS_ARCH_INTERRUPT_H
+
+#include "los_common_interrupt.h"
 #include "nuclei_sdk_soc.h"
-#include "los_compiler.h"
-#include "los_config.h"
-#include "los_interrupt.h"
-#include "los_arch_context.h"
 
 #ifdef __cplusplus
 #if __cplusplus
@@ -192,6 +190,16 @@ extern VOID HalHwiDefaultHandler(VOID);
  */
 #define OS_ERRNO_HWI_HWINUM_UNCREATE LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x0b)
 
+/* *
+ * @ingroup los_arch_interrupt
+ * Hardware interrupt error code: Invalid interrupt operation function.
+ *
+ * Value: 0x0200090c
+ *
+ * Solution: Set a valid interrupt operation function
+ */
+#define OS_ERRNO_HWI_OPS_FUNC_NULL LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x0c)
+
 extern UINT32 HalUnalignedAccessFix(UINTPTR mcause, UINTPTR mepc, UINTPTR mtval, VOID *sp);
 
 extern VOID DisplayTaskInfo(VOID);
@@ -202,4 +210,4 @@ extern VOID DisplayTaskInfo(VOID);
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
-#endif /* _LOS_HWI_H */
+#endif /* _LOS_ARCH_INTERRUPT_H */

arch/risc-v/nuclei/gcc/los_interrupt.c

@@ -1,4 +1,5 @@
 /*
+ * Copyright (c) 2023-2023 Huawei Device Co., Ltd. All rights reserved.
  * Copyright (c) 2021 Nuclei Limited. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -37,8 +38,6 @@
 #include "los_debug.h"
 #include "nuclei_sdk_hal.h"
 
-UINT32 g_intCount = 0;
-
 STATIC UINT32 HwiUnmask(HWI_HANDLE_T hwiNum)
 {
     if (hwiNum >= OS_HWI_MAX_NUM) {
@@ -150,20 +149,6 @@ LITE_OS_SEC_TEXT UINT32 ArchHwiDelete(HWI_HANDLE_T hwiNum, HwiIrqParam *irqParam
     return LOS_OK;
 }
 
-/* ****************************************************************************
- Function    : HalHwiDefaultHandler
- Description : default handler of the hardware interrupt
- Input       : None
- Output      : None
- Return      : None
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT VOID HalHwiDefaultHandler(VOID)
-{
-    PRINT_ERR("default handler\n");
-    while (1) {
-    }
-}
-
 /* ****************************************************************************
  Function    : HalDisplayTaskInfo
  Description : display the task list
@@ -215,13 +200,13 @@ __attribute__((always_inline)) inline VOID HalIntExit(VOID)
     g_intCount -= 1;
 }
 
-__attribute__((always_inline)) inline UINT32 ArchIsIntActive(VOID)
-{
-    return (g_intCount > 0);
-}
-
-const HwiControllerOps g_archHwiOps = {
+STATIC HwiControllerOps g_archHwiOps = {
     .enableIrq      = HwiUnmask,
     .disableIrq     = HwiMask,
     .setIrqPriority = HwiSetPriority,
 };
+
+HwiControllerOps *ArchIntOpsGet(VOID)
+{
+    return &g_archHwiOps;
+}

arch/risc-v/riscv32/gcc/los_arch_interrupt.h

@@ -31,11 +31,7 @@
 #ifndef _LOS_ARCH_INTERRUPT_H
 #define _LOS_ARCH_INTERRUPT_H
 
-#include "los_compiler.h"
-#include "los_config.h"
-#include "los_interrupt.h"
-#include "los_arch_context.h"
-#include "los_error.h"
+#include "los_common_interrupt.h"
 
 #ifdef __cplusplus
 #if __cplusplus
@@ -146,9 +142,6 @@ extern VOID HalHwiInit(VOID);
 extern UINT32 HalGetHwiFormCnt(HWI_HANDLE_T hwiNum);
 extern HWI_HANDLE_FORM_S *HalGetHwiForm(VOID);
 extern VOID HalHwiInterruptDone(HWI_HANDLE_T hwiNum);
-extern VOID HalHwiDefaultHandler(VOID *arg);
-
-extern UINT32 g_intCount;
 
 /**
  * @ingroup los_arch_interrupt
@@ -273,6 +266,16 @@ extern UINT32 g_intCount;
  */
 #define OS_ERRNO_HWI_HWINUM_UNCREATE LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x0b)
 
+/* *
+ * @ingroup los_arch_interrupt
+ * Hardware interrupt error code: Invalid interrupt operation function.
+ *
+ * Value: 0x0200090c
+ *
+ * Solution: Set a valid interrupt operation function
+ */
+#define OS_ERRNO_HWI_OPS_FUNC_NULL LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x0c)
+
 extern UINT32 HalUnalignedAccessFix(UINTPTR mcause, UINTPTR mepc, UINTPTR mtval, VOID *sp);
 
 #ifdef __cplusplus

arch/risc-v/riscv32/gcc/los_interrupt.c

@@ -40,7 +40,6 @@
 #include "los_hook.h"
 #include "riscv_hal.h"
 
-
 LosExcInfo g_excInfo;
 #define RISCV_EXC_TYPE_NUM 16
 #define RISCV_EXC_LOAD_MISALIGNED 4
@@ -64,7 +63,6 @@ const CHAR g_excInformation[RISCV_EXC_TYPE_NUM][50] = {
     { "Store/AMO page fault!" },
 };
 
-LITE_OS_SEC_BSS UINT32  g_intCount = 0;
 LITE_OS_SEC_BSS UINT32 g_hwiFormCnt[OS_HWI_MAX_NUM];
 LITE_OS_SEC_DATA_INIT HWI_HANDLE_FORM_S g_hwiForm[OS_HWI_MAX_NUM] = {
     { .pfnHook = NULL, .uwParam = 0 }, // 0 User software interrupt handler
@@ -95,14 +93,6 @@ LITE_OS_SEC_DATA_INIT HWI_HANDLE_FORM_S g_hwiForm[OS_HWI_MAX_NUM] = {
     { .pfnHook = NULL, .uwParam = 0 }, // 25 Reserved
 };
 
-LITE_OS_SEC_TEXT_INIT VOID HalHwiDefaultHandler(VOID *arg)
-{
-    (VOID)arg;
-    PRINT_ERR("default handler\n");
-    while (1) {
-    }
-}
-
 LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
     UINT32 index;
@@ -144,12 +134,6 @@ LITE_OS_SEC_TEXT HWI_HANDLE_FORM_S *HalGetHwiForm(VOID)
     return g_hwiForm;
 }
 
-
-inline UINT32 ArchIsIntActive(VOID)
-{
-    return (g_intCount > 0);
-}
-
 /*****************************************************************************
  Function    : ArchHwiCreate
  Description : create hardware interrupt
@@ -348,3 +332,9 @@ SYSTEM_DEATH:
     }
 }
 
+LITE_OS_SEC_BSS STATIC HwiControllerOps g_archHwiOps;
+
+HwiControllerOps *ArchIntOpsGet(VOID)
+{
+    return &g_archHwiOps;
+}

arch/xtensa/BUILD.gn

@@ -1,5 +1,5 @@
 # Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+# Copyright (c) 2020-2023 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:
@@ -30,5 +30,8 @@
 import("//kernel/liteos_m/liteos.gni")
 
 module_group("xtensa") {
-  modules = [ "lx6/gcc" ]
+  modules = [
+    "common",
+    "lx6/gcc",
+  ]
 }

arch/xtensa/common/BUILD.gn

@@ -0,0 +1,39 @@
+# Copyright (c) 2023-2023 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.
+
+import("//kernel/liteos_m/liteos.gni")
+
+module_name = "common"
+kernel_module(module_name) {
+  sources = [ "los_common_interrupt.c" ]
+  configs += [ "$LITEOSTOPDIR:warn_config" ]
+}
+
+config("public") {
+  include_dirs = [ "." ]
+}

arch/xtensa/common/los_common_interrupt.c

@@ -0,0 +1,275 @@
+/*
+ * Copyright (c) 2023-2023 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.
+ */
+
+#include "los_arch_interrupt.h"
+#include "los_debug.h"
+
+UINT32 g_intCount = 0;
+
+/* *
+ * @ingroup los_hwi
+ * Hardware interrupt form mapping handling function array.
+ */
+HWI_PROC_FUNC __attribute__((aligned(LOSCFG_ARCH_HWI_VECTOR_ALIGN))) g_hwiForm[OS_VECTOR_CNT] = {0};
+
+VOID *ArchGetHwiFrom(VOID)
+{
+    return g_hwiForm;
+}
+
+/* ****************************************************************************
+ Function    : HalHwiDefaultHandler
+ Description : default handler of the hardware interrupt
+ Input       : None
+ Output      : None
+ Return      : None
+ **************************************************************************** */
+VOID HalHwiDefaultHandler(VOID)
+{
+    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, ArchIntCurIrqNum());
+    while (1) {}
+}
+
+WEAK VOID HalPreInterruptHandler(UINT32 arg)
+{
+    (VOID)arg;
+    return;
+}
+
+WEAK VOID HalAftInterruptHandler(UINT32 arg)
+{
+    (VOID)arg;
+    return;
+}
+
+STATIC UINT32 HwiNumValid(UINT32 num)
+{
+    return (num >= OS_SYS_VECTOR_CNT) && (num <= OS_VECTOR_CNT);
+}
+
+UINT32 ArchIntTrigger(HWI_HANDLE_T hwiNum)
+{
+    if (!HwiNumValid(hwiNum)) {
+        return OS_ERRNO_HWI_NUM_INVALID;
+    }
+
+    HwiControllerOps *hwiOps = ArchIntOpsGet();
+    if (hwiOps->triggerIrq == NULL) {
+        return OS_ERRNO_HWI_OPS_FUNC_NULL;
+    }
+
+    return hwiOps->triggerIrq(hwiNum);
+}
+
+UINT32 ArchIntEnable(HWI_HANDLE_T hwiNum)
+{
+    if (!HwiNumValid(hwiNum)) {
+        return OS_ERRNO_HWI_NUM_INVALID;
+    }
+
+    HwiControllerOps *hwiOps = ArchIntOpsGet();
+    if (hwiOps->enableIrq == NULL) {
+        return OS_ERRNO_HWI_OPS_FUNC_NULL;
+    }
+
+    return hwiOps->enableIrq(hwiNum);
+}
+
+UINT32 ArchIntDisable(HWI_HANDLE_T hwiNum)
+{
+    if (!HwiNumValid(hwiNum)) {
+        return OS_ERRNO_HWI_NUM_INVALID;
+    }
+
+    HwiControllerOps *hwiOps = ArchIntOpsGet();
+    if (hwiOps->disableIrq == NULL) {
+        return OS_ERRNO_HWI_OPS_FUNC_NULL;
+    }
+
+    return hwiOps->disableIrq(hwiNum);
+}
+
+UINT32 ArchIntClear(HWI_HANDLE_T hwiNum)
+{
+    if (!HwiNumValid(hwiNum)) {
+        return OS_ERRNO_HWI_NUM_INVALID;
+    }
+
+    HwiControllerOps *hwiOps = ArchIntOpsGet();
+    if (hwiOps->clearIrq == NULL) {
+        return OS_ERRNO_HWI_OPS_FUNC_NULL;
+    }
+
+    return hwiOps->clearIrq(hwiNum);
+}
+
+UINT32 ArchIntCurIrqNum(VOID)
+{
+    HwiControllerOps *hwiOps = ArchIntOpsGet();
+    return hwiOps->getCurIrqNum();
+}
+
+#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
+typedef struct {
+    HWI_PROC_FUNC pfnHandler;
+    VOID *pParm;
+} HWI_HANDLER_FUNC;
+
+/* *
+ * @ingroup los_hwi
+ * Hardware interrupt handler form mapping handling function array.
+ */
+HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};
+
+/* *
+ * @ingroup los_hwi
+ * Set interrupt vector table.
+ */
+VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg)
+{
+    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
+        g_hwiForm[num + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalInterrupt;
+        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pfnHandler = vector;
+        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pParm = arg;
+    }
+}
+
+#else
+/* *
+ * @ingroup los_hwi
+ * Hardware interrupt handler form mapping handling function array.
+ */
+HWI_PROC_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {0};
+
+/* *
+ * @ingroup los_hwi
+ * Set interrupt vector table.
+ */
+VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector)
+{
+    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
+        g_hwiForm[num + OS_SYS_VECTOR_CNT] = HalInterrupt;
+        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT] = vector;
+    }
+}
+#endif
+
+/* ****************************************************************************
+ Function    : ArchHwiCreate
+ Description : create hardware interrupt
+ Input       : hwiNum   --- hwi num to create
+               hwiPrio  --- priority of the hwi
+               hwiMode  --- unused
+               hwiHandler --- hwi handler
+               irqParam --- param of the hwi handler
+ Output      : None
+ Return      : LOS_OK on success or error code on failure
+ **************************************************************************** */
+UINT32 ArchHwiCreate(HWI_HANDLE_T hwiNum,
+                     HWI_PRIOR_T hwiPrio,
+                     HWI_MODE_T hwiMode,
+                     HWI_PROC_FUNC hwiHandler,
+                     HwiIrqParam *irqParam)
+{
+    (VOID)hwiMode;
+    UINT32 intSave;
+
+    if (hwiHandler == NULL) {
+        return OS_ERRNO_HWI_PROC_FUNC_NULL;
+    }
+
+    if (hwiNum >= OS_HWI_MAX_NUM) {
+        return OS_ERRNO_HWI_NUM_INVALID;
+    }
+
+    if (g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
+        return OS_ERRNO_HWI_ALREADY_CREATED;
+    }
+
+    if (hwiPrio > OS_HWI_PRIO_LOWEST) {
+        return OS_ERRNO_HWI_PRIO_INVALID;
+    }
+
+    intSave = LOS_IntLock();
+#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
+    if (irqParam != NULL) {
+        OsSetVector(hwiNum, hwiHandler, irqParam->pDevId);
+    } else {
+        OsSetVector(hwiNum, hwiHandler, NULL);
+    }
+#else
+    (VOID)irqParam;
+    OsSetVector(hwiNum, hwiHandler);
+#endif
+
+    HwiControllerOps *hwiOps = ArchIntOpsGet();
+    if (hwiOps->createIrq == NULL) {
+        LOS_IntRestore(intSave);
+        return OS_ERRNO_HWI_OPS_FUNC_NULL;
+    }
+    hwiOps->createIrq(hwiNum, hwiPrio);
+
+    LOS_IntRestore(intSave);
+
+    return LOS_OK;
+}
+
+/* ****************************************************************************
+ Function    : ArchHwiDelete
+ Description : Delete hardware interrupt
+ Input       : hwiNum   --- hwi num to delete
+               irqParam --- param of the hwi handler
+ Output      : None
+ Return      : LOS_OK on success or error code on failure
+ **************************************************************************** */
+LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiDelete(HWI_HANDLE_T hwiNum, HwiIrqParam *irqParam)
+{
+    (VOID)irqParam;
+    UINT32 intSave;
+
+    if (hwiNum >= OS_HWI_MAX_NUM) {
+        return OS_ERRNO_HWI_NUM_INVALID;
+    }
+
+    ArchIntDisable(hwiNum);
+
+    intSave = LOS_IntLock();
+
+    g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+
+    LOS_IntRestore(intSave);
+
+    return LOS_OK;
+}
+
+UINT32 ArchIsIntActive(VOID)
+{
+    return (g_intCount > 0);
+}

arch/xtensa/common/los_common_interrupt.h

@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2023-2023 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_COMMON_INTERRUPT_H
+#define _LOS_COMMON_INTERRUPT_H
+
+#include "los_config.h"
+#include "los_compiler.h"
+#include "los_interrupt.h"
+#include "los_error.h"
+
+#ifdef __cplusplus
+#if __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+#endif /* __cplusplus */
+
+/* *
+ * @ingroup  los_arch_interrupt
+ * Define the type of a hardware interrupt vector table function.
+ */
+typedef VOID (**HWI_VECTOR_FUNC)(VOID);
+
+/* *
+ * @ingroup los_arch_interrupt
+ * Count of interrupts.
+ */
+extern UINT32 g_intCount;
+
+/* *
+ * @ingroup los_arch_interrupt
+ * Maximum number of used hardware interrupts.
+ */
+#ifndef OS_HWI_MAX_NUM
+#define OS_HWI_MAX_NUM                        LOSCFG_PLATFORM_HWI_LIMIT
+#endif
+
+#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
+/* *
+ * @ingroup los_arch_interrupt
+ * Set interrupt vector table.
+ */
+extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg);
+extern HWI_HANDLER_FUNC g_hwiHandlerForm[];
+#else
+/* *
+ * @ingroup los_arch_interrupt
+ * Set interrupt vector table.
+ */
+extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
+extern HWI_PROC_FUNC g_hwiHandlerForm[];
+#endif
+
+#define OS_EXC_IN_INIT                      0
+#define OS_EXC_IN_TASK                      1
+#define OS_EXC_IN_HWI                       2
+
+extern VOID HalHwiDefaultHandler(VOID);
+
+VOID HalPreInterruptHandler(UINT32 arg);
+VOID HalAftInterruptHandler(UINT32 arg);
+VOID *ArchGetHwiFrom(VOID);
+
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* __cplusplus */
+
+#endif /* _LOS_COMMON_INTERRUPT_H */

arch/xtensa/lx6/gcc/los_arch_interrupt.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -32,9 +32,7 @@
 #ifndef _LOS_ARCH_INTERRUPT_H
 #define _LOS_ARCH_INTERRUPT_H
 
-#include "los_config.h"
-#include "los_compiler.h"
-#include "los_interrupt.h"
+#include "los_common_interrupt.h"
 
 #ifdef __cplusplus
 #if __cplusplus
@@ -67,14 +65,6 @@ typedef struct {
 extern CHAR *VECTOR_START;
 #define INIT_VECTOR_START                     ((UINTPTR)&VECTOR_START)
 
-/* *
- * @ingroup los_arch_interrupt
- * Maximum number of used hardware interrupts.
- */
-#ifndef OS_HWI_MAX_NUM
-#define OS_HWI_MAX_NUM                        LOSCFG_PLATFORM_HWI_LIMIT
-#endif
-
 /* *
  * @ingroup los_arch_interrupt
  * Highest priority of a hardware interrupt.
@@ -91,22 +81,6 @@ extern CHAR *VECTOR_START;
 #define OS_HWI_PRIO_LOWEST                    7
 #endif
 
-#define OS_EXC_IN_INIT                        0
-#define OS_EXC_IN_TASK                        1
-#define OS_EXC_IN_HWI                         2
-
-/* *
- * @ingroup  los_arch_interrupt
- * Define the type of a hardware interrupt vector table function.
- */
-typedef VOID (**HWI_VECTOR_FUNC)(VOID);
-
-/* *
- * @ingroup los_arch_interrupt
- * Count of interrupts.
- */
-extern UINT32 g_intCount;
-
 /* *
  * @ingroup los_arch_interrupt
  * Count of Xtensa system interrupt vector.
@@ -199,22 +173,17 @@ extern UINT32 g_intCount;
  */
 #define OS_ERRNO_HWI_FASTMODE_ALREADY_CREATED LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x07)
 
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
 /* *
  * @ingroup los_arch_interrupt
- * Set interrupt vector table.
+ * Hardware interrupt error code: Invalid interrupt operation function.
+ *
+ * Value: 0x0200090c
+ *
+ * Solution: Set a valid interrupt operation function
  */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg);
-#else
-/* *
- * @ingroup los_arch_interrupt
- * Set interrupt vector table.
- */
-extern VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector);
-#endif
+#define OS_ERRNO_HWI_OPS_FUNC_NULL            LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x0c)
 
 VOID HalInterrupt(VOID);
-VOID HalHwiDefaultHandler(VOID);
 VOID HalExcHandleEntry(UINTPTR faultAddr, EXC_CONTEXT_S *excBufAddr, UINT32 type);
 VOID HalHwiInit(VOID);
 

arch/xtensa/lx6/gcc/los_interrupt.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -29,7 +29,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "los_interrupt.h"
 #include <stdarg.h>
 #include "securec.h"
 #include "los_context.h"
@@ -42,65 +41,6 @@
 #include "los_membox.h"
 #include "los_arch_regs.h"
 
-UINT32 g_intCount = 0;
-
-/* *
- * @ingroup los_hwi
- * Hardware interrupt form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC __attribute__((aligned(LOSCFG_ARCH_HWI_VECTOR_ALIGN))) g_hwiForm[OS_VECTOR_CNT] = {0};
-
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-
-typedef struct {
-    HWI_PROC_FUNC pfnHandler;
-    VOID *pParm;
-} HWI_HANDLER_FUNC;
-
-/* *
- * @ingroup los_hwi
- * Hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_HANDLER_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {{ (HWI_PROC_FUNC)0, (HWI_ARG_T)0 }};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector, VOID *arg)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pfnHandler = vector;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT].pParm = arg;
-    }
-}
-
-#else
-/* *
- * @ingroup los_hwi
- * Hardware interrupt handler form mapping handling function array.
- */
-STATIC HWI_PROC_FUNC g_hwiHandlerForm[OS_VECTOR_CNT] = {0};
-
-/* *
- * @ingroup los_hwi
- * Set interrupt vector table.
- */
-VOID OsSetVector(UINT32 num, HWI_PROC_FUNC vector)
-{
-    if ((num + OS_SYS_VECTOR_CNT) < OS_VECTOR_CNT) {
-        g_hwiForm[num + OS_SYS_VECTOR_CNT] = HalInterrupt;
-        g_hwiHandlerForm[num + OS_SYS_VECTOR_CNT] = vector;
-    }
-}
-#endif
-
-UINT32 HwiNumValid(UINT32 num)
-{
-    return (num >= OS_SYS_VECTOR_CNT) && (num <= OS_VECTOR_CNT);
-}
-
 /* *
  * @ingroup los_hwi
  * Lock all interrupt.
@@ -154,37 +94,24 @@ STATIC INLINE UINT32 ArchIntLocked(VOID)
  */
 STATIC UINT32 HwiPending(HWI_HANDLE_T hwiNum)
 {
-    if (!HwiNumValid(hwiNum)) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     __asm__ __volatile__("wsr   %0, intset; rsync" : : "a"(0x1U << hwiNum));
-
     return LOS_OK;
 }
 
-UINT32 HwiUnmask(HWI_HANDLE_T hwiNum)
+STATIC UINT32 HwiUnmask(HWI_HANDLE_T hwiNum)
 {
     UINT32 ier;
 
-    if (!HwiNumValid(hwiNum)) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     __asm__ __volatile__("rsr %0, intenable" : "=a"(ier) : : "memory");
     __asm__ __volatile__("wsr %0, intenable; rsync" : : "a"(ier | ((UINT32)0x1U << hwiNum)));
 
     return LOS_OK;
 }
 
-UINT32 HwiMask(HWI_HANDLE_T hwiNum)
+STATIC UINT32 HwiMask(HWI_HANDLE_T hwiNum)
 {
     UINT32 ier;
 
-    if (!HwiNumValid(hwiNum)) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
     __asm__ __volatile__("rsr %0, intenable" : "=a"(ier) : : "memory");
     __asm__ __volatile__("wsr %0, intenable; rsync" : : "a"(ier & ~((UINT32)0x1U << hwiNum)));
 
@@ -216,53 +143,32 @@ STATIC UINT32 HwiNumGet(VOID)
  * @ingroup los_hwi
  * Clear the interrupt
  */
-STATIC UINT32 HwiClear(HWI_HANDLE_T vector)
+STATIC UINT32 HwiClear(HWI_HANDLE_T hwiNum)
 {
-    if (!HwiNumValid(vector)) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    __asm__ __volatile__("wsr   %0, intclear; rsync" : : "a"(0x1U << vector));
+    __asm__ __volatile__("wsr   %0, intclear; rsync" : : "a"(0x1U << hwiNum));
 
     return LOS_OK;
 }
 
-HwiControllerOps g_archHwiOps = {
+STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
+{
+    (VOID)hwiPrio;
+    HwiUnmask(hwiNum);
+    return LOS_OK;
+}
+
+STATIC HwiControllerOps g_archHwiOps = {
     .triggerIrq     = HwiPending,
     .enableIrq      = HwiUnmask,
     .disableIrq     = HwiMask,
     .getCurIrqNum   = HwiNumGet,
     .clearIrq       = HwiClear,
+    .createIrq      = HwiCreate,
 };
 
-INLINE UINT32 ArchIsIntActive(VOID)
+HwiControllerOps *ArchIntOpsGet(VOID)
 {
-    return (g_intCount > 0);
-}
-
-/* ****************************************************************************
- Function    : HalHwiDefaultHandler
- Description : default handler of the hardware interrupt
- Input       : None
- Output      : None
- Return      : None
- **************************************************************************** */
-VOID HalHwiDefaultHandler(VOID)
-{
-    PRINT_ERR("%s irqnum:%u\n", __FUNCTION__, HwiNumGet());
-    while (1) {}
-}
-
-WEAK VOID HalPreInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
-}
-
-WEAK VOID HalAftInterruptHandler(UINT32 arg)
-{
-    (VOID)arg;
-    return;
+    return &g_archHwiOps;
 }
 
 /* ****************************************************************************
@@ -308,88 +214,6 @@ VOID HalInterrupt(VOID)
     HalIrqEndCheckNeedSched();
 }
 
-/* ****************************************************************************
- Function    : ArchHwiCreate
- Description : create hardware interrupt
- Input       : hwiNum   --- hwi num to create
-               hwiPrio  --- priority of the hwi
-               hwiMode  --- unused
-               hwiHandler --- hwi handler
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-UINT32 ArchHwiCreate(HWI_HANDLE_T hwiNum,
-                     HWI_PRIOR_T hwiPrio,
-                     HWI_MODE_T hwiMode,
-                     HWI_PROC_FUNC hwiHandler,
-                     HwiIrqParam *irqParam)
-{
-    (VOID)hwiMode;
-    UINT32 intSave;
-
-    if (hwiHandler == NULL) {
-        return OS_ERRNO_HWI_PROC_FUNC_NULL;
-    }
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    if (g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] != (HWI_PROC_FUNC)HalHwiDefaultHandler) {
-        return OS_ERRNO_HWI_ALREADY_CREATED;
-    }
-
-    if (hwiPrio > OS_HWI_PRIO_LOWEST) {
-        return OS_ERRNO_HWI_PRIO_INVALID;
-    }
-
-    intSave = LOS_IntLock();
-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 1)
-    if (irqParam != NULL) {
-        OsSetVector(hwiNum, hwiHandler, irqParam->pDevId);
-    } else {
-        OsSetVector(hwiNum, hwiHandler, NULL);
-    }
-#else
-    (VOID)irqParam;
-    OsSetVector(hwiNum, hwiHandler);
-#endif
-    HwiUnmask(hwiNum);
-
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
-/* ****************************************************************************
- Function    : ArchHwiDelete
- Description : Delete hardware interrupt
- Input       : hwiNum   --- hwi num to delete
-               irqParam --- param of the hwi handler
- Output      : None
- Return      : LOS_OK on success or error code on failure
- **************************************************************************** */
-LITE_OS_SEC_TEXT_INIT UINT32 ArchHwiDelete(HWI_HANDLE_T hwiNum, HwiIrqParam *irqParam)
-{
-    (VOID)irqParam;
-    UINT32 intSave;
-
-    if (hwiNum >= OS_HWI_MAX_NUM) {
-        return OS_ERRNO_HWI_NUM_INVALID;
-    }
-
-    HwiMask(hwiNum);
-
-    intSave = LOS_IntLock();
-
-    g_hwiForm[hwiNum + OS_SYS_VECTOR_CNT] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
-
-    LOS_IntRestore(intSave);
-
-    return LOS_OK;
-}
-
 ExcInfo g_excInfo = {0};
 
 #if (LOSCFG_KERNEL_PRINTF != 0)
@@ -559,8 +383,9 @@ WEAK VOID __stack_chk_fail(VOID)
 VOID HalHwiInit(VOID)
 {
     EnableExceptionInterface();
+    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
     for (UINT32 i = 0; i < OS_HWI_MAX_NUM; i++) {
-        g_hwiForm[i + OS_SYS_VECTOR_CNT] = HalHwiDefaultHandler;
+        hwiForm[i + OS_SYS_VECTOR_CNT] = HalHwiDefaultHandler;
         HwiMask(i);
     }
     asm volatile ("wsr %0, vecbase" : : "r"(INIT_VECTOR_START));

arch/xtensa/lx6/gcc/los_timer.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2023 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:
@@ -74,7 +74,7 @@ STATIC UINT32 SysTickStart(HWI_PROC_FUNC handler)
     __asm__ __volatile__("wsr %0, ccompare1; rsync" : : "a"(0));
     __asm__ __volatile__("wsr %0, ccompare2; rsync" : : "a"(0));
 
-    HwiUnmask(tick->irqNum);
+    LOS_HwiEnable(tick->irqNum);
     return LOS_OK;
 }
 
@@ -115,12 +115,12 @@ STATIC UINT64 SysTickCycleGet(UINT32 *period)
 
 STATIC VOID SysTickLock(VOID)
 {
-    HwiMask(OS_TICK_INT_NUM);
+    LOS_HwiDisable(OS_TICK_INT_NUM);
 }
 
 STATIC VOID SysTickUnlock(VOID)
 {
-    HwiUnmask(OS_TICK_INT_NUM);
+    LOS_HwiEnable(OS_TICK_INT_NUM);
 }
 
 ArchTickTimer *ArchSysTickTimerGet(VOID)

bundle.json

@@ -28,7 +28,7 @@
         "name": "liteos_m",
         "subsystem": "kernel",
         "syscap": [
-            "SystemCapability.Kernel.liteos-m"
+            "SystemCapability.Kernel.Liteos-M"
         ],
         "features": [],
         "adapted_system_type": [
@@ -43,7 +43,7 @@
             "third_party": [
                 "bounds_checking_function",
                 "cmsis",
-                "fatfs",
+                "FatFs",
                 "littlefs",
                 "lwip",
                 "musl"
@@ -58,4 +58,4 @@
             "test": []
         }
     }
-}
+}

components/debugtools/los_hwidump.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2022 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2022-2023 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:
@@ -63,7 +63,7 @@ STATIC VOID ShellCmdHwiInfoShow(OsIrqCpupCB *irqData, CPUP_INFO_S *hwiCpup1s,
     }
 
     for (i = 0; i < LOSCFG_PLATFORM_HWI_LIMIT; i++) {
-        if ((OsGetHwiCreated(i) != TRUE) || (OsGetHwiFormCnt(i) == 0)) {
+        if ((OsHwiIsCreated(i) != TRUE) || (OsGetHwiFormCnt(i) == 0)) {
             continue;
         }
 
@@ -118,9 +118,9 @@ STATIC VOID HwiInfoDump(VOID)
 {
     INT32 i;
 
-    PRINTK(" InterruptNo     Count     Name\n");
+    PRINTK(" InterruptNo     Count     Name\n");
     for (i = 0; i < LOSCFG_PLATFORM_HWI_LIMIT; i++) {
-        if ((OsGetHwiCreated(i) != TRUE) || (OsGetHwiFormCnt(i) == 0)) {
+        if ((OsHwiIsCreated(i) != TRUE) || (OsGetHwiFormCnt(i) == 0)) {
             continue;
         }
 
@@ -128,8 +128,8 @@ STATIC VOID HwiInfoDump(VOID)
             PRINTK(" %8d:%10d      %-s\n", i - OS_SYS_VECTOR_CNT, OsGetHwiFormCnt(i), OsGetHwiFormName(i));
         } else {
             PRINTK(" %8d:%10d\n", i - OS_SYS_VECTOR_CNT, OsGetHwiFormCnt(i));
-        }
-    }
+        }
+    }
     return;
 }
 #endif
@@ -144,6 +144,6 @@ UINT32 OsShellCmdHwiDump(INT32 argc, const CHAR **argv)
     }
 
     HwiInfoDump();
-    return LOS_OK;
+    return LOS_OK;
 }
 #endif /* LOSCFG_STACK_DUMP == 1 */

components/exchook/los_exc_info.h

@@ -59,7 +59,7 @@ extern "C" {
 #else
 #define MAX_SWITCH_INFO_SIZE    (0)
 #endif
-     
+
 #define MAX_MEM_INFO_SIZE       (INFO_TYPE_AND_SIZE + sizeof(MemInfoCB) * OS_SYS_MEM_NUM)
 #define MAX_EXC_MEM_SIZE        (INFO_TYPE_AND_SIZE + MAX_SCENE_INFO_SIZE + MAX_TSK_INFO_SIZE + MAX_QUEUE_INFO_SIZE \
                                  + MAX_INT_INFO_SIZE + MAX_SWITCH_INFO_SIZE + MAX_MEM_INFO_SIZE)

components/fs/fatfs/BUILD.gn

@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_m/liteos.gni")
-import("//third_party/FatFs/FatFs.gni")
+import("$THIRDPARTY_FATFS_DIR/FatFs.gni")
 
 module_switch = defined(LOSCFG_FS_FAT)
 module_name = get_path_info(rebase_path("."), "name")

components/fs/fatfs/fatfs.c

@@ -387,7 +387,8 @@ int FatfsOpen(struct File *file, const char *path, int oflag)
         errno = ENOMEM;
         return (int)LOS_NOK;
     }
-
+    (void)memset_s(fp, sizeof(FIL), 0, sizeof(FIL));
+    
     ret = FsChangeDrive(path);
     if (ret != (int)LOS_OK) {
         PRINT_ERR("FAT open ChangeDrive err 0x%x!\r\n", ret);
@@ -675,7 +676,8 @@ int FatfsOpendir(struct Dir *dir, const char *dirName)
         errno = ENOENT;
         return (int)LOS_NOK;
     }
-
+    (void)memset_s(dp, sizeof(DIR), 0, sizeof(DIR));
+    
     res = f_opendir(dp, dirName);
     if (res != FR_OK) {
         PRINT_ERR("FAT opendir err 0x%x!\r\n", res);

components/fs/littlefs/BUILD.gn

@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_m/liteos.gni")
-import("//third_party/littlefs/littlefs.gni")
+import("$THIRDPARTY_LITTLEFS_DIR/littlefs.gni")
 
 module_switch = defined(LOSCFG_FS_LITTLEFS)
 module_name = get_path_info(rebase_path("."), "name")

components/fs/vfs/BUILD.gn

@@ -41,14 +41,14 @@ kernel_module(module_name) {
   ]
 
   include_dirs = [
-    "//kernel/liteos_m/kernel/arch/include",
-    "//kernel/liteos_m/kernel/include",
-    "//kernel/liteos_m/utils",
+    "$LITEOSTOPDIR/kernel/arch/include",
+    "$LITEOSTOPDIR/kernel/include",
+    "$LITEOSTOPDIR/utils",
     "../",
     ".",
   ]
 
-  deps = [ "//kernel/liteos_m/kal" ]
+  deps = [ "$LITEOSTOPDIR/kal" ]
   configs += [ "$LITEOSTOPDIR:warn_config" ]
   if (!defined(LOSCFG_COMPILER_ICCARM)) {
     cflags = [ "-Wno-parentheses" ]

components/fs/vfs/vfs_files.h

@@ -78,7 +78,7 @@ struct File {
     off_t fOffset;
     INT32 fOwner;
     struct MountPoint *fMp;
-    void *fData; /* file system opreations handle, fatfs FIL, etc. */
+    void *fData; /* file system operations handle, fatfs FIL, etc. */
     const char *fullPath;
 };
 

components/fs/vfs/vfs_mount.c

@@ -184,7 +184,7 @@ STATIC struct MountPoint *VfsMountPointInit(const char *source, const char *targ
         return NULL;
     }
 
-    /* Find fsMap coresponding to the fsType */
+    /* Find fsMap corresponding to the fsType */
     mFs = VfsFsMapGet(fsType);
     if ((mFs == NULL) || (mFs->fsMops == NULL) || (mFs->fsMops->mount == NULL)) {
         errno = ENODEV;

components/net/lwip-2.1/BUILD.gn

@@ -27,14 +27,14 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_m/liteos.gni")
-import("$LITEOSTHIRDPARTY/lwip/lwip.gni")
 import("$LITEOSTOPDIR/components/net/lwip-2.1/lwip_porting.gni")
+import("$THIRDPARTY_LWIP_DIR/lwip.gni")
 
 module_switch = defined(LOSCFG_NET_LWIP_SACK)
 module_name = "lwip"
 kernel_module(module_name) {
   sources = LWIP_PORTING_FILES + LWIPNOAPPSFILES - [ "$LWIPDIR/api/sockets.c" ]
-  include_dirs = [ "//commonlibrary/utils_lite/include" ]
+  include_dirs = [ "$COMMONLIBRARY_UTILS_LITE_DIR/include" ]
 }
 
 config("public") {

components/security/userlib/BUILD.gn

@@ -33,5 +33,5 @@ module_name = get_path_info(rebase_path("."), "name")
 kernel_module(module_name) {
   sources = []
 
-  deps = [ "//third_party/musl/porting/liteos_m/user" ]
+  deps = [ "$THIRDPARTY_MUSL_DIR/porting/liteos_m/user" ]
 }

kal/cmsis/BUILD.gn

@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_m/liteos.gni")
-import("//third_party/cmsis/cmsis.gni")
+import("$THIRDPARTY_CMSIS_DIR/cmsis.gni")
 
 module_switch = defined(LOSCFG_KAL_CMSIS)
 module_name = get_path_info(rebase_path("."), "name")

kal/libc/iccarm/BUILD.gn

@@ -27,14 +27,14 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_m/liteos.gni")
-import("//third_party/musl/porting/liteos_m_iccarm/kernel/iccarm.gni")
+import("$THIRDPARTY_MUSL_DIR/porting/liteos_m_iccarm/kernel/iccarm.gni")
 
 module_switch = defined(LOSCFG_LIBC_ICCARM)
 module_name = get_path_info(rebase_path("."), "name")
 kernel_module(module_name) {
   configs += [ "$LITEOSTOPDIR:warn_config" ]
 
-  deps = [ "//third_party/musl/porting/liteos_m_iccarm/kernel" ]
+  deps = [ "$THIRDPARTY_MUSL_DIR/porting/liteos_m_iccarm/kernel" ]
 }
 
 config("public") {

kal/libc/musl/BUILD.gn

@@ -28,14 +28,14 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_m/liteos.gni")
-import("//third_party/musl/porting/liteos_m/kernel/musl.gni")
+import("$THIRDPARTY_MUSL_DIR/porting/liteos_m/kernel/musl.gni")
 
 module_switch = defined(LOSCFG_LIBC_MUSL)
 module_name = get_path_info(rebase_path("."), "name")
 kernel_module(module_name) {
   configs += [ "$LITEOSTOPDIR:warn_config" ]
 
-  deps = [ "//third_party/musl/porting/liteos_m/kernel" ]
+  deps = [ "$THIRDPARTY_MUSL_DIR/porting/liteos_m/kernel" ]
 }
 
 config("public") {

kal/libc/newlib/BUILD.gn

@@ -43,7 +43,7 @@ kernel_module(module_name) {
 
   if (defined(LOSCFG_FS_VFS)) {
     sources +=
-        [ "//third_party/musl/porting/liteos_m/kernel/src/misc/realpath.c" ]
+        [ "$THIRDPARTY_MUSL_DIR/porting/liteos_m/kernel/src/misc/realpath.c" ]
   }
 }
 

kal/libsec/BUILD.gn

@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_m/liteos.gni")
-import("//third_party/bounds_checking_function/libsec_src.gni")
+import("$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR/libsec_src.gni")
 
 module_name = get_path_info(rebase_path("."), "name")
 kernel_module(module_name) {

kal/posix/src/time.c

@@ -613,11 +613,22 @@ struct tm *gmtime(const time_t *timer)
 
 struct tm *localtime_r(const time_t *timep, struct tm *result)
 {
+    INT32 ret;
+
     if ((timep == NULL) || (result == NULL)) {
         errno = EFAULT;
         return NULL;
     }
-    if (!ConvertSecs2Utc(*timep, -TIMEZONE, result)) {
+
+    if (g_rtcTimeFunc.RtcGetTimezoneHook != NULL) {
+        INT32 tempTimezone = 0;
+        g_rtcTimeFunc.RtcGetTimezoneHook(&tempTimezone);
+        ret = ConvertSecs2Utc(*timep, -tempTimezone, result);
+    } else {
+        ret = ConvertSecs2Utc(*timep, -TIMEZONE, result);
+    }
+
+    if (!ret) {
         errno = EINVAL;
         return NULL;
     }
@@ -660,7 +671,14 @@ static time_t ConvertUtc2Secs(struct tm *tm)
     seconds += (tm->tm_mday - 1) * SECS_PER_DAY;
     seconds += tm->tm_hour * SECS_PER_HOUR + tm->tm_min * SECS_PER_MIN + tm->tm_sec;
 
-    seconds += TIMEZONE;
+    if (g_rtcTimeFunc.RtcGetTimezoneHook != NULL) {
+        INT32 tempTimezone = 0;
+        g_rtcTimeFunc.RtcGetTimezoneHook(&tempTimezone);
+        seconds += tempTimezone;
+    } else {
+        seconds += TIMEZONE;
+    }
+
     return seconds;
 }
 
@@ -686,7 +704,14 @@ time_t mktime(struct tm *tmptr)
     }
     timeInSeconds = ConvertUtc2Secs(tmptr);
     /* normalize tm_wday and tm_yday */
-    ConvertSecs2Utc(timeInSeconds, -TIMEZONE, tmptr);
+    if (g_rtcTimeFunc.RtcGetTimezoneHook != NULL) {
+        INT32 tempTimezone = 0;
+        g_rtcTimeFunc.RtcGetTimezoneHook(&tempTimezone);
+        ConvertSecs2Utc(timeInSeconds, -tempTimezone, tmptr);
+    } else {
+        ConvertSecs2Utc(timeInSeconds, -TIMEZONE, tmptr);
+    }
+
     return timeInSeconds;
 }
 
@@ -695,20 +720,11 @@ int gettimeofday(struct timeval *tv, void *ptz)
     struct timezone *tz = (struct timezone *)ptz;
 
     if (tv != NULL) {
-        INT32 rtcRet;
         UINT64 usec = 0;
-        UINT64 currentTime;
 
-        if (g_rtcTimeFunc.RtcGetTimeHook != NULL) {
-            rtcRet = g_rtcTimeFunc.RtcGetTimeHook(&usec);
-            if (rtcRet != 0) {
-                currentTime = GetCurrentTime();
-                tv->tv_sec = currentTime / OS_SYS_MS_PER_SECOND;
-                tv->tv_usec = (currentTime % OS_SYS_MS_PER_SECOND) * OS_SYS_MS_PER_SECOND;
-            } else {
-                tv->tv_sec = usec / OS_SYS_US_PER_SECOND;
-                tv->tv_usec = usec % OS_SYS_US_PER_SECOND;
-            }
+        if ((g_rtcTimeFunc.RtcGetTimeHook != NULL) && (g_rtcTimeFunc.RtcGetTimeHook(&usec) == 0)) {
+            tv->tv_sec = usec / OS_SYS_US_PER_SECOND;
+            tv->tv_usec = usec % OS_SYS_US_PER_SECOND;
         } else {
             struct timespec ts;
             if (-1 == clock_gettime(CLOCK_REALTIME, &ts)) {
@@ -718,7 +734,7 @@ int gettimeofday(struct timeval *tv, void *ptz)
             tv->tv_usec = ts.tv_nsec / OS_SYS_NS_PER_US;
         }
     }
-	
+
     if (tz != NULL) {
         if (g_rtcTimeFunc.RtcGetTimezoneHook != NULL) {
             INT32 tempTimezone = 0;
@@ -740,12 +756,12 @@ int settimeofday(const struct timeval *tv, const struct timezone *tz)
 {
     struct timespec ts;
 
-    if (tv == NULL) {
+    if ((tv == NULL) && (tz == NULL)) {
         errno = EFAULT;
         return -1;
     }
 
-    if (tv->tv_usec >= OS_SYS_US_PER_SECOND) {
+    if ((tv != NULL) && (tv->tv_usec >= OS_SYS_US_PER_SECOND)) {
         errno = EINVAL;
         return -1;
     }
@@ -764,18 +780,20 @@ int settimeofday(const struct timeval *tv, const struct timezone *tz)
         }
     }
 
-    if (g_rtcTimeFunc.RtcSetTimeHook != NULL) {
-        UINT64 usec;
-        g_rtcTimeBase = tv->tv_sec * OS_SYS_MS_PER_SECOND + tv->tv_usec / OS_SYS_MS_PER_SECOND;
-        usec = tv->tv_sec * OS_SYS_US_PER_SECOND + tv->tv_usec;
-        if (-1 == g_rtcTimeFunc.RtcSetTimeHook(g_rtcTimeBase, &usec)) {
-            return -1;
-        }
-    } else {
-        ts.tv_sec = tv->tv_sec;
-        ts.tv_nsec = tv->tv_usec * OS_SYS_NS_PER_US;
-        if (-1 == clock_settime(CLOCK_REALTIME, &ts)) {
-            return -1;
+    if (tv != NULL) {
+        if (g_rtcTimeFunc.RtcSetTimeHook != NULL) {
+            UINT64 usec;
+            g_rtcTimeBase = tv->tv_sec * OS_SYS_MS_PER_SECOND + tv->tv_usec / OS_SYS_MS_PER_SECOND;
+            usec = tv->tv_sec * OS_SYS_US_PER_SECOND + tv->tv_usec;
+            if (g_rtcTimeFunc.RtcSetTimeHook(g_rtcTimeBase, &usec) < 0) {
+                return -1;
+            }
+        } else {
+            ts.tv_sec = tv->tv_sec;
+            ts.tv_nsec = tv->tv_usec * OS_SYS_NS_PER_US;
+            if (clock_settime(CLOCK_REALTIME, &ts) < 0) {
+                return -1;
+            }
         }
     }
 

liteos.gni

@@ -51,8 +51,19 @@ exec_script("//build/lite/run_shell_cmd.py",
 import("$root_out_dir/config.gni")
 
 LITEOSTOPDIR = "//kernel/liteos_m"
-LITEOSTHIRDPARTY = "//third_party"
 HDFTOPDIR = "//drivers/hdf_core/adapter/khdf/liteos_m"
+THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR =
+    "//third_party/bounds_checking_function"
+LITEOSTHIRDPARTY = "//third_party"
+THIRDPARTY_FATFS_DIR = "//third_party/FatFs"
+THIRDPARTY_MUSL_DIR = "//third_party/musl"
+THIRDPARTY_LITTLEFS_DIR = "//third_party/littlefs"
+THIRDPARTY_CMSIS_DIR = "//third_party/cmsis"
+THIRDPARTY_LWIP_DIR = "//third_party/lwip"
+DEVICE_BOARD_DIR = "//device/board"
+DEVICE_SOC_DIR = "//device/soc"
+COMMONLIBRARY_UTILS_LITE_DIR = "//commonlibrary/utils_lite"
+TEST_XTS_TOOLS_DIR = "//test/xts/tools"
 
 ARCH = ""
 if (defined(LOSCFG_ARCH_ARM_AARCH32)) {
@@ -163,8 +174,8 @@ set_defaults("kernel_module") {
     "$LITEOSTOPDIR:los_config",
   ]
   visibility = [
-    "$LITEOSTOPDIR:*",
     ":*",
+    "$LITEOSTOPDIR:*",
     "..:*",
     "../..:*",
   ]

testsuites/BUILD.gn

@@ -48,7 +48,10 @@ kernel_module("test_init") {
     "src/osTest.c",
   ]
 
-  include_dirs = [ "unittest/posix/src" ]
+  include_dirs = [
+    "unittest/posix/src",
+    "unittest/xts",
+  ]
 
   configs += [ ":include" ]
 }
@@ -69,6 +72,7 @@ group("testsuites") {
     "sample/kernel/task:test_task",
     "sample/posix:test_posix",
     "unittest/posix:posix_test",
+    "unittest/xts:xts_test",
   ]
   if (defined(LOSCFG_DYNLINK)) {
     deps += [ "sample/kernel/dynlink:test_dynlink" ]

testsuites/include/osTest.h

@@ -96,6 +96,7 @@ extern "C" {
 #define LOS_KERNEL_LMK_TEST 0
 #define LOS_KERNEL_SIGNAL_TEST 0
 
+#define LOS_XTS_TEST 1
 #define LOS_POSIX_TEST 1
 #define LOS_CMSIS_TEST 1
 #define LOS_CMSIS2_CORE_TASK_TEST 0

testsuites/sample/cmsis/BUILD.gn

@@ -26,8 +26,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_cmsis") {
   sources = [ "cmsis_func_test.c" ]
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/kernel/atomic/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_atomic") {
   sources = [
     "it_los_atomic.c",
@@ -43,5 +45,5 @@ static_library("test_atomic") {
     "it_los_atomic_011.c",
   ]
   include_dirs = [ "." ]
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/kernel/dynlink/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_dynlink") {
   sources = [
     "It_los_dynlink.c",
@@ -52,14 +54,5 @@ static_library("test_dynlink") {
     "It_los_dynlink_020.c",
   ]
 
-  include_dirs = [
-    "../../../../kernel/include",
-    "../../../../kernel/arch/include",
-    "../../../include",
-    "../../../../utils",
-    "../../../../components/dynlink",
-    ".",
-    "../../../../components/cpup",
-    "//third_party/bounds_checking_function/include",
-  ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/kernel/dynlink/It_los_dynlink.h

@@ -51,6 +51,7 @@ VOID ItLosDynlink007(VOID);
 VOID ItLosDynlink008(VOID);
 VOID ItLosDynlink009(VOID);
 VOID ItLosDynlink010(VOID);
+VOID ItLosDynlink011(VOID);
 VOID ItLosDynlink012(VOID);
 VOID ItLosDynlink013(VOID);
 VOID ItLosDynlink014(VOID);

testsuites/sample/kernel/dynlink/It_los_dynlink_002.c

@@ -33,8 +33,8 @@
 /* Test invalid params */
 STATIC UINT32 TestCase(VOID)
 {
-    VOID *handle = NULL;
-    VOID *invalHandle = NULL;
+    CHAR *handle = NULL;
+    CHAR *invalHandle = NULL;
     INT32 (*func)(INT32, INT32) = NULL;
     CHAR *symbolName = "test_api";
     CHAR *dsoName = DSO_FULL_PATH("Align4_dynamic_align4.so");

testsuites/sample/kernel/dynlink/It_los_dynlink_011.c

@@ -34,7 +34,7 @@
 STATIC UINT32 TestCase(VOID)
 {
     VOID *handle = NULL;
-    INT32 (*func)() = NULL;
+    INT32 (*func)(VOID) = NULL;
     INT32 *pValue = NULL;
     CHAR *symbolName1 = "dyn_bss_func";
     CHAR *symbolName2 = "test_array";
@@ -44,7 +44,7 @@ STATIC UINT32 TestCase(VOID)
     handle = (VOID *)LOS_SoLoad(dsoName, NULL);
     ICUNIT_ASSERT_NOT_EQUAL(handle, NULL, handle);
 
-    func = (INT32 (*)())LOS_FindSym(handle, symbolName1);
+    func = (INT32 (*)(VOID))LOS_FindSym(handle, symbolName1);
     ICUNIT_GOTO_NOT_EQUAL(func, NULL, func, EXIT);
     ret = func();
     ICUNIT_GOTO_EQUAL(ret, 2117, ret, EXIT);

testsuites/sample/kernel/dynlink/It_los_dynlink_013.c

@@ -34,7 +34,7 @@
 STATIC UINT32 TestCase(VOID)
 {
     VOID *handle = NULL;
-    INT32 (*func)() = NULL;
+    INT32 (*func)(VOID) = NULL;
     INT32 *pValueAddr = NULL;
     INT32 **ppValueAddr = NULL;
     CHAR *symbolName1 = "get_value100";
@@ -49,12 +49,12 @@ STATIC UINT32 TestCase(VOID)
     handle = (VOID *)LOS_SoLoad(dsoName, NULL);
     ICUNIT_ASSERT_NOT_EQUAL(handle, NULL, handle);
 
-    func = (INT32 (*)())LOS_FindSym(handle, symbolName1);
+    func = (INT32 (*)(VOID))LOS_FindSym(handle, symbolName1);
     ICUNIT_GOTO_NOT_EQUAL(func, NULL, func, EXIT);
     ret = func();
     ICUNIT_GOTO_EQUAL(ret, 100, ret, EXIT);
 
-    func = (INT32 (*)())LOS_FindSym(handle, symbolName2);
+    func = (INT32 (*)(VOID))LOS_FindSym(handle, symbolName2);
     ICUNIT_GOTO_NOT_EQUAL(func, NULL, func, EXIT);
     ret = func();
     ICUNIT_GOTO_EQUAL(ret, 200, ret, EXIT);

testsuites/sample/kernel/dynlink/It_los_dynlink_020.c

@@ -34,7 +34,6 @@
 STATIC UINT32 TestCase(VOID)
 {
     VOID *handle = NULL;
-    VOID (*func)(INT32, INT32) = NULL;
     CHAR *dsoName = DSO_FULL_PATH("Align4_dynamic_stdlib.so");
 
     handle = (VOID *)LOS_SoLoad(dsoName, NULL);

testsuites/sample/kernel/event/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_event") {
   sources = [
     "It_los_event.c",
@@ -74,5 +76,5 @@ static_library("test_event") {
     "It_los_event_043.c",
   ]
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/kernel/hwi/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_hwi") {
   sources = [
     "It_los_hwi.c",
@@ -72,5 +74,5 @@ static_library("test_hwi") {
     "llt_los_hwi_035.c",
   ]
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/kernel/lmk/BUILD.gn

@@ -26,6 +26,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_lmk") {
   sources = [
     "It_los_lmk.c",
@@ -35,7 +37,7 @@ static_library("test_lmk") {
     "It_los_lmk_004.c",
   ]
 
-  include_dirs = [ "//kernel/liteos_m/components/lmk" ]
+  include_dirs = [ "$LITEOSTOPDIR/components/lmk" ]
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/kernel/lms/BUILD.gn

@@ -25,7 +25,9 @@
 # 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.
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+import("//kernel/liteos_m/liteos.gni")
 
 static_library("test_lms") {
   sources = [
@@ -74,5 +76,5 @@ static_library("test_lms") {
     ]
   }
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/kernel/mem/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_mem") {
   sources = [
     "It_los_mem_001.c",
@@ -61,5 +63,5 @@ static_library("test_mem") {
     "it_los_mem.c",
   ]
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/kernel/mux/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_mux") {
   sources = [
     "It_los_mutex_001.c",
@@ -64,5 +66,5 @@ static_library("test_mux") {
     "It_los_mux.c",
   ]
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/kernel/power/BUILD.gn

@@ -26,6 +26,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_pm") {
   sources = [
     "It_los_pm.c",
@@ -34,7 +36,7 @@ static_library("test_pm") {
     "It_los_pm_003.c",
   ]
 
-  include_dirs = [ "//kernel/liteos_m/components/power" ]
+  include_dirs = [ "$LITEOSTOPDIR/components/power" ]
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/kernel/queue/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_queue") {
   sources = [
     "It_los_queue.c",
@@ -172,5 +174,5 @@ static_library("test_queue") {
     "Llt_los_queue_001.c",
   ]
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/kernel/sem/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_sem") {
   sources = [
     "It_los_sem.c",
@@ -75,5 +77,5 @@ static_library("test_sem") {
     "it_los_sem_043.c",
   ]
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/kernel/signal/BUILD.gn

@@ -26,6 +26,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_signal") {
   sources = [
     "It_los_signal.c",
@@ -36,5 +38,5 @@ static_library("test_signal") {
     "It_los_signal_005.c",
   ]
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/kernel/swtmr/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_swtmr") {
   sources = [
     "It_los_swtmr.c",
@@ -146,5 +148,5 @@ static_library("test_swtmr") {
     "It_los_swtmr_Delay_005.c",
   ]
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/kernel/task/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_task") {
   sources = [
     "It_los_task.c",
@@ -159,5 +161,5 @@ static_library("test_task") {
     "It_los_task_130.c",
   ]
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/sample/posix/BUILD.gn

@@ -26,6 +26,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/liteos.gni")
+
 static_library("test_posix") {
   sources = [
     "mqueue/It_posix_queue.c",
@@ -160,5 +162,5 @@ static_library("test_posix") {
     "pthread_func_test.c",
   ]
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/src/osTest.c

@@ -38,6 +38,9 @@
 #if (LOS_POSIX_TEST == 1)
 #include "posix_test.h"
 #endif
+#if (LOS_XTS_TEST == 1)
+#include "xts_test.h"
+#endif
 
 UINT32 volatile g_testCount;
 UINT32 g_testTskHandle;
@@ -246,6 +249,10 @@ VOID TestTaskEntry(VOID)
     CmsisFuncTestSuite();
 #endif
 
+#if(LOS_XTS_TEST == 1)
+    XtsTestSuite();
+#endif
+
     /* The log is used for testing entrance guard, please do not make any changes. */
     PRINTF("\nfailed count:%d, success count:%d\n", g_failResult, g_passResult);
     PRINTF("--- Test End ---\n");

testsuites/unittest/posix/BUILD.gn

@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_m/liteos.gni")
-import("//test/xts/tools/lite/build/suite_lite.gni")
+import("$TEST_XTS_TOOLS_DIR/lite/build/suite_lite.gni")
 
 static_library("posix_test") {
   sources = [
@@ -65,7 +65,7 @@ static_library("posix_test") {
   }
 
   include_dirs = [
-    "//test/xts/tools/hctest/include",
+    "$TEST_XTS_TOOLS_DIR/hctest/include",
     "src",
   ]
 
@@ -78,5 +78,5 @@ static_library("posix_test") {
     cflags = [ "--no_warnings" ]
   }
 
-  configs += [ "//kernel/liteos_m/testsuites:include" ]
+  configs += [ "$LITEOSTOPDIR/testsuites:include" ]
 }

testsuites/unittest/posix/src/ctype/ctype_func_test.c

@@ -75,7 +75,7 @@ LITE_TEST_CASE(PosixCtypeFuncTestSuite, testCtypeIsalnum001, Function | MediumTe
 {
     int src = 'A';
     int ret = isalnum(src);
-    TEST_ASSERT_NOT_EQUAL(0, ret);
+    ICUNIT_ASSERT_NOT_EQUAL(ret, 0, ret);
     return 0;
 }
 
@@ -88,7 +88,7 @@ LITE_TEST_CASE(PosixCtypeFuncTestSuite, testCtypeIsalnum002, Function | MediumTe
 {
     int src = '1';
     int ret = isalnum(src);
-    TEST_ASSERT_NOT_EQUAL(0, ret);
+    ICUNIT_ASSERT_NOT_EQUAL(ret, 0, ret);
     return 0;
 }
 
@@ -101,7 +101,7 @@ LITE_TEST_CASE(PosixCtypeFuncTestSuite, testCtypeIsalnum003, Function | MediumTe
 {
     int src = '@';
     int ret = isalnum(src);
-    TEST_ASSERT_EQUAL_INT(0, ret);
+    ICUNIT_ASSERT_EQUAL(ret, 0, ret);
     return 0;
 }
 
@@ -114,7 +114,7 @@ LITE_TEST_CASE(PosixCtypeFuncTestSuite, testCtypeIsalnum004, Function | MediumTe
 {
     int src = ' ';
     int ret = isalnum(src);
-    TEST_ASSERT_EQUAL_INT(0, ret);
+    ICUNIT_ASSERT_EQUAL(ret, 0, ret);
     return 0;
 }
 
@@ -127,7 +127,7 @@ LITE_TEST_CASE(PosixCtypeFuncTestSuite, testCtypeIsalnum005, Function | MediumTe
 {
     int src = '\f'; // 0x0c 14
     int ret = isalnum(src);
-    TEST_ASSERT_EQUAL_INT(0, ret);
+    ICUNIT_ASSERT_EQUAL(ret, 0, ret);
     return 0;
 }
 
@@ -141,7 +141,7 @@ LITE_TEST_CASE(PosixCtypeFuncTestSuite, testCtypeIsascii001, Function | MediumTe
 {
     const int src = -1;
     int ret = isascii(src);
-    TEST_ASSERT_EQUAL_INT(0, ret);
+    ICUNIT_ASSERT_EQUAL(ret, 0, ret);
     return 0;
 }
 
@@ -154,7 +154,7 @@ LITE_TEST_CASE(PosixCtypeFuncTestSuite, testCtypeIsascii002, Function | MediumTe
 {
     const int src = 0;
     int ret = isascii(src);
-    TEST_ASSERT_NOT_EQUAL(0, ret);
+    ICUNIT_ASSERT_NOT_EQUAL(ret, 0, ret);
     return 0;
 }
 
@@ -167,7 +167,7 @@ LITE_TEST_CASE(PosixCtypeFuncTestSuite, testCtypeIsascii003, Function | MediumTe
 {
     const int src = 127;
     int ret = isascii(src);
-    TEST_ASSERT_NOT_EQUAL(0, ret);
+    ICUNIT_ASSERT_NOT_EQUAL(ret, 0, ret);
     return 0;
 }
 
@@ -180,7 +180,7 @@ LITE_TEST_CASE(PosixCtypeFuncTestSuite, testCtypeIsascii004, Function | MediumTe
 {
     const int src = 128;
     int ret = isascii(src);
-    TEST_ASSERT_EQUAL_INT(0, ret);
+    ICUNIT_ASSERT_EQUAL(ret, 0, ret);
     return 0;
 }
 
@@ -193,7 +193,7 @@ LITE_TEST_CASE(PosixCtypeFuncTestSuite, testCtypeIsascii005, Function | MediumTe
 {
     int src = '\f'; // 0x0c 14
     int ret = isascii(src);
-    TEST_ASSERT_NOT_EQUAL(0, ret);
+    ICUNIT_ASSERT_NOT_EQUAL(ret, 0, ret);
     return 0;
 }
 
@@ -206,7 +206,7 @@ LITE_TEST_CASE(PosixCtypeFuncTestSuite, testCtypeIsprint001, Function | MediumTe
 {
     int src = 'A';
     int ret = isprint(src);
-    TEST_ASSERT_NOT_EQUAL(0, ret);
+    ICUNIT_ASSERT_NOT_EQUAL(ret, 0, ret);
     return 0;
 }
 
@@ -219,7 +219,7 @@ LITE_TEST_CASE(PosixCtypeFuncTestSuite, testCtypeIsprint002, Function | MediumTe
 {
     int src = '1';
     int ret = isprint(src);
-    TEST_ASSERT_NOT_EQUAL(0, ret);
+    ICUNIT_ASSERT_NOT_EQUAL(ret, 0, ret);
     return 0;
 }
 
@@ -232,7 +232,7 @@ LITE_TEST_CASE(PosixCtypeFuncTestSuite, testCtypeIsprint003, Function | MediumTe
 {
     int src = '@';
     int ret = isprint(src);
-    TEST_ASSERT_NOT_EQUAL(0, ret);
+    ICUNIT_ASSERT_NOT_EQUAL(ret, 0, ret);
     return 0;
 }
 
@@ -245,7 +245,7 @@ LITE_TEST_CASE(PosixCtypeFuncTestSuite, testCtypeIsprint004, Function | MediumTe
 {
     int src = ' ';
     int ret = isprint(src);
-    TEST_ASSERT_NOT_EQUAL(0, ret);
+    ICUNIT_ASSERT_NOT_EQUAL(ret, 0, ret);
     return 0;
 }
 
@@ -258,7 +258,7 @@ LITE_TEST_CASE(PosixCtypeFuncTestSuite, testCtypeIsprint005, Function | MediumTe
 {
     int src = '\f'; // 0x0c
     int ret = isprint(src);
-    TEST_ASSERT_EQUAL_INT(0, ret);
+    ICUNIT_ASSERT_EQUAL(ret, 0, ret);
     return 0;
 }
 
@@ -272,7 +272,7 @@ LITE_TEST_CASE(PosixCtypeFuncTestSuite, testCtypeIsspace001, Function | MediumTe
 {
     int src = 'A';
     int ret = isspace(src);
-    TEST_ASSERT_EQUAL_INT(0, ret);
+    ICUNIT_ASSERT_EQUAL(ret, 0, ret);
     return 0;
 }
 
@@ -285,7 +285,7 @@ LITE_TEST_CASE(PosixCtypeFuncTestSuite, testCtypeIsspace002, Function | MediumTe
 {
     int src = '1';
     int ret = isspace(src);
-    TEST_ASSERT_EQUAL_INT(0, ret);
+    ICUNIT_ASSERT_EQUAL(ret, 0, ret);
     return 0;
 }
 
@@ -298,7 +298,7 @@ LITE_TEST_CASE(PosixCtypeFuncTestSuite, testCtypeIsspace003, Function | MediumTe
 {
     int src = '@';
     int ret = isspace(src);
-    TEST_ASSERT_EQUAL_INT(0, ret);
+    ICUNIT_ASSERT_EQUAL(ret, 0, ret);
     return 0;
 }
 
@@ -311,7 +311,7 @@ LITE_TEST_CASE(PosixCtypeFuncTestSuite, testCtypeIsspace004, Function | MediumTe
 {
     int src = ' ';
     int ret = isspace(src);
-    TEST_ASSERT_NOT_EQUAL(0, ret);
+    ICUNIT_ASSERT_NOT_EQUAL(ret, 0, ret);
     return 0;
 }
 
@@ -324,7 +324,7 @@ LITE_TEST_CASE(PosixCtypeFuncTestSuite, testCtypeIsspace005, Function | MediumTe
 {
     int src = '\t';
     int ret = isspace(src);
-    TEST_ASSERT_NOT_EQUAL(0, ret);
+    ICUNIT_ASSERT_NOT_EQUAL(ret, 0, ret);
     return 0;
 }
 
@@ -338,7 +338,7 @@ LITE_TEST_CASE(PosixCtypeFuncTestSuite, testCtypeIsupper001, Function | MediumTe
 {
     int src = 'A';
     int ret = isupper(src);
-    TEST_ASSERT_NOT_EQUAL(0, ret);
+    ICUNIT_ASSERT_NOT_EQUAL(ret, 0, ret);
     return 0;
 }
 
@@ -351,7 +351,7 @@ LITE_TEST_CASE(PosixCtypeFuncTestSuite, testCtypeIsupper002, Function | MediumTe
 {
     int src = 'a';
     int ret = isupper(src);
-    TEST_ASSERT_EQUAL_INT(0, ret);
+    ICUNIT_ASSERT_EQUAL(ret, 0, ret);
     return 0;
 }
 
@@ -364,7 +364,7 @@ LITE_TEST_CASE(PosixCtypeFuncTestSuite, testCtypeIsupper003, Function | MediumTe
 {
     const int src = 0x45;
     int ret = isupper(src);
-    TEST_ASSERT_NOT_EQUAL(0, ret);
+    ICUNIT_ASSERT_NOT_EQUAL(ret, 0, ret);
     return 0;
 }
 
@@ -377,7 +377,7 @@ LITE_TEST_CASE(PosixCtypeFuncTestSuite, testCtypeIsupper004, Function | MediumTe
 {
     int src = ' ';
     int ret = isupper(src);
-    TEST_ASSERT_EQUAL_INT(0, ret);
+    ICUNIT_ASSERT_EQUAL(ret, 0, ret);
     return 0;
 }
 
@@ -390,12 +390,10 @@ LITE_TEST_CASE(PosixCtypeFuncTestSuite, testCtypeIsupper005, Function | MediumTe
 {
     int src = '\t';
     int ret = isupper(src);
-    TEST_ASSERT_EQUAL_INT(0, ret);
+    ICUNIT_ASSERT_EQUAL(ret, 0, ret);
     return 0;
 }
 
-RUN_TEST_SUITE(PosixCtypeFuncTestSuite);
-
 void PosixCtypeFuncTest()
 {
     LOG("begin PosixCtypeFuncTest....");