Merge changes from topic "sgi_to_nrd"
* changes:
fix(arm): fix comments referencing "SGI platform"
refactor(sgi): replace references to "SGI"/"sgi" for neoverse_rd
refactor(sgi): rename "CSS_SGI" macro prefixes to "NRD"
refactor(sgi): move apis and types to "nrd" prefix
refactor(sgi): replace build-option prefix to "NRD"
refactor(sgi): regroup "sgi" and "rdinfra" to "neoverse_rd"
diff --git a/plat/arm/n1sdp/n1sdp_pwr_state.c b/plat/arm/n1sdp/n1sdp_pwr_state.c
index fcee7c4..d78f2ee 100644
--- a/plat/arm/n1sdp/n1sdp_pwr_state.c
+++ b/plat/arm/n1sdp/n1sdp_pwr_state.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2022-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -7,7 +7,7 @@
#include <platform.h>
#include <psci.h>
-/* State IDs for local power states on SGI platforms. */
+/* State IDs for local power states on N1SDP platform. */
#define N1SDP_PS_RUN_STATE_ID 0 /* Valid for CPUs and Clusters */
#define N1SDP_PS_RETENTION_STATE_ID 1 /* Valid for only CPUs */
#define N1SDP_PS_OFF_STATE_ID 2 /* Valid for CPUs and Clusters */
diff --git a/plat/arm/sgi/common/aarch64/plat_helpers.S b/plat/arm/neoverse_rd/common/arch/aarch64/plat_helpers.S
similarity index 85%
rename from plat/arm/sgi/common/aarch64/plat_helpers.S
rename to plat/arm/neoverse_rd/common/arch/aarch64/plat_helpers.S
index e17c509..122d0b9 100644
--- a/plat/arm/sgi/common/aarch64/plat_helpers.S
+++ b/plat/arm/neoverse_rd/common/arch/aarch64/plat_helpers.S
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -16,15 +16,15 @@
/*----------------------------------------------------------------------
* unsigned int platform_get_core_pos(unsigned long mpid)
*
- * Function to calculate the core position on sgi platforms.
+ * Function to calculate the core position on Neoverse RD platforms.
*
- * (ClusterId * CSS_SGI_MAX_CPUS_PER_CLUSTER * CSS_SGI_MAX_PE_PER_CPU) +
- * (CPUId * CSS_SGI_MAX_PE_PER_CPU) +
+ * (ClusterId * NRD_MAX_CPUS_PER_CLUSTER * NRD_MAX_PE_PER_CPU) +
+ * (CPUId * NRD_MAX_PE_PER_CPU) +
* ThreadId
*
* which can be simplified as:
*
- * ((ClusterId * CSS_SGI_MAX_CPUS_PER_CLUSTER + CPUId) * CSS_SGI_MAX_PE_PER_CPU)
+ * ((ClusterId * NRD_MAX_CPUS_PER_CLUSTER + CPUId) * NRD_MAX_PE_PER_CPU)
* + ThreadId
* ---------------------------------------------------------------------
*/
@@ -43,9 +43,9 @@
ubfx x2, x3, #MPIDR_AFF2_SHIFT, #MPIDR_AFFINITY_BITS
/* Compute linear position */
- mov x3, #CSS_SGI_MAX_CPUS_PER_CLUSTER
+ mov x3, #NRD_MAX_CPUS_PER_CLUSTER
madd x1, x2, x3, x1
- mov x3, #CSS_SGI_MAX_PE_PER_CPU
+ mov x3, #NRD_MAX_PE_PER_CPU
madd x0, x1, x3, x0
ret
endfunc platform_get_core_pos
diff --git a/plat/arm/sgi/common/include/sgi_base_platform_def.h b/plat/arm/neoverse_rd/common/include/nrd_base_platform_def.h
similarity index 84%
rename from plat/arm/sgi/common/include/sgi_base_platform_def.h
rename to plat/arm/neoverse_rd/common/include/nrd_base_platform_def.h
index 04673b3..6a7e487 100644
--- a/plat/arm/sgi/common/include/sgi_base_platform_def.h
+++ b/plat/arm/neoverse_rd/common/include/nrd_base_platform_def.h
@@ -1,11 +1,11 @@
/*
- * Copyright (c) 2018-2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
*
* 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 <lib/utils_def.h>
@@ -14,19 +14,19 @@
#define PLATFORM_LINKER_ARCH aarch64
/* Sub-system Peripherals */
-#define SGI_DEVICE0_BASE UL(0x2A000000)
-#define SGI_DEVICE0_SIZE UL(0x26000000)
+#define NRD_DEVICE0_BASE UL(0x2A000000)
+#define NRD_DEVICE0_SIZE UL(0x26000000)
/* Peripherals and PCIe expansion area */
-#define SGI_DEVICE1_BASE UL(0x60000000)
-#define SGI_DEVICE1_SIZE UL(0x20000000)
+#define NRD_DEVICE1_BASE UL(0x60000000)
+#define NRD_DEVICE1_SIZE UL(0x20000000)
/* AP Non-Secure UART related constants */
-#define SGI_CSS_NSEC_UART_BASE UL(0x2A400000)
-#define SGI_CSS_NSEC_CLK_IN_HZ 7372800
+#define NRD_CSS_NSEC_UART_BASE UL(0x2A400000)
+#define NRD_CSS_NSEC_CLK_IN_HZ 7372800
-#define PLAT_ARM_UART_BASE SGI_CSS_NSEC_UART_BASE
-#define PLAT_ARM_UART_CLK_IN_HZ SGI_CSS_NSEC_CLK_IN_HZ
+#define PLAT_ARM_UART_BASE NRD_CSS_NSEC_UART_BASE
+#define PLAT_ARM_UART_CLK_IN_HZ NRD_CSS_NSEC_CLK_IN_HZ
/* Base address of trusted watchdog (SP805) */
#define SP805_TWDOG_BASE UL(0x2A480000)
@@ -69,7 +69,7 @@
#define PCPU_DV_MEM_STACK_SIZE 0x600
#define PLATFORM_CORE_COUNT (PLAT_ARM_CLUSTER_COUNT * \
- CSS_SGI_MAX_CPUS_PER_CLUSTER)
+ NRD_MAX_CPUS_PER_CLUSTER)
#define PLATFORM_NUM_AFFS (PLAT_ARM_CLUSTER_COUNT + PLATFORM_CORE_COUNT)
#define PLATFORM_MAX_AFFLVL MPIDR_AFFLVL1
@@ -106,4 +106,4 @@
/* Per-CPU Hypervisor Timer Interrupt ID */
#define IRQ_PCPU_HP_TIMER 26
-#endif /* SGI_BASE_PLATFORM_DEF_H */
+#endif /* NRD_BASE_PLATFORM_DEF_H */
diff --git a/plat/arm/sgi/common/include/sgi_soc_css_def.h b/plat/arm/neoverse_rd/common/include/nrd_soc_css_def.h
similarity index 60%
rename from plat/arm/sgi/common/include/sgi_soc_css_def.h
rename to plat/arm/neoverse_rd/common/include/nrd_soc_css_def.h
index da73b3e..bffe189 100644
--- a/plat/arm/sgi/common/include/sgi_soc_css_def.h
+++ b/plat/arm/neoverse_rd/common/include/nrd_soc_css_def.h
@@ -1,11 +1,11 @@
/*
- * Copyright (c) 2022, Arm Limited. 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
/* Trusted watchdog (SP805) Interrupt ID */
#define IRQ_TWDOG_INTID 86
@@ -16,4 +16,4 @@
/* AP_REFCLK Generic Timer, Non-secure. */
#define IRQ_CNTPSIRQ1 92
-#endif /* SGI_SOC_CSS_DEF_H */
+#endif /* NRD_SOC_CSS_DEF_H */
diff --git a/plat/arm/neoverse_rd/common/include/nrd_soc_css_def_v2.h b/plat/arm/neoverse_rd/common/include/nrd_soc_css_def_v2.h
new file mode 100644
index 0000000..5d4f5e6
--- /dev/null
+++ b/plat/arm/neoverse_rd/common/include/nrd_soc_css_def_v2.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2022-2024, Arm Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef NRD_SOC_CSS_DEF_V2_H
+#define NRD_SOC_CSS_DEF_V2_H
+
+/* Trusted watchdog (SP805) Interrupt ID */
+#define IRQ_TWDOG_INTID 107
+
+/* Maximum SPI */
+#define PLAT_MAX_SPI_OFFSET_ID 256
+
+/* AP_REFCLK Generic Timer, Non-secure. */
+#define IRQ_CNTPSIRQ1 109
+
+#endif /* NRD_SOC_CSS_DEF_V2_H */
+
diff --git a/plat/arm/neoverse_rd/common/include/nrd_soc_platform_def.h b/plat/arm/neoverse_rd/common/include/nrd_soc_platform_def.h
new file mode 100644
index 0000000..d329688
--- /dev/null
+++ b/plat/arm/neoverse_rd/common/include/nrd_soc_platform_def.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2022-2024, ARM Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef NRD_SOC_PLATFORM_H
+#define NRD_SOC_PLATFORM_H
+
+#include <nrd_base_platform_def.h>
+#include <nrd_soc_css_def.h>
+
+/* Base address of non-trusted watchdog (SP805) */
+#define SP805_WDOG_BASE UL(0x1C0F0000)
+
+#endif /* NRD_SOC_PLATFORM_H */
diff --git a/plat/arm/neoverse_rd/common/include/nrd_soc_platform_def_v2.h b/plat/arm/neoverse_rd/common/include/nrd_soc_platform_def_v2.h
new file mode 100644
index 0000000..7a23c51
--- /dev/null
+++ b/plat/arm/neoverse_rd/common/include/nrd_soc_platform_def_v2.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2022-2024, ARM Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef NRD_SOC_PLATFORM_V2_H
+#define NRD_SOC_PLATFORM_V2_H
+
+#include <nrd_base_platform_def.h>
+#include <nrd_soc_css_def_v2.h>
+
+/* Base address of non-trusted watchdog (SP805) */
+#define SP805_WDOG_BASE UL(0x0C0F0000)
+
+#endif /* NRD_SOC_PLATFORM_V2_H */
diff --git a/plat/arm/neoverse_rd/common/nrd_common.mk b/plat/arm/neoverse_rd/common/nrd_common.mk
new file mode 100644
index 0000000..10ee08b
--- /dev/null
+++ b/plat/arm/neoverse_rd/common/nrd_common.mk
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+PLAT_INCLUDES := -Iplat/arm/neoverse_rd/common/include/
+
+PLAT_SOURCES := drivers/arm/gic/arm_gic_v2v3.c \
+ drivers/arm/gic/gic_v2.c \
+ drivers/arm/gic/gic_v3.c \
+ drivers/arm/sp805/sp805.c \
+ drivers/arm/timer/private_timer.c \
+ drivers/arm/timer/system_timer.c \
+ plat/arm/neoverse_rd/common/arch/${ARCH}/plat_helpers.S\
+ plat/arm/neoverse_rd/common/plat_setup.c \
+ plat/arm/neoverse_rd/common/nrd_mem_prot.c \
+ plat/arm/neoverse_rd/common/nrd_pwr_state.c
+
+include plat/arm/common/arm_common.mk
+
+ifeq (${USE_NVM},1)
+$(error "USE_NVM is not supported on Neoverse RD platforms")
+endif
+
+# Pass NRD_PLATFORM_VARIANT flag to the build system
+$(eval $(call add_define,TFTF_DEFINES,NRD_PLATFORM_VARIANT))
diff --git a/plat/arm/neoverse_rd/common/nrd_mem_prot.c b/plat/arm/neoverse_rd/common/nrd_mem_prot.c
new file mode 100644
index 0000000..9ea25e8
--- /dev/null
+++ b/plat/arm/neoverse_rd/common/nrd_mem_prot.c
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <platform.h>
+
+#define NRD_DRAM1_NS_START (TFTF_BASE + 0x4000000)
+#define NRD_DRAM1_NS_SIZE 0x10000000
+
+static const mem_region_t nrd_ram_ranges[] = {
+ { NRD_DRAM1_NS_START, NRD_DRAM1_NS_SIZE },
+};
+
+const mem_region_t *plat_get_prot_regions(int *nelem)
+{
+ *nelem = ARRAY_SIZE(nrd_ram_ranges);
+ return nrd_ram_ranges;
+}
diff --git a/plat/arm/neoverse_rd/common/nrd_pwr_state.c b/plat/arm/neoverse_rd/common/nrd_pwr_state.c
new file mode 100644
index 0000000..31f81dd
--- /dev/null
+++ b/plat/arm/neoverse_rd/common/nrd_pwr_state.c
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#include <platform.h>
+#include <psci.h>
+
+/* State IDs for local power states on Neoverse RD platforms. */
+#define NRD_PS_RUN_STATE_ID 0 /* Valid for CPUs and Clusters */
+#define NRD_PS_RETENTION_STATE_ID 1 /* Valid for only CPUs */
+#define NRD_PS_OFF_STATE_ID 2 /* Valid for CPUs and Clusters */
+
+/* Suspend depth definitions for each power state */
+#define NRD_PS_RUN_DEPTH 0
+#define NRD_PS_RETENTION_DEPTH 1
+#define NRD_PS_OFF_DEPTH 2
+
+/* The state property array with details of idle state possible for the core */
+static const plat_state_prop_t core_state_prop[] = {
+ {NRD_PS_RETENTION_DEPTH, NRD_PS_RETENTION_STATE_ID,
+ PSTATE_TYPE_STANDBY},
+ {NRD_PS_OFF_DEPTH, NRD_PS_OFF_STATE_ID, PSTATE_TYPE_POWERDOWN},
+ {0},
+};
+
+/* The state property array with details of idle state possible for the cluster */
+static const plat_state_prop_t cluster_state_prop[] = {
+ {NRD_PS_OFF_DEPTH, NRD_PS_OFF_STATE_ID, PSTATE_TYPE_POWERDOWN},
+ {0},
+};
+
+const plat_state_prop_t *plat_get_state_prop(unsigned int level)
+{
+ switch (level) {
+ case MPIDR_AFFLVL0:
+ return core_state_prop;
+ case MPIDR_AFFLVL1:
+ return cluster_state_prop;
+ default:
+ return NULL;
+ }
+}
diff --git a/plat/arm/sgi/common/plat_setup.c b/plat/arm/neoverse_rd/common/plat_setup.c
similarity index 72%
rename from plat/arm/sgi/common/plat_setup.c
rename to plat/arm/neoverse_rd/common/plat_setup.c
index f343f8d..4734bf0 100644
--- a/plat/arm/sgi/common/plat_setup.c
+++ b/plat/arm/neoverse_rd/common/plat_setup.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -8,9 +8,9 @@
#include <xlat_tables_v2.h>
static const mmap_region_t mmap[] = {
- MAP_REGION_FLAT(SGI_DEVICE0_BASE, SGI_DEVICE0_SIZE,
+ MAP_REGION_FLAT(NRD_DEVICE0_BASE, NRD_DEVICE0_SIZE,
MT_DEVICE | MT_RW | MT_NS),
- MAP_REGION_FLAT(SGI_DEVICE1_BASE, SGI_DEVICE1_SIZE,
+ MAP_REGION_FLAT(NRD_DEVICE1_BASE, NRD_DEVICE1_SIZE,
MT_DEVICE | MT_RW | MT_NS),
MAP_REGION_FLAT(DRAM_BASE, TFTF_BASE - DRAM_BASE,
MT_MEMORY | MT_RW | MT_NS),
diff --git a/plat/arm/rdinfra/rdn1edge/include/platform_def.h b/plat/arm/neoverse_rd/platform/rdn1edge/include/platform_def.h
similarity index 72%
rename from plat/arm/rdinfra/rdn1edge/include/platform_def.h
rename to plat/arm/neoverse_rd/platform/rdn1edge/include/platform_def.h
index 0ae8ec5..2a3c7ac 100644
--- a/plat/arm/rdinfra/rdn1edge/include/platform_def.h
+++ b/plat/arm/neoverse_rd/platform/rdn1edge/include/platform_def.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019-2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -7,11 +7,11 @@
#ifndef PLATFORM_DEF_H
#define PLATFORM_DEF_H
-#include "sgi_soc_platform_def.h"
+#include "nrd_soc_platform_def.h"
#define PLAT_ARM_CLUSTER_COUNT U(2)
-#define CSS_SGI_MAX_CPUS_PER_CLUSTER U(4)
-#define CSS_SGI_MAX_PE_PER_CPU U(1)
+#define NRD_MAX_CPUS_PER_CLUSTER U(4)
+#define NRD_MAX_PE_PER_CPU U(1)
/* GIC related constants */
#define PLAT_ARM_GICD_BASE UL(0x30000000)
diff --git a/plat/arm/neoverse_rd/platform/rdn1edge/platform.mk b/plat/arm/neoverse_rd/platform/rdn1edge/platform.mk
new file mode 100644
index 0000000..9f92efd
--- /dev/null
+++ b/plat/arm/neoverse_rd/platform/rdn1edge/platform.mk
@@ -0,0 +1,18 @@
+#
+# Copyright (c) 2019-2024, Arm Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+include plat/arm/neoverse_rd/common/nrd_common.mk
+
+PLAT_INCLUDES += -Iplat/arm/neoverse_rd/platform/rdn1edge/include/
+
+PLAT_SOURCES += plat/arm/neoverse_rd/platform/rdn1edge/topology.c
+
+PLAT_TESTS_SKIP_LIST := plat/arm/neoverse_rd/platform/rdn1edge/tests_to_skip.txt
+
+ifdef NRD_PLATFORM_VARIANT
+$(error "NRD_PLATFORM_VARIANT should not be set for RD-N1-Edge, \
+ currently set to ${NRD_PLATFORM_VARIANT}.")
+endif
diff --git a/plat/arm/rdinfra/rdn1edge/tests_to_skip.txt b/plat/arm/neoverse_rd/platform/rdn1edge/tests_to_skip.txt
similarity index 78%
rename from plat/arm/rdinfra/rdn1edge/tests_to_skip.txt
rename to plat/arm/neoverse_rd/platform/rdn1edge/tests_to_skip.txt
index 95360bc..6341809 100644
--- a/plat/arm/rdinfra/rdn1edge/tests_to_skip.txt
+++ b/plat/arm/neoverse_rd/platform/rdn1edge/tests_to_skip.txt
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2019, Arm Limited. All rights reserved.
+# Copyright (c) 2019-2024, Arm Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
diff --git a/plat/arm/rdinfra/rdn1edge/topology.c b/plat/arm/neoverse_rd/platform/rdn1edge/topology.c
similarity index 89%
rename from plat/arm/rdinfra/rdn1edge/topology.c
rename to plat/arm/neoverse_rd/platform/rdn1edge/topology.c
index 6f20695..cb79ba6 100644
--- a/plat/arm/rdinfra/rdn1edge/topology.c
+++ b/plat/arm/neoverse_rd/platform/rdn1edge/topology.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -34,9 +34,9 @@
/* Number of root nodes */
PLAT_ARM_CLUSTER_COUNT,
/* Number of children for the 1st node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 2nd node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER
+ NRD_MAX_CPUS_PER_CLUSTER
};
const unsigned char *tftf_plat_get_pwr_domain_tree_desc(void)
diff --git a/plat/arm/rdinfra/rdn2/include/platform_def.h b/plat/arm/neoverse_rd/platform/rdn2/include/platform_def.h
similarity index 69%
rename from plat/arm/rdinfra/rdn2/include/platform_def.h
rename to plat/arm/neoverse_rd/platform/rdn2/include/platform_def.h
index ab4149d..177d911 100644
--- a/plat/arm/rdinfra/rdn2/include/platform_def.h
+++ b/plat/arm/neoverse_rd/platform/rdn2/include/platform_def.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2022-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -7,25 +7,25 @@
#ifndef PLATFORM_DEF_H
#define PLATFORM_DEF_H
-#include <sgi_soc_platform_def_v2.h>
+#include <nrd_soc_platform_def_v2.h>
/*
* The RD-N2 Cfg1 platform is a variant of the RD-N2 platform with a
* reduced interconnect mesh size (3x3) and core count (8-cores).
*
- * The $CSS_SGI_PLATFORM_VARIANT flag is set to 1 for RD-N2-Cfg1 platform.
+ * The $NRD_PLATFORM_VARIANT flag is set to 1 for RD-N2-Cfg1 platform.
*/
-#if (CSS_SGI_PLATFORM_VARIANT == 1)
+#if (NRD_PLATFORM_VARIANT == 1)
#define PLAT_ARM_CLUSTER_COUNT U(8)
#else
#define PLAT_ARM_CLUSTER_COUNT U(16)
#endif
-#define CSS_SGI_MAX_CPUS_PER_CLUSTER U(1)
-#define CSS_SGI_MAX_PE_PER_CPU U(1)
+#define NRD_MAX_CPUS_PER_CLUSTER U(1)
+#define NRD_MAX_PE_PER_CPU U(1)
/* GIC-600 & interrupt handling related constants */
#define PLAT_ARM_GICD_BASE UL(0x30000000)
-#if (CSS_SGI_PLATFORM_VARIANT == 1)
+#if (NRD_PLATFORM_VARIANT == 1)
#define PLAT_ARM_GICR_BASE UL(0x30100000)
#else
#define PLAT_ARM_GICR_BASE UL(0x301C0000)
diff --git a/plat/arm/neoverse_rd/platform/rdn2/platform.mk b/plat/arm/neoverse_rd/platform/rdn2/platform.mk
new file mode 100644
index 0000000..31d91a1
--- /dev/null
+++ b/plat/arm/neoverse_rd/platform/rdn2/platform.mk
@@ -0,0 +1,21 @@
+#
+# Copyright (c) 2022-2024, Arm Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+include plat/arm/neoverse_rd/common/nrd_common.mk
+
+PLAT_INCLUDES += -Iplat/arm/neoverse_rd/platform/rdn2/include/
+
+PLAT_SOURCES += plat/arm/neoverse_rd/platform/rdn2/topology.c
+
+PLAT_TESTS_SKIP_LIST := plat/arm/neoverse_rd/platform/rdn2/tests_to_skip.txt
+
+RD_N2_VARIANTS := 0 1 3
+
+ifneq ($(NRD_PLATFORM_VARIANT), \
+ $(filter $(NRD_PLATFORM_VARIANT),$(RD_N2_VARIANTS)))
+ $(error "NRD_PLATFORM_VARIANT for RD-N2 should be 0 1 or 3, currently \
+ set to ${NRD_PLATFORM_VARIANT}.")
+endif
diff --git a/plat/arm/rdinfra/rdn2/tests_to_skip.txt b/plat/arm/neoverse_rd/platform/rdn2/tests_to_skip.txt
similarity index 84%
rename from plat/arm/rdinfra/rdn2/tests_to_skip.txt
rename to plat/arm/neoverse_rd/platform/rdn2/tests_to_skip.txt
index b8a433d..2c9acee 100644
--- a/plat/arm/rdinfra/rdn2/tests_to_skip.txt
+++ b/plat/arm/neoverse_rd/platform/rdn2/tests_to_skip.txt
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2022, Arm Limited. All rights reserved.
+# Copyright (c) 2022-2024, Arm Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
diff --git a/plat/arm/rdinfra/rdv1/topology.c b/plat/arm/neoverse_rd/platform/rdn2/topology.c
similarity index 78%
copy from plat/arm/rdinfra/rdv1/topology.c
copy to plat/arm/neoverse_rd/platform/rdn2/topology.c
index ad13285..3cd3121 100644
--- a/plat/arm/rdinfra/rdv1/topology.c
+++ b/plat/arm/neoverse_rd/platform/rdn2/topology.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2022-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -28,6 +28,7 @@
{ 6, 0 },
/* Cluster7: 1 core */
{ 7, 0 },
+#if (NRD_PLATFORM_VARIANT == 0)
/* Cluster8: 1 core */
{ 8, 0 },
/* Cluster9: 1 core */
@@ -44,6 +45,7 @@
{ 14, 0 },
/* Cluster15: 1 core */
{ 15, 0 },
+#endif
};
/*
@@ -56,37 +58,39 @@
/* Number of root nodes */
PLAT_ARM_CLUSTER_COUNT,
/* Number of children for the 1st node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 2nd node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 3rd node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 4th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 5th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 6th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 7th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 8th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
+#if (NRD_PLATFORM_VARIANT == 0)
/* Number of children for the 9th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 10th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 11th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 12th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 13th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 14th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 15th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 16th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER
+ NRD_MAX_CPUS_PER_CLUSTER
+#endif
};
const unsigned char *tftf_plat_get_pwr_domain_tree_desc(void)
diff --git a/plat/arm/rdinfra/rdv1/include/platform_def.h b/plat/arm/neoverse_rd/platform/rdv1/include/platform_def.h
similarity index 72%
rename from plat/arm/rdinfra/rdv1/include/platform_def.h
rename to plat/arm/neoverse_rd/platform/rdv1/include/platform_def.h
index 7869551..6b78d95 100644
--- a/plat/arm/rdinfra/rdv1/include/platform_def.h
+++ b/plat/arm/neoverse_rd/platform/rdv1/include/platform_def.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2022-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -7,11 +7,11 @@
#ifndef PLATFORM_DEF_H
#define PLATFORM_DEF_H
-#include <sgi_soc_platform_def.h>
+#include <nrd_soc_platform_def.h>
#define PLAT_ARM_CLUSTER_COUNT U(16)
-#define CSS_SGI_MAX_CPUS_PER_CLUSTER U(1)
-#define CSS_SGI_MAX_PE_PER_CPU U(1)
+#define NRD_MAX_CPUS_PER_CLUSTER U(1)
+#define NRD_MAX_PE_PER_CPU U(1)
/* GIC related constants */
#define PLAT_ARM_GICD_BASE UL(0x30000000)
diff --git a/plat/arm/neoverse_rd/platform/rdv1/platform.mk b/plat/arm/neoverse_rd/platform/rdv1/platform.mk
new file mode 100644
index 0000000..cfb8543
--- /dev/null
+++ b/plat/arm/neoverse_rd/platform/rdv1/platform.mk
@@ -0,0 +1,18 @@
+#
+# Copyright (c) 2022-2024, Arm Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+include plat/arm/neoverse_rd/common/nrd_common.mk
+
+PLAT_INCLUDES += -Iplat/arm/neoverse_rd/platform/rdv1/include/
+
+PLAT_SOURCES += plat/arm/neoverse_rd/platform/rdv1/topology.c
+
+PLAT_TESTS_SKIP_LIST := plat/arm/neoverse_rd/platform/rdv1/tests_to_skip.txt
+
+ifdef NRD_PLATFORM_VARIANT
+$(error "NRD_PLATFORM_VARIANT should not be set for RD-V1, \
+ currently set to ${NRD_PLATFORM_VARIANT}.")
+endif
diff --git a/plat/arm/rdinfra/rdv1/tests_to_skip.txt b/plat/arm/neoverse_rd/platform/rdv1/tests_to_skip.txt
similarity index 89%
rename from plat/arm/rdinfra/rdv1/tests_to_skip.txt
rename to plat/arm/neoverse_rd/platform/rdv1/tests_to_skip.txt
index 9b3ff5f..d62b9dd 100644
--- a/plat/arm/rdinfra/rdv1/tests_to_skip.txt
+++ b/plat/arm/neoverse_rd/platform/rdv1/tests_to_skip.txt
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2022, Arm Limited. All rights reserved.
+# Copyright (c) 2022-2024, Arm Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
diff --git a/plat/arm/rdinfra/rdv1/topology.c b/plat/arm/neoverse_rd/platform/rdv1/topology.c
similarity index 79%
rename from plat/arm/rdinfra/rdv1/topology.c
rename to plat/arm/neoverse_rd/platform/rdv1/topology.c
index ad13285..882bffb 100644
--- a/plat/arm/rdinfra/rdv1/topology.c
+++ b/plat/arm/neoverse_rd/platform/rdv1/topology.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2022-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -56,37 +56,37 @@
/* Number of root nodes */
PLAT_ARM_CLUSTER_COUNT,
/* Number of children for the 1st node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 2nd node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 3rd node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 4th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 5th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 6th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 7th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 8th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 9th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 10th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 11th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 12th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 13th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 14th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 15th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 16th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER
+ NRD_MAX_CPUS_PER_CLUSTER
};
const unsigned char *tftf_plat_get_pwr_domain_tree_desc(void)
diff --git a/plat/arm/rdinfra/rdn1edge/include/platform_def.h b/plat/arm/neoverse_rd/platform/sgi575/include/platform_def.h
similarity index 72%
copy from plat/arm/rdinfra/rdn1edge/include/platform_def.h
copy to plat/arm/neoverse_rd/platform/sgi575/include/platform_def.h
index 0ae8ec5..bdaecb9 100644
--- a/plat/arm/rdinfra/rdn1edge/include/platform_def.h
+++ b/plat/arm/neoverse_rd/platform/sgi575/include/platform_def.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019-2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -7,11 +7,11 @@
#ifndef PLATFORM_DEF_H
#define PLATFORM_DEF_H
-#include "sgi_soc_platform_def.h"
+#include <nrd_soc_platform_def.h>
#define PLAT_ARM_CLUSTER_COUNT U(2)
-#define CSS_SGI_MAX_CPUS_PER_CLUSTER U(4)
-#define CSS_SGI_MAX_PE_PER_CPU U(1)
+#define NRD_MAX_CPUS_PER_CLUSTER U(4)
+#define NRD_MAX_PE_PER_CPU U(1)
/* GIC related constants */
#define PLAT_ARM_GICD_BASE UL(0x30000000)
diff --git a/plat/arm/neoverse_rd/platform/sgi575/platform.mk b/plat/arm/neoverse_rd/platform/sgi575/platform.mk
new file mode 100644
index 0000000..5e81be5
--- /dev/null
+++ b/plat/arm/neoverse_rd/platform/sgi575/platform.mk
@@ -0,0 +1,18 @@
+#
+# Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+include plat/arm/neoverse_rd/common/nrd_common.mk
+
+PLAT_INCLUDES += -Iplat/arm/neoverse_rd/platform/sgi575/include/
+
+PLAT_SOURCES += plat/arm/neoverse_rd/platform/sgi575/sgi575_topology.c
+
+PLAT_TESTS_SKIP_LIST := plat/arm/neoverse_rd/platform/sgi575/tests_to_skip.txt
+
+ifdef NRD_PLATFORM_VARIANT
+$(error "NRD_PLATFORM_VARIANT should not be set for SGI-575, \
+ currently set to ${NRD_PLATFORM_VARIANT}.")
+endif
diff --git a/plat/arm/sgi/sgi575/sgi575_topology.c b/plat/arm/neoverse_rd/platform/sgi575/sgi575_topology.c
similarity index 89%
rename from plat/arm/sgi/sgi575/sgi575_topology.c
rename to plat/arm/neoverse_rd/platform/sgi575/sgi575_topology.c
index c01ad83..f38c197 100644
--- a/plat/arm/sgi/sgi575/sgi575_topology.c
+++ b/plat/arm/neoverse_rd/platform/sgi575/sgi575_topology.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -34,9 +34,9 @@
/* Number of root nodes */
PLAT_ARM_CLUSTER_COUNT,
/* Number of children for the 1st node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
+ NRD_MAX_CPUS_PER_CLUSTER,
/* Number of children for the 2nd node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER
+ NRD_MAX_CPUS_PER_CLUSTER
};
const unsigned char *tftf_plat_get_pwr_domain_tree_desc(void)
diff --git a/plat/arm/sgi/sgi575/tests_to_skip.txt b/plat/arm/neoverse_rd/platform/sgi575/tests_to_skip.txt
similarity index 78%
rename from plat/arm/sgi/sgi575/tests_to_skip.txt
rename to plat/arm/neoverse_rd/platform/sgi575/tests_to_skip.txt
index 1af24d8..8817946 100644
--- a/plat/arm/sgi/sgi575/tests_to_skip.txt
+++ b/plat/arm/neoverse_rd/platform/sgi575/tests_to_skip.txt
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
#
# SPDX-License-Identifier: BSD-3-Clause
#
diff --git a/plat/arm/rdinfra/rdn1edge/platform.mk b/plat/arm/rdinfra/rdn1edge/platform.mk
deleted file mode 100644
index d44e5a0..0000000
--- a/plat/arm/rdinfra/rdn1edge/platform.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright (c) 2019-2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-include plat/arm/sgi/common/sgi_common.mk
-
-PLAT_INCLUDES += -Iplat/arm/rdinfra/rdn1edge/include/
-
-PLAT_SOURCES += plat/arm/rdinfra/rdn1edge/topology.c
-
-PLAT_TESTS_SKIP_LIST := plat/arm/rdinfra/rdn1edge/tests_to_skip.txt
-
-ifdef CSS_SGI_PLATFORM_VARIANT
-$(error "CSS_SGI_PLATFORM_VARIANT should not be set for RD-N1-Edge, \
- currently set to ${CSS_SGI_PLATFORM_VARIANT}.")
-endif
diff --git a/plat/arm/rdinfra/rdn2/platform.mk b/plat/arm/rdinfra/rdn2/platform.mk
deleted file mode 100644
index 3d4ffe6..0000000
--- a/plat/arm/rdinfra/rdn2/platform.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Copyright (c) 2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-include plat/arm/sgi/common/sgi_common.mk
-
-PLAT_INCLUDES += -Iplat/arm/rdinfra/rdn2/include/
-
-PLAT_SOURCES += plat/arm/rdinfra/rdn2/topology.c
-
-PLAT_TESTS_SKIP_LIST := plat/arm/rdinfra/rdn2/tests_to_skip.txt
-
-RD_N2_VARIANTS := 0 1 3
-
-ifneq ($(CSS_SGI_PLATFORM_VARIANT), \
- $(filter $(CSS_SGI_PLATFORM_VARIANT),$(RD_N2_VARIANTS)))
- $(error "CSS_SGI_PLATFORM_VARIANT for RD-N2 should be 0 1 or 3, currently \
- set to ${CSS_SGI_PLATFORM_VARIANT}.")
-endif
diff --git a/plat/arm/rdinfra/rdn2/topology.c b/plat/arm/rdinfra/rdn2/topology.c
deleted file mode 100644
index 6918638..0000000
--- a/plat/arm/rdinfra/rdn2/topology.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2022, Arm Limited. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <assert.h>
-#include <plat_topology.h>
-#include <tftf_lib.h>
-
-static const struct {
- unsigned int cluster_id;
- unsigned int cpu_id;
-} plat_cores[] = {
- /* Cluster0: 1 core */
- { 0, 0 },
- /* Cluster1: 1 core */
- { 1, 0 },
- /* Cluster2: 1 core */
- { 2, 0 },
- /* Cluster3: 1 core */
- { 3, 0 },
- /* Cluster4: 1 core */
- { 4, 0 },
- /* Cluster5: 1 core */
- { 5, 0 },
- /* Cluster6: 1 core */
- { 6, 0 },
- /* Cluster7: 1 core */
- { 7, 0 },
-#if (CSS_SGI_PLATFORM_VARIANT == 0)
- /* Cluster8: 1 core */
- { 8, 0 },
- /* Cluster9: 1 core */
- { 9, 0 },
- /* Cluster10: 1 core */
- { 10, 0 },
- /* Cluster11: 1 core */
- { 11, 0 },
- /* Cluster12: 1 core */
- { 12, 0 },
- /* Cluster13: 1 core */
- { 13, 0 },
- /* Cluster14: 1 core */
- { 14, 0 },
- /* Cluster15: 1 core */
- { 15, 0 },
-#endif
-};
-
-/*
- * The power domain tree descriptor. The cluster power domains are
- * arranged so that when the PSCI generic code creates the power domain tree,
- * the indices of the CPU power domain nodes it allocates match the linear
- * indices returned by plat_core_pos_by_mpidr().
- */
-const unsigned char plat_pd_tree_desc[] = {
- /* Number of root nodes */
- PLAT_ARM_CLUSTER_COUNT,
- /* Number of children for the 1st node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
- /* Number of children for the 2nd node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
- /* Number of children for the 3rd node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
- /* Number of children for the 4th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
- /* Number of children for the 5th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
- /* Number of children for the 6th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
- /* Number of children for the 7th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
- /* Number of children for the 8th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
-#if (CSS_SGI_PLATFORM_VARIANT == 0)
- /* Number of children for the 9th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
- /* Number of children for the 10th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
- /* Number of children for the 11th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
- /* Number of children for the 12th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
- /* Number of children for the 13th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
- /* Number of children for the 14th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
- /* Number of children for the 15th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER,
- /* Number of children for the 16th node */
- CSS_SGI_MAX_CPUS_PER_CLUSTER
-#endif
-};
-
-const unsigned char *tftf_plat_get_pwr_domain_tree_desc(void)
-{
- return plat_pd_tree_desc;
-}
-
-uint64_t tftf_plat_get_mpidr(unsigned int core_pos)
-{
- unsigned int mpid;
-
- assert(core_pos < PLATFORM_CORE_COUNT);
-
- mpid = make_mpid(plat_cores[core_pos].cluster_id,
- plat_cores[core_pos].cpu_id);
-
- return (uint64_t)mpid;
-}
diff --git a/plat/arm/rdinfra/rdv1/platform.mk b/plat/arm/rdinfra/rdv1/platform.mk
deleted file mode 100644
index 8001ec5..0000000
--- a/plat/arm/rdinfra/rdv1/platform.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright (c) 2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-include plat/arm/sgi/common/sgi_common.mk
-
-PLAT_INCLUDES += -Iplat/arm/rdinfra/rdv1/include/
-
-PLAT_SOURCES += plat/arm/rdinfra/rdv1/topology.c
-
-PLAT_TESTS_SKIP_LIST := plat/arm/rdinfra/rdv1/tests_to_skip.txt
-
-ifdef CSS_SGI_PLATFORM_VARIANT
-$(error "CSS_SGI_PLATFORM_VARIANT should not be set for RD-V1, \
- currently set to ${CSS_SGI_PLATFORM_VARIANT}.")
-endif
diff --git a/plat/arm/sgi/common/include/sgi_soc_css_def_v2.h b/plat/arm/sgi/common/include/sgi_soc_css_def_v2.h
deleted file mode 100644
index e834386..0000000
--- a/plat/arm/sgi/common/include/sgi_soc_css_def_v2.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2022, Arm Limited. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef SGI_SOC_CSS_DEF_V2_H
-#define SGI_SOC_CSS_DEF_V2_H
-
-/* Trusted watchdog (SP805) Interrupt ID */
-#define IRQ_TWDOG_INTID 107
-
-/* Maximum SPI */
-#define PLAT_MAX_SPI_OFFSET_ID 256
-
-/* AP_REFCLK Generic Timer, Non-secure. */
-#define IRQ_CNTPSIRQ1 109
-
-#endif /* SGI_SOC_CSS_DEF_V2_H */
-
diff --git a/plat/arm/sgi/common/include/sgi_soc_platform_def.h b/plat/arm/sgi/common/include/sgi_soc_platform_def.h
deleted file mode 100644
index fc60999..0000000
--- a/plat/arm/sgi/common/include/sgi_soc_platform_def.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2022, ARM Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef SGI_SOC_PLATFORM_H
-#define SGI_SOC_PLATFORM_H
-
-#include <sgi_base_platform_def.h>
-#include <sgi_soc_css_def.h>
-
-/* Base address of non-trusted watchdog (SP805) */
-#define SP805_WDOG_BASE UL(0x1C0F0000)
-
-#endif /* SGI_SOC_PLATFORM_H */
diff --git a/plat/arm/sgi/common/include/sgi_soc_platform_def_v2.h b/plat/arm/sgi/common/include/sgi_soc_platform_def_v2.h
deleted file mode 100644
index fad31ca..0000000
--- a/plat/arm/sgi/common/include/sgi_soc_platform_def_v2.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2022, ARM Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef SGI_SOC_PLATFORM_V2_H
-#define SGI_SOC_PLATFORM_V2_H
-
-#include <sgi_base_platform_def.h>
-#include <sgi_soc_css_def_v2.h>
-
-/* Base address of non-trusted watchdog (SP805) */
-#define SP805_WDOG_BASE UL(0x0C0F0000)
-
-#endif /* SGI_SOC_PLATFORM_V2_H */
diff --git a/plat/arm/sgi/common/sgi_common.mk b/plat/arm/sgi/common/sgi_common.mk
deleted file mode 100644
index 45d8485..0000000
--- a/plat/arm/sgi/common/sgi_common.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright (c) 2018-2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-PLAT_INCLUDES := -Iplat/arm/sgi/common/include/
-
-PLAT_SOURCES := drivers/arm/gic/arm_gic_v2v3.c \
- drivers/arm/gic/gic_v2.c \
- drivers/arm/gic/gic_v3.c \
- drivers/arm/sp805/sp805.c \
- drivers/arm/timer/private_timer.c \
- drivers/arm/timer/system_timer.c \
- plat/arm/sgi/common/${ARCH}/plat_helpers.S \
- plat/arm/sgi/common/plat_setup.c \
- plat/arm/sgi/common/sgi_mem_prot.c \
- plat/arm/sgi/common/sgi_pwr_state.c
-
-include plat/arm/common/arm_common.mk
-
-ifeq (${USE_NVM},1)
-$(error "USE_NVM is not supported on SGI platforms")
-endif
-
-# Pass CSS_SGI_PLATFORM_VARIANT flag to the build system
-$(eval $(call add_define,TFTF_DEFINES,CSS_SGI_PLATFORM_VARIANT))
diff --git a/plat/arm/sgi/common/sgi_mem_prot.c b/plat/arm/sgi/common/sgi_mem_prot.c
deleted file mode 100644
index 14da4cd..0000000
--- a/plat/arm/sgi/common/sgi_mem_prot.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <platform.h>
-
-#define SGI_DRAM1_NS_START (TFTF_BASE + 0x4000000)
-#define SGI_DRAM1_NS_SIZE 0x10000000
-
-static const mem_region_t sgi_ram_ranges[] = {
- { SGI_DRAM1_NS_START, SGI_DRAM1_NS_SIZE },
-};
-
-const mem_region_t *plat_get_prot_regions(int *nelem)
-{
- *nelem = ARRAY_SIZE(sgi_ram_ranges);
- return sgi_ram_ranges;
-}
diff --git a/plat/arm/sgi/common/sgi_pwr_state.c b/plat/arm/sgi/common/sgi_pwr_state.c
deleted file mode 100644
index 305d1f5..0000000
--- a/plat/arm/sgi/common/sgi_pwr_state.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2018, Arm Limited. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <platform.h>
-#include <psci.h>
-
-/* State IDs for local power states on SGI platforms. */
-#define SGI_PS_RUN_STATE_ID 0 /* Valid for CPUs and Clusters */
-#define SGI_PS_RETENTION_STATE_ID 1 /* Valid for only CPUs */
-#define SGI_PS_OFF_STATE_ID 2 /* Valid for CPUs and Clusters */
-
-/* Suspend depth definitions for each power state */
-#define SGI_PS_RUN_DEPTH 0
-#define SGI_PS_RETENTION_DEPTH 1
-#define SGI_PS_OFF_DEPTH 2
-
-/* The state property array with details of idle state possible for the core */
-static const plat_state_prop_t core_state_prop[] = {
- {SGI_PS_RETENTION_DEPTH, SGI_PS_RETENTION_STATE_ID,
- PSTATE_TYPE_STANDBY},
- {SGI_PS_OFF_DEPTH, SGI_PS_OFF_STATE_ID, PSTATE_TYPE_POWERDOWN},
- {0},
-};
-
-/* The state property array with details of idle state possible for the cluster */
-static const plat_state_prop_t cluster_state_prop[] = {
- {SGI_PS_OFF_DEPTH, SGI_PS_OFF_STATE_ID, PSTATE_TYPE_POWERDOWN},
- {0},
-};
-
-const plat_state_prop_t *plat_get_state_prop(unsigned int level)
-{
- switch (level) {
- case MPIDR_AFFLVL0:
- return core_state_prop;
- case MPIDR_AFFLVL1:
- return cluster_state_prop;
- default:
- return NULL;
- }
-}
diff --git a/plat/arm/sgi/sgi575/include/platform_def.h b/plat/arm/sgi/sgi575/include/platform_def.h
deleted file mode 100644
index 237978c..0000000
--- a/plat/arm/sgi/sgi575/include/platform_def.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2018-2022, Arm Limited. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#ifndef PLATFORM_DEF_H
-#define PLATFORM_DEF_H
-
-#include <sgi_soc_platform_def.h>
-
-#define PLAT_ARM_CLUSTER_COUNT U(2)
-#define CSS_SGI_MAX_CPUS_PER_CLUSTER U(4)
-#define CSS_SGI_MAX_PE_PER_CPU U(1)
-
-/* GIC related constants */
-#define PLAT_ARM_GICD_BASE UL(0x30000000)
-#define PLAT_ARM_GICC_BASE UL(0x2C000000)
-#define PLAT_ARM_GICR_BASE UL(0x300C0000)
-
-/* Platform specific page table and MMU setup constants */
-#define PLAT_PHY_ADDR_SPACE_SIZE (1ULL << 32)
-#define PLAT_VIRT_ADDR_SPACE_SIZE (1ULL << 32)
-
-#endif /* PLATFORM_DEF_H */
diff --git a/plat/arm/sgi/sgi575/platform.mk b/plat/arm/sgi/sgi575/platform.mk
deleted file mode 100644
index 7c8194f..0000000
--- a/plat/arm/sgi/sgi575/platform.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright (c) 2018-2022, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-include plat/arm/sgi/common/sgi_common.mk
-
-PLAT_INCLUDES += -Iplat/arm/sgi/sgi575/include/
-
-PLAT_SOURCES += plat/arm/sgi/sgi575/sgi575_topology.c
-
-PLAT_TESTS_SKIP_LIST := plat/arm/sgi/sgi575/tests_to_skip.txt
-
-ifdef CSS_SGI_PLATFORM_VARIANT
-$(error "CSS_SGI_PLATFORM_VARIANT should not be set for SGI-575, \
- currently set to ${CSS_SGI_PLATFORM_VARIANT}.")
-endif
diff --git a/plat/arm/tc/tc_pwr_state.c b/plat/arm/tc/tc_pwr_state.c
index 46d952b..97fcd97 100644
--- a/plat/arm/tc/tc_pwr_state.c
+++ b/plat/arm/tc/tc_pwr_state.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2020, Arm Limited. All rights reserved.
+ * Copyright (c) 2020-2024, Arm Limited and Contributors. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -7,7 +7,7 @@
#include <platform.h>
#include <psci.h>
-/* State IDs for local power states on SGI platforms. */
+/* State IDs for local power states on TC platform. */
#define TC_PS_RUN_STATE_ID 0 /* Valid for CPUs and Clusters */
#define TC_PS_RETENTION_STATE_ID 1 /* Valid for only CPUs */
#define TC_PS_OFF_STATE_ID 2 /* Valid for CPUs and Clusters */