rockchip: move pmusram assembler code to a aarch64 subdir

The current code doing power-management from sram is highly
arm64-specific so should live in a corresponding subdirectory
and not in the common area.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Change-Id: I3b79ac26f70fd189d4d930faa6251439a644c5d9

diff --git a/plat/rockchip/common/aarch64/pmu_sram_cpus_on.S b/plat/rockchip/common/aarch64/pmu_sram_cpus_on.S
new file mode 100644 (file)
index 0000000..d91ee0e
--- /dev/null
+++ b/plat/rockchip/common/aarch64/pmu_sram_cpus_on.S
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2016, ARM Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <arch.h>
+#include <asm_macros.S>
+#include <platform_def.h>
+
+       .globl pmu_cpuson_entrypoint
+       .macro pmusram_entry_func _name
+       .section .pmusram.entry, "ax"
+       .type \_name, %function
+       .cfi_startproc
+       \_name:
+       .endm
+
+pmusram_entry_func pmu_cpuson_entrypoint
+
+#if PSRAM_CHECK_WAKEUP_CPU
+check_wake_cpus:
+       mrs     x0, MPIDR_EL1
+       and     x1, x0, #MPIDR_CPU_MASK
+       and     x0, x0, #MPIDR_CLUSTER_MASK
+       orr     x0, x0, x1
+
+       /* primary_cpu */
+       ldr     w1, boot_mpidr
+       cmp     w0, w1
+       b.eq    sys_wakeup
+
+       /*
+        * If the core is not the primary cpu,
+        * force the core into wfe.
+        */
+wfe_loop:
+       wfe
+       b       wfe_loop
+sys_wakeup:
+#endif
+
+#if PSRAM_DO_DDR_RESUME
+ddr_resume:
+       ldr     x2, =__bl31_sram_stack_end
+       mov     sp, x2
+       bl      dmc_resume
+#endif
+       bl      sram_restore
+sys_resume:
+       bl      bl31_warm_entrypoint
+endfunc pmu_cpuson_entrypoint

diff --git a/plat/rockchip/common/pmusram/pmu_sram_cpus_on.S b/plat/rockchip/common/pmusram/pmu_sram_cpus_on.S
deleted file mode 100644 (file)
index d91ee0e..0000000
--- a/plat/rockchip/common/pmusram/pmu_sram_cpus_on.S
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2016, ARM Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <arch.h>
-#include <asm_macros.S>
-#include <platform_def.h>
-
-       .globl pmu_cpuson_entrypoint
-       .macro pmusram_entry_func _name
-       .section .pmusram.entry, "ax"
-       .type \_name, %function
-       .cfi_startproc
-       \_name:
-       .endm
-
-pmusram_entry_func pmu_cpuson_entrypoint
-
-#if PSRAM_CHECK_WAKEUP_CPU
-check_wake_cpus:
-       mrs     x0, MPIDR_EL1
-       and     x1, x0, #MPIDR_CPU_MASK
-       and     x0, x0, #MPIDR_CLUSTER_MASK
-       orr     x0, x0, x1
-
-       /* primary_cpu */
-       ldr     w1, boot_mpidr
-       cmp     w0, w1
-       b.eq    sys_wakeup
-
-       /*
-        * If the core is not the primary cpu,
-        * force the core into wfe.
-        */
-wfe_loop:
-       wfe
-       b       wfe_loop
-sys_wakeup:
-#endif
-
-#if PSRAM_DO_DDR_RESUME
-ddr_resume:
-       ldr     x2, =__bl31_sram_stack_end
-       mov     sp, x2
-       bl      dmc_resume
-#endif
-       bl      sram_restore
-sys_resume:
-       bl      bl31_warm_entrypoint
-endfunc pmu_cpuson_entrypoint

diff --git a/plat/rockchip/rk3328/platform.mk b/plat/rockchip/rk3328/platform.mk
index 18b1b9419ba08246c0dcc147c0b659abcf987bf7..ce8693a5cfd33dab49892319752db50602dc7d32 100644 (file)
--- a/plat/rockchip/rk3328/platform.mk
+++ b/plat/rockchip/rk3328/platform.mk
@@ -14,7 +14,7 @@ PLAT_INCLUDES         :=      -Idrivers/arm/gic/common/                       \
                                -Idrivers/arm/gic/v2/                   \
                                -I${RK_PLAT_COMMON}/                            \
                                -I${RK_PLAT_COMMON}/include/                    \
-                               -I${RK_PLAT_COMMON}/pmusram                     \
+                               -I${RK_PLAT_COMMON}/aarch64/                    \
                                -I${RK_PLAT_COMMON}/drivers/pmu/                \
                                -I${RK_PLAT_COMMON}/drivers/parameter/          \
                                -I${RK_PLAT_SOC}/                               \
@@ -44,7 +44,7 @@ BL31_SOURCES          +=      ${RK_GIC_SOURCES}                               \
                                ${RK_PLAT_COMMON}/drivers/parameter/ddr_parameter.c     \
                                ${RK_PLAT_COMMON}/aarch64/plat_helpers.S        \
                                ${RK_PLAT_COMMON}/bl31_plat_setup.c             \
-                               ${RK_PLAT_COMMON}/pmusram/pmu_sram_cpus_on.S    \
+                               ${RK_PLAT_COMMON}/aarch64/pmu_sram_cpus_on.S    \
                                ${RK_PLAT_COMMON}/plat_pm.c                     \
                                ${RK_PLAT_COMMON}/plat_topology.c               \
                                ${RK_PLAT_COMMON}/aarch64/platform_common.c     \

diff --git a/plat/rockchip/rk3368/platform.mk b/plat/rockchip/rk3368/platform.mk
index d1315fc580a19e5f4798d3042d6ba67004820cb4..8988dc503553b3aef64f11d1acb4a8d47d5c56f1 100644 (file)
--- a/plat/rockchip/rk3368/platform.mk
+++ b/plat/rockchip/rk3368/platform.mk
@@ -12,7 +12,7 @@ include lib/libfdt/libfdt.mk
 
 PLAT_INCLUDES          :=      -I${RK_PLAT_COMMON}/                            \
                                -I${RK_PLAT_COMMON}/include/                    \
-                               -I${RK_PLAT_COMMON}/pmusram                     \
+                               -I${RK_PLAT_COMMON}/aarch64/                    \
                                -I${RK_PLAT_COMMON}/drivers/pmu/                        \
                                -I${RK_PLAT_SOC}/                               \
                                -I${RK_PLAT_SOC}/drivers/pmu/                   \
@@ -41,7 +41,7 @@ BL31_SOURCES          +=      ${RK_GIC_SOURCES}                               \
                                ${RK_PLAT_COMMON}/aarch64/plat_helpers.S        \
                                ${RK_PLAT_COMMON}/bl31_plat_setup.c             \
                                ${RK_PLAT_COMMON}/params_setup.c                \
-                               ${RK_PLAT_COMMON}/pmusram/pmu_sram_cpus_on.S            \
+                               ${RK_PLAT_COMMON}/aarch64/pmu_sram_cpus_on.S    \
                                ${RK_PLAT_COMMON}/plat_pm.c                     \
                                ${RK_PLAT_COMMON}/plat_topology.c               \
                                ${RK_PLAT_COMMON}/aarch64/platform_common.c     \

diff --git a/plat/rockchip/rk3399/platform.mk b/plat/rockchip/rk3399/platform.mk
index 101359856d3934769814fa2617f678e369709835..3dfafc90b0d77558ec45ca8ddd7c7c6a4546589b 100644 (file)
--- a/plat/rockchip/rk3399/platform.mk
+++ b/plat/rockchip/rk3399/platform.mk
@@ -12,7 +12,7 @@ include lib/libfdt/libfdt.mk
 
 PLAT_INCLUDES          :=      -I${RK_PLAT_COMMON}/                    \
                                -I${RK_PLAT_COMMON}/include/            \
-                               -I${RK_PLAT_COMMON}/pmusram             \
+                               -I${RK_PLAT_COMMON}/aarch64/            \
                                -I${RK_PLAT_COMMON}/drivers/pmu/        \
                                -I${RK_PLAT_SOC}/                       \
                                -I${RK_PLAT_SOC}/drivers/pmu/           \
@@ -49,7 +49,7 @@ BL31_SOURCES  +=      ${RK_GIC_SOURCES}                               \
                        ${RK_PLAT_COMMON}/aarch64/plat_helpers.S        \
                        ${RK_PLAT_COMMON}/bl31_plat_setup.c             \
                        ${RK_PLAT_COMMON}/params_setup.c                \
-                       ${RK_PLAT_COMMON}/pmusram/pmu_sram_cpus_on.S    \
+                       ${RK_PLAT_COMMON}/aarch64/pmu_sram_cpus_on.S    \
                        ${RK_PLAT_COMMON}/plat_pm.c                     \
                        ${RK_PLAT_COMMON}/plat_topology.c               \
                        ${RK_PLAT_COMMON}/aarch64/platform_common.c     \