yystopf
/
openharmony_kernel_liteos_m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!385 fix: 修复cortex-m系列系统提供的timer在低频下时间不准的问题 

Merge pull request !385 from zhushengle/timer
This commit is contained in:
openharmony_ci 2021-11-09 08:57:07 +00:00 committed by Gitee
parent 4422285b24 3e569bac58
commit 72928ca12e
10 changed files with 50 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/arch/arm/cortex-m3/keil/los_timer.c
View File

@ -85,10 +85,13 @@ WEAK VOID HalSysTickReload(UINT64 nextResponseTime)
WEAK UINT64 HalGetTickCycle(UINT32 *period) WEAK UINT64 HalGetTickCycle(UINT32 *period)
{ {
UINT32 hwCycle; UINT32 hwCycle = 0;
UINT32 intSave = LOS_IntLock(); UINT32 intSave = LOS_IntLock();
UINT32 val = SysTick->VAL;
*period = SysTick->LOAD; *period = SysTick->LOAD;
hwCycle = *period - SysTick->VAL; if (val != 0) {
hwCycle = *period - val;
}
LOS_IntRestore(intSave); LOS_IntRestore(intSave);
return (UINT64)hwCycle; return (UINT64)hwCycle;
} }

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

@ -84,10 +84,13 @@ WEAK VOID HalSysTickReload(UINT64 nextResponseTime)
WEAK UINT64 HalGetTickCycle(UINT32 *period) WEAK UINT64 HalGetTickCycle(UINT32 *period)
{ {
UINT32 hwCycle; UINT32 hwCycle = 0;
UINT32 intSave = LOS_IntLock(); UINT32 intSave = LOS_IntLock();
UINT32 val = SysTick->VAL;
*period = SysTick->LOAD; *period = SysTick->LOAD;
hwCycle = *period - SysTick->VAL; if (val != 0) {
hwCycle = *period - val;
}
LOS_IntRestore(intSave); LOS_IntRestore(intSave);
return (UINT64)hwCycle; return (UINT64)hwCycle;
} }

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

@ -84,10 +84,13 @@ WEAK VOID HalSysTickReload(UINT64 nextResponseTime)
WEAK UINT64 HalGetTickCycle(UINT32 *period) WEAK UINT64 HalGetTickCycle(UINT32 *period)
{ {
UINT32 hwCycle; UINT32 hwCycle = 0；
UINT32 intSave = LOS_IntLock(); UINT32 intSave = LOS_IntLock();
UINT32 val = SysTick->VAL;
*period = SysTick->LOAD; *period = SysTick->LOAD;
hwCycle = *period - SysTick->VAL; if (val != 0) {
hwCycle = *period - val;
}
LOS_IntRestore(intSave); LOS_IntRestore(intSave);
return (UINT64)hwCycle; return (UINT64)hwCycle;
} }

7
kernel/arch/arm/cortex-m33/gcc/los_timer.c
View File

@ -84,10 +84,13 @@ WEAK VOID HalSysTickReload(UINT64 nextResponseTime)
WEAK UINT64 HalGetTickCycle(UINT32 *period) WEAK UINT64 HalGetTickCycle(UINT32 *period)
{ {
UINT32 hwCycle; UINT32 hwCycle = 0;
UINT32 intSave = LOS_IntLock(); UINT32 intSave = LOS_IntLock();
UINT32 val = SysTick->VAL;
*period = SysTick->LOAD; *period = SysTick->LOAD;
hwCycle = *period - SysTick->VAL; if (val != 0) {
hwCycle = *period - val;
}
LOS_IntRestore(intSave); LOS_IntRestore(intSave);
return (UINT64)hwCycle; return (UINT64)hwCycle;
} }

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

@ -84,10 +84,13 @@ WEAK VOID HalSysTickReload(UINT64 nextResponseTime)
WEAK UINT64 HalGetTickCycle(UINT32 *period) WEAK UINT64 HalGetTickCycle(UINT32 *period)
{ {
UINT32 hwCycle; UINT32 hwCycle = 0;
UINTPTR intSave = LOS_IntLock(); UINTPTR intSave = LOS_IntLock();
UINT32 val = SysTick->VAL;
*period = SysTick->LOAD; *period = SysTick->LOAD;
hwCycle = *period - SysTick->VAL; if (val != 0) {
hwCycle = *period - val;
}
LOS_IntRestore(intSave); LOS_IntRestore(intSave);
return (UINT64)hwCycle; return (UINT64)hwCycle;
} }

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

@ -84,10 +84,13 @@ WEAK VOID HalSysTickReload(UINT64 nextResponseTime)
WEAK UINT64 HalGetTickCycle(UINT32 *period) WEAK UINT64 HalGetTickCycle(UINT32 *period)
{ {
UINT32 hwCycle; UINT32 hwCycle = 0;
UINTPTR intSave = LOS_IntLock(); UINTPTR intSave = LOS_IntLock();
UINT32 val = SysTick->VAL;
*period = SysTick->LOAD; *period = SysTick->LOAD;
hwCycle = *period - SysTick->VAL; if (val != 0) {
hwCycle = *period - val;
}
LOS_IntRestore(intSave); LOS_IntRestore(intSave);
return (UINT64)hwCycle; return (UINT64)hwCycle;
} }

7
kernel/arch/arm/cortex-m4/gcc/los_timer.c
View File

@ -85,10 +85,13 @@ WEAK VOID HalSysTickReload(UINT64 nextResponseTime)
WEAK UINT64 HalGetTickCycle(UINT32 *period) WEAK UINT64 HalGetTickCycle(UINT32 *period)
{ {
UINT32 hwCycle; UINT32 hwCycle = 0;
UINT32 intSave = LOS_IntLock(); UINT32 intSave = LOS_IntLock();
UINT32 val = SysTick->VAL;
*period = SysTick->LOAD; *period = SysTick->LOAD;
hwCycle = *period - SysTick->VAL; if (val != 0) {
hwCycle = *period - val;
}
LOS_IntRestore(intSave); LOS_IntRestore(intSave);
return (UINT64)hwCycle; return (UINT64)hwCycle;
} }

7
kernel/arch/arm/cortex-m4/iar/los_timer.c
View File

@ -85,10 +85,13 @@ WEAK VOID HalSysTickReload(UINT64 nextResponseTime)
WEAK UINT64 HalGetTickCycle(UINT32 *period) WEAK UINT64 HalGetTickCycle(UINT32 *period)
{ {
UINT32 hwCycle; UINT32 hwCycle = 0;
UINT32 intSave = LOS_IntLock(); UINT32 intSave = LOS_IntLock();
UINT32 val = SysTick->VAL;
*period = SysTick->LOAD; *period = SysTick->LOAD;
hwCycle = *period - SysTick->VAL; if (val != 0) {
hwCycle = *period - val;
}
LOS_IntRestore(intSave); LOS_IntRestore(intSave);
return (UINT64)hwCycle; return (UINT64)hwCycle;
} }

7
kernel/arch/arm/cortex-m7/gcc/los_timer.c
View File

@ -84,10 +84,13 @@ WEAK VOID HalSysTickReload(UINT64 nextResponseTime)
WEAK UINT64 HalGetTickCycle(UINT32 *period) WEAK UINT64 HalGetTickCycle(UINT32 *period)
{ {
UINT32 hwCycle; UINT32 hwCycle = 0;
UINT32 intSave = LOS_IntLock(); UINT32 intSave = LOS_IntLock();
UINT32 val = SysTick->VAL;
*period = SysTick->LOAD; *period = SysTick->LOAD;
hwCycle = *period - SysTick->VAL; if (val != 0) {
hwCycle = *period - val;
}
LOS_IntRestore(intSave); LOS_IntRestore(intSave);
return (UINT64)hwCycle; return (UINT64)hwCycle;
} }

7
kernel/arch/arm/cortex-m7/iar/los_timer.c
View File

@ -84,10 +84,13 @@ WEAK VOID HalSysTickReload(UINT64 nextResponseTime)
WEAK UINT64 HalGetTickCycle(UINT32 *period) WEAK UINT64 HalGetTickCycle(UINT32 *period)
{ {
UINT32 hwCycle; UINT32 hwCycle = 0;
UINT32 intSave = LOS_IntLock(); UINT32 intSave = LOS_IntLock();
UINT32 val = SysTick->VAL;
*period = SysTick->LOAD; *period = SysTick->LOAD;
hwCycle = *period - SysTick->VAL; if (val != 0) {
hwCycle = *period - val;
}
LOS_IntRestore(intSave); LOS_IntRestore(intSave);
return (UINT64)hwCycle; return (UINT64)hwCycle;
} }