!1122 liteos_m cpup 中断索引值越界修复

Merge pull request !1122 from hw_llm/master

OAT.xml

@@ -67,6 +67,9 @@
                 <!--filteritem type="filepath" name="projectroot/[a-zA-Z0-9]{20,}.sh" desc="Temp files"/-->
             </filefilter>
             <filefilter name="binaryFileTypePolicyFilter" desc="Filters for binary file policies">
+            <filteritem type="filepath"
+            name="figures/architecture-of-openharmony-the-liteos-cortex-m-kernel.png" desc="architecture-of-openharmony-the-liteos-cortex-m-kernel"/>
+            <filteritem type="filepath" name="figures/OpenHarmony-LiteOS-M核内核架构图.png" desc="内核驱动架构"/>
                 <!--filteritem type="filename" name="*.uvwxyz" desc="Describe the reason for filtering scan results"/-->
                 <!--filteritem type="filepath" name="abcdefg/.*.uvwxyz" desc="Describe the reason for filtering scan results"/-->
                 <!--filteritem type="filepath" name="projectroot/[a-zA-Z0-9]{20,}.sh" desc="Temp files"/-->

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

@@ -86,7 +86,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
     SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
     SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
     SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    NVIC_ClearPendingIRQ(SysTick_IRQn);
+    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
     SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
 
     return nextResponseTime;

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

@@ -85,7 +85,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
     SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
     SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
     SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    NVIC_ClearPendingIRQ(SysTick_IRQn);
+    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
     SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
     return nextResponseTime;
 }

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

@@ -84,7 +84,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
     SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
     SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
     SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    NVIC_ClearPendingIRQ(SysTick_IRQn);
+    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
     SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
     return nextResponseTime;
 }

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

@@ -84,7 +84,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
     SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
     SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
     SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    NVIC_ClearPendingIRQ(SysTick_IRQn);
+    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
     SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
     return nextResponseTime;
 }

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

@@ -85,7 +85,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
     SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
     SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
     SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    NVIC_ClearPendingIRQ(SysTick_IRQn);
+    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
     SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
     return nextResponseTime;
 }

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

@@ -84,7 +84,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
     SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
     SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
     SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    NVIC_ClearPendingIRQ(SysTick_IRQn);
+    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
     SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
     return nextResponseTime;
 }

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

@@ -84,7 +84,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
     SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
     SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
     SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    NVIC_ClearPendingIRQ(SysTick_IRQn);
+    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
     SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
     return nextResponseTime;
 }

arch/arm/cortex-m55/gcc/NTZ/los_timer.c

@@ -84,7 +84,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
     SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
     SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
     SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    NVIC_ClearPendingIRQ(SysTick_IRQn);
+    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
     SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
     return nextResponseTime;
 }

arch/arm/cortex-m55/gcc/TZ/non_secure/los_timer.c

@@ -84,7 +84,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
     SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
     SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
     SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    NVIC_ClearPendingIRQ(SysTick_IRQn);
+    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
     SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
     return nextResponseTime;
 }

arch/arm/cortex-m55/iar/NTZ/los_timer.c

@@ -84,7 +84,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
     SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
     SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
     SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    NVIC_ClearPendingIRQ(SysTick_IRQn);
+    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
     SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
     return nextResponseTime;
 }

arch/arm/cortex-m55/iar/TZ/non_secure/los_timer.c

@@ -85,7 +85,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
     SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
     SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
     SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    NVIC_ClearPendingIRQ(SysTick_IRQn);
+    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
     SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
     return nextResponseTime;
 }

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

@@ -84,7 +84,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
     SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
     SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
     SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    NVIC_ClearPendingIRQ(SysTick_IRQn);
+    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
     SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
     return nextResponseTime;
 }

arch/arm/cortex-m7/iar/los_timer.c

@@ -84,7 +84,7 @@ STATIC UINT64 SysTickReload(UINT64 nextResponseTime)
     SysTick->CTRL &= ~SysTick_CTRL_ENABLE_Msk;
     SysTick->LOAD = (UINT32)(nextResponseTime - 1UL); /* set reload register */
     SysTick->VAL = 0UL; /* Load the SysTick Counter Value */
-    NVIC_ClearPendingIRQ(SysTick_IRQn);
+    SCB->ICSR |= SCB_ICSR_PENDSTCLR_Msk;
     SysTick->CTRL |= SysTick_CTRL_ENABLE_Msk;
     return nextResponseTime;
 }

arch/risc-v/riscv32/gcc/los_arch_interrupt.h

@@ -110,6 +110,12 @@ typedef struct {
  */
 #define OS_RISCV_VECTOR_CNT                  (OS_RISCV_SYS_VECTOR_CNT + OS_RISCV_CUSTOM_IRQ_VECTOR_CNT)
 
+/**
+ * @ingroup los_arch_interrupt
+ * Count of risc-v system interrupt vector.
+ */
+#define OS_SYS_VECTOR_CNT                    0
+
 /**
  * Maximum number of supported hardware devices that generate hardware interrupts.
  * The maximum number of hardware devices that generate hardware interrupts supported by hi3518ev200 is 32.

components/cpup/los_cpup.c

@@ -616,11 +616,11 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_CpupUsageMonitor(CPUP_TYPE_E type, CPUP_MODE_E
 #if (LOSCFG_CPUP_INCLUDE_IRQ == 1)
 LITE_OS_SEC_TEXT_MINOR VOID OsCpupIrqStart(UINT32 intNum)
 {
-    if (g_irqCpupInitFlg == 0) {
+    if ((g_irqCpupInitFlg == 0) || (intNum < OS_SYS_VECTOR_CNT)) {
         return;
     }
-
+    UINT32 cpupIntNum = intNum - OS_SYS_VECTOR_CNT;
-    g_irqCpup[intNum].startTime = CpupTimeUsGet();
+    g_irqCpup[cpupIntNum].startTime = CpupTimeUsGet();
     return;
 }
 
@@ -629,33 +629,34 @@ LITE_OS_SEC_TEXT_MINOR VOID OsCpupIrqEnd(UINT32 intNum)
     UINT64 cpuTime;
     UINT64 usedTime;
 
-    if (g_irqCpupInitFlg == 0) {
+    if ((g_irqCpupInitFlg == 0) || (intNum < OS_SYS_VECTOR_CNT)) {
         return;
     }
 
-    if (g_irqCpup[intNum].startTime == 0) {
+    UINT32 cpupIntNum = intNum - OS_SYS_VECTOR_CNT;
+    if (g_irqCpup[cpupIntNum].startTime == 0) {
         return;
     }
 
     cpuTime = CpupTimeUsGet();
-    if (cpuTime < g_irqCpup[intNum].startTime) {
+    if (cpuTime < g_irqCpup[cpupIntNum].startTime) {
         cpuTime += OS_US_PER_TICK;
     }
 
-    g_irqCpup[intNum].cpupID = intNum;
+    g_irqCpup[cpupIntNum].cpupID = intNum;
-    g_irqCpup[intNum].status = OS_CPUP_USED;
+    g_irqCpup[cpupIntNum].status = OS_CPUP_USED;
-    usedTime = cpuTime - g_irqCpup[intNum].startTime;
+    usedTime = cpuTime - g_irqCpup[cpupIntNum].startTime;
 
-    if (g_irqCpup[intNum].count <= 1000) { /* 1000, Take 1000 samples */
+    if (g_irqCpup[cpupIntNum].count <= 1000) { /* 1000, Take 1000 samples */
-        g_irqCpup[intNum].allTime += usedTime;
+        g_irqCpup[cpupIntNum].allTime += usedTime;
-        g_irqCpup[intNum].count++;
+        g_irqCpup[cpupIntNum].count++;
     } else {
-        g_irqCpup[intNum].allTime = 0;
+        g_irqCpup[cpupIntNum].allTime = 0;
-        g_irqCpup[intNum].count = 0;
+        g_irqCpup[cpupIntNum].count = 0;
     }
-    g_irqCpup[intNum].startTime = 0;
+    g_irqCpup[cpupIntNum].startTime = 0;
-    if (usedTime > g_irqCpup[intNum].timeMax) {
+    if (usedTime > g_irqCpup[cpupIntNum].timeMax) {
-        g_irqCpup[intNum].timeMax = usedTime;
+        g_irqCpup[cpupIntNum].timeMax = usedTime;
     }
     return;
 }