nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-22 20:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use bic instead of and in finalize_powerdown

Browse source
This commit is contained in:
TuxSH 2018-02-28 19:58:59 +01:00
parent 6be5b0a52f
commit 303774aeb7
2 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
exosphere/src/arm.s
View file

@ -1,3 +1,6 @@
#define cpuactlr_el1 s3_1_c15_c2_0
#define cpuectlr_el1 s3_1_c15_c2_1
.section .text.tlb_invalidate_all, "ax", %progbits .section .text.tlb_invalidate_all, "ax", %progbits
.type tlb_invalidate_all, %function .type tlb_invalidate_all, %function
.global tlb_invalidate_all .global tlb_invalidate_all
@ -244,35 +247,44 @@ invalidate_icache_all:
.type finalize_powerdown, %function .type finalize_powerdown, %function
.global finalize_powerdown .global finalize_powerdown
finalize_powerdown: finalize_powerdown:
/* All data access to Normal memory from EL0/EL1 + all Normal Memory accesses to EL0/1 stage 1 translation tables non-cacheable for all levels, unified cache. */ /*
Make all data access to Normal memory from EL0/EL1 + all Normal Memory accesses to EL0/1 stage 1 translation tables
non-cacheable for all levels, unified cache.
*/
mrs x0, sctlr_el1 mrs x0, sctlr_el1
and x0, x0, #0xfffffffffffffffb bic x0, x0, #(1 << 2)
msr sctlr_el1, x0 msr sctlr_el1, x0
isb isb
/* Same as above, for EL3. */ /* Same as above, for EL3. */
mrs x0, sctlr_el3 mrs x0, sctlr_el3
and x0, x0, #0xfffffffffffffffb and x0, x0, #(1 << 2)
msr sctlr_el3, x0 msr sctlr_el3, x0
isb isb
/* Disable table walk descriptor access prefetch, disable instruction prefetch, disable data prefetch. */ /* Disable table walk descriptor access prefetch, disable instruction prefetch, disable data prefetch. */
mrs x0, s3_1_c15_c2_1 mrs x0, cpuectlr_el1
orr x0, x0, #0x4000000000 orr x0, x0, #(1 << 38)
and x0, x0, #0xffffffe7ffffffff bic x0, x0, #(3 << 35)
and x0, x0, #0xfffffffcffffffff bic x0, x0, #(3 << 32)
msr s3_1_c15_c2_1, x0 msr cpuectlr_el1, x0
isb isb
dsb sy dsb sy
bl flush_dcache_all bl flush_dcache_all
/* Disable receiving instruction cache/tbl maintenance operations. */ /* Disable receiving instruction cache/tbl maintenance operations. */
mrs x0, s3_1_c15_c2_1 mrs x0, cpuectlr_el1
and x0, x0, #0xffffffffffffffbf and x0, x0, #(1 << 6)
msr s3_1_c15_c2_1, x0 msr cpuectlr_el1, x0
/* Prepare GICC */ /* Prepare GICC */
bl intr_prepare_gicc_for_sleep bl intr_prepare_gicc_for_sleep
/* Set OS double lock */ /* Set OS double lock */
mrs x0, osdlr_el1 mrs x0, osdlr_el1
orr x0, x0, #1 orr x0, x0, #1
msr osdlr_el1, x0 msr osdlr_el1, x0
isb isb
dsb sy dsb sy
wait_for_power_off: wait_for_power_off:

2
exosphere/src/start.s
View file

@ -188,7 +188,7 @@ __jump_to_lower_el:
/* x0: arg (context ID), x1: entrypoint, w2: exception level */ /* x0: arg (context ID), x1: entrypoint, w2: exception level */
msr elr_el3, x1 msr elr_el3, x1
mov w1, #((0b1111 << 6) | 1) /* DAIF set and SP = SP_ELx*/ mov w1, #(0b1111 << 6 | 1) /* DAIF set and SP = SP_ELx*/
orr w1, w2, w2, lsl#2 orr w1, w2, w2, lsl#2
msr spsr_el3, x1 msr spsr_el3, x1