refactor(sgi): rename "CSS_SGI" macro prefixes to "NRD"
As of now, several internal macros utilize "CSS_SGI" as their prefix.
Given the change to neoverse_rd, the prefix "CSS_SGI" is no longer
appropriate. Therefore, update the macro prefixes to "NRD" for
consistency and clarity.
Signed-off-by: Rohit Mathew <Rohit.Mathew@arm.com>
Change-Id: I252a5ece6c82a0a5a3b451238ed0da07f8a0c81e
diff --git a/plat/arm/neoverse_rd/common/arch/aarch64/plat_helpers.S b/plat/arm/neoverse_rd/common/arch/aarch64/plat_helpers.S
index 647bdaf..9e1aa0f 100644
--- a/plat/arm/neoverse_rd/common/arch/aarch64/plat_helpers.S
+++ b/plat/arm/neoverse_rd/common/arch/aarch64/plat_helpers.S
@@ -18,13 +18,13 @@
*
* Function to calculate the core position on sgi 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/neoverse_rd/common/include/nrd_base_platform_def.h b/plat/arm/neoverse_rd/common/include/nrd_base_platform_def.h
index 672eb80..09686a4 100644
--- a/plat/arm/neoverse_rd/common/include/nrd_base_platform_def.h
+++ b/plat/arm/neoverse_rd/common/include/nrd_base_platform_def.h
@@ -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
diff --git a/plat/arm/neoverse_rd/platform/rdn1edge/include/platform_def.h b/plat/arm/neoverse_rd/platform/rdn1edge/include/platform_def.h
index 6360031..2a3c7ac 100644
--- a/plat/arm/neoverse_rd/platform/rdn1edge/include/platform_def.h
+++ b/plat/arm/neoverse_rd/platform/rdn1edge/include/platform_def.h
@@ -10,8 +10,8 @@
#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/topology.c b/plat/arm/neoverse_rd/platform/rdn1edge/topology.c
index 978a309..cb79ba6 100644
--- a/plat/arm/neoverse_rd/platform/rdn1edge/topology.c
+++ b/plat/arm/neoverse_rd/platform/rdn1edge/topology.c
@@ -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/neoverse_rd/platform/rdn2/include/platform_def.h b/plat/arm/neoverse_rd/platform/rdn2/include/platform_def.h
index d48696b..177d911 100644
--- a/plat/arm/neoverse_rd/platform/rdn2/include/platform_def.h
+++ b/plat/arm/neoverse_rd/platform/rdn2/include/platform_def.h
@@ -20,8 +20,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)
diff --git a/plat/arm/neoverse_rd/platform/rdn2/topology.c b/plat/arm/neoverse_rd/platform/rdn2/topology.c
index 54d6801..3cd3121 100644
--- a/plat/arm/neoverse_rd/platform/rdn2/topology.c
+++ b/plat/arm/neoverse_rd/platform/rdn2/topology.c
@@ -58,38 +58,38 @@
/* 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
};
diff --git a/plat/arm/neoverse_rd/platform/rdv1/include/platform_def.h b/plat/arm/neoverse_rd/platform/rdv1/include/platform_def.h
index 1073feb..6b78d95 100644
--- a/plat/arm/neoverse_rd/platform/rdv1/include/platform_def.h
+++ b/plat/arm/neoverse_rd/platform/rdv1/include/platform_def.h
@@ -10,8 +10,8 @@
#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/topology.c b/plat/arm/neoverse_rd/platform/rdv1/topology.c
index 8bc20ff..882bffb 100644
--- a/plat/arm/neoverse_rd/platform/rdv1/topology.c
+++ b/plat/arm/neoverse_rd/platform/rdv1/topology.c
@@ -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/neoverse_rd/platform/sgi575/include/platform_def.h b/plat/arm/neoverse_rd/platform/sgi575/include/platform_def.h
index 18887ab..bdaecb9 100644
--- a/plat/arm/neoverse_rd/platform/sgi575/include/platform_def.h
+++ b/plat/arm/neoverse_rd/platform/sgi575/include/platform_def.h
@@ -10,8 +10,8 @@
#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/sgi575_topology.c b/plat/arm/neoverse_rd/platform/sgi575/sgi575_topology.c
index b9c25ba..f38c197 100644
--- a/plat/arm/neoverse_rd/platform/sgi575/sgi575_topology.c
+++ b/plat/arm/neoverse_rd/platform/sgi575/sgi575_topology.c
@@ -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)