shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 19:08:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

firmware: rockchip_sip: fix error in cpu_logical_map_mpidr

Browse Source 
If PE support multithread, the mpidr of cpu0~cpu3 in cluster0
and cpu4~cpu7 in cluster1 is as follow:
cpu0~3: 0x81000000, 0x81000100, 0x81000200, 0x81000300.
cpu4~7: 0x81010000, 0x81010100, 0x81010200, 0x81010300.

If PE doesn't support multithread, the mpidr of cpu0~cpu3 in cluster0
and cpu4~cpu7 in cluster1 is as follow:
cpu0~3: 0x80000000, 0x80000001, 0x80000002, 0x80000003.
cpu4~7: 0x80000100, 0x80000101, 0x80000102, 0x80000103.

Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
Change-Id: Ib2fb18ad280c6c275850910f18cb4f653c4a108f
This commit is contained in:
XiaoDong Huang
2023-05-22 16:36:12 +08:00
committed by Tao Huang
parent b9d6865a47
commit 59d0a1e8b2
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/firmware/rockchip_sip.c
View File

@@ -471,16 +471,21 @@ static ulong cpu_logical_map_mpidr(u32 cpu)
{
#ifdef MODULE
/* Empirically, local "cpu_logical_map()" for rockchip platforms */
ulong mpidr = 0x00;
ulong mpidr = read_cpuid_mpidr();
if (cpu < 4)
/* 0x00, 0x01, 0x02, 0x03 */
mpidr = cpu;
else if (cpu < 8)
/* 0x100, 0x101, 0x102, 0x103 */
mpidr = 0x100 | (cpu - 4);
else
pr_err("Unsupported map cpu: %d\n", cpu);
if (mpidr & MPIDR_MT_BITMASK) {
/* 0x100, 0x200, 0x300, 0x400 ... */
mpidr = (cpu & 0xff) << 8;
} else {
if (cpu < 4)
/* 0x00, 0x01, 0x02, 0x03 */
mpidr = cpu;
else if (cpu < 8)
/* 0x100, 0x101, 0x102, 0x103 */
mpidr = 0x100 | (cpu - 4);
else
pr_err("Unsupported map cpu: %d\n", cpu);
}
return mpidr;
#else