Mirrors/m1n1
2
0
Fork 0
mirror of https://github.com/AsahiLinux/m1n1 synced 2024-11-24 23:53:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

smp: Add support for deep sleep on A7-A9X

Browse source 
Signed-off-by: Nick Chan <towinchenmi@gmail.com>
This commit is contained in:
Nick Chan 2024-10-07 19:14:54 +08:00 committed by Hector Martin
parent dadc48ed10
commit da3519de14
4 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/chickens.c
View file

@ -70,6 +70,7 @@ void init_t6031_sawtooth(void);
void init_t6031_everest(int rev); void init_t6031_everest(int rev);
bool cpufeat_actlr_el2, cpufeat_fast_ipi, cpufeat_mmu_sprr; bool cpufeat_actlr_el2, cpufeat_fast_ipi, cpufeat_mmu_sprr;
bool cpufeat_global_sleep;
const char *init_cpu(void) const char *init_cpu(void)
{ {
@ -241,6 +242,12 @@ const char *init_cpu(void)
if (part >= MIDR_PART_T8015_MONSOON) if (part >= MIDR_PART_T8015_MONSOON)
cpufeat_fast_ipi = true; cpufeat_fast_ipi = true;
if (part >= MIDR_PART_T8010_2_HURRICANE)
cpufeat_global_sleep = true;
else
/* Disable deep sleep */
reg_clr(SYS_IMP_APL_ACC_CFG, ACC_CFG_DEEP_SLEEP);
/* Unmask external IRQs, set WFI mode to up (2) */ /* Unmask external IRQs, set WFI mode to up (2) */
reg_mask(SYS_IMP_APL_CYC_OVRD, reg_mask(SYS_IMP_APL_CYC_OVRD,
CYC_OVRD_FIQ_MODE_MASK | CYC_OVRD_IRQ_MODE_MASK | CYC_OVRD_WFI_MODE_MASK, CYC_OVRD_FIQ_MODE_MASK | CYC_OVRD_IRQ_MODE_MASK | CYC_OVRD_WFI_MODE_MASK,

3
src/smp.c
View file

@ -179,8 +179,9 @@ static void smp_stop_cpu(int index, int die, int cluster, int core, u64 impl, u6
// Request CPU stop // Request CPU stop
write32(cpu_start_base + 0x0, 1 << (4 * cluster + core)); write32(cpu_start_base + 0x0, 1 << (4 * cluster + core));
u64 dsleep = deep_sleep;
// Put the CPU to sleep // Put the CPU to sleep
smp_call1(index, cpu_sleep, deep_sleep); smp_call2(index, cpu_sleep, dsleep, cpufeat_global_sleep);
// If going into deep sleep, powering off the last core in a cluster kills our register // If going into deep sleep, powering off the last core in a cluster kills our register
// access, so just wait a bit. // access, so just wait a bit.

1
src/utils.h
View file

@ -460,6 +460,7 @@ extern u32 board_id, chip_id;
extern bool is_mac, has_dcp; extern bool is_mac, has_dcp;
extern bool cpufeat_actlr_el2, cpufeat_fast_ipi, cpufeat_mmu_sprr; extern bool cpufeat_actlr_el2, cpufeat_fast_ipi, cpufeat_mmu_sprr;
extern bool cpufeat_global_sleep;
extern struct vector_args next_stage; extern struct vector_args next_stage;
extern u64 boot_flags, mem_size_actual; extern u64 boot_flags, mem_size_actual;

20
src/utils_asm.S
View file

@ -185,6 +185,8 @@ cpu_sleep:
cmp x0, #0 cmp x0, #0
bne 1f bne 1f
mov x4, x1
mrs x1, SYS_IMP_APL_CYC_OVRD mrs x1, SYS_IMP_APL_CYC_OVRD
and x1, x1, #~CYC_OVRD_IRQ_MODE_MASK and x1, x1, #~CYC_OVRD_IRQ_MODE_MASK
orr x1, x1, #CYC_OVRD_IRQ_MODE(2) orr x1, x1, #CYC_OVRD_IRQ_MODE(2)
@ -192,8 +194,10 @@ cpu_sleep:
orr x1, x1, #CYC_OVRD_FIQ_MODE(2) orr x1, x1, #CYC_OVRD_FIQ_MODE(2)
msr SYS_IMP_APL_CYC_OVRD, x1 msr SYS_IMP_APL_CYC_OVRD, x1
1: 1:
cmp x0, #0 cmp x0, #0
beq 3f
cmp x4, #0
beq 2f beq 2f
mrs x1, SYS_IMP_APL_ACC_OVRD mrs x1, SYS_IMP_APL_ACC_OVRD
@ -205,14 +209,22 @@ cpu_sleep:
orr x1, x1, #ACC_OVRD_DISABLE_PIO_ON_WFI_CPU orr x1, x1, #ACC_OVRD_DISABLE_PIO_ON_WFI_CPU
orr x1, x1, #ACC_OVRD_DEEP_SLEEP orr x1, x1, #ACC_OVRD_DEEP_SLEEP
msr SYS_IMP_APL_ACC_OVRD, x1 msr SYS_IMP_APL_ACC_OVRD, x1
2:
cmp x4, #0
bne 3f
2:
mrs x1, SYS_IMP_APL_ACC_CFG
orr x1, x1, #ACC_CFG_DEEP_SLEEP
msr SYS_IMP_APL_ACC_CFG, x1
3:
mrs x1, SYS_IMP_APL_CYC_OVRD mrs x1, SYS_IMP_APL_CYC_OVRD
orr x1, x1, #CYC_OVRD_WFI_MODE(3) orr x1, x1, #CYC_OVRD_WFI_MODE(3)
orr x1, x1, #CYC_OVRD_DISABLE_WFI_RET orr x1, x1, #CYC_OVRD_DISABLE_WFI_RET
msr SYS_IMP_APL_CYC_OVRD, x1 msr SYS_IMP_APL_CYC_OVRD, x1
3: 4:
isb isb
wfi wfi
b 3b b 4b