update openharmony 1.0.1

kernel/base/mp/los_lockdep.c

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2013-2019, Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020, Huawei Device Co., Ltd. All rights reserved.
+ * 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:
@@ -273,7 +273,7 @@ VOID OsLockDepCheckOut(SPIN_LOCK_S *lock)
     depth = lockDep->lockDepth;
 
     /* find the lock position */
-    while (depth-- >= 0) {
+    while (--depth >= 0) {
         if (heldlocks[depth].lockPtr == lock) {
             break;
         }
@@ -314,7 +314,35 @@ VOID OsLockdepClearSpinlocks(VOID)
     }
 }
 
-#endif /* LOSCFG_KERNEL_SMP_LOCKDEP */
+#else /* LOSCFG_KERNEL_SMP_LOCKDEP */
+
+VOID OsLockDepCheckIn(SPIN_LOCK_S *lock)
+{
+    (VOID)lock;
+
+    return;
+}
+
+VOID OsLockDepRecord(SPIN_LOCK_S *lock)
+{
+    (VOID)lock;
+
+    return;
+}
+
+VOID OsLockDepCheckOut(SPIN_LOCK_S *lock)
+{
+    (VOID)lock;
+
+    return;
+}
+
+VOID OsLockdepClearSpinlocks(VOID)
+{
+    return;
+}
+
+#endif
 
 #ifdef __cplusplus
 #if __cplusplus

kernel/base/mp/los_mp.c

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2013-2019, Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020, Huawei Device Co., Ltd. All rights reserved.
+ * 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:

kernel/base/mp/los_percpu.c

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2013-2019, Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020, Huawei Device Co., Ltd. All rights reserved.
+ * 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:

kernel/base/mp/los_spinlock.c

@@ -0,0 +1,115 @@
+/*
+ * 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_spinlock.h"
+#if (LOSCFG_KERNEL_SMP == YES)
+#include "los_sched_pri.h"
+
+#ifdef __cplusplus
+#if __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+#endif /* __cplusplus */
+
+VOID LOS_SpinInit(SPIN_LOCK_S *lock)
+{
+    lock->rawLock = 0;
+    lock->cpuid   = (UINT32)-1;
+    lock->owner   = SPINLOCK_OWNER_INIT;
+    lock->name    = "spinlock";
+}
+
+BOOL LOS_SpinHeld(const SPIN_LOCK_S *lock)
+{
+    return (lock->rawLock != 0);
+}
+
+VOID LOS_SpinLock(SPIN_LOCK_S *lock)
+{
+    UINT32 intSave = LOS_IntLock();
+    OsCpuSchedLock(OsPercpuGet());
+    LOS_IntRestore(intSave);
+
+    LOCKDEP_CHECK_IN(lock);
+    ArchSpinLock(&lock->rawLock);
+    LOCKDEP_RECORD(lock);
+}
+
+INT32 LOS_SpinTrylock(SPIN_LOCK_S *lock)
+{
+    Percpu *cpu = OsPercpuGet();
+    UINT32 intSave = LOS_IntLock();
+    OsCpuSchedLock(cpu);
+    LOS_IntRestore(intSave);
+
+    INT32 ret = ArchSpinTrylock(&lock->rawLock);
+    if (ret == LOS_OK) {
+        LOCKDEP_CHECK_IN(lock);
+        LOCKDEP_RECORD(lock);
+    } else {
+        OsCpuSchedUnlock(cpu, LOS_IntLock());
+    }
+
+    return ret;
+}
+
+VOID LOS_SpinUnlock(SPIN_LOCK_S *lock)
+{
+    LOCKDEP_CHECK_OUT(lock);
+    ArchSpinUnlock(&lock->rawLock);
+
+    OsCpuSchedUnlock(OsPercpuGet(), LOS_IntLock());
+}
+
+VOID LOS_SpinLockSave(SPIN_LOCK_S *lock, UINT32 *intSave)
+{
+    *intSave = LOS_IntLock();
+    OsCpuSchedLock(OsPercpuGet());
+
+    LOCKDEP_CHECK_IN(lock);
+    ArchSpinLock(&lock->rawLock);
+    LOCKDEP_RECORD(lock);
+}
+
+VOID LOS_SpinUnlockRestore(SPIN_LOCK_S *lock, UINT32 intSave)
+{
+    LOCKDEP_CHECK_OUT(lock);
+    ArchSpinUnlock(&lock->rawLock);
+
+    OsCpuSchedUnlock(OsPercpuGet(), intSave);
+}
+#endif
+
+#ifdef __cplusplus
+#if __cplusplus
+}
+#endif /* __cplusplus */
+#endif /* __cplusplus */

kernel/base/mp/los_stat.c

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2013-2019, Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020, Huawei Device Co., Ltd. All rights reserved.
+ * 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: