Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-16 01:24:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: rename hunter_elp to cortex-x4

Browse source 
Rename hunter_elp to cortex-x4

Change-Id: I78c8c009d7bee14b4793dc1d950ed81273216831
Signed-off-by: Govindraj Raja <govindraj.raja@arm.com>
This commit is contained in:
Govindraj Raja 2023-06-23 11:09:31 -05:00
parent 448d4d97aa
commit 870fcb9495
5 changed files with 66 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
include/lib/cpus/aarch64/cortex_hunter_elp_arm.h
View file

@ -1,26 +0,0 @@
/*
* Copyright (c) 2022, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef CORTEX_HUNTER_ELP_ARM_H
#define CORTEX_HUNTER_ELP_ARM_H
#define CORTEX_HUNTER_ELP_ARM_MIDR U(0x410FD821)
/* Cortex Hunter ELP loop count for CVE-2022-23960 mitigation */
#define CORTEX_HUNTER_ELP_ARM_BHB_LOOP_COUNT U(132)
/*******************************************************************************
* CPU Extended Control register specific definitions
******************************************************************************/
#define CORTEX_HUNTER_ELP_ARM_CPUECTLR_EL1 S3_0_C15_C1_4
/*******************************************************************************
* CPU Power Control register specific definitions
******************************************************************************/
#define CORTEX_HUNTER_ELP_ARM_CPUPWRCTLR_EL1 S3_0_C15_C2_7
#define CORTEX_HUNTER_ELP_ARM_CPUPWRCTLR_EL1_CORE_PWRDN_BIT U(1)
#endif /* CORTEX_HUNTER_ELP_ARM_H */

26
include/lib/cpus/aarch64/cortex_x4.h Normal file
View file

@ -0,0 +1,26 @@
/*
* Copyright (c) 2022-2023, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef CORTEX_X4_H
#define CORTEX_X4_H
#define CORTEX_X4_MIDR U(0x410FD821)
/* Cortex X4 loop count for CVE-2022-23960 mitigation */
#define CORTEX_X4_BHB_LOOP_COUNT U(132)
/*******************************************************************************
* CPU Extended Control register specific definitions
******************************************************************************/
#define CORTEX_X4_CPUECTLR_EL1 S3_0_C15_C1_4
/*******************************************************************************
* CPU Power Control register specific definitions
******************************************************************************/
#define CORTEX_X4_CPUPWRCTLR_EL1 S3_0_C15_C2_7
#define CORTEX_X4_CPUPWRCTLR_EL1_CORE_PWRDN_BIT U(1)
#endif /* CORTEX_X4_H */

56
lib/cpus/aarch64/cortex_hunter_elp_arm.S → lib/cpus/aarch64/cortex_x4.S
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, Arm Limited. All rights reserved.
* Copyright (c) 2022-2023, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -7,23 +7,23 @@
#include <arch.h>
#include <asm_macros.S>
#include <common/bl_common.h>
#include <cortex_hunter_elp_arm.h>
#include <cortex_x4.h>
#include <cpu_macros.S>
#include <plat_macros.S>
#include "wa_cve_2022_23960_bhb_vector.S"
/* Hardware handled coherency */
#if HW_ASSISTED_COHERENCY == 0
#error "Cortex Hunter ELP must be compiled with HW_ASSISTED_COHERENCY enabled"
#error "Cortex X4 must be compiled with HW_ASSISTED_COHERENCY enabled"
#endif
/* 64-bit only core */
#if CTX_INCLUDE_AARCH32_REGS == 1
#error "Cortex Hunter ELP supports only AArch64. Compile with CTX_INCLUDE_AARCH32_REGS=0"
#error "Cortex X4 supports only AArch64. Compile with CTX_INCLUDE_AARCH32_REGS=0"
#endif
#if WORKAROUND_CVE_2022_23960
wa_cve_2022_23960_bhb_vector_table CORTEX_HUNTER_ELP_ARM_BHB_LOOP_COUNT, cortex_hunter_elp_arm
wa_cve_2022_23960_bhb_vector_table CORTEX_X4_BHB_LOOP_COUNT, cortex_x4
#endif /* WORKAROUND_CVE_2022_23960 */
func check_errata_cve_2022_23960
@ -35,44 +35,44 @@ func check_errata_cve_2022_23960
ret
endfunc check_errata_cve_2022_23960
func cortex_hunter_elp_arm_reset_func
func cortex_x4_reset_func
/* Disable speculative loads */
msr SSBS, xzr
#if IMAGE_BL31 && WORKAROUND_CVE_2022_23960
/*
* The Cortex Hunter ELP generic vectors are overridden to apply errata
* The Cortex X4 generic vectors are overridden to apply errata
* mitigation on exception entry from lower ELs.
*/
adr x0, wa_cve_vbar_cortex_hunter_elp_arm
adr x0, wa_cve_vbar_cortex_x4
msr vbar_el3, x0
#endif /* IMAGE_BL31 && WORKAROUND_CVE_2022_23960 */
isb
ret
endfunc cortex_hunter_elp_arm_reset_func
endfunc cortex_x4_reset_func
/* ----------------------------------------------------
* HW will do the cache maintenance while powering down
* ----------------------------------------------------
*/
func cortex_hunter_elp_arm_core_pwr_dwn
func cortex_x4_core_pwr_dwn
/* ---------------------------------------------------
* Enable CPU power down bit in power control register
* ---------------------------------------------------
*/
mrs x0, CORTEX_HUNTER_ELP_ARM_CPUPWRCTLR_EL1
orr x0, x0, #CORTEX_HUNTER_ELP_ARM_CPUPWRCTLR_EL1_CORE_PWRDN_BIT
msr CORTEX_HUNTER_ELP_ARM_CPUPWRCTLR_EL1, x0
mrs x0, CORTEX_X4_CPUPWRCTLR_EL1
orr x0, x0, #CORTEX_X4_CPUPWRCTLR_EL1_CORE_PWRDN_BIT
msr CORTEX_X4_CPUPWRCTLR_EL1, x0
isb
ret
endfunc cortex_hunter_elp_arm_core_pwr_dwn
endfunc cortex_x4_core_pwr_dwn
#if REPORT_ERRATA
/*
* Errata printing function for Cortex Hunter ELP. Must follow AAPCS.
* Errata printing function for Cortex X4. Must follow AAPCS.
*/
func cortex_hunter_elp_arm_errata_report
func cortex_x4_errata_report
stp x8, x30, [sp, #-16]!
bl cpu_get_rev_var
@ -82,15 +82,15 @@ func cortex_hunter_elp_arm_errata_report
* Report all errata. The revision-variant information is passed to
* checking functions of each errata.
*/
report_errata WORKAROUND_CVE_2022_23960, cortex_hunter_elp_arm, cve_2022_23960
report_errata WORKAROUND_CVE_2022_23960, cortex_x4, cve_2022_23960
ldp x8, x30, [sp], #16
ret
endfunc cortex_hunter_elp_arm_errata_report
endfunc cortex_x4_errata_report
#endif
/* ---------------------------------------------
* This function provides Cortex Hunter ELP-specific
* This function provides Cortex X4-specific
* register information for crash reporting.
* It needs to return with x6 pointing to
* a list of register names in ascii and
@ -98,16 +98,16 @@ endfunc cortex_hunter_elp_arm_errata_report
* reported.
* ---------------------------------------------
*/
.section .rodata.cortex_hunter_elp_arm_regs, "aS"
cortex_hunter_elp_arm_regs: /* The ascii list of register names to be reported */
.section .rodata.cortex_x4_regs, "aS"
cortex_x4_regs: /* The ascii list of register names to be reported */
.asciz "cpuectlr_el1", ""
func cortex_hunter_elp_arm_cpu_reg_dump
adr x6, cortex_hunter_elp_arm_regs
mrs x8, CORTEX_HUNTER_ELP_ARM_CPUECTLR_EL1
func cortex_x4_cpu_reg_dump
adr x6, cortex_x4_regs
mrs x8, CORTEX_X4_CPUECTLR_EL1
ret
endfunc cortex_hunter_elp_arm_cpu_reg_dump
endfunc cortex_x4_cpu_reg_dump
declare_cpu_ops cortex_hunter_elp_arm, CORTEX_HUNTER_ELP_ARM_MIDR, \
cortex_hunter_elp_arm_reset_func, \
cortex_hunter_elp_arm_core_pwr_dwn
declare_cpu_ops cortex_x4, CORTEX_X4_MIDR, \
cortex_x4_reset_func, \
cortex_x4_core_pwr_dwn

22
plat/arm/board/arm_fpga/platform.mk
View file

@ -58,18 +58,18 @@ ifeq (${HW_ASSISTED_COHERENCY}, 0)
lib/cpus/aarch64/cortex_a73.S
else
# AArch64-only cores
FPGA_CPU_LIBS +=lib/cpus/aarch64/cortex_a510.S \
lib/cpus/aarch64/cortex_a710.S \
lib/cpus/aarch64/cortex_a715.S \
lib/cpus/aarch64/cortex_x3.S \
FPGA_CPU_LIBS += lib/cpus/aarch64/cortex_a510.S \
lib/cpus/aarch64/cortex_a710.S \
lib/cpus/aarch64/cortex_a715.S \
lib/cpus/aarch64/cortex_x3.S \
lib/cpus/aarch64/cortex_x4.S \
lib/cpus/aarch64/neoverse_n_common.S \
lib/cpus/aarch64/neoverse_n1.S \
lib/cpus/aarch64/neoverse_n2.S \
lib/cpus/aarch64/neoverse_v1.S \
lib/cpus/aarch64/cortex_hayes.S \
lib/cpus/aarch64/cortex_hunter.S \
lib/cpus/aarch64/cortex_hunter_elp_arm.S \
lib/cpus/aarch64/cortex_chaberton.S \
lib/cpus/aarch64/neoverse_n1.S \
lib/cpus/aarch64/neoverse_n2.S \
lib/cpus/aarch64/neoverse_v1.S \
lib/cpus/aarch64/cortex_hayes.S \
lib/cpus/aarch64/cortex_hunter.S \
lib/cpus/aarch64/cortex_chaberton.S \
lib/cpus/aarch64/cortex_blackhawk.S
# AArch64/AArch32 cores

2
plat/arm/board/tc/platform.mk
View file

@ -80,7 +80,7 @@ endif
ifeq (${TARGET_PLATFORM}, 2)
TC_CPU_SOURCES += lib/cpus/aarch64/cortex_hayes.S \
lib/cpus/aarch64/cortex_hunter.S \
lib/cpus/aarch64/cortex_hunter_elp_arm.S
lib/cpus/aarch64/cortex_x4.S
endif
INTERCONNECT_SOURCES := ${TC_BASE}/tc_interconnect.c