feat(cpu): add support for Hunter CPU

This patch adds the basic CPU library code to support the Hunter CPU
in TF-A. This CPU is based on the Makalu core so that library code
was adapted as the basis for this patch.

Signed-off-by: John Powell <john.powell@arm.com>
Change-Id: I956b2dc0f43da7cec3e015252392e2694363e1b3
This commit is contained in:
johpow01 2021-08-19 16:51:26 -05:00 committed by John
parent 0a712819f2
commit fb9e5f7bb7
3 changed files with 102 additions and 1 deletions

View File

@ -0,0 +1,23 @@
/*
* Copyright (c) 2021, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#ifndef CORTEX_HUNTER_H
#define CORTEX_HUNTER_H
#define CORTEX_HUNTER_MIDR U(0x410FD810)
/*******************************************************************************
* CPU Extended Control register specific definitions
******************************************************************************/
#define CORTEX_HUNTER_CPUECTLR_EL1 S3_0_C15_C1_4
/*******************************************************************************
* CPU Power Control register specific definitions
******************************************************************************/
#define CORTEX_HUNTER_CPUPWRCTLR_EL1 S3_0_C15_C2_7
#define CORTEX_HUNTER_CPUPWRCTLR_EL1_CORE_PWRDN_BIT U(1)
#endif /* CORTEX_HUNTER_H */

View File

@ -0,0 +1,77 @@
/*
* Copyright (c) 2021, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <arch.h>
#include <asm_macros.S>
#include <common/bl_common.h>
#include <cortex_hunter.h>
#include <cpu_macros.S>
#include <plat_macros.S>
/* Hardware handled coherency */
#if HW_ASSISTED_COHERENCY == 0
#error "Cortex Hunter must be compiled with HW_ASSISTED_COHERENCY enabled"
#endif
/* 64-bit only core */
#if CTX_INCLUDE_AARCH32_REGS == 1
#error "Cortex Hunter supports only AArch64. Compile with CTX_INCLUDE_AARCH32_REGS=0"
#endif
func cortex_hunter_reset_func
/* Disable speculative loads */
msr SSBS, xzr
isb
ret
endfunc cortex_hunter_reset_func
/* ----------------------------------------------------
* HW will do the cache maintenance while powering down
* ----------------------------------------------------
*/
func cortex_hunter_core_pwr_dwn
/* ---------------------------------------------------
* Enable CPU power down bit in power control register
* ---------------------------------------------------
*/
mrs x0, CORTEX_HUNTER_CPUPWRCTLR_EL1
orr x0, x0, #CORTEX_HUNTER_CPUPWRCTLR_EL1_CORE_PWRDN_BIT
msr CORTEX_HUNTER_CPUPWRCTLR_EL1, x0
isb
ret
endfunc cortex_hunter_core_pwr_dwn
#if REPORT_ERRATA
/*
* Errata printing function for Cortex Hunter. Must follow AAPCS.
*/
func cortex_hunter_errata_report
ret
endfunc cortex_hunter_errata_report
#endif
/* ---------------------------------------------
* This function provides Cortex Hunter-specific
* register information for crash reporting.
* It needs to return with x6 pointing to
* a list of register names in ascii and
* x8 - x15 having values of registers to be
* reported.
* ---------------------------------------------
*/
.section .rodata.cortex_hunter_regs, "aS"
cortex_hunter_regs: /* The ascii list of register names to be reported */
.asciz "cpuectlr_el1", ""
func cortex_hunter_cpu_reg_dump
adr x6, cortex_hunter_regs
mrs x8, CORTEX_HUNTER_CPUECTLR_EL1
ret
endfunc cortex_hunter_cpu_reg_dump
declare_cpu_ops cortex_hunter, CORTEX_HUNTER_MIDR, \
cortex_hunter_reset_func, \
cortex_hunter_core_pwr_dwn

View File

@ -139,7 +139,8 @@ else
lib/cpus/aarch64/cortex_a65.S \
lib/cpus/aarch64/cortex_a65ae.S \
lib/cpus/aarch64/cortex_a78c.S \
lib/cpus/aarch64/cortex_hayes.S
lib/cpus/aarch64/cortex_hayes.S \
lib/cpus/aarch64/cortex_hunter.S
endif
# AArch64/AArch32 cores
FVP_CPU_LIBS += lib/cpus/aarch64/cortex_a55.S \