!942 【monthly_20221018】文件系统提供动态内存分配器钩子

Merge pull request !942 from Far/monthly_20221018
feat: 文件系统提供动态内存分配器钩子
2022-11-29 03:53:36 +00:00 · 2022-11-28 20:01:36 +08:00 · 2022-11-23 11:07:51 +00:00 · 2022-11-23 02:58:04 +00:00 · 2022-11-23 01:46:38 +00:00 · 2022-11-21 14:06:09 +00:00
478 changed files with 8967 additions and 33349 deletions
--- a/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md
+++ b/.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md
@ -10,12 +10,6 @@
 ### 测试用例（新增、改动、可能影响的功能）


-### 是否涉及对外变更（典型的如：对外API规格变更、新增对外接口等等）
-
-必须选择一项（在MarkDown模式下用[x]替换[ ]即可勾选对应选项）:
- [ ] 是，涉及对外变更: 需要在commit message中按【[模板要求](https://gitee.com/openharmony/kernel_liteos_m/wikis/Commit%20message%E8%A7%84%E8%8C%83)】描述变更点
- [ ] 否，不涉及对外变更
-
 ### 是否需要同步至release（如：3.0LTS ... ）分支？

 必须选择一项（在MarkDown模式下用[x]替换[ ]即可勾选对应选项）:
--- a/BUILD.gn
+++ b/BUILD.gn
@ -44,10 +44,6 @@ if (defined(LOSCFG_COMPILER_ICCARM)) {
  }
 }

-declare_args() {
-  liteos_build_asm = true
-}
-
 config("arch_config") {
  cflags = arch_config_cflags
  asmflags = arch_config_asmflags
@ -95,9 +91,8 @@ config("dialect_config") {
 }

 config("misc_config") {
-  defines = []
  if (!defined(LOSCFG_COMPILER_ICCARM)) {
-    defines += [ "__LITEOS__" ]
+    defines = [ "__LITEOS__" ]
    defines += [ "__LITEOS_M__" ]
  }
  if (!defined(LOSCFG_DEBUG_VERSION)) {
@ -141,8 +136,8 @@ config("public") {
  ]

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

  if (BOARD_SOC_FEATURE) {
-    deps += [ "$DEVICE_BOARD_DIR/$device_company" ]
-    deps += [ "$DEVICE_SOC_DIR/$LOSCFG_SOC_COMPANY" ]
+    deps += [ "//device/board/$device_company" ]
+    deps += [ "//device/soc/$LOSCFG_SOC_COMPANY" ]
  } else {
    if (HAVE_DEVICE_SDK) {
      deps += [ device_path ]
@ -219,7 +214,4 @@ build_ext_component("build_kernel_image") {
  exec_path = rebase_path(root_out_dir)

  command = toochain_config_command
-  if (liteos_build_asm) {
-    command += toochain_asm_command
-  }
 }
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,465 +0,0 @@
-#  (2022-03-30)
-
-
-### Bug Fixes
-
-* c-sky等芯片架构的BUILD.gn优化 ([3311d73](https://gitee.com/openharmony/kernel_liteos_m/commits/3311d73406b68d289b6f715a099e90f62c86abd1)), closes [#I4D129](https://gitee.com/openharmony/kernel_liteos_m/issues/I4D129)
-* change the sensitive words ([8e2248c](https://gitee.com/openharmony/kernel_liteos_m/commits/8e2248c062aaca2444cc1001873fe8e8d8cdd3c6)), closes [#I4K7LL](https://gitee.com/openharmony/kernel_liteos_m/issues/I4K7LL)
-* cortex-m55栈优化 ([59e9c6e](https://gitee.com/openharmony/kernel_liteos_m/commits/59e9c6ed73caeeed56081a768198eccc7448df6c)), closes [#I4SQIQ](https://gitee.com/openharmony/kernel_liteos_m/issues/I4SQIQ)
-* csky等新增模块的HalTickStart函数定义和实现不一致 ([07ab6a5](https://gitee.com/openharmony/kernel_liteos_m/commits/07ab6a5b77c6955f6093beeab976bdc1b32d1db9)), closes [#I4D1HY](https://gitee.com/openharmony/kernel_liteos_m/issues/I4D1HY)
-* FD_SETSIZE compatible newlibc ([82c6d5f](https://gitee.com/openharmony/kernel_liteos_m/commits/82c6d5f17478fb47ea5977a32fb76d783ee3e815))
-* fix compile warning saying dereference void * pointer ([29126a9](https://gitee.com/openharmony/kernel_liteos_m/commits/29126a98fe7a8f75695910bdf8fa1ccc6ff67288))
-* gcc编译testsuite编译问题修复 ([f7d26b8](https://gitee.com/openharmony/kernel_liteos_m/commits/f7d26b8e12fb1ba4bebe6c0fc9ca9e392537419f)), closes [#I4DAOU](https://gitee.com/openharmony/kernel_liteos_m/issues/I4DAOU)
-* Kconfig中打开littlefs选项默认关联打开LOSCFG_SUPPORT_LITTLEFS宏 ([b2bcab3](https://gitee.com/openharmony/kernel_liteos_m/commits/b2bcab3a5bd794c86dd4d93b1b5aeca2d097289b)), closes [#I4ENQ1](https://gitee.com/openharmony/kernel_liteos_m/issues/I4ENQ1)
-* kernel接口融合，添加/修改kernel函数 ([cee9714](https://gitee.com/openharmony/kernel_liteos_m/commits/cee9714a90f2660a0b4455f4f5a2fc42870a6aa5))
-* L0 pthread_cond_timedwait接口实现存在的几个问题 ([2219c32](https://gitee.com/openharmony/kernel_liteos_m/commits/2219c32784071b6c37ea57185382e3228ed4b0a7)), closes [#I4N9P8](https://gitee.com/openharmony/kernel_liteos_m/issues/I4N9P8)
-* liteos_kernel_only=true编译内核报错 ([adc2105](https://gitee.com/openharmony/kernel_liteos_m/commits/adc21052b2b9b55de9fc493cf74645f470edf9b5)), closes [#I4O204](https://gitee.com/openharmony/kernel_liteos_m/issues/I4O204)
-* los_exc.S中_ExcInMsp主栈中异常处理函数中异常返回类型错误 ([c51df7a](https://gitee.com/openharmony/kernel_liteos_m/commits/c51df7a94c1f21803db25f46a73a7fb291588eda)), closes [#I4EJI4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4EJI4)
-* los_interrupt.c存在未使用的参数编译出错 ([5af4c2e](https://gitee.com/openharmony/kernel_liteos_m/commits/5af4c2e2139cabe49049283f7a4280460bbf353a)), closes [#I4SJPZ](https://gitee.com/openharmony/kernel_liteos_m/issues/I4SJPZ)
-* LOS_Panic接口中增加需要增加LOS_BackTrace()，方便定位主动异常位置 ([f51d675](https://gitee.com/openharmony/kernel_liteos_m/commits/f51d675fee217e0ad519f2fa79f70b033f313dce)), closes [#I4IGGY](https://gitee.com/openharmony/kernel_liteos_m/issues/I4IGGY)
-* los_trace.h接口注释错误修正 ([693468e](https://gitee.com/openharmony/kernel_liteos_m/commits/693468e5274af310721f5962602a915d701a7bf0)), closes #I4CYPZ
-* m4核在任务中异常时backtrace使用的是MSP所在的栈，而不是PSP所在的栈 ([3e8aea2](https://gitee.com/openharmony/kernel_liteos_m/commits/3e8aea224e481322efef9397e4aafc3450a09d28)), closes [#I4D7GE](https://gitee.com/openharmony/kernel_liteos_m/issues/I4D7GE)
-* M核posix接口fs模块用例完善 ([ee380fb](https://gitee.com/openharmony/kernel_liteos_m/commits/ee380fb9be45ef033979ec3b8875d980b7f13198)), closes [#I4L7BF](https://gitee.com/openharmony/kernel_liteos_m/issues/I4L7BF)
-* optimize default configuration ([b2e3849](https://gitee.com/openharmony/kernel_liteos_m/commits/b2e3849bfbd470981602b0dc02f47bffb38bfe11)), closes [#I4FSC9](https://gitee.com/openharmony/kernel_liteos_m/issues/I4FSC9)
-* OsGetAllTskInfo调用和异常时无任务回调函数地址 ([1c605a3](https://gitee.com/openharmony/kernel_liteos_m/commits/1c605a338ad2317aeb464bdac85df5b9a79c99fd)), closes [#I4MG2T](https://gitee.com/openharmony/kernel_liteos_m/issues/I4MG2T)
-* pm codex告警清零 ([9666380](https://gitee.com/openharmony/kernel_liteos_m/commits/96663805ecfd3248e33b4deb877c8d55cc4e8eec)), closes [#I4OWPE](https://gitee.com/openharmony/kernel_liteos_m/issues/I4OWPE)
-* pm模块解冻线程时存在删除空链表且时间片频繁唤醒系统 ([9f185b5](https://gitee.com/openharmony/kernel_liteos_m/commits/9f185b5b52ed9506a4913f233c9ddfe45452ec05)), closes [#I4AKUS](https://gitee.com/openharmony/kernel_liteos_m/issues/I4AKUS)
-* **posix unittest:** posix unittest 融合 ([ad6f249](https://gitee.com/openharmony/kernel_liteos_m/commits/ad6f249d1ea878f06864d79bdbed772b21eeac49))
-* **posix:** posix兼容回退 ([207efc1](https://gitee.com/openharmony/kernel_liteos_m/commits/207efc15b859fe18d8b1dac2a3da9d7a5831aa6e))
-* **posix:** posix接口融合，接口规范兼容性修改 ([e0b1275](https://gitee.com/openharmony/kernel_liteos_m/commits/e0b12758da4a25e42110ba32da25b6d18ebed8ef))
-* **posix接口融合:** posix接口融合，接口规范兼容性修改 ([4b607fd](https://gitee.com/openharmony/kernel_liteos_m/commits/4b607fd0740a5379cd373890482235845d782b62))
-* posix线程和LOS_TaskCreate任务不兼容，补齐接口防护，防止访问野指针 ([60805e1](https://gitee.com/openharmony/kernel_liteos_m/commits/60805e1a7c3736db86695ed86cd03cfaab70a427))
-* pr模板补充说明 ([7b86f69](https://gitee.com/openharmony/kernel_liteos_m/commits/7b86f69cc0ccd5512b69fd3a1181b3440747ddb2))
-* ReadMe中无对动态加载模块待加载的共享库的限制说明。 ([f86b971](https://gitee.com/openharmony/kernel_liteos_m/commits/f86b97180f97903bb2def271b7b11fc1ae1bf9bb)), closes [#I4ICK8](https://gitee.com/openharmony/kernel_liteos_m/issues/I4ICK8)
-* shell 输入不识别命令时内存泄漏 ([0245b1a](https://gitee.com/openharmony/kernel_liteos_m/commits/0245b1a7b24fd36d23f9602d0755b274581a84ce)), closes [#I4UR9P](https://gitee.com/openharmony/kernel_liteos_m/issues/I4UR9P)
-* **shell:** cat针对大文件无法工作 ([d518bad](https://gitee.com/openharmony/kernel_liteos_m/commits/d518bad0dc7dd9e3fbb45423a7db5cb8c1c922dc)), closes [#I4J4TK](https://gitee.com/openharmony/kernel_liteos_m/issues/I4J4TK)
-* shell模块task命令踩内存问题修改 ([6ffd55d](https://gitee.com/openharmony/kernel_liteos_m/commits/6ffd55dcd07ce17b693a97bb678668f763480e4d)), closes [#I4A70V](https://gitee.com/openharmony/kernel_liteos_m/issues/I4A70V)
-* switch inet_addr to a function ([b30e913](https://gitee.com/openharmony/kernel_liteos_m/commits/b30e9139d5502acab8c36ae9a56d4cd640786c44)), closes [#I4G4I4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4G4I4)
-* **testsuites:** cpup和测试套解耦 ([692651f](https://gitee.com/openharmony/kernel_liteos_m/commits/692651fe40f668f19b479186e52fea34d092b458))
-* tick timer时钟频率赋值修改为运行时赋值 ([ae02afc](https://gitee.com/openharmony/kernel_liteos_m/commits/ae02afc8504f64ff6bc09828f55e9602bcbcae56)), closes [#I4PGUR](https://gitee.com/openharmony/kernel_liteos_m/issues/I4PGUR)
-* tick中断处理时，无挂起任务时应更新当前运行任务的时间片, 并触发一次调度 ([ea12d40](https://gitee.com/openharmony/kernel_liteos_m/commits/ea12d40caf1301b4a7b6d60a2c599ceff4746c90)), closes [#I4LRZG](https://gitee.com/openharmony/kernel_liteos_m/issues/I4LRZG)
-* **time_func_test_01.c:** 修复testTimes测试单板配置LOSCFG_BASE_CORE_TICK_PER_SECOND = 1000的问题 ([5c982f1](https://gitee.com/openharmony/kernel_liteos_m/commits/5c982f1087f95174f2836c72648eab58adf37fd7))
-* 中断向量表对齐大小支持可配置 ([cf9c838](https://gitee.com/openharmony/kernel_liteos_m/commits/cf9c8387e3785d994aacf948b7c1b61324a3dd63)), closes [#I4M20E](https://gitee.com/openharmony/kernel_liteos_m/issues/I4M20E)
-* 优化trace buffer初始化，删除swtmr 桩中的无效参数 ([afbc9a5](https://gitee.com/openharmony/kernel_liteos_m/commits/afbc9a593b61461072556cb5531d90b30ce2e394)), closes [#I4DPR7](https://gitee.com/openharmony/kernel_liteos_m/issues/I4DPR7)
-* 优化低功耗流程 ([c6600d9](https://gitee.com/openharmony/kernel_liteos_m/commits/c6600d9dddb666f397ba659d47d64f334691af6b)), closes [#I46VXK](https://gitee.com/openharmony/kernel_liteos_m/issues/I46VXK)
-* 修复arch目录调整影响到的target目录下的文件 ([d5725b2](https://gitee.com/openharmony/kernel_liteos_m/commits/d5725b22644da8ab3e719169230303e44c7d8750)), closes [#I4JM7Z](https://gitee.com/openharmony/kernel_liteos_m/issues/I4JM7Z)
-* 修复cortex-m系列系统提供的timer在低频下时间不准的问题 ([3e569ba](https://gitee.com/openharmony/kernel_liteos_m/commits/3e569bac587d90dcd21aff7d8ec53216dfbb8f1c)), closes [#I4HBGR](https://gitee.com/openharmony/kernel_liteos_m/issues/I4HBGR)
-* 修复hook层LOS_HOOK_TYPE_SEM_PEND的runningTask入参可能为空 ([3fd22ac](https://gitee.com/openharmony/kernel_liteos_m/commits/3fd22ac2b0b4c690669a659246aba099fd4311ec)), closes [#I4BU4P](https://gitee.com/openharmony/kernel_liteos_m/issues/I4BU4P)
-* 修复irqNum = HwiNumGet()编译错误的问题 ([16e87d7](https://gitee.com/openharmony/kernel_liteos_m/commits/16e87d78d89bec7d85c076fc738ed4ad0614b865)), closes [#I4S81B](https://gitee.com/openharmony/kernel_liteos_m/issues/I4S81B)
-* 修复Kconfig信息错误 ([bb04582](https://gitee.com/openharmony/kernel_liteos_m/commits/bb045829104211522cd12a7273d5853400c1ea26)), closes [#I4MZ1F](https://gitee.com/openharmony/kernel_liteos_m/issues/I4MZ1F)
-* 修复L0_Emulator 门禁高概率失败的问题 ([7ad2f62](https://gitee.com/openharmony/kernel_liteos_m/commits/7ad2f62a03481a3919fef1f1e46e4c9677b1e65c)), closes [#I4NB0N](https://gitee.com/openharmony/kernel_liteos_m/issues/I4NB0N)
-* 修复liteos-m在iar环境下的编译问题 ([4c4784e](https://gitee.com/openharmony/kernel_liteos_m/commits/4c4784e33d7944e7850009be192375aaa6e2b125)), closes [#I4Q5Q5](https://gitee.com/openharmony/kernel_liteos_m/issues/I4Q5Q5)
-* 修复los_interrupt.c文件中HalHwiInit函数里未使能未对齐异常问题 ([d32e25f](https://gitee.com/openharmony/kernel_liteos_m/commits/d32e25f3ae8e8e5ec24effa98dc8f0b3ba94d0c1)), closes [#I4EJGR](https://gitee.com/openharmony/kernel_liteos_m/issues/I4EJGR)
-* 修复newlib缺省PTHREAD_KEYS_MAX 问题 ([65f04bf](https://gitee.com/openharmony/kernel_liteos_m/commits/65f04bf093376a478e9585dadfc1238158cc3641)), closes [#I4OX47](https://gitee.com/openharmony/kernel_liteos_m/issues/I4OX47)
-* 修复OsQueueMailFree提早释放内存的问题 ([ec88d16](https://gitee.com/openharmony/kernel_liteos_m/commits/ec88d1628937b3def6dd613246116f6bfa4141eb))
-* 修复pm编译告警导致内核编译失败 ([18b0524](https://gitee.com/openharmony/kernel_liteos_m/commits/18b052458e1cea113df7a6bb4798a6d5e1eb751e)), closes [#I49MIN](https://gitee.com/openharmony/kernel_liteos_m/issues/I49MIN)
-* 修复pthread 编译告警 ([cc57f81](https://gitee.com/openharmony/kernel_liteos_m/commits/cc57f81ab85a5eb9bb4be9bd7d2863978996bcf3)), closes [#I4U16U](https://gitee.com/openharmony/kernel_liteos_m/issues/I4U16U)
-* 修复pthread_create相关问题 ([cd949dd](https://gitee.com/openharmony/kernel_liteos_m/commits/cd949ddae0aa4e7291b0b7f6ba83c2034cdf1301)), closes [#I4P78J](https://gitee.com/openharmony/kernel_liteos_m/issues/I4P78J)
-* 修复pthread_create行为与posix不一致问题 ([2b1e5a7](https://gitee.com/openharmony/kernel_liteos_m/commits/2b1e5a7a130fbca1b86a787b54f474e183541d6d)), closes [#I49W9F](https://gitee.com/openharmony/kernel_liteos_m/issues/I49W9F)
-* 修复readme中文档链接错误 ([8ee70a0](https://gitee.com/openharmony/kernel_liteos_m/commits/8ee70a0f8f856da29139a36ba6f8589201cdb109)), closes [#I4FD5G](https://gitee.com/openharmony/kernel_liteos_m/issues/I4FD5G)
-* 修复risc-v异常时，异常信息混乱且backtrace无法输出的问题 ([0fb49d4](https://gitee.com/openharmony/kernel_liteos_m/commits/0fb49d4422245e83c2435468eb7f2690f2e2c6e4)), closes #I4BPHX
-* 修复shcmd.h需要用宏包起来的问题 ([a7a8a62](https://gitee.com/openharmony/kernel_liteos_m/commits/a7a8a62bcb7398b4194b37f62098da9cb1ce717e)), closes [#I45FU2](https://gitee.com/openharmony/kernel_liteos_m/issues/I45FU2)
-* 修复shell 模块存在大量的编译告警及codeCheck。 ([e0d8b53](https://gitee.com/openharmony/kernel_liteos_m/commits/e0d8b5328f53dcef9427a34e8b0462250bb6a40f)), closes [#I48V2J](https://gitee.com/openharmony/kernel_liteos_m/issues/I48V2J)
-* 修复任务栈对齐问题及补充posix和cmsis测试用例 ([ed863e9](https://gitee.com/openharmony/kernel_liteos_m/commits/ed863e90dd9aceb5d3b6d92b0a94703101b83f80))
-* 修复公版gcc编译内核，调用calloc崩溃 ([8d0ced2](https://gitee.com/openharmony/kernel_liteos_m/commits/8d0ced206951f35d5caab61969344b0ab259e5fb)), closes [#I4OFG6](https://gitee.com/openharmony/kernel_liteos_m/issues/I4OFG6)
-* 修复未使用的参数和类型比较编译报错问题 ([21b46e8](https://gitee.com/openharmony/kernel_liteos_m/commits/21b46e82f31030703d052369701f4d6d736a4a86))
-* 修复调度时间最大值不一致问题 ([9f393bc](https://gitee.com/openharmony/kernel_liteos_m/commits/9f393bcc6df592efb6940e9864ff93e932ae59ad))
-* 修正liteos-m内核README不准确信息 ([0e067b2](https://gitee.com/openharmony/kernel_liteos_m/commits/0e067b239354c28e16b05489274b33051d002508)), closes [#I4PLWP](https://gitee.com/openharmony/kernel_liteos_m/issues/I4PLWP)
-* 修正部分编码风格问题 ([91903a3](https://gitee.com/openharmony/kernel_liteos_m/commits/91903a37165ef364750916104be4f7dfd1d8f9a6)), closes [#I4K8M7](https://gitee.com/openharmony/kernel_liteos_m/issues/I4K8M7)
-* 内核ERR打印，线程信息，不方便问题定位。 ([232fec2](https://gitee.com/openharmony/kernel_liteos_m/commits/232fec27ac8cd2f46b5a2f5cfbe4677d0e287314)), closes #I4DAKM
-* 内源检视问题修复 ([c24363b](https://gitee.com/openharmony/kernel_liteos_m/commits/c24363bc50364b0be1fba3b993a83c6936fc3d08))
-* 删除C文件中无用的__cplusplus ([7fe3aad](https://gitee.com/openharmony/kernel_liteos_m/commits/7fe3aaddf56b300ffcb2b186ae01ed64bef1c069)), closes [#I4D0YK](https://gitee.com/openharmony/kernel_liteos_m/issues/I4D0YK)
-* 删除OsMemboxExcInfoGetSub内存调测方法中多余的赋值语句。 ([94db0fe](https://gitee.com/openharmony/kernel_liteos_m/commits/94db0fe7a30edaa10786101f1ef662987a27734a)), closes [#I4CFNX](https://gitee.com/openharmony/kernel_liteos_m/issues/I4CFNX)
-* 去掉没有使用的入参consoleid。 ([a627953](https://gitee.com/openharmony/kernel_liteos_m/commits/a62795304da31e13021ea2c675d124afd2594102)), closes [#I43CVE](https://gitee.com/openharmony/kernel_liteos_m/issues/I43CVE)
-* 去掉编译选项-fno-short-enums ([b542aab](https://gitee.com/openharmony/kernel_liteos_m/commits/b542aab09dd92397f8c1305ac656ef14a012b5f8)), closes [#I4JY32](https://gitee.com/openharmony/kernel_liteos_m/issues/I4JY32)
-* 取消cpu进入低功耗前开中断操作 ([bd39e9e](https://gitee.com/openharmony/kernel_liteos_m/commits/bd39e9e6d67310222c363e132141bb7fee1213f1)), closes [#I4KDP8](https://gitee.com/openharmony/kernel_liteos_m/issues/I4KDP8)
-* 告警修复 ([7d2fd01](https://gitee.com/openharmony/kernel_liteos_m/commits/7d2fd01c2d7d6d4c653a307a1419bc094f5332f0))
-* 告警修复 ([2d7bf3b](https://gitee.com/openharmony/kernel_liteos_m/commits/2d7bf3b7d8ea84961e802c366899aca891f38377))
-* 在头文件中补充LOSCFG_MEM_FREE_BY_TASKID函数的声明 ([ad18026](https://gitee.com/openharmony/kernel_liteos_m/commits/ad18026a59fc2853c9580e040f959f9f42082640)), closes [#I4JBOV](https://gitee.com/openharmony/kernel_liteos_m/issues/I4JBOV)
-* 将curl依赖的函数新增至newlib库 ([bd04d9f](https://gitee.com/openharmony/kernel_liteos_m/commits/bd04d9f29a0b77445a71378f88b01ffdae24554f)), closes [#I4RG71](https://gitee.com/openharmony/kernel_liteos_m/issues/I4RG71)
-* 将未定义小写"true"，"false"改为"TRUE"，"FALSE"。 ([9819eb5](https://gitee.com/openharmony/kernel_liteos_m/commits/9819eb567636adf1774de9fd6039d274bee8f69b)), closes [#I43D20](https://gitee.com/openharmony/kernel_liteos_m/issues/I43D20)
-* 当前仓代码编译告警的问题 ([194ac58](https://gitee.com/openharmony/kernel_liteos_m/commits/194ac5898d1e2ffaa17f6dca405614b73da6f8bb)), closes #I4N50W
-* 支持硬浮点编译 ([988fd85](https://gitee.com/openharmony/kernel_liteos_m/commits/988fd85fae454a0d9fe01ef1c921b4f3667d5ac8)), closes [#I48KJP](https://gitee.com/openharmony/kernel_liteos_m/issues/I48KJP)
-* 测试用例任务栈的宏定义重复定义，导致在osTest.h中修改不生效 ([ce6cf68](https://gitee.com/openharmony/kernel_liteos_m/commits/ce6cf6879f4564393765a24c4d65448e0fddc3eb))
-* 添加L0 测试门禁 ([5c168fc](https://gitee.com/openharmony/kernel_liteos_m/commits/5c168fc3e0d08dd4a8924696e17a498eb444fa70)), closes #I4C5R4
-* 添加newlib对ipv6的支持 ([f7400fb](https://gitee.com/openharmony/kernel_liteos_m/commits/f7400fbcb275cbb3b75f1aef2af1459b794432de)), closes [#I4M1DB](https://gitee.com/openharmony/kernel_liteos_m/issues/I4M1DB)
-* 添加文件版权头等信息 ([cf4e017](https://gitee.com/openharmony/kernel_liteos_m/commits/cf4e017970f8a3113bc8b6028d75775f747512c6)), closes [#I4BXBH](https://gitee.com/openharmony/kernel_liteos_m/issues/I4BXBH)
-* 清除因g_tm变量没有使用引入的编译告警 ([9689522](https://gitee.com/openharmony/kernel_liteos_m/commits/9689522a8e08b79244ad339dc24074843b99d33b)), closes [#I4LW3H](https://gitee.com/openharmony/kernel_liteos_m/issues/I4LW3H)
-* 移除los_arch_interrupt.h文件中冗余声明的函数VOID OsExcInit(VOID) ([136952f](https://gitee.com/openharmony/kernel_liteos_m/commits/136952f193fe97cfd6a88932e71811e12edfa7a5)), closes [#I4D9OO](https://gitee.com/openharmony/kernel_liteos_m/issues/I4D9OO)
-* 补充net相关头文件 ([93f616b](https://gitee.com/openharmony/kernel_liteos_m/commits/93f616b64e961013be5c5267e50d58a40b5cc6c9))
-* 解决gmtime和localtime接口由于g_tm全局变量导致的竞态问题 ([1454b76](https://gitee.com/openharmony/kernel_liteos_m/commits/1454b76482d42e78c1904028de55d82261e5ecaa)), closes [#I4LW3H](https://gitee.com/openharmony/kernel_liteos_m/issues/I4LW3H)
-* 解决los_pm.c:743:19: warning 编译告警 ([0c72c8b](https://gitee.com/openharmony/kernel_liteos_m/commits/0c72c8bf94b053ff90bbf2019006c52adf1eb8df)), closes [#I4D4L8](https://gitee.com/openharmony/kernel_liteos_m/issues/I4D4L8)
-* 解决定时器超时但还在队列中无法删除的问题 ([ecce17e](https://gitee.com/openharmony/kernel_liteos_m/commits/ecce17ea4878c7bdf7d7de9a6848e6bf871563de)), closes [#I4LFVD](https://gitee.com/openharmony/kernel_liteos_m/issues/I4LFVD)
-* 解除net对cmsis的依赖，net属于内核模块，不应该依赖内核对外接口 ([9982624](https://gitee.com/openharmony/kernel_liteos_m/commits/99826240d979c3aa820ab2aace62e3338978e6d1))
-* 调度中将pm相关的部分用LOSCFG_KERNEL_PM包含 ([d7c0059](https://gitee.com/openharmony/kernel_liteos_m/commits/d7c0059dc4fcca3f85d2cad1012353892ce28021)), closes [#I4L00F](https://gitee.com/openharmony/kernel_liteos_m/issues/I4L00F)
-* 调用LOS_TaskDetach操作已退出的joinable的任务时，未正确回收该任务 ([49c93b3](https://gitee.com/openharmony/kernel_liteos_m/commits/49c93b37c5e215612bbeb4619e73c809f9eb1cac)), closes [#I4DZL7](https://gitee.com/openharmony/kernel_liteos_m/issues/I4DZL7)
-* 针对pr是否同步至release分支，增加原因说明规则 ([1ee543d](https://gitee.com/openharmony/kernel_liteos_m/commits/1ee543d5d31524d543ffb297b121224dedf8602f))
-* 队列相关的API实现中,参数的校验不完全,导致程序异常 ([eef7c80](https://gitee.com/openharmony/kernel_liteos_m/commits/eef7c80a725d68af254ae55091bd36f978cf4284))
-
-
-### Features
-
-* adapt net ([8594ee4](https://gitee.com/openharmony/kernel_liteos_m/commits/8594ee469ad2d40a363e5d77f94f292ab3cb8c21))
-* add option for ioctl ([5e8ac4b](https://gitee.com/openharmony/kernel_liteos_m/commits/5e8ac4b8883f64bbffa5bb3f063a601112058396)), closes [#I4I3W5](https://gitee.com/openharmony/kernel_liteos_m/issues/I4I3W5)
-* add option SIOCGIFBRDADDR for ioctl ([33ee492](https://gitee.com/openharmony/kernel_liteos_m/commits/33ee49295329e3c394d1cc7b16f77a23ac2255a8)), closes [#I4EGNG](https://gitee.com/openharmony/kernel_liteos_m/issues/I4EGNG)
-* added assembly atomic interface ([1513f50](https://gitee.com/openharmony/kernel_liteos_m/commits/1513f50a474d1227a83fb655ad18c19cd792f235))
-* backtrace for arm9 ([03de7f3](https://gitee.com/openharmony/kernel_liteos_m/commits/03de7f37450a8821ea05e60e94a5d1dd359c4f99)), closes [#I4BMLG](https://gitee.com/openharmony/kernel_liteos_m/issues/I4BMLG)
-* Board 和 SoC分离，编译适配 ([3f1c04d](https://gitee.com/openharmony/kernel_liteos_m/commits/3f1c04dd57bca0379ce37162d9d824801e7d880f))
-* **build:** add module_group and comment out arch_cflags ([e5636f7](https://gitee.com/openharmony/kernel_liteos_m/commits/e5636f7acaf7e8b7d14dc07930b2a16c86e63c85))
-* **build:** support Kconfig ([7e67343](https://gitee.com/openharmony/kernel_liteos_m/commits/7e673430dc42c55b3a0a6d955ba8fea21d6d58ea))
-* **cmsis:** support max_count for osSemaphoreNew ([d478152](https://gitee.com/openharmony/kernel_liteos_m/commits/d478152762013975551e1af154df42987596c9a6))
-* cortex-m55支持psplimit ([db7d641](https://gitee.com/openharmony/kernel_liteos_m/commits/db7d641c223db8ab25501d79c2a6331f743d830b)), closes [#I4T7R3](https://gitee.com/openharmony/kernel_liteos_m/issues/I4T7R3)
-* littlefs最大打开文件个数修改为可通过menuconfig配置 ([9bc9f3a](https://gitee.com/openharmony/kernel_liteos_m/commits/9bc9f3aa53be7bf392d3da09adcb184dec8e3da2))
-* newlib支持pthread_equal ([ce5357e](https://gitee.com/openharmony/kernel_liteos_m/commits/ce5357eee1daf1c1b3a3aa7bdeaef0cc5a8901bf)), closes [#I4QERS](https://gitee.com/openharmony/kernel_liteos_m/issues/I4QERS)
-* provide read write for socket by #define ([d044eda](https://gitee.com/openharmony/kernel_liteos_m/commits/d044eda3c3640ae135ef528739d0c9609f40c822)), closes [#I4H8TL](https://gitee.com/openharmony/kernel_liteos_m/issues/I4H8TL)
-* synchronizing arch api ([04bf3a6](https://gitee.com/openharmony/kernel_liteos_m/commits/04bf3a682f149482d8ebdbb9ff96d6889edb487a)), closes [#I4N7XV](https://gitee.com/openharmony/kernel_liteos_m/issues/I4N7XV)
-* synchronous los_hwicreate interface ([6c68ada](https://gitee.com/openharmony/kernel_liteos_m/commits/6c68adad4db7f6112990764eafe6a3bd5f8759a5))
-* 低内存资源回收low memory killer ([ab886d8](https://gitee.com/openharmony/kernel_liteos_m/commits/ab886d848ab809942c11d0e408b8ff76c41b92b2)), closes [#I4ID0M](https://gitee.com/openharmony/kernel_liteos_m/issues/I4ID0M)
-* 低功耗支持冻结线程等需求 ([9b5739a](https://gitee.com/openharmony/kernel_liteos_m/commits/9b5739ab11ae7a89d35ba6f54fc62137ddc6d897)), closes [#I49FJF](https://gitee.com/openharmony/kernel_liteos_m/issues/I49FJF)
-* 内核提供Interrupt框架，支持多架构多平台通用化 ([e8538d0](https://gitee.com/openharmony/kernel_liteos_m/commits/e8538d041a93817cea4ae3914afcfdc6182483e7))
-* 内核提供tick timer框架，支持多架构多平台通用化 ([f635450](https://gitee.com/openharmony/kernel_liteos_m/commits/f635450d7cf7f674de3803b5eb9d759b6e4d005b)), closes [#I4N7XV](https://gitee.com/openharmony/kernel_liteos_m/issues/I4N7XV)
-* 同步调度部分优化至liteos_m ([fb11ab1](https://gitee.com/openharmony/kernel_liteos_m/commits/fb11ab181e69289f7a2edfd5857595b89f1d5d67))
-* 支持cortex-m55 ([6e17805](https://gitee.com/openharmony/kernel_liteos_m/commits/6e1780546c173365262c7a50b81896f5b3c46389)), closes [#I4Q9OQ](https://gitee.com/openharmony/kernel_liteos_m/issues/I4Q9OQ)
-* 支持Lms ([7b838e8](https://gitee.com/openharmony/kernel_liteos_m/commits/7b838e8a7b8e9f7fb34ca495e5cb46d70d12722b)), closes [#I4HYBG](https://gitee.com/openharmony/kernel_liteos_m/issues/I4HYBG)
-* 支持posix 和 cmsis join能力 ([ecfdf7f](https://gitee.com/openharmony/kernel_liteos_m/commits/ecfdf7ff9bf1adf06835968dc6f06b7c45e04862)), closes [#I44V26](https://gitee.com/openharmony/kernel_liteos_m/issues/I44V26)
-* 支持posix线程私有数据能力 ([a856303](https://gitee.com/openharmony/kernel_liteos_m/commits/a856303b9cdadcfade33de0d3a335db0332f5761)), closes [#I4ODEB](https://gitee.com/openharmony/kernel_liteos_m/issues/I4ODEB)
-* 支持pthread_condattr_setclock ([68dad2c](https://gitee.com/openharmony/kernel_liteos_m/commits/68dad2ccc9856dc2c1ac112bc8f30a703c1af5d9)), closes [#I4ETLN](https://gitee.com/openharmony/kernel_liteos_m/issues/I4ETLN)
-* 支持pthread_mutex属性相关接口 ([d2be4d7](https://gitee.com/openharmony/kernel_liteos_m/commits/d2be4d7a460365844a7732df8a3eb59e6bb64897)), closes [#I4G4RQ](https://gitee.com/openharmony/kernel_liteos_m/issues/I4G4RQ)
-* 支持select.h的FD_SETSIZE宏配置 ([05642f0](https://gitee.com/openharmony/kernel_liteos_m/commits/05642f05ae6b220df977f4402bc31f396bf08603)), closes [#I4RYK4](https://gitee.com/openharmony/kernel_liteos_m/issues/I4RYK4)
-* 支持任务栈可配置 ([96cc92d](https://gitee.com/openharmony/kernel_liteos_m/commits/96cc92d03561e1a9f1030c71916068584b349626))
-* 调度、任务及pm解耦 ([cc8a794](https://gitee.com/openharmony/kernel_liteos_m/commits/cc8a794229f4236a1611183fd482740b3badbcd7)), closes [#I4JTN6](https://gitee.com/openharmony/kernel_liteos_m/issues/I4JTN6)
-* 适配三方库FatFs升级至r0.14a版本 ([92ea355](https://gitee.com/openharmony/kernel_liteos_m/commits/92ea355756ebd92b8809ecb638ffb5355d89c5e9))
-
-
-### BREAKING CHANGES
-
-* pthread_create 支持任务栈设置
-osThreadNew 支持任务栈设置
-TSK_INIT_PARAM_S 结构体添加stackAddr 字段
-
-* 涉及接口修改：
-    LOS_HwiCreate LOS_HwiDelete
-
-改动内容：
-    中断处理函数参数类型由HWI_ARG_T统一改为HwiIrqParam，封装原有arg参数及riscv部分实际使用变量pDevId, 这样一方面统一LiteOS接口，也统一了中断处理函数的arg参数
-    同步LOS_HwiDelete接口入参，新增HWI_IRQ_PARAM_S *irqParam参数，为后续共享中断功能的添加预留
-
-* 新增接口：
-LOS_TaskResRecycle
-LOS_CurrNanosec
-LOS_MDelay
-
-接口修改：
-LOS_QueueCreate：第一个入参添加const修饰并增加一种异常情况处理
-los_memory.c中 OS_ERROR 修改为LOS_NOK，重定义LOS_NOK为（UINT32）-1。
-
-接口位置转移：
-LOS_UDelay 由los_task.h/.c 转移到los_tick.h/.c 
-
-宏修改：
-LOS_ERRNO_MUX_PEND_INTERR 改名为 LOS_ERRNO_MUX_IN_INTERR
-
-* **posix接口融合:**
-
-接口修改：
-calloc
-pthread_mutex_init
-mq_unlink
-pthread_join
-pthread_exit
-pthread_attr_init
-pthread_attr_destroy
-pthread_condattr_destroy
-pthread_cond_timedwait
-pthread_mutexattr_init
-pthread_mutexattr_settype
-pthread_mutex_destroy
-pthread_mutex_timedlock
-pthread_mutex_trylockk
-pthread_mutex_unlock
-sem_getvalue
-sem_timedwait
-pthread_cond_timedwait
-nanosleep
-timer_create
-timer_settime
-timer_gettime
-testStdlibStrtoull005
-testStdlibStrtol011
-testStdlibStrtoul007
-testPthread004
-
-新增接口：
-CheckForCancel
-pthread_setcancelstate
-pthread_setcanceltype
-pthread_once
-pthread_setschedprio
-pthread_attr_setstack
-pthread_attr_getstack
-pthread_condattr_getpshared
-pthread_condattr_setpshared
-pthread_condattr_getclock
-pthread_mutexattr_gettype
-CheckMutexAttr
-OsMuxPreCheck
-sem_trywait
-MuxPendForPosix
-MuxPostForPosix
-增加overrun功能
-
-接口变化：
-mq_getsetattr 改为内部接口MqGetSetAttr
-GetTickTimeFromNow->OsGetTickTimeFromNow
-
-接口位置转移：
-pthread_equal接口由newlib下转移到kal/posix/src/pthread.c中
-
-* **posix:** 接口修改：
-calloc
-pthread_mutex_init
-mq_unlink
-pthread_join
-pthread_exit
-pthread_attr_init
-pthread_attr_destroy
-pthread_condattr_destroy
-pthread_cond_timedwait
-pthread_mutexattr_init
-pthread_mutexattr_settype
-pthread_mutex_destroy
-pthread_mutex_timedlock
-pthread_mutex_trylockk
-pthread_mutex_unlock
-sem_getvalue
-
-新增接口：
-CheckForCancel
-pthread_setcancelstate
-pthread_setcanceltype
-pthread_once
-pthread_setschedprio
-pthread_attr_setstack
-pthread_attr_getstack
-pthread_condattr_getpshared
-pthread_condattr_setpshared
-pthread_condattr_getclock
-pthread_mutexattr_gettype
-CheckMutexAttr
-OsMuxPreCheck
-sem_trywait
-
-接口变化：
-mq_getsetattr 改为内部接口OsMqGetSetAttr
-
-接口位置转移：
-pthread_equal接口由newlib下转移到kal/posix/src/pthread.c中
-
-* 新增接口：
-    LOS_HwiTrigger ArchIntTrigger
-    LOS_HwiEnable ArchIntEnable
-    LOS_HwiDisable ArchIntDisable
-    LOS_HwiClear ArchIntClear
-    LOS_HwiSetPriority ArchIntSetPriority
-
-* Assembly implementation:
-    ArchAtomicRead
-    ArchAtomicSet
-    ArchAtomicAdd
-    ArchAtomicSub
-    ArchAtomicInc
-    ArchAtomicIncRet
-    ArchAtomicDec
-    ArchAtomicDecRet
-
-* 原来版本中每个架构下提供的tick timer相关操作函数为弱函数：
-    WEAK UINT32 HalTickStart(OS_TICK_HANDLER handler);
-    WEAK VOID HalSysTickReload(UINT64 nextResponseTime);
-    WEAK UINT64 HalGetTickCycle(UINT32 *period);
-    WEAK VOID HalTickLock(VOID);
-    WEAK VOID HalTickUnlock(VOID);
-  用户如果需要启用自己的tick timer需要自己实现相关接口(强属性)，在 "内核初始化之前" 通过调用：
-  LOS_TickTimerRegister 接口替换系统默认提供的tick timer相关接口。
-  无论用户提供的tick timer 还是系统默认提供的，均在内核初始化时启动。
-*   int pthread_key_create(pthread_key_t *k, void (*dtor)(void *))
-  int pthread_key_delete(pthread_key_t k)
-  int pthread_setspecific(pthread_key_t k, const void *x)
-  void *pthread_getspecific(pthread_key_t k)
-* 1.修改arch/include下接口，以ArchXX命名函数
-2.提取公共函数声明:ArchAtomicXchg32bits、ArchAtomicDecRet、ArchAtomicCmpXchg32bits
-3.新增部分原子操作c内联实现
-* 增加低内存资源回收注册相关接口LOS_LmkOpsNodeRegister、LOS_LmkOpsNodeUnregister和内存资源释放和任务恢复接口LOS_LmkTasksKill和LOS_LmkTasksRestore.
-* SwtmrHandlerItem结构体新增swtmrID字段，用于标识超时队列中软件定时器id
-* 新增支持API:
-
-LOS_LmsCheckPoolAdd使能检测指定内存池
-LOS_LmsCheckPoolDel不检测指定内存池
-LOS_LmsAddrProtect为指定内存段上锁，不允许访问
-LOS_LmsAddrDisableProtect去能指定内存段的访问保护
-
-
-#  (2021-09-30)
-
-
-### Bug Fixes
-
-*  M核代码告警清零 ([cb5f862](https://gitee.com/openharmony/kernel_liteos_m/commits/cb5f862eafd91675bf53d0320616cc8f707a6e5a)), closes [#I4386N](https://gitee.com/openharmony/kernel_liteos_m/issues/I4386N)
-*  M核告警消除 ([5a9d53b](https://gitee.com/openharmony/kernel_liteos_m/commits/5a9d53b6444a3bbe084f575ef079f0da36c27c2a)), closes [#I46LHG](https://gitee.com/openharmony/kernel_liteos_m/issues/I46LHG)
-*  M核编译配置修改 ([deff7c9](https://gitee.com/openharmony/kernel_liteos_m/commits/deff7c921f606ed85663f91d21c12163c15aa7f8)), closes [#I46XEA](https://gitee.com/openharmony/kernel_liteos_m/issues/I46XEA)
-*  shell模块task命令踩内存问题修改 ([b5e84d5](https://gitee.com/openharmony/kernel_liteos_m/commits/b5e84d5516b599257151f88b5a830d6fe9e0e188)), closes #II4
-*  trustzone 中断适配 ([15a2c17](https://gitee.com/openharmony/kernel_liteos_m/commits/15a2c17f791b7d6703863718d92fa35402c41067)), closes [#I42TFV](https://gitee.com/openharmony/kernel_liteos_m/issues/I42TFV)
-* add API LOS_HwiCreate and LOS_HwDelete ([eb668eb](https://gitee.com/openharmony/kernel_liteos_m/commits/eb668eb9e0021961230858f9bfa1599646da9a8f)), closes [#I3R75F](https://gitee.com/openharmony/kernel_liteos_m/issues/I3R75F)
-* add liteos_m vfs ([5479dd6](https://gitee.com/openharmony/kernel_liteos_m/commits/5479dd66d7ec96d2206a9890586fe5f07d50fbb9)), closes [#I3R493](https://gitee.com/openharmony/kernel_liteos_m/issues/I3R493)
-* backtrace代码段判断函数定义成弱函数，如果有多个代码段，那么可根据实际情况重定义 ([8692ed3](https://gitee.com/openharmony/kernel_liteos_m/commits/8692ed33a3b975bac7aa5b6ce3c40a84e281f6c5)), closes [#I420PQ](https://gitee.com/openharmony/kernel_liteos_m/issues/I420PQ)
-* change cpup retval range ([d00a35b](https://gitee.com/openharmony/kernel_liteos_m/commits/d00a35ba9288047e9eaba06a8ed1d15806bfca40))
-* change description according to review ([a38365e](https://gitee.com/openharmony/kernel_liteos_m/commits/a38365ed097fb398f922a5d1a72305933ae3e7b3))
-* change queuePosion to queuePosition ([e772ccb](https://gitee.com/openharmony/kernel_liteos_m/commits/e772ccb3ccd3b31269066fa59a434a23af98ce51))
-* change to OpenHarmony LiteOS-M ([259fb54](https://gitee.com/openharmony/kernel_liteos_m/commits/259fb54b3c1a208c5672f1f6551ba0424505e4b2))
-* comment error ([a37b73d](https://gitee.com/openharmony/kernel_liteos_m/commits/a37b73d7599a62a728dbf564de9d9927f995ec1b))
-* compile warning fix ([8dea15c](https://gitee.com/openharmony/kernel_liteos_m/commits/8dea15c4fcaff2957c60351781180f964c0a882d)), closes #I4330
-* compile warnings ([75f6187](https://gitee.com/openharmony/kernel_liteos_m/commits/75f61870a002e238385bc9a7632d42b0b2488c9a)), closes [#I3Y57X](https://gitee.com/openharmony/kernel_liteos_m/issues/I3Y57X)
-* correct ECB in comment ([e2aeb1f](https://gitee.com/openharmony/kernel_liteos_m/commits/e2aeb1ff1d4cd54a752c9f6ef976ee8e353da620))
-* correct spelling ([dd5cefb](https://gitee.com/openharmony/kernel_liteos_m/commits/dd5cefb0dace4b7a7276c880e45d5520950e9844))
-* correct spelling ([e7ea50f](https://gitee.com/openharmony/kernel_liteos_m/commits/e7ea50f13142e34a9860e75be051538fe91e234e))
-* correct the counter of exception type ([bff6587](https://gitee.com/openharmony/kernel_liteos_m/commits/bff65877a281ac1cdcbefd325dcd3ad4933edac9))
-* correct typo ([3ceface](https://gitee.com/openharmony/kernel_liteos_m/commits/3ceface13e1c15d107bc3c8460c17b9dd4c95e26))
-* cpup funciton repair ([c842251](https://gitee.com/openharmony/kernel_liteos_m/commits/c842251bab7ea6365f2bee8ae880e6efb60f0c73))
-* delete unused symbols for default config ([7ad3a22](https://gitee.com/openharmony/kernel_liteos_m/commits/7ad3a22b4d62c8b00876ff338c4ce8d1e3f3cbe2)), closes [#I45HN3](https://gitee.com/openharmony/kernel_liteos_m/issues/I45HN3)
-* fix __cplusplus typo ([c3eb3e5](https://gitee.com/openharmony/kernel_liteos_m/commits/c3eb3e59e692371f67a4e21e4b38004195ce5e10))
-* fix backtrace check issue ([b6664e6](https://gitee.com/openharmony/kernel_liteos_m/commits/b6664e66f14d432b02101c883a53cb333dc4c195))
-* fix bad params def in HalTickStart ([4443b74](https://gitee.com/openharmony/kernel_liteos_m/commits/4443b74ea63d2e458af69723a7198bbbaeb856ea)), closes [#I48YWT](https://gitee.com/openharmony/kernel_liteos_m/issues/I48YWT)
-* fix comment typo issue ([0c2a675](https://gitee.com/openharmony/kernel_liteos_m/commits/0c2a675e2d163eaf05aff7df226404888d78ca37))
-* fix destroy typo ([4ba6259](https://gitee.com/openharmony/kernel_liteos_m/commits/4ba6259e94bd677764922b0470fddc2590f6efa5))
-* fix function name ([f7d50d0](https://gitee.com/openharmony/kernel_liteos_m/commits/f7d50d0fbf53cdd352e94a387cf707083f1641bb))
-* fix length typo ([98d6580](https://gitee.com/openharmony/kernel_liteos_m/commits/98d65801de9e37199b5df9c8734ebcb6ff5d853d))
-* fix LOS_MEMBOX_ALIGNED macro name ([fced899](https://gitee.com/openharmony/kernel_liteos_m/commits/fced8992cf4fbc26c9722d528d642a7afe479170))
-* fix LOS_TaskNameGet comment ([c70b28b](https://gitee.com/openharmony/kernel_liteos_m/commits/c70b28bf785da12fd60ecc92a5a63fb54e52c22a))
-* fix macro typo ([1600360](https://gitee.com/openharmony/kernel_liteos_m/commits/16003604a948d081151ca4fcf0cfeea91c9e1960))
-* fix misspell in comments ([4572814](https://gitee.com/openharmony/kernel_liteos_m/commits/457281427ba286e24386d7916c4bc81f112f1c60))
-* fix NULL UNUSED redefined issue ([765bd55](https://gitee.com/openharmony/kernel_liteos_m/commits/765bd551990e906f457ec1145aea4f2bf5856547))
-* fix OS_TASK_STACK_PROTECT_SIZE undeclared error ([2a5a515](https://gitee.com/openharmony/kernel_liteos_m/commits/2a5a515f50a0f344d416218046bf0880facfb97c)), closes [#I4C5RW](https://gitee.com/openharmony/kernel_liteos_m/issues/I4C5RW)
-* fix print format compilation warning ([ef12c89](https://gitee.com/openharmony/kernel_liteos_m/commits/ef12c89c7a79791665125a0b7391f9e533a06a0f))
-* fix readme link issue ([9e332c6](https://gitee.com/openharmony/kernel_liteos_m/commits/9e332c69a5813027575786424b78f0ae2f9a4c5a))
-* fix some typo issues ([f6b8cab](https://gitee.com/openharmony/kernel_liteos_m/commits/f6b8cab2539e4d1ee9e47ab8e3eb12f1630f7393))
-* fix typo in comment ([811d3fa](https://gitee.com/openharmony/kernel_liteos_m/commits/811d3fae8a39686a1c66dfd61c897b7fd3fac2ac))
-* fix typos ([191644e](https://gitee.com/openharmony/kernel_liteos_m/commits/191644e4412fccb7142cfcd34316ad8e2d24fcdf))
-* Fixed a spelling error in FS_LOCK_TIMEOUT_SEC. ([42dc308](https://gitee.com/openharmony/kernel_liteos_m/commits/42dc3083693be13c5fa8f2ad8213245465e28adf)), closes [#I3TL66](https://gitee.com/openharmony/kernel_liteos_m/issues/I3TL66)
-* include file log_config.h in los_mpu.c ([1932d71](https://gitee.com/openharmony/kernel_liteos_m/commits/1932d714a589c9e87258d7c8ed647b6110bde543))
-* L0 GN compilation problem ([2f9bfcc](https://gitee.com/openharmony/kernel_liteos_m/commits/2f9bfcc6ee436ee3568d0c8158a8e43c9ef02623)), closes [I3ORHS](https://gitee.com/openharmony/kernel_liteos_m/issues/I3ORHS)
-* l0 shell adapt new master ([fd2227e](https://gitee.com/openharmony/kernel_liteos_m/commits/fd2227e5c858c840f63629c27e559580e1cbdf2f))
-* littlefs inappropriate return value and errno ([452f364](https://gitee.com/openharmony/kernel_liteos_m/commits/452f36403dd4376572d8b52352d0d8129a4617e4)), closes [I3YIVT](https://gitee.com/openharmony/kernel_liteos_m/issues/I3YIVT)
-* littlefs三方源码采用GN编译修改上库 ([bdb614b](https://gitee.com/openharmony/kernel_liteos_m/commits/bdb614bc2b82011d77c7c8ffb95e415d2640d19d))
-* LOS_QueueInfoGet函数统计等待读写任务有误 ([215a1f6](https://gitee.com/openharmony/kernel_liteos_m/commits/215a1f6dc06cf2348c5875f7b05193b26ec17dde)), closes [#I4C6P2](https://gitee.com/openharmony/kernel_liteos_m/issues/I4C6P2)
-* los_swtmr.h不满足自包含要求对los_config.h存在依赖，但未包含los_config.h ([ad8e96a](https://gitee.com/openharmony/kernel_liteos_m/commits/ad8e96a00f2fcaebe57feae4e3f23f99d7f1d066)), closes [#I40DHM](https://gitee.com/openharmony/kernel_liteos_m/issues/I40DHM)
-* **mbedtls:** mbedtls l0 support ([761b860](https://gitee.com/openharmony/kernel_liteos_m/commits/761b86096c3cf5642c95e556c11a45a3d5f413e4))
-* misspell ([30578a6](https://gitee.com/openharmony/kernel_liteos_m/commits/30578a6a68a0d3a203b9a00e7bd1a946356d13d2))
-* modify event API description ([9481f1d](https://gitee.com/openharmony/kernel_liteos_m/commits/9481f1d8406960b8b859cc5a84b3831eadaf040c))
-* modify the return type of LOS_IntLock from UINTPTR to UINT32. ([bcc34e2](https://gitee.com/openharmony/kernel_liteos_m/commits/bcc34e22ede5aeccea63aba9f9ce3cb9aa92cbeb))
-* modify type INLNIE ([294a6d2](https://gitee.com/openharmony/kernel_liteos_m/commits/294a6d246b6a1f7cba8ce1bc4eeb9ae11f17a003))
-* Mutex锁释放后，无任务持有的情况下，owner未清空 ([c136cfd](https://gitee.com/openharmony/kernel_liteos_m/commits/c136cfdf973ae0068154606afa3a23858822c347)), closes [#I40OC8](https://gitee.com/openharmony/kernel_liteos_m/issues/I40OC8)
-* M核littlefs当文件open失败时，需要回收fd，否则会有fd泄露 ([b458e12](https://gitee.com/openharmony/kernel_liteos_m/commits/b458e12ed54905db6667f9d5db1410f94a3d6c71)), closes [#I3XU6R](https://gitee.com/openharmony/kernel_liteos_m/issues/I3XU6R)
-* m核上littlefs新增错误码功能 ([a062378](https://gitee.com/openharmony/kernel_liteos_m/commits/a06237863121816fa6421aed233446a3fa4e2665)), closes [#I3UVMQ](https://gitee.com/openharmony/kernel_liteos_m/issues/#I3UVMQ)
-* net compile fix ([299813c](https://gitee.com/openharmony/kernel_liteos_m/commits/299813cdb43ae1e24200f0a6b006e04e4d4fcb05))
-* open shell & fix qemu compile ([911a767](https://gitee.com/openharmony/kernel_liteos_m/commits/911a767992ee540a96ee9f67e0b87195656c3eab))
-* ping cmd compile fail ([ae05de3](https://gitee.com/openharmony/kernel_liteos_m/commits/ae05de3ffda86d312d33b2e38f237dd76daf4949))
-* protect from accssing NULL pointer, access g_handle after fslock ([bc7a914](https://gitee.com/openharmony/kernel_liteos_m/commits/bc7a914bce1b227a4f57265d5ecc3f82d78533e7)), closes [#I3UCX3](https://gitee.com/openharmony/kernel_liteos_m/issues/I3UCX3)
-* remove changelog in README ([37ef8ca](https://gitee.com/openharmony/kernel_liteos_m/commits/37ef8ca7ae73bf78f56dfef36c48bcd790afb6ff)), closes [#I3ZECY](https://gitee.com/openharmony/kernel_liteos_m/issues/I3ZECY)
-* remove libsec_kernel ([1144b75](https://gitee.com/openharmony/kernel_liteos_m/commits/1144b75f3ff9ce9e8fa114cf614d3deade8ac7c2))
-* remove project files ([4ad01ce](https://gitee.com/openharmony/kernel_liteos_m/commits/4ad01ced93684e5c7ba144ca267f8fcc2fe03105))
-* remove targets project files ([f39da5a](https://gitee.com/openharmony/kernel_liteos_m/commits/f39da5a6da59a3b1291c6b9ef7c50e6185df5ea1))
-* risc-v 锁中断在调度后失效 ([70f3aa1](https://gitee.com/openharmony/kernel_liteos_m/commits/70f3aa1c112e949d9af8e0245af5879140adefba)), closes [#I42OLJ](https://gitee.com/openharmony/kernel_liteos_m/issues/I42OLJ)
-* riscv_nuclei 编译失败 ([d3fb23c](https://gitee.com/openharmony/kernel_liteos_m/commits/d3fb23cca06580b6e447a9476a9c16643c4ea8fe)), closes [#I41PQJ](https://gitee.com/openharmony/kernel_liteos_m/issues/I41PQJ)
-* rollback resources when opendir failed ([82fad6c](https://gitee.com/openharmony/kernel_liteos_m/commits/82fad6c36f183de93d936dd2007b899c2932bcee)), closes [#I3Y577](https://gitee.com/openharmony/kernel_liteos_m/issues/I3Y577)
-* Scheduling module code to join GN compilation. ([8bf166b](https://gitee.com/openharmony/kernel_liteos_m/commits/8bf166b418ce1a6c027dc304d45fc9431923764c)), closes [#I3OA95](https://gitee.com/openharmony/kernel_liteos_m/issues/I3OA95)
-* The hook module fails to compile under the c99 compilation standard. ([a078c30](https://gitee.com/openharmony/kernel_liteos_m/commits/a078c3086fa47e05e3ffdc4e94ca202284a1487b)), closes [#I3S4ME](https://gitee.com/openharmony/kernel_liteos_m/issues/I3S4ME)
-* tick 动态化计算优化，减小中断执行时间对系统总体时间的影响，保证软件定时器的响应精度。 ([2118c84](https://gitee.com/openharmony/kernel_liteos_m/commits/2118c84616cce5b5d4569d5a82a4d5de02af1e1c)), closes [#I3YGP1](https://gitee.com/openharmony/kernel_liteos_m/issues/I3YGP1)
-* timer qemu 头文件缺失 ([12fed74](https://gitee.com/openharmony/kernel_liteos_m/commits/12fed747226c377c656b8acb8346154627845b6f))
-* update according to review comments ([4dc0d31](https://gitee.com/openharmony/kernel_liteos_m/commits/4dc0d313d1b4a39ebb62156d0bb6429ebb8b996d))
-* update arch_spec.md ([cf43988](https://gitee.com/openharmony/kernel_liteos_m/commits/cf439885234e0955bab09834b3b876d627c81605))
-* update doc usage ([5c19fd4](https://gitee.com/openharmony/kernel_liteos_m/commits/5c19fd4beca15a8b7faad847a13943a9abfe3c8c))
-* update document description ([954c2fc](https://gitee.com/openharmony/kernel_liteos_m/commits/954c2fcfb531d0da1dcc6354a0c0b14335566ed7))
-* update macro to config item ([be57ece](https://gitee.com/openharmony/kernel_liteos_m/commits/be57ece9ce6200c8868164bc0bb2f26e3062cd37))
-* 以g_sysSchedStartTime是否为0判断时间轴是否生效存在极限场景导致调度时间不生效 ([509cf59](https://gitee.com/openharmony/kernel_liteos_m/commits/509cf59befb40839a376be31958d615f066c66fd)), closes [#I45HP5](https://gitee.com/openharmony/kernel_liteos_m/issues/I45HP5)
-* 修复littlefs的多分区挂载时，对pathname的处理逻辑异常 ([b55cfc1](https://gitee.com/openharmony/kernel_liteos_m/commits/b55cfc1ba7fc470b876c555ac7d3be0aa1d3d363)), closes [#I3WWFA](https://gitee.com/openharmony/kernel_liteos_m/issues/I3WWFA)
-* 修复littlefs编译fs.c缺少头文件件依赖配置+若干musl库的缺失问题+多分区规格宏配置问题 ([7259289](https://gitee.com/openharmony/kernel_liteos_m/commits/7259289bd98a743f596060bc607f77ab8f149129)), closes [#I3VT11](https://gitee.com/openharmony/kernel_liteos_m/issues/I3VT11)
-* 修复M核littlefs GN编译的若干错误 ([d77828e](https://gitee.com/openharmony/kernel_liteos_m/commits/d77828e206f3324424c3b1372332828a0afb84c2))
-* 修复M核上musl库缺失strdup,c的问题 ([139f83a](https://gitee.com/openharmony/kernel_liteos_m/commits/139f83af391a4f5e64ab0fccbd783dd651b87e6a)), closes [#I3VZSI](https://gitee.com/openharmony/kernel_liteos_m/issues/I3VZSI)
-* 修复QUEUE_INFO_S中waitReadTask无法保存大于32的任务编号 ([704cca9](https://gitee.com/openharmony/kernel_liteos_m/commits/704cca97b17972d1640fd33b1fa0b5917bb92b19)), closes [#I41N78](https://gitee.com/openharmony/kernel_liteos_m/issues/I41N78)
-* 修复task命令格式错误，增加copyright ([ad15bbd](https://gitee.com/openharmony/kernel_liteos_m/commits/ad15bbd6a4d298aabc05b26d7838de6425dbc5c5))
-* 修复timer_settime只设置第一次到期时间时，到期时间不准的缺陷 ([a5f4e37](https://gitee.com/openharmony/kernel_liteos_m/commits/a5f4e37e535bff39a333c469e2f1bf1817216fe8)), closes [#I3TCHA](https://gitee.com/openharmony/kernel_liteos_m/issues/I3TCHA)
-* 修复timer_settime只设置第一次到期时间时，到期时间不准的缺陷 ([e4b5d4e](https://gitee.com/openharmony/kernel_liteos_m/commits/e4b5d4ebe9677d49d490fe74e5ac33c4a29435a2)), closes [#I3TCHA](https://gitee.com/openharmony/kernel_liteos_m/issues/I3TCHA)
-* 修复不规范的copyright ([2d9bbd2](https://gitee.com/openharmony/kernel_liteos_m/commits/2d9bbd2769e71e7b464bd22fc335999dd8000682)), closes [#I3SPJ1](https://gitee.com/openharmony/kernel_liteos_m/issues/I3SPJ1)
-* 修复中断操作接口头文件位置变更，导致的编译错误 ([013a953](https://gitee.com/openharmony/kernel_liteos_m/commits/013a953926ca7cefd8a2f7c74d23c36c49765b59)), closes [#I4665Z](https://gitee.com/openharmony/kernel_liteos_m/issues/I4665Z)
-* 修复文档链接失效问题 ([5d53c84](https://gitee.com/openharmony/kernel_liteos_m/commits/5d53c848124319a95f509b56ba001357c6dd8b05)), closes [#I4529I](https://gitee.com/openharmony/kernel_liteos_m/issues/I4529I)
-* 内核模块编译增加-Werror编译选项，且清除内核编译告警 ([3798091](https://gitee.com/openharmony/kernel_liteos_m/commits/3798091d87441ea445ec642de57e036dbbc8370e)), closes [#I46E6S](https://gitee.com/openharmony/kernel_liteos_m/issues/I46E6S)
-* 删除MQ内冗余的重复宏定义 ([6d72916](https://gitee.com/openharmony/kernel_liteos_m/commits/6d7291660ad04682f05850876f81dfd0cba8ea6b)), closes [#I3U5QQ](https://gitee.com/openharmony/kernel_liteos_m/issues/I3U5QQ)
-* 删除延时节点后，存在时间无法有效刷新的场景 ([0a87c04](https://gitee.com/openharmony/kernel_liteos_m/commits/0a87c04d58d11da2082470698de0760d72259533)), closes [#I45I9Y](https://gitee.com/openharmony/kernel_liteos_m/issues/I45I9Y)
-* 在内核初始化前期启动tick timer ([b3841ed](https://gitee.com/openharmony/kernel_liteos_m/commits/b3841ed1ddbfb3359c7a0ceca04fc0f645d440c3)), closes [#I410F0](https://gitee.com/openharmony/kernel_liteos_m/issues/I410F0)
-* 增加MPU功能的开关宏，默认关闭 ([9709d29](https://gitee.com/openharmony/kernel_liteos_m/commits/9709d29b87a3888412ffda586e16eba86adccfe7)), closes [#I3WE0S](https://gitee.com/openharmony/kernel_liteos_m/issues/I3WE0S)
-* 宏LOSCFG_SUPPORT_FATFS在fs.c中存在使用问题，导致无fatfs的情况下，编译出错 ([c1614ce](https://gitee.com/openharmony/kernel_liteos_m/commits/c1614ce2b4d4dfcda9532cbeeff25ad7a6558196)), closes [#I44XNR](https://gitee.com/openharmony/kernel_liteos_m/issues/I44XNR)
-* 延时队列为NULL时，返回的响应时间为64位最大值，导致无法更新tick timer的响应周期 ([bcec32e](https://gitee.com/openharmony/kernel_liteos_m/commits/bcec32e389634097102a203ee7e937ed3193c984)), closes [#I3W1LF](https://gitee.com/openharmony/kernel_liteos_m/issues/I3W1LF)
-* 支持smoke 测试用例 ([3ad5942](https://gitee.com/openharmony/kernel_liteos_m/commits/3ad5942301a1094a2c6b6ffee280cf09cfdb2a88)), closes [#I424RX](https://gitee.com/openharmony/kernel_liteos_m/issues/I424RX)
-* 新增函数regcomp,regfree和regexec支持 ([86d5544](https://gitee.com/openharmony/kernel_liteos_m/commits/86d5544a3fd5f41f7f2abe3b143e9f1dc9b430f8)), closes [#I3U9LE](https://gitee.com/openharmony/kernel_liteos_m/issues/I3U9LE)
-* 清理残留无效的trace代码 ([3c48951](https://gitee.com/openharmony/kernel_liteos_m/commits/3c489518576583ab6bf0d581810ef0a02b6ccd51)), closes [#I3ZMB4](https://gitee.com/openharmony/kernel_liteos_m/issues/I3ZMB4)
-* 解决arm9编译冲突问题 ([c1a6245](https://gitee.com/openharmony/kernel_liteos_m/commits/c1a624536887fef44fed37134638bf40191b9aae)), closes [#I420PQ](https://gitee.com/openharmony/kernel_liteos_m/issues/I420PQ)
-* 调度过程低概率触发OsSchedTaskEnQueue断言，导致系统异常 ([e5e9289](https://gitee.com/openharmony/kernel_liteos_m/commits/e5e9289a08cf1db71c09647b71a864f5a1f8a4a2)), closes [#I3VX9Y](https://gitee.com/openharmony/kernel_liteos_m/issues/I3VX9Y)
-* 调整hook类型和位置，方便调试 ([369320d](https://gitee.com/openharmony/kernel_liteos_m/commits/369320de3710486f252c55c522e8c06e19541b77)), closes [#I3TGZS](https://gitee.com/openharmony/kernel_liteos_m/issues/I3TGZS)
-
-
-### Features
-
-* add cmsis ThreadFlags support ([cea551e](https://gitee.com/openharmony/kernel_liteos_m/commits/cea551e99ea0da8eefbaa826de2f68813252fb83))
-* add deps to musl and securec ([bfa25fc](https://gitee.com/openharmony/kernel_liteos_m/commits/bfa25fcaa355c28a6139f683c4453f677e23abd7))
-* add file type support for LfsStat ([ceaed2d](https://gitee.com/openharmony/kernel_liteos_m/commits/ceaed2dc86de2ed242aab4dd02c1f34e064583b3)), closes [#I3ZCDR](https://gitee.com/openharmony/kernel_liteos_m/issues/I3ZCDR)
-* add interface of dhcp_is_bound ([84a180d](https://gitee.com/openharmony/kernel_liteos_m/commits/84a180d585686cda693bf8c6ed6b86f7c5dd5eee)), closes [#I46W08](https://gitee.com/openharmony/kernel_liteos_m/issues/I46W08)
-* add L0 shell function ([97283b7](https://gitee.com/openharmony/kernel_liteos_m/commits/97283b7c5dd44b266e94fcf0f5d21e63ee1ec7e0))
-* add LOS_ListHeadInsert function ([430b186](https://gitee.com/openharmony/kernel_liteos_m/commits/430b186be7ec1554a29a6d509188eb877d796a7e)), closes [#I3TAQA](https://gitee.com/openharmony/kernel_liteos_m/issues/I3TAQA)
-* **kernel:** 补充获取最高、最低优先级接口 ([c24c38b](https://gitee.com/openharmony/kernel_liteos_m/commits/c24c38b084c13a2cdc5616f88bb5f63153600c28)), closes [#I42HM7](https://gitee.com/openharmony/kernel_liteos_m/issues/I42HM7)
-* L0 armquem 剥离工具链 ([67d7455](https://gitee.com/openharmony/kernel_liteos_m/commits/67d74559d1bb3820bd51da2e2bf43e41e1224314))
-* L0 支持Trace ([56c93a6](https://gitee.com/openharmony/kernel_liteos_m/commits/56c93a641b3c7a3d1ef9293ee3c95cccb559191f)), closes [#I41Y9Y](https://gitee.com/openharmony/kernel_liteos_m/issues/I41Y9Y)
-* L0 支持低功耗框架 ([558ce14](https://gitee.com/openharmony/kernel_liteos_m/commits/558ce14becab05102497afca90a43d89abaf5531)), closes [#I3UDNV](https://gitee.com/openharmony/kernel_liteos_m/issues/I3UDNV)
-* L0 测试用例支持risc-v qemu 编译运行 ([2dd6c08](https://gitee.com/openharmony/kernel_liteos_m/commits/2dd6c080daab52eaf61e5eefe7b581190670e8a7)), closes [#I3YILG](https://gitee.com/openharmony/kernel_liteos_m/issues/I3YILG)
-* **liteos_m:** support backtrace for riscv ([ca1792a](https://gitee.com/openharmony/kernel_liteos_m/commits/ca1792aa4b5a85ca4ea6e41b265858c6b24a6897)), closes [#I3RVXY](https://gitee.com/openharmony/kernel_liteos_m/issues/I3RVXY)
-* los_memory.c代码重复率处理 ([475db62](https://gitee.com/openharmony/kernel_liteos_m/commits/475db62db1ac285fc6cab91f09af618870269580)), closes [#I44WNU](https://gitee.com/openharmony/kernel_liteos_m/issues/I44WNU)
-* M33平台支持GCC环境的Trustzone ([d469da2](https://gitee.com/openharmony/kernel_liteos_m/commits/d469da29c6d316640eaa7865f98ad8d6e2eb6d44)), closes [#I3Y85I](https://gitee.com/openharmony/kernel_liteos_m/issues/I3Y85I)
-* provide getifaddrs for liteos_m ([948501a](https://gitee.com/openharmony/kernel_liteos_m/commits/948501ac73e7887f4585eca156ad760acc2a3b1f)), closes [#I400S5](https://gitee.com/openharmony/kernel_liteos_m/issues/I400S5)
-* risc-v gn 编译框架添加汇编编译选项 ([76dc343](https://gitee.com/openharmony/kernel_liteos_m/commits/76dc343c888ec4e65eba43feb49921111b144640)), closes [#I3YS5Y](https://gitee.com/openharmony/kernel_liteos_m/issues/I3YS5Y)
-* Support arm9 ([6d7c9df](https://gitee.com/openharmony/kernel_liteos_m/commits/6d7c9dfe597affb260e8bd74fa606b6d68c2b49a)), closes [#I3WLCN](https://gitee.com/openharmony/kernel_liteos_m/issues/I3WLCN)
-* Support arm9 fiq swi mode and using system mode. ([97b5b08](https://gitee.com/openharmony/kernel_liteos_m/commits/97b5b0837be4b8df1381af29a6f650f243322840)), closes [#I3WLCN](https://gitee.com/openharmony/kernel_liteos_m/issues/I3WLCN)
-* support non-continuous memory regions ([0facb0c](https://gitee.com/openharmony/kernel_liteos_m/commits/0facb0c0179f29a08b037655bbe691c98384dc84)), closes [#I43XOP](https://gitee.com/openharmony/kernel_liteos_m/issues/I43XOP)
-* 完善m核qemu串口驱动，支持shell输入 ([c4dc5ab](https://gitee.com/openharmony/kernel_liteos_m/commits/c4dc5ab0f8b5caae55efdbedf59ab07f5006f6c2)), closes [#I46N7F](https://gitee.com/openharmony/kernel_liteos_m/issues/I46N7F)
-* 按任务统计已经alloc的内存大小 ([53117f9](https://gitee.com/openharmony/kernel_liteos_m/commits/53117f9f47a8dd3023e83dc0cc0de224eab9719f)), closes [#I44WNU](https://gitee.com/openharmony/kernel_liteos_m/issues/I44WNU)
-* 支持native动态加载组件 ([d753834](https://gitee.com/openharmony/kernel_liteos_m/commits/d75383400efe5d9ca0ae4093e4f2e65fee03024b)), closes [#I418HJ](https://gitee.com/openharmony/kernel_liteos_m/issues/I418HJ)
-* 新增LOSCFG_BASE_CORE_TSK_SWITCH_HOOK 宏定义配置 ([39efd6f](https://gitee.com/openharmony/kernel_liteos_m/commits/39efd6fb30ee7dc9159811f5d37dffcdfe81bae0)), closes [#I40Q9O](https://gitee.com/openharmony/kernel_liteos_m/issues/I40Q9O)
-* 新增ROM/RAM分析工具 ([ee3403d](https://gitee.com/openharmony/kernel_liteos_m/commits/ee3403deaf24dc612b51354f31f795fb0b9a49b5))
-* 补充fs相关函数用例 ([2a95af5](https://gitee.com/openharmony/kernel_liteos_m/commits/2a95af5bf1b412de27b4518d0abf7c335366d4d7)), closes [#I3UQ4F](https://gitee.com/openharmony/kernel_liteos_m/issues/I3UQ4F)
-* 解决fclose等函数工具链重定义问题 ([b244ad4](https://gitee.com/openharmony/kernel_liteos_m/commits/b244ad4ad0da8d151b69071fdd6db808c91f85a5)), closes [#I3UG6O](https://gitee.com/openharmony/kernel_liteos_m/issues/I3UG6O)
-
-
-### BREAKING CHANGES
-
-* 新增4个对外接口，声明在los_dynlink.h文件中，分别为：
-(1) LOS_DynlinkInit: 动态加载模块初始化。
-(2) LOS_SoLoad: 加载指定路径的共享库。
-(3) LOS_FindSym: 根据共享库句柄查找指定符号。
-(4) LOS_SoUnload: 卸载共享库。
-* 1.新增一系列trace的对外API，位于los_trace.h中.
-LOS_TRACE_EASY简易插桩
-LOS_TRACE标准插桩
-LOS_TraceInit配置Trace缓冲区的地址和大小
-LOS_TraceStart开启事件记录
-LOS_TraceStop停止事件记录
-LOS_TraceRecordDump输出Trace缓冲区数据
-LOS_TraceRecordGet获取Trace缓冲区的首地址
-LOS_TraceReset清除Trace缓冲区中的事件
-LOS_TraceEventMaskSet设置事件掩码，仅记录某些模块的事件
-LOS_TraceHwiFilterHookReg注册过滤特定中断号事件的钩子函数
-* 1.原调度中基于tick timer的低功耗扩展和当前的pm模块合并，删除原对外接口LOS_SchedSleepInit,
-　变为pm模块统一提供的LOS_PmRegistered接口.
-2.原来在arch los_timer.h下提供的低功耗模式为枚举LOS_SysSleepEnum，其中OS_SYS_NORMAL_SLEEP
-  和OS_SYS_DEEP_SLEEP不符合对外定义，统一修改为LOS_SYS_NORMAL_SLEEP和LOS_SYS_DEEP_SLEEP,
-  并移至los_pm.h中.
-3.VOID HalEnterSleep(LOS_SysSleepEnum sleep) 变更为UINT32 HalEnterSleep(VOID).
-
-
-
--- a/170
+++ b/170
@ -39,9 +39,19 @@ choice
 config COMPILER_GCC
    bool "GCC"

+config CROSS_COMPILE
+    string "GCC cross-compile toolchain prefix"
+    depends on COMPILER_GCC
+    default "arm-none-eabi-" if ARCH_ARM_AARCH32
+
 config COMPILER_CLANG_LLVM
    bool "Clang"

+config LLVM_TARGET
+    string "Clang LLVM target"
+    depends on COMPILER_CLANG_LLVM
+    default "arm-liteos-ohos" if ARCH_ARM_AARCH32
+
 config COMPILER_ICCARM
    bool "ICCARM"

@ -86,6 +96,15 @@ config PLATFORM
    string
    default "virt"            if PLATFORM_QEMU_ARM_VIRT_CM7 || PLATFORM_QEMU_ARM_VIRT_CM4 || PLATFORM_QEMU_ARM_VIRT_CM55 || PRODUCT_QEMU_RISCV32_VIRT || PLATFORM_QEMU_CSKY_SMARTL || PLATFORM_QEMU_XTENSA_ESP32

+config PRODUCT_NAME
+    string
+    default "arm_virt" if PRODUCT_QEMU_ARM
+    default "arm_mps2_an386" if PRODUCT_QEMU_ARM_MPS2_AN386
+    default "arm_mps3_an547" if PRODUCT_QEMU_ARM_MPS3_AN547
+    default "riscv32_virt" if PRODUCT_QEMU_RISCV32_VIRT
+    default "csky_smartl_e802" if PRODUCT_QEMU_CSKY_SMARTL_E802
+    default "xtensa_esp32" if PRODUCT_QEMU_XTENSA_ESP32
+
 config DEVICE_COMPANY
    string
    default "qemu" if PLATFORM_QEMU_ARM_VIRT_CM7 || PLATFORM_QEMU_ARM_VIRT_CM4 || PLATFORM_QEMU_ARM_VIRT_CM55 || PRODUCT_QEMU_RISCV32_VIRT || PLATFORM_QEMU_CSKY_SMARTL || PLATFORM_QEMU_XTENSA_ESP32
@ -144,9 +163,24 @@ choice
    help
      Select your target board.

+config PRODUCT_QEMU_ARM
+    bool "arm_virt" if PLATFORM_QEMU_ARM_VIRT_CM7
+
+config PRODUCT_QEMU_ARM_MPS2_AN386
+    bool "arm_mps2_an386" if PLATFORM_QEMU_ARM_VIRT_CM4
+
+config PRODUCT_QEMU_ARM_MPS3_AN547
+    bool "arm_mps3_an547" if PLATFORM_QEMU_ARM_VIRT_CM55
+
 config PRODUCT_QEMU_RISCV32_VIRT
    bool "riscv32_virt" if PLATFORM_QEMU_RISCV32_VIRT

+config PRODUCT_QEMU_CSKY_SMARTL_E802
+    bool "csky_smartl_e802" if PLATFORM_QEMU_CSKY_SMARTL
+
+config PRODUCT_QEMU_XTENSA_ESP32
+    bool "xtensa_esp32" if PLATFORM_QEMU_XTENSA_ESP32
+
 endchoice


@ -185,6 +219,12 @@ endchoice

 orsource "../../device/soc/*/Kconfig.liteos_m.soc"

+config QUICK_START
+    bool "Enable QUICK_START"
+    default n
+    depends on DRIVERS && FS_VFS
+    help
+      Answer Y to enable LiteOS support quick start.
 endmenu

 ######################### config options of kernel #####################
@ -303,6 +343,21 @@ config KERNEL_PM_IDLE
      Configuration item for low power frame tailoring.
      If you wish to build LiteOS with support for power management idle.

+config KERNEL_PM_TASK_PTIORITY
+    int "Power Management Task Priority"
+    default 1
+    range 1 31
+    depends on KERNEL_PM
+    help
+      Configuration item for priority of low-power task.
+
+config KERNEL_PM_TASK_STACKSIZE
+    int "Power Management Task Stack Size"
+    default 1024
+    depends on KERNEL_PM
+    help
+      Configuration item for stack size of low-power task.
+
 config KERNEL_PM_DEBUG
    bool "Power Management Debug"
    default n
@ -338,6 +393,17 @@ source "components/lms/Kconfig"

 endmenu

+######################### config options of lib ########################
+menu "Lib"
+config LIB_LIBC
+    bool "Enable Libc"
+    default y
+    help
+      Answer Y to enable libc for full code.
+
+endmenu
+
+
 ######################### config options of compatibility ##############
 menu "Compat"

@ -370,6 +436,43 @@ endmenu

 ######################## config options of debug ########################
 menu "Debug"
+config GDB
+    bool "Enable gdb functions"
+    default n
+    help
+      Answer Y to enable gdb functions.
+
+config PLATFORM_ADAPT
+    bool "Enable Os_adapt"
+    default y
+    help
+      Answer Y to add os_adapt.c to LiteOS.
+
+config ENABLE_OOM_LOOP_TASK
+    bool "Enable Oom loop task"
+    default n
+    depends on KERNEL_VM
+    help
+      Answer Y to enable oom loop kthread to check system out of memory.
+
+config DO_ALIGN
+    bool "Enable do align for hi3518e"
+    default y
+    depends on PLATFORM_HI3518EV200
+    help
+      Answer Y to enable do align for hi3518e.
+
+
+config ENABLE_MAGICKEY
+    bool "Enable MAGIC KEY"
+    default y
+    help
+      Answer Y to enable LiteOS Magic key.
+        ctrl + r : Magic key check switch;
+        ctrl + z : Show all magic op key;
+        ctrl + t : Show task information;
+        ctrl + p : System panic;
+        ctrl + e : Check system memory pool.

 config THUMB
    bool "Enable Thumb"
@ -378,6 +481,20 @@ config THUMB
    help
      Answer Y to build thumb version.  This will make LiteOS smaller.

+config PLATFORM_DVFS
+    bool "Enable Dvfs"
+    default n
+    depends on  COMPAT_LINUXKPI
+    help
+      Answer Y to enable LiteOS support dynamic voltage and frequency scaling feature for
+      low power consumption.
+
+config SAVE_EXCINFO
+    bool "Enable Saving Exception Information"
+    default n
+    help
+      Answer Y to enable LiteOS support saving exception information to storage medium.
+
 config DEBUG_VERSION
    bool "Enable a Debug Version"
    default y
@ -397,13 +514,26 @@ config DEBUG_KERNEL
      It also means you want to get queue, mutex, semaphore, memory debug information.
      That means you want a opposite behaviour compared to release version.

-config MUTEX_CREATE_TRACE
-    bool "Enable Mutex Trace Debugging"
+config DEBUG_QUEUE
+    bool "Enable Queue Debugging"
    default n
-    depends on ARCH_ARM
    depends on DEBUG_KERNEL
    help
-      Answer Y to enable debug mutex trace.
+      Answer Y to enable debug queue.
+
+config DEBUG_DEADLOCK
+    bool "Enable Mutex Deadlock Debugging"
+    default n
+    depends on DEBUG_KERNEL
+    help
+      Answer Y to enable debug mutex deadlock.
+
+config DEBUG_SEMAPHORE
+    bool "Enable Semaphore Debugging"
+    default n
+    depends on DEBUG_KERNEL
+    help
+      Answer Y to enable debug semaphore.

 config NET_LWIP_SACK_TFTP
    bool "Enable Tftp"
@ -419,6 +549,18 @@ config DEBUG_HOOK
    help
      Enable the kernel hook framework to support customized trace information capture.

+config SCHED_DEBUG
+    bool "Enable sched debug Feature"
+    default n
+    depends on DEBUG_VERSION
+    help
+      If you wish to build LiteOS with support for sched debug.
+
+config USER_INIT_DEBUG
+    bool "Enable user init Debug"
+    default n
+    depends on DEBUG_VERSION
+
 config SHELL_CMD_DEBUG
    bool "Enable shell cmd Debug"
    default n
@ -431,6 +573,13 @@ config DEBUG_TOOLS
    help
      Answer Y to enable LiteOS debug tools, include stackdump, hwidump, tasktrack.

+config USB_DEBUG
+    bool "Enable USB Debug"
+    default n
+    depends on SHELL && DRIVERS_USB && DEBUG_VERSION
+    help
+      Answer Y to enable LiteOS support usb debug.
+      use shell command to open the specified debug level print.
 config MEM_DEBUG
    bool "Enable MEM Debug"
    default n
@ -454,6 +603,13 @@ config MEM_WATERLINE
    default n
    depends on DEBUG_VERSION && MEM_DEBUG

+config VM_OVERLAP_CHECK
+    bool "Enable VM overlap check or not"
+    default n
+    depends on DEBUG_VERSION && MEM_DEBUG
+    help
+      Answer Y to enable vm overlap check.
+      
 config TASK_MEM_USED
    bool "Enable show task mem used or not"
    default n
@ -479,6 +635,12 @@ config SECURE_HEAP_SIZE
    int "TrustZone Heap Size (bytes)"
    default 2048
    depends on SECURE_TRUSTZONE
+config SECURE_STACK_DEFAULT_SIZE
+    int "TrustZone Stack Size (bytes)"
+    default 512
+    depends on SECURE_TRUSTZONE
+    help
+      The secure stack must be allocated before the task calls non-secure functions.
 config SECURE
    bool "Enable Security"
    default n
--- a/OAT.xml
+++ b/OAT.xml
@ -23,7 +23,6 @@
        <policylist>
            <policy name="projectPolicy" desc="">
                <policyitem type="copyright" name="Huawei Technologies Co., Ltd. All rights reserved." path=".*" desc="original liteos copyright"/>
-                <policyitem type="copyright" name="Hunan OpenValley Digital Industry Development Co., Ltd." path=".*" desc="Developed By OpenValley Digital Co., Ltd."/>
                <policyitem type="license" name="BSD-3-Clause" path=".*" desc="Liteos kernel use bsd3 license"/>
                <policyitem type="license" name="BSD-3-Clause" path=".*" desc="Liteos kernel use bsd3 license"/>
            </policy>
@ -67,9 +66,6 @@
                <!--filteritem type="filepath" name="projectroot/[a-zA-Z0-9]{20,}.sh" desc="Temp files"/-->
            </filefilter>
            <filefilter name="binaryFileTypePolicyFilter" desc="Filters for binary file policies">
-            <filteritem type="filepath"
-            name="figures/architecture-of-openharmony-the-liteos-cortex-m-kernel.png" desc="architecture-of-openharmony-the-liteos-cortex-m-kernel"/>
-            <filteritem type="filepath" name="figures/OpenHarmony-LiteOS-M核内核架构图.png" desc="内核驱动架构"/>
                <!--filteritem type="filename" name="*.uvwxyz" desc="Describe the reason for filtering scan results"/-->
                <!--filteritem type="filepath" name="abcdefg/.*.uvwxyz" desc="Describe the reason for filtering scan results"/-->
                <!--filteritem type="filepath" name="projectroot/[a-zA-Z0-9]{20,}.sh" desc="Temp files"/-->
--- a/README.md
+++ b/README.md
@ -35,7 +35,7 @@ The directory structure is as follows. For more details, see [arch_spec.md](arch
 │   ├── include          # APIs exposed externally
 │   ├── risc-v           # Code of the risc-v architecture
 │   │   ├── nuclei       # Code of the nuclei system technology risc-v architecture
-│   │   └── riscv32      # Code of the risc-v official common architecture
+│   │   └── riscv32      # Code of the risc-v architecture
 │   └── xtensa           # Code of the xtensa architecture
 │       └── lx6          # Code of the lx6 xtensa architecture
 ├── components           # Optional components
@ -78,7 +78,7 @@ The OpenHarmony LiteOS-M kernel build system is a modular build system based on

 ### Setting Up the Environment

-Before setting up the environment for a development board, you must set up the basic system environment for OpenHarmony first. The basic system environment includes the OpenHarmony build environment and development environment. For details, see [Setting Up Development Environment](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/Readme-EN.md).
+Before setting up the environment for a development board, you must set up the basic system environment for OpenHarmony first. The basic system environment includes the OpenHarmony build environment and development environment. For details, see [Setting Up Development Environment](https://gitee.com/openharmony/docs/blob/HEAD/en/device-dev/quick-start/quickstart-lite-env-setup.md).

 ### Obtaining the OpenHarmony Source Code

@ -108,7 +108,7 @@ The LiteOS-M kernel porting projects for specific development boards are provide

 ## Contribution<a name="section1371123476307"></a>

-[How to involve](https://gitee.com/openharmony/docs/blob/master/en/contribute/how-to-contribute.md)
+[How to involve](https://gitee.com/openharmony/docs/blob/HEAD/en/contribute/contribution.md)

 [Commit message spec](https://gitee.com/openharmony/kernel_liteos_m/wikis/Commit%20message%E8%A7%84%E8%8C%83)

@ -116,10 +116,12 @@ The LiteOS-M kernel porting projects for specific development boards are provide

 How to contribute a chip based on Liteos-M kernel:

-[Mini System SoC Porting Guide](https://gitee.com/openharmony/docs/blob/master/en/device-dev/porting/Readme-EN.md)
+[ Board-Level Directory Specifications](https://gitee.com/openharmony/docs/blob/HEAD/en/device-dev/porting/porting-chip-board-overview.md)
+
+[Mini System SoC Porting Guide](https://gitee.com/openharmony/docs/blob/HEAD/en/device-dev/porting/porting-minichip.md)

 ## Repositories Involved<a name="section1371113476307"></a>

-[Kernel Subsystem](https://gitee.com/openharmony/docs/blob/master/en/readme/kernel.md)
+[Kernel Subsystem](https://gitee.com/openharmony/docs/blob/HEAD/en/readme/kernel-subsystem.md)

 [kernel\_liteos\_m](https://gitee.com/openharmony/kernel_liteos_m/blob/master/README.md)
--- a/README_zh.md
+++ b/README_zh.md
@ -11,7 +11,7 @@

 OpenHarmony LiteOS-M内核是面向IoT领域构建的轻量级物联网操作系统内核，具有小体积、低功耗、高性能的特点，其代码结构简单，主要包括内核最小功能集、内核抽象层、可选组件以及工程目录等，分为硬件相关层以及硬件无关层，硬件相关层提供统一的HAL（Hardware Abstraction Layer）接口，提升硬件易适配性，不同编译工具链和芯片架构的组合分类，满足AIoT类型丰富的硬件和编译工具链的拓展。其架构图如图1所示：

-**图 1**  OpenHarmony LiteOS-M核内核架构图<a name="fig0865152210223"></a>
+**图 1**  OpenHarmony LiteOS-M核内核架构图<a name="fig0865152210223"></a>  
 ![](figures/OpenHarmony-LiteOS-M核内核架构图.png "OpenHarmony-LiteOS-M核内核架构图")

 ## 目录<a name="section161941989596"></a>
@ -77,7 +77,7 @@ LiteOS-M内核的编译构建系统是一个基于gn和ninja的组件化构建

 ### 搭建系统基础环境

-在搭建各个开发板环境前，需要完成OpenHarmony系统基础环境搭建。系统基础环境主要是指OpenHarmony的编译环境和开发环境，详细介绍请参考官方站点[开发环境准备](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/Readme-CN.md)。开发者需要根据环境搭建文档完成环境搭建。
+在搭建各个开发板环境前，需要完成OpenHarmony系统基础环境搭建。系统基础环境主要是指OpenHarmony的编译环境和开发环境，详细介绍请参考官方站点[开发环境准备](https://gitee.com/openharmony/docs/blob/HEAD/zh-cn/device-dev/quick-start/quickstart-lite-env-setup.md)。开发者需要根据环境搭建文档完成环境搭建。

 ### 获取OpenHarmony源码

@ -115,7 +115,11 @@ LiteOS-M内核移植的具体开发板的工程由社区开发者提供，可以

 如何基于Liteos-M内核贡献一款芯片:

-[轻量系统芯片移植指导](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/porting/Readme-CN.md)
+[板级目录规范](https://gitee.com/openharmony/docs/blob/HEAD/zh-cn/device-dev/porting/porting-chip-board-overview.md)
+
+[轻量系统芯片移植指导](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/porting/porting-minichip.md)
+
+[轻量系统芯片移植案例](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/porting/porting-minichip-cases.md)

 ## 相关仓<a name="section1371113476307"></a>

--- a/arch/Kconfig
+++ b/arch/Kconfig
@ -24,6 +24,27 @@ config ARCH_FPU_DISABLE
    help
      This option will bypass floating procedure in system.

+config ARCH_SECURE_MONITOR_MODE
+    bool "Run On Secure Monitor Mode"
+    default n
+    depends on ARCH_ARM_AARCH64
+    help
+      This option will make the system run on EL3.
+
+config ARCH_INTERRUPT_PREEMPTION
+    bool "Enable Interrupt Preemption"
+    default n
+    depends on ARCH_ARM_AARCH64
+    help
+      This option will support high priority interrupt preemption.
+
+config IRQ_USE_STANDALONE_STACK
+    bool "Use Interrupt Stack"
+    default y
+    depends on ARCH_ARM_AARCH64 || ARCH_ARM_AARCH32
+    help
+      This option will support using standalone interrupt stack.
+
 config ARCH_UNALIGNED_EXC
    bool "Enable Unaligned Exception"
    default y
--- a/arch/arm/BUILD.gn
+++ b/arch/arm/BUILD.gn
@ -1,5 +1,5 @@
 # Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2023 Huawei Device Co., Ltd. All rights reserved.
+# Copyright (c) 2020-2022 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,11 +34,10 @@ 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" ]
 }
--- a/arch/arm/arm9/gcc/los_arch_interrupt.h
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -32,7 +32,9 @@
 #ifndef _LOS_ARCH_INTERRUPT_H
 #define _LOS_ARCH_INTERRUPT_H

-#include "los_common_interrupt.h"
+#include "los_config.h"
+#include "los_compiler.h"
+#include "los_interrupt.h"

 #ifdef __cplusplus
 #if __cplusplus
@ -40,6 +42,14 @@ 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.
@ -56,6 +66,19 @@ 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.
@ -151,15 +174,19 @@ extern "C" {
 */
 #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
- * Hardware interrupt error code: Invalid interrupt operation function.
- *
- * Value: 0x0200090c
- *
- * Solution: Set a valid interrupt operation function
+ * @ingroup los_hwi
+ * Set interrupt vector table.
 */
-#define OS_ERRNO_HWI_OPS_FUNC_NULL            LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x0c)
+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_arch_interrupt
@ -180,6 +207,35 @@ extern "C" {
 */
 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
@ -269,6 +325,7 @@ typedef struct TagExcInfo {
    EXC_CONTEXT_S *context;
 } ExcInfo;

+extern UINT32 g_intCount;
 extern ExcInfo g_excInfo;

 #ifdef __cplusplus
--- a/arch/arm/arm9/gcc/los_interrupt.c
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -28,10 +28,12 @@
 * 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"
@ -40,6 +42,7 @@
 #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)
@ -52,8 +55,86 @@
 #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
@ -72,6 +153,10 @@ 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;
@ -79,28 +164,48 @@ 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;
 }

-STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
-{
-    (VOID)hwiPrio;
-    HwiUnmask(hwiNum);
-    return LOS_OK;
-}
-
-STATIC HwiControllerOps g_archHwiOps = {
+HwiControllerOps g_archHwiOps = {
    .enableIrq      = HwiUnmask,
    .disableIrq     = HwiMask,
    .getCurIrqNum   = HwiNumGet,
-    .createIrq      = HwiCreate,
 };

-HwiControllerOps *ArchIntOpsGet(VOID)
+inline UINT32 ArchIsIntActive(VOID)
 {
-    return &g_archHwiOps;
+    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;
 }

 /* ****************************************************************************
@ -159,6 +264,87 @@ 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)
 {
@ -325,14 +511,13 @@ 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)
-        hwiForm[val].pfnHook = HalHwiDefaultHandler;
-        hwiForm[val].uwParam = 0;
+        g_hwiForm[val].pfnHook = HalHwiDefaultHandler;
+        g_hwiForm[val].uwParam = 0;
 #else
-        hwiForm[val] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+        g_hwiForm[val] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
 #endif
    }

@ -375,3 +560,4 @@ UINT32 ArchIntUnLock(VOID)
                         : "memory");
    return intSave;
 }
+
--- a/arch/arm/common/los_common_interrupt.c
+++ b/arch/arm/common/los_common_interrupt.c
@ -1,324 +0,0 @@
-/*
- * 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)
-
-/* *
- * @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);
-}
--- a/arch/arm/common/los_common_interrupt.h
+++ b/arch/arm/common/los_common_interrupt.h
@ -1,123 +0,0 @@
-/*
- * 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)
-typedef struct {
-    HWI_PROC_FUNC pfnHandler;
-    VOID *pParm;
-} HWI_HANDLER_FUNC;
-
-/* *
- * @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 */
--- a/arch/arm/cortex-m3/keil/los_arch_interrupt.h
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -42,6 +42,14 @@ 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.
@ -58,6 +66,19 @@ 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.
@ -165,16 +186,6 @@ 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.
@ -301,6 +312,20 @@ 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.
@ -320,6 +345,25 @@ extern UINT32 _BootVectors[];
 */
 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.
@ -359,12 +403,17 @@ 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
@ -374,6 +423,14 @@ 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
@ -446,6 +503,7 @@ 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);
@ -610,6 +668,7 @@ typedef struct TagExcInfo {
 } ExcInfo;

 extern UINT32 g_curNestCount;
+extern UINT32 g_intCount;
 extern UINT8 g_uwExcTbl[32];
 extern ExcInfo g_excInfo;

--- a/arch/arm/cortex-m3/keil/los_interrupt.c
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -28,10 +28,12 @@
 * 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"
@ -41,6 +43,95 @@
 #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
@ -55,54 +146,99 @@ 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;
 }

-STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
-{
-    HwiSetPriority(hwiNum, hwiPrio);
-    HwiUnmask(hwiNum);
-    return LOS_OK;
-}
-
-STATIC HwiControllerOps g_archHwiOps = {
+HwiControllerOps g_archHwiOps = {
    .enableIrq      = HwiUnmask,
    .disableIrq     = HwiMask,
    .setIrqPriority = HwiSetPriority,
    .getCurIrqNum   = HwiNumGet,
    .triggerIrq     = HwiPending,
    .clearIrq       = HwiClear,
-    .createIrq      = HwiCreate,
 };

-HwiControllerOps *ArchIntOpsGet(VOID)
+inline UINT32 ArchIsIntActive(VOID)
 {
-    return &g_archHwiOps;
+    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;
 }

 /* ****************************************************************************
@ -161,6 +297,97 @@ 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)
@ -383,11 +610,6 @@ 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
@ -399,24 +621,23 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
    UINT32 index;
-    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
-    hwiForm[0] = 0;             /* [0] Top of Stack */
-    hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
+    g_hwiForm[0] = 0;             /* [0] Top of Stack */
+    g_hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
    for (index = 2; index < OS_VECTOR_CNT; index++) { /* 2: The starting position of the interrupt */
-        hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+        g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
    }
    /* Exception handler register */
-    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;
+    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;

    /* Interrupt vector table location */
-    SCB->VTOR = (UINT32)(UINTPTR)hwiForm;
+    SCB->VTOR = (UINT32)(UINTPTR)g_hwiForm;
 #endif
 #if (__CORTEX_M >= 0x03U) /* only for Cortex-M3 and above */
    NVIC_SetPriorityGrouping(OS_NVIC_AIRCR_PRIGROUP);
@ -434,3 +655,4 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)

    return;
 }
+
--- a/arch/arm/cortex-m3/keil/los_timer.c
+++ b/arch/arm/cortex-m3/keil/los_timer.c
@ -86,7 +86,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
    SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
    SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
+    NVIC_ClearPendingIRQ(SysTick_IRQn);
    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;

    return nextResponseTime;
--- a/arch/arm/cortex-m33/gcc/NTZ/los_arch_interrupt.h
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -32,7 +32,9 @@
 #ifndef _LOS_ARCH_INTERRUPT_H
 #define _LOS_ARCH_INTERRUPT_H

-#include "los_common_interrupt.h"
+#include "los_config.h"
+#include "los_compiler.h"
+#include "los_interrupt.h"

 #ifdef __cplusplus
 #if __cplusplus
@ -40,6 +42,14 @@ 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.
@ -56,17 +66,18 @@ extern "C" {
 #define OS_HWI_PRIO_LOWEST                    7
 #endif

+
 /* *
- * @ingroup los_arch_interrupt
- * AIRCR register priority group parameter .
+ * @ingroup  los_arch_interrupt
+ * Define the type of a hardware interrupt vector table function.
 */
-#define OS_NVIC_AIRCR_PRIGROUP                7
+typedef VOID (**HWI_VECTOR_FUNC)(void);

 /* *
 * @ingroup los_arch_interrupt
- * Boot interrupt vector table.
+ * Count of interrupts.
 */
-extern UINT32 _BootVectors[];
+extern UINT32 g_intCount;

 /* *
 * @ingroup los_arch_interrupt
@ -80,6 +91,18 @@ extern UINT32 _BootVectors[];
 */
 #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.
@ -87,7 +110,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)

@ -163,16 +186,6 @@ 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.
@ -299,6 +312,20 @@ 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.
@ -318,6 +345,25 @@ extern UINT32 _BootVectors[];
 */
 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.
@ -357,20 +403,34 @@ 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
@ -443,6 +503,7 @@ 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);
@ -606,9 +667,10 @@ typedef struct TagExcInfo {
    EXC_CONTEXT_S *context;
 } ExcInfo;

-extern ExcInfo g_excInfo;
 extern UINT32 g_curNestCount;
+extern UINT32 g_intCount;
 extern UINT8 g_uwExcTbl[32];
+extern ExcInfo g_excInfo;

 #define MAX_INT_INFO_SIZE       (8 + 0x164)

--- a/arch/arm/cortex-m33/gcc/NTZ/los_interrupt.c
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -28,10 +28,12 @@
 * 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,6 +44,84 @@
 #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
@ -57,54 +137,99 @@ 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;
 }

-STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
-{
-    HwiSetPriority(hwiNum, hwiPrio);
-    HwiUnmask(hwiNum);
-    return LOS_OK;
-}
-
-STATIC HwiControllerOps g_archHwiOps = {
+HwiControllerOps g_archHwiOps = {
    .enableIrq      = HwiUnmask,
    .disableIrq     = HwiMask,
    .setIrqPriority = HwiSetPriority,
    .getCurIrqNum   = HwiNumGet,
    .triggerIrq     = HwiPending,
    .clearIrq       = HwiClear,
-    .createIrq      = HwiCreate,
 };

-HwiControllerOps *ArchIntOpsGet(VOID)
+inline UINT32 ArchIsIntActive(VOID)
 {
-    return &g_archHwiOps;
+    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;
 }

 /* ****************************************************************************
@ -163,6 +288,97 @@ 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)
@ -396,24 +612,23 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
    UINT32 index;
-    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
-    hwiForm[0] = 0;             /* [0] Top of Stack */
-    hwiForm[1] = 0; /* [1] reset */
+    g_hwiForm[0] = 0;             /* [0] Top of Stack */
+    g_hwiForm[1] = 0; /* [1] reset */
    for (index = DEF_HANDLER_START_INDEX; index < OS_VECTOR_CNT; index++) {
-        hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+        g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
    }
    /* Exception handler register */
-    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;
+    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;

    /* Interrupt vector table location */
-    SCB->VTOR = (UINT32)(UINTPTR)hwiForm;
+    SCB->VTOR = (UINT32)(UINTPTR)g_hwiForm;
 #endif
 #if (__CORTEX_M >= 0x03U) /* only for Cortex-M3 and above */
    NVIC_SetPriorityGrouping(OS_NVIC_AIRCR_PRIGROUP);
@ -431,3 +646,4 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)

    return;
 }
+
--- a/arch/arm/cortex-m33/gcc/NTZ/los_timer.c
+++ b/arch/arm/cortex-m33/gcc/NTZ/los_timer.c
@ -85,7 +85,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
    SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
    SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
+    NVIC_ClearPendingIRQ(SysTick_IRQn);
    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
    return nextResponseTime;
 }
--- a/arch/arm/cortex-m33/gcc/TZ/non_secure/los_arch_interrupt.h
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -32,7 +32,9 @@
 #ifndef _LOS_ARCH_INTERRUPT_H
 #define _LOS_ARCH_INTERRUPT_H

-#include "los_common_interrupt.h"
+#include "los_config.h"
+#include "los_compiler.h"
+#include "los_interrupt.h"

 #ifdef __cplusplus
 #if __cplusplus
@ -40,6 +42,14 @@ 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.
@ -56,17 +66,18 @@ extern "C" {
 #define OS_HWI_PRIO_LOWEST                    7
 #endif

+
 /* *
- * @ingroup los_arch_interrupt
- * AIRCR register priority group parameter .
+ * @ingroup  los_arch_interrupt
+ * Define the type of a hardware interrupt vector table function.
 */
-#define OS_NVIC_AIRCR_PRIGROUP                7
+typedef VOID (**HWI_VECTOR_FUNC)(void);

 /* *
 * @ingroup los_arch_interrupt
- * Boot interrupt vector table.
+ * Count of interrupts.
 */
-extern UINT32 _BootVectors[];
+extern UINT32 g_intCount;

 /* *
 * @ingroup los_arch_interrupt
@ -80,6 +91,18 @@ extern UINT32 _BootVectors[];
 */
 #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.
@ -87,7 +110,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)

@ -163,16 +186,6 @@ 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.
@ -299,6 +312,20 @@ 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.
@ -318,6 +345,25 @@ extern UINT32 _BootVectors[];
 */
 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.
@ -357,20 +403,34 @@ 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
@ -443,6 +503,7 @@ 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);
@ -606,9 +667,10 @@ typedef struct TagExcInfo {
    EXC_CONTEXT_S *context;
 } ExcInfo;

-extern ExcInfo g_excInfo;
 extern UINT32 g_curNestCount;
+extern UINT32 g_intCount;
 extern UINT8 g_uwExcTbl[32];
+extern ExcInfo g_excInfo;

 #define MAX_INT_INFO_SIZE       (8 + 0x164)

--- a/arch/arm/cortex-m33/gcc/TZ/non_secure/los_interrupt.c
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -28,10 +28,12 @@
 * 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,6 +44,83 @@
 #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
@ -57,54 +136,100 @@ 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;
 }

-STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
-{
-    HwiSetPriority(hwiNum, hwiPrio);
-    HwiUnmask(hwiNum);
-    return LOS_OK;
-}
-
-STATIC HwiControllerOps g_archHwiOps = {
+HwiControllerOps g_archHwiOps = {
    .enableIrq      = HwiUnmask,
    .disableIrq     = HwiMask,
    .setIrqPriority = HwiSetPriority,
    .getCurIrqNum   = HwiNumGet,
    .triggerIrq     = HwiPending,
    .clearIrq       = HwiClear,
-    .createIrq      = HwiCreate,
 };

-HwiControllerOps *ArchIntOpsGet(VOID)
+inline UINT32 ArchIsIntActive(VOID)
 {
-    return &g_archHwiOps;
+    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;
 }

 /* ****************************************************************************
@ -163,6 +288,97 @@ 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)
@ -396,24 +612,23 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
    UINT32 index;
-    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
-    hwiForm[0] = 0; /* [0] Top of Stack */
-    hwiForm[1] = 0; /* [1] reset */
+    g_hwiForm[0] = 0; /* [0] Top of Stack */
+    g_hwiForm[1] = 0; /* [1] reset */
    for (index = DEF_HANDLER_START_INDEX; index < OS_VECTOR_CNT; index++) {
-        hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+        g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
    }
    /* Exception handler register */
-    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;
+    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;

    /* Interrupt vector table location */
-    SCB->VTOR = (UINT32)(UINTPTR)hwiForm;
+    SCB->VTOR = (UINT32)(UINTPTR)g_hwiForm;
 #endif
 #if (__CORTEX_M >= 0x03U) /* only for Cortex-M3 and above */
    NVIC_SetPriorityGrouping(OS_NVIC_AIRCR_PRIGROUP);
@ -431,3 +646,4 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)

    return;
 }
+
--- a/arch/arm/cortex-m33/gcc/TZ/non_secure/los_timer.c
+++ b/arch/arm/cortex-m33/gcc/TZ/non_secure/los_timer.c
@ -84,7 +84,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
    SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
    SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
+    NVIC_ClearPendingIRQ(SysTick_IRQn);
    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
    return nextResponseTime;
 }
--- a/arch/arm/cortex-m33/iar/NTZ/los_arch_interrupt.h
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -29,10 +29,12 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef _LOS_ARCH_INTERRUPT_H
-#define _LOS_ARCH_INTERRUPT_H
+#ifndef _LOS_EXC_H
+#define _LOS_EXC_H

-#include "los_common_interrupt.h"
+#include "los_config.h"
+#include "los_compiler.h"
+#include "los_interrupt.h"

 #ifdef __cplusplus
 #if __cplusplus
@ -41,7 +43,15 @@ extern "C" {
 #endif /* __cplusplus */

 /* *
- * @ingroup los_arch_interrupt
+ * @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
 * Highest priority of a hardware interrupt.
 */
 #ifndef OS_HWI_PRIO_HIGHEST
@ -49,50 +59,63 @@ extern "C" {
 #endif

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Lowest priority of a hardware interrupt.
 */
 #ifndef OS_HWI_PRIO_LOWEST
 #define OS_HWI_PRIO_LOWEST                    7
 #endif

-/* *
- * @ingroup los_arch_interrupt
- * AIRCR register priority group parameter .
- */
-#define OS_NVIC_AIRCR_PRIGROUP                7

 /* *
- * @ingroup los_arch_interrupt
- * Boot interrupt vector table.
+ * @ingroup  los_hwi
+ * Define the type of a hardware interrupt vector table function.
 */
-extern UINT32 _BootVectors[];
+typedef VOID (**HWI_VECTOR_FUNC)(void);

 /* *
- * @ingroup los_arch_interrupt
+ * @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_arch_interrupt
+ * @ingroup los_hwi
 * Count of M-Core interrupt vector.
 */
 #define OS_VECTOR_CNT                         (OS_SYS_VECTOR_CNT + OS_HWI_MAX_NUM)

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
+ * AIRCR register priority group parameter .
+ */
+#define OS_NVIC_AIRCR_PRIGROUP                7
+
+/* *
+ * @ingroup los_hwi
+ * Boot interrupt vector table.
+ */
+extern UINT32 _BootVectors[];
+
+/* *
+ * @ingroup los_hwi
 * 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_arch_interrupt
+ * @ingroup los_hwi
 * Hardware interrupt error code: Null hardware interrupt handling function.
 *
 * Value: 0x02000901
@ -102,7 +125,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_PROC_FUNC_NULL           LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x01)

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Hardware interrupt error code: Insufficient interrupt resources for hardware interrupt creation.
 *
 * Value: 0x02000902
@ -112,7 +135,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_CB_UNAVAILABLE           LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x02)

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Hardware interrupt error code: Insufficient memory for hardware interrupt initialization.
 *
 * Value: 0x02000903
@ -122,7 +145,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_NO_MEMORY                LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x03)

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Hardware interrupt error code: The interrupt has already been created.
 *
 * Value: 0x02000904
@ -132,7 +155,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_ALREADY_CREATED          LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x04)

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Hardware interrupt error code: Invalid interrupt priority.
 *
 * Value: 0x02000905
@ -143,7 +166,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_PRIO_INVALID             LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x05)

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Hardware interrupt error code: Incorrect interrupt creation mode.
 *
 * Value: 0x02000906
@ -154,7 +177,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_MODE_INVALID             LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x06)

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Hardware interrupt error code: The interrupt has already been created as a fast interrupt.
 *
 * Value: 0x02000907
@ -164,17 +187,7 @@ 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
+ * @ingroup los_hwi
 * SysTick control and status register.
 */
 #define OS_SYSTICK_CONTROL_REG                0xE000E010
@ -186,119 +199,133 @@ extern UINT32 _BootVectors[];
 #define OS_SYSTICK_CURRENT_REG                0xE000E018

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt Priority-Level Registers.
 */
 #define OS_NVIC_PRI_BASE                      0xE000E400

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt enable register for 0-31.
 */
 #define OS_NVIC_SETENA_BASE                   0xE000E100

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * interrupt pending register.
 */
 #define OS_NVIC_SETPEND_BASE                  0xE000E200

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt active register.
 */
 #define OS_NVIC_INT_ACT_BASE                  0xE000E300

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt disable register for 0-31.
 */
 #define OS_NVIC_CLRENA_BASE                   0xE000E180

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt control and status register.
 */
 #define OS_NVIC_INT_CTRL                      0xE000ED04

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Vector table offset register.
 */
 #define OS_NVIC_VTOR                          0xE000ED08

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Application interrupt and reset control register
 */
 #define OS_NVIC_AIRCR                         0xE000ED0C

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * System exception priority register.
 */
 #define OS_NVIC_EXCPRI_BASE                   0xE000ED18

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 1 :reset.
 */
 #define OS_EXC_RESET                          1

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 2 :Non-Maskable Interrupt.
 */
 #define OS_EXC_NMI                            2

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 3 :(hard)fault.
 */
 #define OS_EXC_HARD_FAULT                     3

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 4 :MemManage fault.
 */
 #define OS_EXC_MPU_FAULT                      4

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 5 :Bus fault.
 */
 #define OS_EXC_BUS_FAULT                      5

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 6 :Usage fault.
 */
 #define OS_EXC_USAGE_FAULT                    6

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 11 :SVCall.
 */
 #define OS_EXC_SVC_CALL                       11

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 12 :Debug monitor.
 */
 #define OS_EXC_DBG_MONITOR                    12

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 14 :PendSV.
 */
 #define OS_EXC_PEND_SV                        14

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * 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.
@ -319,7 +346,27 @@ extern UINT32 _BootVectors[];
 extern VOID HalInterrupt(VOID);

 /* *
- * @ingroup  los_arch_interrupt
+ * @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
 * @brief: Reset the vector table.
 *
 * @par Description:
@ -332,13 +379,13 @@ extern VOID HalInterrupt(VOID);
 *
 * @retval:None.
 * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
+ * <ul><li>los_hwi.h: the header file that contains the API declaration.</li></ul>
 * @see None.
 */
 extern VOID Reset_Handler(VOID);

 /* *
- * @ingroup  los_arch_interrupt
+ * @ingroup  los_hwi
 * @brief: Pended System Call.
 *
 * @par Description:
@ -352,25 +399,39 @@ extern VOID Reset_Handler(VOID);
 *
 * @retval:None.
 * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
+ * <ul><li>los_hwi.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
@ -439,10 +500,11 @@ 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);
@ -583,7 +645,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-M4 platform.
 *
 */
 typedef struct TagExcInfo {
@ -606,9 +668,10 @@ typedef struct TagExcInfo {
    EXC_CONTEXT_S *context;
 } ExcInfo;

-extern ExcInfo g_excInfo;
 extern UINT32 g_curNestCount;
+extern UINT32 g_intCount;
 extern UINT8 g_uwExcTbl[32];
+extern ExcInfo g_excInfo;

 #define MAX_INT_INFO_SIZE       (8 + 0x164)

@ -618,4 +681,4 @@ extern UINT8 g_uwExcTbl[32];
 #endif /* __cplusplus */
 #endif /* __cplusplus */

-#endif /* _LOS_ARCH_INTERRUPT_H */
+#endif /* _LOS_EXC_H */
--- a/arch/arm/cortex-m33/iar/NTZ/los_interrupt.c
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -29,10 +29,12 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include <stdarg.h>
+#include "los_interrupt.h"
 #include "securec.h"
-#include "los_context.h"
+#include <stdarg.h>
 #include "los_arch_interrupt.h"
+#include "los_context.h"
+#include "los_debug.h"
 #include "los_hook.h"
 #include "los_task.h"
 #include "los_sched.h"
@ -42,6 +44,93 @@
 #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
@ -56,54 +145,100 @@ 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;
 }

-STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
-{
-    HwiSetPriority(hwiNum, hwiPrio);
-    HwiUnmask(hwiNum);
-    return LOS_OK;
-}
-
-STATIC HwiControllerOps g_archHwiOps = {
+HwiControllerOps g_archHwiOps = {
    .enableIrq      = HwiUnmask,
    .disableIrq     = HwiMask,
    .setIrqPriority = HwiSetPriority,
    .getCurIrqNum   = HwiNumGet,
    .triggerIrq     = HwiPending,
    .clearIrq       = HwiClear,
-    .createIrq      = HwiCreate,
 };

-HwiControllerOps *ArchIntOpsGet(VOID)
+inline UINT32 ArchIsIntActive(VOID)
 {
-    return &g_archHwiOps;
+    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;
 }

 /* ****************************************************************************
@ -164,6 +299,97 @@ 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)
@ -385,11 +611,6 @@ 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
@ -401,24 +622,23 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
    UINT32 index;
-    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
-    hwiForm[0] = 0;             /* [0] Top of Stack */
-    hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
+    g_hwiForm[0] = 0;             /* [0] Top of Stack */
+    g_hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
    for (index = 2; index < OS_VECTOR_CNT; index++) { /* 2: The starting position of the interrupt */
-        hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+        g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
    }
    /* Exception handler register */
-    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;
+    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;

    /* Interrupt vector table location */
-    SCB->VTOR = (UINT32)(UINTPTR)hwiForm;
+    SCB->VTOR = (UINT32)(UINTPTR)g_hwiForm;
 #endif
 #if (__CORTEX_M >= 0x03U) /* only for Cortex-M3 and above */
    NVIC_SetPriorityGrouping(OS_NVIC_AIRCR_PRIGROUP);
@ -431,3 +651,4 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)

    return;
 }
+
--- a/arch/arm/cortex-m33/iar/NTZ/los_timer.c
+++ b/arch/arm/cortex-m33/iar/NTZ/los_timer.c
@ -84,7 +84,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
    SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
    SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
+    NVIC_ClearPendingIRQ(SysTick_IRQn);
    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
    return nextResponseTime;
 }
--- a/arch/arm/cortex-m33/iar/TZ/non_secure/los_arch_interrupt.h
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -29,10 +29,12 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef _LOS_ARCH_INTERRUPT_H
-#define _LOS_ARCH_INTERRUPT_H
+#ifndef _LOS_EXC_H
+#define _LOS_EXC_H

-#include "los_common_interrupt.h"
+#include "los_config.h"
+#include "los_compiler.h"
+#include "los_interrupt.h"

 #ifdef __cplusplus
 #if __cplusplus
@ -41,7 +43,15 @@ extern "C" {
 #endif /* __cplusplus */

 /* *
- * @ingroup los_arch_interrupt
+ * @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
 * Highest priority of a hardware interrupt.
 */
 #ifndef OS_HWI_PRIO_HIGHEST
@ -49,50 +59,63 @@ extern "C" {
 #endif

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Lowest priority of a hardware interrupt.
 */
 #ifndef OS_HWI_PRIO_LOWEST
 #define OS_HWI_PRIO_LOWEST                    7
 #endif

-/* *
- * @ingroup los_arch_interrupt
- * AIRCR register priority group parameter .
- */
-#define OS_NVIC_AIRCR_PRIGROUP                7

 /* *
- * @ingroup los_arch_interrupt
- * Boot interrupt vector table.
+ * @ingroup  los_hwi
+ * Define the type of a hardware interrupt vector table function.
 */
-extern UINT32 _BootVectors[];
+typedef VOID (**HWI_VECTOR_FUNC)(void);

 /* *
- * @ingroup los_arch_interrupt
+ * @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_arch_interrupt
+ * @ingroup los_hwi
 * Count of M-Core interrupt vector.
 */
 #define OS_VECTOR_CNT                         (OS_SYS_VECTOR_CNT + OS_HWI_MAX_NUM)

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
+ * AIRCR register priority group parameter .
+ */
+#define OS_NVIC_AIRCR_PRIGROUP                7
+
+/* *
+ * @ingroup los_hwi
+ * Boot interrupt vector table.
+ */
+extern UINT32 _BootVectors[];
+
+/* *
+ * @ingroup los_hwi
 * 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_arch_interrupt
+ * @ingroup los_hwi
 * Hardware interrupt error code: Null hardware interrupt handling function.
 *
 * Value: 0x02000901
@ -102,7 +125,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_PROC_FUNC_NULL           LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x01)

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Hardware interrupt error code: Insufficient interrupt resources for hardware interrupt creation.
 *
 * Value: 0x02000902
@ -112,7 +135,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_CB_UNAVAILABLE           LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x02)

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Hardware interrupt error code: Insufficient memory for hardware interrupt initialization.
 *
 * Value: 0x02000903
@ -122,7 +145,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_NO_MEMORY                LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x03)

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Hardware interrupt error code: The interrupt has already been created.
 *
 * Value: 0x02000904
@ -132,7 +155,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_ALREADY_CREATED          LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x04)

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Hardware interrupt error code: Invalid interrupt priority.
 *
 * Value: 0x02000905
@ -143,7 +166,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_PRIO_INVALID             LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x05)

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Hardware interrupt error code: Incorrect interrupt creation mode.
 *
 * Value: 0x02000906
@ -154,7 +177,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_MODE_INVALID             LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x06)

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Hardware interrupt error code: The interrupt has already been created as a fast interrupt.
 *
 * Value: 0x02000907
@ -164,17 +187,7 @@ 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
+ * @ingroup los_hwi
 * SysTick control and status register.
 */
 #define OS_SYSTICK_CONTROL_REG                0xE000E010
@ -186,119 +199,133 @@ extern UINT32 _BootVectors[];
 #define OS_SYSTICK_CURRENT_REG                0xE000E018

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt Priority-Level Registers.
 */
 #define OS_NVIC_PRI_BASE                      0xE000E400

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt enable register for 0-31.
 */
 #define OS_NVIC_SETENA_BASE                   0xE000E100

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * interrupt pending register.
 */
 #define OS_NVIC_SETPEND_BASE                  0xE000E200

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt active register.
 */
 #define OS_NVIC_INT_ACT_BASE                  0xE000E300

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt disable register for 0-31.
 */
 #define OS_NVIC_CLRENA_BASE                   0xE000E180

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt control and status register.
 */
 #define OS_NVIC_INT_CTRL                      0xE000ED04

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Vector table offset register.
 */
 #define OS_NVIC_VTOR                          0xE000ED08

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Application interrupt and reset control register
 */
 #define OS_NVIC_AIRCR                         0xE000ED0C

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * System exception priority register.
 */
 #define OS_NVIC_EXCPRI_BASE                   0xE000ED18

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 1 :reset.
 */
 #define OS_EXC_RESET                          1

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 2 :Non-Maskable Interrupt.
 */
 #define OS_EXC_NMI                            2

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 3 :(hard)fault.
 */
 #define OS_EXC_HARD_FAULT                     3

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 4 :MemManage fault.
 */
 #define OS_EXC_MPU_FAULT                      4

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 5 :Bus fault.
 */
 #define OS_EXC_BUS_FAULT                      5

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 6 :Usage fault.
 */
 #define OS_EXC_USAGE_FAULT                    6

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 11 :SVCall.
 */
 #define OS_EXC_SVC_CALL                       11

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 12 :Debug monitor.
 */
 #define OS_EXC_DBG_MONITOR                    12

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 14 :PendSV.
 */
 #define OS_EXC_PEND_SV                        14

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * 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.
@ -319,7 +346,27 @@ extern UINT32 _BootVectors[];
 extern VOID HalInterrupt(VOID);

 /* *
- * @ingroup  los_arch_interrupt
+ * @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
 * @brief: Reset the vector table.
 *
 * @par Description:
@ -332,13 +379,13 @@ extern VOID HalInterrupt(VOID);
 *
 * @retval:None.
 * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
+ * <ul><li>los_hwi.h: the header file that contains the API declaration.</li></ul>
 * @see None.
 */
 extern VOID Reset_Handler(VOID);

 /* *
- * @ingroup  los_arch_interrupt
+ * @ingroup  los_hwi
 * @brief: Pended System Call.
 *
 * @par Description:
@ -352,25 +399,39 @@ extern VOID Reset_Handler(VOID);
 *
 * @retval:None.
 * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
+ * <ul><li>los_hwi.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
@ -439,10 +500,11 @@ 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);
@ -583,7 +645,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-M4 platform.
 *
 */
 typedef struct TagExcInfo {
@ -606,9 +668,10 @@ typedef struct TagExcInfo {
    EXC_CONTEXT_S *context;
 } ExcInfo;

-extern ExcInfo g_excInfo;
 extern UINT32 g_curNestCount;
+extern UINT32 g_intCount;
 extern UINT8 g_uwExcTbl[32];
+extern ExcInfo g_excInfo;

 #define MAX_INT_INFO_SIZE       (8 + 0x164)

@ -618,4 +681,4 @@ extern UINT8 g_uwExcTbl[32];
 #endif /* __cplusplus */
 #endif /* __cplusplus */

-#endif /* _LOS_ARCH_INTERRUPT_H */
+#endif /* _LOS_EXC_H */
--- a/arch/arm/cortex-m33/iar/TZ/non_secure/los_interrupt.c
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -29,10 +29,12 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include <stdarg.h>
+#include "los_interrupt.h"
 #include "securec.h"
-#include "los_context.h"
+#include <stdarg.h>
 #include "los_arch_interrupt.h"
+#include "los_context.h"
+#include "los_debug.h"
 #include "los_hook.h"
 #include "los_task.h"
 #include "los_sched.h"
@ -42,6 +44,93 @@
 #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
@ -56,54 +145,100 @@ 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;
 }

-STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
-{
-    HwiSetPriority(hwiNum, hwiPrio);
-    HwiUnmask(hwiNum);
-    return LOS_OK;
-}
-
-STATIC HwiControllerOps g_archHwiOps = {
+HwiControllerOps g_archHwiOps = {
    .enableIrq      = HwiUnmask,
    .disableIrq     = HwiMask,
    .setIrqPriority = HwiSetPriority,
    .getCurIrqNum   = HwiNumGet,
    .triggerIrq     = HwiPending,
    .clearIrq       = HwiClear,
-    .createIrq      = HwiCreate,
 };

-HwiControllerOps *ArchIntOpsGet(VOID)
+inline UINT32 ArchIsIntActive(VOID)
 {
-    return &g_archHwiOps;
+    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;
 }

 /* ****************************************************************************
@ -164,6 +299,97 @@ 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)
@ -385,11 +611,6 @@ 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
@ -401,24 +622,23 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
    UINT32 index;
-    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
-    hwiForm[0] = 0;             /* [0] Top of Stack */
-    hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
+    g_hwiForm[0] = 0;             /* [0] Top of Stack */
+    g_hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
    for (index = 2; index < OS_VECTOR_CNT; index++) { /* 2: The starting position of the interrupt */
-        hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+        g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
    }
    /* Exception handler register */
-    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;
+    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;

    /* Interrupt vector table location */
-    SCB->VTOR = (UINT32)(UINTPTR)hwiForm;
+    SCB->VTOR = (UINT32)(UINTPTR)g_hwiForm;
 #endif
 #if (__CORTEX_M >= 0x03U) /* only for Cortex-M3 and above */
    NVIC_SetPriorityGrouping(OS_NVIC_AIRCR_PRIGROUP);
@ -431,3 +651,4 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)

    return;
 }
+
--- a/arch/arm/cortex-m33/iar/TZ/non_secure/los_timer.c
+++ b/arch/arm/cortex-m33/iar/TZ/non_secure/los_timer.c
@ -85,7 +85,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
    SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
    SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
+    NVIC_ClearPendingIRQ(SysTick_IRQn);
    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
    return nextResponseTime;
 }
--- a/arch/arm/cortex-m4/gcc/los_arch_interrupt.h
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -32,7 +32,9 @@
 #ifndef _LOS_ARCH_INTERRUPT_H
 #define _LOS_ARCH_INTERRUPT_H

-#include "los_common_interrupt.h"
+#include "los_config.h"
+#include "los_compiler.h"
+#include "los_interrupt.h"

 #ifdef __cplusplus
 #if __cplusplus
@ -40,6 +42,14 @@ 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.
@ -56,17 +66,18 @@ extern "C" {
 #define OS_HWI_PRIO_LOWEST                    7
 #endif

+
 /* *
- * @ingroup los_arch_interrupt
- * AIRCR register priority group parameter .
+ * @ingroup  los_arch_interrupt
+ * Define the type of a hardware interrupt vector table function.
 */
-#define OS_NVIC_AIRCR_PRIGROUP                7
+typedef VOID (**HWI_VECTOR_FUNC)(void);

 /* *
 * @ingroup los_arch_interrupt
- * Boot interrupt vector table.
+ * Count of interrupts.
 */
-extern UINT32 _BootVectors[];
+extern UINT32 g_intCount;

 /* *
 * @ingroup los_arch_interrupt
@ -80,6 +91,18 @@ extern UINT32 _BootVectors[];
 */
 #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.
@ -87,7 +110,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)

@ -163,16 +186,6 @@ 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.
@ -299,6 +312,20 @@ 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.
@ -318,6 +345,25 @@ extern UINT32 _BootVectors[];
 */
 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.
@ -357,20 +403,34 @@ 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
@ -443,6 +503,7 @@ 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);
@ -606,9 +667,10 @@ typedef struct TagExcInfo {
    EXC_CONTEXT_S *context;
 } ExcInfo;

-extern ExcInfo g_excInfo;
 extern UINT32 g_curNestCount;
+extern UINT32 g_intCount;
 extern UINT8 g_uwExcTbl[32];
+extern ExcInfo g_excInfo;

 #define MAX_INT_INFO_SIZE       (8 + 0x164)

--- a/arch/arm/cortex-m4/gcc/los_interrupt.c
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -28,11 +28,12 @@
 * 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,6 +43,89 @@
 #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
@ -56,54 +140,99 @@ 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;
 }

-STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
-{
-    HwiSetPriority(hwiNum, hwiPrio);
-    HwiUnmask(hwiNum);
-    return LOS_OK;
-}
-
-STATIC HwiControllerOps g_archHwiOps = {
+HwiControllerOps g_archHwiOps = {
    .enableIrq      = HwiUnmask,
    .disableIrq     = HwiMask,
    .setIrqPriority = HwiSetPriority,
    .getCurIrqNum   = HwiNumGet,
    .triggerIrq     = HwiPending,
    .clearIrq       = HwiClear,
-    .createIrq      = HwiCreate,
 };

-HwiControllerOps *ArchIntOpsGet(VOID)
+inline UINT32 ArchIsIntActive(VOID)
 {
-    return &g_archHwiOps;
+    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;
 }

 /* ****************************************************************************
@ -162,6 +291,97 @@ 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)
@ -394,11 +614,6 @@ WEAK VOID __stack_chk_fail(VOID)
              __builtin_return_address(0));
 }

-WEAK VOID SysTick_Handler(VOID)
-{
-    return;
-}
-
 /* ****************************************************************************
 Function    : HalHwiInit
 Description : initialization of the hardware interrupt
@ -410,24 +625,23 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
    UINT32 index;
-    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
-    hwiForm[0] = 0; /* [0] Top of Stack */
-    hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
+    g_hwiForm[0] = 0;             /* [0] Top of Stack */
+    g_hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
    for (index = 2; index < OS_VECTOR_CNT; index++) { /* 2: The starting position of the interrupt */
-        hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+        g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
    }
    /* Exception handler register */
-    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;
+    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;

    /* Interrupt vector table location */
-    SCB->VTOR = (UINT32)(UINTPTR)hwiForm;
+    SCB->VTOR = (UINT32)(UINTPTR)g_hwiForm;
 #endif
 #if (__CORTEX_M >= 0x03U) /* only for Cortex-M3 and above */
    NVIC_SetPriorityGrouping(OS_NVIC_AIRCR_PRIGROUP);
@ -445,3 +659,4 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)

    return;
 }
+
--- a/arch/arm/cortex-m4/gcc/los_timer.c
+++ b/arch/arm/cortex-m4/gcc/los_timer.c
@ -84,7 +84,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
    SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
    SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
+    NVIC_ClearPendingIRQ(SysTick_IRQn);
    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
    return nextResponseTime;
 }
--- a/arch/arm/cortex-m4/iar/los_arch_interrupt.h
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -32,7 +32,9 @@
 #ifndef _LOS_ARCH_INTERRUPT_H
 #define _LOS_ARCH_INTERRUPT_H

-#include "los_common_interrupt.h"
+#include "los_config.h"
+#include "los_compiler.h"
+#include "los_interrupt.h"

 #ifdef __cplusplus
 #if __cplusplus
@ -40,6 +42,14 @@ 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.
@ -56,17 +66,18 @@ extern "C" {
 #define OS_HWI_PRIO_LOWEST                    7
 #endif

+
 /* *
- * @ingroup los_arch_interrupt
- * AIRCR register priority group parameter .
+ * @ingroup  los_arch_interrupt
+ * Define the type of a hardware interrupt vector table function.
 */
-#define OS_NVIC_AIRCR_PRIGROUP                7
+typedef VOID (**HWI_VECTOR_FUNC)(void);

 /* *
 * @ingroup los_arch_interrupt
- * Boot interrupt vector table.
+ * Count of interrupts.
 */
-extern UINT32 _BootVectors[];
+extern UINT32 g_intCount;

 /* *
 * @ingroup los_arch_interrupt
@ -80,6 +91,18 @@ extern UINT32 _BootVectors[];
 */
 #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.
@ -87,7 +110,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  platformis [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)

@ -163,16 +186,6 @@ 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.
@ -299,6 +312,20 @@ 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.
@ -318,6 +345,25 @@ extern UINT32 _BootVectors[];
 */
 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.
@ -357,20 +403,34 @@ 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
@ -443,6 +503,7 @@ 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);
@ -606,9 +667,10 @@ typedef struct TagExcInfo {
    EXC_CONTEXT_S *context;
 } ExcInfo;

-extern ExcInfo g_excInfo;
 extern UINT32 g_curNestCount;
+extern UINT32 g_intCount;
 extern UINT8 g_uwExcTbl[32];
+extern ExcInfo g_excInfo;

 #define MAX_INT_INFO_SIZE       (8 + 0x164)

--- a/arch/arm/cortex-m4/iar/los_interrupt.c
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -29,10 +29,12 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include <stdarg.h>
+#include "los_interrupt.h"
 #include "securec.h"
-#include "los_context.h"
+#include <stdarg.h>
 #include "los_arch_interrupt.h"
+#include "los_context.h"
+#include "los_debug.h"
 #include "los_hook.h"
 #include "los_task.h"
 #include "los_sched.h"
@ -42,6 +44,95 @@
 #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
@ -56,54 +147,100 @@ 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;
 }

-STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
-{
-    HwiSetPriority(hwiNum, hwiPrio);
-    HwiUnmask(hwiNum);
-    return LOS_OK;
-}
-
-STATIC HwiControllerOps g_archHwiOps = {
+HwiControllerOps g_archHwiOps = {
    .enableIrq      = HwiUnmask,
    .disableIrq     = HwiMask,
    .setIrqPriority = HwiSetPriority,
    .getCurIrqNum   = HwiNumGet,
    .triggerIrq     = HwiPending,
    .clearIrq       = HwiClear,
-    .createIrq      = HwiCreate,
 };

-HwiControllerOps *ArchIntOpsGet(VOID)
+inline UINT32 ArchIsIntActive(VOID)
 {
-    return &g_archHwiOps;
+    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;
 }

 /* ****************************************************************************
@ -162,6 +299,97 @@ 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)
@ -384,11 +612,6 @@ 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
@ -400,24 +623,23 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
    UINT32 index;
-    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
-    hwiForm[0] = 0;             /* [0] Top of Stack */
-    hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
+    g_hwiForm[0] = 0;             /* [0] Top of Stack */
+    g_hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
    for (index = 2; index < OS_VECTOR_CNT; index++) { /* 2: The starting position of the interrupt */
-        hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+        g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
    }
    /* Exception handler register */
-    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;
+    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;

    /* Interrupt vector table location */
-    SCB->VTOR = (UINT32)(UINTPTR)hwiForm;
+    SCB->VTOR = (UINT32)(UINTPTR)g_hwiForm;
 #endif
 #if (__CORTEX_M >= 0x03U) /* only for Cortex-M3 and above */
    NVIC_SetPriorityGrouping(OS_NVIC_AIRCR_PRIGROUP);
@ -435,3 +657,4 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)

    return;
 }
+
--- a/arch/arm/cortex-m4/iar/los_timer.c
+++ b/arch/arm/cortex-m4/iar/los_timer.c
@ -84,7 +84,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
    SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
    SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
+    NVIC_ClearPendingIRQ(SysTick_IRQn);
    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
    return nextResponseTime;
 }
--- a/arch/arm/cortex-m55/gcc/NTZ/los_arch_interrupt.h
+++ b/arch/arm/cortex-m55/gcc/NTZ/los_arch_interrupt.h
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2022-2022 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,7 +31,9 @@
 #ifndef _LOS_ARCH_INTERRUPT_H
 #define _LOS_ARCH_INTERRUPT_H

-#include "los_common_interrupt.h"
+#include "los_config.h"
+#include "los_compiler.h"
+#include "los_interrupt.h"

 #ifdef __cplusplus
 #if __cplusplus
@ -39,6 +41,14 @@ 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.
@ -55,11 +65,18 @@ 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
- * AIRCR register priority group parameter .
+ * Count of interrupts.
 */
-#define OS_NVIC_AIRCR_PRIGROUP                7
+extern UINT32 g_intCount;

 /* *
 * @ingroup los_arch_interrupt
@ -73,6 +90,12 @@ extern "C" {
 */
 #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.
@ -80,7 +103,7 @@ extern "C" {
 * Value: 0x02000900
 *
 * Solution: Ensure that the interrupt number is valid.
- * The value range of the interrupt number applicable for a Cortex-M55  platformis [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)

@ -131,7 +154,7 @@ extern "C" {
 * Value: 0x02000905
 *
 * Solution: Ensure that the interrupt priority is valid.
- * The value range of the interrupt priority applicable for a Cortex-M55 platform is [0,15].
+ * The value range of the interrupt priority applicable for a Cortex-M33 platform is [0,15].
 */
 #define OS_ERRNO_HWI_PRIO_INVALID             LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x05)

@ -156,16 +179,6 @@ extern "C" {
 */
 #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.
@ -292,6 +305,20 @@ extern "C" {
 */
 #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.
@ -311,6 +338,25 @@ extern "C" {
 */
 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.
@ -350,20 +396,34 @@ 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
@ -436,6 +496,7 @@ 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);
@ -593,7 +654,7 @@ VOID HalHwiInit(VOID);
 * @ingroup los_exc
 * Exception information structure
 *
- * Description: Exception information saved when an exception is triggered on the Cortex-M55 platform.
+ * Description: Exception information saved when an exception is triggered on the Cortex-M33 platform.
 *
 */
 typedef struct TagExcInfo {
@ -616,9 +677,10 @@ typedef struct TagExcInfo {
    EXC_CONTEXT_S *context;
 } ExcInfo;

-extern ExcInfo g_excInfo;
 extern UINT32 g_curNestCount;
+extern UINT32 g_intCount;
 extern UINT8 g_uwExcTbl[32];
+extern ExcInfo g_excInfo;

 #define MAX_INT_INFO_SIZE       (8 + 0x164)

--- a/arch/arm/cortex-m55/gcc/NTZ/los_interrupt.c
+++ b/arch/arm/cortex-m55/gcc/NTZ/los_interrupt.c
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2022-2022 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,10 +27,12 @@
 * 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"
@ -41,6 +43,89 @@
 #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
@ -56,54 +141,99 @@ 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;
 }

-STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
-{
-    HwiSetPriority(hwiNum, hwiPrio);
-    HwiUnmask(hwiNum);
-    return LOS_OK;
-}
-
-STATIC HwiControllerOps g_archHwiOps = {
+HwiControllerOps g_archHwiOps = {
    .enableIrq      = HwiUnmask,
    .disableIrq     = HwiMask,
    .setIrqPriority = HwiSetPriority,
    .getCurIrqNum   = HwiNumGet,
    .triggerIrq     = HwiPending,
    .clearIrq       = HwiClear,
-    .createIrq      = HwiCreate,
 };

-HwiControllerOps *ArchIntOpsGet(VOID)
+inline UINT32 ArchIsIntActive(VOID)
 {
-    return &g_archHwiOps;
+    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;
 }

 /* ****************************************************************************
@ -162,6 +292,97 @@ 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)
@ -388,11 +609,6 @@ 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
@ -404,24 +620,23 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
    UINT32 index;
-    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
-    hwiForm[0] = 0;             /* [0] Top of Stack */
-    hwiForm[1] = 0; /* [1] reset */
+    g_hwiForm[0] = 0;             /* [0] Top of Stack */
+    g_hwiForm[1] = 0; /* [1] reset */
    for (index = DEF_HANDLER_START_INDEX; index < OS_VECTOR_CNT; index++) {
-        hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+        g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
    }
    /* Exception handler register */
-    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;
+    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;

    /* Interrupt vector table location */
-    SCB->VTOR = (UINT32)(UINTPTR)hwiForm;
+    SCB->VTOR = (UINT32)(UINTPTR)g_hwiForm;
 #endif
 #if (__CORTEX_M >= 0x03U) /* only for Cortex-M3 and above */
    NVIC_SetPriorityGrouping(OS_NVIC_AIRCR_PRIGROUP);
@ -439,3 +654,4 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)

    return;
 }
+
--- a/arch/arm/cortex-m55/gcc/NTZ/los_timer.c
+++ b/arch/arm/cortex-m55/gcc/NTZ/los_timer.c
@ -84,7 +84,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
    SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
    SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
+    NVIC_ClearPendingIRQ(SysTick_IRQn);
    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
    return nextResponseTime;
 }
--- a/arch/arm/cortex-m55/gcc/TZ/non_secure/los_arch_interrupt.h
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -32,7 +32,9 @@
 #ifndef _LOS_ARCH_INTERRUPT_H
 #define _LOS_ARCH_INTERRUPT_H

-#include "los_common_interrupt.h"
+#include "los_config.h"
+#include "los_compiler.h"
+#include "los_interrupt.h"

 #ifdef __cplusplus
 #if __cplusplus
@ -40,6 +42,14 @@ 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.
@ -56,17 +66,18 @@ extern "C" {
 #define OS_HWI_PRIO_LOWEST                    7
 #endif

+
 /* *
- * @ingroup los_arch_interrupt
- * AIRCR register priority group parameter .
+ * @ingroup  los_arch_interrupt
+ * Define the type of a hardware interrupt vector table function.
 */
-#define OS_NVIC_AIRCR_PRIGROUP                7
+typedef VOID (**HWI_VECTOR_FUNC)(void);

 /* *
 * @ingroup los_arch_interrupt
- * Boot interrupt vector table.
+ * Count of interrupts.
 */
-extern UINT32 _BootVectors[];
+extern UINT32 g_intCount;

 /* *
 * @ingroup los_arch_interrupt
@ -80,6 +91,18 @@ extern UINT32 _BootVectors[];
 */
 #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.
@ -87,7 +110,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)

@ -163,16 +186,6 @@ 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.
@ -299,6 +312,20 @@ 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.
@ -318,6 +345,25 @@ extern UINT32 _BootVectors[];
 */
 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.
@ -357,20 +403,34 @@ 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
@ -443,6 +503,7 @@ 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);
@ -583,7 +644,7 @@ VOID HalHwiInit(VOID);
 * @ingroup los_exc
 * Exception information structure
 *
- * Description: Exception information saved when an exception is triggered on the Cortex-M55 platform.
+ * Description: Exception information saved when an exception is triggered on the Cortex-M33 platform.
 *
 */
 typedef struct TagExcInfo {
@ -606,9 +667,10 @@ typedef struct TagExcInfo {
    EXC_CONTEXT_S *context;
 } ExcInfo;

-extern ExcInfo g_excInfo;
 extern UINT32 g_curNestCount;
+extern UINT32 g_intCount;
 extern UINT8 g_uwExcTbl[32];
+extern ExcInfo g_excInfo;

 #define MAX_INT_INFO_SIZE       (8 + 0x164)

--- a/arch/arm/cortex-m55/gcc/TZ/non_secure/los_interrupt.c
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -28,20 +28,99 @@
 * 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
@ -57,54 +136,100 @@ 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;
 }

-STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
-{
-    HwiSetPriority(hwiNum, hwiPrio);
-    HwiUnmask(hwiNum);
-    return LOS_OK;
-}
-
-STATIC HwiControllerOps g_archHwiOps = {
+HwiControllerOps g_archHwiOps = {
    .enableIrq      = HwiUnmask,
    .disableIrq     = HwiMask,
    .setIrqPriority = HwiSetPriority,
    .getCurIrqNum   = HwiNumGet,
    .triggerIrq     = HwiPending,
    .clearIrq       = HwiClear,
-    .createIrq      = HwiCreate,
 };

-HwiControllerOps *ArchIntOpsGet(VOID)
+inline UINT32 ArchIsIntActive(VOID)
 {
-    return &g_archHwiOps;
+    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;
 }

 /* ****************************************************************************
@ -163,6 +288,97 @@ 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)
@ -396,24 +612,23 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
    UINT32 index;
-    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
-    hwiForm[0] = 0;   /* [0] Top of Stack */
-    hwiForm[1] = 0;   /* [1] reset */
+    g_hwiForm[0] = 0; /* [0] Top of Stack */
+    g_hwiForm[1] = 0; /* [1] reset */
    for (index = DEF_HANDLER_START_INDEX; index < OS_VECTOR_CNT; index++) {
-        hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+        g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
    }
    /* Exception handler register */
-    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;
+    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;

    /* Interrupt vector table location */
-    SCB->VTOR = (UINT32)(UINTPTR)hwiForm;
+    SCB->VTOR = (UINT32)(UINTPTR)g_hwiForm;
 #endif
 #if (__CORTEX_M >= 0x03U) /* only for Cortex-M3 and above */
    NVIC_SetPriorityGrouping(OS_NVIC_AIRCR_PRIGROUP);
@ -431,3 +646,4 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)

    return;
 }
+
--- a/arch/arm/cortex-m55/gcc/TZ/non_secure/los_timer.c
+++ b/arch/arm/cortex-m55/gcc/TZ/non_secure/los_timer.c
@ -84,7 +84,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
    SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
    SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
+    NVIC_ClearPendingIRQ(SysTick_IRQn);
    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
    return nextResponseTime;
 }
--- a/arch/arm/cortex-m55/iar/NTZ/los_arch_interrupt.h
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -29,10 +29,12 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef _LOS_ARCH_INTERRUPT_H
-#define _LOS_ARCH_INTERRUPT_H
+#ifndef _LOS_EXC_H
+#define _LOS_EXC_H

-#include "los_common_interrupt.h"
+#include "los_config.h"
+#include "los_compiler.h"
+#include "los_interrupt.h"

 #ifdef __cplusplus
 #if __cplusplus
@ -41,7 +43,15 @@ extern "C" {
 #endif /* __cplusplus */

 /* *
- * @ingroup los_arch_interrupt
+ * @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
 * Highest priority of a hardware interrupt.
 */
 #ifndef OS_HWI_PRIO_HIGHEST
@ -49,50 +59,63 @@ extern "C" {
 #endif

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Lowest priority of a hardware interrupt.
 */
 #ifndef OS_HWI_PRIO_LOWEST
 #define OS_HWI_PRIO_LOWEST                    7
 #endif

-/* *
- * @ingroup los_arch_interrupt
- * AIRCR register priority group parameter .
- */
-#define OS_NVIC_AIRCR_PRIGROUP                7

 /* *
- * @ingroup los_arch_interrupt
- * Boot interrupt vector table.
+ * @ingroup  los_hwi
+ * Define the type of a hardware interrupt vector table function.
 */
-extern UINT32 _BootVectors[];
+typedef VOID (**HWI_VECTOR_FUNC)(void);

 /* *
- * @ingroup los_arch_interrupt
+ * @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_arch_interrupt
+ * @ingroup los_hwi
 * Count of M-Core interrupt vector.
 */
 #define OS_VECTOR_CNT                         (OS_SYS_VECTOR_CNT + OS_HWI_MAX_NUM)

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
+ * AIRCR register priority group parameter .
+ */
+#define OS_NVIC_AIRCR_PRIGROUP                7
+
+/* *
+ * @ingroup los_hwi
+ * Boot interrupt vector table.
+ */
+extern UINT32 _BootVectors[];
+
+/* *
+ * @ingroup los_hwi
 * 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_arch_interrupt
+ * @ingroup los_hwi
 * Hardware interrupt error code: Null hardware interrupt handling function.
 *
 * Value: 0x02000901
@ -102,7 +125,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_PROC_FUNC_NULL           LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x01)

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Hardware interrupt error code: Insufficient interrupt resources for hardware interrupt creation.
 *
 * Value: 0x02000902
@ -112,7 +135,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_CB_UNAVAILABLE           LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x02)

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Hardware interrupt error code: Insufficient memory for hardware interrupt initialization.
 *
 * Value: 0x02000903
@ -122,7 +145,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_NO_MEMORY                LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x03)

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Hardware interrupt error code: The interrupt has already been created.
 *
 * Value: 0x02000904
@ -132,7 +155,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_ALREADY_CREATED          LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x04)

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Hardware interrupt error code: Invalid interrupt priority.
 *
 * Value: 0x02000905
@ -143,7 +166,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_PRIO_INVALID             LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x05)

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Hardware interrupt error code: Incorrect interrupt creation mode.
 *
 * Value: 0x02000906
@ -154,7 +177,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_MODE_INVALID             LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x06)

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Hardware interrupt error code: The interrupt has already been created as a fast interrupt.
 *
 * Value: 0x02000907
@ -164,17 +187,7 @@ 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
+ * @ingroup los_hwi
 * SysTick control and status register.
 */
 #define OS_SYSTICK_CONTROL_REG                0xE000E010
@ -186,119 +199,133 @@ extern UINT32 _BootVectors[];
 #define OS_SYSTICK_CURRENT_REG                0xE000E018

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt Priority-Level Registers.
 */
 #define OS_NVIC_PRI_BASE                      0xE000E400

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt enable register for 0-31.
 */
 #define OS_NVIC_SETENA_BASE                   0xE000E100

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * interrupt pending register.
 */
 #define OS_NVIC_SETPEND_BASE                  0xE000E200

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt active register.
 */
 #define OS_NVIC_INT_ACT_BASE                  0xE000E300

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt disable register for 0-31.
 */
 #define OS_NVIC_CLRENA_BASE                   0xE000E180

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt control and status register.
 */
 #define OS_NVIC_INT_CTRL                      0xE000ED04

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Vector table offset register.
 */
 #define OS_NVIC_VTOR                          0xE000ED08

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Application interrupt and reset control register
 */
 #define OS_NVIC_AIRCR                         0xE000ED0C

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * System exception priority register.
 */
 #define OS_NVIC_EXCPRI_BASE                   0xE000ED18

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 1 :reset.
 */
 #define OS_EXC_RESET                          1

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 2 :Non-Maskable Interrupt.
 */
 #define OS_EXC_NMI                            2

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 3 :(hard)fault.
 */
 #define OS_EXC_HARD_FAULT                     3

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 4 :MemManage fault.
 */
 #define OS_EXC_MPU_FAULT                      4

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 5 :Bus fault.
 */
 #define OS_EXC_BUS_FAULT                      5

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 6 :Usage fault.
 */
 #define OS_EXC_USAGE_FAULT                    6

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 11 :SVCall.
 */
 #define OS_EXC_SVC_CALL                       11

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 12 :Debug monitor.
 */
 #define OS_EXC_DBG_MONITOR                    12

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 14 :PendSV.
 */
 #define OS_EXC_PEND_SV                        14

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * 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.
@ -319,7 +346,27 @@ extern UINT32 _BootVectors[];
 extern VOID HalInterrupt(VOID);

 /* *
- * @ingroup  los_arch_interrupt
+ * @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
 * @brief: Reset the vector table.
 *
 * @par Description:
@ -332,13 +379,13 @@ extern VOID HalInterrupt(VOID);
 *
 * @retval:None.
 * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
+ * <ul><li>los_hwi.h: the header file that contains the API declaration.</li></ul>
 * @see None.
 */
 extern VOID Reset_Handler(VOID);

 /* *
- * @ingroup  los_arch_interrupt
+ * @ingroup  los_hwi
 * @brief: Pended System Call.
 *
 * @par Description:
@ -352,25 +399,39 @@ extern VOID Reset_Handler(VOID);
 *
 * @retval:None.
 * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
+ * <ul><li>los_hwi.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
@ -439,10 +500,11 @@ 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);
@ -583,7 +645,7 @@ VOID HalHwiInit(VOID);
 * @ingroup los_exc
 * Exception information structure
 *
- * Description: Exception information saved when an exception is triggered on the Cortex-M55 platform.
+ * Description: Exception information saved when an exception is triggered on the Cortex-M4 platform.
 *
 */
 typedef struct TagExcInfo {
@ -606,9 +668,10 @@ typedef struct TagExcInfo {
    EXC_CONTEXT_S *context;
 } ExcInfo;

-extern ExcInfo g_excInfo;
 extern UINT32 g_curNestCount;
+extern UINT32 g_intCount;
 extern UINT8 g_uwExcTbl[32];
+extern ExcInfo g_excInfo;

 #define MAX_INT_INFO_SIZE       (8 + 0x164)

@ -618,4 +681,4 @@ extern UINT8 g_uwExcTbl[32];
 #endif /* __cplusplus */
 #endif /* __cplusplus */

-#endif /* _LOS_ARCH_INTERRUPT_H */
+#endif /* _LOS_EXC_H */
--- a/arch/arm/cortex-m55/iar/NTZ/los_interrupt.c
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -29,10 +29,12 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include <stdarg.h>
+#include "los_interrupt.h"
 #include "securec.h"
-#include "los_context.h"
+#include <stdarg.h>
 #include "los_arch_interrupt.h"
+#include "los_context.h"
+#include "los_debug.h"
 #include "los_hook.h"
 #include "los_task.h"
 #include "los_sched.h"
@ -42,6 +44,93 @@
 #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
@ -56,54 +145,100 @@ 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;
 }

-STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
-{
-    HwiSetPriority(hwiNum, hwiPrio);
-    HwiUnmask(hwiNum);
-    return LOS_OK;
-}
-
-STATIC HwiControllerOps g_archHwiOps = {
+HwiControllerOps g_archHwiOps = {
    .enableIrq      = HwiUnmask,
    .disableIrq     = HwiMask,
    .setIrqPriority = HwiSetPriority,
    .getCurIrqNum   = HwiNumGet,
    .triggerIrq     = HwiPending,
    .clearIrq       = HwiClear,
-    .createIrq      = HwiCreate,
 };

-HwiControllerOps *ArchIntOpsGet(VOID)
+inline UINT32 ArchIsIntActive(VOID)
 {
-    return &g_archHwiOps;
+    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;
 }

 /* ****************************************************************************
@ -164,6 +299,97 @@ 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)
@ -385,11 +611,6 @@ 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
@ -401,24 +622,23 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
    UINT32 index;
-    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
-    hwiForm[0] = 0;             /* [0] Top of Stack */
-    hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
+    g_hwiForm[0] = 0;             /* [0] Top of Stack */
+    g_hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
    for (index = 2; index < OS_VECTOR_CNT; index++) { /* 2: The starting position of the interrupt */
-        hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+        g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
    }
    /* Exception handler register */
-    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;
+    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;

    /* Interrupt vector table location */
-    SCB->VTOR = (UINT32)(UINTPTR)hwiForm;
+    SCB->VTOR = (UINT32)(UINTPTR)g_hwiForm;
 #endif
 #if (__CORTEX_M >= 0x03U) /* only for Cortex-M3 and above */
    NVIC_SetPriorityGrouping(OS_NVIC_AIRCR_PRIGROUP);
@ -431,3 +651,4 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)

    return;
 }
+
--- a/arch/arm/cortex-m55/iar/NTZ/los_timer.c
+++ b/arch/arm/cortex-m55/iar/NTZ/los_timer.c
@ -84,7 +84,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
    SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
    SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
+    NVIC_ClearPendingIRQ(SysTick_IRQn);
    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
    return nextResponseTime;
 }
--- a/arch/arm/cortex-m55/iar/TZ/BUILD.gn
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
 # are permitted provided that the following conditions are met:
@ -32,21 +32,15 @@ import("//kernel/liteos_m/liteos.gni")
 module_name = "arch"
 kernel_module(module_name) {
  sources = [
-    "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",
+    "los_context.c",
+    "los_dispatch.S",
+    "los_exc.S",
+    "los_interrupt.c",
+    "los_timer.c",
  ]
  configs += [ "$LITEOSTOPDIR:warn_config" ]
-
-  include_dirs = [
-    "non_secure",
-    "secure",
-  ]
 }

 config("public") {
-  include_dirs = [ "non_secure" ]
+  include_dirs = [ "." ]
 }
--- a/arch/arm/cortex-m55/iar/TZ/non_secure/los_arch_interrupt.h
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -29,10 +29,12 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef _LOS_ARCH_INTERRUPT_H
-#define _LOS_ARCH_INTERRUPT_H
+#ifndef _LOS_EXC_H
+#define _LOS_EXC_H

-#include "los_common_interrupt.h"
+#include "los_config.h"
+#include "los_compiler.h"
+#include "los_interrupt.h"

 #ifdef __cplusplus
 #if __cplusplus
@ -41,7 +43,15 @@ extern "C" {
 #endif /* __cplusplus */

 /* *
- * @ingroup los_arch_interrupt
+ * @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
 * Highest priority of a hardware interrupt.
 */
 #ifndef OS_HWI_PRIO_HIGHEST
@ -49,50 +59,63 @@ extern "C" {
 #endif

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Lowest priority of a hardware interrupt.
 */
 #ifndef OS_HWI_PRIO_LOWEST
 #define OS_HWI_PRIO_LOWEST                    7
 #endif

-/* *
- * @ingroup los_arch_interrupt
- * AIRCR register priority group parameter .
- */
-#define OS_NVIC_AIRCR_PRIGROUP                7

 /* *
- * @ingroup los_arch_interrupt
- * Boot interrupt vector table.
+ * @ingroup  los_hwi
+ * Define the type of a hardware interrupt vector table function.
 */
-extern UINT32 _BootVectors[];
+typedef VOID (**HWI_VECTOR_FUNC)(void);

 /* *
- * @ingroup los_arch_interrupt
+ * @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_arch_interrupt
+ * @ingroup los_hwi
 * Count of M-Core interrupt vector.
 */
 #define OS_VECTOR_CNT                         (OS_SYS_VECTOR_CNT + OS_HWI_MAX_NUM)

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
+ * AIRCR register priority group parameter .
+ */
+#define OS_NVIC_AIRCR_PRIGROUP                7
+
+/* *
+ * @ingroup los_hwi
+ * Boot interrupt vector table.
+ */
+extern UINT32 _BootVectors[];
+
+/* *
+ * @ingroup los_hwi
 * 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_arch_interrupt
+ * @ingroup los_hwi
 * Hardware interrupt error code: Null hardware interrupt handling function.
 *
 * Value: 0x02000901
@ -102,7 +125,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_PROC_FUNC_NULL           LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x01)

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Hardware interrupt error code: Insufficient interrupt resources for hardware interrupt creation.
 *
 * Value: 0x02000902
@ -112,7 +135,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_CB_UNAVAILABLE           LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x02)

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Hardware interrupt error code: Insufficient memory for hardware interrupt initialization.
 *
 * Value: 0x02000903
@ -122,7 +145,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_NO_MEMORY                LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x03)

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Hardware interrupt error code: The interrupt has already been created.
 *
 * Value: 0x02000904
@ -132,7 +155,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_ALREADY_CREATED          LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x04)

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Hardware interrupt error code: Invalid interrupt priority.
 *
 * Value: 0x02000905
@ -143,7 +166,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_PRIO_INVALID             LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x05)

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Hardware interrupt error code: Incorrect interrupt creation mode.
 *
 * Value: 0x02000906
@ -154,7 +177,7 @@ extern UINT32 _BootVectors[];
 #define OS_ERRNO_HWI_MODE_INVALID             LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x06)

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Hardware interrupt error code: The interrupt has already been created as a fast interrupt.
 *
 * Value: 0x02000907
@ -164,17 +187,7 @@ 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
+ * @ingroup los_hwi
 * SysTick control and status register.
 */
 #define OS_SYSTICK_CONTROL_REG                0xE000E010
@ -186,119 +199,133 @@ extern UINT32 _BootVectors[];
 #define OS_SYSTICK_CURRENT_REG                0xE000E018

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt Priority-Level Registers.
 */
 #define OS_NVIC_PRI_BASE                      0xE000E400

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt enable register for 0-31.
 */
 #define OS_NVIC_SETENA_BASE                   0xE000E100

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * interrupt pending register.
 */
 #define OS_NVIC_SETPEND_BASE                  0xE000E200

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt active register.
 */
 #define OS_NVIC_INT_ACT_BASE                  0xE000E300

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt disable register for 0-31.
 */
 #define OS_NVIC_CLRENA_BASE                   0xE000E180

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt control and status register.
 */
 #define OS_NVIC_INT_CTRL                      0xE000ED04

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Vector table offset register.
 */
 #define OS_NVIC_VTOR                          0xE000ED08

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Application interrupt and reset control register
 */
 #define OS_NVIC_AIRCR                         0xE000ED0C

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * System exception priority register.
 */
 #define OS_NVIC_EXCPRI_BASE                   0xE000ED18

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 1 :reset.
 */
 #define OS_EXC_RESET                          1

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 2 :Non-Maskable Interrupt.
 */
 #define OS_EXC_NMI                            2

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 3 :(hard)fault.
 */
 #define OS_EXC_HARD_FAULT                     3

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 4 :MemManage fault.
 */
 #define OS_EXC_MPU_FAULT                      4

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 5 :Bus fault.
 */
 #define OS_EXC_BUS_FAULT                      5

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 6 :Usage fault.
 */
 #define OS_EXC_USAGE_FAULT                    6

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 11 :SVCall.
 */
 #define OS_EXC_SVC_CALL                       11

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 12 :Debug monitor.
 */
 #define OS_EXC_DBG_MONITOR                    12

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * Interrupt No. 14 :PendSV.
 */
 #define OS_EXC_PEND_SV                        14

 /* *
- * @ingroup los_arch_interrupt
+ * @ingroup los_hwi
 * 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.
@ -319,7 +346,27 @@ extern UINT32 _BootVectors[];
 extern VOID HalInterrupt(VOID);

 /* *
- * @ingroup  los_arch_interrupt
+ * @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
 * @brief: Reset the vector table.
 *
 * @par Description:
@ -332,13 +379,13 @@ extern VOID HalInterrupt(VOID);
 *
 * @retval:None.
 * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
+ * <ul><li>los_hwi.h: the header file that contains the API declaration.</li></ul>
 * @see None.
 */
 extern VOID Reset_Handler(VOID);

 /* *
- * @ingroup  los_arch_interrupt
+ * @ingroup  los_hwi
 * @brief: Pended System Call.
 *
 * @par Description:
@ -352,25 +399,39 @@ extern VOID Reset_Handler(VOID);
 *
 * @retval:None.
 * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
+ * <ul><li>los_hwi.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
@ -439,10 +500,11 @@ 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);
@ -583,7 +645,7 @@ VOID HalHwiInit(VOID);
 * @ingroup los_exc
 * Exception information structure
 *
- * Description: Exception information saved when an exception is triggered on the Cortex-M55 platform.
+ * Description: Exception information saved when an exception is triggered on the Cortex-M4 platform.
 *
 */
 typedef struct TagExcInfo {
@ -606,9 +668,10 @@ typedef struct TagExcInfo {
    EXC_CONTEXT_S *context;
 } ExcInfo;

-extern ExcInfo g_excInfo;
 extern UINT32 g_curNestCount;
+extern UINT32 g_intCount;
 extern UINT8 g_uwExcTbl[32];
+extern ExcInfo g_excInfo;

 #define MAX_INT_INFO_SIZE       (8 + 0x164)

@ -618,4 +681,4 @@ extern UINT8 g_uwExcTbl[32];
 #endif /* __cplusplus */
 #endif /* __cplusplus */

-#endif /* _LOS_ARCH_INTERRUPT_H */
+#endif /* _LOS_EXC_H */
--- a/arch/arm/cortex-m55/iar/TZ/non_secure/los_interrupt.c
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -28,10 +28,13 @@
 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-#include <stdarg.h>
+
+#include "los_interrupt.h"
 #include "securec.h"
-#include "los_context.h"
+#include <stdarg.h>
 #include "los_arch_interrupt.h"
+#include "los_context.h"
+#include "los_debug.h"
 #include "los_hook.h"
 #include "los_task.h"
 #include "los_sched.h"
@ -41,7 +44,92 @@
 #include "los_cpup.h"
 #endif

-#define DEF_HANDLER_START_INDEX 2
+/*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
@ -57,54 +145,100 @@ 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;
 }

-STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
-{
-    HwiSetPriority(hwiNum, hwiPrio);
-    HwiUnmask(hwiNum);
-    return LOS_OK;
-}
-
-STATIC HwiControllerOps g_archHwiOps = {
+HwiControllerOps g_archHwiOps = {
    .enableIrq      = HwiUnmask,
    .disableIrq     = HwiMask,
    .setIrqPriority = HwiSetPriority,
    .getCurIrqNum   = HwiNumGet,
    .triggerIrq     = HwiPending,
    .clearIrq       = HwiClear,
-    .createIrq      = HwiCreate,
 };

-HwiControllerOps *ArchIntOpsGet(VOID)
+inline UINT32 ArchIsIntActive(VOID)
 {
-    return &g_archHwiOps;
+    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;
 }

 /* ****************************************************************************
@ -165,6 +299,97 @@ 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)
@ -397,24 +622,23 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
    UINT32 index;
-    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
-    hwiForm[0] = 0;             /* [0] Top of Stack */
-    hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
+    g_hwiForm[0] = 0;             /* [0] Top of Stack */
+    g_hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
    for (index = 2; index < OS_VECTOR_CNT; index++) { /* 2: The starting position of the interrupt */
-        hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+        g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
    }
    /* Exception handler register */
-    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;
+    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;

    /* Interrupt vector table location */
-    SCB->VTOR = (UINT32)(UINTPTR)hwiForm;
+    SCB->VTOR = (UINT32)(UINTPTR)g_hwiForm;
 #endif
 #if (__CORTEX_M >= 0x03U) /* only for Cortex-M3 and above */
    NVIC_SetPriorityGrouping(OS_NVIC_AIRCR_PRIGROUP);
@ -427,3 +651,4 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)

    return;
 }
+
--- a/arch/arm/cortex-m55/iar/TZ/non_secure/los_timer.c
+++ b/arch/arm/cortex-m55/iar/TZ/non_secure/los_timer.c
@ -85,7 +85,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
    SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
    SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
+    NVIC_ClearPendingIRQ(SysTick_IRQn);
    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
    return nextResponseTime;
 }
--- a/arch/arm/cortex-m7/gcc/los_arch_interrupt.h
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -32,7 +32,9 @@
 #ifndef _LOS_ARCH_INTERRUPT_H
 #define _LOS_ARCH_INTERRUPT_H

-#include "los_common_interrupt.h"
+#include "los_config.h"
+#include "los_compiler.h"
+#include "los_interrupt.h"

 #ifdef __cplusplus
 #if __cplusplus
@ -40,6 +42,14 @@ 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.
@ -56,6 +66,19 @@ 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.
@ -87,7 +110,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  platformis [OS_USER_HWI_MIN,OS_USER_HWI_MAX].
+ * The value range of the interrupt number applicable for a Cortex-M7 platform is [OS_USER_HWI_MIN,OS_USER_HWI_MAX].
 */
 #define OS_ERRNO_HWI_NUM_INVALID              LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x00)

@ -163,16 +186,6 @@ 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.
@ -299,6 +312,20 @@ 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.
@ -318,6 +345,25 @@ extern UINT32 _BootVectors[];
 */
 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.
@ -357,20 +403,34 @@ 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
@ -443,6 +503,7 @@ 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);
@ -606,9 +667,10 @@ typedef struct TagExcInfo {
    EXC_CONTEXT_S *context;
 } ExcInfo;

-extern ExcInfo g_excInfo;
 extern UINT32 g_curNestCount;
+extern UINT32 g_intCount;
 extern UINT8 g_uwExcTbl[32];
+extern ExcInfo g_excInfo;

 #define MAX_INT_INFO_SIZE       (8 + 0x164)

--- a/arch/arm/cortex-m7/gcc/los_interrupt.c
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -28,10 +28,12 @@
 * 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"
@ -41,6 +43,84 @@
 #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
@ -55,54 +135,99 @@ 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;
 }

-STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
-{
-    HwiSetPriority(hwiNum, hwiPrio);
-    HwiUnmask(hwiNum);
-    return LOS_OK;
-}
-
-STATIC HwiControllerOps g_archHwiOps = {
+HwiControllerOps g_archHwiOps = {
    .enableIrq      = HwiUnmask,
    .disableIrq     = HwiMask,
    .setIrqPriority = HwiSetPriority,
    .getCurIrqNum   = HwiNumGet,
    .triggerIrq     = HwiPending,
    .clearIrq       = HwiClear,
-    .createIrq      = HwiCreate,
 };

-HwiControllerOps *ArchIntOpsGet(VOID)
+inline UINT32 ArchIsIntActive(VOID)
 {
-    return &g_archHwiOps;
+    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;
 }

 /* ****************************************************************************
@ -161,6 +286,97 @@ 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)
@ -383,11 +599,6 @@ 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
@ -399,24 +610,23 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
    UINT32 index;
-    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
-    hwiForm[0] = 0;             /* [0] Top of Stack */
-    hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
+    g_hwiForm[0] = 0;             /* [0] Top of Stack */
+    g_hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
    for (index = 2; index < OS_VECTOR_CNT; index++) { /* 2: The starting position of the interrupt */
-        hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+        g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
    }
    /* Exception handler register */
-    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;
+    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;

    /* Interrupt vector table location */
-    SCB->VTOR = (UINT32)(UINTPTR)hwiForm;
+    SCB->VTOR = (UINT32)(UINTPTR)g_hwiForm;
 #endif
 #if (__CORTEX_M >= 0x03U) /* only for Cortex-M3 and above */
    NVIC_SetPriorityGrouping(OS_NVIC_AIRCR_PRIGROUP);
@ -434,3 +644,4 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)

    return;
 }
+
--- a/arch/arm/cortex-m7/gcc/los_timer.c
+++ b/arch/arm/cortex-m7/gcc/los_timer.c
@ -84,7 +84,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
    SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
    SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
+    NVIC_ClearPendingIRQ(SysTick_IRQn);
    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
    return nextResponseTime;
 }
--- a/arch/arm/cortex-m7/iar/BUILD.gn
+++ b/arch/arm/cortex-m7/iar/BUILD.gn
@ -1,47 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2024 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 = "arch"
-kernel_module(module_name) {
-  sources = [
-    "los_context.c",
-    "los_dispatch.S",
-    "los_exc.S",
-    "los_interrupt.c",
-    "los_mpu.c",
-    "los_timer.c",
-  ]
-  configs += [ "$LITEOSTOPDIR:warn_config" ]
-}
-
-config("public") {
-  include_dirs = [ "." ]
-}
--- a/arch/arm/cortex-m7/iar/los_arch_interrupt.h
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -32,7 +32,9 @@
 #ifndef _LOS_ARCH_INTERRUPT_H
 #define _LOS_ARCH_INTERRUPT_H

-#include "los_common_interrupt.h"
+#include "los_config.h"
+#include "los_compiler.h"
+#include "los_interrupt.h"

 #ifdef __cplusplus
 #if __cplusplus
@ -40,6 +42,14 @@ 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.
@ -56,17 +66,18 @@ extern "C" {
 #define OS_HWI_PRIO_LOWEST                    7
 #endif

+
 /* *
- * @ingroup los_arch_interrupt
- * AIRCR register priority group parameter .
+ * @ingroup  los_arch_interrupt
+ * Define the type of a hardware interrupt vector table function.
 */
-#define OS_NVIC_AIRCR_PRIGROUP                7
+typedef VOID (**HWI_VECTOR_FUNC)(void);

 /* *
 * @ingroup los_arch_interrupt
- * Boot interrupt vector table.
+ * Count of interrupts.
 */
-extern UINT32 _BootVectors[];
+extern UINT32 g_intCount;

 /* *
 * @ingroup los_arch_interrupt
@ -80,6 +91,18 @@ extern UINT32 _BootVectors[];
 */
 #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.
@ -87,7 +110,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  platformis [OS_USER_HWI_MIN,OS_USER_HWI_MAX].
+ * The value range of the interrupt number applicable for a Cortex-M7 platform is [OS_USER_HWI_MIN,OS_USER_HWI_MAX].
 */
 #define OS_ERRNO_HWI_NUM_INVALID              LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x00)

@ -163,16 +186,6 @@ 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.
@ -299,6 +312,20 @@ 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.
@ -318,6 +345,25 @@ extern UINT32 _BootVectors[];
 */
 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.
@ -357,20 +403,34 @@ 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
@ -443,6 +503,7 @@ 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);
@ -606,9 +667,10 @@ typedef struct TagExcInfo {
    EXC_CONTEXT_S *context;
 } ExcInfo;

-extern ExcInfo g_excInfo;
 extern UINT32 g_curNestCount;
+extern UINT32 g_intCount;
 extern UINT8 g_uwExcTbl[32];
+extern ExcInfo g_excInfo;

 #define MAX_INT_INFO_SIZE       (8 + 0x164)

--- a/arch/arm/cortex-m7/iar/los_interrupt.c
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -29,10 +29,12 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include <stdarg.h>
+#include "los_interrupt.h"
 #include "securec.h"
-#include "los_context.h"
+#include <stdarg.h>
 #include "los_arch_interrupt.h"
+#include "los_context.h"
+#include "los_debug.h"
 #include "los_hook.h"
 #include "los_task.h"
 #include "los_sched.h"
@ -42,8 +44,90 @@
 #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
@ -59,54 +143,100 @@ 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;
 }

-STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
-{
-    HwiSetPriority(hwiNum, hwiPrio);
-    HwiUnmask(hwiNum);
-    return LOS_OK;
-}
-
-STATIC HwiControllerOps g_archHwiOps = {
+HwiControllerOps g_archHwiOps = {
    .enableIrq      = HwiUnmask,
    .disableIrq     = HwiMask,
    .setIrqPriority = HwiSetPriority,
    .getCurIrqNum   = HwiNumGet,
    .triggerIrq     = HwiPending,
    .clearIrq       = HwiClear,
-    .createIrq      = HwiCreate,
 };

-HwiControllerOps *ArchIntOpsGet(VOID)
+inline UINT32 ArchIsIntActive(VOID)
 {
-    return &g_archHwiOps;
+    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;
 }

 /* ****************************************************************************
@ -165,6 +295,97 @@ 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)
@ -387,11 +608,6 @@ 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
@ -403,24 +619,23 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)
 {
 #if (LOSCFG_USE_SYSTEM_DEFINED_INTERRUPT == 1)
    UINT32 index;
-    HWI_PROC_FUNC *hwiForm = (HWI_PROC_FUNC *)ArchGetHwiFrom();
-    hwiForm[0] = 0;             /* [0] Top of Stack */
-    hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
+    g_hwiForm[0] = 0;             /* [0] Top of Stack */
+    g_hwiForm[1] = (HWI_PROC_FUNC)Reset_Handler; /* [1] reset */
    for (index = 2; index < OS_VECTOR_CNT; index++) { /* 2: The starting position of the interrupt */
-        hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
+        g_hwiForm[index] = (HWI_PROC_FUNC)HalHwiDefaultHandler;
    }
    /* Exception handler register */
-    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;
+    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;

    /* Interrupt vector table location */
-    SCB->VTOR = (UINT32)(UINTPTR)hwiForm;
+    SCB->VTOR = (UINT32)(UINTPTR)g_hwiForm;
 #endif
 #if (__CORTEX_M >= 0x03U) /* only for Cortex-M3 and above */
    NVIC_SetPriorityGrouping(OS_NVIC_AIRCR_PRIGROUP);
@ -434,3 +649,4 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit(VOID)

    return;
 }
+
--- a/arch/arm/cortex-m7/iar/los_timer.c
+++ b/arch/arm/cortex-m7/iar/los_timer.c
@ -84,7 +84,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
    SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
    SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
    SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
+    NVIC_ClearPendingIRQ(SysTick_IRQn);
    SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
    return nextResponseTime;
 }
--- a/arch/csky/BUILD.gn
+++ b/arch/csky/BUILD.gn
@ -1,5 +1,5 @@
 # Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2023 Huawei Device Co., Ltd. All rights reserved.
+# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
 # are permitted provided that the following conditions are met:
@ -30,8 +30,5 @@
 import("//kernel/liteos_m/liteos.gni")

 module_group("csky") {
-  modules = [
-    "common",
-    "v2/gcc",
-  ]
+  modules = [ "v2/gcc" ]
 }
--- a/arch/csky/common/BUILD.gn
+++ b/arch/csky/common/BUILD.gn
@ -1,39 +0,0 @@
-# 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 = [ "." ]
-}
--- a/arch/csky/common/los_common_interrupt.c
+++ b/arch/csky/common/los_common_interrupt.c
@ -1,285 +0,0 @@
-/*
- * 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)
-
-/* *
- * @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);
-}
--- a/arch/csky/common/los_common_interrupt.h
+++ b/arch/csky/common/los_common_interrupt.h
@ -1,121 +0,0 @@
-/*
- * 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)
-typedef struct {
-    HWI_PROC_FUNC pfnHandler;
-    VOID *pParm;
-} HWI_HANDLER_FUNC;
-
-/* *
- * @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 */
--- a/arch/csky/v2/gcc/los_arch_interrupt.h
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -32,7 +32,9 @@
 #ifndef _LOS_ARCH_INTERRUPT_H
 #define _LOS_ARCH_INTERRUPT_H

-#include "los_common_interrupt.h"
+#include "los_config.h"
+#include "los_compiler.h"
+#include "los_interrupt.h"

 #ifdef __cplusplus
 #if __cplusplus
@ -40,6 +42,14 @@ 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.
@ -62,6 +72,18 @@ 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.
@ -74,11 +96,6 @@ extern "C" {
 */
 #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

@ -191,16 +208,6 @@ 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.
@ -211,6 +218,20 @@ 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.
@ -230,6 +251,29 @@ extern VIC_TYPE *VIC_REG;
 */
 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
@ -239,6 +283,10 @@ extern VOID HalInterrupt(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
--- a/arch/csky/v2/gcc/los_interrupt.c
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -29,6 +29,7 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+#include "los_interrupt.h"
 #include <stdarg.h>
 #include "securec.h"
 #include "los_context.h"
@ -52,10 +53,20 @@
 #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;
@ -109,6 +120,10 @@ 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));
@ -121,6 +136,14 @@ 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);
@ -132,6 +155,10 @@ 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);
@ -143,6 +170,10 @@ 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);
@ -152,11 +183,69 @@ 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
@ -169,26 +258,43 @@ STATIC UINT32 HwiNumGet(VOID)
    return (HalGetPsr() >> PSR_VEC_OFFSET) & MASK_8_BITS;
 }

-STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
-{
-    HwiSetPriority(hwiNum, (UINT8)hwiPrio);
-    HwiUnmask(hwiNum);
-    return LOS_OK;
-}
-
-STATIC HwiControllerOps g_archHwiOps = {
+HwiControllerOps g_archHwiOps = {
+    .triggerIrq     = HwiPending,
    .enableIrq      = HwiUnmask,
    .disableIrq     = HwiMask,
    .setIrqPriority = HwiSetPriority,
    .getCurIrqNum   = HwiNumGet,
-    .triggerIrq     = HwiPending,
    .clearIrq       = HwiClear,
-    .createIrq      = HwiCreate,
 };

-HwiControllerOps *ArchIntOpsGet(VOID)
+inline UINT32 ArchIsIntActive(VOID)
 {
-    return &g_archHwiOps;
+    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;
 }

 /* ****************************************************************************
@ -233,6 +339,83 @@ 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)
@ -419,17 +602,16 @@ 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++) {
-        hwiForm[i] = (HWI_PROC_FUNC)HandleEntry;
+        g_hwiForm[i] = (HWI_PROC_FUNC)HandleEntry;
    }

    for (i = OS_SYS_VECTOR_CNT; i < (LOSCFG_PLATFORM_HWI_LIMIT + OS_SYS_VECTOR_CNT); i++) {
-        hwiForm[i] = (HWI_PROC_FUNC)IrqEntry;
+        g_hwiForm[i] = (HWI_PROC_FUNC)IrqEntry;
    }
-    HalHwiHandleReInit((UINT32)hwiForm);
+    HalHwiHandleReInit((UINT32)&g_hwiForm);

-    HalSetVbr((UINT32)hwiForm);
+    HalSetVbr((UINT32)&g_hwiForm);
    for (i = 0; i < BYTES_OF_128_INT; i++) {
        VIC_REG->IABR[i] = 0x0;
        VIC_REG->ICPR[i] = MASK_32_BITS;
--- a/arch/include/los_arch.h
+++ b/arch/include/los_arch.h
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -62,14 +62,6 @@ STATIC INLINE UINTPTR ArchMspGet(VOID)
    __asm("mrs %0, msp" : "=r" (msp));
    return msp;
 }
-
-#define ARCH_LR_GET()                           \
-({                                              \
-    UINTPTR lr;                                 \
-    __asm("mov %0, lr" : "=r" (lr));            \
-    (lr);                                       \
-})
-#define ArchLRGet ARCH_LR_GET
 #elif defined(__CLANG_ARM) || defined(__GNUC__)
 STATIC INLINE UINTPTR ArchSpGet(VOID)
 {
@ -91,14 +83,6 @@ STATIC INLINE UINTPTR ArchMspGet(VOID)
    __asm volatile("mrs %0, msp" : "=r" (msp));
    return msp;
 }
-
-#define ARCH_LR_GET()                           \
-({                                              \
-    UINTPTR lr;                                 \
-    __asm volatile("mov %0, lr" : "=r" (lr));   \
-    (lr);                                       \
-})
-#define ArchLRGet ARCH_LR_GET
 #else
 /* Other platforms to be improved  */
 #endif
--- a/arch/include/los_interrupt.h
+++ b/arch/include/los_interrupt.h
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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,7 +31,6 @@

 #ifndef _LOS_INTERRUPT_H
 #define _LOS_INTERRUPT_H
-
 #include "los_config.h"
 #include "los_compiler.h"

@ -42,8 +41,11 @@ 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)
@ -51,7 +53,6 @@ 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 */
@ -65,17 +66,37 @@ 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);
-#if (LOSCFG_DEBUG_TOOLS == 1)
-extern UINT32 OsGetHwiFormCnt(UINT32 index);
-extern CHAR *OsGetHwiFormName(UINT32 index);
-extern BOOL OsHwiIsCreated(UINT32 index);
-#endif
+
+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

 /**
 * @ingroup  los_interrupt
@ -141,34 +162,70 @@ 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 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);
+UINT32 ArchHwiCreate(HWI_HANDLE_T hwiNum,
+                     HWI_PRIOR_T hwiPrio,
+                     HWI_MODE_T mode,
+                     HWI_PROC_FUNC handler,
+                     HwiIrqParam *irqParam);

-#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
+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

 #ifdef __cplusplus
 #if __cplusplus
--- a/arch/risc-v/BUILD.gn
+++ b/arch/risc-v/BUILD.gn
@ -30,8 +30,5 @@
 import("//kernel/liteos_m/liteos.gni")

 module_group("risc-v") {
-  modules = [
-    "common",
-    "riscv32/gcc",
-  ]
+  modules = [ "riscv32/gcc" ]
 }
--- a/arch/risc-v/common/BUILD.gn
+++ b/arch/risc-v/common/BUILD.gn
@ -1,39 +0,0 @@
-# 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 = [ "." ]
-}
--- a/arch/risc-v/common/los_common_interrupt.c
+++ b/arch/risc-v/common/los_common_interrupt.c
@ -1,103 +0,0 @@
-/*
- * 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();
-}
--- a/arch/risc-v/common/los_common_interrupt.h
+++ b/arch/risc-v/common/los_common_interrupt.h
@ -1,60 +0,0 @@
-/*
- * 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 */
--- a/arch/risc-v/nuclei/gcc/los_arch_interrupt.h
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 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,12 +29,14 @@
 * 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
@ -190,16 +192,6 @@ 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);
@ -210,4 +202,4 @@ extern VOID DisplayTaskInfo(VOID);
 #endif /* __cplusplus */
 #endif /* __cplusplus */

-#endif /* _LOS_ARCH_INTERRUPT_H */
+#endif /* _LOS_HWI_H */
--- a/arch/risc-v/nuclei/gcc/los_interrupt.c
+++ b/arch/risc-v/nuclei/gcc/los_interrupt.c
@ -1,5 +1,4 @@
 /*
- * 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,
@ -38,6 +37,8 @@
 #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) {
@ -149,6 +150,20 @@ 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
@ -200,13 +215,13 @@ __attribute__((always_inline)) inline VOID HalIntExit(VOID)
    g_intCount -= 1;
 }

-STATIC HwiControllerOps g_archHwiOps = {
+__attribute__((always_inline)) inline UINT32 ArchIsIntActive(VOID)
+{
+    return (g_intCount > 0);
+}
+
+const HwiControllerOps g_archHwiOps = {
    .enableIrq      = HwiUnmask,
    .disableIrq     = HwiMask,
    .setIrqPriority = HwiSetPriority,
 };
-
-HwiControllerOps *ArchIntOpsGet(VOID)
-{
-    return &g_archHwiOps;
-}
--- a/arch/risc-v/riscv32/gcc/asm/soc_common.h
+++ b/arch/risc-v/riscv32/gcc/asm/soc_common.h
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2020, Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -63,9 +63,6 @@
 #define RISCV_MIE_MEIE                      0x000000800

 /************************** mcause ***********************/
-#ifndef MCAUSE_INT_ID_MASK
-#define MCAUSE_INT_ID_MASK                  0x7FFFFFF
-#endif
 #define RISCV_MCAUSE_ECALL_U                8

 #define RISCV_USER_SOFT_IRQ                 0
@ -75,6 +72,7 @@
 #define RISCV_USER_EXT_IRQ                  8
 #define RISCV_MACH_EXT_IRQ                  11

+
 #define READ_CSR(reg) ({                                          \
    UINT32 _tmp;                                                  \
    __asm__ volatile("csrr %0, " #reg : "=r"(_tmp) : : "memory"); \
--- a/arch/risc-v/riscv32/gcc/los_arch_interrupt.h
+++ b/arch/risc-v/riscv32/gcc/los_arch_interrupt.h
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2020, Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -31,7 +31,11 @@
 #ifndef _LOS_ARCH_INTERRUPT_H
 #define _LOS_ARCH_INTERRUPT_H

-#include "los_common_interrupt.h"
+#include "los_compiler.h"
+#include "los_config.h"
+#include "los_interrupt.h"
+#include "los_arch_context.h"
+#include "los_error.h"

 #ifdef __cplusplus
 #if __cplusplus
@ -39,10 +43,6 @@ extern "C" {
 #endif /* __cplusplus */
 #endif /* __cplusplus */

-#if (LOSCFG_PLATFORM_HWI_WITH_ARG == 0)
-#error "LOSCFG_PLATFORM_HWI_WITH_ARG must be set to 1 !!!"
-#endif
-
 /**
 * @ingroup  los_arch_interrupt
 * Define the type of a hardware interrupt vector table function.
@ -110,12 +110,6 @@ typedef struct {
 */
 #define OS_RISCV_VECTOR_CNT                  (OS_RISCV_SYS_VECTOR_CNT + OS_RISCV_CUSTOM_IRQ_VECTOR_CNT)

-/**
- * @ingroup los_arch_interrupt
- * Count of risc-v system interrupt vector.
- */
-#define OS_SYS_VECTOR_CNT                    0
-
 /**
 * Maximum number of supported hardware devices that generate hardware interrupts.
 * The maximum number of hardware devices that generate hardware interrupts supported by hi3518ev200 is 32.
@ -148,6 +142,9 @@ 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
@ -272,16 +269,6 @@ extern VOID HalHwiInterruptDone(HWI_HANDLE_T hwiNum);
 */
 #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
--- a/arch/risc-v/riscv32/gcc/los_context.c
+++ b/arch/risc-v/riscv32/gcc/los_context.c
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2020, Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -35,7 +35,7 @@
 #include "los_task.h"
 #include "los_sched.h"
 #include "los_memory.h"
-#include "soc_common.h"
+#include "soc.h"

 STATIC UINT32 g_sysNeedSched = FALSE;

--- a/arch/risc-v/riscv32/gcc/los_dispatch.S
+++ b/arch/risc-v/riscv32/gcc/los_dispatch.S
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2020, Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -29,7 +29,7 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#include "soc_common.h"
+#include "soc.h"

 .global  HalEnableIRQ
 .global  HalDisableIRQ
--- a/arch/risc-v/riscv32/gcc/los_exc.S
+++ b/arch/risc-v/riscv32/gcc/los_exc.S
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2020, Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -31,7 +31,7 @@

 #ifndef _LOS_EXC_S
 #define _LOS_EXC_S
-#include "soc_common.h"
+#include "soc.h"

 .macro PUSH_CALLER_REG
    addi sp, sp, -(32 * REGBYTES)
@ -139,7 +139,8 @@ HalTrapEntry:
    sw    a0, 0 * REGBYTES(sp)
    csrr  t0, mtval
    sw    t0, 1 * REGBYTES(sp)
-    sw    zero, 2 * REGBYTES(sp)
+    csrr  t0, medeleg
+    sw    t0, 2 * REGBYTES(sp)
    sw    gp, 3 * REGBYTES(sp)
    mv    a0, sp
    csrw  mscratch, sp
--- a/arch/risc-v/riscv32/gcc/los_interrupt.c
+++ b/arch/risc-v/riscv32/gcc/los_interrupt.c
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2013-2020, Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -40,6 +40,7 @@
 #include "los_hook.h"
 #include "riscv_hal.h"

+
 LosExcInfo g_excInfo;
 #define RISCV_EXC_TYPE_NUM 16
 #define RISCV_EXC_LOAD_MISALIGNED 4
@ -63,6 +64,7 @@ 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
@ -93,6 +95,14 @@ 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;
@ -134,6 +144,12 @@ 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
@ -151,7 +167,6 @@ LITE_OS_SEC_TEXT UINT32 ArchHwiCreate(HWI_HANDLE_T hwiNum,
                                      HWI_PROC_FUNC hwiHandler,
                                      HwiIrqParam *irqParam)
 {
-    (VOID)hwiMode;
    UINT32 intSave;

    if (hwiHandler == NULL) {
@ -268,7 +283,7 @@ STATIC VOID ExcInfoDisplayContext(const LosExcInfo *exc)
    ExcBackTrace(taskContext->s0);
 }

-STATIC VOID ExcInfoDisplay(VOID)
+STATIC VOID ExcInfoDisplay(const LosExcContext *excBufAddr)
 {
    PRINTK("\nException Information     \n");

@ -290,11 +305,6 @@ STATIC VOID ExcInfoDisplay(VOID)

 WEAK UINT32 HalUnalignedAccessFix(UINTPTR mcause, UINTPTR mepc, UINTPTR mtval, VOID *sp)
 {
-    (VOID)mcause;
-    (VOID)mepc;
-    (VOID)mtval;
-    (VOID)sp;
-
    /* Unaligned access fixes are not supported by default */
    PRINTK("Unaligned access fixes are not supported by default!\n");
    return LOS_NOK;
@ -319,7 +329,7 @@ VOID HalExcEntry(const LosExcContext *excBufAddr)
        }
    }

-    ExcInfoDisplay();
+    ExcInfoDisplay(excBufAddr);

    if (LOS_TaskIsRunning()) {
        PRINTK("----------------All Task information ------------\n");
@ -332,9 +342,3 @@ SYSTEM_DEATH:
    }
 }

-LITE_OS_SEC_BSS STATIC HwiControllerOps g_archHwiOps;
-
-HwiControllerOps *ArchIntOpsGet(VOID)
-{
-    return &g_archHwiOps;
-}
--- a/arch/xtensa/BUILD.gn
+++ b/arch/xtensa/BUILD.gn
@ -1,5 +1,5 @@
 # Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2023 Huawei Device Co., Ltd. All rights reserved.
+# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification,
 # are permitted provided that the following conditions are met:
@ -30,8 +30,5 @@
 import("//kernel/liteos_m/liteos.gni")

 module_group("xtensa") {
-  modules = [
-    "common",
-    "lx6/gcc",
-  ]
+  modules = [ "lx6/gcc" ]
 }
--- a/arch/xtensa/common/los_common_interrupt.c
+++ b/arch/xtensa/common/los_common_interrupt.c
@ -1,271 +0,0 @@
-/*
- * 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)
-
-/* *
- * @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);
-}
--- a/arch/xtensa/common/los_common_interrupt.h
+++ b/arch/xtensa/common/los_common_interrupt.h
@ -1,102 +0,0 @@
-/*
- * 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)
-typedef struct {
-    HWI_PROC_FUNC pfnHandler;
-    VOID *pParm;
-} HWI_HANDLER_FUNC;
-
-/* *
- * @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 */
--- a/arch/xtensa/lx6/gcc/los_arch_interrupt.h
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -32,7 +32,9 @@
 #ifndef _LOS_ARCH_INTERRUPT_H
 #define _LOS_ARCH_INTERRUPT_H

-#include "los_common_interrupt.h"
+#include "los_config.h"
+#include "los_compiler.h"
+#include "los_interrupt.h"

 #ifdef __cplusplus
 #if __cplusplus
@ -65,6 +67,14 @@ 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.
@ -81,6 +91,22 @@ 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.
@ -173,17 +199,22 @@ extern CHAR *VECTOR_START;
 */
 #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
- * Hardware interrupt error code: Invalid interrupt operation function.
- *
- * Value: 0x0200090c
- *
- * Solution: Set a valid interrupt operation function
+ * Set interrupt vector table.
 */
-#define OS_ERRNO_HWI_OPS_FUNC_NULL            LOS_ERRNO_OS_ERROR(LOS_MOD_HWI, 0x0c)
+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

 VOID HalInterrupt(VOID);
+VOID HalHwiDefaultHandler(VOID);
 VOID HalExcHandleEntry(UINTPTR faultAddr, EXC_CONTEXT_S *excBufAddr, UINT32 type);
 VOID HalHwiInit(VOID);

--- a/arch/xtensa/lx6/gcc/los_interrupt.c
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -29,6 +29,7 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+#include "los_interrupt.h"
 #include <stdarg.h>
 #include "securec.h"
 #include "los_context.h"
@ -41,6 +42,65 @@
 #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.
@ -94,24 +154,37 @@ 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;
 }

-STATIC UINT32 HwiUnmask(HWI_HANDLE_T hwiNum)
+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;
 }

-STATIC UINT32 HwiMask(HWI_HANDLE_T hwiNum)
+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)));

@ -143,32 +216,53 @@ STATIC UINT32 HwiNumGet(VOID)
 * @ingroup los_hwi
 * Clear the interrupt
 */
-STATIC UINT32 HwiClear(HWI_HANDLE_T hwiNum)
+STATIC UINT32 HwiClear(HWI_HANDLE_T vector)
 {
-    __asm__ __volatile__("wsr   %0, intclear; rsync" : : "a"(0x1U << hwiNum));
+    if (!HwiNumValid(vector)) {
+        return OS_ERRNO_HWI_NUM_INVALID;
+    }
+
+    __asm__ __volatile__("wsr   %0, intclear; rsync" : : "a"(0x1U << vector));

    return LOS_OK;
 }

-STATIC UINT32 HwiCreate(HWI_HANDLE_T hwiNum, HWI_PRIOR_T hwiPrio)
-{
-    (VOID)hwiPrio;
-    HwiUnmask(hwiNum);
-    return LOS_OK;
-}
-
-STATIC HwiControllerOps g_archHwiOps = {
+HwiControllerOps g_archHwiOps = {
    .triggerIrq     = HwiPending,
    .enableIrq      = HwiUnmask,
    .disableIrq     = HwiMask,
    .getCurIrqNum   = HwiNumGet,
    .clearIrq       = HwiClear,
-    .createIrq      = HwiCreate,
 };

-HwiControllerOps *ArchIntOpsGet(VOID)
+INLINE UINT32 ArchIsIntActive(VOID)
 {
-    return &g_archHwiOps;
+    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;
 }

 /* ****************************************************************************
@ -214,6 +308,88 @@ 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)
@ -383,9 +559,8 @@ 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++) {
-        hwiForm[i + OS_SYS_VECTOR_CNT] = HalHwiDefaultHandler;
+        g_hwiForm[i + OS_SYS_VECTOR_CNT] = HalHwiDefaultHandler;
        HwiMask(i);
    }
    asm volatile ("wsr %0, vecbase" : : "r"(INIT_VECTOR_START));
--- a/arch/xtensa/lx6/gcc/los_timer.c
+++ b/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-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without modification,
 * are permitted provided that the following conditions are met:
@ -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));

-    LOS_HwiEnable(tick->irqNum);
+    HwiUnmask(tick->irqNum);
    return LOS_OK;
 }

@ -115,12 +115,12 @@ STATIC UINT64 SysTickCycleGet(UINT32 *period)

 STATIC VOID SysTickLock(VOID)
 {
-    LOS_HwiDisable(OS_TICK_INT_NUM);
+    HwiMask(OS_TICK_INT_NUM);
 }

 STATIC VOID SysTickUnlock(VOID)
 {
-    LOS_HwiEnable(OS_TICK_INT_NUM);
+    HwiUnmask(OS_TICK_INT_NUM);
 }

 ArchTickTimer *ArchSysTickTimerGet(VOID)
--- a/bundle.json
+++ b/bundle.json
@ -27,6 +27,9 @@
    "component": {
        "name": "liteos_m",
        "subsystem": "kernel",
+        "syscap": [
+            "SystemCapability.Kernel.liteos-m"
+        ],
        "features": [],
        "adapted_system_type": [
            "mini"
@ -40,7 +43,7 @@
            "third_party": [
                "bounds_checking_function",
                "cmsis",
-                "FatFs",
+                "fatfs",
                "littlefs",
                "lwip",
                "musl"
@ -55,4 +58,4 @@
            "test": []
        }
    }
-}
+}
--- a/components/backtrace/los_backtrace.c
+++ b/components/backtrace/los_backtrace.c
@ -43,7 +43,7 @@
   judgment condition to support multiple code sections. */
 WEAK BOOL OsStackDataIsCodeAddr(UINTPTR value)
 {
-    if ((value > CODE_START_ADDR) && (value < CODE_END_ADDR)) {
+    if ((value >= CODE_START_ADDR) && (value < CODE_END_ADDR)) {
        return TRUE;
    }
    return FALSE;
--- a/components/cpup/los_cpup.c
+++ b/components/cpup/los_cpup.c
@ -58,9 +58,6 @@

 #define OS_CPUP_RECORD_PERIOD   (g_sysClock)

-#define OS_SYS_CYCLE_TO_US(cycle)  ((cycle) / (g_sysClock)) * OS_SYS_US_PER_SECOND + \
-    ((cycle) % (g_sysClock) * OS_SYS_US_PER_SECOND / (g_sysClock))
-
 LITE_OS_SEC_BSS UINT16    g_cpupInitFlg = 0;
 LITE_OS_SEC_BSS OsCpupCB  *g_cpup = NULL;
 LITE_OS_SEC_BSS UINT64    g_lastRecordTime;
@ -170,15 +167,6 @@ LITE_OS_SEC_TEXT_INIT UINT32 OsCpupInit()
    return LOS_OK;
 }

-/* The calculation time unit is changed to us to decouple the influence of
- * system frequency modulation on CPUP
- */
-STATIC UINT64 CpupTimeUsGet(VOID)
-{
-    UINT64 time = LOS_SysCycleGet();
-    return OS_SYS_CYCLE_TO_US(time);
-}
-
 /*****************************************************************************
 Function   : OsTskCycleStart
 Description: start task to get cycles count in current task beginning
@ -195,11 +183,10 @@ LITE_OS_SEC_TEXT_MINOR VOID OsTskCycleStart(VOID)

    taskID = g_losTask.newTask->taskID;
    g_cpup[taskID].cpupID = taskID;
-    g_cpup[taskID].startTime = CpupTimeUsGet();
+    g_cpup[taskID].startTime = LOS_SysCycleGet();

    return;
 }
-
 /*****************************************************************************
 Function   : OsTskCycleEnd
 Description: quit task and get cycle count
@ -209,7 +196,7 @@ Return     : None
 LITE_OS_SEC_TEXT_MINOR VOID OsTskCycleEnd(VOID)
 {
    UINT32 taskID;
-    UINT64 cpuTime;
+    UINT64 cpuCycle;

    if (g_cpupInitFlg == 0) {
        return;
@ -221,17 +208,16 @@ LITE_OS_SEC_TEXT_MINOR VOID OsTskCycleEnd(VOID)
        return;
    }

-    cpuTime = CpupTimeUsGet();
-    if (cpuTime < g_cpup[taskID].startTime) {
-        cpuTime += OS_US_PER_TICK;
+    cpuCycle = LOS_SysCycleGet();
+    if (cpuCycle < g_cpup[taskID].startTime) {
+        cpuCycle += g_cyclesPerTick;
    }

-    g_cpup[taskID].allTime += (cpuTime - g_cpup[taskID].startTime);
+    g_cpup[taskID].allTime += (cpuCycle - g_cpup[taskID].startTime);
    g_cpup[taskID].startTime = 0;

    return;
 }
-
 /*****************************************************************************
 Function   : OsTskCycleEndStart
 Description: start task to get cycles count in current task ending
@ -241,7 +227,7 @@ Return     : None
 LITE_OS_SEC_TEXT_MINOR VOID OsTskCycleEndStart(VOID)
 {
    UINT32 taskID;
-    UINT64 cpuTime;
+    UINT64 cpuCycle;
    UINT16 loopNum;

    if (g_cpupInitFlg == 0) {
@ -249,23 +235,23 @@ LITE_OS_SEC_TEXT_MINOR VOID OsTskCycleEndStart(VOID)
    }

    taskID = g_losTask.runTask->taskID;
-    cpuTime = CpupTimeUsGet();
+    cpuCycle = LOS_SysCycleGet();

    if (g_cpup[taskID].startTime != 0) {
-        if (cpuTime < g_cpup[taskID].startTime) {
-            cpuTime += OS_US_PER_TICK;
+        if (cpuCycle < g_cpup[taskID].startTime) {
+            cpuCycle += g_cyclesPerTick;
        }

-        g_cpup[taskID].allTime += (cpuTime - g_cpup[taskID].startTime);
+        g_cpup[taskID].allTime += (cpuCycle - g_cpup[taskID].startTime);
        g_cpup[taskID].startTime = 0;
    }

    taskID = g_losTask.newTask->taskID;
    g_cpup[taskID].cpupID = taskID;
-    g_cpup[taskID].startTime = cpuTime;
+    g_cpup[taskID].startTime = cpuCycle;

-    if ((cpuTime - g_lastRecordTime) > OS_CPUP_RECORD_PERIOD) {
-        g_lastRecordTime = cpuTime;
+    if ((cpuCycle - g_lastRecordTime) > OS_CPUP_RECORD_PERIOD) {
+        g_lastRecordTime = cpuCycle;

        for (loopNum = 0; loopNum < g_taskMaxNum; loopNum++) {
            g_cpup[loopNum].historyTime[g_hisPos] = g_cpup[loopNum].allTime;
@ -281,12 +267,12 @@ LITE_OS_SEC_TEXT_MINOR VOID OsTskCycleEndStart(VOID)
    return;
 }

-LITE_OS_SEC_TEXT_MINOR STATIC INLINE UINT16 OsGetPrePos(UINT16 curPos)
+LITE_OS_SEC_TEXT_MINOR static inline UINT16 OsGetPrePos(UINT16 curPos)
 {
    return (curPos == 0) ? (OS_CPUP_HISTORY_RECORD_NUM - 1) : (curPos - 1);
 }

-LITE_OS_SEC_TEXT_MINOR STATIC VOID OsGetPositions(UINT16 mode, UINT16* curPosAddr, UINT16* prePosAddr)
+LITE_OS_SEC_TEXT_MINOR static VOID OsGetPositions(UINT16 mode, UINT16* curPosAddr, UINT16* prePosAddr)
 {
    UINT16 curPos;
    UINT16 prePos = 0;
@ -312,7 +298,7 @@ Return     : cpupRet:current CPU usage
 *****************************************************************************/
 LITE_OS_SEC_TEXT_MINOR UINT32 LOS_SysCpuUsage(VOID)
 {
-    UINT64  cpuTimeAll = 0;
+    UINT64  cpuCycleAll = 0;
    UINT32  cpupRet = 0;
    UINT16  loopNum;
    UINT32 intSave;
@ -326,12 +312,12 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_SysCpuUsage(VOID)
    OsTskCycleEnd();

    for (loopNum = 0; loopNum < g_taskMaxNum; loopNum++) {
-        cpuTimeAll += g_cpup[loopNum].allTime;
+        cpuCycleAll += g_cpup[loopNum].allTime;
    }

-    if (cpuTimeAll) {
+    if (cpuCycleAll) {
        cpupRet = LOS_CPUP_PRECISION -  (UINT32)((LOS_CPUP_PRECISION *
-            g_cpup[g_idleTaskID].allTime) / cpuTimeAll);
+            g_cpup[g_idleTaskID].allTime) / cpuCycleAll);
    }

    OsTskCycleStart();
@ -348,7 +334,7 @@ Return     : cpupRet:CPU usage history
 *****************************************************************************/
 LITE_OS_SEC_TEXT_MINOR UINT32 LOS_HistorySysCpuUsage(UINT16 mode)
 {
-    UINT64  cpuTimeAll = 0;
+    UINT64  cpuCycleAll = 0;
    UINT64  idleCycleAll = 0;
    UINT32  cpupRet = 0;
    UINT16  loopNum;
@ -368,9 +354,9 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_HistorySysCpuUsage(UINT16 mode)

    for (loopNum = 0; loopNum < g_taskMaxNum; loopNum++) {
        if (mode == CPUP_IN_1S) {
-            cpuTimeAll += g_cpup[loopNum].historyTime[curPos] - g_cpup[loopNum].historyTime[prePos];
+            cpuCycleAll += g_cpup[loopNum].historyTime[curPos] - g_cpup[loopNum].historyTime[prePos];
        } else {
-            cpuTimeAll += g_cpup[loopNum].allTime - g_cpup[loopNum].historyTime[curPos];
+            cpuCycleAll += g_cpup[loopNum].allTime - g_cpup[loopNum].historyTime[curPos];
        }
    }

@ -381,8 +367,8 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_HistorySysCpuUsage(UINT16 mode)
        idleCycleAll += g_cpup[g_idleTaskID].allTime - g_cpup[g_idleTaskID].historyTime[curPos];
    }

-    if (cpuTimeAll) {
-        cpupRet = (LOS_CPUP_PRECISION -  (UINT32)((LOS_CPUP_PRECISION * idleCycleAll) / cpuTimeAll));
+    if (cpuCycleAll) {
+        cpupRet = (LOS_CPUP_PRECISION -  (UINT32)((LOS_CPUP_PRECISION * idleCycleAll) / cpuCycleAll));
    }

    OsTskCycleStart();
@ -399,7 +385,7 @@ Return     : cpupRet:CPU usage of certain task
 *****************************************************************************/
 LITE_OS_SEC_TEXT_MINOR UINT32 LOS_TaskCpuUsage(UINT32 taskID)
 {
-    UINT64  cpuTimeAll = 0;
+    UINT64  cpuCycleAll = 0;
    UINT16  loopNum;
    UINT32 intSave;
    UINT32  cpupRet = 0;
@ -424,11 +410,11 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_TaskCpuUsage(UINT32 taskID)
        if ((g_cpup[loopNum].status & OS_TASK_STATUS_UNUSED) || (g_cpup[loopNum].status == 0)) {
            continue;
        }
-        cpuTimeAll += g_cpup[loopNum].allTime;
+        cpuCycleAll += g_cpup[loopNum].allTime;
    }

-    if (cpuTimeAll) {
-        cpupRet = (UINT32)((LOS_CPUP_PRECISION * g_cpup[taskID].allTime) / cpuTimeAll);
+    if (cpuCycleAll) {
+        cpupRet = (UINT32)((LOS_CPUP_PRECISION * g_cpup[taskID].allTime) / cpuCycleAll);
    }

    OsTskCycleStart();
@ -446,8 +432,8 @@ Return     : cpupRet:CPU usage history of task
 *****************************************************************************/
 LITE_OS_SEC_TEXT_MINOR UINT32 LOS_HistoryTaskCpuUsage(UINT32 taskID, UINT16 mode)
 {
-    UINT64  cpuTimeAll = 0;
-    UINT64  cpuTimeCurTsk = 0;
+    UINT64  cpuCycleAll = 0;
+    UINT64  cpuCycleCurTsk = 0;
    UINT16  loopNum, curPos;
    UINT16  prePos = 0;
    UINT32 intSave;
@ -477,19 +463,19 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_HistoryTaskCpuUsage(UINT32 taskID, UINT16 mode
        }

        if (mode == CPUP_IN_1S) {
-            cpuTimeAll += g_cpup[loopNum].historyTime[curPos] - g_cpup[loopNum].historyTime[prePos];
+            cpuCycleAll += g_cpup[loopNum].historyTime[curPos] - g_cpup[loopNum].historyTime[prePos];
        } else {
-            cpuTimeAll += g_cpup[loopNum].allTime - g_cpup[loopNum].historyTime[curPos];
+            cpuCycleAll += g_cpup[loopNum].allTime - g_cpup[loopNum].historyTime[curPos];
        }
    }

    if (mode == CPUP_IN_1S) {
-        cpuTimeCurTsk += g_cpup[taskID].historyTime[curPos] - g_cpup[taskID].historyTime[prePos];
+        cpuCycleCurTsk += g_cpup[taskID].historyTime[curPos] - g_cpup[taskID].historyTime[prePos];
    } else {
-        cpuTimeCurTsk += g_cpup[taskID].allTime - g_cpup[taskID].historyTime[curPos];
+        cpuCycleCurTsk += g_cpup[taskID].allTime - g_cpup[taskID].historyTime[curPos];
    }
-    if (cpuTimeAll) {
-        cpupRet = (UINT32)((LOS_CPUP_PRECISION * cpuTimeCurTsk) / cpuTimeAll);
+    if (cpuCycleAll) {
+        cpupRet = (UINT32)((LOS_CPUP_PRECISION * cpuCycleCurTsk) / cpuCycleAll);
    }

    OsTskCycleStart();
@ -504,8 +490,8 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_AllTaskCpuUsage(CPUP_INFO_S *cpupInfo, UINT16
    UINT16  curPos;
    UINT16  prePos = 0;
    UINT32 intSave;
-    UINT64  cpuTimeAll = 0;
-    UINT64  cpuTimeCurTsk = 0;
+    UINT64  cpuCycleAll = 0;
+    UINT64  cpuCycleCurTsk = 0;

    if (g_cpupInitFlg == 0) {
        return  LOS_ERRNO_CPUP_NO_INIT;
@ -527,9 +513,9 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_AllTaskCpuUsage(CPUP_INFO_S *cpupInfo, UINT16
        }

        if (mode == CPUP_IN_1S) {
-            cpuTimeAll += g_cpup[loopNum].historyTime[curPos] - g_cpup[loopNum].historyTime[prePos];
+            cpuCycleAll += g_cpup[loopNum].historyTime[curPos] - g_cpup[loopNum].historyTime[prePos];
        } else {
-            cpuTimeAll += g_cpup[loopNum].allTime - g_cpup[loopNum].historyTime[curPos];
+            cpuCycleAll += g_cpup[loopNum].allTime - g_cpup[loopNum].historyTime[curPos];
        }
    }

@ -540,16 +526,16 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_AllTaskCpuUsage(CPUP_INFO_S *cpupInfo, UINT16
        }

        if (mode == CPUP_IN_1S) {
-            cpuTimeCurTsk += g_cpup[loopNum].historyTime[curPos] - g_cpup[loopNum].historyTime[prePos];
+            cpuCycleCurTsk += g_cpup[loopNum].historyTime[curPos] - g_cpup[loopNum].historyTime[prePos];
        } else {
-            cpuTimeCurTsk += g_cpup[loopNum].allTime - g_cpup[loopNum].historyTime[curPos];
+            cpuCycleCurTsk += g_cpup[loopNum].allTime - g_cpup[loopNum].historyTime[curPos];
        }
        cpupInfo[loopNum].usStatus = g_cpup[loopNum].status;
-        if (cpuTimeAll) {
-            cpupInfo[loopNum].uwUsage = (UINT32)((LOS_CPUP_PRECISION * cpuTimeCurTsk) / cpuTimeAll);
+        if (cpuCycleAll) {
+            cpupInfo[loopNum].uwUsage = (UINT32)((LOS_CPUP_PRECISION * cpuCycleCurTsk) / cpuCycleAll);
        }

-        cpuTimeCurTsk = 0;
+        cpuCycleCurTsk = 0;
    }

    OsTskCycleStart();
@ -616,47 +602,46 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_CpupUsageMonitor(CPUP_TYPE_E type, CPUP_MODE_E
 #if (LOSCFG_CPUP_INCLUDE_IRQ == 1)
 LITE_OS_SEC_TEXT_MINOR VOID OsCpupIrqStart(UINT32 intNum)
 {
-    if ((g_irqCpupInitFlg == 0) || (intNum < OS_SYS_VECTOR_CNT)) {
+    if (g_irqCpupInitFlg == 0) {
        return;
    }
-    UINT32 cpupIntNum = intNum - OS_SYS_VECTOR_CNT;
-    g_irqCpup[cpupIntNum].startTime = CpupTimeUsGet();
+
+    g_irqCpup[intNum].startTime = LOS_SysCycleGet();
    return;
 }

 LITE_OS_SEC_TEXT_MINOR VOID OsCpupIrqEnd(UINT32 intNum)
 {
-    UINT64 cpuTime;
+    UINT64 cpuCycle;
    UINT64 usedTime;

-    if ((g_irqCpupInitFlg == 0) || (intNum < OS_SYS_VECTOR_CNT)) {
+    if (g_irqCpupInitFlg == 0) {
        return;
    }

-    UINT32 cpupIntNum = intNum - OS_SYS_VECTOR_CNT;
-    if (g_irqCpup[cpupIntNum].startTime == 0) {
+    if (g_irqCpup[intNum].startTime == 0) {
        return;
    }

-    cpuTime = CpupTimeUsGet();
-    if (cpuTime < g_irqCpup[cpupIntNum].startTime) {
-        cpuTime += OS_US_PER_TICK;
+    cpuCycle = LOS_SysCycleGet();
+    if (cpuCycle < g_irqCpup[intNum].startTime) {
+        cpuCycle += g_cyclesPerTick;
    }

-    g_irqCpup[cpupIntNum].cpupID = intNum;
-    g_irqCpup[cpupIntNum].status = OS_CPUP_USED;
-    usedTime = cpuTime - g_irqCpup[cpupIntNum].startTime;
+    g_irqCpup[intNum].cpupID = intNum;
+    g_irqCpup[intNum].status = OS_CPUP_USED;
+    usedTime = cpuCycle - g_irqCpup[intNum].startTime;

-    if (g_irqCpup[cpupIntNum].count <= 1000) { /* 1000, Take 1000 samples */
-        g_irqCpup[cpupIntNum].allTime += usedTime;
-        g_irqCpup[cpupIntNum].count++;
+    if (g_irqCpup[intNum].count <= 1000) { /* 1000, Take 1000 samples */
+        g_irqCpup[intNum].allTime += usedTime;
+        g_irqCpup[intNum].count++;
    } else {
-        g_irqCpup[cpupIntNum].allTime = 0;
-        g_irqCpup[cpupIntNum].count = 0;
+        g_irqCpup[intNum].allTime = 0;
+        g_irqCpup[intNum].count = 0;
    }
-    g_irqCpup[cpupIntNum].startTime = 0;
-    if (usedTime > g_irqCpup[cpupIntNum].timeMax) {
-        g_irqCpup[cpupIntNum].timeMax = usedTime;
+    g_irqCpup[intNum].startTime = 0;
+    if (usedTime > g_irqCpup[intNum].timeMax) {
+        g_irqCpup[intNum].timeMax = usedTime;
    }
    return;
 }
@ -687,12 +672,12 @@ LITE_OS_SEC_TEXT_MINOR STATIC VOID OsGetIrqPositions(UINT16 mode, UINT16* curPos
 LITE_OS_SEC_TEXT_MINOR STATIC UINT64 OsGetIrqAllTime(VOID)
 {
    INT32 i;
-    UINT64 cpuTimeAll = 0;
+    UINT64 cpuCycleAll = 0;
    for (i = 0; i < OS_CPUP_HISTORY_RECORD_NUM; i++) {
-        cpuTimeAll += g_cpuHistoryTime[i];
+        cpuCycleAll += g_cpuHistoryTime[i];
    }

-    return cpuTimeAll;
+    return cpuCycleAll;
 }

 LITE_OS_SEC_TEXT_MINOR STATIC UINT64 OsGetIrqAllHisTime(UINT32 num)
@ -712,8 +697,8 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_GetAllIrqCpuUsage(UINT16 mode, CPUP_INFO_S *cp
    UINT16 curPos;
    UINT16 prePos = 0;
    UINT32 intSave;
-    UINT64 cpuTimeAll;
-    UINT64 cpuTimeCurIrq;
+    UINT64 cpuCycleAll;
+    UINT64 cpuCycleCurIrq;

    if (g_irqCpupInitFlg == 0) {
        return  LOS_ERRNO_CPUP_NO_INIT;
@ -727,9 +712,9 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_GetAllIrqCpuUsage(UINT16 mode, CPUP_INFO_S *cp

    OsGetIrqPositions(mode, &curPos, &prePos);
    if (mode == CPUP_IN_10S) {
-        cpuTimeAll = OsGetIrqAllTime();
+        cpuCycleAll = OsGetIrqAllTime();
    } else {
-        cpuTimeAll = g_cpuHistoryTime[curPos] - g_cpuHistoryTime[prePos];
+        cpuCycleAll = g_cpuHistoryTime[curPos] - g_cpuHistoryTime[prePos];
    }

    for (loopNum = 0; loopNum < LOSCFG_PLATFORM_HWI_LIMIT; loopNum++) {
@ -740,13 +725,13 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_GetAllIrqCpuUsage(UINT16 mode, CPUP_INFO_S *cp
        cpupInfo[loopNum].usStatus = g_irqCpup[loopNum].status;

        if (mode == CPUP_IN_10S) {
-            cpuTimeCurIrq = OsGetIrqAllHisTime(loopNum);
+            cpuCycleCurIrq = OsGetIrqAllHisTime(loopNum);
        } else {
-            cpuTimeCurIrq = g_irqCpup[loopNum].historyTime[curPos] - g_irqCpup[loopNum].historyTime[prePos];
+            cpuCycleCurIrq = g_irqCpup[loopNum].historyTime[curPos] - g_irqCpup[loopNum].historyTime[prePos];
        }

-        if (cpuTimeAll != 0) {
-            cpupInfo[loopNum].uwUsage = (UINT32)((LOS_CPUP_PRECISION * cpuTimeCurIrq) / cpuTimeAll);
+        if (cpuCycleAll != 0) {
+            cpupInfo[loopNum].uwUsage = (UINT32)((LOS_CPUP_PRECISION * cpuCycleCurIrq) / cpuCycleAll);
        }
    }

--- a/components/debugtools/los_hwidump.c
+++ b/components/debugtools/los_hwidump.c
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022-2023 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2022-2022 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 ((OsHwiIsCreated(i) != TRUE) || (OsGetHwiFormCnt(i) == 0)) {
+        if ((OsGetHwiCreated(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 ((OsHwiIsCreated(i) != TRUE) || (OsGetHwiFormCnt(i) == 0)) {
+        if ((OsGetHwiCreated(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 */
--- a/components/exchook/los_exc_info.h
+++ b/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)
--- a/components/fs/fatfs/BUILD.gn
+++ b/components/fs/fatfs/BUILD.gn
@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 import("//kernel/liteos_m/liteos.gni")
-import("$THIRDPARTY_FATFS_DIR/FatFs.gni")
+import("//third_party/FatFs/FatFs.gni")

 module_switch = defined(LOSCFG_FS_FAT)
 module_name = get_path_info(rebase_path("."), "name")
--- a/components/fs/fatfs/Kconfig
+++ b/components/fs/fatfs/Kconfig
@ -32,6 +32,7 @@ config FS_FAT
    default n
    depends on FS_VFS
    select SUPPORT_FATFS
+    select KAL_CMSIS
    help
      Answer Y to enable LiteOS support fat filesystem.

--- a/components/fs/fatfs/fatfs.c
+++ b/components/fs/fatfs/fatfs.c
@ -60,6 +60,7 @@
 #endif /* FS_LOCK_TIMEOUT_SEC */

 static UINT8 g_workBuffer[FF_MAX_SS];
+static pthread_mutex_t g_fatfsMutex = PTHREAD_MUTEX_INITIALIZER;
 static char *g_volPath[FF_VOLUMES] = {FF_VOLUME_STRS};

 PARTITION VolToPart[] = {
@ -69,6 +70,31 @@ PARTITION VolToPart[] = {
    { 0, 0, 4, 0, 0 }
 };

+static int FsLock(void)
+{
+    int ret = 0;
+    struct timespec absTimeout = {0};
+    if (!OsCheckKernelRunning()) {
+        return ret;
+    }
+    ret = clock_gettime(CLOCK_REALTIME, &absTimeout);
+    if (ret != 0) {
+        PRINT_ERR("clock gettime err 0x%x!\r\n", errno);
+        return errno;
+    }
+    absTimeout.tv_sec += FS_LOCK_TIMEOUT_SEC;
+    ret = pthread_mutex_timedlock(&g_fatfsMutex, &absTimeout);
+    return ret;
+}
+
+static void FsUnlock(void)
+{
+    if (!OsCheckKernelRunning()) {
+        return;
+    }
+    (void)pthread_mutex_unlock(&g_fatfsMutex);
+}
+
 static int FsChangeDrive(const char *path)
 {
    INT32 res;
@ -249,69 +275,95 @@ int FatfsMount(struct MountPoint *mp, unsigned long mountflags,
 {
    FRESULT res;
    FATFS *fs = NULL;
+    int ret;
+
+    ret = FsLock();
+    if (ret != 0) {
+        errno = ret;
+        return (int)LOS_NOK;
+    }

    if (mountflags & MS_REMOUNT) {
-        return Remount(mp, mountflags);
+        ret = Remount(mp, mountflags);
+        FsUnlock();
+        return ret;
    }

    char *ldPath = GetLdPath(mp->mDev);
    if (ldPath == NULL) {
        errno = EFAULT;
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto ERROUT;
    }

    fs = (FATFS *)LOSCFG_FS_MALLOC_HOOK(sizeof(FATFS));
    if (fs == NULL) {
        errno = ENOMEM;
-        PutLdPath(ldPath);
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto ERROUT;
    }
    (void)memset_s(fs, sizeof(FATFS), 0, sizeof(FATFS));
-
-    res = f_mount(fs, ldPath, 1);
-    if (res != FR_OK) {
-        LOSCFG_FS_FREE_HOOK(fs);
-        PutLdPath(ldPath);
-        errno = FatfsErrno(res);
-        return (int)LOS_NOK;
-    }
    mp->mData = (void *)fs;

+    res = f_mount((FATFS *)mp->mData, ldPath, 1);
+    if (res != FR_OK) {
+        errno = FatfsErrno(res);
+        ret = (int)LOS_NOK;
+        goto ERROUT;
+    }
+
    PutLdPath(ldPath);
+    FsUnlock();
    return (int)LOS_OK;
+
+ERROUT:
+    LOSCFG_FS_FREE_HOOK(fs);
+    mp->mData = NULL;
+    PutLdPath(ldPath);
+    FsUnlock();
+    return ret;
 }

 int FatfsUmount(struct MountPoint *mp)
 {
+    int ret;
    int volId;
    FRESULT res;
-    char *ldPath = NULL;
    FATFS *fatfs = (FATFS *)mp->mData;

+    ret = FsLock();
+    if (ret != 0) {
+        errno = ret;
+        return (int)LOS_NOK;
+    }
+
+    char *ldPath = GetLdPath(mp->mDev);
+    if (ldPath == NULL) {
+        errno = EFAULT;
+        ret = (int)LOS_NOK;
+        goto OUT;
+    }
+
    /* The volume is not mounted */
    if (fatfs->fs_type == 0) {
        errno = EINVAL;
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto OUT;
    }

    volId = GetPartIdByPartName(mp->mDev);
    /* umount is not allowed when a file or directory is opened. */
    if (f_checkopenlock(volId) != FR_OK) {
        errno = EBUSY;
-        return (int)LOS_NOK;
-    }
-
-    ldPath = GetLdPath(mp->mDev);
-    if (ldPath == NULL) {
-        errno = EFAULT;
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto OUT;
    }

    res = f_mount((FATFS *)NULL, ldPath, 0);
    if (res != FR_OK) {
        errno = FatfsErrno(res);
-        PutLdPath(ldPath);
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto OUT;
    }

    if (fatfs->win != NULL) {
@ -321,15 +373,19 @@ int FatfsUmount(struct MountPoint *mp)
    LOSCFG_FS_FREE_HOOK(mp->mData);
    mp->mData = NULL;

+    ret = (int)LOS_OK;
+
+OUT:
    PutLdPath(ldPath);
-    return (int)LOS_OK;
+    FsUnlock();
+    return ret;
 }

 int FatfsUmount2(struct MountPoint *mp, int flag)
 {
+    int ret;
    UINT32 flags;
    FRESULT res;
-    char *ldPath = NULL;
    FATFS *fatfs = (FATFS *)mp->mData;

    flags = MNT_FORCE | MNT_DETACH | MNT_EXPIRE | UMOUNT_NOFOLLOW;
@ -338,23 +394,31 @@ int FatfsUmount2(struct MountPoint *mp, int flag)
        return (int)LOS_NOK;
    }

-    /* The volume is not mounted */
-    if (fatfs->fs_type == 0) {
-        errno = EINVAL;
+    ret = FsLock();
+    if (ret != 0) {
+        errno = ret;
        return (int)LOS_NOK;
    }

-    ldPath = GetLdPath(mp->mDev);
+    char *ldPath = GetLdPath(mp->mDev);
    if (ldPath == NULL) {
        errno = EFAULT;
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto OUT;
+    }
+
+    /* The volume is not mounted */
+    if (fatfs->fs_type == 0) {
+        errno = EINVAL;
+        ret = (int)LOS_NOK;
+        goto OUT;
    }

    res = f_mount((FATFS *)NULL, ldPath, 0);
    if (res != FR_OK) {
-        PutLdPath(ldPath);
        errno = FatfsErrno(res);
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto OUT;
    }

    if (fatfs->win != NULL) {
@ -364,8 +428,12 @@ int FatfsUmount2(struct MountPoint *mp, int flag)
    LOSCFG_FS_FREE_HOOK(mp->mData);
    mp->mData = NULL;

+    ret = (int)LOS_OK;
+
+OUT:
    PutLdPath(ldPath);
-    return (int)LOS_OK;
+    FsUnlock();
+    return ret;
 }

 int FatfsOpen(struct File *file, const char *path, int oflag)
@ -387,14 +455,21 @@ 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 = FsLock();
+    if (ret != 0) {
+        errno = ret;
+        LOSCFG_FS_FREE_HOOK(fp);
+        return (int)LOS_NOK;
+    }
+
    ret = FsChangeDrive(path);
    if (ret != (int)LOS_OK) {
        PRINT_ERR("FAT open ChangeDrive err 0x%x!\r\n", ret);
        errno = ENOENT;
+        ret = (int)LOS_NOK;
        LOSCFG_FS_FREE_HOOK(fp);
-        return (int)LOS_NOK;
+        goto OUT;
    }

    res = f_open(fp, path, fmode);
@ -402,20 +477,31 @@ int FatfsOpen(struct File *file, const char *path, int oflag)
        PRINT_ERR("FAT open err 0x%x!\r\n", res);
        LOSCFG_FS_FREE_HOOK(fp);
        errno = FatfsErrno(res);
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto OUT;
    }

    file->fData = (void *)fp;

-    return (int)LOS_OK;
+OUT:
+    FsUnlock();
+    return ret;
 }

 int FatfsClose(struct File *file)
 {
    FRESULT res;
    FIL *fp = (FIL *)file->fData;
+    int ret;
+
+    ret = FsLock();
+    if (ret != 0) {
+        errno = ret;
+        return (int)LOS_NOK;
+    }

    if ((fp == NULL) || (fp->obj.fs == NULL)) {
+        FsUnlock();
        errno = ENOENT;
        return (int)LOS_NOK;
    }
@ -423,6 +509,7 @@ int FatfsClose(struct File *file)
    res = f_close(fp);
    if (res != FR_OK) {
        PRINT_ERR("FAT close err 0x%x!\r\n", res);
+        FsUnlock();
        errno = FatfsErrno(res);
        return (int)LOS_NOK;
    }
@ -434,6 +521,7 @@ int FatfsClose(struct File *file)
 #endif
    LOSCFG_FS_FREE_HOOK(file->fData);
    file->fData = NULL;
+    FsUnlock();

    return (int)LOS_OK;
 }
@ -443,22 +531,31 @@ ssize_t FatfsRead(struct File *file, char *buf, size_t nbyte)
    FRESULT res;
    UINT32 lenRead;
    FIL *fp = (FIL *)file->fData;
+    int ret;

    if (buf == NULL) {
        errno = EFAULT;
        return (ssize_t)LOS_NOK;
    }

+    ret = FsLock();
+    if (ret != 0) {
+        errno = ret;
+        return (ssize_t)LOS_NOK;
+    }
    if (fp == NULL) {
+        FsUnlock();
        errno = ENOENT;
        return (ssize_t)LOS_NOK;
    }

    res = f_read(fp, buf, nbyte, &lenRead);
    if (res != FR_OK) {
+        FsUnlock();
        errno = FatfsErrno(res);
        return (ssize_t)LOS_NOK;
    }
+    FsUnlock();

    return (ssize_t)lenRead;
 }
@ -469,17 +566,24 @@ ssize_t FatfsWrite(struct File *file, const char *buf, size_t nbyte)
    UINT32 lenWrite;
    static BOOL overFlow = FALSE;
    FIL *fp = (FIL *)file->fData;
+    int ret;

    if (buf == NULL) {
        errno = EFAULT;
        return (ssize_t)LOS_NOK;
    }

-    if ((fp == NULL) || (fp->obj.fs == NULL)) {
-        errno = ENOENT;
+    ret = FsLock();
+    if (ret != 0) {
+        errno = ret;
        return (ssize_t)LOS_NOK;
    }

+    if ((fp ==NULL) || (fp->obj.fs == NULL)) {
+        errno = ENOENT;
+        goto ERROUT;
+    }
+
    res = f_write(fp, buf, nbyte, &lenWrite);
    if ((res == FR_OK) && (lenWrite == 0) && (nbyte != 0) && (overFlow == FALSE)) {
        overFlow = TRUE;
@ -488,10 +592,15 @@ ssize_t FatfsWrite(struct File *file, const char *buf, size_t nbyte)

    if ((res != FR_OK) || (nbyte != lenWrite)) {
        errno = FatfsErrno(res);
-        return (ssize_t)LOS_NOK;
+        goto ERROUT;
    }

+    FsUnlock();
    return (ssize_t)lenWrite;
+
+ERROUT:
+    FsUnlock();
+    return (ssize_t)LOS_NOK;
 }

 off_t FatfsLseek(struct File *file, off_t offset, int whence)
@ -499,10 +608,17 @@ off_t FatfsLseek(struct File *file, off_t offset, int whence)
    FRESULT res;
    off_t pos;
    FIL *fp = (FIL *)file->fData;
+    int ret;
+
+    ret = FsLock();
+    if (ret != 0) {
+        errno = ret;
+        return (off_t)LOS_NOK;
+    }

    if ((fp == NULL) || (fp->obj.fs == NULL)) {
        errno = ENOENT;
-        return (off_t)LOS_NOK;
+        goto ERROUT;
    }

    if (whence == SEEK_SET) {
@ -513,17 +629,22 @@ off_t FatfsLseek(struct File *file, off_t offset, int whence)
        pos = f_size(fp);
    } else {
        errno = EINVAL;
-        return (off_t)LOS_NOK;
+        goto ERROUT;
    }

    res = f_lseek(fp, offset + pos);
    if (res != FR_OK) {
        errno = FatfsErrno(res);
-        return (off_t)LOS_NOK;
+        goto ERROUT;
    }

    pos = f_tell(fp);
+    FsUnlock();
    return pos;
+
+ERROUT:
+    FsUnlock();
+    return (off_t)LOS_NOK;
 }

 /* Remove the specified FILE */
@ -537,26 +658,39 @@ int FatfsUnlink(struct MountPoint *mp, const char *path)
        return (int)LOS_NOK;
    }

+    ret = FsLock();
+    if (ret != 0) {
+        errno = ret;
+        return (int)LOS_NOK;
+    }
+
    if (!mp->mWriteEnable) {
        errno = EACCES;
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto OUT;
    }

    ret = FsChangeDrive(path);
    if (ret != (int)LOS_OK) {
        PRINT_ERR("FAT unlink ChangeDrive err 0x%x!\r\n", ret);
        errno = ENOENT;
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto OUT;
    }

    res = f_unlink(path);
    if (res != FR_OK) {
        PRINT_ERR("FAT unlink err 0x%x!\r\n", res);
        errno = FatfsErrno(res);
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto OUT;
    }

-    return (int)LOS_OK;
+    ret = (int)LOS_OK;
+
+OUT:
+    FsUnlock();
+    return ret;
 }

 int FatfsStat(struct MountPoint *mp, const char *path, struct stat *buf)
@ -570,18 +704,26 @@ int FatfsStat(struct MountPoint *mp, const char *path, struct stat *buf)
        return (int)LOS_NOK;
    }

+    ret = FsLock();
+    if (ret != 0) {
+        errno = ret;
+        return (int)LOS_NOK;
+    }
+
    ret = FsChangeDrive(path);
    if (ret != (int)LOS_OK) {
        PRINT_ERR("FAT stat ChangeDrive err 0x%x!\r\n", ret);
        errno = ENOENT;
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto OUT;
    }

    res = f_stat(path, &fileInfo);
    if (res != FR_OK) {
        PRINT_ERR("FAT stat err 0x%x!\r\n", res);
        errno = FatfsErrno(res);
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto OUT;
    }

    buf->st_size = fileInfo.fsize;
@ -598,27 +740,43 @@ int FatfsStat(struct MountPoint *mp, const char *path, struct stat *buf)
        buf->st_mode |= S_IFDIR;
    }

-    return (int)LOS_OK;
+    ret = (int)LOS_OK;
+
+OUT:
+    FsUnlock();
+    return ret;
 }

 /* Synchronize all changes to Flash */
 int FatfsSync(struct File *file)
 {
+    int ret;
    FRESULT res;
    FIL *fp = (FIL *)file->fData;

+    ret = FsLock();
+    if (ret != 0) {
+        errno = ret;
+        return (int)LOS_NOK;
+    }
+
    if ((fp == NULL) || (fp->obj.fs == NULL)) {
        errno = ENOENT;
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto OUT;
    }

    res = f_sync(fp);
    if (res != FR_OK) {
        errno = FatfsErrno(res);
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto OUT;
    }
+    ret = (int)LOS_OK;

-    return (int)LOS_OK;
+OUT:
+    FsUnlock();
+    return ret;
 }

 int FatfsMkdir(struct MountPoint *mp, const char *path)
@ -631,26 +789,38 @@ int FatfsMkdir(struct MountPoint *mp, const char *path)
        return (int)LOS_NOK;
    }

+    ret = FsLock();
+    if (ret != 0) {
+        errno = ret;
+        return (int)LOS_NOK;
+    }
+
    if (!mp->mWriteEnable) {
        errno = EACCES;
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto OUT;
    }

    ret = FsChangeDrive(path);
    if (ret != (int)LOS_OK) {
        PRINT_ERR("FAT mkdir ChangeDrive err 0x%x!\r\n", ret);
        errno = ENOENT;
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto OUT;
    }

    res = f_mkdir(path);
    if (res != FR_OK) {
        PRINT_ERR("FAT mkdir err 0x%x!\r\n", res);
        errno = FatfsErrno(res);
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto OUT;
    }
+    ret = (int)LOS_OK;

-    return (int)LOS_OK;
+OUT:
+    FsUnlock();
+    return ret;
 }

 int FatfsOpendir(struct Dir *dir, const char *dirName)
@ -661,35 +831,47 @@ int FatfsOpendir(struct Dir *dir, const char *dirName)

    if (dirName == NULL) {
        errno = EFAULT;
-        return (int)LOS_NOK;
+        goto ERROUT;
+    }
+
+    dp = (DIR *)LOSCFG_FS_MALLOC_HOOK(sizeof(DIR));
+    if (dp == NULL) {
+        errno = ENOENT;
+        goto ERROUT;
+    }
+
+    ret = FsLock();
+    if (ret != 0) {
+        errno = ret;
+        goto ERROUT;
    }

    ret = FsChangeDrive(dirName);
    if (ret != (int)LOS_OK) {
        PRINT_ERR("FAT opendir ChangeDrive err 0x%x!\r\n", ret);
        errno = ENOENT;
-        return (int)LOS_NOK;
+        goto ERROUT;
    }

-    dp = (DIR *)LOSCFG_FS_MALLOC_HOOK(sizeof(DIR));
-    if (dp == NULL) {
-        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);
-        LOSCFG_FS_FREE_HOOK(dp);
        errno = FatfsErrno(res);
-        return (int)LOS_NOK;
+        goto ERROUT;
    }

    dir->dData = dp;
    dir->dOffset = 0;

+    FsUnlock();
    return (int)LOS_OK;
+
+ERROUT:
+    if (dp != NULL) {
+        LOSCFG_FS_FREE_HOOK(dp);
+    }
+    FsUnlock();
+    return (int)LOS_NOK;
 }

 int FatfsReaddir(struct Dir *dir, struct dirent *dent)
@ -697,6 +879,7 @@ int FatfsReaddir(struct Dir *dir, struct dirent *dent)
    FRESULT res;
    FILINFO fileInfo = {0};
    DIR *dp = NULL;
+    int ret;

    if ((dir == NULL) || (dir->dData == NULL)) {
        errno = EBADF;
@ -704,11 +887,18 @@ int FatfsReaddir(struct Dir *dir, struct dirent *dent)
    }

    dp = (DIR *)dir->dData;
+    ret = FsLock();
+    if (ret != 0) {
+        errno = ret;
+        return (int)LOS_NOK;
+    }
+
    res = f_readdir(dp, &fileInfo);
    /* if res not ok or fname is NULL , return NULL */
    if ((res != FR_OK) || (fileInfo.fname[0] == 0x0)) {
        PRINT_ERR("FAT readdir err 0x%x!\r\n", res);
        errno = FatfsErrno(res);
+        FsUnlock();
        return (int)LOS_NOK;
    }

@ -719,6 +909,7 @@ int FatfsReaddir(struct Dir *dir, struct dirent *dent)
    } else {
        dent->d_type = DT_REG;
    }
+    FsUnlock();

    return (int)LOS_OK;
 }
@ -727,6 +918,7 @@ int FatfsClosedir(struct Dir *dir)
 {
    FRESULT res;
    DIR *dp = NULL;
+    int ret;

    if ((dir == NULL) || (dir->dData == NULL)) {
        errno = EBADF;
@ -734,15 +926,23 @@ int FatfsClosedir(struct Dir *dir)
    }

    dp = dir->dData;
+    ret = FsLock();
+    if (ret != 0) {
+        errno = ret;
+        return (int)LOS_NOK;
+    }
+
    res = f_closedir(dp);
    if (res != FR_OK) {
        PRINT_ERR("FAT closedir err 0x%x!\r\n", res);
+        FsUnlock();
        errno = FatfsErrno(res);
        return (int)LOS_NOK;
    }

    LOSCFG_FS_FREE_HOOK(dir->dData);
    dir->dData = NULL;
+    FsUnlock();

    return (int)LOS_OK;
 }
@ -757,26 +957,38 @@ int FatfsRmdir(struct MountPoint *mp, const char *path)
        return (int)LOS_NOK;
    }

+    ret = FsLock();
+    if (ret != 0) {
+        errno = ret;
+        return (int)LOS_NOK;
+    }
+
    if (!mp->mWriteEnable) {
        errno = EACCES;
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto OUT;
    }

    ret = FsChangeDrive(path);
    if (ret != (int)LOS_OK) {
        PRINT_ERR("FAT rmdir ChangeDrive err 0x%x!\r\n", ret);
        errno = ENOENT;
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto OUT;
    }

    res = f_rmdir(path);
    if (res != FR_OK) {
        PRINT_ERR("FAT rmdir err 0x%x!\r\n", res);
        errno = FatfsErrno(res);
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto OUT;
    }
+    ret = (int)LOS_OK;

-    return (int)LOS_OK;
+OUT:
+    FsUnlock();
+    return ret;
 }

 int FatfsRename(struct MountPoint *mp, const char *oldName, const char *newName)
@ -789,26 +1001,38 @@ int FatfsRename(struct MountPoint *mp, const char *oldName, const char *newName)
        return (int)LOS_NOK;
    }

+    ret = FsLock();
+    if (ret != 0) {
+        errno = ret;
+        return (int)LOS_NOK;
+    }
+
    if (!mp->mWriteEnable) {
        errno = EACCES;
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto OUT;
    }

    ret = FsChangeDrive(oldName);
    if (ret != (int)LOS_OK) {
        PRINT_ERR("FAT f_getfree ChangeDrive err 0x%x!\r\n", ret);
        errno = ENOENT;
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto OUT;
    }

    res = f_rename(oldName, newName);
    if (res != FR_OK) {
        PRINT_ERR("FAT frename err 0x%x!\r\n", res);
        errno = FatfsErrno(res);
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto OUT;
    }
+    ret = (int)LOS_OK;

-    return (int)LOS_OK;
+OUT:
+    FsUnlock();
+    return ret;
 }

 int FatfsStatfs(const char *path, struct statfs *buf)
@ -823,18 +1047,26 @@ int FatfsStatfs(const char *path, struct statfs *buf)
        return (int)LOS_NOK;
    }

+    ret = FsLock();
+    if (ret != 0) {
+        errno = ret;
+        return (int)LOS_NOK;
+    }
+
    ret = FsChangeDrive(path);
    if (ret != FR_OK) {
        PRINT_ERR("FAT f_getfree ChangeDrive err %d.", ret);
        errno = FatfsErrno(FR_INVALID_PARAMETER);
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto OUT;
    }

    res = f_getfree(path, &freeClust, &fs);
    if (res != FR_OK) {
        PRINT_ERR("FAT f_getfree err 0x%x.", res);
        errno = FatfsErrno(res);
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto OUT;
    }
    buf->f_bfree  = freeClust;
    buf->f_bavail = freeClust;
@ -846,7 +1078,11 @@ int FatfsStatfs(const char *path, struct statfs *buf)
    buf->f_bsize  = FF_MIN_SS * fs->csize;
 #endif

-    return (int)LOS_OK;
+    ret = (int)LOS_OK;
+
+OUT:
+    FsUnlock();
+    return ret;
 }

 static int DoTruncate(struct File *file, off_t length, UINT32 count)
@ -854,6 +1090,7 @@ static int DoTruncate(struct File *file, off_t length, UINT32 count)
    FRESULT res = FR_OK;
    DWORD csz;
    FIL *fp = (FIL *)file->fData;
+    int ret = (int)LOS_OK;

    csz = (DWORD)(fp->obj.fs)->csize * SS(fp->obj.fs); /* Cluster size */
    if (length > csz * count) {
@ -861,7 +1098,8 @@ static int DoTruncate(struct File *file, off_t length, UINT32 count)
        res = f_expand(fp, 0, (FSIZE_t)(length), FALLOC_FL_KEEP_SIZE);
 #else
        errno = ENOSYS;
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        return ret;
 #endif
    } else if (length < csz * count) {
        res = f_truncate(fp, (FSIZE_t)length);
@ -869,13 +1107,14 @@ static int DoTruncate(struct File *file, off_t length, UINT32 count)

    if (res != FR_OK) {
        errno = FatfsErrno(res);
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        return ret;
    }

    fp->obj.objsize = length; /* Set file size to length */
    fp->flag |= 0x40; /* Set modified flag */

-    return (int)LOS_OK;
+    return ret;
 }

 int FatfsTruncate(struct File *file, off_t length)
@ -884,30 +1123,49 @@ int FatfsTruncate(struct File *file, off_t length)
    UINT count;
    DWORD fclust;
    FIL *fp = (FIL *)file->fData;
+    int ret;

    if ((length < 0) || (length > UINT_MAX)) {
        errno = EINVAL;
        return (int)LOS_NOK;
    }

+    ret = FsLock();
+    if (ret != 0) {
+        errno = ret;
+        return (int)LOS_NOK;
+    }
+
    if ((fp == NULL) || (fp->obj.fs == NULL)) {
        errno = ENOENT;
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto OUT;
    }

    res = f_getclustinfo(fp, &fclust, &count);
    if (res != FR_OK) {
        errno = FatfsErrno(res);
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto OUT;
    }

-    return DoTruncate(file, length, count);
+    ret = DoTruncate(file, length, count);
+    if (ret != FR_OK) {
+        goto OUT;
+    }
+
+    ret = (int)LOS_OK;
+
+OUT:
+    FsUnlock();
+    return ret;
 }

 int FatfsFdisk(const char *dev, int *partTbl, int arrayNum)
 {
    int pdrv;
    FRESULT res;
+    int ret;

    if ((dev == NULL) || (partTbl == NULL)) {
        errno = EFAULT;
@ -920,13 +1178,25 @@ int FatfsFdisk(const char *dev, int *partTbl, int arrayNum)
        return (int)LOS_NOK;
    }

+    ret = FsLock();
+    if (ret != 0) {
+        errno = ret;
+        ret = (int)LOS_NOK;
+        goto OUT;
+    }
+
    res = f_fdisk(pdrv, (DWORD const *)partTbl, g_workBuffer);
    if (res != FR_OK) {
        errno = FatfsErrno(res);
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto OUT;
    }

-    return (int)LOS_OK;
+    ret = (int)LOS_OK;
+
+OUT:
+    FsUnlock();
+    return ret;
 }

 int FatfsFormat(const char *partName, void *privData)
@ -935,6 +1205,7 @@ int FatfsFormat(const char *partName, void *privData)
    MKFS_PARM opt = {0};
    int option = *(int *)privData;
    char *dev = NULL; /* logical driver */
+    int ret;

    if (partName == NULL) {
        errno = EFAULT;
@ -947,17 +1218,29 @@ int FatfsFormat(const char *partName, void *privData)
        return (int)LOS_NOK;
    }

+    ret = FsLock();
+    if (ret != 0) {
+        errno = ret;
+        PutLdPath(dev);
+        return (int)LOS_NOK;
+    }
+
    opt.fmt = option;
    opt.n_sect = 0; /* use default allocation unit size depends on the volume
                       size. */
    res = f_mkfs(dev, &opt, g_workBuffer, FF_MAX_SS);
    if (res != FR_OK) {
        errno = FatfsErrno(res);
-        PutLdPath(dev);
-        return (int)LOS_NOK;
+        ret = (int)LOS_NOK;
+        goto OUT;
    }

-    return (int)LOS_OK;
+    ret = (int)LOS_OK;
+
+OUT:
+    PutLdPath(dev);
+    FsUnlock();
+    return ret;
 }

 static struct MountOps g_fatfsMnt = {
--- a/components/fs/littlefs/BUILD.gn
+++ b/components/fs/littlefs/BUILD.gn
@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 import("//kernel/liteos_m/liteos.gni")
-import("$THIRDPARTY_LITTLEFS_DIR/littlefs.gni")
+import("//third_party/littlefs/littlefs.gni")

 module_switch = defined(LOSCFG_FS_LITTLEFS)
 module_name = get_path_info(rebase_path("."), "name")
--- a/components/fs/littlefs/lfs_adapter.c
+++ b/components/fs/littlefs/lfs_adapter.c
@ -32,6 +32,7 @@
 #define _GNU_SOURCE 1
 #include "lfs_adapter.h"
 #include "los_config.h"
+#include "los_fs.h"
 #include "vfs_files.h"
 #include "vfs_operations.h"
 #include "vfs_partition.h"
@ -40,6 +41,8 @@
 #include "securec.h"
 #include "los_fs.h"

+static pthread_mutex_t g_fsLocalMutex = PTHREAD_MUTEX_INITIALIZER;
+
 static struct PartitionCfg g_partitionCfg;
 static struct DeviceDesc *g_lfsDevice = NULL;

@ -375,6 +378,7 @@ int LfsReaddir(struct Dir *dir, struct dirent *dent)

    ret = lfs_dir_read(lfs, dirInfo, &lfsInfo);
    if (ret == TRUE) {
+        pthread_mutex_lock(&g_fsLocalMutex);
        (void)strncpy_s(dent->d_name, sizeof(dent->d_name), lfsInfo.name, strlen(lfsInfo.name) + 1);
        if (lfsInfo.type == LFS_TYPE_DIR) {
            dent->d_type = DT_DIR;
@ -383,6 +387,7 @@ int LfsReaddir(struct Dir *dir, struct dirent *dent)
        }

        dent->d_reclen = lfsInfo.size;
+        pthread_mutex_unlock(&g_fsLocalMutex);

        return LOS_OK;
    }
@ -562,7 +567,10 @@ int LfsClose(struct File *file)
        return (int)LOS_NOK;
    }

+    pthread_mutex_lock(&g_fsLocalMutex);
    ret = lfs_file_close((lfs_t *)mp->mData, lfsHandle);
+    pthread_mutex_unlock(&g_fsLocalMutex);
+
    if (ret != 0) {
        errno = LittlefsErrno(ret);
        ret = (int)LOS_NOK;
--- a/components/fs/vfs/BUILD.gn
+++ b/components/fs/vfs/BUILD.gn
@ -41,14 +41,14 @@ kernel_module(module_name) {
  ]

  include_dirs = [
-    "$LITEOSTOPDIR/kernel/arch/include",
-    "$LITEOSTOPDIR/kernel/include",
-    "$LITEOSTOPDIR/utils",
+    "//kernel/liteos_m/kernel/arch/include",
+    "//kernel/liteos_m/kernel/include",
+    "//kernel/liteos_m/utils",
    "../",
    ".",
  ]

-  deps = [ "$LITEOSTOPDIR/kal" ]
+  deps = [ "//kernel/liteos_m/kal" ]
  configs += [ "$LITEOSTOPDIR:warn_config" ]
  if (!defined(LOSCFG_COMPILER_ICCARM)) {
    cflags = [ "-Wno-parentheses" ]
--- a/components/fs/vfs/Kconfig
+++ b/components/fs/vfs/Kconfig
@ -30,23 +30,6 @@
 config FS_VFS
    bool "Enable FS VFS"
    default y
-    select POSIX_FS_API

    help
      Answer Y to enable LiteOS support VFS.
-
-if FS_VFS
-config FS_LOCK_TIMEOUT
-    int "Filesystem global lock timeout value in tick. -1 for waiting forever"
-    default -1
-    help
-        The timeout value of getting filesystem lock in tick. -1 for waiting forever
-
-config FS_SUPPORT_MOUNT_TARGET_RECURSIVE
-    bool "Mount target can be recursive"
-    default n
-    depends on FS_VFS
-
-    help
-      Answer Y to enable LiteOS support VFS mount recursively. For example, "/system/bin".
-endif
--- a/components/fs/vfs/los_fs.h
+++ b/components/fs/vfs/los_fs.h
@ -46,7 +46,6 @@
 #include "sys/uio.h"
 #include "unistd.h"
 #include <stdarg.h>
-#include "vfs_maps.h"

 #ifdef __cplusplus
 #if __cplusplus
@ -62,6 +61,41 @@ extern "C" {
 #define LOSCFG_FS_FREE_HOOK(ptr) LOS_MemFree((VOID *)OS_SYS_MEM_ADDR, ptr)
 #endif

+int LOS_Open(const char *path, int flags, ...);
+int LOS_Close(int fd);
+ssize_t LOS_Read(int fd, void *buff, size_t bytes);
+ssize_t LOS_Write(int fd, const void *buff, size_t bytes);
+off_t LOS_Lseek(int fd, off_t off, int whence);
+int LOS_Stat(const char *path, struct stat *stat);
+int LOS_Statfs(const char *path, struct statfs *buf);
+int LOS_Unlink(const char *path);
+int LOS_Rename(const char *oldpath, const char *newpath);
+int LOS_Fsync(int fd);
+DIR *LOS_Opendir(const char *path);
+struct dirent *LOS_Readdir(DIR *dir);
+int LOS_Closedir(DIR *dir);
+int LOS_Mkdir(const char *path, mode_t mode);
+int LOS_Rmdir(const char *path);
+int LOS_Lstat(const char *path, struct stat *buffer);
+int LOS_Fstat(int fd, struct stat *buf);
+int LOS_Fcntl(int fd, int cmd, ...);
+int LOS_Ioctl(int fd, int req, ...);
+ssize_t LOS_Readv(int fd, const struct iovec *iovBuf, int iovcnt);
+ssize_t LOS_Writev(int fd, const struct iovec *iovBuf, int iovcnt);
+ssize_t LOS_Pread(int fd, void *buff, size_t bytes, off_t off);
+ssize_t LOS_Pwrite(int fd, const void *buff, size_t bytes, off_t off);
+int LOS_Isatty(int fd);
+int LOS_Access(const char *path, int amode);
+int LOS_Ftruncate(int fd, off_t length);
+int LOS_FsUmount(const char *target);
+int LOS_FsUmount2(const char *target, int flag);
+int LOS_FsMount(const char *source, const char *target,
+                const char *fsType, unsigned long mountflags,
+                const void *data);
+
+int OsFcntl(int fd, int cmd, va_list ap);
+int OsIoctl(int fd, int req, va_list ap);
+
 struct PartitionCfg {
    /* partition low-level read func */
    int  (*readFunc)(int partition, UINT32 *offset, void *buf, UINT32 size);
@ -118,39 +152,6 @@ int LOS_DiskPartition(const char *dev, const char *fsType, int *lengthArray, int
 */
 int LOS_PartitionFormat(const char *partName, char *fsType, void *data);

-/*
- * @brief new file system callbacks register.
- * These callback functions are the adaptation layer implemented by the developer,
- * used to interconnect the vfs with the new file system.
- *
- * LOS_FsRegister must be called after kernel initialization is complete.
- *
- * @param fsType file system type, don't register the same type fs more than once.
- * @param fsMops mount operation of the fs.
- * @param fsFops file operation of the fs.
- * @param fsMgt management operation of the fs.
- *
- * @return Return LOS_OK if success.
- *         Return LOS_NOK if error.
- *         errno EINVAL: input errors, such as null pointers.
- *         errno ENOMEM: memory may malloc failed.
- *
- */
-int LOS_FsRegister(const char *fsType, const struct MountOps *fsMops,
-                   const struct FileOps *fsFops, const struct FsManagement *fsMgt);
-
-/*
- * @brief Lock the whole filesystem to forbid filesystem access.
- *
- * @return Return LOS_NOK if error. Return LOS_OK if seccess.
- */
-int LOS_FsLock(void);
-
-/*
- * @brief Unlock the whole filesystem to allow filesystem access.
- */
-void LOS_FsUnlock(void);
-
 #ifdef __cplusplus
 #if __cplusplus
 extern "C" {
--- a/components/fs/vfs/vfs_config.h
+++ b/components/fs/vfs/vfs_config.h
@ -49,17 +49,21 @@

 #ifdef LOSCFG_FS_FAT
 #include "fatfs_conf.h"
+#define __FAT_NFILE FAT_MAX_OPEN_FILES
+#else
+#define __FAT_NFILE 0
 #endif

 #ifdef LOSCFG_FS_LITTLEFS
 #include "lfs_conf.h"
+#define __LFS_NFILE LOSCFG_LFS_MAX_OPEN_FILES
+#else
+#define __LFS_NFILE 0
 #endif

-#ifndef CONFIG_NFILE_DESCRIPTORS
-#define CONFIG_NFILE_DESCRIPTORS 256
-#endif
+#define CONFIG_NFILE_DESCRIPTORS    (__FAT_NFILE + __LFS_NFILE)

-#define NR_OPEN_DEFAULT (CONFIG_NFILE_DESCRIPTORS - MIN_START_FD)
+#define NR_OPEN_DEFAULT CONFIG_NFILE_DESCRIPTORS

 /* time configure */

@ -84,9 +88,4 @@

 #define MAX_DIRENT_NUM 14 // 14 means 4096 length buffer can store 14 dirent, see struct DIR

-/* max number of open directories */
-#ifndef LOSCFG_MAX_OPEN_DIRS
-#define LOSCFG_MAX_OPEN_DIRS 10
-#endif
-
 #endif
--- a/components/fs/vfs/vfs_files.h
+++ b/components/fs/vfs/vfs_files.h
@ -78,7 +78,7 @@ struct File {
    off_t fOffset;
    INT32 fOwner;
    struct MountPoint *fMp;
-    void *fData; /* file system operations handle, fatfs FIL, etc. */
+    void *fData; /* file system opreations handle, fatfs FIL, etc. */
    const char *fullPath;
 };

--- a/components/fs/vfs/vfs_fs.c
+++ b/components/fs/vfs/vfs_fs.c
--- a/components/fs/vfs/vfs_maps.c
+++ b/components/fs/vfs/vfs_maps.c
@ -41,33 +41,31 @@ struct FsMap *VfsFsMapGet(const char *fsType)
 {
    struct FsMap *curr = g_fsMap;

-    (void)LOS_FsLock();
+    (void)VfsLock();
    while (curr != NULL) {
        if ((curr->fsType != NULL) && (fsType != NULL) &&
            (strcmp(curr->fsType, fsType) == 0)) {
-            LOS_FsUnlock();
+            (void)VfsUnlock();
            return curr;
        }
        curr = curr->next;
    }

-    LOS_FsUnlock();
+    VfsUnlock();
    return NULL;
 }

-int OsFsRegister(const char *fsType, const struct MountOps *fsMops,
-                 const struct FileOps *fsFops, const struct FsManagement *fsMgt)
+int OsFsRegister(const char *fsType, struct MountOps *fsMops,
+                 struct FileOps *fsFops, struct FsManagement *fsMgt)
 {
    size_t len;
    if ((fsMops == NULL) || (fsFops == NULL)) {
-        VFS_ERRNO_SET(EINVAL);
        return (int)LOS_NOK;
    }

    struct FsMap *newfs = (struct FsMap *)LOSCFG_FS_MALLOC_HOOK(sizeof(struct FsMap));
    if (newfs == NULL) {
        PRINT_ERR("Fs register malloc failed, fsType %s.\n", fsType);
-        VFS_ERRNO_SET(ENOMEM);
        return (int)LOS_NOK;
    }
    (void)memset_s(newfs, sizeof(struct FsMap), 0, sizeof(struct FsMap));
@ -76,7 +74,6 @@ int OsFsRegister(const char *fsType, const struct MountOps *fsMops,
    newfs->fsType = LOSCFG_FS_MALLOC_HOOK(len);
    if (newfs->fsType == NULL) {
        LOSCFG_FS_FREE_HOOK(newfs);
-        VFS_ERRNO_SET(ENOMEM);
        return (int)LOS_NOK;
    }
    (void)strcpy_s((char *)newfs->fsType, len, fsType);
@ -86,22 +83,10 @@ int OsFsRegister(const char *fsType, const struct MountOps *fsMops,
    newfs->fsMgt = fsMgt;
    newfs->fsRefs = 0;

-    (void)LOS_FsLock();
+    (void)VfsLock();
    newfs->next = g_fsMap;
    g_fsMap = newfs;

-    LOS_FsUnlock();
+    VfsUnlock();
    return LOS_OK;
 }
-
-int LOS_FsRegister(const char *fsType, const struct MountOps *fsMops,
-                   const struct FileOps *fsFops, const struct FsManagement *fsMgt)
-{
-    if (VfsFsMapGet(fsType) != NULL) {
-        PRINT_ERR("fsType has been registered or fsType error\n");
-        VFS_ERRNO_SET(EINVAL);
-        return (int)LOS_NOK;
-    }
-
-    return OsFsRegister(fsType, fsMops, fsFops, fsMgt);
-}
--- a/components/fs/vfs/vfs_maps.h
+++ b/components/fs/vfs/vfs_maps.h
@ -56,8 +56,8 @@ struct FsMap {
    struct FsMap *next;
 };

-int OsFsRegister(const char *fsType, const struct MountOps *fsMops,
-                 const struct FileOps *fsFops, const struct FsManagement *fsMgt);
+int OsFsRegister(const char *fsType, struct MountOps *fsMops,
+                 struct FileOps *fsFops, struct FsManagement *fsMgt);
 struct FsMap *VfsFsMapGet(const char *fsType);

 #ifdef __cplusplus
--- a/components/fs/vfs/vfs_mount.c
+++ b/components/fs/vfs/vfs_mount.c
@ -33,7 +33,6 @@
 #include "vfs_config.h"
 #include "stdlib.h"
 #include "string.h"
-#include "limits.h"
 #include "errno.h"
 #include "securec.h"
 #include "vfs_operations.h"
@ -63,13 +62,14 @@ static void MpDeleteFromList(struct MountPoint *mp)
    }
 }

-#if (LOSCFG_FS_SUPPORT_MOUNT_TARGET_RECURSIVE == 1)
 struct MountPoint *VfsMpFind(const char *path, const char **pathInMp)
 {
    struct MountPoint *mp = g_mountPoints;
    struct MountPoint *bestMp = NULL;
    int bestMatches = 0;
-
+    if (path == NULL) {
+        return NULL;
+    }
    if (pathInMp != NULL) {
        *pathInMp = NULL;
    }
@ -121,85 +121,29 @@ struct MountPoint *VfsMpFind(const char *path, const char **pathInMp)
    next:
        mp = mp->mNext;
    }
-
    return bestMp;
 }
-#else
-struct MountPoint *VfsMpFind(const char *path, const char **pathInMp)
-{
-    struct MountPoint *mp = g_mountPoints;
-    const char *iPath = path;
-    const char *mPath = NULL;
-    const char *target = NULL;

-    if (pathInMp != NULL) {
-        *pathInMp = NULL;
-    }
-    while (*iPath == '/') {
-        ++iPath;
-    }
-
-    while ((mp != NULL) && (mp->mPath != NULL)) {
-        mPath = mp->mPath;
-        target = iPath;
-
-        while (*mPath == '/') {
-            ++mPath;
-        }
-
-        while ((*mPath != '\0') && (*mPath != '/') &&
-               (*target != '\0') && (*target != '/')) {
-            if (*mPath != *target) {
-                break;
-            }
-            ++mPath;
-            ++target;
-        }
-        if (((*mPath == '\0') || (*mPath == '/')) &&
-            ((*target == '\0') || (*target == '/'))) {
-            if (pathInMp != NULL) {
-                *pathInMp = path;
-            }
-            return mp;
-        }
-        mp = mp->mNext;
-    }
-    return NULL;
-}
-#endif
-
-STATIC struct MountPoint *VfsMountPointInit(const char *source, const char *target,
-        const char *fsType, unsigned long mountflags)
+STATIC struct MountPoint *VfsMountPointInit(const char *target, const char *fsType, unsigned long mountflags)
 {
    struct MountPoint *mp = NULL;
    const char *pathInMp = NULL;
    struct FsMap *mFs = NULL;
-    size_t ssize = 0;
-    size_t tsize;

    /* find mp by target, to see if it was mounted */
    mp = VfsMpFind(target, &pathInMp);
    if (mp != NULL && pathInMp != NULL) {
-        errno = EINVAL;
        return NULL;
    }

-    /* Find fsMap corresponding to the fsType */
+    /* Find fsMap coresponding to the fsType */
    mFs = VfsFsMapGet(fsType);
    if ((mFs == NULL) || (mFs->fsMops == NULL) || (mFs->fsMops->mount == NULL)) {
-        errno = ENODEV;
        return NULL;
    }

-    if (source != NULL) {
-        ssize = strlen(source) + 1;
-    }
-
-    tsize = strlen(target) + 1;
-
-    mp = (struct MountPoint *)LOSCFG_FS_MALLOC_HOOK(sizeof(struct MountPoint) + ssize + tsize);
+    mp = (struct MountPoint *)LOSCFG_FS_MALLOC_HOOK(sizeof(struct MountPoint));
    if (mp == NULL) {
-        errno = ENOMEM;
        return NULL;
    }

@ -208,20 +152,7 @@ STATIC struct MountPoint *VfsMountPointInit(const char *source, const char *targ
    mp->mRefs = 0;
    mp->mWriteEnable = (mountflags & MS_RDONLY) ? FALSE : TRUE;
    mp->mFs->fsRefs++;
-
-    if (source != NULL && strcpy_s((char *)mp + sizeof(struct MountPoint), ssize, source) != EOK) {
-        LOSCFG_FS_FREE_HOOK(mp);
-        errno = ENOMEM;
-        return NULL;
-    }
-
-    if (strcpy_s((char *)mp + sizeof(struct MountPoint) + ssize, tsize, target) != EOK) {
-        LOSCFG_FS_FREE_HOOK(mp);
-        errno = ENOMEM;
-        return NULL;
-    }
-    mp->mDev = source ? (char *)mp + sizeof(struct MountPoint) : NULL;
-    mp->mPath = (char *)mp + sizeof(struct MountPoint) + ssize;
+    mp->mNext = g_mountPoints;

    return mp;
 }
@ -247,47 +178,51 @@ STATIC int VfsRemount(const char *source, const char *target,
    return mp->mFs->fsMops->mount(mp, mountflags, data);
 }

-STATIC int VfsMountPathCheck(const char *target)
-{
-    /* target must begin with '/', for example /system, /data, etc. */
-    if ((target == NULL) || (target[0] != '/')) {
-        errno = EINVAL;
-        return (int)LOS_NOK;
-    }
-
-    if (strlen(target) >= PATH_MAX) {
-        errno = ENAMETOOLONG;
-        return (int)LOS_NOK;
-    }
-
-    return LOS_OK;
-}
-
-int mount(const char *source, const char *target,
+int LOS_FsMount(const char *source, const char *target,
                const char *fsType, unsigned long mountflags,
                const void *data)
 {
+    size_t len;
    int ret;
    struct MountPoint *mp = NULL;

-    if (VfsMountPathCheck(target) != LOS_OK) {
+    /* target must begin with '/', for example /system, /data, etc. */
+    if ((target == NULL) || (target[0] != '/')) {
        return (int)LOS_NOK;
    }

-    (void)LOS_FsLock();
+    (void)VfsLock();

    if (mountflags & MS_REMOUNT) {
        ret = VfsRemount(source, target, fsType, mountflags, data);
-        LOS_FsUnlock();
+        VfsUnlock();
        return ret;
    }

-    mp = VfsMountPointInit(source, target, fsType, mountflags);
+    mp = VfsMountPointInit(target, fsType, mountflags);
    if (mp == NULL) {
-        LOS_FsUnlock();
+        VfsUnlock();
        return (int)LOS_NOK;
    }

+    if (source != NULL) {
+        len = strlen(source) + 1;
+        mp->mDev = LOSCFG_FS_MALLOC_HOOK(len);
+        if (mp->mDev == NULL) {
+            LOSCFG_FS_FREE_HOOK(mp);
+            VfsUnlock();
+            return (int)LOS_NOK;
+        }
+        (void)strcpy_s((char *)mp->mDev, len, source);
+    }
+
+    len = strlen(target) + 1;
+    mp->mPath = LOSCFG_FS_MALLOC_HOOK(len);
+    if (mp->mPath == NULL) {
+        goto errout;
+    }
+    (void)strcpy_s((char *)mp->mPath, len, target);
+
    ret = mp->mFs->fsMops->mount(mp, mountflags, data);
    if (ret != 0) {
        /* errno is set */
@ -295,28 +230,30 @@ int mount(const char *source, const char *target,
        goto errout;
    }

-    mp->mNext = g_mountPoints;
    g_mountPoints = mp;
-    LOS_FsUnlock();
+    VfsUnlock();
    return LOS_OK;

 errout:
+    LOSCFG_FS_FREE_HOOK((void *)mp->mPath);
+    LOSCFG_FS_FREE_HOOK((void *)mp->mDev);
    LOSCFG_FS_FREE_HOOK(mp);
-    LOS_FsUnlock();
+    VfsUnlock();
    return (int)LOS_NOK;
 }

-int umount(const char *target)
+int LOS_FsUmount(const char *target)
 {
    struct MountPoint *mp = NULL;
+    const char *pathInMp = NULL;
    int ret = (int)LOS_NOK;

-    (void)LOS_FsLock();
-    if (VfsMountPathCheck(target) != LOS_OK) {
+    (void)VfsLock();
+    if (target == NULL) {
        goto errout;
    }

-    mp = VfsMpFind(target, NULL);
+    mp = VfsMpFind(target, &pathInMp);
    if ((mp == NULL) || (mp->mRefs != 0)) {
        goto errout;
    }
@ -335,14 +272,16 @@ int umount(const char *target)
    /* delete mp from mount list */
    MpDeleteFromList(mp);
    mp->mFs->fsRefs--;
+    LOSCFG_FS_FREE_HOOK((void *)mp->mPath);
+    LOSCFG_FS_FREE_HOOK((void *)mp->mDev);
    LOSCFG_FS_FREE_HOOK(mp);

-    LOS_FsUnlock();
+    VfsUnlock();
    return LOS_OK;

 errout:
    PRINT_ERR("umount2 failed, target %s.\n", target);
-    LOS_FsUnlock();
+    VfsUnlock();
    return (int)LOS_NOK;
 }

@ -361,17 +300,18 @@ static void CloseFdsInMp(const struct MountPoint *mp)
    }
 }

-int umount2(const char *target, int flag)
+int LOS_FsUmount2(const char *target, int flag)
 {
    struct MountPoint *mp = NULL;
+    const char *pathInMp = NULL;
    int ret = (int)LOS_NOK;

-    (void)LOS_FsLock();
-    if (VfsMountPathCheck(target) != LOS_OK) {
+    (void)VfsLock();
+    if (target == NULL) {
        goto errout;
    }

-    mp = VfsMpFind(target, NULL);
+    mp = VfsMpFind(target, &pathInMp);
    if ((mp == NULL) || (mp->mRefs != 0) ||
        (mp->mFs == NULL) || (mp->mFs->fsMops == NULL) ||
        (mp->mFs->fsMops->umount2 == NULL)) {
@ -392,13 +332,15 @@ int umount2(const char *target, int flag)
    /* delete mp from mount list */
    MpDeleteFromList(mp);
    mp->mFs->fsRefs--;
+    LOSCFG_FS_FREE_HOOK((void *)mp->mPath);
+    LOSCFG_FS_FREE_HOOK((void *)mp->mDev);
    LOSCFG_FS_FREE_HOOK(mp);

-    LOS_FsUnlock();
+    VfsUnlock();
    return LOS_OK;

 errout:
    PRINT_ERR("umount2 failed, target %s.\n", target);
-    LOS_FsUnlock();
+    VfsUnlock();
    return (int)LOS_NOK;
 }
--- a/components/fs/vfs/vfs_operations.h
+++ b/components/fs/vfs/vfs_operations.h
@ -52,6 +52,8 @@ extern "C" {
 extern UINT32 g_fsMutex;

 int OsVfsInit(void);
+int VfsLock(void);
+void VfsUnlock(void);

 #ifdef __cplusplus
 #if __cplusplus
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
openharmony_ci	af5fcc0e6c	!942 【monthly_20221018】文件系统提供动态内存分配器钩子 Merge pull request !942 from Far/monthly_20221018	2022-11-29 03:53:36 +00:00
Far	e004ca9783	feat: 文件系统提供动态内存分配器钩子增加LOS_FS_MALLOC/LOS_FS_FREE宏以提供用户配置动态内存分配器的能力。用户只需要在components/fs/vfs/los_fs.h中修改对应的函数即可。 BREAKING CHANGE: 文件系统提供动态内存分配器钩子新增宏: LOS_FS_MALLOC LOS_FS_FREE fix #I63IZ8 Signed-off-by: Far <yesiyuan2@huawei.com> Change-Id: Ia18cbf907709dbfaa1bbc4e779537ec8e659a0ec	2022-11-28 20:01:36 +08:00
openharmony_ci	257364f873	!931 Fix : 内核告警清理挑单 Merge pull request !931 from yinjiaming/cherry-pick-1669172283	2022-11-23 11:07:51 +00:00
yinjiaming	86ee9aff2e	fixed `a4087a6` from https://gitee.com/hgbveiu743/kernel_liteos_m/pulls/930 Fix: 内核告警清理消除了多余的空格 Signed-off-by: yinjiaming <yinjiaming@huawei.com> Change-Id: Ibe90fcf8c46ef9a60c0a8f4dbba07d399e139b8c	2022-11-23 02:58:04 +00:00
openharmony_ci	e709718fdc	!926 告警清理 Merge pull request !926 from 乔克叔叔/cherry-pick-1669000234	2022-11-23 01:46:38 +00:00
openharmony_ci	34fcef1bf1	!924 告警清理 Merge pull request !924 from 乔克叔叔/cherry-pick-1668998063	2022-11-21 14:06:09 +00:00
liuwenxin	f5833a19ce	fixed `2806c4a` from https://gitee.com/wenxin-liu_admin/kernel_liteos_m/pulls/892 Fix:m核告警清理 Signed-off-by: liuwenxin <liuwenxin11@huawei.com>	2022-11-21 16:43:48 +08:00
liuwenxin	5b65d5d0f3	fixed `fa6f0c3` from https://gitee.com/wenxin-liu_admin/kernel_liteos_m/pulls/917 fix:告警清理 Signed-off-by: liuwenxin <liuwenxin11@huawei.com>	2022-11-21 02:34:24 +00:00
openharmony_ci	1a525b1f0f	!920 告警清理合入monthly_20221018 Merge pull request !920 from Hongjin Li/cherry-pick-1668687992	2022-11-19 07:08:11 +00:00
openharmony_ci	780227205d	!923 挑单其他分区已mount时会引起格式化失败至monthly_20221018 Merge pull request !923 from wangchen/1118_1030_m	2022-11-18 10:21:09 +00:00
wangchen	171ffc4f4b	fix: 挑单其他分区已mount时会引起格式化失败至monthly_20221018 【背景】其他分区已mount时会引起格式化失败至monthly_20221018 【修改方案】 1, 格式化时判断方式修改为路径【影响】对现有的产品编译不会有影响。 re #I61W0J Signed-off-by: wangchen <wangchen240@huawei.com>	2022-11-18 06:58:29 +00:00
Hongjin Li	87e957c6a6	fixed `2dc3998` from https://gitee.com/hongjin-li/kernel_liteos_m/pulls/919 fix: add space after comma Signed-off-by: Hongjin Li <lihongjin1@huawei.com>	2022-11-17 12:26:32 +00:00
openharmony_ci	03a72de3ed	!914 【monthly_20221018】修复mount接口对MS_REMOUNT的支持 Merge pull request !914 from Far/cherry-pick-1668503371	2022-11-17 04:56:30 +00:00
Far	ed3ad6e65f	fixed `64d15df` from https://gitee.com/yesiyuanjim/kernel_liteos_m/pulls/909 fix: fix the MS_REMOUNT support The mount interface can't deal with MS_REMOUNT flag now, fix it. Signed-off-by: Far <yesiyuan2@huawei.com> Change-Id: Id0960c8d92ce767b8d8ef98b3ba2e1d1ab7db15d	2022-11-15 09:09:32 +00:00
openharmony_ci	48b116bebb	!883 【回合monthly1018】feat: 提供死机场景下dump文件能力 Merge pull request !883 from Zhaotianyu/cherry-pick-1667647264	2022-11-14 02:23:37 +00:00
openharmony_ci	d4cbd3b563	!888 cortex-m4支持iar编译器的gn适配 Merge pull request !888 from yiweiniunan/cherry-pick-1667812780	2022-11-07 11:15:42 +00:00
yiweiniunan	787eaac712	fixed `62cd8fe` from https://gitee.com/yiweiniunan/kernel_liteos_m/pulls/886 cortex-m4支持iar编译器的gn适配 Signed-off-by: yiweiniunan <michael.likai@huawei.com>	2022-11-07 09:19:40 +00:00
openharmony_ci	de6e3829b2	!872 挑单解决部分平台ping失败 Merge pull request !872 from wangchen/1103_net	2022-11-07 01:37:53 +00:00
arvinzzz	9c0ea618df	fixed `4742015` from https://gitee.com/arvinzzz/kernel_liteos_m/pulls/881 feat: 提供死机场景下dump文件的能力死机场景下，vfs层锁会放开，提供dump文件的能力 Signed-off-by: arvinzzz <zhaotianyu9@huawei.com> Change-Id: Id8c9e63fbf011dbc6690b9b4557bd3370353bf21	2022-11-05 11:21:05 +00:00
openharmony_ci	6fdbdf18cb	!876 挑单-pm idle控制选项添加到menuconfig中至monthly_20221018 Merge pull request !876 from zhushengle/cherry-pick-1667528978	2022-11-04 09:38:11 +00:00
zhushengle	9454dd8bda	fixed `98d20e9` from https://gitee.com/zhushengle/kernel_liteos_m/pulls/874 feat: pm idle添加到menuconfig中 Close #I5ZD5L Signed-off-by: zhushengle <zhushengle@huawei.com> Change-Id: Ibdedff3043a0902aa3cd9539497ef97fb6a1ce6c	2022-11-04 02:29:38 +00:00
wangchen	291cb06744	fix: 挑单解决部分平台ping失败【背景】挑单解决部分平台ping失败【修改方案】挑单解决部分平台ping失败【影响】对现有的产品编译不会有影响。 re #I5Z9TP Signed-off-by: wangchen <wangchen240@huawei.com>	2022-11-03 07:18:47 +00:00