diff options
| author | danh-arm <dan.handley@arm.com> | 2014-12-08 12:14:36 +0000 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2014-12-08 12:14:36 +0000 |
| commit | c5c64dd6a1541651b599ef2fa4b45b22fa40b825 (patch) | |
| tree | 9c993d25fceb420d64454276179861383f15eb9f | |
| parent | 435cdcf42be8b4540a7a0d112b33da19429cc654 (diff) | |
| parent | 235585b1932d976167f49f7d19a963af8acbc8ac (diff) | |
Merge pull request #224 from soby-mathew/sm/fix_mpidr_aff_map_nodes_t
Fix the array size of mpidr_aff_map_nodes_t.
| -rw-r--r-- | include/lib/aarch64/arch.h | 6 | ||||
| -rw-r--r-- | services/std_svc/psci/psci_private.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/lib/aarch64/arch.h b/include/lib/aarch64/arch.h index 476c9c5c..52916846 100644 --- a/include/lib/aarch64/arch.h +++ b/include/lib/aarch64/arch.h @@ -61,7 +61,11 @@ #define MPIDR_AFFLVL1 1 #define MPIDR_AFFLVL2 2 #define MPIDR_AFFLVL3 3 -/* TODO: Support only the first 3 affinity levels for now */ +/* + * The MPIDR_MAX_AFFLVL count starts from 0. Take care to + * add one while using this macro to define array sizes. + * TODO: Support only the first 3 affinity levels for now. + */ #define MPIDR_MAX_AFFLVL 2 /* Constant to highlight the assumption that MPIDR allocation starts from 0 */ diff --git a/services/std_svc/psci/psci_private.h b/services/std_svc/psci/psci_private.h index 924a24f5..24a5604e 100644 --- a/services/std_svc/psci/psci_private.h +++ b/services/std_svc/psci/psci_private.h @@ -60,7 +60,7 @@ typedef struct aff_limits_node { int max; } aff_limits_node_t; -typedef aff_map_node_t (*mpidr_aff_map_nodes_t[MPIDR_MAX_AFFLVL]); +typedef aff_map_node_t (*mpidr_aff_map_nodes_t[MPIDR_MAX_AFFLVL + 1]); typedef unsigned int (*afflvl_power_on_finisher_t)(aff_map_node_t *); /******************************************************************************* |