Skip to content

GitLab

Commit 3465ab60 authored by davidcunado-arm's avatar davidcunado-arm Committed by GitHub
Browse files

Merge pull request #991 from davidcunado-arm/dc/update_hikey 

hikey960: migrate to use A53 specific defines
parents 6de8b24f 0d5eb656
Show whitespace changes
Inline Side-by-side
plat/hisilicon/hikey960/aarch64/hikey960_helpers.S
View file @ 3465ab60
...@@ -144,10 +144,10 @@ endfunc plat_reset_handler ...@@ -144,10 +144,10 @@ endfunc plat_reset_handler
* ----------------------------------------------------- * -----------------------------------------------------
*/ */
func set_retention_ticks func set_retention_ticks
mrs x0, CPUECTLR_EL1 mrs x0, CORTEX_A53_ECTLR_EL1
bic x0, x0, #CPUECTLR_CPU_RET_CTRL_MASK bic x0, x0, #CORTEX_A53_ECTLR_CPU_RET_CTRL_MASK
orr x0, x0, #RETENTION_ENTRY_TICKS_8 orr x0, x0, #RETENTION_ENTRY_TICKS_8
msr CPUECTLR_EL1, x0 msr CORTEX_A53_ECTLR_EL1, x0
isb isb
dsb sy dsb sy
ret ret
...@@ -159,9 +159,9 @@ endfunc set_retention_ticks ...@@ -159,9 +159,9 @@ endfunc set_retention_ticks
* ----------------------------------------------------- * -----------------------------------------------------
*/ */
func clr_retention_ticks func clr_retention_ticks
mrs x0, CPUECTLR_EL1 mrs x0, CORTEX_A53_ECTLR_EL1
bic x0, x0, #CPUECTLR_CPU_RET_CTRL_MASK bic x0, x0, #CORTEX_A53_ECTLR_CPU_RET_CTRL_MASK
msr CPUECTLR_EL1, x0 msr CORTEX_A53_ECTLR_EL1, x0
isb isb
dsb sy dsb sy
ret ret
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment