sunxi: Move remaining PSCI assembly code to C

This patch finishes the rewrite of sunxi specific PSCI parts into C
code.

The assembly-only stack setup code has been factored out into a common
function for ARMv7. The GIC setup code can be renamed as psci_arch_init.
And we can use an empty stub function for psci_text_end.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/arch/arm/cpu/armv7/sunxi/Makefile b/arch/arm/cpu/armv7/sunxi/Makefile
index c2085101685bb28199e38c6e91ea8668027795da..b35b9df4a9d6f7d75a82265a19914946131e1aca 100644 (file)
--- a/arch/arm/cpu/armv7/sunxi/Makefile
+++ b/arch/arm/cpu/armv7/sunxi/Makefile
@@ -14,7 +14,6 @@ obj-$(CONFIG_MACH_SUN8I_H3)   += tzpc.o
 
 ifndef CONFIG_SPL_BUILD
 obj-$(CONFIG_ARMV7_PSCI)       += psci.o
-obj-$(CONFIG_ARMV7_PSCI)       += psci_head.o
 endif
 
 ifdef CONFIG_SPL_BUILD

diff --git a/arch/arm/cpu/armv7/sunxi/psci.c b/arch/arm/cpu/armv7/sunxi/psci.c
index a118e9d0c4ada1c73001109d013cd84eaf227c73..cd0d94462b182cb3bfe502d9b455f8ac37ab1c16 100644 (file)
--- a/arch/arm/cpu/armv7/sunxi/psci.c
+++ b/arch/arm/cpu/armv7/sunxi/psci.c
@@ -250,7 +250,7 @@ void __secure psci_cpu_off(void)
                wfi();
 }
 
-void __secure sunxi_gic_init(void)
+void __secure psci_arch_init(void)
 {
        u32 reg;
 
@@ -271,3 +271,8 @@ void __secure sunxi_gic_init(void)
        reg &= ~BIT(0); /* Secure mode */
        cp15_write_scr(reg);
 }
+
+/* dummy entry for end of psci text */
+void __secure psci_text_end(void)
+{
+}

diff --git a/arch/arm/cpu/armv7/sunxi/psci_head.S b/arch/arm/cpu/armv7/sunxi/psci_head.S
deleted file mode 100644 (file)
index e51db04..0000000
--- a/arch/arm/cpu/armv7/sunxi/psci_head.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2013 - ARM Ltd
- * Author: Marc Zyngier <marc.zyngier@arm.com>
- *
- * Based on code by Carl van Schaik <carl@ok-labs.com>.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <config.h>
-#include <linux/linkage.h>
-
-#include <asm/arch-armv7/generictimer.h>
-#include <asm/gic.h>
-#include <asm/macro.h>
-#include <asm/psci.h>
-#include <asm/arch/cpu.h>
-
-/*
- * Memory layout:
- *
- * SECURE_RAM to text_end :
- *     ._secure_text section
- * text_end to ALIGN_PAGE(text_end):
- *     nothing
- * ALIGN_PAGE(text_end) to ALIGN_PAGE(text_end) + 0x1000)
- *     1kB of stack per CPU (4 CPUs max).
- */
-
-       .pushsection ._secure.text, "ax"
-
-       .arch_extension sec
-
-#define        GICD_BASE               (SUNXI_GIC400_BASE +  0x1000)
-#define        GICC_BASE               (SUNXI_GIC400_BASE +  0x2000)
-
-ENTRY(psci_arch_init)
-       b       sunxi_gic_init
-ENDPROC(psci_arch_init)
-
-ENTRY(psci_text_end)
-       .popsection