Changeset 429 for EcnlProtoTool/trunk/asp3_dcre/arch/arm_gcc/common/gic_support.S

Timestamp:

Jul 3, 2020, 7:19:17 PM (4 years ago)

Author:

coas-nagasima

Message:

ASP3, TINET, mbed を更新

File:

• EcnlProtoTool/trunk/asp3_dcre/arch/arm_gcc/common/gic_support.S (modified) (3 diffs)

EcnlProtoTool/trunk/asp3_dcre/arch/arm_gcc/common/gic_support.S

@@ -5 +5 @@
  *  Copyright (C) 2000-2003 by Embedded and Real-Time Systems Laboratory
  *                              Toyohashi Univ. of Technology, JAPAN
- *  Copyright (C) 2006-2017 by Embedded and Real-Time Systems Laboratory
+ *  Copyright (C) 2006-2018 by Embedded and Real-Time Systems Laboratory
  *              Graduate School of Information Science, Nagoya Univ., JAPAN
  * 
@@ -70 +70 @@
          *  割込み要因を取得する．
          */
+#ifdef GIC_PL390_ERRATA                 /* GIC 390 Errata 801120への対策 */
+        ldr             r1, =GICC_HPPIR
+        ldr             r0, [r1]        
+#endif /* GIC_PL390_ERRATA */
         ldr             r1, =GICC_IAR
         ldr             r3, [r1]
-
-        /*
-         *  割込み番号を求める．
-         */
         lsl             r4, r3, #22                     /* 下位10ビットを取り出す */
         lsr             r4, r4, #22
 
-        /*
-         *  割込み要求をクリアする．
-         */
-        and             r0, r4, #31
-        mov             r2, #1
-        lsl             r0, r2, r0
-        ldr             r2, =GICD_ICPENDR(0)
-        lsr             r1, r4, #5
-        str             r0, [r2,r1,lsl #2]
+#ifdef GIC_PL390_ERRATA                 /* GIC 390 Errata 733075への対策 */
+        movw    r0, #1023
+        cmp             r4, r0
+        beq             irc_begin_int_errata_1
+        movw    r0, #1022
+        cmp             r4, r0
+        beq             irc_begin_int_errata_1
+        cmp             r3, #0
+        bne             irc_begin_int_errata_2
+        ldr             r1, =GICD_ISACTIVER(0)          /* 割込み要求があるかチェック */
+        ldr             r0, [r1]
+        tst             r0, #0x01
+        movweq  r4, #1024                                       /* 無効な割込みとみなす */
+ALABEL(irc_begin_int_errata_1)
+        ldr             r1, =GICD_IPRIORITYR(0)         /* 割込み優先度レジスタ0に書き込み */
+        ldr             r0, [r1]
+        str             r0, [r1]
+        asm_data_sync_barrier r0
+ALABEL(irc_begin_int_errata_2)
+#endif /* GIC_PL390_ERRATA */
 
         /*
@@ -107 +118 @@
 
         /*
-         *  割込み番号を返値としてリターンする．
+         *  r4に割込み番号を入れた状態でリターンする．
          */
         bx              lr