diff options
| author | johpow01 <john.powell@arm.com> | 2021-10-15 12:02:36 -0500 |
|---|---|---|
| committer | John <john.powell@arm.com> | 2021-10-21 20:12:28 +0200 |
| commit | 4cb576a0c5bd2e7669606996a9f79602596df07c (patch) | |
| tree | 38c3bff629ebddb4203d52d90ee4f47e851f9dd5 /lib/cpus | |
| parent | 65da2f2af735b1336c78e6a3d398c3d53544db3d (diff) | |
| download | arm-trusted-firmware-4cb576a0c5bd2e7669606996a9f79602596df07c.tar.gz | |
fix(cpu): correct Demeter CPU name
This patch changes Cortex Demeter to Neoverse Demeter.
Signed-off-by: John Powell <john.powell@arm.com>
Change-Id: I7306d09ca60e101d0a96c9ceff9845422d75c160
Diffstat (limited to 'lib/cpus')
| -rw-r--r-- | lib/cpus/aarch64/neoverse_demeter.S (renamed from lib/cpus/aarch64/cortex_demeter.S) | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/lib/cpus/aarch64/cortex_demeter.S b/lib/cpus/aarch64/neoverse_demeter.S index 9ad8b86fd..f43c18b6b 100644 --- a/lib/cpus/aarch64/cortex_demeter.S +++ b/lib/cpus/aarch64/neoverse_demeter.S @@ -7,54 +7,54 @@ #include <arch.h> #include <asm_macros.S> #include <common/bl_common.h> -#include <cortex_demeter.h> +#include <neoverse_demeter.h> #include <cpu_macros.S> #include <plat_macros.S> /* Hardware handled coherency */ #if HW_ASSISTED_COHERENCY == 0 -#error "Cortex Demeter must be compiled with HW_ASSISTED_COHERENCY enabled" +#error "Neoverse Demeter must be compiled with HW_ASSISTED_COHERENCY enabled" #endif /* 64-bit only core */ #if CTX_INCLUDE_AARCH32_REGS == 1 -#error "Cortex Demeter supports only AArch64. Compile with CTX_INCLUDE_AARCH32_REGS=0" +#error "Neoverse Demeter supports only AArch64. Compile with CTX_INCLUDE_AARCH32_REGS=0" #endif /* ---------------------------------------------------- * HW will do the cache maintenance while powering down * ---------------------------------------------------- */ -func cortex_demeter_core_pwr_dwn +func neoverse_demeter_core_pwr_dwn /* --------------------------------------------------- * Enable CPU power down bit in power control register * --------------------------------------------------- */ - mrs x0, CORTEX_DEMETER_CPUPWRCTLR_EL1 - orr x0, x0, #CORTEX_DEMETER_CPUPWRCTLR_EL1_CORE_PWRDN_BIT - msr CORTEX_DEMETER_CPUPWRCTLR_EL1, x0 + mrs x0, NEOVERSE_DEMETER_CPUPWRCTLR_EL1 + orr x0, x0, #NEOVERSE_DEMETER_CPUPWRCTLR_EL1_CORE_PWRDN_BIT + msr NEOVERSE_DEMETER_CPUPWRCTLR_EL1, x0 isb ret -endfunc cortex_demeter_core_pwr_dwn +endfunc neoverse_demeter_core_pwr_dwn #if REPORT_ERRATA /* - * Errata printing function for Cortex Demeter. Must follow AAPCS. + * Errata printing function for Neoverse Demeter. Must follow AAPCS. */ -func cortex_demeter_errata_report +func neoverse_demeter_errata_report ret -endfunc cortex_demeter_errata_report +endfunc neoverse_demeter_errata_report #endif -func cortex_demeter_reset_func +func neoverse_demeter_reset_func /* Disable speculative loads */ msr SSBS, xzr isb ret -endfunc cortex_demeter_reset_func +endfunc neoverse_demeter_reset_func /* --------------------------------------------- - * This function provides Cortex Demeter- + * This function provides Neoverse Demeter- * specific register information for crash * reporting. It needs to return with x6 * pointing to a list of register names in ascii @@ -62,16 +62,16 @@ endfunc cortex_demeter_reset_func * reported. * --------------------------------------------- */ -.section .rodata.cortex_demeter_regs, "aS" -cortex_demeter_regs: /* The ascii list of register names to be reported */ +.section .rodata.neoverse_demeter_regs, "aS" +neoverse_demeter_regs: /* The ascii list of register names to be reported */ .asciz "cpuectlr_el1", "" -func cortex_demeter_cpu_reg_dump - adr x6, cortex_demeter_regs - mrs x8, CORTEX_DEMETER_CPUECTLR_EL1 +func neoverse_demeter_cpu_reg_dump + adr x6, neoverse_demeter_regs + mrs x8, NEOVERSE_DEMETER_CPUECTLR_EL1 ret -endfunc cortex_demeter_cpu_reg_dump +endfunc neoverse_demeter_cpu_reg_dump -declare_cpu_ops cortex_demeter, CORTEX_DEMETER_MIDR, \ - cortex_demeter_reset_func, \ - cortex_demeter_core_pwr_dwn +declare_cpu_ops neoverse_demeter, NEOVERSE_DEMETER_MIDR, \ + neoverse_demeter_reset_func, \ + neoverse_demeter_core_pwr_dwn |