From: Felix Fu fuzhen5@huawei.com
hulk inclusion category: feature bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAI881 CVE: NA
-----------------------------------------
This reverts commit bff4b41a19c46d71c538536151827177c334ea37.
Signed-off-by: Felix Fu fuzhen5@huawei.com --- arch/arm/mach-mvebu/coherency_ll.S | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-mvebu/coherency_ll.S b/arch/arm/mach-mvebu/coherency_ll.S index b81266a22a6d..35930e03d9c6 100644 --- a/arch/arm/mach-mvebu/coherency_ll.S +++ b/arch/arm/mach-mvebu/coherency_ll.S @@ -35,7 +35,9 @@ ENTRY(ll_get_coherency_base) * MMU is disabled, use the physical address of the coherency * base address, (or 0x0 if the coherency fabric is not mapped) */ - ldr_l r1, coherency_phys_base + adr r1, 3f + ldr r3, [r1] + ldr r1, [r1, r3] b 2f 1: /* @@ -151,3 +153,7 @@ ENTRY(ll_disable_coherency) dsb ret lr ENDPROC(ll_disable_coherency) + + .align 2 +3: + .long coherency_phys_base - .