diff --git a/docs/about/maintainers.rst b/docs/about/maintainers.rst index fed2a5cca..37640842c 100644 --- a/docs/about/maintainers.rst +++ b/docs/about/maintainers.rst @@ -524,7 +524,7 @@ Arm Reference Design platform ports :|G|: `thomas-arm`_ :|M|: Vijayenthiran Subramaniam :|G|: `vijayenthiran-arm`_ -:|F|: plat/arm/css/sgi/ +:|F|: plat/arm/css/neoverse_rd/ :|F|: plat/arm/board/rdn1edge/ :|F|: plat/arm/board/rdn2/ :|F|: plat/arm/board/rdv1/ diff --git a/plat/arm/board/rdn1edge/include/platform_def.h b/plat/arm/board/rdn1edge/include/platform_def.h index 21d8ee09a..e17005ca5 100644 --- a/plat/arm/board/rdn1edge/include/platform_def.h +++ b/plat/arm/board/rdn1edge/include/platform_def.h @@ -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 */ @@ -9,8 +9,8 @@ #include -#include -#include +#include +#include #define PLAT_ARM_CLUSTER_COUNT U(2) #define CSS_SGI_MAX_CPUS_PER_CLUSTER U(4) diff --git a/plat/arm/board/rdn1edge/platform.mk b/plat/arm/board/rdn1edge/platform.mk index d8d12937a..b440ae093 100644 --- a/plat/arm/board/rdn1edge/platform.mk +++ b/plat/arm/board/rdn1edge/platform.mk @@ -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 # @@ -9,7 +9,7 @@ $(warning Platform ${PLAT} is deprecated. Some of the features might not work as # GIC-600 configuration 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 @@ -17,7 +17,7 @@ PLAT_INCLUDES += -I${RDN1EDGE_BASE}/include/ 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} \ ${RDN1EDGE_BASE}/rdn1edge_err.c diff --git a/plat/arm/board/rdn1edge/rdn1edge_plat.c b/plat/arm/board/rdn1edge/rdn1edge_plat.c index 9a875356f..9130751df 100644 --- a/plat/arm/board/rdn1edge/rdn1edge_plat.c +++ b/plat/arm/board/rdn1edge/rdn1edge_plat.c @@ -8,8 +8,9 @@ #include #include #include -#include -#include + +#include +#include #if defined(IMAGE_BL31) static const mmap_region_t rdn1edge_dynamic_mmap[] = { diff --git a/plat/arm/board/rdn1edge/rdn1edge_security.c b/plat/arm/board/rdn1edge/rdn1edge_security.c index 49435329b..959daea84 100644 --- a/plat/arm/board/rdn1edge/rdn1edge_security.c +++ b/plat/arm/board/rdn1edge/rdn1edge_security.c @@ -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 */ @@ -7,7 +7,7 @@ #include #include -#include +#include uintptr_t rdn1edge_dmc_base[] = { RDN1EDGE_DMC620_BASE0, diff --git a/plat/arm/board/rdn2/include/platform_def.h b/plat/arm/board/rdn2/include/platform_def.h index 2391b7254..c8f6ffbc6 100644 --- a/plat/arm/board/rdn2/include/platform_def.h +++ b/plat/arm/board/rdn2/include/platform_def.h @@ -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 */ @@ -8,8 +8,8 @@ #define PLATFORM_DEF_H #include -#include -#include +#include +#include #if (CSS_SGI_PLATFORM_VARIANT == 1) #define PLAT_ARM_CLUSTER_COUNT U(8) diff --git a/plat/arm/board/rdn2/include/rdn2_ras.h b/plat/arm/board/rdn2/include/rdn2_ras.h index 1d9af609c..7a97ea330 100644 --- a/plat/arm/board/rdn2/include/rdn2_ras.h +++ b/plat/arm/board/rdn2/include/rdn2_ras.h @@ -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 */ @@ -7,7 +7,7 @@ #ifndef RDN2_RAS_H #define RDN2_RAS_H -#include +#include extern struct plat_sgi_ras_config ras_config; diff --git a/plat/arm/board/rdn2/platform.mk b/plat/arm/board/rdn2/platform.mk index 30402a882..6476899db 100644 --- a/plat/arm/board/rdn2/platform.mk +++ b/plat/arm/board/rdn2/platform.mk @@ -28,7 +28,7 @@ endif override CSS_SYSTEM_GRACEFUL_RESET := 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 @@ -37,7 +37,7 @@ PLAT_INCLUDES += -I${RDN2_BASE}/include/ SGI_CPU_SOURCES := lib/cpus/aarch64/neoverse_n2.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} \ ${RDN2_BASE}/rdn2_err.c @@ -71,9 +71,9 @@ endif ifeq (${ENABLE_FEAT_RAS}-${HANDLE_EA_EL3_FIRST_NS},1-1) BL31_SOURCES += ${RDN2_BASE}/rdn2_ras.c \ - ${CSS_ENT_BASE}/ras/sgi_ras_common.c \ - ${CSS_ENT_BASE}/ras/sgi_ras_sram.c \ - ${CSS_ENT_BASE}/ras/sgi_ras_cpu.c + ${CSS_ENT_BASE}/ras/nrd_ras_common.c \ + ${CSS_ENT_BASE}/ras/nrd_ras_sram.c \ + ${CSS_ENT_BASE}/ras/nrd_ras_cpu.c endif # Add the FDT_SOURCES and options for Dynamic Config diff --git a/plat/arm/board/rdn2/rdn2_plat.c b/plat/arm/board/rdn2/rdn2_plat.c index 2a6c658bc..e369e36f2 100644 --- a/plat/arm/board/rdn2/rdn2_plat.c +++ b/plat/arm/board/rdn2/rdn2_plat.c @@ -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 */ @@ -9,9 +9,10 @@ #include #include #include + +#include +#include #include -#include -#include #if defined(IMAGE_BL31) #if (CSS_SGI_PLATFORM_VARIANT == 2) diff --git a/plat/arm/board/rdn2/rdn2_ras.c b/plat/arm/board/rdn2/rdn2_ras.c index 3aed58e94..680e83bcc 100644 --- a/plat/arm/board/rdn2/rdn2_ras.c +++ b/plat/arm/board/rdn2/rdn2_ras.c @@ -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 */ #include -#include -#include + +#include +#include struct sgi_ras_ev_map plat_ras_map[] = { /* Non Secure base RAM ECC CE interrupt */ diff --git a/plat/arm/board/rdv1/include/platform_def.h b/plat/arm/board/rdv1/include/platform_def.h index 620fa3e2d..7eca2bdf3 100644 --- a/plat/arm/board/rdv1/include/platform_def.h +++ b/plat/arm/board/rdv1/include/platform_def.h @@ -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 */ @@ -9,7 +9,7 @@ #include -#include +#include #define PLAT_ARM_CLUSTER_COUNT U(16) #define CSS_SGI_MAX_CPUS_PER_CLUSTER U(1) diff --git a/plat/arm/board/rdv1/platform.mk b/plat/arm/board/rdv1/platform.mk index 0b059b5e8..9858e3127 100644 --- a/plat/arm/board/rdv1/platform.mk +++ b/plat/arm/board/rdv1/platform.mk @@ -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 # @@ -6,7 +6,7 @@ # RD-V1 platform uses GIC-700 which is based on GICv4.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 @@ -14,7 +14,7 @@ PLAT_INCLUDES += -I${RDV1_BASE}/include/ 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} \ ${RDV1_BASE}/rdv1_err.c diff --git a/plat/arm/board/rdv1/rdv1_plat.c b/plat/arm/board/rdv1/rdv1_plat.c index ab5251e51..181d84a06 100644 --- a/plat/arm/board/rdv1/rdv1_plat.c +++ b/plat/arm/board/rdv1/rdv1_plat.c @@ -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 */ #include -#include + +#include unsigned int plat_arm_sgi_get_platform_id(void) { diff --git a/plat/arm/board/rdv1mc/include/platform_def.h b/plat/arm/board/rdv1mc/include/platform_def.h index cd13d6e37..7863cc033 100644 --- a/plat/arm/board/rdv1mc/include/platform_def.h +++ b/plat/arm/board/rdv1mc/include/platform_def.h @@ -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 */ @@ -8,7 +8,7 @@ #define PLATFORM_DEF_H #include -#include +#include #define PLAT_ARM_CLUSTER_COUNT U(4) #define CSS_SGI_MAX_CPUS_PER_CLUSTER U(1) diff --git a/plat/arm/board/rdv1mc/platform.mk b/plat/arm/board/rdv1mc/platform.mk index 176e0efff..a4d807d8a 100644 --- a/plat/arm/board/rdv1mc/platform.mk +++ b/plat/arm/board/rdv1mc/platform.mk @@ -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 # @@ -7,7 +7,7 @@ GIC_ENABLE_V4_EXTN := 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 @@ -15,7 +15,7 @@ PLAT_INCLUDES += -I${RDV1MC_BASE}/include/ 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} \ ${RDV1MC_BASE}/rdv1mc_err.c diff --git a/plat/arm/board/rdv1mc/rdv1mc_plat.c b/plat/arm/board/rdv1mc/rdv1mc_plat.c index 5ef977847..91181457e 100644 --- a/plat/arm/board/rdv1mc/rdv1mc_plat.c +++ b/plat/arm/board/rdv1mc/rdv1mc_plat.c @@ -8,8 +8,9 @@ #include #include #include -#include -#include + +#include +#include #if defined(IMAGE_BL31) static const mmap_region_t rdv1mc_dynamic_mmap[] = { diff --git a/plat/arm/board/rdv1mc/rdv1mc_topology.c b/plat/arm/board/rdv1mc/rdv1mc_topology.c index 4486e5cfa..63e69be56 100644 --- a/plat/arm/board/rdv1mc/rdv1mc_topology.c +++ b/plat/arm/board/rdv1mc/rdv1mc_topology.c @@ -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 */ @@ -7,7 +7,8 @@ #include #include #include -#include + +#include /****************************************************************************** * The power domain tree descriptor. diff --git a/plat/arm/board/sgi575/include/platform_def.h b/plat/arm/board/sgi575/include/platform_def.h index 82a38c549..7cc536625 100644 --- a/plat/arm/board/sgi575/include/platform_def.h +++ b/plat/arm/board/sgi575/include/platform_def.h @@ -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 */ @@ -9,8 +9,8 @@ #include -#include -#include +#include +#include #define PLAT_ARM_CLUSTER_COUNT U(2) #define CSS_SGI_MAX_CPUS_PER_CLUSTER U(4) diff --git a/plat/arm/board/sgi575/platform.mk b/plat/arm/board/sgi575/platform.mk index 2f2bf73b4..2a03b1d0f 100644 --- a/plat/arm/board/sgi575/platform.mk +++ b/plat/arm/board/sgi575/platform.mk @@ -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 # $(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 @@ -14,7 +14,7 @@ PLAT_INCLUDES += -I${SGI575_BASE}/include/ 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} \ ${SGI575_BASE}/sgi575_err.c diff --git a/plat/arm/board/sgi575/sgi575_plat.c b/plat/arm/board/sgi575/sgi575_plat.c index dc294e6a8..85ac6525e 100644 --- a/plat/arm/board/sgi575/sgi575_plat.c +++ b/plat/arm/board/sgi575/sgi575_plat.c @@ -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 */ #include -#include -#include + +#include +#include unsigned int plat_arm_sgi_get_platform_id(void) { diff --git a/plat/arm/board/sgi575/sgi575_security.c b/plat/arm/board/sgi575/sgi575_security.c index 17d07d1a1..00b49e257 100644 --- a/plat/arm/board/sgi575/sgi575_security.c +++ b/plat/arm/board/sgi575/sgi575_security.c @@ -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 */ @@ -7,7 +7,7 @@ #include #include -#include +#include uintptr_t sgi575_dmc_base[] = { SGI575_DMC620_BASE0, diff --git a/plat/arm/css/sgi/aarch64/sgi_helper.S b/plat/arm/css/neoverse_rd/aarch64/nrd_helper.S similarity index 97% rename from plat/arm/css/sgi/aarch64/sgi_helper.S rename to plat/arm/css/neoverse_rd/aarch64/nrd_helper.S index ced59e8dd..14c3a7cb0 100644 --- a/plat/arm/css/sgi/aarch64/sgi_helper.S +++ b/plat/arm/css/neoverse_rd/aarch64/nrd_helper.S @@ -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 */ diff --git a/plat/arm/css/sgi/include/sgi_base_platform_def.h b/plat/arm/css/neoverse_rd/include/nrd_base_platform_def.h similarity index 99% rename from plat/arm/css/sgi/include/sgi_base_platform_def.h rename to plat/arm/css/neoverse_rd/include/nrd_base_platform_def.h index 2126a8663..619f706db 100644 --- a/plat/arm/css/sgi/include/sgi_base_platform_def.h +++ b/plat/arm/css/neoverse_rd/include/nrd_base_platform_def.h @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef SGI_BASE_PLATFORM_DEF_H -#define SGI_BASE_PLATFORM_DEF_H +#ifndef NRD_BASE_PLATFORM_DEF_H +#define NRD_BASE_PLATFORM_DEF_H #include #include @@ -303,4 +303,4 @@ /* SDS ID for unusable CPU MPID list structure */ #define SDS_ISOLATED_CPU_LIST_ID U(128) -#endif /* SGI_BASE_PLATFORM_DEF_H */ +#endif /* NRD_BASE_PLATFORM_DEF_H */ diff --git a/plat/arm/css/sgi/include/sgi_dmc620_tzc_regions.h b/plat/arm/css/neoverse_rd/include/nrd_dmc620_tzc_regions.h similarity index 81% rename from plat/arm/css/sgi/include/sgi_dmc620_tzc_regions.h rename to plat/arm/css/neoverse_rd/include/nrd_dmc620_tzc_regions.h index e93916318..a38c75979 100644 --- a/plat/arm/css/sgi/include/sgi_dmc620_tzc_regions.h +++ b/plat/arm/css/neoverse_rd/include/nrd_dmc620_tzc_regions.h @@ -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 */ -#ifndef SGI_DMC620_TZC_REGIONS_H -#define SGI_DMC620_TZC_REGIONS_H +#ifndef NRD_DMC620_TZC_REGIONS_H +#define NRD_DMC620_TZC_REGIONS_H #include @@ -33,4 +33,4 @@ } #endif /* SPM_MM */ -#endif /* SGI_DMC620_TZC_REGIONS_H */ +#endif /* NRD_DMC620_TZC_REGIONS_H */ diff --git a/plat/arm/css/sgi/include/sgi_plat.h b/plat/arm/css/neoverse_rd/include/nrd_plat.h similarity index 52% rename from plat/arm/css/sgi/include/sgi_plat.h rename to plat/arm/css/neoverse_rd/include/nrd_plat.h index a5fbded3c..d5bfb60f8 100644 --- a/plat/arm/css/sgi/include/sgi_plat.h +++ b/plat/arm/css/neoverse_rd/include/nrd_plat.h @@ -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 */ -#ifndef SGI_PLAT_H -#define SGI_PLAT_H +#ifndef NRD_PLAT_H +#define NRD_PLAT_H /* BL31 platform setup common to all SGI based platforms */ void sgi_bl31_common_platform_setup(void); -#endif /* SGI_PLAT_H */ +#endif /* NRD_PLAT_H */ diff --git a/plat/arm/css/sgi/include/sgi_ras.h b/plat/arm/css/neoverse_rd/include/nrd_ras.h similarity index 93% rename from plat/arm/css/sgi/include/sgi_ras.h rename to plat/arm/css/neoverse_rd/include/nrd_ras.h index d311807e3..e5c3f2c3e 100644 --- a/plat/arm/css/sgi/include/sgi_ras.h +++ b/plat/arm/css/neoverse_rd/include/nrd_ras.h @@ -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 */ -#ifndef SGI_RAS_H -#define SGI_RAS_H +#ifndef NRD_RAS_H +#define NRD_RAS_H #include #include @@ -65,4 +65,4 @@ int sgi_ras_cpu_intr_handler(const struct err_record_info *err_rec, int probe_data, const struct err_handler_data *const data); -#endif /* SGI_RAS_H */ +#endif /* NRD_RAS_H */ diff --git a/plat/arm/css/sgi/include/sgi_sdei.h b/plat/arm/css/neoverse_rd/include/nrd_sdei.h similarity index 77% rename from plat/arm/css/sgi/include/sgi_sdei.h rename to plat/arm/css/neoverse_rd/include/nrd_sdei.h index f380122bb..81bd51343 100644 --- a/plat/arm/css/sgi/include/sgi_sdei.h +++ b/plat/arm/css/neoverse_rd/include/nrd_sdei.h @@ -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 */ -#ifndef SGI_SDEI_H -#define SGI_SDEI_H +#ifndef NRD_SDEI_H +#define NRD_SDEI_H #if SDEI_SUPPORT @@ -22,4 +22,4 @@ #endif /* SDEI_SUPPORT */ -#endif /* SGI_SDEI_H */ +#endif /* NRD_SDEI_H */ diff --git a/plat/arm/css/sgi/include/sgi_soc_css_def.h b/plat/arm/css/neoverse_rd/include/nrd_soc_css_def.h similarity index 87% rename from plat/arm/css/sgi/include/sgi_soc_css_def.h rename to plat/arm/css/neoverse_rd/include/nrd_soc_css_def.h index f78b45a28..7c1f5ae0d 100644 --- a/plat/arm/css/sgi/include/sgi_soc_css_def.h +++ b/plat/arm/css/neoverse_rd/include/nrd_soc_css_def.h @@ -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 */ -#ifndef SGI_SOC_CSS_DEF_H -#define SGI_SOC_CSS_DEF_H +#ifndef NRD_SOC_CSS_DEF_H +#define NRD_SOC_CSS_DEF_H #include #include @@ -44,4 +44,4 @@ #define PLAT_ARM_NVM_BASE V2M_FLASH0_BASE #define PLAT_ARM_NVM_SIZE (V2M_FLASH0_SIZE - V2M_FLASH_BLOCK_SIZE) -#endif /* SGI_SOC_CSS_DEF_H */ +#endif /* NRD_SOC_CSS_DEF_H */ diff --git a/plat/arm/css/sgi/include/sgi_soc_css_def_v2.h b/plat/arm/css/neoverse_rd/include/nrd_soc_css_def_v2.h similarity index 97% rename from plat/arm/css/sgi/include/sgi_soc_css_def_v2.h rename to plat/arm/css/neoverse_rd/include/nrd_soc_css_def_v2.h index d659ae519..81cbdf428 100644 --- a/plat/arm/css/sgi/include/sgi_soc_css_def_v2.h +++ b/plat/arm/css/neoverse_rd/include/nrd_soc_css_def_v2.h @@ -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 */ -#ifndef SGI_SOC_CSS_DEF_V2_H -#define SGI_SOC_CSS_DEF_V2_H +#ifndef NRD_SOC_CSS_DEF_V2_H +#define NRD_SOC_CSS_DEF_V2_H #include #include @@ -204,4 +204,4 @@ #define PLAT_ARM_NVM_BASE V2M_FLASH0_BASE #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 */ diff --git a/plat/arm/css/sgi/include/sgi_soc_platform_def.h b/plat/arm/css/neoverse_rd/include/nrd_soc_platform_def.h similarity index 78% rename from plat/arm/css/sgi/include/sgi_soc_platform_def.h rename to plat/arm/css/neoverse_rd/include/nrd_soc_platform_def.h index 3b8d9c664..0024e4902 100644 --- a/plat/arm/css/sgi/include/sgi_soc_platform_def.h +++ b/plat/arm/css/neoverse_rd/include/nrd_soc_platform_def.h @@ -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 */ -#ifndef SGI_SOC_PLATFORM_DEF_H -#define SGI_SOC_PLATFORM_DEF_H +#ifndef NRD_SOC_PLATFORM_DEF_H +#define NRD_SOC_PLATFORM_DEF_H #include #include -#include -#include + +#include +#include /* Map the System registers to access from S-EL0 */ #define CSS_SYSTEMREG_DEVICE_BASE (0x1C010000) @@ -30,4 +31,4 @@ (MT_DEVICE | MT_RW | \ MT_SECURE | MT_USER)) -#endif /* SGI_SOC_PLATFORM_DEF_H */ +#endif /* NRD_SOC_PLATFORM_DEF_H */ diff --git a/plat/arm/css/sgi/include/sgi_soc_platform_def_v2.h b/plat/arm/css/neoverse_rd/include/nrd_soc_platform_def_v2.h similarity index 76% rename from plat/arm/css/sgi/include/sgi_soc_platform_def_v2.h rename to plat/arm/css/neoverse_rd/include/nrd_soc_platform_def_v2.h index 20dd6825d..2e6f3543b 100644 --- a/plat/arm/css/sgi/include/sgi_soc_platform_def_v2.h +++ b/plat/arm/css/neoverse_rd/include/nrd_soc_platform_def_v2.h @@ -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 */ -#ifndef SGI_SOC_PLATFORM_DEF_V2_H -#define SGI_SOC_PLATFORM_DEF_V2_H +#ifndef NRD_SOC_PLATFORM_DEF_V2_H +#define NRD_SOC_PLATFORM_DEF_V2_H -#include -#include +#include +#include /* Map the System registers to access from S-EL0 */ #define CSS_SYSTEMREG_DEVICE_BASE (0x0C010000) @@ -28,4 +28,4 @@ (MT_DEVICE | MT_RW | \ MT_SECURE | MT_USER)) -#endif /* SGI_SOC_PLATFORM_DEF_V2_H */ +#endif /* NRD_SOC_PLATFORM_DEF_V2_H */ diff --git a/plat/arm/css/sgi/include/sgi_variant.h b/plat/arm/css/neoverse_rd/include/nrd_variant.h similarity index 91% rename from plat/arm/css/sgi/include/sgi_variant.h rename to plat/arm/css/neoverse_rd/include/nrd_variant.h index 8f9529aa1..ac7c81cd1 100644 --- a/plat/arm/css/sgi/include/sgi_variant.h +++ b/plat/arm/css/neoverse_rd/include/nrd_variant.h @@ -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 */ -#ifndef SGI_VARIANT_H -#define SGI_VARIANT_H +#ifndef NRD_VARIANT_H +#define NRD_VARIANT_H /* SSC_VERSION values for SGI575 */ #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 */ unsigned int plat_arm_sgi_get_multi_chip_mode(void); -#endif /* SGI_VARIANT_H */ +#endif /* NRD_VARIANT_H */ diff --git a/plat/arm/css/sgi/include/plat_macros.S b/plat/arm/css/neoverse_rd/include/plat_macros.S similarity index 86% rename from plat/arm/css/sgi/include/plat_macros.S rename to plat/arm/css/neoverse_rd/include/plat_macros.S index 521bcc32b..df7cfb639 100644 --- a/plat/arm/css/sgi/include/plat_macros.S +++ b/plat/arm/css/neoverse_rd/include/plat_macros.S @@ -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 */ diff --git a/plat/arm/css/sgi/sgi-common.mk b/plat/arm/css/neoverse_rd/nrd-common.mk similarity index 85% rename from plat/arm/css/sgi/sgi-common.mk rename to plat/arm/css/neoverse_rd/nrd-common.mk index 717e14964..18769ef21 100644 --- a/plat/arm/css/sgi/sgi-common.mk +++ b/plat/arm/css/neoverse_rd/nrd-common.mk @@ -6,7 +6,7 @@ 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 @@ -25,7 +25,7 @@ ENABLE_SVE_FOR_NS := 0 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 @@ -39,18 +39,18 @@ ENT_GIC_SOURCES := ${GICV3_SOURCES} \ plat/common/plat_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} \ 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 BL31_SOURCES += ${INTERCONNECT_SOURCES} \ ${ENT_GIC_SOURCES} \ - ${CSS_ENT_BASE}/sgi_bl31_setup.c \ - ${CSS_ENT_BASE}/sgi_topology.c \ + ${CSS_ENT_BASE}/nrd_bl31_setup.c \ + ${CSS_ENT_BASE}/nrd_topology.c \ drivers/delay_timer/generic_delay_timer.c ifneq (${RESET_TO_BL31},0) diff --git a/plat/arm/css/sgi/sgi_bl31_setup.c b/plat/arm/css/neoverse_rd/nrd_bl31_setup.c similarity index 98% rename from plat/arm/css/sgi/sgi_bl31_setup.c rename to plat/arm/css/neoverse_rd/nrd_bl31_setup.c index 3de8c1ba2..f9e59186d 100644 --- a/plat/arm/css/sgi/sgi_bl31_setup.c +++ b/plat/arm/css/neoverse_rd/nrd_bl31_setup.c @@ -14,13 +14,11 @@ #include #include #include - +#include #include -#include - -#include -#include +#include +#include sgi_platform_info_t sgi_plat_info; diff --git a/plat/arm/css/sgi/sgi_image_load.c b/plat/arm/css/neoverse_rd/nrd_image_load.c similarity index 98% rename from plat/arm/css/sgi/sgi_image_load.c rename to plat/arm/css/neoverse_rd/nrd_image_load.c index 0a9bba9df..b47f07a4e 100644 --- a/plat/arm/css/sgi/sgi_image_load.c +++ b/plat/arm/css/neoverse_rd/nrd_image_load.c @@ -12,10 +12,10 @@ #include #include #include - #include -#include -#include + +#include +#include /* * Information about the isolated CPUs obtained from SDS. diff --git a/plat/arm/css/sgi/sgi_interconnect.c b/plat/arm/css/neoverse_rd/nrd_interconnect.c similarity index 94% rename from plat/arm/css/sgi/sgi_interconnect.c rename to plat/arm/css/neoverse_rd/nrd_interconnect.c index e9cd81256..4f9cc851f 100644 --- a/plat/arm/css/sgi/sgi_interconnect.c +++ b/plat/arm/css/neoverse_rd/nrd_interconnect.c @@ -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 */ diff --git a/plat/arm/css/sgi/sgi_plat.c b/plat/arm/css/neoverse_rd/nrd_plat.c similarity index 99% rename from plat/arm/css/sgi/sgi_plat.c rename to plat/arm/css/neoverse_rd/nrd_plat.c index fe64d3431..c713ebd27 100644 --- a/plat/arm/css/sgi/sgi_plat.c +++ b/plat/arm/css/neoverse_rd/nrd_plat.c @@ -16,7 +16,8 @@ #include #include #include -#include + +#include #if SPM_MM #include diff --git a/plat/arm/css/sgi/sgi_plat_v2.c b/plat/arm/css/neoverse_rd/nrd_plat_v2.c similarity index 100% rename from plat/arm/css/sgi/sgi_plat_v2.c rename to plat/arm/css/neoverse_rd/nrd_plat_v2.c diff --git a/plat/arm/css/sgi/sgi_topology.c b/plat/arm/css/neoverse_rd/nrd_topology.c similarity index 93% rename from plat/arm/css/sgi/sgi_topology.c rename to plat/arm/css/neoverse_rd/nrd_topology.c index 1c3b5bfc8..40be04977 100644 --- a/plat/arm/css/sgi/sgi_topology.c +++ b/plat/arm/css/neoverse_rd/nrd_topology.c @@ -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 */ diff --git a/plat/arm/css/sgi/ras/sgi_ras_common.c b/plat/arm/css/neoverse_rd/ras/nrd_ras_common.c similarity index 96% rename from plat/arm/css/sgi/ras/sgi_ras_common.c rename to plat/arm/css/neoverse_rd/ras/nrd_ras_common.c index 9789670d7..d92056062 100644 --- a/plat/arm/css/sgi/ras/sgi_ras_common.c +++ b/plat/arm/css/neoverse_rd/ras/nrd_ras_common.c @@ -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 */ @@ -11,7 +11,7 @@ #include #include -#include +#include static struct plat_sgi_ras_config *sgi_ras_config; diff --git a/plat/arm/css/sgi/ras/sgi_ras_cpu.c b/plat/arm/css/neoverse_rd/ras/nrd_ras_cpu.c similarity index 98% rename from plat/arm/css/sgi/ras/sgi_ras_cpu.c rename to plat/arm/css/neoverse_rd/ras/nrd_ras_cpu.c index 5e77dbb89..71d177574 100644 --- a/plat/arm/css/sgi/ras/sgi_ras_cpu.c +++ b/plat/arm/css/neoverse_rd/ras/nrd_ras_cpu.c @@ -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 */ @@ -14,7 +14,7 @@ #include #include -#include +#include #define CPU_CONTEXT_REG_GPR_ARR_SIZE 32 #define CPU_CONTEXT_REG_EL1_ARR_SIZE 17 diff --git a/plat/arm/css/sgi/ras/sgi_ras_sram.c b/plat/arm/css/neoverse_rd/ras/nrd_ras_sram.c similarity index 96% rename from plat/arm/css/sgi/ras/sgi_ras_sram.c rename to plat/arm/css/neoverse_rd/ras/nrd_ras_sram.c index b1007003d..8f4fb4c5b 100644 --- a/plat/arm/css/sgi/ras/sgi_ras_sram.c +++ b/plat/arm/css/neoverse_rd/ras/nrd_ras_sram.c @@ -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 */ @@ -11,7 +11,7 @@ #include #include -#include +#include /* Base Element RAM Error Record offsets. */ #define ERRSTATUS U(0)