@@ -29,33 +29,33 @@ static struct arm_gic _gic_table[ARM_GIC_MAX_NR];
2929
3030/** Macro to access the Generic Interrupt Controller Interface (GICC)
3131*/
32- #define GIC_CPU_CTRL (hw_base ) __REG32((hw_base) + 0x00U) /* GICC_CTLR */
33- #define GIC_CPU_PRIMASK (hw_base ) __REG32((hw_base) + 0x04U) /* GICC_PMR */
34- #define GIC_CPU_BINPOINT (hw_base ) __REG32((hw_base) + 0x08U) /* GICC_BPR */
35- #define GIC_CPU_INTACK (hw_base ) __REG32((hw_base) + 0x0cU) /* GICC_IAR */
36- #define GIC_CPU_EOI (hw_base ) __REG32((hw_base) + 0x10U) /* GICC_EOIR */
37- #define GIC_CPU_RUNNINGPRI (hw_base ) __REG32((hw_base) + 0x14U) /* GICC_RPR */
38- #define GIC_CPU_HIGHPRI (hw_base ) __REG32((hw_base) + 0x18U) /* GICC_HPPIR */
39- #define GIC_CPU_IIDR (hw_base ) __REG32((hw_base) + 0xFCU) /* GICC_IIDR */
32+ #define GIC_CPU_CTRL (hw_base ) __REG32((hw_base) + 0x00U) /* GICC_CTLR */
33+ #define GIC_CPU_PRIMASK (hw_base ) __REG32((hw_base) + 0x04U) /* GICC_PMR */
34+ #define GIC_CPU_BINPOINT (hw_base ) __REG32((hw_base) + 0x08U) /* GICC_BPR */
35+ #define GIC_CPU_INTACK (hw_base ) __REG32((hw_base) + 0x0cU) /* GICC_IAR */
36+ #define GIC_CPU_EOI (hw_base ) __REG32((hw_base) + 0x10U) /* GICC_EOIR */
37+ #define GIC_CPU_RUNNINGPRI (hw_base ) __REG32((hw_base) + 0x14U) /* GICC_RPR */
38+ #define GIC_CPU_HIGHPRI (hw_base ) __REG32((hw_base) + 0x18U) /* GICC_HPPIR */
39+ #define GIC_CPU_IIDR (hw_base ) __REG32((hw_base) + 0xFCU) /* GICC_IIDR */
4040
4141/** Macro to access the Generic Interrupt Controller Distributor (GICD)
4242*/
43- #define GIC_DIST_CTRL (hw_base ) __REG32((hw_base) + 0x000U) /* GICD_CTLR */
44- #define GIC_DIST_TYPE (hw_base ) __REG32((hw_base) + 0x004U) /* GICD_TYPER */
45- #define GIC_DIST_IGROUP (hw_base , n ) __REG32((hw_base) + 0x080U + ((n)/ 32U) * 4U) /* GICD_IGROUPRn */
46- #define GIC_DIST_ENABLE_SET (hw_base , n ) __REG32((hw_base) + 0x100U + ((n)/ 32U) * 4U) /* GICD_ISENABLERn */
47- #define GIC_DIST_ENABLE_CLEAR (hw_base , n ) __REG32((hw_base) + 0x180U + ((n)/ 32U) * 4U) /* GICD_ICENABLERn */
48- #define GIC_DIST_PENDING_SET (hw_base , n ) __REG32((hw_base) + 0x200U + ((n)/ 32U) * 4U) /* GICD_ISPENDRn */
49- #define GIC_DIST_PENDING_CLEAR (hw_base , n ) __REG32((hw_base) + 0x280U + ((n)/ 32U) * 4U) /* GICD_ICPENDRn */
50- #define GIC_DIST_ACTIVE_SET (hw_base , n ) __REG32((hw_base) + 0x300U + ((n)/ 32U) * 4U) /* GICD_ISACTIVERn */
51- #define GIC_DIST_ACTIVE_CLEAR (hw_base , n ) __REG32((hw_base) + 0x380U + ((n)/ 32U) * 4U) /* GICD_ICACTIVERn */
52- #define GIC_DIST_PRI (hw_base , n ) __REG32((hw_base) + 0x400U + ((n)/ 4U) * 4U) /* GICD_IPRIORITYRn */
53- #define GIC_DIST_TARGET (hw_base , n ) __REG32((hw_base) + 0x800U + ((n)/ 4U) * 4U) /* GICD_ITARGETSRn */
54- #define GIC_DIST_CONFIG (hw_base , n ) __REG32((hw_base) + 0xc00U + ((n)/ 16U) * 4U) /* GICD_ICFGRn */
55- #define GIC_DIST_SOFTINT (hw_base ) __REG32((hw_base) + 0xf00U) /* GICD_SGIR */
56- #define GIC_DIST_CPENDSGI (hw_base , n ) __REG32((hw_base) + 0xf10U + ((n)/ 4U) * 4U) /* GICD_CPENDSGIRn */
57- #define GIC_DIST_SPENDSGI (hw_base , n ) __REG32((hw_base) + 0xf20U + ((n)/ 4U) * 4U) /* GICD_SPENDSGIRn */
58- #define GIC_DIST_ICPIDR2 (hw_base ) __REG32((hw_base) + 0xfe8U) /* ICPIDR2 */
43+ #define GIC_DIST_CTRL (hw_base ) __REG32((hw_base) + 0x000U) /* GICD_CTLR */
44+ #define GIC_DIST_TYPE (hw_base ) __REG32((hw_base) + 0x004U) /* GICD_TYPER */
45+ #define GIC_DIST_IGROUP (hw_base , n ) __REG32((hw_base) + 0x080U + ((n) / 32U) * 4U) /* GICD_IGROUPRn */
46+ #define GIC_DIST_ENABLE_SET (hw_base , n ) __REG32((hw_base) + 0x100U + ((n) / 32U) * 4U) /* GICD_ISENABLERn */
47+ #define GIC_DIST_ENABLE_CLEAR (hw_base , n ) __REG32((hw_base) + 0x180U + ((n) / 32U) * 4U) /* GICD_ICENABLERn */
48+ #define GIC_DIST_PENDING_SET (hw_base , n ) __REG32((hw_base) + 0x200U + ((n) / 32U) * 4U) /* GICD_ISPENDRn */
49+ #define GIC_DIST_PENDING_CLEAR (hw_base , n ) __REG32((hw_base) + 0x280U + ((n) / 32U) * 4U) /* GICD_ICPENDRn */
50+ #define GIC_DIST_ACTIVE_SET (hw_base , n ) __REG32((hw_base) + 0x300U + ((n) / 32U) * 4U) /* GICD_ISACTIVERn */
51+ #define GIC_DIST_ACTIVE_CLEAR (hw_base , n ) __REG32((hw_base) + 0x380U + ((n) / 32U) * 4U) /* GICD_ICACTIVERn */
52+ #define GIC_DIST_PRI (hw_base , n ) __REG32((hw_base) + 0x400U + ((n) / 4U) * 4U) /* GICD_IPRIORITYRn */
53+ #define GIC_DIST_TARGET (hw_base , n ) __REG32((hw_base) + 0x800U + ((n) / 4U) * 4U) /* GICD_ITARGETSRn */
54+ #define GIC_DIST_CONFIG (hw_base , n ) __REG32((hw_base) + 0xc00U + ((n) / 16U) * 4U) /* GICD_ICFGRn */
55+ #define GIC_DIST_SOFTINT (hw_base ) __REG32((hw_base) + 0xf00U) /* GICD_SGIR */
56+ #define GIC_DIST_CPENDSGI (hw_base , n ) __REG32((hw_base) + 0xf10U + ((n) / 4U) * 4U) /* GICD_CPENDSGIRn */
57+ #define GIC_DIST_SPENDSGI (hw_base , n ) __REG32((hw_base) + 0xf20U + ((n) / 4U) * 4U) /* GICD_SPENDSGIRn */
58+ #define GIC_DIST_ICPIDR2 (hw_base ) __REG32((hw_base) + 0xfe8U) /* ICPIDR2 */
5959
6060static unsigned int _gic_max_irq ;
6161
@@ -240,7 +240,7 @@ void arm_gic_clear_pending_irq(rt_uint32_t index, int irq)
240240 }
241241 else
242242 {
243- mask = 1U << ((irq % 4U ) * 8U );
243+ mask = 1U << ((irq % 4U ) * 8U );
244244 GIC_DIST_CPENDSGI (_gic_table [index ].dist_hw_base , irq ) = mask ;
245245 }
246246}
@@ -337,8 +337,8 @@ void arm_gic_set_cpu(rt_uint32_t index, int irq, unsigned int cpumask)
337337
338338 old_tgt = GIC_DIST_TARGET (_gic_table [index ].dist_hw_base , irq );
339339
340- old_tgt &= ~(0x0FFUL << ((irq % 4U )* 8U ));
341- old_tgt |= cpumask << ((irq % 4U )* 8U );
340+ old_tgt &= ~(0x0FFUL << ((irq % 4U ) * 8U ));
341+ old_tgt |= cpumask << ((irq % 4U ) * 8U );
342342
343343 GIC_DIST_TARGET (_gic_table [index ].dist_hw_base , irq ) = old_tgt ;
344344}
@@ -590,7 +590,7 @@ void arm_gic_set_group(rt_uint32_t index, int irq, rt_uint32_t group)
590590 igroupr = GIC_DIST_IGROUP (_gic_table [index ].dist_hw_base , irq );
591591 shift = (irq % 32U );
592592 igroupr &= (~(1U << shift ));
593- igroupr |= ( (group & 0x1U ) << shift );
593+ igroupr |= ((group & 0x1U ) << shift );
594594
595595 GIC_DIST_IGROUP (_gic_table [index ].dist_hw_base , irq ) = igroupr ;
596596}
0 commit comments