summaryrefslogtreecommitdiff
path: root/drivers/arm
diff options
context:
space:
mode:
authorSoby Mathew <soby.mathew@arm.com>2018-12-12 15:54:09 +0000
committerGitHub <noreply@github.com>2018-12-12 15:54:09 +0000
commitfd809dc8d86bfe46a6dca528630f42985fa62828 (patch)
tree7f05fef288a78ce5819c25edd823ee684b7339a4 /drivers/arm
parent4f7812e7ac2b363d76681e57c3eb055a67815f20 (diff)
parent2f2b9ec8228ecd0b140d3fd5b3b3e1909ed12281 (diff)
Merge pull request #1715 from pangupta/master
ccn: for RN-I, used node id instead of node postion
Diffstat (limited to 'drivers/arm')
-rw-r--r--drivers/arm/ccn/ccn.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/arm/ccn/ccn.c b/drivers/arm/ccn/ccn.c
index 59a7576c..d46e0208 100644
--- a/drivers/arm/ccn/ccn.c
+++ b/drivers/arm/ccn/ccn.c
@@ -553,7 +553,14 @@ static unsigned int get_region_id_for_node(node_types_t node_type,
return REGION_ID_LIMIT;
}
- region_id += node_pos_in_map;
+ /*
+ * According to section 3.1.1 in CCN specification, region offset for
+ * the RN-I components is calculated as (128 + NodeID of RN-I).
+ */
+ if (node_type == NODE_TYPE_RNI)
+ region_id += node_id;
+ else
+ region_id += node_pos_in_map;
return region_id;
}