Skip to content

Commit 883bdfa

Browse files
authored
[libcpu][aarch64]fix gicv3 mpidr table (#9284)
* fix gicv3 mpidr error * phytium should support rt_cpu_mpidr_table by using common_setup
1 parent 7475f55 commit 883bdfa

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

bsp/phytium/board/board.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ extern FIOPadCtrl iopad_ctrl;
5252
/* mmu config */
5353
extern struct mem_desc platform_mem_desc[];
5454
extern const rt_uint32_t platform_mem_desc_size;
55+
rt_uint64_t rt_cpu_mpidr_table[RT_CPUS_NR];
5556

5657
void idle_wfi(void)
5758
{

libcpu/aarch64/common/gicv3.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#if !defined(RT_USING_SMP) && !defined(RT_USING_AMP)
3939
#define RT_CPUS_NR 1
4040
#else
41-
extern rt_uint64_t rt_cpu_mpidr_early[];
41+
extern rt_uint64_t rt_cpu_mpidr_table[];
4242
#endif /* RT_USING_SMP */
4343

4444
/* 'ARM_GIC_MAX_NR' is the number of cores */
@@ -417,10 +417,10 @@ static rt_uint64_t gicv3_sgi_init(void)
417417

418418
for (i = 0; i < RT_CPUS_NR; i++)
419419
{
420-
icc_sgi1r_value = (rt_uint64_t)((rt_cpu_mpidr_early[i] >> 8) & 0xFF) << 16;
421-
icc_sgi1r_value |= (rt_uint64_t)((rt_cpu_mpidr_early[i] >> 16) & 0xFF) << 32;
422-
icc_sgi1r_value |= (rt_uint64_t)((rt_cpu_mpidr_early[i] >> 32) & 0xFF) << 48;
423-
icc_sgi1r_value |= (rt_uint64_t)((rt_cpu_mpidr_early[i] >> 4) & 0xF) << 44;
420+
icc_sgi1r_value = (rt_uint64_t)((rt_cpu_mpidr_table[i] >> 8) & 0xFF) << 16;
421+
icc_sgi1r_value |= (rt_uint64_t)((rt_cpu_mpidr_table[i] >> 16) & 0xFF) << 32;
422+
icc_sgi1r_value |= (rt_uint64_t)((rt_cpu_mpidr_table[i] >> 32) & 0xFF) << 48;
423+
icc_sgi1r_value |= (rt_uint64_t)((rt_cpu_mpidr_table[i] >> 4) & 0xF) << 44;
424424
sgi_aff_add_table(icc_sgi1r_value, i);
425425
}
426426

@@ -455,7 +455,7 @@ rt_inline void gicv3_sgi_target_list_set(rt_uint64_t array, rt_uint32_t cpu_mask
455455
{
456456
value = __builtin_ctzl(cpu_mask);
457457
cpu_mask &= ~(1 << value);
458-
sgi_aff_table[i].target_list |= 1 << (rt_cpu_mpidr_early[(array << 5) | value] & 0xF);
458+
sgi_aff_table[i].target_list |= 1 << (rt_cpu_mpidr_table[(array << 5) | value] & 0xF);
459459
}
460460
}
461461
}
@@ -629,7 +629,7 @@ int arm_gic_dist_init(rt_uint64_t index, rt_uint64_t dist_base, int irq_start)
629629
arm_gicv3_wait_rwp(0, 32);
630630

631631
#ifdef RT_USING_SMP
632-
main_cpu_affinity_val = rt_cpu_mpidr_early[ARM_SPI_BIND_CPU_ID];
632+
main_cpu_affinity_val = rt_cpu_mpidr_table[ARM_SPI_BIND_CPU_ID];
633633
#else
634634
__asm__ volatile ("mrs %0, mpidr_el1":"=r"(main_cpu_affinity_val));
635635
#endif

0 commit comments

Comments
 (0)