fix(cpus): remove plat_can_cmo check for aarch32

We don't need CONDITIONAL_CMO for aarch32 so let's remove it.

Signed-off-by: Okash Khawawja <okash@google.com>
Change-Id: I256959d7005df21a850ff7791c8188ea01f5c53b
This commit is contained in:
Okash Khawaja 2022-11-14 13:02:12 +00:00 committed by Manish Pandey
parent a2e0123484
commit 92f8be8fd1

View file

@ -37,27 +37,12 @@ exit_loop_\op:
bx lr bx lr
.endm .endm
.macro check_plat_can_cmo
#if CONDITIONAL_CMO
mov r3, lr
mov r2, r0
bl plat_can_cmo
mov lr, r3
cmp r0, #0
bne 1f
bx lr
1:
mov r0, r2
#endif
.endm
/* ------------------------------------------ /* ------------------------------------------
* Clean+Invalidate from base address till * Clean+Invalidate from base address till
* size. 'r0' = addr, 'r1' = size * size. 'r0' = addr, 'r1' = size
* ------------------------------------------ * ------------------------------------------
*/ */
func flush_dcache_range func flush_dcache_range
check_plat_can_cmo
do_dcache_maintenance_by_mva cimvac, DCCIMVAC do_dcache_maintenance_by_mva cimvac, DCCIMVAC
endfunc flush_dcache_range endfunc flush_dcache_range
@ -67,7 +52,6 @@ endfunc flush_dcache_range
* ------------------------------------------ * ------------------------------------------
*/ */
func clean_dcache_range func clean_dcache_range
check_plat_can_cmo
do_dcache_maintenance_by_mva cmvac, DCCMVAC do_dcache_maintenance_by_mva cmvac, DCCMVAC
endfunc clean_dcache_range endfunc clean_dcache_range
@ -77,7 +61,6 @@ endfunc clean_dcache_range
* ------------------------------------------ * ------------------------------------------
*/ */
func inv_dcache_range func inv_dcache_range
check_plat_can_cmo
do_dcache_maintenance_by_mva imvac, DCIMVAC do_dcache_maintenance_by_mva imvac, DCIMVAC
endfunc inv_dcache_range endfunc inv_dcache_range
@ -185,7 +168,6 @@ endfunc do_dcsw_op
* --------------------------------------------------------------- * ---------------------------------------------------------------
*/ */
func dcsw_op_louis func dcsw_op_louis
check_plat_can_cmo
dcsw_op #LOUIS_SHIFT, #CLIDR_FIELD_WIDTH, #LEVEL_SHIFT dcsw_op #LOUIS_SHIFT, #CLIDR_FIELD_WIDTH, #LEVEL_SHIFT
endfunc dcsw_op_louis endfunc dcsw_op_louis
@ -198,7 +180,6 @@ endfunc dcsw_op_louis
* --------------------------------------------------------------- * ---------------------------------------------------------------
*/ */
func dcsw_op_all func dcsw_op_all
check_plat_can_cmo
dcsw_op #LOC_SHIFT, #CLIDR_FIELD_WIDTH, #LEVEL_SHIFT dcsw_op #LOC_SHIFT, #CLIDR_FIELD_WIDTH, #LEVEL_SHIFT
endfunc dcsw_op_all endfunc dcsw_op_all
@ -224,7 +205,6 @@ endfunc dcsw_op_all
* --------------------------------------------------------------- * ---------------------------------------------------------------
*/ */
func dcsw_op_level1 func dcsw_op_level1
check_plat_can_cmo
dcsw_op_level #(1 << LEVEL_SHIFT) dcsw_op_level #(1 << LEVEL_SHIFT)
endfunc dcsw_op_level1 endfunc dcsw_op_level1
@ -237,7 +217,6 @@ endfunc dcsw_op_level1
* --------------------------------------------------------------- * ---------------------------------------------------------------
*/ */
func dcsw_op_level2 func dcsw_op_level2
check_plat_can_cmo
dcsw_op_level #(2 << LEVEL_SHIFT) dcsw_op_level #(2 << LEVEL_SHIFT)
endfunc dcsw_op_level2 endfunc dcsw_op_level2
@ -250,6 +229,5 @@ endfunc dcsw_op_level2
* --------------------------------------------------------------- * ---------------------------------------------------------------
*/ */
func dcsw_op_level3 func dcsw_op_level3
check_plat_can_cmo
dcsw_op_level #(3 << LEVEL_SHIFT) dcsw_op_level #(3 << LEVEL_SHIFT)
endfunc dcsw_op_level3 endfunc dcsw_op_level3