diff options
| author | johpow01 <john.powell@arm.com> | 2021-04-20 17:05:04 -0500 |
|---|---|---|
| committer | johpow01 <john.powell@arm.com> | 2021-04-20 17:14:31 -0500 |
| commit | 97bc7f0dcc398dd45f5fe2c979aa74a7999d6681 (patch) | |
| tree | e8a62f42eb5c188314d1c83296ad91286e6d03db /lib | |
| parent | 38b7c9c651c304bed9eea47905fc3072fb2af24e (diff) | |
| download | arm-trusted-firmware-97bc7f0dcc398dd45f5fe2c979aa74a7999d6681.tar.gz | |
Add "_arm" suffix to Makalu ELP CPU lib
ELP processors can sometimes have different MIDR values or features so
we are adding the "_arm" suffix to differentiate the reference
implementation from other future versions.
Signed-off-by: John Powell <john.powell@arm.com>
Change-Id: Ieea444288587c7c18a397d279ee4b22b7ad79e20
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/cpus/aarch64/cortex_makalu_elp_arm.S (renamed from lib/cpus/aarch64/cortex_makalu_elp.S) | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/lib/cpus/aarch64/cortex_makalu_elp.S b/lib/cpus/aarch64/cortex_makalu_elp_arm.S index e3a3e9de8..fbbf20501 100644 --- a/lib/cpus/aarch64/cortex_makalu_elp.S +++ b/lib/cpus/aarch64/cortex_makalu_elp_arm.S @@ -7,7 +7,7 @@ #include <arch.h> #include <asm_macros.S> #include <common/bl_common.h> -#include <cortex_makalu_elp.h> +#include <cortex_makalu_elp_arm.h> #include <cpu_macros.S> #include <plat_macros.S> @@ -25,33 +25,33 @@ * HW will do the cache maintenance while powering down * ---------------------------------------------------- */ -func cortex_makalu_elp_core_pwr_dwn +func cortex_makalu_elp_arm_core_pwr_dwn /* --------------------------------------------------- * Enable CPU power down bit in power control register * --------------------------------------------------- */ - mrs x0, CORTEX_MAKALU_ELP_CPUPWRCTLR_EL1 - orr x0, x0, #CORTEX_MAKALU_ELP_CPUPWRCTLR_EL1_CORE_PWRDN_BIT - msr CORTEX_MAKALU_ELP_CPUPWRCTLR_EL1, x0 + mrs x0, CORTEX_MAKALU_ELP_ARM_CPUPWRCTLR_EL1 + orr x0, x0, #CORTEX_MAKALU_ELP_ARM_CPUPWRCTLR_EL1_CORE_PWRDN_BIT + msr CORTEX_MAKALU_ELP_ARM_CPUPWRCTLR_EL1, x0 isb ret -endfunc cortex_makalu_elp_core_pwr_dwn +endfunc cortex_makalu_elp_arm_core_pwr_dwn #if REPORT_ERRATA /* * Errata printing function for Cortex Makalu ELP. Must follow AAPCS. */ -func cortex_makalu_elp_errata_report +func cortex_makalu_elp_arm_errata_report ret -endfunc cortex_makalu_elp_errata_report +endfunc cortex_makalu_elp_arm_errata_report #endif -func cortex_makalu_elp_reset_func +func cortex_makalu_elp_arm_reset_func /* Disable speculative loads */ msr SSBS, xzr isb ret -endfunc cortex_makalu_elp_reset_func +endfunc cortex_makalu_elp_arm_reset_func /* --------------------------------------------- * This function provides Cortex Makalu ELP- @@ -62,16 +62,16 @@ endfunc cortex_makalu_elp_reset_func * reported. * --------------------------------------------- */ -.section .rodata.cortex_makalu_elp_regs, "aS" -cortex_makalu_elp_regs: /* The ascii list of register names to be reported */ +.section .rodata.cortex_makalu_elp_arm_regs, "aS" +cortex_makalu_elp_arm_regs: /* The ascii list of register names to be reported */ .asciz "cpuectlr_el1", "" -func cortex_makalu_elp_cpu_reg_dump - adr x6, cortex_makalu_elp_regs - mrs x8, CORTEX_MAKALU_ELP_CPUECTLR_EL1 +func cortex_makalu_elp_arm_cpu_reg_dump + adr x6, cortex_makalu_elp_arm_regs + mrs x8, CORTEX_MAKALU_ELP_ARM_CPUECTLR_EL1 ret -endfunc cortex_makalu_elp_cpu_reg_dump +endfunc cortex_makalu_elp_arm_cpu_reg_dump -declare_cpu_ops cortex_makalu_elp, CORTEX_MAKALU_ELP_MIDR, \ - cortex_makalu_elp_reset_func, \ - cortex_makalu_elp_core_pwr_dwn +declare_cpu_ops cortex_makalu_elp_arm, CORTEX_MAKALU_ELP_ARM_MIDR, \ + cortex_makalu_elp_arm_reset_func, \ + cortex_makalu_elp_arm_core_pwr_dwn |