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

refactor(sgi): move from "sgi" to "neoverse_rd"

Browse source 
Currently, reference design platforms such as RD-N2, RD-N1-Edge,
RD-V1-MC, RD-V1 and SGI-575 utilize "css/sgi" as the common source
directory. The "sgi" prefix originated from the System Guidance for
Infrastructure (SGI) and was initially associated with the SGI-575
platform. However, subsequent platforms released were under the Neoverse
Reference Design product name.

To align with the Neoverse Reference Design nomenclature, rename the
common source directory from "css/sgi" to "css/neoverse_rd" and update
all file prefixes from "sgi" to "nrd."

Signed-off-by: Rohit Mathew <Rohit.Mathew@arm.com>
Change-Id: I3dcbb31b9ab202e82caf25218ba33c520dcea4e4
This commit is contained in:
Rohit Mathew 2024-02-03 17:22:54 +00:00 • committed by Omkar Anand Kulkarni
parent 2d32517ce6
commit c669f65359
43 changed files with 129 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/about/maintainers.rst
View file

@ -524,7 +524,7 @@ Arm Reference Design platform ports
:|G|: `thomas-arm`_ :|G|: `thomas-arm`_
:|M|: Vijayenthiran Subramaniam <vijayenthiran.subramaniam@arm.com> :|M|: Vijayenthiran Subramaniam <vijayenthiran.subramaniam@arm.com>
:|G|: `vijayenthiran-arm`_ :|G|: `vijayenthiran-arm`_
:|F|: plat/arm/css/sgi/ :|F|: plat/arm/css/neoverse_rd/
:|F|: plat/arm/board/rdn1edge/ :|F|: plat/arm/board/rdn1edge/
:|F|: plat/arm/board/rdn2/ :|F|: plat/arm/board/rdn2/
:|F|: plat/arm/board/rdv1/ :|F|: plat/arm/board/rdv1/

6
plat/arm/board/rdn1edge/include/platform_def.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018-2022, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -9,8 +9,8 @@
#include <lib/utils_def.h> #include <lib/utils_def.h>
#include <sgi_sdei.h> #include <nrd_sdei.h>
#include <sgi_soc_platform_def.h> #include <nrd_soc_platform_def.h>
#define PLAT_ARM_CLUSTER_COUNT U(2) #define PLAT_ARM_CLUSTER_COUNT U(2)
#define CSS_SGI_MAX_CPUS_PER_CLUSTER U(4) #define CSS_SGI_MAX_CPUS_PER_CLUSTER U(4)

6
plat/arm/board/rdn1edge/platform.mk
View file

@ -1,5 +1,5 @@
# #
# Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved. # Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
# #
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
@ -9,7 +9,7 @@ $(warning Platform ${PLAT} is deprecated. Some of the features might not work as
# GIC-600 configuration # GIC-600 configuration
GICV3_IMPL_GIC600_MULTICHIP := 1 GICV3_IMPL_GIC600_MULTICHIP := 1
include plat/arm/css/sgi/sgi-common.mk include plat/arm/css/neoverse_rd/nrd-common.mk
RDN1EDGE_BASE = plat/arm/board/rdn1edge RDN1EDGE_BASE = plat/arm/board/rdn1edge
@ -17,7 +17,7 @@ PLAT_INCLUDES += -I${RDN1EDGE_BASE}/include/
SGI_CPU_SOURCES := lib/cpus/aarch64/neoverse_n1.S SGI_CPU_SOURCES := lib/cpus/aarch64/neoverse_n1.S
PLAT_BL_COMMON_SOURCES += ${CSS_ENT_BASE}/sgi_plat.c PLAT_BL_COMMON_SOURCES += ${CSS_ENT_BASE}/nrd_plat.c
BL1_SOURCES += ${SGI_CPU_SOURCES} \ BL1_SOURCES += ${SGI_CPU_SOURCES} \
${RDN1EDGE_BASE}/rdn1edge_err.c ${RDN1EDGE_BASE}/rdn1edge_err.c

5
plat/arm/board/rdn1edge/rdn1edge_plat.c
View file

@ -8,8 +8,9 @@
#include <drivers/arm/gic600_multichip.h> #include <drivers/arm/gic600_multichip.h>
#include <plat/arm/common/plat_arm.h> #include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h> #include <plat/common/platform.h>
#include <sgi_soc_platform_def.h>
#include <sgi_plat.h> #include <nrd_plat.h>
#include <nrd_soc_platform_def.h>
#if defined(IMAGE_BL31) #if defined(IMAGE_BL31)
static const mmap_region_t rdn1edge_dynamic_mmap[] = { static const mmap_region_t rdn1edge_dynamic_mmap[] = {

4
plat/arm/board/rdn1edge/rdn1edge_security.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2019-2021, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2019-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -7,7 +7,7 @@
#include <platform_def.h> #include <platform_def.h>
#include <common/debug.h> #include <common/debug.h>
#include <sgi_dmc620_tzc_regions.h> #include <nrd_dmc620_tzc_regions.h>
uintptr_t rdn1edge_dmc_base[] = { uintptr_t rdn1edge_dmc_base[] = {
RDN1EDGE_DMC620_BASE0, RDN1EDGE_DMC620_BASE0,

6
plat/arm/board/rdn2/include/platform_def.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2020-2023, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -8,8 +8,8 @@
#define PLATFORM_DEF_H #define PLATFORM_DEF_H
#include <lib/utils_def.h> #include <lib/utils_def.h>
#include <sgi_sdei.h> #include <nrd_sdei.h>
#include <sgi_soc_platform_def_v2.h> #include <nrd_soc_platform_def_v2.h>
#if (CSS_SGI_PLATFORM_VARIANT == 1) #if (CSS_SGI_PLATFORM_VARIANT == 1)
#define PLAT_ARM_CLUSTER_COUNT U(8) #define PLAT_ARM_CLUSTER_COUNT U(8)

4
plat/arm/board/rdn2/include/rdn2_ras.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2023, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2023-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -7,7 +7,7 @@
#ifndef RDN2_RAS_H #ifndef RDN2_RAS_H
#define RDN2_RAS_H #define RDN2_RAS_H
#include <sgi_ras.h> #include <nrd_ras.h>
extern struct plat_sgi_ras_config ras_config; extern struct plat_sgi_ras_config ras_config;

10
plat/arm/board/rdn2/platform.mk
View file

@ -28,7 +28,7 @@ endif
override CSS_SYSTEM_GRACEFUL_RESET := 1 override CSS_SYSTEM_GRACEFUL_RESET := 1
override EL3_EXCEPTION_HANDLING := 1 override EL3_EXCEPTION_HANDLING := 1
include plat/arm/css/sgi/sgi-common.mk include plat/arm/css/neoverse_rd/nrd-common.mk
RDN2_BASE = plat/arm/board/rdn2 RDN2_BASE = plat/arm/board/rdn2
@ -37,7 +37,7 @@ PLAT_INCLUDES += -I${RDN2_BASE}/include/
SGI_CPU_SOURCES := lib/cpus/aarch64/neoverse_n2.S \ SGI_CPU_SOURCES := lib/cpus/aarch64/neoverse_n2.S \
lib/cpus/aarch64/neoverse_v2.S lib/cpus/aarch64/neoverse_v2.S
PLAT_BL_COMMON_SOURCES += ${CSS_ENT_BASE}/sgi_plat_v2.c PLAT_BL_COMMON_SOURCES += ${CSS_ENT_BASE}/nrd_plat_v2.c
BL1_SOURCES += ${SGI_CPU_SOURCES} \ BL1_SOURCES += ${SGI_CPU_SOURCES} \
${RDN2_BASE}/rdn2_err.c ${RDN2_BASE}/rdn2_err.c
@ -71,9 +71,9 @@ endif
ifeq (${ENABLE_FEAT_RAS}-${HANDLE_EA_EL3_FIRST_NS},1-1) ifeq (${ENABLE_FEAT_RAS}-${HANDLE_EA_EL3_FIRST_NS},1-1)
BL31_SOURCES += ${RDN2_BASE}/rdn2_ras.c \ BL31_SOURCES += ${RDN2_BASE}/rdn2_ras.c \
${CSS_ENT_BASE}/ras/sgi_ras_common.c \ ${CSS_ENT_BASE}/ras/nrd_ras_common.c \
${CSS_ENT_BASE}/ras/sgi_ras_sram.c \ ${CSS_ENT_BASE}/ras/nrd_ras_sram.c \
${CSS_ENT_BASE}/ras/sgi_ras_cpu.c ${CSS_ENT_BASE}/ras/nrd_ras_cpu.c
endif endif
# Add the FDT_SOURCES and options for Dynamic Config # Add the FDT_SOURCES and options for Dynamic Config

7
plat/arm/board/rdn2/rdn2_plat.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2020-2023, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -9,9 +9,10 @@
#include <plat/arm/common/plat_arm.h> #include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h> #include <plat/common/platform.h>
#include <services/el3_spmc_ffa_memory.h> #include <services/el3_spmc_ffa_memory.h>
#include <nrd_plat.h>
#include <nrd_soc_platform_def_v2.h>
#include <rdn2_ras.h> #include <rdn2_ras.h>
#include <sgi_soc_platform_def_v2.h>
#include <sgi_plat.h>
#if defined(IMAGE_BL31) #if defined(IMAGE_BL31)
#if (CSS_SGI_PLATFORM_VARIANT == 2) #if (CSS_SGI_PLATFORM_VARIANT == 2)

7
plat/arm/board/rdn2/rdn2_ras.c
View file

@ -1,12 +1,13 @@
/* /*
* Copyright (c) 2023, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2023-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#include <platform_def.h> #include <platform_def.h>
#include <sgi_ras.h>
#include <sgi_sdei.h> #include <nrd_ras.h>
#include <nrd_sdei.h>
struct sgi_ras_ev_map plat_ras_map[] = { struct sgi_ras_ev_map plat_ras_map[] = {
/* Non Secure base RAM ECC CE interrupt */ /* Non Secure base RAM ECC CE interrupt */

4
plat/arm/board/rdv1/include/platform_def.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2020-2022, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -9,7 +9,7 @@
#include <lib/utils_def.h> #include <lib/utils_def.h>
#include <sgi_soc_platform_def.h> #include <nrd_soc_platform_def.h>
#define PLAT_ARM_CLUSTER_COUNT U(16) #define PLAT_ARM_CLUSTER_COUNT U(16)
#define CSS_SGI_MAX_CPUS_PER_CLUSTER U(1) #define CSS_SGI_MAX_CPUS_PER_CLUSTER U(1)

6
plat/arm/board/rdv1/platform.mk
View file

@ -1,4 +1,4 @@
# Copyright (c) 2020-2021, ARM Limited and Contributors. All rights reserved. # Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
# #
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
@ -6,7 +6,7 @@
# RD-V1 platform uses GIC-700 which is based on GICv4.1 # RD-V1 platform uses GIC-700 which is based on GICv4.1
GIC_ENABLE_V4_EXTN := 1 GIC_ENABLE_V4_EXTN := 1
include plat/arm/css/sgi/sgi-common.mk include plat/arm/css/neoverse_rd/nrd-common.mk
RDV1_BASE = plat/arm/board/rdv1 RDV1_BASE = plat/arm/board/rdv1
@ -14,7 +14,7 @@ PLAT_INCLUDES += -I${RDV1_BASE}/include/
SGI_CPU_SOURCES := lib/cpus/aarch64/neoverse_v1.S SGI_CPU_SOURCES := lib/cpus/aarch64/neoverse_v1.S
PLAT_BL_COMMON_SOURCES += ${CSS_ENT_BASE}/sgi_plat.c PLAT_BL_COMMON_SOURCES += ${CSS_ENT_BASE}/nrd_plat.c
BL1_SOURCES += ${SGI_CPU_SOURCES} \ BL1_SOURCES += ${SGI_CPU_SOURCES} \
${RDV1_BASE}/rdv1_err.c ${RDV1_BASE}/rdv1_err.c

5
plat/arm/board/rdv1/rdv1_plat.c
View file

@ -1,11 +1,12 @@
/* /*
* Copyright (c) 2020, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#include <plat/common/platform.h> #include <plat/common/platform.h>
#include <sgi_plat.h>
#include <nrd_plat.h>
unsigned int plat_arm_sgi_get_platform_id(void) unsigned int plat_arm_sgi_get_platform_id(void)
{ {

4
plat/arm/board/rdv1mc/include/platform_def.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2020-2022, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -8,7 +8,7 @@
#define PLATFORM_DEF_H #define PLATFORM_DEF_H
#include <lib/utils_def.h> #include <lib/utils_def.h>
#include <sgi_soc_platform_def.h> #include <nrd_soc_platform_def.h>
#define PLAT_ARM_CLUSTER_COUNT U(4) #define PLAT_ARM_CLUSTER_COUNT U(4)
#define CSS_SGI_MAX_CPUS_PER_CLUSTER U(1) #define CSS_SGI_MAX_CPUS_PER_CLUSTER U(1)

6
plat/arm/board/rdv1mc/platform.mk
View file

@ -1,4 +1,4 @@
# Copyright (c) 2020-2021, ARM Limited and Contributors. All rights reserved. # Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
# #
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
@ -7,7 +7,7 @@
GIC_ENABLE_V4_EXTN := 1 GIC_ENABLE_V4_EXTN := 1
GICV3_IMPL_GIC600_MULTICHIP := 1 GICV3_IMPL_GIC600_MULTICHIP := 1
include plat/arm/css/sgi/sgi-common.mk include plat/arm/css/neoverse_rd/nrd-common.mk
RDV1MC_BASE = plat/arm/board/rdv1mc RDV1MC_BASE = plat/arm/board/rdv1mc
@ -15,7 +15,7 @@ PLAT_INCLUDES += -I${RDV1MC_BASE}/include/
SGI_CPU_SOURCES := lib/cpus/aarch64/neoverse_v1.S SGI_CPU_SOURCES := lib/cpus/aarch64/neoverse_v1.S
PLAT_BL_COMMON_SOURCES += ${CSS_ENT_BASE}/sgi_plat.c PLAT_BL_COMMON_SOURCES += ${CSS_ENT_BASE}/nrd_plat.c
BL1_SOURCES += ${SGI_CPU_SOURCES} \ BL1_SOURCES += ${SGI_CPU_SOURCES} \
${RDV1MC_BASE}/rdv1mc_err.c ${RDV1MC_BASE}/rdv1mc_err.c

5
plat/arm/board/rdv1mc/rdv1mc_plat.c
View file

@ -8,8 +8,9 @@
#include <drivers/arm/gic600_multichip.h> #include <drivers/arm/gic600_multichip.h>
#include <plat/arm/common/plat_arm.h> #include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h> #include <plat/common/platform.h>
#include <sgi_soc_platform_def.h>
#include <sgi_plat.h> #include <nrd_plat.h>
#include <nrd_soc_platform_def.h>
#if defined(IMAGE_BL31) #if defined(IMAGE_BL31)
static const mmap_region_t rdv1mc_dynamic_mmap[] = { static const mmap_region_t rdv1mc_dynamic_mmap[] = {

5
plat/arm/board/rdv1mc/rdv1mc_topology.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2020, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -7,7 +7,8 @@
#include <common/debug.h> #include <common/debug.h>
#include <plat/arm/common/plat_arm.h> #include <plat/arm/common/plat_arm.h>
#include <plat/arm/css/common/css_pm.h> #include <plat/arm/css/common/css_pm.h>
#include <sgi_variant.h>
#include <nrd_variant.h>
/****************************************************************************** /******************************************************************************
* The power domain tree descriptor. * The power domain tree descriptor.

6
plat/arm/board/sgi575/include/platform_def.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018-2022, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -9,8 +9,8 @@
#include <lib/utils_def.h> #include <lib/utils_def.h>
#include <sgi_sdei.h> #include <nrd_sdei.h>
#include <sgi_soc_platform_def.h> #include <nrd_soc_platform_def.h>
#define PLAT_ARM_CLUSTER_COUNT U(2) #define PLAT_ARM_CLUSTER_COUNT U(2)
#define CSS_SGI_MAX_CPUS_PER_CLUSTER U(4) #define CSS_SGI_MAX_CPUS_PER_CLUSTER U(4)

6
plat/arm/board/sgi575/platform.mk
View file

@ -1,12 +1,12 @@
# #
# Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved. # Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
# #
# SPDX-License-Identifier: BSD-3-Clause # SPDX-License-Identifier: BSD-3-Clause
# #
$(warning Platform ${PLAT} is deprecated. Some of the features might not work as expected) $(warning Platform ${PLAT} is deprecated. Some of the features might not work as expected)
include plat/arm/css/sgi/sgi-common.mk include plat/arm/css/neoverse_rd/nrd-common.mk
SGI575_BASE = plat/arm/board/sgi575 SGI575_BASE = plat/arm/board/sgi575
@ -14,7 +14,7 @@ PLAT_INCLUDES += -I${SGI575_BASE}/include/
SGI_CPU_SOURCES := lib/cpus/aarch64/cortex_a75.S SGI_CPU_SOURCES := lib/cpus/aarch64/cortex_a75.S
PLAT_BL_COMMON_SOURCES += ${CSS_ENT_BASE}/sgi_plat.c PLAT_BL_COMMON_SOURCES += ${CSS_ENT_BASE}/nrd_plat.c
BL1_SOURCES += ${SGI_CPU_SOURCES} \ BL1_SOURCES += ${SGI_CPU_SOURCES} \
${SGI575_BASE}/sgi575_err.c ${SGI575_BASE}/sgi575_err.c

7
plat/arm/board/sgi575/sgi575_plat.c
View file

@ -1,12 +1,13 @@
/* /*
* Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#include <plat/common/platform.h> #include <plat/common/platform.h>
#include <sgi_plat.h>
#include <sgi_variant.h> #include <nrd_plat.h>
#include <nrd_variant.h>
unsigned int plat_arm_sgi_get_platform_id(void) unsigned int plat_arm_sgi_get_platform_id(void)
{ {

4
plat/arm/board/sgi575/sgi575_security.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018-2021, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -7,7 +7,7 @@
#include <platform_def.h> #include <platform_def.h>
#include <common/debug.h> #include <common/debug.h>
#include <sgi_dmc620_tzc_regions.h> #include <nrd_dmc620_tzc_regions.h>
uintptr_t sgi575_dmc_base[] = { uintptr_t sgi575_dmc_base[] = {
SGI575_DMC620_BASE0, SGI575_DMC620_BASE0,

2
plat/arm/css/sgi/aarch64/sgi_helper.S → plat/arm/css/neoverse_rd/aarch64/nrd_helper.S
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */

6
plat/arm/css/sgi/include/sgi_base_platform_def.h → plat/arm/css/neoverse_rd/include/nrd_base_platform_def.h
View file

@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#ifndef SGI_BASE_PLATFORM_DEF_H #ifndef NRD_BASE_PLATFORM_DEF_H
#define SGI_BASE_PLATFORM_DEF_H #define NRD_BASE_PLATFORM_DEF_H
#include <lib/utils_def.h> #include <lib/utils_def.h>
#include <lib/xlat_tables/xlat_tables_defs.h> #include <lib/xlat_tables/xlat_tables_defs.h>
@ -303,4 +303,4 @@
/* SDS ID for unusable CPU MPID list structure */ /* SDS ID for unusable CPU MPID list structure */
#define SDS_ISOLATED_CPU_LIST_ID U(128) #define SDS_ISOLATED_CPU_LIST_ID U(128)
#endif /* SGI_BASE_PLATFORM_DEF_H */ #endif /* NRD_BASE_PLATFORM_DEF_H */

8
plat/arm/css/sgi/include/sgi_dmc620_tzc_regions.h → plat/arm/css/neoverse_rd/include/nrd_dmc620_tzc_regions.h
View file

@ -1,11 +1,11 @@
/* /*
* Copyright (c) 2021, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2021-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#ifndef SGI_DMC620_TZC_REGIONS_H #ifndef NRD_DMC620_TZC_REGIONS_H
#define SGI_DMC620_TZC_REGIONS_H #define NRD_DMC620_TZC_REGIONS_H
#include <drivers/arm/tzc_dmc620.h> #include <drivers/arm/tzc_dmc620.h>
@ -33,4 +33,4 @@
} }
#endif /* SPM_MM */ #endif /* SPM_MM */
#endif /* SGI_DMC620_TZC_REGIONS_H */ #endif /* NRD_DMC620_TZC_REGIONS_H */

8
plat/arm/css/sgi/include/sgi_plat.h → plat/arm/css/neoverse_rd/include/nrd_plat.h
View file

@ -1,13 +1,13 @@
/* /*
* Copyright (c) 2020, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#ifndef SGI_PLAT_H #ifndef NRD_PLAT_H
#define SGI_PLAT_H #define NRD_PLAT_H
/* BL31 platform setup common to all SGI based platforms */ /* BL31 platform setup common to all SGI based platforms */
void sgi_bl31_common_platform_setup(void); void sgi_bl31_common_platform_setup(void);
#endif /* SGI_PLAT_H */ #endif /* NRD_PLAT_H */

8
plat/arm/css/sgi/include/sgi_ras.h → plat/arm/css/neoverse_rd/include/nrd_ras.h
View file

@ -1,11 +1,11 @@
/* /*
* Copyright (c) 2018-2023, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#ifndef SGI_RAS_H #ifndef NRD_RAS_H
#define SGI_RAS_H #define NRD_RAS_H
#include <lib/extensions/ras.h> #include <lib/extensions/ras.h>
#include <plat/common/platform.h> #include <plat/common/platform.h>
@ -65,4 +65,4 @@ int sgi_ras_cpu_intr_handler(const struct err_record_info *err_rec,
int probe_data, int probe_data,
const struct err_handler_data *const data); const struct err_handler_data *const data);
#endif /* SGI_RAS_H */ #endif /* NRD_RAS_H */

8
plat/arm/css/sgi/include/sgi_sdei.h → plat/arm/css/neoverse_rd/include/nrd_sdei.h
View file

@ -1,11 +1,11 @@
/* /*
* Copyright (c) 2021, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2021-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#ifndef SGI_SDEI_H #ifndef NRD_SDEI_H
#define SGI_SDEI_H #define NRD_SDEI_H
#if SDEI_SUPPORT #if SDEI_SUPPORT
@ -22,4 +22,4 @@
#endif /* SDEI_SUPPORT */ #endif /* SDEI_SUPPORT */
#endif /* SGI_SDEI_H */ #endif /* NRD_SDEI_H */

8
plat/arm/css/sgi/include/sgi_soc_css_def.h → plat/arm/css/neoverse_rd/include/nrd_soc_css_def.h
View file

@ -1,11 +1,11 @@
/* /*
* Copyright (c) 2022, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2022-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#ifndef SGI_SOC_CSS_DEF_H #ifndef NRD_SOC_CSS_DEF_H
#define SGI_SOC_CSS_DEF_H #define NRD_SOC_CSS_DEF_H
#include <lib/utils_def.h> #include <lib/utils_def.h>
#include <plat/arm/board/common/v2m_def.h> #include <plat/arm/board/common/v2m_def.h>
@ -44,4 +44,4 @@
#define PLAT_ARM_NVM_BASE V2M_FLASH0_BASE #define PLAT_ARM_NVM_BASE V2M_FLASH0_BASE
#define PLAT_ARM_NVM_SIZE (V2M_FLASH0_SIZE - V2M_FLASH_BLOCK_SIZE) #define PLAT_ARM_NVM_SIZE (V2M_FLASH0_SIZE - V2M_FLASH_BLOCK_SIZE)
#endif /* SGI_SOC_CSS_DEF_H */ #endif /* NRD_SOC_CSS_DEF_H */

8
plat/arm/css/sgi/include/sgi_soc_css_def_v2.h → plat/arm/css/neoverse_rd/include/nrd_soc_css_def_v2.h
View file

@ -1,11 +1,11 @@
/* /*
* Copyright (c) 2021-2022, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2021-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#ifndef SGI_SOC_CSS_DEF_V2_H #ifndef NRD_SOC_CSS_DEF_V2_H
#define SGI_SOC_CSS_DEF_V2_H #define NRD_SOC_CSS_DEF_V2_H
#include <lib/utils_def.h> #include <lib/utils_def.h>
#include <plat/common/common_def.h> #include <plat/common/common_def.h>
@ -204,4 +204,4 @@
#define PLAT_ARM_NVM_BASE V2M_FLASH0_BASE #define PLAT_ARM_NVM_BASE V2M_FLASH0_BASE
#define PLAT_ARM_NVM_SIZE (V2M_FLASH0_SIZE - V2M_FLASH_BLOCK_SIZE) #define PLAT_ARM_NVM_SIZE (V2M_FLASH0_SIZE - V2M_FLASH_BLOCK_SIZE)
#endif /* SGI_SOC_CSS_DEF_V2_H */ #endif /* NRD_SOC_CSS_DEF_V2_H */

13
plat/arm/css/sgi/include/sgi_soc_platform_def.h → plat/arm/css/neoverse_rd/include/nrd_soc_platform_def.h
View file

@ -1,16 +1,17 @@
/* /*
* Copyright (c) 2020-2022, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#ifndef SGI_SOC_PLATFORM_DEF_H #ifndef NRD_SOC_PLATFORM_DEF_H
#define SGI_SOC_PLATFORM_DEF_H #define NRD_SOC_PLATFORM_DEF_H
#include <plat/arm/board/common/v2m_def.h> #include <plat/arm/board/common/v2m_def.h>
#include <plat/arm/soc/common/soc_css_def.h> #include <plat/arm/soc/common/soc_css_def.h>
#include <sgi_base_platform_def.h>
#include <sgi_soc_css_def.h> #include <nrd_base_platform_def.h>
#include <nrd_soc_css_def.h>
/* Map the System registers to access from S-EL0 */ /* Map the System registers to access from S-EL0 */
#define CSS_SYSTEMREG_DEVICE_BASE (0x1C010000) #define CSS_SYSTEMREG_DEVICE_BASE (0x1C010000)
@ -30,4 +31,4 @@
(MT_DEVICE | MT_RW | \ (MT_DEVICE | MT_RW | \
MT_SECURE | MT_USER)) MT_SECURE | MT_USER))
#endif /* SGI_SOC_PLATFORM_DEF_H */ #endif /* NRD_SOC_PLATFORM_DEF_H */

12
plat/arm/css/sgi/include/sgi_soc_platform_def_v2.h → plat/arm/css/neoverse_rd/include/nrd_soc_platform_def_v2.h
View file

@ -1,14 +1,14 @@
/* /*
* Copyright (c) 2020-2021, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#ifndef SGI_SOC_PLATFORM_DEF_V2_H #ifndef NRD_SOC_PLATFORM_DEF_V2_H
#define SGI_SOC_PLATFORM_DEF_V2_H #define NRD_SOC_PLATFORM_DEF_V2_H
#include <sgi_base_platform_def.h> #include <nrd_base_platform_def.h>
#include <sgi_soc_css_def_v2.h> #include <nrd_soc_css_def_v2.h>
/* Map the System registers to access from S-EL0 */ /* Map the System registers to access from S-EL0 */
#define CSS_SYSTEMREG_DEVICE_BASE (0x0C010000) #define CSS_SYSTEMREG_DEVICE_BASE (0x0C010000)
@ -28,4 +28,4 @@
(MT_DEVICE | MT_RW | \ (MT_DEVICE | MT_RW | \
MT_SECURE | MT_USER)) MT_SECURE | MT_USER))
#endif /* SGI_SOC_PLATFORM_DEF_V2_H */ #endif /* NRD_SOC_PLATFORM_DEF_V2_H */

8
plat/arm/css/sgi/include/sgi_variant.h → plat/arm/css/neoverse_rd/include/nrd_variant.h
View file

@ -1,11 +1,11 @@
/* /*
* Copyright (c) 2018-2023, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#ifndef SGI_VARIANT_H #ifndef NRD_VARIANT_H
#define SGI_VARIANT_H #define NRD_VARIANT_H
/* SSC_VERSION values for SGI575 */ /* SSC_VERSION values for SGI575 */
#define SGI575_SSC_VER_PART_NUM 0x0783 #define SGI575_SSC_VER_PART_NUM 0x0783
@ -47,4 +47,4 @@ unsigned int plat_arm_sgi_get_config_id(void);
/* returns true if operating in multi-chip configuration */ /* returns true if operating in multi-chip configuration */
unsigned int plat_arm_sgi_get_multi_chip_mode(void); unsigned int plat_arm_sgi_get_multi_chip_mode(void);
#endif /* SGI_VARIANT_H */ #endif /* NRD_VARIANT_H */

2
plat/arm/css/sgi/include/plat_macros.S → plat/arm/css/neoverse_rd/include/plat_macros.S
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */

12
plat/arm/css/sgi/sgi-common.mk → plat/arm/css/neoverse_rd/nrd-common.mk
View file

@ -6,7 +6,7 @@
CSS_USE_SCMI_SDS_DRIVER := 1 CSS_USE_SCMI_SDS_DRIVER := 1
CSS_ENT_BASE := plat/arm/css/sgi CSS_ENT_BASE := plat/arm/css/neoverse_rd
ENABLE_FEAT_RAS := 1 ENABLE_FEAT_RAS := 1
@ -25,7 +25,7 @@ ENABLE_SVE_FOR_NS := 0
CTX_INCLUDE_FPREGS := 1 CTX_INCLUDE_FPREGS := 1
INTERCONNECT_SOURCES := ${CSS_ENT_BASE}/sgi_interconnect.c INTERCONNECT_SOURCES := ${CSS_ENT_BASE}/nrd_interconnect.c
PLAT_INCLUDES += -I${CSS_ENT_BASE}/include PLAT_INCLUDES += -I${CSS_ENT_BASE}/include
@ -39,18 +39,18 @@ ENT_GIC_SOURCES := ${GICV3_SOURCES} \
plat/common/plat_gicv3.c \ plat/common/plat_gicv3.c \
plat/arm/common/arm_gicv3.c plat/arm/common/arm_gicv3.c
PLAT_BL_COMMON_SOURCES += ${CSS_ENT_BASE}/aarch64/sgi_helper.S PLAT_BL_COMMON_SOURCES += ${CSS_ENT_BASE}/aarch64/nrd_helper.S
BL1_SOURCES += ${INTERCONNECT_SOURCES} \ BL1_SOURCES += ${INTERCONNECT_SOURCES} \
drivers/arm/sbsa/sbsa.c drivers/arm/sbsa/sbsa.c
BL2_SOURCES += ${CSS_ENT_BASE}/sgi_image_load.c \ BL2_SOURCES += ${CSS_ENT_BASE}/nrd_image_load.c \
drivers/arm/css/sds/sds.c drivers/arm/css/sds/sds.c
BL31_SOURCES += ${INTERCONNECT_SOURCES} \ BL31_SOURCES += ${INTERCONNECT_SOURCES} \
${ENT_GIC_SOURCES} \ ${ENT_GIC_SOURCES} \
${CSS_ENT_BASE}/sgi_bl31_setup.c \ ${CSS_ENT_BASE}/nrd_bl31_setup.c \
${CSS_ENT_BASE}/sgi_topology.c \ ${CSS_ENT_BASE}/nrd_topology.c \
drivers/delay_timer/generic_delay_timer.c drivers/delay_timer/generic_delay_timer.c
ifneq (${RESET_TO_BL31},0) ifneq (${RESET_TO_BL31},0)

8
plat/arm/css/sgi/sgi_bl31_setup.c → plat/arm/css/neoverse_rd/nrd_bl31_setup.c
View file

@ -14,13 +14,11 @@
#include <drivers/arm/css/scmi.h> #include <drivers/arm/css/scmi.h>
#include <drivers/generic_delay_timer.h> #include <drivers/generic_delay_timer.h>
#include <plat/arm/common/plat_arm.h> #include <plat/arm/common/plat_arm.h>
#include <plat/arm/css/common/css_pm.h>
#include <plat/common/platform.h> #include <plat/common/platform.h>
#include <plat/arm/css/common/css_pm.h> #include <nrd_ras.h>
#include <nrd_variant.h>
#include <sgi_ras.h>
#include <sgi_variant.h>
sgi_platform_info_t sgi_plat_info; sgi_platform_info_t sgi_plat_info;

6
plat/arm/css/sgi/sgi_image_load.c → plat/arm/css/neoverse_rd/nrd_image_load.c
View file

@ -12,10 +12,10 @@
#include <drivers/arm/css/sds.h> #include <drivers/arm/css/sds.h>
#include <plat/arm/common/plat_arm.h> #include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h> #include <plat/common/platform.h>
#include <platform_def.h> #include <platform_def.h>
#include <sgi_base_platform_def.h>
#include <sgi_variant.h> #include <nrd_base_platform_def.h>
#include <nrd_variant.h>
/* /*
* Information about the isolated CPUs obtained from SDS. * Information about the isolated CPUs obtained from SDS.

2
plat/arm/css/sgi/sgi_interconnect.c → plat/arm/css/neoverse_rd/nrd_interconnect.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */

3
plat/arm/css/sgi/sgi_plat.c → plat/arm/css/neoverse_rd/nrd_plat.c
View file

@ -16,7 +16,8 @@
#include <plat/arm/common/plat_arm.h> #include <plat/arm/common/plat_arm.h>
#include <plat/common/platform.h> #include <plat/common/platform.h>
#include <drivers/arm/sbsa.h> #include <drivers/arm/sbsa.h>
#include <sgi_base_platform_def.h>
#include <nrd_base_platform_def.h>
#if SPM_MM #if SPM_MM
#include <services/spm_mm_partition.h> #include <services/spm_mm_partition.h>

0
plat/arm/css/sgi/sgi_plat_v2.c → plat/arm/css/neoverse_rd/nrd_plat_v2.c
View file

2
plat/arm/css/sgi/sgi_topology.c → plat/arm/css/neoverse_rd/nrd_topology.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018-2020, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */

4
plat/arm/css/sgi/ras/sgi_ras_common.c → plat/arm/css/neoverse_rd/ras/nrd_ras_common.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018-2023, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -11,7 +11,7 @@
#include <plat/common/platform.h> #include <plat/common/platform.h>
#include <platform_def.h> #include <platform_def.h>
#include <sgi_ras.h> #include <nrd_ras.h>
static struct plat_sgi_ras_config *sgi_ras_config; static struct plat_sgi_ras_config *sgi_ras_config;

4
plat/arm/css/sgi/ras/sgi_ras_cpu.c → plat/arm/css/neoverse_rd/ras/nrd_ras_cpu.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2023, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2023-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -14,7 +14,7 @@
#include <services/sdei.h> #include <services/sdei.h>
#include <services/spm_mm_svc.h> #include <services/spm_mm_svc.h>
#include <sgi_ras.h> #include <nrd_ras.h>
#define CPU_CONTEXT_REG_GPR_ARR_SIZE 32 #define CPU_CONTEXT_REG_GPR_ARR_SIZE 32
#define CPU_CONTEXT_REG_EL1_ARR_SIZE 17 #define CPU_CONTEXT_REG_EL1_ARR_SIZE 17

4
plat/arm/css/sgi/ras/sgi_ras_sram.c → plat/arm/css/neoverse_rd/ras/nrd_ras_sram.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2023, ARM Limited and Contributors. All rights reserved. * Copyright (c) 2023-2024, Arm Limited and Contributors. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -11,7 +11,7 @@
#include <services/spm_mm_svc.h> #include <services/spm_mm_svc.h>
#include <platform_def.h> #include <platform_def.h>
#include <sgi_ras.h> #include <nrd_ras.h>
/* Base Element RAM Error Record offsets. */ /* Base Element RAM Error Record offsets. */
#define ERRSTATUS U(0) #define ERRSTATUS U(0)