!678 fix: 低功耗tick timer休眠时间计算有误

Merge pull request !678 from zhushengle/cherry-pick-1650532074

arch/arm/arm9/gcc/los_context.c

@@ -76,6 +76,7 @@ LITE_OS_SEC_TEXT_MINOR VOID ArchSysExit(VOID)
 LITE_OS_SEC_TEXT_INIT VOID *ArchTskStackInit(UINT32 taskID, UINT32 stackSize, VOID *topStack)
 {
     TaskContext *context = (TaskContext *)((UINTPTR)topStack + stackSize - sizeof(TaskContext));
+    LosTaskCB *taskCB = OS_TCB_FROM_TID(taskID);
 
     context->r0 = taskID;
     context->r1 = 0x01010101L;

components/power/los_pm.c

@@ -101,7 +101,7 @@ STATIC VOID OsPmTickTimerStart(LosPmCB *pm)
     }
 
 #if (LOSCFG_BASE_CORE_TICK_WTIMER == 0)
-    if (tickTimer->timerStop != NULL) {
+    if ((tickTimer->timerStop != NULL) && (pm->enterSleepTime != 0)) {
         /* Restore the main CPU frequency */
         sleepTime = tickTimer->timerCycleGet();
         tickTimer->timerStop();
@@ -123,8 +123,9 @@ STATIC VOID OsPmTickTimerStart(LosPmCB *pm)
 STATIC BOOL OsPmTickTimerStop(LosPmCB *pm)
 {
 #if (LOSCFG_BASE_CORE_TICK_WTIMER == 0)
-    UINT64 sleepCycle;
-    UINT64 realSleepTime = OsSchedGetNextExpireTime(OsGetCurrSchedTimeCycle());
+    UINT64 sleepCycle, realSleepTime;
+    UINT64 currTime = OsGetCurrSchedTimeCycle();
+    UINT64 expireTime = OsSchedGetNextExpireTime(currTime);
 #endif
     LosPmTickTimer *tickTimer = pm->tickTimer;
 
@@ -134,10 +135,9 @@ STATIC BOOL OsPmTickTimerStop(LosPmCB *pm)
 
 #if (LOSCFG_BASE_CORE_TICK_WTIMER == 0)
     if (tickTimer->timerStart != NULL) {
-        if (realSleepTime == 0) {
-            return FALSE;
-        }
+        LOS_ASSERT(expireTime > currTime);
 
+        realSleepTime = expireTime - currTime;
         sleepCycle = OS_SYS_CYCLE_TO_NS(realSleepTime, g_sysClock);
         sleepCycle = OS_SYS_NS_TO_CYCLE(sleepCycle, tickTimer->freq);