!594 处理M核编译告警

Merge pull request !594 from yinjiaming/OpenHarmony-3.0-LTS

BUILD.gn

@@ -29,46 +29,65 @@
 
 import("config.gni")
 
+LITEOS_LOS_CONFIG_H = rebase_path("$LITEOSTOPDIR/kernel/include/los_config.h")
+
+config("los_config") {
+  cflags = [ "-Werror" ]
+
+  asmflags = [
+    "-DCLZ=CLZ",
+    "-imacros",
+    "$LITEOS_LOS_CONFIG_H",
+  ]
+
+  include_dirs = [
+    "//kernel/liteos_m/kernel/include",
+    "//kernel/liteos_m/kernel/arch/include",
+    "//kernel/liteos_m/utils",
+    "//third_party/bounds_checking_function/include",
+  ]
+}
+
 group("kernel") {
   deps = [
     "kernel:kernel",
     "utils:utils",
     "//third_party/bounds_checking_function:libsec_static",
   ]
-  if (enable_ohos_kernel_liteos_m_cppsupport == true) {
+  if (enable_ohos_kernel_liteos_m_cppsupport) {
     deps += [ "components/cppsupport:cppsupport" ]
   }
-  if (enable_ohos_kernel_liteos_m_cpup == true) {
+  if (enable_ohos_kernel_liteos_m_cpup) {
     deps += [ "components/cpup:cpup" ]
   }
-  if (enable_ohos_kernel_liteos_m_exchook == true) {
+  if (enable_ohos_kernel_liteos_m_exchook) {
     deps += [ "components/exchook:exchook" ]
   }
-  if (enable_ohos_kernel_liteos_m_backtrace == true) {
+  if (enable_ohos_kernel_liteos_m_backtrace) {
     deps += [ "components/backtrace:backtrace" ]
   }
-  if (enable_ohos_kernel_liteos_m_fs == true) {
+  if (enable_ohos_kernel_liteos_m_fs) {
     deps += [ "components/fs:fs" ]
   }
-  if (enable_ohos_kernel_liteos_m_pm == true) {
+  if (enable_ohos_kernel_liteos_m_pm) {
     deps += [ "components/power:pm" ]
   }
-  if (enable_ohos_kernel_liteos_m_trace == true) {
+  if (enable_ohos_kernel_liteos_m_trace) {
     deps += [ "components/trace:trace" ]
   }
-  if (enable_ohos_kernel_liteos_m_kal == true) {
+  if (enable_ohos_kernel_liteos_m_kal) {
     deps += [ "kal:kal" ]
   }
-  if (enable_ohos_kernel_liteos_m_shell == true) {
+  if (enable_ohos_kernel_liteos_m_shell) {
     deps += [ "components/shell:shell" ]
   }
-  if (enable_ohos_kernel_liteos_m_test == true) {
+  if (enable_ohos_kernel_liteos_m_test) {
     deps += [ "testsuits:test" ]
   }
-  if (enable_ohos_kernel_liteos_m_lwip == true) {
+  if (enable_ohos_kernel_liteos_m_lwip) {
     deps += [ ohos_kernel_liteos_m_lwip_path ]
   }
-  if (enable_ohos_kernel_liteos_m_dynlink == true) {
+  if (enable_ohos_kernel_liteos_m_dynlink) {
     deps += [ "components/dynlink:dynlink" ]
   }
 }

README.md

@@ -71,7 +71,7 @@ After the compilation is successful, the executable file  **NUCLEO-F767.hex**  i
 
 ## 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.md)
 
 **kernel\_liteos\_m**
 

README_zh.md

@@ -52,11 +52,11 @@ OpenHarmony LiteOS-M内核的编译构建系统是一个基于gn和ninja的组
 
 ### 搭建系统基础环境
 
-在搭建各个开发板环境前，需要完成OpenHarmony系统基础环境搭建。系统基础环境主要是指OpenHarmony的编译环境和开发环境，详细介绍请参考官方站点[Ubuntu编译环境准备](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-env-setup-linux.md)。开发者需要根据环境搭建文档，完成下述软件的安装：Python3.7+、gn、ninja、hb。对于LiteOS-M内核，还需要安装Make构建工具和[ARM GCC编译工具链](https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads)。
+在搭建各个开发板环境前，需要完成OpenHarmony系统基础环境搭建。系统基础环境主要是指OpenHarmony的编译环境和开发环境，详细介绍请参考官方站点[Ubuntu编译环境准备](https://gitee.com/openharmony/docs/blob/HEAD/zh-cn/device-dev/quick-start/quickstart-lite-env-setup-linux.md)。开发者需要根据环境搭建文档，完成下述软件的安装：Python3.7+、gn、ninja、hb。对于LiteOS-M内核，还需要安装Make构建工具和[ARM GCC编译工具链](https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads)。
 
 ### 获取OpenHarmony源码
 
-开发者需要在Linux服务器上通过Git克隆获取OpenHarmony最新源码，详细的源码获取方式，请见[源码获取](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/get-code/sourcecode-acquire.md)。获取OpenHarmony完整仓代码后，假设克隆目录为`~/openHarmony`。
+开发者需要在Linux服务器上通过Git克隆获取OpenHarmony最新源码，详细的源码获取方式，请见[源码获取](https://gitee.com/openharmony/docs/blob/HEAD/zh-cn/device-dev/get-code/sourcecode-acquire.md)。获取OpenHarmony完整仓代码后，假设克隆目录为`~/openHarmony`。
 
 ### 获取示例工程源码
 
@@ -78,7 +78,7 @@ chmod +x ~/openHarmony/device/st/nucleo_f767zi/build.sh
 cp -r ~/nucleo_f767zi/vendor/st ~/openHarmony/vendor/st
 ```
 
-关于示例代码目录的说明，可以参考资料站点[板级目录规范](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/porting/transplant-chip-board-overview.md)。如果需要自行移植开发板，请参考[板级系统移植](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/porting/transplant-chip-board.md)。
+关于示例代码目录的说明，可以参考资料站点[板级目录规范](https://gitee.com/openharmony/docs/blob/HEAD/zh-cn/device-dev/porting/transplant-chip-board-overview.md)。如果需要自行移植开发板，请参考[板级系统移植](https://gitee.com/openharmony/docs/blob/HEAD/zh-cn/device-dev/porting/transplant-chip-board.md)。
 
 ### 编译运行
 
@@ -121,7 +121,7 @@ LiteOS-M内核移植的具体开发板的工程由社区开发者提供，可以
 
 ## 相关仓<a name="section1371113476307"></a>
 
-[内核子系统](https://gitee.com/openharmony/docs/blob/master/zh-cn/readme/%E5%86%85%E6%A0%B8%E5%AD%90%E7%B3%BB%E7%BB%9F.md)
+[内核子系统](https://gitee.com/openharmony/docs/blob/HEAD/zh-cn/readme/%E5%86%85%E6%A0%B8%E5%AD%90%E7%B3%BB%E7%BB%9F.md)
 
 **kernel\_liteos\_m**
 

bundle.json

@@ -0,0 +1,59 @@
+{
+    "name": "@ohos/kernel_liteos_m",
+    "version": "",
+    "description": "liteos-m内核",
+    "homePage": "https://gitee.com/openharmony",
+    "license": "BSD 3-clause",
+    "repository": "https://gitee.com/openharmony/kernel_liteos_m",
+    "domain": "os",
+    "language": "",
+    "publishAs": "code-segment",
+    "private": false,
+    "scripts": {},
+    "tags": [
+        "kernel"
+    ],
+    "keywords": [
+        "kernel",
+        "liteos-m"
+    ],
+    "envs": [],
+    "dirs": [],
+    "author": {
+        "name": "",
+        "email": "",
+        "url": ""
+    },
+    "contributors": [
+        {
+            "name": "",
+            "email": "",
+            "url": ""
+        }
+    ],
+    "segment": {
+        "destPath": "kernel/liteos_m"
+    },
+    "component": {
+        "name": "liteos-m",
+        "subsystem": "liteos_m",
+        "syscap": [
+            "SystemCapability.Kernel.liteos-m"
+        ],
+        "features": [],
+        "adapted_system_type": [
+            "mini"
+        ],
+        "rom": "",
+        "ram": "",
+        "deps": {
+            "components": [],
+            "third_party": []
+        },
+        "build": {
+            "sub_component": [],
+            "inner_kits": [],
+            "test": []
+        }
+    }
+}

components/backtrace/BUILD.gn

@@ -27,13 +27,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
+
 static_library("backtrace") {
   sources = [ "los_backtrace.c" ]
 
-  include_dirs = [
-    "../../kernel/include",
-    "../../kernel/arch/include",
-    "../../utils",
-    "//third_party/bounds_checking_function/include",
-  ]
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 }

components/cppsupport/BUILD.gn

@@ -27,8 +27,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
+
 static_library("cppsupport") {
   sources = [ "los_cppsupport.c" ]
 
-  include_dirs = [ "../../utils" ]
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 }

components/cppsupport/los_cppsupport.c

@@ -31,7 +31,6 @@
 
 #include "los_cppsupport.h"
 
-
 typedef VOID (*InitFunc)(VOID);
 
 INT32 LOS_CppSystemInit(UINTPTR initArrayStart, UINTPTR initArrayEnd)
@@ -39,12 +38,10 @@ INT32 LOS_CppSystemInit(UINTPTR initArrayStart, UINTPTR initArrayEnd)
     UINTPTR *start;
     InitFunc initFunc = NULL;
 
-    for (start = (UINTPTR *)initArrayStart; start < (UINTPTR *)initArrayEnd; start++){
+    for (start = (UINTPTR *)initArrayStart; start < (UINTPTR *)initArrayEnd; start++) {
         initFunc = (InitFunc)(*start);
         initFunc();
     }
 
     return 0;
 }
-
-

components/cpup/BUILD.gn

@@ -27,13 +27,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
+
 static_library("cpup") {
   sources = [ "los_cpup.c" ]
 
-  include_dirs = [
-    "../../kernel/include",
-    "../../kernel/arch/include",
-    "../../utils",
-    "//third_party/bounds_checking_function/include",
-  ]
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 }

components/dynlink/BUILD.gn

@@ -26,15 +26,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-config("dynlink_config") {
-  include_dirs = [
-    "../../kernel/include",
-    "../../kernel/arch/include",
-    "../../utils",
-    ".",
-    "//third_party/bounds_checking_function/include",
-  ]
+import("//kernel/liteos_m/config.gni")
 
+config("dynlink_config") {
+  include_dirs = [ "./" ]
   if (arch == "arm") {
     include_dirs += [ "../../kernel/arch/arm/include" ]
   } else {
@@ -47,5 +42,7 @@ static_library("dynlink") {
   sources = [ "los_dynlink.c" ]
 
   public_configs = [ ":dynlink_config" ]
+  configs += [ "$LITEOSTOPDIR:los_config" ]
+
   deps = [ "//kernel/liteos_m/kal/posix" ]
 }

components/exchook/BUILD.gn

@@ -27,15 +27,13 @@
 # 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/config.gni")
+
 static_library("exchook") {
   sources = [
     "los_exc_info.c",
     "los_exchook.c",
   ]
-  include_dirs = [
-    "../../kernel/arch/include",
-    "../../kernel/include",
-    "../../utils",
-    "//third_party/bounds_checking_function/include",
-  ]
+
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 }

components/fs/BUILD.gn

@@ -49,10 +49,10 @@ declare_args() {
 group("fs") {
   deps = []
   deps += [ ".:fs_operations" ]
-  if (enable_ohos_kernel_liteos_m_fatfs == true) {
+  if (enable_ohos_kernel_liteos_m_fatfs) {
     deps += [ "fatfs:fatfs" ]
   }
-  if (enable_ohos_kernel_liteos_m_littlefs == true) {
+  if (enable_ohos_kernel_liteos_m_littlefs) {
     deps += [ "littlefs:littlefs" ]
   }
 }

components/fs/fs.c

@@ -347,14 +347,14 @@ ssize_t read(int fd, void *buf, size_t nbyte)
         return recv(fd, buf, nbyte, 0);
     }
 #endif
-    if (g_fs->fsFops == NULL || g_fs->fsFops->Read == NULL) {
-        errno = ENOSYS;
-        return FS_FAILURE;
-    }
     if (g_fs == NULL) {
         errno = ENODEV;
         return FS_FAILURE;
     }
+    if (g_fs->fsFops == NULL || g_fs->fsFops->Read == NULL) {
+        errno = ENOSYS;
+        return FS_FAILURE;
+    }
     return g_fs->fsFops->Read(fd, buf, nbyte);
 }
 

components/net/lwip-2.1/BUILD.gn

@@ -44,6 +44,8 @@ static_library("lwip") {
 
   sources = LWIP_PORTING_FILES + LWIPNOAPPSFILES
 
+  sources -= [ "$LWIPDIR/api/sockets.c" ]
+
   configs += [ ":lwip_depends" ]
 
   deps = [ "//kernel/liteos_m/kal/posix" ]

components/net/lwip-2.1/enhancement/src/fixme.c

@@ -39,6 +39,27 @@
 #define NETIFAPI_VAR_ALLOC(name)    API_VAR_ALLOC(struct netifapi_msg, MEMP_NETIFAPI_MSG, name, ERR_MEM)
 #define NETIFAPI_VAR_FREE(name)     API_VAR_FREE(MEMP_NETIFAPI_MSG, name)
 
+#if LWIP_DHCP
+#include <lwip/dhcp.h>
+#include <lwip/prot/dhcp.h>
+
+err_t dhcp_is_bound(struct netif *netif)
+{
+    struct dhcp *dhcp = NULL;
+
+    LWIP_ERROR("netif != NULL", (netif != NULL), return ERR_ARG);
+
+    dhcp = netif_dhcp_data(netif);
+    LWIP_ERROR("netif->dhcp != NULL", (dhcp != NULL), return ERR_ARG);
+
+    if (dhcp->state == DHCP_STATE_BOUND) {
+        return ERR_OK;
+    } else {
+        return ERR_INPROGRESS;
+    }
+}
+#endif /* LWIP_DHCP */
+
 static struct netif *netif_find_by_name(const char *name)
 {
     struct netif *netif = NULL;

components/net/lwip-2.1/lwip_porting.gni

@@ -40,6 +40,6 @@ LWIP_PORTING_FILES = [
   "$LWIP_PORTING_DIR/enhancement/src/lwip_ifaddrs.c",
 ]
 
-if (enable_ohos_kernel_liteos_m_shell == true) {
+if (enable_ohos_kernel_liteos_m_shell) {
   LWIP_PORTING_FILES += [ "$LWIP_PORTING_DIR/porting/src/api_shell.c" ]
 }

components/net/lwip-2.1/porting/include/arch/cc.h

@@ -93,26 +93,17 @@
 
 #define LWIP_RAND rand
 
-extern void HilogPrintf(const char *fmt, ...);
-
-#ifndef HILOG_INFO
-#define HILOG_INFO(...)
-#ifndef HILOG_MODULE_APP
-#define HILOG_MODULE_APP 0
-#endif
+#ifndef LWIP_LOGGER
+#define LWIP_LOGGER(msg)
 #endif
 
-#ifndef HILOG_ERROR
-#define HILOG_ERROR(...)
-#endif
-
-#define LWIP_PLATFORM_DIAG(vars) HilogPrintf vars
-#define LWIP_PLATFORM_ASSERT(x) do {HILOG_ERROR(HILOG_MODULE_APP, \
-                                    "Assertion \"%s\" errno %d line %d in %s\n", \
-                                    x, errno, __LINE__, __FILE__);} while (0)
+extern void LwipLogPrintf(const char *fmt, ...);
+#define LWIP_PLATFORM_DIAG(vars) LwipLogPrintf vars
+#define LWIP_PLATFORM_ASSERT(x) do { \
+        LWIP_PLATFORM_DIAG(("Assertion \"%s\" failed at line %d in %s\n", x, __LINE__, __FILE__)); \
+    } while (0)
 
 #define init_waitqueue_head(...)
 #define poll_check_waiters(...)
-#define IOCTL_CMD_CASE_HANDLER()
 
 #endif /* _LWIP_PORTING_CC_H_ */

components/net/lwip-2.1/porting/include/lwip/api_shell.h

@@ -6,15 +6,15 @@
  * 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.
+ *    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.
+ *    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.
+ *    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,
@@ -29,18 +29,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/**********************************************************************************
-
-* Notice of Export Control Law
-===============================================
-* Huawei LiteOS may be subject to applicable export control laws and regulations, which
-* might include those applicable to Huawei LiteOS of U.S. and the country in which you
-* are located.
-* Import, export and usage of Huawei LiteOS in any manner by you shall be in compliance
-* with such applicable export control laws and regulations.
-***********************************************************************************/
-
-
 #ifndef LWIP_API_SHELL_H
 #define LWIP_API_SHELL_H
 

components/net/lwip-2.1/porting/include/lwip/dhcp.h

@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this list of
+ *    conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *    of conditions and the following disclaimer in the documentation and/or other materials
+ *    provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors may be used
+ *    to endorse or promote products derived from this software without specific prior written
+ *    permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _LWIP_PORTING_DHCP_H_
+#define _LWIP_PORTING_DHCP_H_
+
+#include_next <lwip/dhcp.h>
+
+err_t dhcp_is_bound(struct netif *netif);
+
+#endif /* _LWIP_PORTING_DHCP_H_ */

components/net/lwip-2.1/porting/include/lwip/inet.h

@@ -43,9 +43,6 @@
             (ip4_addr_set_u32(target_ipaddr, (source_inaddr)->s_addr))
 
 /* directly map this to the lwip internal functions */
-#define inet_addr(cp)                   ipaddr_addr(cp)
-#define inet_aton(cp, addr)             ip4addr_aton(cp, (ip4_addr_t*)addr)
-#define inet_ntoa(addr)                 ip4addr_ntoa((const ip4_addr_t*)&(addr))
 #define inet_ntoa_r(addr, buf, buflen)  ip4addr_ntoa_r((const ip4_addr_t*)&(addr), buf, buflen)
 #endif /* LWIP_IPV4 */
 #if LWIP_IPV6

components/net/lwip-2.1/porting/include/lwip/lwipopts.h

@@ -134,7 +134,7 @@
 #define LWIP_NETIF_LOOPBACK             1
 #define LWIP_POSIX_SOCKETS_IO_NAMES     0
 #define LWIP_RAW                        1
-#define LWIP_SOCKET_OFFSET              FAT_MAX_OPEN_FILES
+#define LWIP_SOCKET_OFFSET              0
 #define LWIP_SO_RCVBUF                  1
 #define LWIP_SO_RCVTIMEO                1
 #define LWIP_SO_SNDTIMEO                1
@@ -220,75 +220,11 @@
 #undef LWIP_NETIF_PROMISC
 #define LWIP_NETIF_PROMISC              0
 
-#undef LWIP_ICMP
-#define LWIP_ICMP                       0
-
-#undef LWIP_DHCP
-#define LWIP_DHCP                       1
-
-#undef LWIP_IGMP
-#define LWIP_IGMP                       0
+#define MEMP_MEM_MALLOC                 1
 
 #undef LWIP_IPV6
 #define LWIP_IPV6                       0
 
-#undef LWIP_IPV6_DHCP6
-#define LWIP_IPV6_DHCP6                 0
-
-#undef TCP_SND_BUF
-#define TCP_SND_BUF                     (65535 / 3)
-
-#undef TCP_WND
-#define TCP_WND                         ((TCP_SND_BUF * 2) / 3)
-
-#undef TCP_SND_QUEUELEN
-#define TCP_SND_QUEUELEN                (2 * (TCP_SND_BUF / TCP_MSS))
-
-#undef MEMP_NUM_NETDB
-#define MEMP_NUM_NETDB                  1
-
-#undef MEMP_NUM_ARP_QUEUE
-#define MEMP_NUM_ARP_QUEUE              4
-
-#undef MEMP_NUM_NETBUF
-#define MEMP_NUM_NETBUF                 32
-
-#undef MEMP_NUM_NETCONN
-#define MEMP_NUM_NETCONN                32
-
-#undef MEMP_NUM_PBUF
-#define MEMP_NUM_PBUF                   0
-
-#undef PBUF_POOL_SIZE
-#define PBUF_POOL_SIZE                  0
-
-#undef MEMP_NUM_RAW_PCB
-#define MEMP_NUM_RAW_PCB                8
-
-#undef MEMP_NUM_REASSDATA
-#define MEMP_NUM_REASSDATA              12
-
-#undef MEMP_NUM_TCPIP_MSG_API
-#define MEMP_NUM_TCPIP_MSG_API          32
-
-#undef MEMP_NUM_TCPIP_MSG_INPKT
-#define MEMP_NUM_TCPIP_MSG_INPKT        32
-
-#undef MEMP_NUM_TCP_PCB
-#define MEMP_NUM_TCP_PCB                8
-
-#undef MEMP_NUM_TCP_PCB_LISTEN
-#define MEMP_NUM_TCP_PCB_LISTEN         4
-
-#undef MEMP_NUM_TCP_SEG
-#define MEMP_NUM_TCP_SEG                64
-
-#undef MEMP_NUM_UDP_PCB
-#define MEMP_NUM_UDP_PCB                4
-
-#undef TCPIP_THREAD_STACKSIZE
-#define TCPIP_THREAD_STACKSIZE          0x1000
-
 #undef LWIP_SOCKET_SELECT
 #define LWIP_SOCKET_SELECT              1
 

components/net/lwip-2.1/porting/include/lwip/sockets.h

@@ -41,7 +41,6 @@
 #include <limits.h>
 #include <fcntl.h>
 #include_next <lwip/sockets.h>
-#include <fatfs.h>
 
 #ifdef __cplusplus
 extern "C" {

components/net/lwip-2.1/porting/src/api_shell.c

@@ -6,15 +6,15 @@
  * 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.
+ *    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.
+ *    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.
+ *    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,
@@ -29,18 +29,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/**********************************************************************************
-
-* Notice of Export Control Law
-===============================================
-* Huawei LiteOS may be subject to applicable export control laws and regulations, which
-* might include those applicable to Huawei LiteOS of U.S. and the country in which you
-* are located.
-* Import, export and usage of Huawei LiteOS in any manner by you shall be in compliance
-* with such applicable export control laws and regulations.
-***********************************************************************************/
-
-
 #define LWIP_STATIC static
 #define DHCP_STATE_OFF 0
 #define LWIP_EXT_POLL_SUPPORT 1
@@ -345,7 +333,7 @@ LWIP_STATIC int OsPingFunc(u32_t *parg)
     int ret = 0;
     u32_t intrvl;
     char *data_buf = NULL;
-    BOOL timeout_flag = false;
+    BOOL timeout_flag = FALSE;
     char buf[50];
 
     u32_t destip = parg[0];
@@ -410,14 +398,14 @@ LWIP_STATIC int OsPingFunc(u32_t *parg)
         do {
             pfd.events = POLLIN;
             pfd.revents = 0;
-            timeout_flag = false;
+            timeout_flag = FALSE;
             ret = poll(&pfd, 1, LWIP_SHELL_CMD_PING_TIMEOUT);
             if (ret < 0) {
                 perror("Ping: poll\n");
                 goto FAILURE;
             } else if (ret == 0) {
                 /* first type timeout event */
-                timeout_flag = true;
+                timeout_flag = TRUE;
                 break;
             }
 
@@ -457,7 +445,7 @@ LWIP_STATIC int OsPingFunc(u32_t *parg)
         } while (timout_ms >= 0);
 
         /* all timeout events are true timeout */
-        if ((timout_ms < 0) || (timeout_flag == true)) {
+        if ((timout_ms < 0) || (timeout_flag == TRUE)) {
             failed_cnt++;
             i++;
             PRINTK("\nPing: destination unreachable ...");

components/net/lwip-2.1/porting/src/sockets_porting.c

@@ -29,8 +29,9 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "lwip/sockets.h"
+#include "lwip/priv/tcpip_priv.h"
 #include "lwip/priv/sockets_priv.h"
-#include <lwip/sockets.h>
 
 #if !LWIP_COMPAT_SOCKETS
 #if LWIP_SOCKET
@@ -160,6 +161,27 @@ int inet_pton(int af, const char *src, void *dst)
     return lwip_inet_pton(af, src, dst);
 }
 
+#ifndef LWIP_INET_ADDR_FUNC
+in_addr_t inet_addr(const char *cp)
+{
+    return ipaddr_addr(cp);
+}
+#endif
+
+#ifndef LWIP_INET_NTOA_FUNC
+char *inet_ntoa(struct in_addr addr)
+{
+    return ip4addr_ntoa((const ip4_addr_t*)&(addr));
+}
+#endif
+
+#ifndef LWIP_INET_ATON_FUNC
+int inet_aton(const char *cp, struct in_addr *addr)
+{
+    return ip4addr_aton(cp, (ip4_addr_t*)addr);
+}
+#endif
+
 int ioctlsocket(int s, long cmd, void *argp)
 {
     return lwip_ioctl(s, cmd, argp);
@@ -185,4 +207,81 @@ unsigned int if_nametoindex(const char *ifname)
 }
 
 #endif
-#endif /* !LWIP_COMPAT_SOCKETS */
+#endif /* !LWIP_COMPAT_SOCKETS */
+
+#define IOCTL_CMD_CASE_HANDLER() do {                      \
+    err_t  err;                                            \
+    struct lwip_ioctl_apimsg msg;                          \
+    msg.sock = sock;                                       \
+    msg.cmd = cmd;                                         \
+    msg.argp = argp;                                       \
+                                                           \
+    err = tcpip_api_call(lwip_do_ioctl_impl, &msg.call);   \
+    if (err != ENOSYS) {                                   \
+        sock_set_errno(sock, err);                         \
+        done_socket(sock);                                 \
+        return -(err != ERR_OK);                           \
+    }                                                      \
+} while (0)
+
+struct lwip_ioctl_apimsg {
+    struct tcpip_api_call_data call;
+    struct lwip_sock *sock;
+    long cmd;
+    void *argp;
+};
+
+static err_t lwip_do_ioctl_impl(struct tcpip_api_call_data *call);
+
+#include "../api/sockets.c"
+
+static u8_t lwip_ioctl_internal_SIOCGIFBRDADDR(struct ifreq *ifr)
+{
+    struct netif *netif = NULL;
+    struct sockaddr_in *sock_in = NULL;
+
+    /* get netif subnet broadcast addr */
+    netif = netif_find(ifr->ifr_name);
+    if (netif == NULL) {
+        return ENODEV;
+    }
+    if (ip4_addr_isany_val(*(ip_2_ip4(&netif->netmask)))) {
+        return ENXIO;
+    }
+    sock_in = (struct sockaddr_in *)&ifr->ifr_addr;
+    sock_in->sin_family = AF_INET;
+    sock_in->sin_addr.s_addr = (ip_2_ip4(&((netif)->ip_addr))->addr | ~(ip_2_ip4(&netif->netmask)->addr));
+    return 0;
+}
+
+static u8_t lwip_ioctl_impl(const struct lwip_sock *sock, long cmd, void *argp)
+{
+    u8_t err = 0;
+    struct ifreq *ifr = (struct ifreq *)argp;
+    bool is_ipv6 = 0;
+
+    /* allow it only on IPv6 sockets... */
+    is_ipv6 = NETCONNTYPE_ISIPV6((unsigned int)(sock->conn->type));
+
+    switch ((u32_t)cmd) {
+        case SIOCGIFBRDADDR:
+            if (is_ipv6 != 0) {
+                err = EINVAL;
+            } else {
+                err = lwip_ioctl_internal_SIOCGIFBRDADDR(ifr);
+            }
+            break;
+        default:
+            err = ENOSYS;
+            LWIP_DEBUGF(SOCKETS_DEBUG, ("lwip_ioctl(UNIMPL: 0x%lx)\n", cmd));
+            break;
+    }
+
+    return err;
+}
+
+static err_t lwip_do_ioctl_impl(struct tcpip_api_call_data *call)
+{
+    struct lwip_ioctl_apimsg *msg = (struct lwip_ioctl_apimsg *)(void *)call;
+    return lwip_ioctl_impl(msg->sock, msg->cmd, msg->argp);
+}

components/net/lwip-2.1/porting/src/sys_arch.c

@@ -324,7 +324,7 @@ void sys_mutex_set_invalid(sys_mutex_t *mutex)
     *mutex = LOSCFG_BASE_IPC_MUX_LIMIT;
 }
 
-void HilogPrintf(const char *fmt, ...)
+void LwipLogPrintf(const char *fmt, ...)
 {
     if ((fmt == NULL) || (strlen(fmt) == 0)) {
         return;
@@ -337,8 +337,8 @@ void HilogPrintf(const char *fmt, ...)
     len = vsprintf_s(buf, sizeof(buf) - 1, fmt, ap);
     va_end(ap);
     if (len < 0) {
-        HILOG_INFO(HILOG_MODULE_APP, "log param invalid or buf is not enough.");
+        LWIP_LOGGER("log param invalid or buf is not enough.");
         return;
     }
-    HILOG_INFO(HILOG_MODULE_APP, buf);
+    LWIP_LOGGER(buf);
 }

components/power/BUILD.gn

@@ -27,13 +27,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
+
 static_library("pm") {
   sources = [ "los_pm.c" ]
 
-  include_dirs = [
-    "../../kernel/include",
-    "../../kernel/arch/include",
-    "../../utils",
-    "//third_party/bounds_checking_function/include",
-  ]
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 }

components/power/los_pm.c

@@ -34,20 +34,22 @@
 #include "los_sched.h"
 #include "los_timer.h"
 #include "los_memory.h"
+#include "los_swtmr.h"
 
 #if (LOSCFG_KERNEL_PM == 1)
 #define OS_PM_NODE_FREE 0x80000000U
 #define OS_PM_LOCK_MAX  0xFFFFU
+#define OS_PM_SYS_EARLY        1
+#define OS_PM_SYS_DEVICE_EARLY 2
 
-typedef UINT32 (*Suspend)(VOID);
+typedef UINT32 (*Suspend)(UINT32 mode);
 
-#if (LOSCFG_KERNEL_PM_DEBUG == 1)
 typedef struct {
     CHAR         *name;
     UINT32       count;
+    UINT32       swtmrID;
     LOS_DL_LIST  list;
 } OsPmLockCB;
-#endif
 
 typedef struct {
     LOS_SysSleepEnum  pmMode;
@@ -60,72 +62,92 @@ typedef struct {
 #if (LOSCFG_BASE_CORE_TICK_WTIMER == 0)
     UINT64            enterSleepTime;
 #endif
-#if (LOSCFG_KERNEL_PM_DEBUG == 1)
     LOS_DL_LIST       lockList;
-#endif
 } LosPmCB;
 
+#define PM_EVENT_LOCK_MASK    0xF
+#define PM_EVENT_LOCK_RELEASE 0x1
+STATIC EVENT_CB_S g_pmEvent;
 STATIC LosPmCB g_pmCB;
-STATIC LosPmSysctrl *g_sysctrl = NULL;
+STATIC LosPmSysctrl g_sysctrl;
 STATIC UINT64 g_pmSleepTime;
 
-#if (LOSCFG_BASE_CORE_TICK_WTIMER == 0)
-STATIC VOID OsPmTickTimerStart(LosPmCB *pm)
+STATIC VOID OsPmSysctrlInit(VOID)
 {
-    UINT32 intSave;
-    UINT64 currTime, sleepTime, realSleepTime;
-    LosPmTickTimer *tickTimer = pm->tickTimer;
-
-    intSave = LOS_IntLock();
-    /* Restore the main CPU frequency */
-    sleepTime = tickTimer->timerCycleGet();
-    tickTimer->timerStop();
-
-    realSleepTime = OS_SYS_CYCLE_TO_NS(sleepTime, tickTimer->freq);
-    realSleepTime = OS_SYS_NS_TO_CYCLE(realSleepTime, OS_SYS_CLOCK);
-    currTime = pm->enterSleepTime + realSleepTime;
-    pm->enterSleepTime = 0;
-
-    OsSchedTimerBaseReset(currTime);
-    OsSchedUpdateExpireTime(currTime, FALSE);
-    tickTimer->tickUnlock();
-    LOS_IntRestore(intSave);
-    return;
+    /* Default handler functions, which are implemented by the product */
+    g_sysctrl.early = NULL;
+    g_sysctrl.late = NULL;
+    g_sysctrl.normalSuspend = HalEnterSleep;
+    g_sysctrl.normalResume = NULL;
+    g_sysctrl.lightSuspend = HalEnterSleep;
+    g_sysctrl.lightResume = NULL;
+    g_sysctrl.deepSuspend = HalEnterSleep;
+    g_sysctrl.deepResume = NULL;
+    g_sysctrl.shutdownSuspend = NULL;
+    g_sysctrl.shutdownResume = NULL;
 }
 
-STATIC VOID OsPmTickTimerStop(LosPmCB *pm)
+STATIC VOID OsPmTickTimerStart(LosPmCB *pm)
 {
-    UINT64 sleepCycle;
-    UINT64 realSleepTime = g_pmSleepTime;
+#if (LOSCFG_BASE_CORE_TICK_WTIMER == 0)
+    UINT64 currTime, sleepTime, realSleepTime;
+#endif
     LosPmTickTimer *tickTimer = pm->tickTimer;
 
-    if (realSleepTime == 0) {
+    if ((tickTimer == NULL) || (tickTimer->tickUnlock == NULL)) {
         return;
     }
 
-    sleepCycle = OS_SYS_CYCLE_TO_NS(realSleepTime, OS_SYS_CLOCK);
-    sleepCycle = OS_SYS_NS_TO_CYCLE(sleepCycle, tickTimer->freq);
+#if (LOSCFG_BASE_CORE_TICK_WTIMER == 0)
+    if (tickTimer->timerStop != NULL) {
+        /* Restore the main CPU frequency */
+        sleepTime = tickTimer->timerCycleGet();
+        tickTimer->timerStop();
 
-    /* The main CPU reduces the frequency */
-    pm->enterSleepTime = OsGetCurrSysTimeCycle();
-    tickTimer->tickLock();
-    tickTimer->timerStart(sleepCycle);
+        realSleepTime = OS_SYS_CYCLE_TO_NS(sleepTime, tickTimer->freq);
+        realSleepTime = OS_SYS_NS_TO_CYCLE(realSleepTime, OS_SYS_CLOCK);
+        currTime = pm->enterSleepTime + realSleepTime;
+        pm->enterSleepTime = 0;
+
+        OsSchedTimerBaseReset(currTime);
+    }
+#endif
+
+    tickTimer->tickUnlock();
     return;
 }
+
+STATIC BOOL OsPmTickTimerStop(LosPmCB *pm)
+{
+#if (LOSCFG_BASE_CORE_TICK_WTIMER == 0)
+    UINT64 sleepCycle;
+    UINT64 realSleepTime = g_pmSleepTime;
+#endif
+    LosPmTickTimer *tickTimer = pm->tickTimer;
+
+    if ((tickTimer == NULL) || (tickTimer->tickLock == NULL)) {
+        return FALSE;
+    }
+
+#if (LOSCFG_BASE_CORE_TICK_WTIMER == 0)
+    if (tickTimer->timerStart != NULL) {
+        if (realSleepTime == 0) {
+            return FALSE;
+        }
+
+        sleepCycle = OS_SYS_CYCLE_TO_NS(realSleepTime, OS_SYS_CLOCK);
+        sleepCycle = OS_SYS_NS_TO_CYCLE(sleepCycle, tickTimer->freq);
+
+        /* The main CPU reduces the frequency */
+        pm->enterSleepTime = OsGetCurrSysTimeCycle();
+        tickTimer->tickLock();
+        tickTimer->timerStart(sleepCycle);
+        return TRUE;
+    }
 #endif
 
-STATIC VOID OsPmTickTimerResume(LosPmCB *pm)
-{
-    if ((pm->sysMode == LOS_SYS_DEEP_SLEEP) && (pm->tickTimer->tickUnlock != NULL)) {
-        pm->tickTimer->tickUnlock();
-    } else {
-#if (LOSCFG_BASE_CORE_TICK_WTIMER == 0)
-        /* Sys tick timer is restored from low power mode */
-        if (pm->enterSleepTime != 0) {
-            OsPmTickTimerStart(pm);
-        }
-#endif
-    }
+    tickTimer->tickLock();
+    return TRUE;
 }
 
 STATIC VOID OsPmCpuResume(LosPmCB *pm)
@@ -139,126 +161,137 @@ STATIC VOID OsPmCpuResume(LosPmCB *pm)
     }
 }
 
-STATIC Suspend OsPmCpuSuspend(LosPmCB *pm)
+STATIC VOID OsPmCpuSuspend(LosPmCB *pm)
 {
-    Suspend sysSuspend = NULL;
-
     /* cpu enter low power mode */
     LOS_ASSERT(pm->sysctrl != NULL);
 
     if (pm->sysMode == LOS_SYS_NORMAL_SLEEP) {
-        sysSuspend = pm->sysctrl->normalSuspend;
+        pm->sysctrl->normalSuspend();
     } else if (pm->sysMode == LOS_SYS_LIGHT_SLEEP) {
-        sysSuspend = pm->sysctrl->lightSuspend;
+        pm->sysctrl->lightSuspend();
     } else if (pm->sysMode == LOS_SYS_DEEP_SLEEP) {
-        sysSuspend = pm->sysctrl->deepSuspend;
+        pm->sysctrl->deepSuspend();
     } else {
-        sysSuspend = pm->sysctrl->shutdownSuspend;
+        pm->sysctrl->shutdownSuspend();
     }
-
-    LOS_ASSERT(sysSuspend != NULL);
-
-    return sysSuspend;
 }
 
-STATIC VOID OsPmTickTimerSuspend(LosPmCB *pm)
+STATIC VOID OsPmResumePrepare(LosPmCB *pm, UINT32 mode, UINT32 prepare)
 {
-    if (((pm->sysMode == LOS_SYS_DEEP_SLEEP) || (pm->sysMode == LOS_SYS_SHUTDOWN)) &&
-        (pm->tickTimer->tickLock != NULL)) {
-        pm->tickTimer->tickLock();
-    } else {
-#if (LOSCFG_BASE_CORE_TICK_WTIMER == 0)
-        /* Sys tick timer enter low power mode */
-        if (pm->tickTimer == NULL) {
-            return;
-        }
+    if ((prepare == 0) && (pm->device->resume != NULL)) {
+        pm->device->resume(mode);
+    }
 
-        if ((pm->tickTimer->timerStart != NULL) &&
-            (pm->tickTimer->timerStop != NULL) &&
-            (pm->tickTimer->timerCycleGet == NULL) &&
-            (pm->tickTimer->freq != 0)) {
-            OsPmTickTimerStop(pm);
-        }
-#endif
+    if (((prepare == 0) || (prepare == OS_PM_SYS_DEVICE_EARLY)) && (pm->sysctrl->late != NULL)) {
+        pm->sysctrl->late(mode);
     }
 }
 
-STATIC VOID OsPmEnter(BOOL isIdle)
+STATIC UINT32 OsPmSuspendPrepare(Suspend sysSuspendEarly, Suspend deviceSuspend, UINT32 mode, UINT32 *prepare)
 {
     UINT32 ret;
+
+    if (sysSuspendEarly != NULL) {
+        ret = sysSuspendEarly(mode);
+        if (ret != LOS_OK) {
+            *prepare = OS_PM_SYS_EARLY;
+            return ret;
+        }
+    }
+
+    if (deviceSuspend != NULL) {
+        ret = deviceSuspend(mode);
+        if (ret != LOS_OK) {
+            *prepare = OS_PM_SYS_DEVICE_EARLY;
+            return ret;
+        }
+    }
+
+    return LOS_OK;
+}
+
+STATIC UINT32 OsPmSuspendCheck(LosPmCB *pm, Suspend *sysSuspendEarly, Suspend *deviceSuspend, LOS_SysSleepEnum *mode)
+{
     UINT32 intSave;
-    Suspend sysSuspend = NULL;
-    LosPmCB *pm = &g_pmCB;
-    BOOL isTaskLock = FALSE;
 
     intSave = LOS_IntLock();
     pm->sysMode = pm->pmMode;
-    if (isIdle) {
-        if ((pm->sysMode != LOS_SYS_NORMAL_SLEEP) && (pm->sysMode != LOS_SYS_LIGHT_SLEEP)) {
-            pm->sysMode = LOS_SYS_NORMAL_SLEEP;
-        }
-    } else {
-        if ((pm->sysMode != LOS_SYS_DEEP_SLEEP) && (pm->sysMode != LOS_SYS_SHUTDOWN)) {
-            LOS_IntRestore(intSave);
-            return;
-        }
-    }
-
-    if ((pm->sysMode == LOS_SYS_NORMAL_SLEEP) || (pm->sysMode == LOS_SYS_LIGHT_SLEEP)) {
-        if (pm->lock > 0) {
-            pm->sysMode = LOS_SYS_NORMAL_SLEEP;
-        }
-    } else if (pm->lock > 0) {
+    if (pm->lock > 0) {
+        pm->sysMode = LOS_SYS_NORMAL_SLEEP;
         LOS_IntRestore(intSave);
-        return;
+        return LOS_NOK;
     }
 
-    if (pm->sysMode != LOS_SYS_NORMAL_SLEEP) {
-        pm->isWake = FALSE;
-        LOS_TaskLock();
-        isTaskLock = TRUE;
-
-        ret = pm->device->suspend((UINT32)pm->sysMode);
-        if (ret != LOS_OK) {
-            goto EXIT;
-        }
-    }
-
-    OsPmTickTimerSuspend(pm);
-
-    sysSuspend = OsPmCpuSuspend(pm);
+    pm->isWake = FALSE;
+    *mode = pm->sysMode;
+    *sysSuspendEarly = pm->sysctrl->early;
+    *deviceSuspend = pm->device->suspend;
     LOS_IntRestore(intSave);
+    return LOS_OK;
+}
 
-    if (!isTaskLock || (isTaskLock && !pm->isWake)) {
-        (VOID)sysSuspend();
+STATIC UINT32 OsPmSuspendSleep(LosPmCB *pm)
+{
+    UINT32 ret, intSave;
+    Suspend sysSuspendEarly, deviceSuspend;
+    LOS_SysSleepEnum mode;
+    UINT32 prepare = 0;
+    BOOL tickTimerStop = FALSE;
+    UINT64 currTime;
+
+    ret = OsPmSuspendCheck(pm, &sysSuspendEarly, &deviceSuspend, &mode);
+    if (ret != LOS_OK) {
+        return ret;
+    }
+
+    ret = OsPmSuspendPrepare(sysSuspendEarly, deviceSuspend, (UINT32)mode, &prepare);
+    if (ret != LOS_OK) {
+        intSave = LOS_IntLock();
+        LOS_TaskLock();
+        goto EXIT;
     }
 
     intSave = LOS_IntLock();
+    LOS_TaskLock();
+    if (pm->isWake || (pm->lock > 0)) {
+        goto EXIT;
+    }
+
+    tickTimerStop = OsPmTickTimerStop(pm);
+    if (!tickTimerStop) {
+        currTime = OsGetCurrSchedTimeCycle();
+        OsSchedResetSchedResponseTime(0);
+        OsSchedUpdateExpireTime(currTime, TRUE);
+    }
+
+    OsPmCpuSuspend(pm);
 
     OsPmCpuResume(pm);
 
-    OsPmTickTimerResume(pm);
-
-    if (pm->sysMode != LOS_SYS_NORMAL_SLEEP) {
-        pm->device->resume((UINT32)pm->sysMode);
-    }
-
-    if (pm->pmMode == LOS_SYS_DEEP_SLEEP) {
-        pm->pmMode = LOS_SYS_NORMAL_SLEEP;
-    }
+    OsPmTickTimerStart(pm);
 
 EXIT:
+    pm->sysMode = LOS_SYS_NORMAL_SLEEP;
+    OsPmResumePrepare(pm, (UINT32)mode, prepare);
     LOS_IntRestore(intSave);
 
-    if (isTaskLock) {
-        LOS_TaskUnlock();
-    }
-    return;
+    LOS_TaskUnlock();
+    return ret;
 }
 
-STATIC VOID OsPmTask(VOID)
+STATIC VOID OsPmNormalSleep(VOID)
 {
-    OsPmEnter(FALSE);
+    UINT32 intSave;
+    LosPmCB *pm = &g_pmCB;
+
+    intSave = LOS_IntLock();
+
+    OsPmCpuSuspend(pm);
+
+    OsPmCpuResume(pm);
+
+    LOS_IntRestore(intSave);
 }
 
 STATIC UINT32 OsPmDeviceRegister(LosPmCB *pm, LosPmDevice *device)
@@ -280,27 +313,60 @@ STATIC UINT32 OsPmTickTimerRegister(LosPmCB *pm, LosPmTickTimer *tickTimer)
 {
     UINT32 intSave;
 
-    intSave = LOS_IntLock();
+    if ((tickTimer->tickLock == NULL) || (tickTimer->tickUnlock == NULL)) {
+        return LOS_ERRNO_PM_INVALID_PARAM;
+    }
+
+    if (((tickTimer->timerStart == NULL) && (tickTimer->timerStop == NULL) &&
+         (tickTimer->timerCycleGet == NULL) && (tickTimer->freq == 0)) ||
+        ((tickTimer->timerStart != NULL) && (tickTimer->timerStop != NULL) &&
+         (tickTimer->timerCycleGet != NULL) && (tickTimer->freq != 0))) {
+        intSave = LOS_IntLock();
 #if (LOSCFG_BASE_CORE_TICK_WTIMER == 0)
-    pm->enterSleepTime = 0;
+        pm->enterSleepTime = 0;
 #endif
-    pm->tickTimer = tickTimer;
-    LOS_IntRestore(intSave);
-    return LOS_OK;
+        pm->tickTimer = tickTimer;
+        LOS_IntRestore(intSave);
+        return LOS_OK;
+    }
+
+    return LOS_ERRNO_PM_INVALID_PARAM;
 }
 
 STATIC UINT32 OsPmSysctrlRegister(LosPmCB *pm, LosPmSysctrl *sysctrl)
 {
-    UINT32 intSave;
-
-    if (sysctrl->normalSuspend == NULL) {
-        return LOS_ERRNO_PM_INVALID_PARAM;
+    UINT32 intSave = LOS_IntLock();
+    if (sysctrl->early != NULL) {
+        pm->sysctrl->early = sysctrl->early;
+    }
+    if (sysctrl->late != NULL) {
+        pm->sysctrl->late = sysctrl->late;
+    }
+    if (sysctrl->normalSuspend != NULL) {
+        pm->sysctrl->normalSuspend = sysctrl->normalSuspend;
+    }
+    if (sysctrl->normalResume != NULL) {
+        pm->sysctrl->normalResume = sysctrl->normalResume;
+    }
+    if (sysctrl->lightSuspend != NULL) {
+        pm->sysctrl->lightSuspend = sysctrl->lightSuspend;
+    }
+    if (sysctrl->lightResume != NULL) {
+        pm->sysctrl->lightResume = sysctrl->lightResume;
+    }
+    if (sysctrl->deepSuspend != NULL) {
+        pm->sysctrl->deepSuspend = sysctrl->deepSuspend;
+    }
+    if (sysctrl->deepResume != NULL) {
+        pm->sysctrl->deepResume = sysctrl->deepResume;
+    }
+    if (sysctrl->shutdownSuspend != NULL) {
+        pm->sysctrl->shutdownSuspend = sysctrl->shutdownSuspend;
+    }
+    if (sysctrl->shutdownResume != NULL) {
+        pm->sysctrl->shutdownResume = sysctrl->shutdownResume;
     }
-
-    intSave = LOS_IntLock();
-    pm->sysctrl = sysctrl;
     LOS_IntRestore(intSave);
-
     return LOS_OK;
 }
 
@@ -362,27 +428,13 @@ STATIC UINT32 OsPmTickTimerUnregister(LosPmCB *pm, LosPmTickTimer *tickTimer)
 
 STATIC UINT32 OsPmSysctrlUnregister(LosPmCB *pm, LosPmSysctrl *sysctrl)
 {
-    UINT32 intSave;
-    VOID *freeNode = NULL;
-
-    intSave = LOS_IntLock();
-    if (pm->sysctrl == sysctrl) {
-        if (pm->sysctrl == g_sysctrl) {
-            freeNode = (VOID *)pm->sysctrl;
-            g_sysctrl = NULL;
-        }
-
-        pm->sysctrl = NULL;
-        LOS_IntRestore(intSave);
-
-        if (freeNode != NULL) {
-            (VOID)LOS_MemFree((VOID *)OS_SYS_MEM_ADDR, freeNode);
-        }
-        return LOS_OK;
-    }
+    (VOID)sysctrl;
 
+    UINT32 intSave = LOS_IntLock();
+    OsPmSysctrlInit();
+    pm->pmMode = LOS_SYS_NORMAL_SLEEP;
     LOS_IntRestore(intSave);
-    return LOS_ERRNO_PM_INVALID_NODE;
+    return LOS_OK;
 }
 
 UINT32 LOS_PmUnregister(LOS_PmNodeType type, VOID *node)
@@ -433,11 +485,8 @@ LOS_SysSleepEnum LOS_PmModeGet(VOID)
 UINT32 LOS_PmModeSet(LOS_SysSleepEnum mode)
 {
     UINT32 intSave;
-    UINT32 taskID;
-    UINT32 ret;
     LosPmCB *pm = &g_pmCB;
     INT32 sleepMode = (INT32)mode;
-    TSK_INIT_PARAM_S taskInitParam = { 0 };
 
     if ((sleepMode < 0) || (sleepMode > LOS_SYS_SHUTDOWN)) {
         return LOS_ERRNO_PM_INVALID_MODE;
@@ -464,29 +513,9 @@ UINT32 LOS_PmModeSet(LOS_SysSleepEnum mode)
         return LOS_ERRNO_PM_HANDLER_NULL;
     }
 
-    if ((mode == LOS_SYS_DEEP_SLEEP) || (mode == LOS_SYS_SHUTDOWN)) {
-        if ((pm->tickTimer == NULL) ||
-            (pm->tickTimer->tickLock == NULL) ||
-            (pm->tickTimer->tickUnlock == NULL)) {
-            LOS_IntRestore(intSave);
-            return LOS_ERRNO_PM_TICK_TIMER_NULL;
-        }
-    }
-
     pm->pmMode = mode;
     LOS_IntRestore(intSave);
 
-    if ((mode == LOS_SYS_DEEP_SLEEP) || (mode == LOS_SYS_SHUTDOWN)) {
-        taskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)OsPmTask;
-        taskInitParam.uwStackSize = LOSCFG_KERNEL_PM_TASK_STACKSIZE;
-        taskInitParam.pcName = "pm";
-        taskInitParam.usTaskPrio = LOSCFG_KERNEL_PM_TASK_PTIORITY;
-        ret = LOS_TaskCreate(&taskID, &taskInitParam);
-        if (ret != LOS_OK) {
-            return ret;
-        }
-    }
-
     return LOS_OK;
 }
 
@@ -513,24 +542,17 @@ VOID LOS_PmLockInfoShow(VOID)
 }
 #endif
 
-UINT32 LOS_PmLockRequest(const CHAR *name)
+UINT32 OsPmLockRequest(const CHAR *name, UINT32 swtmrID)
 {
     UINT32 intSave;
     UINT32 ret = LOS_ERRNO_PM_NOT_LOCK;
     LosPmCB *pm = &g_pmCB;
-#if (LOSCFG_KERNEL_PM_DEBUG == 1)
     OsPmLockCB *listNode = NULL;
     OsPmLockCB *lock = NULL;
     LOS_DL_LIST *head = &pm->lockList;
     LOS_DL_LIST *list = head->pstNext;
 
-    if (name == NULL) {
-        return LOS_ERRNO_PM_INVALID_PARAM;
-    }
-#endif
-
     intSave = LOS_IntLock();
-#if (LOSCFG_KERNEL_PM_DEBUG == 1)
     while (list != head) {
         listNode = LOS_DL_LIST_ENTRY(list, OsPmLockCB, list);
         if (strcmp(name, listNode->name) == 0) {
@@ -549,11 +571,17 @@ UINT32 LOS_PmLockRequest(const CHAR *name)
         }
         lock->name = (CHAR *)name;
         lock->count = 1;
+        lock->swtmrID = swtmrID;
         LOS_ListTailInsert(head, &lock->list);
     } else if (lock->count < OS_PM_LOCK_MAX) {
         lock->count++;
     }
-#endif
+
+    if ((lock->swtmrID != OS_INVALID) && (lock->count > 1)) {
+        lock->count--;
+        LOS_IntRestore(intSave);
+        return LOS_ERRNO_PM_ALREADY_LOCK;
+    }
 
     if (pm->lock < OS_PM_LOCK_MAX) {
         pm->lock++;
@@ -564,25 +592,34 @@ UINT32 LOS_PmLockRequest(const CHAR *name)
     return ret;
 }
 
+UINT32 LOS_PmLockRequest(const CHAR *name)
+{
+    if (name == NULL) {
+        return LOS_ERRNO_PM_INVALID_PARAM;
+    }
+
+    return OsPmLockRequest(name, OS_INVALID);
+}
+
 UINT32 LOS_PmLockRelease(const CHAR *name)
 {
     UINT32 intSave;
     UINT32 ret = LOS_ERRNO_PM_NOT_LOCK;
     LosPmCB *pm = &g_pmCB;
-#if (LOSCFG_KERNEL_PM_DEBUG == 1)
     OsPmLockCB *lock = NULL;
     OsPmLockCB *listNode = NULL;
     LOS_DL_LIST *head = &pm->lockList;
     LOS_DL_LIST *list = head->pstNext;
-    VOID *lockFree = NULL;
+    OsPmLockCB *lockFree = NULL;
+    BOOL isRelease = FALSE;
+    UINT32 mode;
 
     if (name == NULL) {
         return LOS_ERRNO_PM_INVALID_PARAM;
     }
-#endif
 
     intSave = LOS_IntLock();
-#if (LOSCFG_KERNEL_PM_DEBUG == 1)
+    mode = (UINT32)pm->pmMode;
     while (list != head) {
         listNode = LOS_DL_LIST_ENTRY(list, OsPmLockCB, list);
         if (strcmp(name, listNode->name) == 0) {
@@ -603,25 +640,141 @@ UINT32 LOS_PmLockRelease(const CHAR *name)
             lockFree = lock;
         }
     }
-#endif
 
     if (pm->lock > 0) {
         pm->lock--;
+        if (pm->lock == 0) {
+            isRelease = TRUE;
+        }
         ret = LOS_OK;
     }
-
     LOS_IntRestore(intSave);
-#if (LOSCFG_KERNEL_PM_DEBUG == 1)
-    (VOID)LOS_MemFree((VOID *)OS_SYS_MEM_ADDR, lockFree);
-#endif
+
+    if (lockFree != NULL) {
+        (VOID)LOS_SwtmrDelete(lockFree->swtmrID);
+        (VOID)LOS_MemFree((VOID *)OS_SYS_MEM_ADDR, lockFree);
+    }
+
+    if (isRelease && (mode > LOS_SYS_NORMAL_SLEEP)) {
+        (VOID)LOS_EventWrite(&g_pmEvent, PM_EVENT_LOCK_RELEASE);
+    }
+
     return ret;
 }
 
+VOID OsPmFreezeTaskUnsafe(UINT32 taskID)
+{
+    UINT64 responseTime;
+    LosTaskCB *taskCB = OS_TCB_FROM_TID(taskID);
+
+    responseTime = GET_SORTLIST_VALUE(&taskCB->sortList);
+    OsDeleteSortLink(&taskCB->sortList, OS_SORT_LINK_TASK);
+    SET_SORTLIST_VALUE(&taskCB->sortList, responseTime);
+    taskCB->taskStatus |= OS_TASK_FALG_FREEZE;
+    return;
+}
+
+VOID OsPmUnfreezeTaskUnsafe(UINT32 taskID)
+{
+    LosTaskCB *taskCB = OS_TCB_FROM_TID(taskID);
+    UINT64 currTime, responseTime;
+    UINT32 remainTick;
+
+    taskCB->taskStatus &= ~OS_TASK_FALG_FREEZE;
+    currTime = OsGetCurrSchedTimeCycle();
+    responseTime = GET_SORTLIST_VALUE(&taskCB->sortList);
+    if (responseTime > currTime) {
+        remainTick = ((responseTime - currTime) + OS_CYCLE_PER_TICK - 1) / OS_CYCLE_PER_TICK;
+        OsAdd2SortLink(&taskCB->sortList, currTime, remainTick, OS_SORT_LINK_TASK);
+        return;
+    }
+
+    SET_SORTLIST_VALUE(&taskCB->sortList, OS_SORT_LINK_INVALID_TIME);
+    if (taskCB->taskStatus & OS_TASK_STATUS_PEND) {
+        LOS_ListDelete(&taskCB->pendList);
+    }
+    taskCB->taskStatus &= ~(OS_TASK_STATUS_DELAY | OS_TASK_STATUS_PEND_TIME | OS_TASK_STATUS_PEND);
+    return;
+}
+
+STATIC VOID OsPmSwtmrHandler(UINT32 arg)
+{
+    const CHAR *name = (const CHAR *)arg;
+    UINT32 ret = LOS_PmLockRelease(name);
+    if (ret != LOS_OK) {
+        PRINT_ERR("Pm delay lock %s release faled! : 0x%x\n", name, ret);
+    }
+}
+
+UINT32 LOS_PmTimeLockRequest(const CHAR *name, UINT64 millisecond)
+{
+    UINT32 ticks;
+    UINT32 swtmrID;
+    UINT32 ret;
+
+    if ((name == NULL) || !millisecond) {
+        return LOS_ERRNO_PM_INVALID_PARAM;
+    }
+
+    ticks = (UINT32)((millisecond + OS_MS_PER_TICK - 1) / OS_MS_PER_TICK);
+#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
+    ret = LOS_SwtmrCreate(ticks, LOS_SWTMR_MODE_ONCE, OsPmSwtmrHandler, &swtmrID, (UINT32)(UINTPTR)name,
+                          OS_SWTMR_ROUSES_ALLOW, OS_SWTMR_ALIGN_INSENSITIVE);
+#else
+    ret = LOS_SwtmrCreate(ticks, LOS_SWTMR_MODE_ONCE, OsPmSwtmrHandler, &swtmrID, (UINT32)(UINTPTR)name);
+#endif
+    if (ret != LOS_OK) {
+        return ret;
+    }
+
+    ret = OsPmLockRequest(name, swtmrID);
+    if (ret != LOS_OK) {
+        (VOID)LOS_SwtmrDelete(swtmrID);
+        return ret;
+    }
+
+    ret = LOS_SwtmrStart(swtmrID);
+    if (ret != LOS_OK) {
+        (VOID)LOS_PmLockRelease(name);
+    }
+
+    return ret;
+}
+
+UINT32 LOS_PmReadLock(VOID)
+{
+    UINT32 ret = LOS_EventRead(&g_pmEvent, PM_EVENT_LOCK_MASK, LOS_WAITMODE_OR | LOS_WAITMODE_CLR, LOS_WAIT_FOREVER);
+    if (ret > PM_EVENT_LOCK_MASK) {
+        PRINT_ERR("%s event read failed! ERROR: 0x%x\n", __FUNCTION__, ret);
+    }
+
+    return LOS_OK;
+}
+
+UINT32 LOS_PmSuspend(UINT32 wakeCount)
+{
+    (VOID)wakeCount;
+    return OsPmSuspendSleep(&g_pmCB);
+}
+
 STATIC VOID OsPmSleepTimeSet(UINT64 sleepTime)
 {
     g_pmSleepTime = sleepTime;
 }
 
+BOOL OsIsPmMode(VOID)
+{
+    LosPmCB *pm = &g_pmCB;
+
+    UINT32 intSave = LOS_IntLock();
+    if ((pm->sysMode != LOS_SYS_NORMAL_SLEEP) && (pm->lock == 0)) {
+        LOS_IntRestore(intSave);
+        return TRUE;
+    }
+    LOS_IntRestore(intSave);
+    return FALSE;
+}
+
 UINT32 OsPmInit(VOID)
 {
     UINT32 ret;
@@ -630,34 +783,21 @@ UINT32 OsPmInit(VOID)
     (VOID)memset_s(pm, sizeof(LosPmCB), 0, sizeof(LosPmCB));
 
     pm->pmMode = LOS_SYS_NORMAL_SLEEP;
-#if (LOSCFG_KERNEL_PM_DEBUG == 1)
     LOS_ListInit(&pm->lockList);
-#endif
+    (VOID)LOS_EventInit(&g_pmEvent);
 
     ret = OsSchedRealSleepTimeSet(OsPmSleepTimeSet);
     if (ret != LOS_OK) {
         return ret;
     }
 
-    ret = OsPmEnterHandlerSet(OsPmEnter);
+    ret = OsPmEnterHandlerSet(OsPmNormalSleep);
     if (ret != LOS_OK) {
         return ret;
     }
 
-    g_sysctrl = (LosPmSysctrl *)LOS_MemAlloc((VOID *)OS_SYS_MEM_ADDR, sizeof(LosPmSysctrl));
-    if (g_sysctrl == NULL) {
-        return LOS_NOK;
-    }
-
-    (VOID)memset_s(g_sysctrl, sizeof(LosPmSysctrl), 0, sizeof(LosPmSysctrl));
-    g_sysctrl->normalSuspend = HalEnterSleep;
-
-    ret = LOS_PmRegister(LOS_PM_TYPE_SYSCTRL, (VOID *)g_sysctrl);
-    if (ret != LOS_OK) {
-        (VOID)LOS_MemFree((VOID *)OS_SYS_MEM_ADDR, g_sysctrl);
-        g_sysctrl = NULL;
-    }
-
+    OsPmSysctrlInit();
+    pm->sysctrl = &g_sysctrl;
     return ret;
 }
 #endif

components/power/los_pm.h

@@ -118,6 +118,15 @@
  */
 #define LOS_ERRNO_PM_DEVICE_NULL         LOS_ERRNO_OS_ERROR(LOS_MOD_PM, 0x09)
 
+/**
+ * @ingroup los_pm
+ * Pm error code: The delay lock has already been activated.
+ *
+ * Value: 0x0200200a
+ *
+ */
+#define LOS_ERRNO_PM_ALREADY_LOCK        LOS_ERRNO_OS_ERROR(LOS_MOD_PM, 0x0a)
+
 typedef enum {
     LOS_SYS_NORMAL_SLEEP = 0,
     LOS_SYS_LIGHT_SLEEP,
@@ -132,8 +141,8 @@ typedef enum {
 } LOS_PmNodeType;
 
 typedef struct {
-    UINT32 (*suspend)(UINT32 mode);
-    VOID   (*resume)(UINT32 mode);
+    UINT32 (*suspend)(UINT32 mode); /* The device enters low power consumption, Unlocked task scheduling. */
+    VOID   (*resume)(UINT32 mode);  /* The device exits from low power consumption, Unlocked task scheduling. */
 } LosPmDevice;
 
 typedef struct {
@@ -146,13 +155,47 @@ typedef struct {
 } LosPmTickTimer;
 
 typedef struct {
+    /* Preparations before the CPU enters low power consumption.
+     * All modes except normal mode are invoked.
+     * Unlocked task scheduling.
+     */
+    UINT32 (*early)(UINT32 mode);
+    /* The system performs low-power recovery.
+     * All modes except normal mode are invoked.
+     * Unlocked task scheduling.
+     */
+    VOID   (*late)(UINT32 mode);
+    /* The system enters the Normal sleep mode.
+     * In normal mode, the value cannot be NULL.
+     */
     UINT32 (*normalSuspend)(VOID);
+    /* The system recovers from normal sleep.
+     * The value can be NULL.
+     */
     VOID   (*normalResume)(VOID);
+    /* The system enters the light sleep mode.
+     * In light sleep mode, the value cannot be NULL.
+     */
     UINT32 (*lightSuspend)(VOID);
+    /* The system recovers from light sleep.
+     * The value can be NULL.
+     */
     VOID   (*lightResume)(VOID);
+    /* The system enters the deep sleep mode.
+     * In deep sleep mode, the value cannot be NULL.
+     */
     UINT32 (*deepSuspend)(VOID);
+    /* The system recovers from deep sleep.
+     * The value can be NULL.
+     */
     VOID   (*deepResume)(VOID);
+    /* The system enters the shutdown mode.
+     * In shutdown mode, the value cannot be NULL.
+     */
     UINT32 (*shutdownSuspend)(VOID);
+    /* The system recovers from shutdown.
+     * In shutdown mode, the value cannot be NULL.
+     */
     VOID   (*shutdownResume)(VOID);
 } LosPmSysctrl;
 
@@ -174,6 +217,60 @@ typedef struct {
  */
 UINT32 OsPmInit(VOID);
 
+/**
+ * @ingroup los_pm
+ * @brief Whether the low power consumption condition is met.
+ *
+ * @par Description:
+ * This API is used to check whether low power consumption is met.
+ *
+ * @attention None.
+ *
+ * @param  None.
+ *
+ * @retval TRUE or FALSE.
+ * @par Dependency:
+ * <ul><li>los_pm.h: the header file that contains the API declaration.</li></ul>
+ * @see
+ */
+BOOL OsIsPmMode(VOID);
+
+/**
+ * @ingroup los_pm
+ * @brief Freeze delay tasks, internal interfaces between modules.
+ *
+ * @par Description:
+ * This API is used to freeze delay tasks.
+ *
+ * @attention None.
+ *
+ * @param taskID [IN] task ID.
+ *
+ * @retval None.
+ * @par Dependency:
+ * <ul><li>los_pm.h: the header file that contains the API declaration.</li></ul>
+ * @see OsPmUnfreezeTaskUnsafe
+ */
+VOID OsPmFreezeTaskUnsafe(UINT32 taskID);
+
+/**
+ * @ingroup los_pm
+ * @brief Unfreeze delayed tasks, internal interface between modules.
+ *
+ * @par Description:
+ * This API is used to unfreeze delayed tasks.
+ *
+ * @attention None.
+ *
+ * @param taskID [IN] task ID.
+ *
+ * @retval None.
+ * @par Dependency:
+ * <ul><li>los_pm.h: the header file that contains the API declaration.</li></ul>
+ * @see OsPmFreezeTaskUnsafe
+ */
+VOID OsPmUnfreezeTaskUnsafe(UINT32 taskID);
+
 /**
  * @ingroup los_pm
  * @brief Register a power management node.
@@ -285,6 +382,27 @@ UINT32 LOS_PmModeSet(LOS_SysSleepEnum mode);
  */
 UINT32 LOS_PmLockRequest(const CHAR *name);
 
+/**
+ * @ingroup los_pm
+ * @brief Request to obtain the lock in current mode, so that the system will not enter
+ * this mode when it enters the idle task next time. After the specified interval, the
+ * lock is automatically released.
+ *
+ * @par Description:
+ * This API is used to obtain the delay lock in current mode.
+ *
+ * @attention None.
+ *
+ * @param  name        [IN] Who requests the lock.
+ * @param  millisecond [IN] Specifies the time to automatically release the lock.
+ *
+ * @retval error code, LOS_OK means success.
+ * @par Dependency:
+ * <ul><li>los_pm.h: the header file that contains the API declaration.</li></ul>
+ * @see LOS_PmLockRelease
+ */
+UINT32 LOS_PmTimeLockRequest(const CHAR *name, UINT64 millisecond);
+
 /**
  * @ingroup los_pm
  * @brief Release the lock in current mode so that the next time the system enters
@@ -304,7 +422,42 @@ UINT32 LOS_PmLockRequest(const CHAR *name);
  */
 UINT32 LOS_PmLockRelease(const CHAR *name);
 
-#if (LOSCFG_KERNEL_PM_DEBUG == 1)
+/**
+ * @ingroup los_pm
+ * @brief Gets the current PM lock status.
+ *
+ * @par Description:
+ * This API is used to Get the current PM lock status.
+ *
+ * @attention None.
+ *
+ * @param NA.
+ *
+ * @retval Number of awakening sources of the device.
+ * @par Dependency:
+ * <ul><li>los_pm.h: the header file that contains the API declaration.</li></ul>
+ * @see
+ */
+UINT32 LOS_PmReadLock(VOID);
+
+/**
+ * @ingroup los_pm
+ * @brief The system enters the low-power flow.
+ *
+ * @par Description:
+ * This API is used to enter the system into a low-power process.
+ *
+ * @attention None.
+ *
+ * @param  wakeCount [IN] Number of wake sources.
+ *
+ * @retval error code, LOS_OK means success.
+ * @par Dependency:
+ * <ul><li>los_pm.h: the header file that contains the API declaration.</li></ul>
+ * @see
+ */
+UINT32 LOS_PmSuspend(UINT32 wakeCount);
+
 /**
  * @ingroup los_pm
  * @brief Output the locking information of the pm lock.
@@ -323,4 +476,3 @@ UINT32 LOS_PmLockRelease(const CHAR *name);
  */
 VOID LOS_PmLockInfoShow(VOID);
 #endif
-#endif

components/shell/BUILD.gn

@@ -50,7 +50,7 @@ static_library("shell") {
     "./include",
   ]
 
-  if (enable_ohos_kernel_liteos_m_lwip == true) {
+  if (enable_ohos_kernel_liteos_m_lwip) {
     defines = [ "LWIP_SHELLCMD_ENABLE" ]
   }
   deps = [

components/shell/src/base/shmsg.c

@@ -29,11 +29,20 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-
 #include "shmsg.h"
+#include "securec.h"
 #include "shcmd.h"
 #include "show.h"
-#include "securec.h"
+#if (LOSCFG_USE_SHELL == 1)
+#include "uart.h"
+#endif
+#include "los_event.h"
+#include "los_task.h"
+
+EVENT_CB_S g_shellInputEvent;
+#define SHELL_CMD_MAX_SIZE 64
+
+#define VISIABLE_CHAR(ch) ((ch) > 0x1F && (ch) < 0x7F)
 
 UINT32 ShellMsgTypeGet(CmdParsed *cmdParsed, const CHAR *cmdType)
 {
@@ -60,17 +69,17 @@ UINT32 ShellMsgTypeGet(CmdParsed *cmdParsed, const CHAR *cmdType)
     return OS_INVALID;
 }
 
-char *GetCmdName(const char *cmdline, unsigned int len)
+CHAR *GetCmdName(const CHAR *cmdline, UINT32 len)
 {
-    unsigned int loop;
-    const char *tmpStr = NULL;
+    UINT32 loop;
+    const CHAR *tmpStr = NULL;
     BOOL quotes = FALSE;
-    char *cmdName = NULL;
+    CHAR *cmdName = NULL;
     if (cmdline == NULL) {
         return NULL;
     }
 
-    cmdName = (char *)malloc(len + 1);
+    cmdName = (CHAR *)malloc(len + 1);
     if (cmdName == NULL) {
         PRINTK("malloc failure in %s[%d]\n", __FUNCTION__, __LINE__);
         return NULL;
@@ -99,9 +108,9 @@ char *GetCmdName(const char *cmdline, unsigned int len)
     return cmdName;
 }
 
-int ShellCmdExec(const char *msgName, const char *cmdString)
+INT32 ShellCmdExec(const CHAR *msgName, const CHAR *cmdString)
 {
-    unsigned int uintRet;
+    UINT32 uintRet;
     errno_t err;
     CmdParsed cmdParsed;
 
@@ -118,24 +127,27 @@ int ShellCmdExec(const char *msgName, const char *cmdString)
         PRINTK("%s:command not found\n", msgName);
         return -EFAULT;
     } else {
-        (void)OsCmdExec(&cmdParsed, (char *)cmdString);
+        (VOID)OsCmdExec(&cmdParsed, (CHAR *)cmdString);
     }
     return 0;
 }
 
-unsigned int PreHandleCmdline(const char *input, char **output, unsigned int *outputlen)
+UINT32 PreHandleCmdline(const CHAR *input, CHAR **output, UINT32 *outputlen)
 {
-    unsigned int shiftLen;
-    unsigned int ret;
-    const char *cmdBuf = input;
-    unsigned int cmdBufLen = strlen(cmdBuf);
-    char *shiftStr = (char *)malloc(cmdBufLen + 1);
+    UINT32 shiftLen;
+    UINT32 ret;
+    const CHAR *cmdBuf = input;
+    UINT32 cmdBufLen = strlen(cmdBuf);
+    if ((cmdBufLen + 1) > SHELL_CMD_MAX_SIZE) {
+        return SH_NOK;
+    }
+    CHAR *shiftStr = (CHAR *)malloc(cmdBufLen + 1);
 
     if (shiftStr == NULL) {
         PRINTK("malloc failure in %s[%d]\n", __FUNCTION__, __LINE__);
         return SH_NOK;
     }
-    (void)memset_s(shiftStr, cmdBufLen + 1, 0, cmdBufLen + 1);
+    (VOID)memset_s(shiftStr, cmdBufLen + 1, 0, cmdBufLen + 1);
 
     /* Call function 'OsCmdKeyShift' to squeeze and clear useless or overmuch space if string buffer */
     ret = OsCmdKeyShift(cmdBuf, shiftStr, cmdBufLen + 1);
@@ -156,12 +168,12 @@ END:
     return ret;
 }
 
-static void ParseAndExecCmdline(CmdParsed *cmdParsed, const char *cmdline, unsigned int len)
+static VOID ParseAndExecCmdline(CmdParsed *cmdParsed, const CHAR *cmdline, UINT32 len)
 {
-    int i;
-    unsigned int ret;
-    char *cmdlineOrigin = NULL;
-    char *cmdName = NULL;
+    INT32 i;
+    UINT32 ret;
+    CHAR *cmdlineOrigin = NULL;
+    CHAR *cmdName = NULL;
 
     cmdlineOrigin = strdup(cmdline);
     if (cmdlineOrigin == NULL) {
@@ -176,13 +188,13 @@ static void ParseAndExecCmdline(CmdParsed *cmdParsed, const char *cmdline, unsig
         return;
     }
 
-    ret = OsCmdParse((char *)cmdline, cmdParsed);
+    ret = OsCmdParse((CHAR *)cmdline, cmdParsed);
     if (ret != SH_OK) {
         PRINTK("cmd parse failure in %s[%d]\n", __FUNCTION__, __LINE__);
         goto OUT;
     }
 
-    (void)ShellCmdExec(cmdName, cmdlineOrigin);
+    (VOID)ShellCmdExec(cmdName, cmdlineOrigin);
 
 OUT:
     for (i = 0; i < cmdParsed->paramCnt; i++) {
@@ -195,11 +207,11 @@ OUT:
     free(cmdlineOrigin);
 }
 
-LITE_OS_SEC_TEXT_MINOR void ExecCmdline(const char *cmdline)
+LITE_OS_SEC_TEXT_MINOR VOID ExecCmdline(const CHAR *cmdline)
 {
-    unsigned int ret;
-    char *output = NULL;
-    unsigned int outputlen;
+    UINT32 ret;
+    CHAR *output = NULL;
+    UINT32 outputlen;
     CmdParsed cmdParsed;
 
     if (cmdline == NULL) {
@@ -214,8 +226,70 @@ LITE_OS_SEC_TEXT_MINOR void ExecCmdline(const char *cmdline)
         return;
     }
 
-    (void)memset_s(&cmdParsed, sizeof(CmdParsed), 0, sizeof(CmdParsed));
+    (VOID)memset_s(&cmdParsed, sizeof(CmdParsed), 0, sizeof(CmdParsed));
     ParseAndExecCmdline(&cmdParsed, output, outputlen);
     free(output);
 }
 
+#if (LOSCFG_USE_SHELL == 1)
+VOID ShellTaskEntry(VOID)
+{
+    CHAR buf[SHELL_CMD_MAX_SIZE] = {0};
+    CHAR *ptr = buf;
+    PRINTK("OHOS # ");
+    while (1) {
+        (VOID)LOS_EventRead(&g_shellInputEvent, 0x1, LOS_WAITMODE_AND | LOS_WAITMODE_CLR, LOS_WAIT_FOREVER);
+        while ((*ptr = (UINT8)UartGetc()) != 0 && *ptr != 13) {
+            if (*ptr == '\x03') { /* ctrl + c */
+                PRINTK("^C\n\rOHOS # ", *ptr);
+                ptr = buf;
+                break;
+            }
+            if (!VISIABLE_CHAR(*ptr)) {
+                break;
+            }
+            PRINTK("%c", *ptr);
+            if ((ptr - buf) == (sizeof(buf) - 1)) {
+                break;
+            }
+            ptr++;
+        }
+        if (ptr != buf) {
+            if (*ptr == 13 || ((ptr - buf) == (sizeof(buf) - 1))) {
+                *ptr = '\0';
+                ptr = buf;
+                PRINTK("\n\r");
+                ExecCmdline(buf);
+                PRINTK("OHOS # ");
+            }
+        } else if (*ptr == 13) {
+            PRINTK("\n\rOHOS # ");
+        }
+    }
+}
+
+LITE_OS_SEC_TEXT_MINOR UINT32 LosShellInit(VOID)
+{
+    UINT32 ret;
+    UINT32 taskID1, taskID2;
+    TSK_INIT_PARAM_S task1 = { 0 };
+
+    ret = LOS_EventInit(&g_shellInputEvent);
+    if (ret != LOS_OK) {
+        PRINTK("Init shellInputEvent failed! ERROR: 0x%x\n", ret);
+        return ret;
+    }
+
+    task1.pfnTaskEntry = (TSK_ENTRY_FUNC)ShellTaskEntry;
+    task1.uwStackSize  = 0x1000;
+    task1.pcName       = "ShellTaskEntry";
+    task1.usTaskPrio   = LOSCFG_SHELL_PRIO;
+    ret = LOS_TaskCreate(&taskID1, &task1);
+    if (ret != LOS_OK) {
+        PRINTK("Create Shell Task failed! ERROR: 0x%x\n", ret);
+        return ret;
+    }
+
+    return ret;
+}
+#endif

components/shell/src/cmds/shell_shellcmd.c

@@ -31,6 +31,10 @@
 
 #include "shcmd.h"
 
+#define DEFAULT_SCREEN_WIDTH 80
+#define MAX_CMD_KEY_WIDTH    8
+#define CMD_ITEM_PER_LINE    (DEFAULT_SCREEN_WIDTH / (MAX_CMD_KEY_WIDTH + 1))
+
 INT32 OsShellCmdHelp(INT32 argc, const CHAR **argv)
 {
     UINT32 loop = 0;
@@ -45,10 +49,10 @@ INT32 OsShellCmdHelp(INT32 argc, const CHAR **argv)
 
     PRINTK("*******************shell commands:*************************\n");
     LOS_DL_LIST_FOR_EACH_ENTRY(curCmdItem, &(cmdInfo->cmdList.list), CmdItemNode, list) {
-        if ((loop & (8 - 1)) == 0) { /* 8 - 1:just align print */
+        if ((loop % CMD_ITEM_PER_LINE) == 0) { /* just align print */
             PRINTK("\n");
         }
-        PRINTK("%-12s  ", curCmdItem->cmd->cmdKey);
+        PRINTK("%-8s ", curCmdItem->cmd->cmdKey);
 
         loop++;
     }

components/shell/src/cmds/task_shellcmd.c

@@ -39,37 +39,22 @@
 #define OS_INVALID_SEM_ID  0xFFFFFFFF
 #define OS_ALL_TASK_MASK   0xFFFFFFFF
 
-LITE_OS_SEC_TEXT_MINOR UINT8 *OsShellCmdConvertTskStatus(UINT16 taskStatus)
-{
-    if (taskStatus & OS_TASK_STATUS_RUNNING) {
-        return (UINT8 *)"Running";
-    } else if (taskStatus & OS_TASK_STATUS_READY) {
-        return (UINT8 *)"Ready";
-    } else {
-        if (taskStatus & OS_TASK_STATUS_DELAY) {
-            return (UINT8 *)"Delay";
-        } else if (taskStatus & OS_TASK_STATUS_PEND_TIME) {
-            return (UINT8 *)"PendTime";
-        } else if (taskStatus & OS_TASK_STATUS_PEND) {
-            return (UINT8 *)"Pend";
-        } else if (taskStatus & OS_TASK_STATUS_SUSPEND) {
-            return (UINT8 *)"Suspend";
-        }
-    }
-
-    return (UINT8 *)"Invalid";
-}
-
 LITE_OS_SEC_TEXT_MINOR STATIC VOID OsShellCmdTskInfoTitle(VOID)
 {
-    PRINTK("\r\nName                   TaskEntryAddr       TID    ");
+    PRINTK("Name                   TaskEntryAddr       TID    ");
 
     PRINTK("Priority   Status       "
+#if (LOSCFG_TASK_MEM_USED == 1)
+           "AllocSize       "
+#endif
            "StackSize       StackPoint   TopOfStack");
 
     PRINTK("\n");
     PRINTK("----                   -------------       ---    ");
     PRINTK("--------   --------     "
+#if (LOSCFG_TASK_MEM_USED == 1)
+           "---------       "
+#endif
            "---------       ----------   ----------");
     PRINTK("\n");
 }
@@ -89,7 +74,17 @@ LITE_OS_SEC_TEXT_MINOR STATIC VOID OsShellCmdTskInfoData(const LosTaskCB *allTas
 {
     const LosTaskCB *taskCB = NULL;
     UINT32 loop;
-    UINT32 semId;
+
+#if (LOSCFG_TASK_MEM_USED == 1)
+    UINT32 arraySize = sizeof(UINT32) * (LOSCFG_BASE_CORE_TSK_LIMIT + 1);
+    UINT32 *getUsedSizeArray = (UINT32 *)LOS_MemAlloc(m_aucSysMem0, arraySize);
+    if (getUsedSizeArray == NULL) {
+        PRINTK("Memory is not enough to save task info!\n");
+        return;
+    }
+    (VOID)memset_s(getUsedSizeArray, arraySize, 0, arraySize);
+    OsTaskMemUsed(m_aucSysMem0, getUsedSizeArray, (LOSCFG_BASE_CORE_TSK_LIMIT + 1));
+#endif
 
     for (loop = 0; loop < g_taskMaxNum; ++loop) {
         taskCB = allTaskArray + loop;
@@ -97,14 +92,21 @@ LITE_OS_SEC_TEXT_MINOR STATIC VOID OsShellCmdTskInfoData(const LosTaskCB *allTas
             continue;
         }
 
-        semId = OsGetSemID(taskCB);
-
         PRINTK("%-23s%-20p0x%-5x", taskCB->taskName, taskCB->taskEntry, taskCB->taskID);
+#if (LOSCFG_TASK_MEM_USED == 1)
+        PRINTK("%-11u%-13s0x%-11x   0x%-11x   0x%-8x   0x%-10x   ", taskCB->priority,
+               OsConvertTskStatus(taskCB->taskStatus), getUsedSizeArray[loop], taskCB->stackSize,
+               taskCB->stackPointer, taskCB->topOfStack);
+#else
         PRINTK("%-11u%-13s0x%-11x   0x%-8x   0x%-10x   ", taskCB->priority,
-               OsShellCmdConvertTskStatus(taskCB->taskStatus), taskCB->stackSize,
-               taskCB->stackPointer, taskCB->topOfStack, semId);
+               OsConvertTskStatus(taskCB->taskStatus), taskCB->stackSize,
+               taskCB->stackPointer, taskCB->topOfStack);
+#endif
         PRINTK("\n");
     }
+#if (LOSCFG_TASK_MEM_USED == 1)
+    (VOID)LOS_MemFree(m_aucSysMem0, getUsedSizeArray);
+#endif
 }
 
 LITE_OS_SEC_TEXT_MINOR UINT32 OsShellCmdTskInfoGet(UINT32 taskId)

components/shell/src/cmds/vfs_shellcmd.c

@@ -276,6 +276,7 @@ int OsShellCmdCat(int argc, const char **argv)
 
     if (fd == -1) {
         ret = -1;
+        free(fullpath);
         return ret;
     }
 
@@ -522,7 +523,10 @@ static int OsShellCmdDoRmdir(const char *pathname)
     char *fullpath = NULL;
     int ret;
 
-    (void)memset_s(&statInfo, sizeof(statInfo), 0, sizeof(struct stat));
+    ret = memset_s(&statInfo, sizeof(struct stat), 0, sizeof(struct stat));
+    if (ret != 0) {
+        return -1;
+    }
     if (stat(pathname, &statInfo) != 0) {
         return -1;
     }

components/trace/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
+
 static_library("trace") {
   sources = [
     "cnv/trace_cnv.c",
@@ -39,13 +41,10 @@ static_library("trace") {
   ]
 
   include_dirs = [
-    "../../kernel/include",
-    "../../kernel/arch/include",
-    "../../utils",
     "./",
     "cnv",
     "pipeline",
     "pipeline/serial",
-    "//third_party/bounds_checking_function/include",
   ]
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 }

components/trace/cnv/trace_cnv.c

@@ -218,7 +218,7 @@ STATIC VOID LOS_TraceSwtmrExpired(const SWTMR_CTRL_S *swtmr)
 
 STATIC VOID LOS_TraceSwtmrStart(const SWTMR_CTRL_S *swtmr)
 {
-    LOS_TRACE(SWTMR_START, swtmr->usTimerID, swtmr->ucMode, swtmr->uwCount, swtmr->uwInterval, 0);
+    LOS_TRACE(SWTMR_START, swtmr->usTimerID, swtmr->ucMode, swtmr->uwInterval);
 }
 
 STATIC VOID LOS_TraceSwtmrStop(const SWTMR_CTRL_S *swtmr)

components/trace/los_trace.c

@@ -240,7 +240,7 @@ STATIC UINT32 OsCreateTraceAgentTask(VOID)
 }
 #endif
 
-UINT32 LOS_TraceInit(VOID *buf, UINT32 size)
+UINT32 OsTraceInit(VOID)
 {
     UINT32 intSave;
     UINT32 ret;
@@ -267,10 +267,15 @@ UINT32 LOS_TraceInit(VOID *buf, UINT32 size)
     }
 #endif
 
-    ret = OsTraceBufInit(buf, size);
+#if (LOSCFG_RECORDER_MODE_OFFLINE == 1)
+    ret = OsTraceBufInit(LOSCFG_TRACE_BUFFER_SIZE);
     if (ret != LOS_OK) {
-        goto LOS_RELEASE;
+#if (LOSCFG_TRACE_CONTROL_AGENT == 1)
+        (VOID)LOS_TaskDelete(g_traceTaskId);
+#endif
+        goto LOS_ERREND;
     }
+#endif
 
     OsTraceHookInstall();
     OsTraceCnvInit();
@@ -286,10 +291,6 @@ UINT32 LOS_TraceInit(VOID *buf, UINT32 size)
 #endif
     TRACE_UNLOCK(intSave);
     return LOS_OK;
-LOS_RELEASE:
-#if (LOSCFG_TRACE_CONTROL_AGENT == 1)
-    LOS_TaskDelete(g_traceTaskId);
-#endif
 LOS_ERREND:
     TRACE_UNLOCK(intSave);
     return ret;

components/trace/los_trace.h

@@ -287,7 +287,6 @@ typedef struct {
  *
  * @par Dependency:
  * <ul><li>los_trace.h: the header file that contains the API declaration.</li></ul>
- * @since Huawei LiteOS V200R005C00
  */
 typedef BOOL (*TRACE_HWI_FILTER_HOOK)(UINT32 hwiNum);
 
@@ -321,7 +320,7 @@ extern TRACE_EVENT_HOOK g_traceEventHook;
 #define TASK_RESUME_PARAMS(taskId, taskStatus, prio)     taskId, taskStatus, prio
 #define TASK_SIGNAL_PARAMS(taskId, signal, schedFlag)    // taskId, signal, schedFlag
 
-#define SWTMR_START_PARAMS(swtmrId, mode, overrun, interval, expiry)  swtmrId, mode, overrun, interval, expiry
+#define SWTMR_START_PARAMS(swtmrId, mode, interval)  swtmrId, mode, interval
 #define SWTMR_DELETE_PARAMS(swtmrId)                                  swtmrId
 #define SWTMR_EXPIRED_PARAMS(swtmrId)                                 swtmrId
 #define SWTMR_STOP_PARAMS(swtmrId)                                    swtmrId
@@ -391,7 +390,6 @@ extern TRACE_EVENT_HOOK g_traceEventHook;
  *
  * @par Dependency:
  * <ul><li>los_trace.h: the header file that contains the API declaration.</li></ul>
- * @since Huawei LiteOS V200R005C00
  */
 #define LOS_TRACE(TYPE, IDENTITY, ...)                                             \
     do {                                                                           \
@@ -423,7 +421,6 @@ extern TRACE_EVENT_HOOK g_traceEventHook;
  *
  * @par Dependency:
  * <ul><li>los_trace.h: the header file that contains the API declaration.</li></ul>
- * @since Huawei LiteOS V200R005C00
  */
 #define LOS_TRACE_EASY(TYPE, IDENTITY, ...)                                                                          \
     do {                                                                                                             \
@@ -437,34 +434,6 @@ extern TRACE_EVENT_HOOK g_traceEventHook;
 #define LOS_TRACE_EASY(...)
 #endif
 
-/**
- * @ingroup los_trace
- * @brief Intialize the trace when the system startup.
- *
- * @par Description:
- * This API is used to intilize the trace for system level.
- * @attention
- * <ul>
- * <li>This API can be called only after the memory is initialized. Otherwise, the Trace Init will be fail.</li>
- * </ul>
- *
- * @param buf        [IN] Type #VOID *. The ptr is trace buffer address, if ptr is NULL, system will malloc a new one in
- *                                  trace offline mode.
- * @param size       [IN] Type #UINT32. The trace buffer's size.
- *
- * @retval #LOS_ERRNO_TRACE_ERROR_STATUS        0x02001400: The trace status is not TRACE_UNINIT.
- * @retval #LOS_ERRNO_TRACE_NO_MEMORY           0x02001401: The memory is not enough for initilize.
- * @retval #LOS_ERRNO_TRACE_BUF_TOO_SMALL       0x02001402: Trace buf size not enough.
- * @retval #LOS_ERRNO_TSK_TCB_UNAVAILABLE       0x02000211: No free task control block is available.
- * @retval #LOS_ERRNO_TSK_MP_SYNC_RESOURCE      0x02000225: Mp sync resource create failed
- * @retval #LOS_OK                              0x00000000: The intialization is successful.
- * @par Dependency:
- * <ul><li>los_trace.h: the header file that contains the API declaration.</li></ul>
- * @see LOS_TraceInit
- * @since Huawei LiteOS V200R005C00
- */
-extern UINT32 LOS_TraceInit(VOID *buf, UINT32 size);
-
 /**
  * @ingroup los_trace
  * @brief Start trace.
@@ -483,7 +452,6 @@ extern UINT32 LOS_TraceInit(VOID *buf, UINT32 size);
  * @par Dependency:
  * <ul><li>los_trace.h: the header file that contains the API declaration.</li></ul>
  * @see LOS_TraceStart
- * @since Huawei LiteOS V200R005C00
  */
 extern UINT32 LOS_TraceStart(VOID);
 
@@ -504,7 +472,6 @@ extern UINT32 LOS_TraceStart(VOID);
  * @par Dependency:
  * <ul><li>los_trace.h: the header file that contains the API declaration.</li></ul>
  * @see LOS_TraceStop
- * @since Huawei LiteOS V200R005C00
  */
 extern VOID LOS_TraceStop(VOID);
 
@@ -525,7 +492,6 @@ extern VOID LOS_TraceStop(VOID);
  * @par Dependency:
  * <ul><li>los_trace.h: the header file that contains the API declaration.</li></ul>
  * @see LOS_TraceReset
- * @since Huawei LiteOS V200R005C00
  */
 extern VOID LOS_TraceReset(VOID);
 
@@ -549,7 +515,6 @@ extern VOID LOS_TraceReset(VOID);
  * @par Dependency:
  * <ul><li>los_trace.h: the header file that contains the API declaration.</li></ul>
  * @see LOS_TraceEventMaskSet
- * @since Huawei LiteOS V200R005C00
  */
 extern VOID LOS_TraceEventMaskSet(UINT32 mask);
 
@@ -572,7 +537,6 @@ extern VOID LOS_TraceEventMaskSet(UINT32 mask);
  * @par Dependency:
  * <ul><li>los_trace.h: the header file that contains the API declaration.</li></ul>
  * @see LOS_TraceRecordDump
- * @since Huawei LiteOS V200R005C00
  */
 extern VOID LOS_TraceRecordDump(BOOL toClient);
 
@@ -595,7 +559,6 @@ extern VOID LOS_TraceRecordDump(BOOL toClient);
  * @par Dependency:
  * <ul><li>los_trace.h: the header file that contains the API declaration.</li></ul>
  * @see LOS_TraceRecordGet
- * @since Huawei LiteOS V200R005C00
  */
 extern OfflineHead *LOS_TraceRecordGet(VOID);
 
@@ -616,7 +579,6 @@ extern OfflineHead *LOS_TraceRecordGet(VOID);
  * @par Dependency:
  * <ul><li>los_trace.h: the header file that contains the API declaration.</li></ul>
  * @see LOS_TraceHwiFilterHookReg
- * @since Huawei LiteOS V200R005C00
  */
 extern VOID LOS_TraceHwiFilterHookReg(TRACE_HWI_FILTER_HOOK hook);
 #ifdef __cplusplus

components/trace/los_trace_pri.h

@@ -119,10 +119,10 @@ typedef struct {
     OfflineHead *head;
 } TraceOfflineHeaderInfo;
 
+extern UINT32 OsTraceInit(VOID);
 extern UINT32 OsTraceGetMaskTid(UINT32 taskId);
 extern VOID OsTraceSetObj(ObjData *obj, const LosTaskCB *tcb);
 extern VOID OsTraceWriteOrSendEvent(const TraceEventFrame *frame);
-extern UINT32 OsTraceBufInit(VOID *buf, UINT32 size);
 extern VOID OsTraceObjAdd(UINT32 eventType, UINT32 taskId);
 extern BOOL OsTraceIsEnable(VOID);
 extern OfflineHead *OsTraceRecordGet(VOID);
@@ -145,6 +145,7 @@ extern VOID OsTraceSendNotify(UINT32 type, UINT32 value);
 #define OsTraceReset()
 #define OsTraceRecordDump(toClient)
 #else
+extern UINT32 OsTraceBufInit(UINT32 size);
 extern VOID OsTraceReset(VOID);
 extern VOID OsTraceRecordDump(BOOL toClient);
 #define OsTraceNotifyStart()

components/trace/pipeline/trace_tlv.h

@@ -85,7 +85,6 @@ typedef struct {
  * @par Dependency:
  * <ul><li>trace_tlv.h: the header file that contains the API declaration.</li></ul>
  * @see LOS_TraceDataEncode
- * @since Huawei LiteOS V200R005C00
  */
 extern UINT32 OsTraceDataEncode(UINT8 type, const TlvTable *table, UINT8 *src, UINT8 *dest, INT32 destLen);
 

components/trace/trace_offline.c

@@ -49,21 +49,19 @@ UINT32 OsTraceGetMaskTid(UINT32 tid)
     return tid | ((tid < LOSCFG_BASE_CORE_TSK_LIMIT) ? g_tidMask[tid] << BITS_NUM_FOR_TASK_ID : 0); /* tid < 65535 */
 }
 
-UINT32 OsTraceBufInit(VOID *buf, UINT32 size)
+UINT32 OsTraceBufInit(UINT32 size)
 {
     UINT32 headSize;
-
+    VOID *buf = NULL;
     headSize = sizeof(OfflineHead) + sizeof(ObjData) * LOSCFG_TRACE_OBJ_MAX_NUM;
     if (size <= headSize) {
         TRACE_ERROR("trace buf size not enough than 0x%x\n", headSize);
         return LOS_ERRNO_TRACE_BUF_TOO_SMALL;
     }
 
+    buf = LOS_MemAlloc(m_aucSysMem0, size);
     if (buf == NULL) {
-        buf = LOS_MemAlloc(m_aucSysMem0, size);
-        if (buf == NULL) {
-            return LOS_ERRNO_TRACE_NO_MEMORY;
-        }
+        return LOS_ERRNO_TRACE_NO_MEMORY;
     }
 
     (VOID)memset_s(buf, size, 0, size);

components/trace/trace_online.c

@@ -44,13 +44,6 @@ UINT32 OsTraceGetMaskTid(UINT32 taskId)
     return taskId;
 }
 
-UINT32 OsTraceBufInit(VOID *buf, UINT32 size)
-{
-    (VOID)buf;
-    (VOID)size;
-    return LOS_OK;
-}
-
 VOID OsTraceSendHead(VOID)
 {
     TraceBaseHeaderInfo head = {

config.gni

@@ -40,5 +40,8 @@ declare_args() {
   enable_ohos_kernel_liteos_m_trace = false
   enable_ohos_kernel_liteos_m_lwip = false
   enable_ohos_kernel_liteos_m_dynlink = false
+  enable_ohos_kernel_liteos_m_tz = false
   ohos_kernel_liteos_m_lwip_path = "components/net/lwip-2.1:lwip"
 }
+
+LITEOSTOPDIR = "//kernel/liteos_m"

kal/BUILD.gn

@@ -37,11 +37,11 @@ declare_args() {
 lite_component("kal") {
   features = []
 
-  if (enable_ohos_kernel_liteos_m_cmsis == true) {
+  if (enable_ohos_kernel_liteos_m_cmsis) {
     features += [ "cmsis" ]
   }
 
-  if (enable_ohos_kernel_liteos_m_posix == true) {
+  if (enable_ohos_kernel_liteos_m_posix) {
     features += [ "posix" ]
   }
 }

kal/cmsis/BUILD.gn

@@ -27,17 +27,13 @@
 # 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/config.gni")
+
 static_library("cmsis") {
   sources = [ "cmsis_liteos2.c" ]
 
-  include_dirs = [
-    "//third_party/bounds_checking_function/include",
-    "../../kernel/include",
-    "../../kernel/arch/include",
-    "../../utils",
-  ]
-
   public_configs = [ ":include" ]
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 }
 
 config("include") {

kal/cmsis/cmsis_liteos2.c

@@ -112,7 +112,7 @@ osStatus_t osKernelGetInfo(osVersion_t *version, char *id_buf, uint32_t id_size)
         }
         uwRet = memcpy_s(id_buf, id_size, KERNEL_ID, id_size);
         if (uwRet != EOK) {
-            PRINT_ERR("%s[%d] memcpy failed, error type = %u\n", __FUNCTION__, __LINE__, uwRet);
+            PRINT_ERR("%s[%d] memcpy failed, error type = %lu\n", __FUNCTION__, __LINE__, uwRet);
             return osError;
         }
     }
@@ -299,7 +299,9 @@ osThreadId_t osThreadNew(osThreadFunc_t func, void *argument, const osThreadAttr
     stTskInitParam.uwStackSize = attr ? attr->stack_size : LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE;
     stTskInitParam.pcName = (CHAR *)(attr ? attr->name : "[NULL]");
     stTskInitParam.usTaskPrio = usPriority;
-
+    if (attr->attr_bits == osThreadJoinable) {
+        stTskInitParam.uwResved = LOS_TASK_ATTR_JOINABLE;
+    }
     uwRet = LOS_TaskCreate(&uwTid, &stTskInitParam);
 
     if (LOS_OK != uwRet) {
@@ -576,6 +578,46 @@ osStatus_t osThreadResume(osThreadId_t thread_id)
 }
 
 
+osStatus_t osThreadDetach(osThreadId_t thread_id)
+{
+    UINT32 ret;
+    LosTaskCB *taskCB = (LosTaskCB *)thread_id;
+
+    if (thread_id == NULL) {
+        return osErrorParameter;
+    }
+
+    ret = LOS_TaskDetach(taskCB->taskID);
+    if (ret == LOS_ERRNO_TSK_NOT_ALLOW_IN_INT) {
+        return osErrorISR;
+    } else if (ret != LOS_OK) {
+        return osErrorResource;
+    }
+
+    return osOK;
+}
+
+
+osStatus_t osThreadJoin(osThreadId_t thread_id)
+{
+    UINT32 ret;
+    LosTaskCB *taskCB = (LosTaskCB *)thread_id;
+
+    if (thread_id == NULL) {
+        return osErrorParameter;
+    }
+
+    ret = LOS_TaskJoin(taskCB->taskID, NULL);
+    if (ret == LOS_ERRNO_TSK_NOT_ALLOW_IN_INT) {
+        return osErrorISR;
+    } else if (ret != LOS_OK) {
+        return osErrorResource;
+    }
+
+    return osOK;
+}
+
+
 osStatus_t osThreadTerminate(osThreadId_t thread_id)
 {
     UINT32 uwRet;
@@ -1087,8 +1129,9 @@ osStatus_t osMutexDelete(osMutexId_t mutex_id)
 
 osSemaphoreId_t osSemaphoreNew(uint32_t max_count, uint32_t initial_count, const osSemaphoreAttr_t *attr)
 {
-    UINT32 uwRet;
+    UINT32 uwRet = LOS_NOK;
     UINT32 uwSemId;
+    UINT32 intSave;
 
     UNUSED(attr);
 
@@ -1096,14 +1139,16 @@ osSemaphoreId_t osSemaphoreNew(uint32_t max_count, uint32_t initial_count, const
         return (osSemaphoreId_t)NULL;
     }
 
-    if (1 == max_count) {
-        uwRet = LOS_BinarySemCreate((UINT16)initial_count, &uwSemId);
-    } else {
+    if (max_count > 0 && max_count <= OS_SEM_COUNTING_MAX_COUNT) {
         uwRet = LOS_SemCreate((UINT16)initial_count, &uwSemId);
     }
 
     if (uwRet == LOS_OK) {
-        return (osSemaphoreId_t)(GET_SEM(uwSemId));
+        osSemaphoreId_t semaphore_id = (osSemaphoreId_t)(GET_SEM(uwSemId));
+        intSave = LOS_IntLock();
+        ((LosSemCB *)semaphore_id)->maxSemCount = max_count;
+        LOS_IntRestore(intSave);
+        return semaphore_id;
     } else {
         return (osSemaphoreId_t)NULL;
     }

kal/posix/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
+
 config("include") {
   include_dirs = [ "include" ]
 }
@@ -45,16 +47,8 @@ static_library("posix") {
     "src/time.c",
   ]
 
-  include_dirs = [
-    "../../kernel/arch/include",
-    "../../kernel/include",
-    "../../utils",
-  ]
-
   public_configs = [ ":include" ]
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 
-  public_deps = [
-    "//third_party/bounds_checking_function:libsec_static",
-    "//third_party/musl/porting/liteos_m/kernel",
-  ]
+  public_deps = [ "//third_party/musl/porting/liteos_m/kernel" ]
 }

kal/posix/src/pthread.c

@@ -34,56 +34,65 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <securec.h>
+#include <limits.h>
 #include "los_config.h"
 #include "los_task.h"
 
+#define PTHREAD_DEFAULT_NAME     "pthread"
+#define PTHREAD_DEFAULT_NAME_LEN 8
 #define PTHREAD_NAMELEN 16
 
 typedef struct {
     void *(*startRoutine)(void *);
     void *param;
     char name[PTHREAD_NAMELEN];
-}PthreadData;
+} PthreadData;
 
 static void *PthreadEntry(UINT32 param)
 {
     PthreadData *pthreadData = (PthreadData *)(UINTPTR)param;
     void *(*startRoutine)(void *) = pthreadData->startRoutine;
     void *ret = startRoutine(pthreadData->param);
-    free(pthreadData);
+    pthread_exit(ret);
     return ret;
 }
 
 static inline int IsPthread(pthread_t thread)
 {
-    return ((UINT32)thread <= LOSCFG_BASE_CORE_TSK_LIMIT) &&
-           (OS_TCB_FROM_TID((UINT32)thread)->taskEntry == PthreadEntry);
+    return ((UINT32)thread <= LOSCFG_BASE_CORE_TSK_LIMIT);
 }
 
-int pthread_create(pthread_t *thread, const pthread_attr_t *attr,
-                   void *(*startRoutine)(void *), void *arg)
+static int PthreadCreateAttrInit(const pthread_attr_t *attr, void *(*startRoutine)(void *), void *arg,
+    TSK_INIT_PARAM_S *taskInitParam)
 {
-    TSK_INIT_PARAM_S taskInitParam = {0};
+    const pthread_attr_t *threadAttr = attr;
+    struct sched_param schedParam = { 0 };
     PthreadData *pthreadData = NULL;
-    UINT32 taskID;
-
-    if ((thread == NULL) || (startRoutine == NULL)) {
-        return EINVAL;
+    INT32 policy = 0;
+    pthread_attr_t attrTmp;
+    INT32 ret;
+    errno_t error;
+    
+    if (!attr) {
+        (VOID)pthread_attr_init(&attrTmp);
+        threadAttr = &attrTmp;
     }
 
-    taskInitParam.usTaskPrio = LOSCFG_BASE_CORE_TSK_DEFAULT_PRIO;
-    taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE;
-    if (attr) {
-        if (attr->detachstate == PTHREAD_CREATE_DETACHED) {
-            return ENOTSUP;
+    if (threadAttr->stackaddr_set != 0) {
+        return ENOTSUP;
+    }
+    if (threadAttr->stacksize < PTHREAD_STACK_MIN) {
+        return EINVAL;
+    }
+    taskInitParam->uwStackSize = threadAttr->stacksize;
+    if (threadAttr->inheritsched == PTHREAD_EXPLICIT_SCHED) {
+        taskInitParam->usTaskPrio = (UINT16)threadAttr->schedparam.sched_priority;
+    } else {
+        ret = pthread_getschedparam(pthread_self(), &policy, &schedParam);
+        if (ret != 0) {
+            return ret;
         }
-        if (attr->stackaddr_set) {
-            return ENOTSUP;
-        }
-        if (attr->stacksize_set) {
-            taskInitParam.uwStackSize = attr->stacksize;
-        }
-        taskInitParam.usTaskPrio = (UINT16)attr->schedparam.sched_priority;
+        taskInitParam->usTaskPrio = (UINT16)schedParam.sched_priority;
     }
 
     pthreadData = (PthreadData *)malloc(sizeof(PthreadData));
@@ -91,19 +100,42 @@ int pthread_create(pthread_t *thread, const pthread_attr_t *attr,
         return ENOMEM;
     }
 
-    pthreadData->startRoutine  = startRoutine;
-    pthreadData->param         = arg;
-    taskInitParam.pcName       = pthreadData->name;
-    taskInitParam.pfnTaskEntry = PthreadEntry;
-    taskInitParam.uwArg   = (UINT32)(UINTPTR)pthreadData;
-
-    if (LOS_TaskCreateOnly(&taskID, &taskInitParam) != LOS_OK) {
+    error = memcpy_s(pthreadData->name, PTHREAD_NAMELEN, PTHREAD_DEFAULT_NAME, PTHREAD_DEFAULT_NAME_LEN);
+    if (error != EOK) {
         free(pthreadData);
+        return error;
+    }
+    pthreadData->startRoutine   = startRoutine;
+    pthreadData->param          = arg;
+    taskInitParam->pcName       = pthreadData->name;
+    taskInitParam->pfnTaskEntry = PthreadEntry;
+    taskInitParam->uwArg        = (UINT32)(UINTPTR)pthreadData;
+    if (threadAttr->detachstate != PTHREAD_CREATE_DETACHED) {
+        taskInitParam->uwResved = LOS_TASK_ATTR_JOINABLE;
+    }
+    return 0;
+}
+
+int pthread_create(pthread_t *thread, const pthread_attr_t *attr,
+    void *(*startRoutine)(void *), void *arg)
+{
+    TSK_INIT_PARAM_S taskInitParam = { 0 };
+    UINT32 taskID;
+    UINT32 ret;
+
+    if ((thread == NULL) || (startRoutine == NULL)) {
         return EINVAL;
     }
 
-    /* set pthread default name */
-    (void)sprintf_s(taskInitParam.pcName, PTHREAD_NAMELEN, "pthread%u", taskID);
+    ret = PthreadCreateAttrInit(attr, startRoutine, arg, &taskInitParam);
+    if (ret != 0) {
+        return ret;
+    }
+
+    if (LOS_TaskCreateOnly(&taskID, &taskInitParam) != LOS_OK) {
+        free((VOID *)(UINTPTR)taskInitParam.uwArg);
+        return EINVAL;
+    }
 
     (void)LOS_TaskResume(taskID);
 
@@ -164,55 +196,74 @@ int pthread_cancel(pthread_t thread)
 
 int pthread_join(pthread_t thread, void **retval)
 {
-    UINT32 taskStatus;
-
-    if (!IsPthread(thread)) {
+    UINTPTR result;
+    UINT32 ret = LOS_TaskJoin((UINT32)thread, &result);
+    if (ret == LOS_ERRNO_TSK_NOT_JOIN_SELF) {
+        return EDEADLK;
+    } else if (ret != LOS_OK) {
         return EINVAL;
     }
 
-    if (retval) {
-        /* retrieve thread exit code is not supported currently */
-        return ENOTSUP;
+    if (retval != NULL) {
+        *retval = (VOID *)result;
     }
-
-    if (thread == pthread_self()) {
-        return EDEADLK;
-    }
-
-    while (LOS_TaskStatusGet((UINT32)thread, &taskStatus) == LOS_OK) {
-        (void)LOS_TaskDelay(10); /* 10: Waiting for the end of thread execution. */
-    }
-
     return 0;
 }
 
 int pthread_detach(pthread_t thread)
 {
-    if (!IsPthread(thread)) {
+    UINT32 ret = LOS_TaskDetach((UINT32)thread);
+    if (ret == LOS_ERRNO_TSK_NOT_JOIN) {
+        return ESRCH;
+    } else if (ret != LOS_OK) {
         return EINVAL;
     }
 
-    return ENOSYS;
+    return 0;
 }
 
 void pthread_exit(void *retVal)
 {
-    (void)retVal;
+    UINT32 intSave;
+
     LosTaskCB *tcb = OS_TCB_FROM_TID(LOS_CurTaskIDGet());
-    free((PthreadData *)(UINTPTR)tcb->arg);
-    (void)LOS_TaskDelete(LOS_CurTaskIDGet());
+    tcb->joinRetval = (UINTPTR)retVal;
+    PthreadData *pthreadData = (PthreadData *)(UINTPTR)tcb->arg;
+
+    intSave = LOS_IntLock();
+    tcb->taskName = PTHREAD_DEFAULT_NAME;
+    LOS_IntRestore(intSave);
+    free(pthreadData);
+    (void)LOS_TaskDelete(tcb->taskID);
 }
 
 int pthread_setname_np(pthread_t thread, const char *name)
 {
+    UINT32 intSave;
+    LosTaskCB *taskCB = NULL;
     char *taskName = LOS_TaskNameGet((UINT32)thread);
     if (taskName == NULL || !IsPthread(thread)) {
         return EINVAL;
     }
+
     if (strnlen(name, PTHREAD_NAMELEN) >= PTHREAD_NAMELEN) {
         return ERANGE;
     }
-    (void)strcpy_s(taskName, PTHREAD_NAMELEN, name);
+
+    taskCB = OS_TCB_FROM_TID((UINT32)thread);
+    intSave = LOS_IntLock();
+    if (taskCB->taskStatus & OS_TASK_STATUS_EXIT) {
+        LOS_IntRestore(intSave);
+        return EINVAL;
+    }
+
+    if (taskCB->taskEntry == PthreadEntry) {
+        (void)strcpy_s(taskName, PTHREAD_NAMELEN, name);
+    } else {
+        LOS_IntRestore(intSave);
+        return EINVAL;
+    }
+    LOS_IntRestore(intSave);
     return 0;
 }
 

kal/posix/src/pthread_cond.c

@@ -202,18 +202,22 @@ STATIC INT32 ProcessReturnVal(pthread_cond_t *cond, INT32 val)
 }
 
 int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
-                           const struct timespec *absTime)
+                           const struct timespec *ts)
 {
-    UINT32 absTicks;
     INT32 ret;
+    UINT64 absTicks;
+    const UINT32 nsPerTick = OS_SYS_NS_PER_SECOND / LOSCFG_BASE_CORE_TICK_PER_SECOND;
+    struct timespec tp;
+    UINT64 nseconds;
+    UINT64 currTime;
 
-    if ((cond == NULL) || (mutex == NULL) || (absTime == NULL)) {
+    if ((cond == NULL) || (mutex == NULL) || (ts == NULL)) {
         return EINVAL;
     }
 
     if (CondInitCheck(cond)) {
         ret = pthread_cond_init(cond, NULL);
-        if (ret != ENOERR) {
+        if (ret != 0) {
             return ret;
         }
     }
@@ -222,22 +226,29 @@ int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
     cond->count++;
     (VOID)pthread_mutex_unlock(cond->mutex);
 
-    if ((absTime->tv_sec == 0) && (absTime->tv_nsec == 0)) {
-        return ETIMEDOUT;
-    }
-
-    if (!ValidTimeSpec(absTime)) {
+    if (!ValidTimeSpec(ts)) {
         return EINVAL;
     }
 
-    absTicks = OsTimeSpec2Tick(absTime);
-    if (pthread_mutex_unlock(mutex) != ENOERR) {
+    clock_gettime(CLOCK_REALTIME, &tp);
+    currTime = (UINT64)tp.tv_sec * OS_SYS_NS_PER_SECOND + tp.tv_nsec;
+    nseconds = (UINT64)ts->tv_sec * OS_SYS_NS_PER_SECOND + ts->tv_nsec;
+    if (currTime >= nseconds) {
+        return ETIMEDOUT;
+    }
+    absTicks = ((nseconds - currTime) + nsPerTick - 1) / nsPerTick + 1;
+    if (absTicks >= UINT32_MAX) {
+        return EINVAL;
+    }
+
+    if (pthread_mutex_unlock(mutex) != 0) {
         PRINT_ERR("%s: %d failed\n", __FUNCTION__, __LINE__);
     }
 
-    ret = (INT32)LOS_EventRead(&(cond->event), 0x0f, LOS_WAITMODE_OR | LOS_WAITMODE_CLR, absTicks);
+    (VOID)LOS_EventClear(&(cond->event), 0);
+    ret = (INT32)LOS_EventRead(&(cond->event), 0x0f, LOS_WAITMODE_OR | LOS_WAITMODE_CLR, (UINT32)absTicks);
 
-    if (pthread_mutex_lock(mutex) != ENOERR) {
+    if (pthread_mutex_lock(mutex) != 0) {
         PRINT_ERR("%s: %d failed\n", __FUNCTION__, __LINE__);
     }
 

kal/posix/src/pthread_mutex.c

@@ -93,6 +93,7 @@ int pthread_mutex_destroy(pthread_mutex_t *mutex)
         return MapError(ret);
     }
     mutex->handle = _MUX_INVALID_HANDLE;
+    mutex->magic = 0;
     return 0;
 }
 

kal/posix/src/time.c

@@ -63,9 +63,6 @@ STATIC const UINT8 g_montbl[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30,
  */
 long timezone = -8 * 60 * 60; // defaults to CST: 8 hours east of the Prime Meridian
 
-/* internal shared struct tm object for localtime and gmtime */
-static struct tm g_tm;
-
 int nanosleep(const struct timespec *rqtp, struct timespec *rmtp)
 {
     UINT64 nseconds;
@@ -508,7 +505,8 @@ struct tm *gmtime_r(const time_t *timep, struct tm *result)
 
 struct tm *gmtime(const time_t *timer)
 {
-    return gmtime_r(timer, &g_tm);
+    static struct tm tm;
+    return gmtime_r(timer, &tm);
 }
 
 struct tm *localtime_r(const time_t *timep, struct tm *result)
@@ -526,7 +524,8 @@ struct tm *localtime_r(const time_t *timep, struct tm *result)
 
 struct tm *localtime(const time_t *timer)
 {
-    return localtime_r(timer, &g_tm);
+    static struct tm tm;
+    return localtime_r(timer, &tm);
 }
 
 static time_t ConvertUtc2Secs(struct tm *tm)

kernel/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
+
 static_library("kernel") {
   sources = [
     "src/los_event.c",
@@ -44,17 +46,15 @@ static_library("kernel") {
   ]
 
   include_dirs = [
-    "include",
-    "arch/include",
     "../components/cpup",
     "../components/exchook",
     "../components/backtrace",
     "../components/power",
     "../components/dynlink",
-    "../utils",
-    "//third_party/bounds_checking_function/include",
   ]
 
+  configs += [ "$LITEOSTOPDIR:los_config" ]
+
   if ("$board_cpu" == "cortex-m3") {
     deps = [ "arch/arm/cortex-m3/gcc/:arch" ]
   } else if ("$board_cpu" == "cortex-m4") {
@@ -62,7 +62,11 @@ static_library("kernel") {
   } else if ("$board_cpu" == "cortex-m7") {
     deps = [ "arch/arm/cortex-m7/gcc/:arch" ]
   } else if ("$board_cpu" == "cortex-m33") {
-    deps = [ "arch/arm/cortex-m33/gcc/TZ:arch" ]
+    if (enable_ohos_kernel_liteos_m_tz) {
+      deps = [ "arch/arm/cortex-m33/gcc/TZ:arch" ]
+    } else {
+      deps = [ "arch/arm/cortex-m33/gcc/NTZ:arch" ]
+    }
   } else if ("$board_cpu" == "") {
     if ("$board_arch" == "rv32imac" || "$board_arch" == "rv32imafdc") {
       deps = [ "arch/risc-v/riscv32/gcc:arch" ]

kernel/arch/arm/arm9/gcc/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
+
 static_library("arch") {
   sources = [
     "los_context.c",
@@ -37,10 +39,5 @@ static_library("arch") {
     "reset_vector.S",
   ]
 
-  include_dirs = [
-    "../../../../../kernel/arch/include",
-    "../../../../../kernel/include",
-    "../../../../../utils",
-    "//third_party/bounds_checking_function/include",
-  ]
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 }

kernel/arch/arm/arm9/gcc/los_timer.c

@@ -58,7 +58,7 @@ Input       : none
 output      : none
 return      : LOS_OK - Success , or LOS_ERRNO_TICK_CFG_INVALID - failed
 **************************************************************************** */
-WEAK UINT32 HalTickStart(OS_TICK_HANDLER *handler)
+WEAK UINT32 HalTickStart(OS_TICK_HANDLER handler)
 {
     UINT32 intSave = LOS_IntLock();
     UINT32 value;

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

@@ -521,25 +521,6 @@ typedef struct TagExcContext {
 typedef VOID (*EXC_PROC_FUNC)(UINT32, EXC_CONTEXT_S *);
 VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, UINT32 pid, EXC_CONTEXT_S *excBufAddr);
 
-/**
- * @ingroup  los_arch_interrupt
- * @brief: Exception initialization.
- *
- * @par Description:
- * This API is used to configure the exception function vector table.
- *
- * @attention:
- * <ul><li>None.</li></ul>
- *
- * @param uwArraySize [IN] Memory size of exception.
- *
- * @retval: None
- * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
- * @see None.
- */
-VOID OsExcInit(VOID);
-
 VOID HalExcNMI(VOID);
 VOID HalExcHardFault(VOID);
 VOID HalExcMemFault(VOID);

kernel/arch/arm/cortex-m3/keil/los_exc.S

@@ -195,10 +195,10 @@ _hwiActiveCheck
     RBIT  R2, R3
     CLZ   R2, R2
     AND   R12, R12, #1
-    ADD   R2, R2, R12, LSL #5               ; calculate R2 (hwi number) as uwPid
+    ADD   R2, R2, R12, LSL #5               ; calculate R2 (hwi number) as pid
 
 _ExcInMSP
-    CMP   LR, #0XFFFFFFED
+    CMP   LR, #0xFFFFFFE9
     BNE   _NoFloatInMsp
     ADD   R3, R13, #104
     PUSH  {R3}

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

@@ -273,6 +273,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 HalHwiDelete(HWI_HANDLE_T hwiNum)
 #define BUSFAULT                        (1 << 17)
 #define MEMFAULT                        (1 << 16)
 #define DIV0FAULT                       (1 << 4)
+#define UNALIGNFAULT                    (1 << 3)
 #define HARDFAULT_IRQN                  (-13)
 
 ExcInfo g_excInfo = {0};
@@ -520,8 +521,13 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit()
 
     /* Enable USGFAULT, BUSFAULT, MEMFAULT */
     *(volatile UINT32 *)OS_NVIC_SHCSR |= (USGFAULT | BUSFAULT | MEMFAULT);
+	
     /* Enable DIV 0 and unaligned exception */
-    *(volatile UINT32 *)OS_NVIC_CCR |= DIV0FAULT;
+#ifdef LOSCFG_ARCH_UNALIGNED_EXC
+    *(volatile UINT32 *)OS_NVIC_CCR |= (DIV0FAULT | UNALIGNFAULT);
+#else
+    *(volatile UINT32 *)OS_NVIC_CCR |= (DIV0FAULT);
+#endif
 
     return;
 }

kernel/arch/arm/cortex-m3/keil/los_timer.c

@@ -45,7 +45,7 @@ Input       : none
 output      : none
 return      : LOS_OK - Success , or LOS_ERRNO_TICK_CFG_INVALID - failed
 **************************************************************************** */
-WEAK UINT32 HalTickStart(OS_TICK_HANDLER *handler)
+WEAK UINT32 HalTickStart(OS_TICK_HANDLER handler)
 {
     UINT32 ret;
 
@@ -85,10 +85,13 @@ WEAK VOID HalSysTickReload(UINT64 nextResponseTime)
 
 WEAK UINT64 HalGetTickCycle(UINT32 *period)
 {
-    UINT32 hwCycle;
+    UINT32 hwCycle = 0;
     UINT32 intSave = LOS_IntLock();
+    UINT32 val = SysTick->VAL;
     *period = SysTick->LOAD;
-    hwCycle = *period - SysTick->VAL;
+    if (val != 0) {
+        hwCycle = *period - val;
+    }
     LOS_IntRestore(intSave);
     return (UINT64)hwCycle;
 }

kernel/arch/arm/cortex-m33/gcc/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
+
 static_library("arch") {
   sources = [
     "los_context.c",
@@ -36,10 +38,5 @@ static_library("arch") {
     "los_timer.c",
   ]
 
-  include_dirs = [
-    "../../../../../kernel/arch/include",
-    "../../../../../kernel/include",
-    "../../../../../utils",
-    "//third_party/bounds_checking_function/include",
-  ]
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 }

kernel/arch/arm/cortex-m33/gcc/NTZ/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
+
 static_library("arch") {
   sources = [
     "los_context.c",
@@ -36,10 +38,5 @@ static_library("arch") {
     "los_timer.c",
   ]
 
-  include_dirs = [
-    "../../../../../../kernel/arch/include",
-    "../../../../../../kernel/include",
-    "../../../../../../utils",
-    "//third_party/bounds_checking_function/include",
-  ]
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 }

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

@@ -521,25 +521,6 @@ typedef struct TagExcContext {
 typedef VOID (*EXC_PROC_FUNC)(UINT32, EXC_CONTEXT_S *);
 VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, UINT32 pid, EXC_CONTEXT_S *excBufAddr);
 
-/**
- * @ingroup  los_arch_interrupt
- * @brief: Exception initialization.
- *
- * @par Description:
- * This API is used to configure the exception function vector table.
- *
- * @attention:
- * <ul><li>None.</li></ul>
- *
- * @param uwArraySize [IN] Memory size of exception.
- *
- * @retval: None
- * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
- * @see None.
- */
-VOID OsExcInit(VOID);
-
 VOID HalExcNMI(VOID);
 VOID HalExcHardFault(VOID);
 VOID HalExcMemFault(VOID);

kernel/arch/arm/cortex-m33/gcc/NTZ/los_exc.S

@@ -268,7 +268,7 @@ _hwiActiveCheck:
     RBIT  R2, R3
     CLZ   R2, R2
     AND   R12, R12, #1
-    ADD   R2, R2, R12, LSL #5               // calculate R2 (hwi number) as uwPid
+    ADD   R2, R2, R12, LSL #5               // calculate R2 (hwi number) as pid
     .fnend
 
     .type _ExcInMSP, %function
@@ -276,16 +276,13 @@ _hwiActiveCheck:
 _ExcInMSP:
     .fnstart
     .cantunwind
-    CMP   LR, #0XFFFFFFED
+    CMP   LR, #0xFFFFFFE9
     BNE   _NoFloatInMsp
     ADD   R3, R13, #104
     PUSH  {R3}
     MRS   R12, PRIMASK                  // store message-->exc: disable int?
     PUSH {R4-R12}                       // store message-->exc: {R4-R12}
-#if ((defined(__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
-     (defined(__FPU_USED) && (__FPU_USED == 1U)))
     VPUSH {D8-D15}
-#endif
     B     _handleEntry
   .fnend
 
@@ -341,10 +338,7 @@ _hwiActiveCheckNext:
 
     MRS   R12, PRIMASK
     PUSH {R4-R12}
-#if ((defined(__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
-     (defined(__FPU_USED) && (__FPU_USED == 1U)))
     VPUSH {D8-D15}
-#endif
 
     // copy auto saved task register
 

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

@@ -263,6 +263,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 HalHwiDelete(HWI_HANDLE_T hwiNum)
 #define BUSFAULT                        (1 << 17)
 #define MEMFAULT                        (1 << 16)
 #define DIV0FAULT                       (1 << 4)
+#define UNALIGNFAULT                    (1 << 3)
 #define HARDFAULT_IRQN                  (-13)
 
 ExcInfo g_excInfo = {0};
@@ -510,8 +511,13 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit()
 
     /* Enable USGFAULT, BUSFAULT, MEMFAULT */
     *(volatile UINT32 *)OS_NVIC_SHCSR |= (USGFAULT | BUSFAULT | MEMFAULT);
+
     /* Enable DIV 0 and unaligned exception */
-    *(volatile UINT32 *)OS_NVIC_CCR |= DIV0FAULT;
+#ifdef LOSCFG_ARCH_UNALIGNED_EXC
+    *(volatile UINT32 *)OS_NVIC_CCR |= (DIV0FAULT | UNALIGNFAULT);
+#else
+    *(volatile UINT32 *)OS_NVIC_CCR |= (DIV0FAULT);
+#endif
 
     return;
 }

kernel/arch/arm/cortex-m33/gcc/NTZ/los_timer.c

@@ -44,7 +44,7 @@ Input       : none
 output      : none
 return      : LOS_OK - Success , or LOS_ERRNO_TICK_CFG_INVALID - failed
 **************************************************************************** */
-WEAK UINT32 HalTickStart(OS_TICK_HANDLER *handler)
+WEAK UINT32 HalTickStart(OS_TICK_HANDLER handler)
 {
     UINT32 ret;
 
@@ -84,10 +84,13 @@ WEAK VOID HalSysTickReload(UINT64 nextResponseTime)
 
 WEAK UINT64 HalGetTickCycle(UINT32 *period)
 {
-    UINT32 hwCycle;
+    UINT32 hwCycle = 0;
     UINT32 intSave = LOS_IntLock();
+    UINT32 val = SysTick->VAL;
     *period = SysTick->LOAD;
-    hwCycle = *period - SysTick->VAL;
+    if (val != 0) {
+        hwCycle = *period - val;
+    }
     LOS_IntRestore(intSave);
     return (UINT64)hwCycle;
 }

kernel/arch/arm/cortex-m33/gcc/TZ/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
+
 static_library("arch") {
   sources = [
     "non_secure/los_context.c",
@@ -35,18 +37,12 @@ static_library("arch") {
     "non_secure/los_interrupt.c",
     "non_secure/los_timer.c",
     "non_secure/los_trustzone.c",
-    "secure/los_secure_context.c",
-    "secure/los_secure_context_asm.S",
-    "secure/los_secure_heap.c",
   ]
 
   include_dirs = [
     "./non_secure",
     "./secure",
-    "../../../../../../kernel/arch/include",
-    "../../../../../../kernel/arch/include",
-    "../../../../../../kernel/include",
-    "../../../../../../utils",
-    "//third_party/bounds_checking_function/include",
   ]
+
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 }

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

@@ -521,25 +521,6 @@ typedef struct TagExcContext {
 typedef VOID (*EXC_PROC_FUNC)(UINT32, EXC_CONTEXT_S *);
 VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, UINT32 pid, EXC_CONTEXT_S *excBufAddr);
 
-/**
- * @ingroup  los_arch_interrupt
- * @brief: Exception initialization.
- *
- * @par Description:
- * This API is used to configure the exception function vector table.
- *
- * @attention:
- * <ul><li>None.</li></ul>
- *
- * @param uwArraySize [IN] Memory size of exception.
- *
- * @retval: None
- * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
- * @see None.
- */
-VOID OsExcInit(VOID);
-
 VOID HalExcNMI(VOID);
 VOID HalExcHardFault(VOID);
 VOID HalExcMemFault(VOID);

kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_exc.S

@@ -252,7 +252,7 @@ _hwiActiveCheck:
     RBIT  R2, R3
     CLZ   R2, R2
     AND   R12, R12, #1
-    ADD   R2, R2, R12, LSL #5               // calculate R2 (hwi number) as uwPid
+    ADD   R2, R2, R12, LSL #5               // calculate R2 (hwi number) as pid
     .fnend
 
     .type _ExcInMSP, %function
@@ -260,16 +260,13 @@ _hwiActiveCheck:
 _ExcInMSP:
     .fnstart
     .cantunwind
-    CMP   LR, #0XFFFFFFED
+    CMP   LR, #0xFFFFFFE9
     BNE   _NoFloatInMsp
     ADD   R3, R13, #104
     PUSH  {R3}
     MRS   R12, PRIMASK                  // store message-->exc: disable int?
     PUSH {R4-R12}                       // store message-->exc: {R4-R12}
-#if ((defined(__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
-     (defined(__FPU_USED) && (__FPU_USED == 1U)))
     VPUSH {D8-D15}
-#endif
     B     _handleEntry
   .fnend
 
@@ -325,10 +322,7 @@ _hwiActiveCheckNext:
 
     MRS   R12, PRIMASK
     PUSH {R4-R12}
-#if ((defined(__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
-     (defined(__FPU_USED) && (__FPU_USED == 1U)))
     VPUSH {D8-D15}
-#endif
 
     // copy auto saved task register
 

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

@@ -263,6 +263,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 HalHwiDelete(HWI_HANDLE_T hwiNum)
 #define BUSFAULT                        (1 << 17)
 #define MEMFAULT                        (1 << 16)
 #define DIV0FAULT                       (1 << 4)
+#define UNALIGNFAULT                    (1 << 3)
 #define HARDFAULT_IRQN                  (-13)
 
 ExcInfo g_excInfo = {0};
@@ -510,8 +511,13 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit()
 
     /* Enable USGFAULT, BUSFAULT, MEMFAULT */
     *(volatile UINT32 *)OS_NVIC_SHCSR |= (USGFAULT | BUSFAULT | MEMFAULT);
+
     /* Enable DIV 0 and unaligned exception */
-    *(volatile UINT32 *)OS_NVIC_CCR |= DIV0FAULT;
+#ifdef LOSCFG_ARCH_UNALIGNED_EXC
+    *(volatile UINT32 *)OS_NVIC_CCR |= (DIV0FAULT | UNALIGNFAULT);
+#else
+    *(volatile UINT32 *)OS_NVIC_CCR |= (DIV0FAULT);
+#endif
 
     return;
 }

kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_timer.c

@@ -44,7 +44,7 @@ Input       : none
 output      : none
 return      : LOS_OK - Success , or LOS_ERRNO_TICK_CFG_INVALID - failed
 **************************************************************************** */
-WEAK UINT32 HalTickStart(OS_TICK_HANDLER *handler)
+WEAK UINT32 HalTickStart(OS_TICK_HANDLER handler)
 {
     UINT32 ret;
 
@@ -84,10 +84,13 @@ WEAK VOID HalSysTickReload(UINT64 nextResponseTime)
 
 WEAK UINT64 HalGetTickCycle(UINT32 *period)
 {
-    UINT32 hwCycle;
+    UINT32 hwCycle = 0；
     UINT32 intSave = LOS_IntLock();
+    UINT32 val = SysTick->VAL;
     *period = SysTick->LOAD;
-    hwCycle = *period - SysTick->VAL;
+    if (val != 0) {
+        hwCycle = *period - val;
+    }
     LOS_IntRestore(intSave);
     return (UINT64)hwCycle;
 }

kernel/arch/arm/cortex-m33/gcc/TZ/non_secure/los_trustzone.c

@@ -34,6 +34,7 @@
 #include "los_secure_context.h"
 #include "los_debug.h"
 #include "los_arch_context.h"
+#include "los_interrupt.h"
 
 OsSecureContext *g_secureContext = NULL;
 
@@ -69,6 +70,7 @@ VOID LOS_SecureContextAlloc(UINT32 secureStackSize)
         return;
     }
 
+    LOS_ASSERT((__get_IPSR() == 0) && (__get_PRIMASK() == 0));
     secureStackSize = LOS_Align(secureStackSize, sizeof(UINTPTR));
     HalSVCSecureContextAlloc(secureStackSize);
 }

kernel/arch/arm/cortex-m33/gcc/TZ/secure/los_secure_heap.c

@@ -34,7 +34,7 @@
 #include "los_config.h"
 #include "los_list.h"
 
-STATIC UINT8 g_secureHeap[LOSCFG_SECURE_HEAP_SIZE] = {0};
+STATIC UINT8 __attribute__((aligned(0x4)))g_secureHeap[LOSCFG_SECURE_HEAP_SIZE] = {0};
 STATIC LOS_DL_LIST g_secureHeapFreeList = {NULL, NULL};
 
 struct OsSecureHeapNode {

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

@@ -521,25 +521,6 @@ typedef struct TagExcContext {
 typedef VOID (*EXC_PROC_FUNC)(UINT32, EXC_CONTEXT_S *);
 VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, UINT32 pid, EXC_CONTEXT_S *excBufAddr);
 
-/**
- * @ingroup  los_arch_interrupt
- * @brief: Exception initialization.
- *
- * @par Description:
- * This API is used to configure the exception function vector table.
- *
- * @attention:
- * <ul><li>None.</li></ul>
- *
- * @param uwArraySize [IN] Memory size of exception.
- *
- * @retval: None
- * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
- * @see None.
- */
-VOID OsExcInit(VOID);
-
 VOID HalExcNMI(VOID);
 VOID HalExcHardFault(VOID);
 VOID HalExcMemFault(VOID);

kernel/arch/arm/cortex-m33/gcc/los_exc.S

@@ -268,7 +268,7 @@ _hwiActiveCheck:
     RBIT  R2, R3
     CLZ   R2, R2
     AND   R12, R12, #1
-    ADD   R2, R2, R12, LSL #5               // calculate R2 (hwi number) as uwPid
+    ADD   R2, R2, R12, LSL #5               // calculate R2 (hwi number) as pid
     .fnend
 
     .type _ExcInMSP, %function
@@ -276,16 +276,13 @@ _hwiActiveCheck:
 _ExcInMSP:
     .fnstart
     .cantunwind
-    CMP   LR, #0XFFFFFFED
+    CMP   LR, #0xFFFFFFE9
     BNE   _NoFloatInMsp
     ADD   R3, R13, #104
     PUSH  {R3}
     MRS   R12, PRIMASK                  // store message-->exc: disable int?
     PUSH {R4-R12}                       // store message-->exc: {R4-R12}
-#if ((defined(__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
-     (defined(__FPU_USED) && (__FPU_USED == 1U)))
     VPUSH {D8-D15}
-#endif
     B     _handleEntry
   .fnend
 
@@ -341,10 +338,7 @@ _hwiActiveCheckNext:
 
     MRS   R12, PRIMASK
     PUSH {R4-R12}
-#if ((defined(__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
-     (defined(__FPU_USED) && (__FPU_USED == 1U)))
     VPUSH {D8-D15}
-#endif
 
     // copy auto saved task register
 

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

@@ -263,6 +263,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 HalHwiDelete(HWI_HANDLE_T hwiNum)
 #define BUSFAULT                        (1 << 17)
 #define MEMFAULT                        (1 << 16)
 #define DIV0FAULT                       (1 << 4)
+#define UNALIGNFAULT                    (1 << 3)
 #define HARDFAULT_IRQN                  (-13)
 
 ExcInfo g_excInfo = {0};
@@ -510,8 +511,13 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit()
 
     /* Enable USGFAULT, BUSFAULT, MEMFAULT */
     *(volatile UINT32 *)OS_NVIC_SHCSR |= (USGFAULT | BUSFAULT | MEMFAULT);
+
     /* Enable DIV 0 and unaligned exception */
-    *(volatile UINT32 *)OS_NVIC_CCR |= DIV0FAULT;
+#ifdef LOSCFG_ARCH_UNALIGNED_EXC
+    *(volatile UINT32 *)OS_NVIC_CCR |= (DIV0FAULT | UNALIGNFAULT);
+#else
+    *(volatile UINT32 *)OS_NVIC_CCR |= (DIV0FAULT);
+#endif
 
     return;
 }

kernel/arch/arm/cortex-m33/gcc/los_timer.c

@@ -44,7 +44,7 @@ Input       : none
 output      : none
 return      : LOS_OK - Success , or LOS_ERRNO_TICK_CFG_INVALID - failed
 **************************************************************************** */
-WEAK UINT32 HalTickStart(OS_TICK_HANDLER *handler)
+WEAK UINT32 HalTickStart(OS_TICK_HANDLER handler)
 {
     UINT32 ret;
 
@@ -84,10 +84,13 @@ WEAK VOID HalSysTickReload(UINT64 nextResponseTime)
 
 WEAK UINT64 HalGetTickCycle(UINT32 *period)
 {
-    UINT32 hwCycle;
+    UINT32 hwCycle = 0;
     UINT32 intSave = LOS_IntLock();
+    UINT32 val = SysTick->VAL;
     *period = SysTick->LOAD;
-    hwCycle = *period - SysTick->VAL;
+    if (val != 0) {
+        hwCycle = *period - val;
+    }
     LOS_IntRestore(intSave);
     return (UINT64)hwCycle;
 }

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

@@ -521,25 +521,6 @@ typedef struct TagExcContext {
 typedef VOID (*EXC_PROC_FUNC)(UINT32, EXC_CONTEXT_S *);
 VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, UINT32 pid, EXC_CONTEXT_S *excBufAddr);
 
-/**
- * @ingroup  los_hwi
- * @brief: Exception initialization.
- *
- * @par Description:
- * This API is used to configure the exception function vector table.
- *
- * @attention:
- * <ul><li>None.</li></ul>
- *
- * @param uwArraySize [IN] Memory size of exception.
- *
- * @retval: None
- * @par Dependency:
- * <ul><li>los_hwi.h: the header file that contains the API declaration.</li></ul>
- * @see None.
- */
-VOID OsExcInit(VOID);
-
 VOID HalExcNMI(VOID);
 VOID HalExcHardFault(VOID);
 VOID HalExcMemFault(VOID);

kernel/arch/arm/cortex-m33/iar/NTZ/los_exc.S

@@ -198,7 +198,7 @@ _hwiActiveCheck
     ADD   R2, R2, R12, LSL #5               ; calculate R2 (hwi number) as uwPid
 
 _ExcInMSP
-    CMP   LR, #0XFFFFFFED
+    CMP   LR, #0xFFFFFFE9
     BNE   _NoFloatInMsp
     ADD   R3, R13, #104
     PUSH  {R3}

kernel/arch/arm/cortex-m33/iar/NTZ/los_timer.c

@@ -44,7 +44,7 @@ Input       : none
 output      : none
 return      : LOS_OK - Success , or LOS_ERRNO_TICK_CFG_INVALID - failed
 **************************************************************************** */
-WEAK UINT32 HalTickStart(OS_TICK_HANDLER *handler)
+WEAK UINT32 HalTickStart(OS_TICK_HANDLER handler)
 {
     UINT32 ret;
 
@@ -84,10 +84,13 @@ WEAK VOID HalSysTickReload(UINT64 nextResponseTime)
 
 WEAK UINT64 HalGetTickCycle(UINT32 *period)
 {
-    UINT32 hwCycle;
+    UINT32 hwCycle = 0;
     UINTPTR intSave = LOS_IntLock();
+    UINT32 val = SysTick->VAL;
     *period = SysTick->LOAD;
-    hwCycle = *period - SysTick->VAL;
+    if (val != 0) {
+        hwCycle = *period - val;
+    }
     LOS_IntRestore(intSave);
     return (UINT64)hwCycle;
 }

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

@@ -521,25 +521,6 @@ typedef struct TagExcContext {
 typedef VOID (*EXC_PROC_FUNC)(UINT32, EXC_CONTEXT_S *);
 VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, UINT32 pid, EXC_CONTEXT_S *excBufAddr);
 
-/**
- * @ingroup  los_hwi
- * @brief: Exception initialization.
- *
- * @par Description:
- * This API is used to configure the exception function vector table.
- *
- * @attention:
- * <ul><li>None.</li></ul>
- *
- * @param uwArraySize [IN] Memory size of exception.
- *
- * @retval: None
- * @par Dependency:
- * <ul><li>los_hwi.h: the header file that contains the API declaration.</li></ul>
- * @see None.
- */
-VOID OsExcInit(VOID);
-
 VOID HalExcNMI(VOID);
 VOID HalExcHardFault(VOID);
 VOID HalExcMemFault(VOID);

kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_exc.S

@@ -184,10 +184,10 @@ _hwiActiveCheck
     RBIT  R2, R3
     CLZ   R2, R2
     AND   R12, R12, #1
-    ADD   R2, R2, R12, LSL #5               ; calculate R2 (hwi number) as uwPid
+    ADD   R2, R2, R12, LSL #5               ; calculate R2 (hwi number) as pid
 
 _ExcInMSP
-    CMP   LR, #0XFFFFFFED
+    CMP   LR, #0xFFFFFFE9
     BNE   _NoFloatInMsp
     ADD   R3, R13, #104
     PUSH  {R3}

kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_timer.c

@@ -44,7 +44,7 @@ Input       : none
 output      : none
 return      : LOS_OK - Success , or LOS_ERRNO_TICK_CFG_INVALID - failed
 **************************************************************************** */
-WEAK UINT32 HalTickStart(OS_TICK_HANDLER *handler)
+WEAK UINT32 HalTickStart(OS_TICK_HANDLER handler)
 {
     UINT32 ret;
 
@@ -84,10 +84,13 @@ WEAK VOID HalSysTickReload(UINT64 nextResponseTime)
 
 WEAK UINT64 HalGetTickCycle(UINT32 *period)
 {
-    UINT32 hwCycle;
+    UINT32 hwCycle = 0;
     UINTPTR intSave = LOS_IntLock();
+    UINT32 val = SysTick->VAL;
     *period = SysTick->LOAD;
-    hwCycle = *period - SysTick->VAL;
+    if (val != 0) {
+        hwCycle = *period - val;
+    }
     LOS_IntRestore(intSave);
     return (UINT64)hwCycle;
 }

kernel/arch/arm/cortex-m33/iar/TZ/non_secure/los_trustzone.c

@@ -34,6 +34,7 @@
 #include "los_secure_context.h"
 #include "los_debug.h"
 #include "los_arch_context.h"
+#include "los_interrupt.h"
 
 OsSecureContext *g_secureContext = NULL;
 
@@ -69,6 +70,7 @@ VOID LOS_SecureContextAlloc(UINT32 secureStackSize)
         return;
     }
 
+    LOS_ASSERT((__get_IPSR() == 0) && (__get_PRIMASK() == 0));
     secureStackSize = LOS_Align(secureStackSize, sizeof(UINTPTR));
     HalSVCSecureContextAlloc(secureStackSize);
 }

kernel/arch/arm/cortex-m33/iar/TZ/secure/los_secure_heap.c

@@ -34,6 +34,7 @@
 #include "los_config.h"
 #include "los_list.h"
 
+#pragma data_alignment=0x4
 STATIC UINT8 g_secureHeap[LOSCFG_SECURE_HEAP_SIZE] = {0};
 STATIC LOS_DL_LIST g_secureHeapFreeList = {NULL, NULL};
 

kernel/arch/arm/cortex-m4/gcc/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//kernel/liteos_m/config.gni")
+
 static_library("arch") {
   sources = [
     "los_context.c",
@@ -37,10 +39,5 @@ static_library("arch") {
     "los_timer.c",
   ]
 
-  include_dirs = [
-    "../../../../../kernel/arch/include",
-    "../../../../../kernel/include",
-    "../../../../../utils",
-    "//third_party/bounds_checking_function/include",
-  ]
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 }

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

@@ -521,25 +521,6 @@ typedef struct TagExcContext {
 typedef VOID (*EXC_PROC_FUNC)(UINT32, EXC_CONTEXT_S *);
 VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, UINT32 pid, EXC_CONTEXT_S *excBufAddr);
 
-/**
- * @ingroup  los_arch_interrupt
- * @brief: Exception initialization.
- *
- * @par Description:
- * This API is used to configure the exception function vector table.
- *
- * @attention:
- * <ul><li>None.</li></ul>
- *
- * @param uwArraySize [IN] Memory size of exception.
- *
- * @retval: None
- * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
- * @see None.
- */
-VOID OsExcInit(VOID);
-
 VOID HalExcNMI(VOID);
 VOID HalExcHardFault(VOID);
 VOID HalExcMemFault(VOID);

kernel/arch/arm/cortex-m4/gcc/los_exc.S

@@ -267,7 +267,7 @@ _hwiActiveCheck:
     RBIT  R2, R3
     CLZ   R2, R2
     AND   R12, R12, #1
-    ADD   R2, R2, R12, LSL #5               // calculate R2 (hwi number) as uwPid
+    ADD   R2, R2, R12, LSL #5               // calculate R2 (hwi number) as pid
     .fnend
 
     .type _ExcInMSP, %function
@@ -275,7 +275,7 @@ _hwiActiveCheck:
 _ExcInMSP:
     .fnstart
     .cantunwind
-    CMP   LR, #0XFFFFFFED
+    CMP   LR, #0xFFFFFFE9
     BNE   _NoFloatInMsp
     ADD   R3, R13, #104
     PUSH  {R3}

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

@@ -273,6 +273,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 HalHwiDelete(HWI_HANDLE_T hwiNum)
 #define BUSFAULT                        (1 << 17)
 #define MEMFAULT                        (1 << 16)
 #define DIV0FAULT                       (1 << 4)
+#define UNALIGNFAULT                    (1 << 3)
 #define HARDFAULT_IRQN                  (-13)
 
 ExcInfo g_excInfo = {0};
@@ -530,8 +531,13 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit()
 
     /* Enable USGFAULT, BUSFAULT, MEMFAULT */
     *(volatile UINT32 *)OS_NVIC_SHCSR |= (USGFAULT | BUSFAULT | MEMFAULT);
+
     /* Enable DIV 0 and unaligned exception */
-    *(volatile UINT32 *)OS_NVIC_CCR |= DIV0FAULT;
+#ifdef LOSCFG_ARCH_UNALIGNED_EXC
+    *(volatile UINT32 *)OS_NVIC_CCR |= (DIV0FAULT | UNALIGNFAULT);
+#else
+    *(volatile UINT32 *)OS_NVIC_CCR |= (DIV0FAULT);
+#endif
 
     return;
 }

kernel/arch/arm/cortex-m4/gcc/los_mpu.c

@@ -97,7 +97,7 @@ STATIC UINT32 HalMpuEncodeSize(UINT64 size)
     if (size > SIZE_4G_BYTE) {
         return 0;
     }
-    if ((size & 0x1F) != 0) { /* size sould aligned to 32 byte at least. */
+    if ((size & 0x1F) != 0) { /* size should aligned to 32 byte at least. */
         return 0;
     }
     size = (size >> 2);

kernel/arch/arm/cortex-m4/gcc/los_timer.c

@@ -45,7 +45,7 @@ Input       : none
 output      : none
 return      : LOS_OK - Success , or LOS_ERRNO_TICK_CFG_INVALID - failed
 **************************************************************************** */
-WEAK UINT32 HalTickStart(OS_TICK_HANDLER *handler)
+WEAK UINT32 HalTickStart(OS_TICK_HANDLER handler)
 {
     UINT32 ret;
 
@@ -85,10 +85,13 @@ WEAK VOID HalSysTickReload(UINT64 nextResponseTime)
 
 WEAK UINT64 HalGetTickCycle(UINT32 *period)
 {
-    UINT32 hwCycle;
+    UINT32 hwCycle = 0;
     UINT32 intSave = LOS_IntLock();
+    UINT32 val = SysTick->VAL;
     *period = SysTick->LOAD;
-    hwCycle = *period - SysTick->VAL;
+    if (val != 0) {
+        hwCycle = *period - val;
+    }
     LOS_IntRestore(intSave);
     return (UINT64)hwCycle;
 }

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

@@ -521,25 +521,6 @@ typedef struct TagExcContext {
 typedef VOID (*EXC_PROC_FUNC)(UINT32, EXC_CONTEXT_S *);
 VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, UINT32 pid, EXC_CONTEXT_S *excBufAddr);
 
-/**
- * @ingroup  los_arch_interrupt
- * @brief: Exception initialization.
- *
- * @par Description:
- * This API is used to configure the exception function vector table.
- *
- * @attention:
- * <ul><li>None.</li></ul>
- *
- * @param uwArraySize [IN] Memory size of exception.
- *
- * @retval: None
- * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
- * @see None.
- */
-VOID OsExcInit(VOID);
-
 VOID HalExcNMI(VOID);
 VOID HalExcHardFault(VOID);
 VOID HalExcMemFault(VOID);

kernel/arch/arm/cortex-m4/iar/los_exc.S

@@ -195,10 +195,10 @@ _hwiActiveCheck
     RBIT  R2, R3
     CLZ   R2, R2
     AND   R12, R12, #1
-    ADD   R2, R2, R12, LSL #5               ; calculate R2 (hwi number) as uwPid
+    ADD   R2, R2, R12, LSL #5               ; calculate R2 (hwi number) as pid
 
 _ExcInMSP
-    CMP   LR, #0xFFFFFFED
+    CMP   LR, #0xFFFFFFE9
     BNE   _NoFloatInMsp
     ADD   R3, R13, #104
     PUSH  {R3}

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

@@ -276,6 +276,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 HalHwiDelete(HWI_HANDLE_T hwiNum)
 #define BUSFAULT                        (1 << 17)
 #define MEMFAULT                        (1 << 16)
 #define DIV0FAULT                       (1 << 4)
+#define UNALIGNFAULT                    (1 << 3)
 #define HARDFAULT_IRQN                  (-13)
 
 ExcInfo g_excInfo = {0};
@@ -523,8 +524,13 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit()
 
     /* Enable USGFAULT, BUSFAULT, MEMFAULT */
     *(volatile UINT32 *)OS_NVIC_SHCSR |= (USGFAULT | BUSFAULT | MEMFAULT);
+
     /* Enable DIV 0 and unaligned exception */
-    *(volatile UINT32 *)OS_NVIC_CCR |= DIV0FAULT;
+#ifdef LOSCFG_ARCH_UNALIGNED_EXC
+    *(volatile UINT32 *)OS_NVIC_CCR |= (DIV0FAULT | UNALIGNFAULT);
+#else
+    *(volatile UINT32 *)OS_NVIC_CCR |= (DIV0FAULT);
+#endif
 
     return;
 }

kernel/arch/arm/cortex-m4/iar/los_mpu.c

@@ -97,7 +97,7 @@ STATIC UINT32 HalMpuEncodeSize(UINT64 size)
     if (size > SIZE_4G_BYTE) {
         return 0;
     }
-    if ((size & 0x1F) != 0) { /* size sould aligned to 32 byte at least. */
+    if ((size & 0x1F) != 0) { /* size should aligned to 32 byte at least. */
         return 0;
     }
     size = (size >> 2);

kernel/arch/arm/cortex-m4/iar/los_timer.c

@@ -45,7 +45,7 @@ Input       : none
 output      : none
 return      : LOS_OK - Success , or LOS_ERRNO_TICK_CFG_INVALID - failed
 **************************************************************************** */
-WEAK UINT32 HalTickStart(OS_TICK_HANDLER *handler)
+WEAK UINT32 HalTickStart(OS_TICK_HANDLER handler)
 {
     UINT32 ret;
 
@@ -85,10 +85,13 @@ WEAK VOID HalSysTickReload(UINT64 nextResponseTime)
 
 WEAK UINT64 HalGetTickCycle(UINT32 *period)
 {
-    UINT32 hwCycle;
+    UINT32 hwCycle = 0;
     UINT32 intSave = LOS_IntLock();
+    UINT32 val = SysTick->VAL;
     *period = SysTick->LOAD;
-    hwCycle = *period - SysTick->VAL;
+    if (val != 0) {
+        hwCycle = *period - val;
+    }
     LOS_IntRestore(intSave);
     return (UINT64)hwCycle;
 }

kernel/arch/arm/cortex-m7/gcc/BUILD.gn

@@ -27,19 +27,17 @@
 # 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/config.gni")
+
 static_library("arch") {
   sources = [
     "los_context.c",
     "los_dispatch.S",
     "los_exc.S",
     "los_interrupt.c",
+    "los_mpu.c",
     "los_timer.c",
   ]
 
-  include_dirs = [
-    "../../../../../kernel/arch/include",
-    "../../../../../kernel/include",
-    "../../../../../utils",
-    "//third_party/bounds_checking_function/include",
-  ]
+  configs += [ "$LITEOSTOPDIR:los_config" ]
 }

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

@@ -521,25 +521,6 @@ typedef struct TagExcContext {
 typedef VOID (*EXC_PROC_FUNC)(UINT32, EXC_CONTEXT_S *);
 VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, UINT32 pid, EXC_CONTEXT_S *excBufAddr);
 
-/**
- * @ingroup  los_arch_interrupt
- * @brief: Exception initialization.
- *
- * @par Description:
- * This API is used to configure the exception function vector table.
- *
- * @attention:
- * <ul><li>None.</li></ul>
- *
- * @param uwArraySize [IN] Memory size of exception.
- *
- * @retval: None
- * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
- * @see None.
- */
-VOID OsExcInit(VOID);
-
 VOID HalExcNMI(VOID);
 VOID HalExcHardFault(VOID);
 VOID HalExcMemFault(VOID);

kernel/arch/arm/cortex-m7/gcc/los_exc.S

@@ -268,7 +268,7 @@ _hwiActiveCheck:
     RBIT  R2, R3
     CLZ   R2, R2
     AND   R12, R12, #1
-    ADD   R2, R2, R12, LSL #5               // calculate R2 (hwi number) as uwPid
+    ADD   R2, R2, R12, LSL #5               // calculate R2 (hwi number) as pid
     .fnend
 
     .type _ExcInMSP, %function
@@ -276,16 +276,13 @@ _hwiActiveCheck:
 _ExcInMSP:
     .fnstart
     .cantunwind
-    CMP   LR, #0XFFFFFFED
+    CMP   LR, #0xFFFFFFE9
     BNE   _NoFloatInMsp
     ADD   R3, R13, #104
     PUSH  {R3}
     MRS   R12, PRIMASK                  // store message-->exc: disable int?
     PUSH {R4-R12}                       // store message-->exc: {R4-R12}
-#if ((defined(__FPU_PRESENT) && (__FPU_PRESENT == 1U)) && \
-     (defined(__FPU_USED) && (__FPU_USED == 1U)))
     VPUSH {D8-D15}
-#endif
     B     _handleEntry
   .fnend
 

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

@@ -263,6 +263,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 HalHwiDelete(HWI_HANDLE_T hwiNum)
 #define BUSFAULT                        (1 << 17)
 #define MEMFAULT                        (1 << 16)
 #define DIV0FAULT                       (1 << 4)
+#define UNALIGNFAULT                    (1 << 3)
 #define HARDFAULT_IRQN                  (-13)
 
 ExcInfo g_excInfo = {0};
@@ -510,8 +511,13 @@ LITE_OS_SEC_TEXT_INIT VOID HalHwiInit()
 
     /* Enable USGFAULT, BUSFAULT, MEMFAULT */
     *(volatile UINT32 *)OS_NVIC_SHCSR |= (USGFAULT | BUSFAULT | MEMFAULT);
+
     /* Enable DIV 0 and unaligned exception */
-    *(volatile UINT32 *)OS_NVIC_CCR |= DIV0FAULT;
+#ifdef LOSCFG_ARCH_UNALIGNED_EXC
+    *(volatile UINT32 *)OS_NVIC_CCR |= (DIV0FAULT | UNALIGNFAULT);
+#else
+    *(volatile UINT32 *)OS_NVIC_CCR |= (DIV0FAULT);
+#endif
 
     return;
 }

kernel/arch/arm/cortex-m7/gcc/los_mpu.c

@@ -0,0 +1,237 @@
+/*
+ * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this list of
+ *    conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *    of conditions and the following disclaimer in the documentation and/or other materials
+ *    provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors may be used
+ *    to endorse or promote products derived from this software without specific prior written
+ *    permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "los_mpu.h"
+#include "los_config.h"
+#include "los_context.h"
+
+#if (LOSCFG_MPU_ENABLE == 1)
+
+#define SIZE_4G_BYTE        0x100000000
+#define MPU_MAX_REGION_NUM  8
+
+STATIC UINT8 g_regionNumBeUsed[MPU_MAX_REGION_NUM] = {0};
+
+typedef enum {
+    MPU_AP_FORBID_USER_FORBID = 0x0, /* Privileged:No access      Unprivileged:No access */
+    MPU_AP_RW_USER_FORBID = 0x1,     /* Privileged:Read/Write     Unprivileged:No access */
+    MPU_AP_RW_USER_RO = 0x2,         /* Privileged:Read/Write     Unprivileged:Read-only */
+    MPU_AP_RW_USER_RW = 0x3,         /* Privileged:Read/Write     Unprivileged:Read/Write */
+    MPU_AP_NA_USER_NA = 0x4,         /* Privileged:UNPREDICTABLE  Unprivileged:UNPREDICTABLE */
+    MPU_AP_RO_USER_FORBID = 0x5,     /* Privileged:Read-only      Unprivileged:No access */
+    MPU_AP_RO_USER_RO = 0x6,         /* Privileged:Read-only      Unprivileged:Read-only */
+} MpuApConfig;
+
+VOID HalMpuEnable(UINT32 defaultRegionEnable)
+{
+    UINT32 intSave = HalIntLock();
+    MPU->CTRL = (MPU_CTRL_ENABLE_Msk | ((defaultRegionEnable << MPU_CTRL_PRIVDEFENA_Pos) & MPU_CTRL_PRIVDEFENA_Msk));
+    SCB->SHCSR |= SCB_SHCSR_MEMFAULTENA_Msk;
+    __DSB();
+    __ISB();
+    HalIntRestore(intSave);
+}
+VOID HalMpuDisable(VOID)
+{
+    UINT32 intSave = HalIntLock();
+    MPU->CTRL = 0;
+    __DSB();
+    __ISB();
+    HalIntRestore(intSave);
+}
+
+STATIC VOID HalMpuRASRAddMemAttr(MPU_CFG_PARA *para, UINT32 *RASR)
+{
+    BOOL cachable = 0;
+    BOOL buffable = 0;
+    switch (para->memType) {
+        case MPU_MEM_ON_CHIP_ROM:
+        case MPU_MEM_ON_CHIP_RAM:
+            cachable = 1;
+            buffable = 0;
+            break;
+        case MPU_MEM_XIP_PSRAM:
+            cachable = 1;
+            buffable = 1;
+            break;
+        case MPU_MEM_XIP_NOR_FLASH:
+            cachable = 0;
+            buffable = 1;
+            break;
+        default:
+            break;
+    }
+    (*RASR) |= ((cachable << MPU_RASR_C_Pos) | (buffable << MPU_RASR_B_Pos));
+}
+
+STATIC UINT32 HalMpuEncodeSize(UINT64 size)
+{
+    UINT32 encodeSize = 0;
+    if (size > SIZE_4G_BYTE) {
+        return 0;
+    }
+    if ((size & 0x1F) != 0) { /* size should aligned to 32 byte at least. */
+        return 0;
+    }
+    size = (size >> 2);
+    while (size != 0) {
+        if (((size & 1) != 0) && ((size & 0xFFFFFFFE) != 0)) { /* size != 2^x (5 <= x <= 32)  128B - 4GB */
+            return 0;
+        }
+        size = (size >> 1);
+        encodeSize++;
+    }
+    return encodeSize;
+}
+
+STATIC UINT32 HalMpuEncodeAP(MpuAccessPermission permission)
+{
+    UINT32 ap;
+    switch (permission) {
+        case MPU_RW_BY_PRIVILEGED_ONLY:
+            ap = MPU_AP_RW_USER_FORBID;
+            break;
+        case MPU_RW_ANY:
+            ap = MPU_AP_RW_USER_RW;
+            break;
+        case MPU_RO_BY_PRIVILEGED_ONLY:
+            ap = MPU_AP_RO_USER_FORBID;
+            break;
+        case MPU_RO_ANY:
+            ap = MPU_AP_RO_USER_RO;
+            break;
+        default:
+            ap = MPU_AP_RW_USER_RW;
+            break;
+    }
+    return ap;
+}
+
+STATIC UINT32 HalMpuGetRASR(UINT32 encodeSize, MPU_CFG_PARA *para)
+{
+    UINT32 RASR;
+    UINT32 ap;
+    ap = HalMpuEncodeAP(para->permission);
+    RASR = MPU_RASR_ENABLE_Msk;
+    RASR |= ((encodeSize << MPU_RASR_SIZE_Pos) & MPU_RASR_SIZE_Msk);
+    RASR |= ((ap << MPU_RASR_AP_Pos) & MPU_RASR_AP_Msk) | ((para->executable << MPU_RASR_XN_Pos) & MPU_RASR_XN_Msk) |
+        ((para->shareability << MPU_RASR_S_Pos) & MPU_RASR_S_Msk);
+    HalMpuRASRAddMemAttr(para, &RASR);
+    return RASR;
+}
+
+UINT32 HalMpuSetRegion(UINT32 regionId, MPU_CFG_PARA *para)
+{
+    UINT32 RASR;
+    UINT32 RBAR;
+    UINT32 RNR;
+    UINT32 encodeSize;
+    UINT32 intSave;
+    UINT64 size;
+
+    if ((regionId >= MPU_MAX_REGION_NUM) || (para == NULL)) {
+        return LOS_NOK;
+    }
+
+    if ((MPU_TYPE_DREGION_Msk & MPU->TYPE) == 0) {
+        return LOS_NOK;
+    }
+
+    RNR = regionId;
+    encodeSize = HalMpuEncodeSize(para->size);
+    if (encodeSize == 0) {
+        return LOS_NOK;
+    }
+    size = para->size - 1;              /* size aligned after encode check */
+    if ((para->baseAddr & size) != 0) { /* base addr should aligned to region size */
+        return LOS_NOK;
+    }
+    RBAR = para->baseAddr & MPU_RBAR_ADDR_Msk;
+    RASR = HalMpuGetRASR(encodeSize, para);
+    intSave = HalIntLock();
+    if (g_regionNumBeUsed[regionId]) {
+        HalIntRestore(intSave);
+        return LOS_NOK;
+    }
+    MPU->RNR = RNR;
+    MPU->RBAR = RBAR;
+    MPU->RASR = RASR;
+    __DSB();
+    __ISB();
+    g_regionNumBeUsed[regionId] = 1; /* Set mpu region used flag */
+    HalIntRestore(intSave);
+    return LOS_OK;
+}
+
+UINT32 HalMpuDisableRegion(UINT32 regionId)
+{
+    volatile UINT32 type;
+    UINT32 intSave;
+
+    if (regionId >= MPU_MAX_REGION_NUM) {
+        return LOS_NOK;
+    }
+
+    intSave = HalIntLock();
+    if (!g_regionNumBeUsed[regionId]) {
+        HalIntRestore(intSave);
+        return LOS_NOK;
+    }
+
+    type = MPU->TYPE;
+    if ((MPU_TYPE_DREGION_Msk & type) != 0) {
+        MPU->RNR = regionId;
+        MPU->RASR = 0;
+        __DSB();
+        __ISB();
+    }
+    g_regionNumBeUsed[regionId] = 0; /* clear mpu region used flag */
+    HalIntRestore(intSave);
+    return LOS_OK;
+}
+
+INT32 HalMpuUnusedRegionGet(VOID)
+{
+    INT32 id;
+    UINT32 intSave = HalIntLock();
+    for (id = 0; id < MPU_MAX_REGION_NUM; id++) {
+        if (!g_regionNumBeUsed[id]) {
+            break;
+        }
+    }
+    HalIntRestore(intSave);
+
+    if (id == MPU_MAX_REGION_NUM) {
+        return -1;
+    } else {
+        return id;
+    }
+}
+#endif

kernel/arch/arm/cortex-m7/gcc/los_timer.c

@@ -44,7 +44,7 @@ Input       : none
 output      : none
 return      : LOS_OK - Success , or LOS_ERRNO_TICK_CFG_INVALID - failed
 **************************************************************************** */
-WEAK UINT32 HalTickStart(OS_TICK_HANDLER *handler)
+WEAK UINT32 HalTickStart(OS_TICK_HANDLER handler)
 {
     UINT32 ret;
 
@@ -84,10 +84,13 @@ WEAK VOID HalSysTickReload(UINT64 nextResponseTime)
 
 WEAK UINT64 HalGetTickCycle(UINT32 *period)
 {
-    UINT32 hwCycle;
+    UINT32 hwCycle = 0;
     UINT32 intSave = LOS_IntLock();
+    UINT32 val = SysTick->VAL;
     *period = SysTick->LOAD;
-    hwCycle = *period - SysTick->VAL;
+    if (val != 0) {
+        hwCycle = *period - val;
+    }
     LOS_IntRestore(intSave);
     return (UINT64)hwCycle;
 }

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

@@ -521,25 +521,6 @@ typedef struct TagExcContext {
 typedef VOID (*EXC_PROC_FUNC)(UINT32, EXC_CONTEXT_S *);
 VOID HalExcHandleEntry(UINT32 excType, UINT32 faultAddr, UINT32 pid, EXC_CONTEXT_S *excBufAddr);
 
-/**
- * @ingroup  los_arch_interrupt
- * @brief: Exception initialization.
- *
- * @par Description:
- * This API is used to configure the exception function vector table.
- *
- * @attention:
- * <ul><li>None.</li></ul>
- *
- * @param uwArraySize [IN] Memory size of exception.
- *
- * @retval: None
- * @par Dependency:
- * <ul><li>los_arch_interrupt.h: the header file that contains the API declaration.</li></ul>
- * @see None.
- */
-VOID OsExcInit(VOID);
-
 VOID HalExcNMI(VOID);
 VOID HalExcHardFault(VOID);
 VOID HalExcMemFault(VOID);

kernel/arch/arm/cortex-m7/iar/los_exc.S

@@ -195,10 +195,10 @@ _hwiActiveCheck
     RBIT  R2, R3
     CLZ   R2, R2
     AND   R12, R12, #1
-    ADD   R2, R2, R12, LSL #5               ; calculate R2 (hwi number) as uwPid
+    ADD   R2, R2, R12, LSL #5               ; calculate R2 (hwi number) as pid
 
 _ExcInMSP
-    CMP   LR, #0XFFFFFFED
+    CMP   LR, #0xFFFFFFE9
     BNE   _NoFloatInMsp
     ADD   R3, R13, #104
     PUSH  {R3}