diff mbox

[U-Boot,1/4] armv7: psci: make v7_flush_dcache_all public for all psci code

Message ID 1471598433-5212-2-git-send-email-hongbo.zhang@nxp.com
State Accepted
Commit d38def1f34c7c282cd1c2f4ec6d99349bb1c1552
Delegated to: York Sun
Headers show

Commit Message

macro.wave.z@gmail.com Aug. 19, 2016, 9:20 a.m. UTC 
From: Hongbo Zhang <hongbo.zhang@nxp.com>

The v7_flush_dcache_all function will be called by ls102xa platform system
suspend, it is necessary to make it a public call instead of a local one, but
changing the LENTRY to ENTRY isn't enough, because there is another one using
the same name, so this one gets a psci_ prefix.

Signed-off-by: Hongbo Zhang <hongbo.zhang@nxp.com>
---
 arch/arm/cpu/armv7/psci.S   | 6 +++---
 arch/arm/include/asm/psci.h | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

Comments

Tom Rini Aug. 19, 2016, 7:55 p.m. UTC | #1 
On Fri, Aug 19, 2016 at 05:20:30PM +0800, macro.wave.z@gmail.com wrote:

> From: Hongbo Zhang <hongbo.zhang@nxp.com>
> 
> The v7_flush_dcache_all function will be called by ls102xa platform system
> suspend, it is necessary to make it a public call instead of a local one, but
> changing the LENTRY to ENTRY isn't enough, because there is another one using
> the same name, so this one gets a psci_ prefix.
> 
> Signed-off-by: Hongbo Zhang <hongbo.zhang@nxp.com>

Reviewed-by: Tom Rini <trini@konsulko.com>
York Sun Sept. 20, 2016, 6:04 p.m. UTC | #2 
On 08/19/2016 02:20 AM, macro.wave.z@gmail.com wrote:
> From: Hongbo Zhang <hongbo.zhang@nxp.com>
>
> The v7_flush_dcache_all function will be called by ls102xa platform system
> suspend, it is necessary to make it a public call instead of a local one, but
> changing the LENTRY to ENTRY isn't enough, because there is another one using
> the same name, so this one gets a psci_ prefix.
>
> Signed-off-by: Hongbo Zhang <hongbo.zhang@nxp.com>
> ---

This set has been applied to fsl-qoriq master. Awaiting upstream. Thanks.

York
diff mbox

Patch

diff --git a/arch/arm/cpu/armv7/psci.S b/arch/arm/cpu/armv7/psci.S
index f80f6e2..6a36208 100644
--- a/arch/arm/cpu/armv7/psci.S
+++ b/arch/arm/cpu/armv7/psci.S
@@ -187,7 +187,7 @@  ENDPROC(psci_get_cpu_id)
 .weak psci_get_cpu_id
 
 /* Imported from Linux kernel */
-LENTRY(v7_flush_dcache_all)
+ENTRY(psci_v7_flush_dcache_all)
 	stmfd	sp!, {r4-r5, r7, r9-r11, lr}
 	dmb					@ ensure ordering with previous memory accesses
 	mrc	p15, 1, r0, c0, c0, 1		@ read clidr
@@ -234,7 +234,7 @@  finished:
 	isb
 	ldmfd	sp!, {r4-r5, r7, r9-r11, lr}
 	bx	lr
-ENDPROC(v7_flush_dcache_all)
+ENDPROC(psci_v7_flush_dcache_all)
 
 ENTRY(psci_disable_smp)
 	mrc	p15, 0, r0, c1, c0, 1		@ ACTLR
@@ -264,7 +264,7 @@  ENTRY(psci_cpu_off_common)
 	isb
 	dsb
 
-	bl	v7_flush_dcache_all
+	bl	psci_v7_flush_dcache_all
 
 	clrex					@ Why???
 
diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
index 8aefaa7..9b068f0 100644
--- a/arch/arm/include/asm/psci.h
+++ b/arch/arm/include/asm/psci.h
@@ -86,6 +86,8 @@  void psci_cpu_off_common(void);
 int psci_update_dt(void *fdt);
 void psci_board_init(void);
 int fdt_psci(void *fdt);
+
+void psci_v7_flush_dcache_all(void);
 #endif /* ! __ASSEMBLY__ */
 
 #endif /* __ARM_PSCI_H__ */