Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-19 02:54:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix debug assertion in deprecated CCI-400 driver

Browse source 
This patch fixes a copy and paste issue that resulted in the cluster
indexes not being checked as intended. Note that this fix applies to
the deprecated CCI-400 driver, not the unified one.

Change-Id: I497132a91c236690e5eaff908f2db5c8c65e85ab
This commit is contained in:
Sandrine Bailleux 2015-10-02 08:51:17 +01:00
parent 6e9fa3866d
commit 22b0eda5d2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/arm/cci400/cci400.c
View file

@ -48,14 +48,14 @@ void cci_init(uintptr_t cci_base,
/* /*
* Check the passed arguments are valid. The cluster indices must be * Check the passed arguments are valid. The cluster indices must be
* less than MAX_CLUSTERS, not the same as each other and at least one * less than MAX_CLUSTERS, not the same as each other and at least one
* of them must be refer to a valid cluster index. * of them must refer to a valid cluster index.
*/ */
assert(cci_base); assert(cci_base);
assert(slave_iface3_cluster_ix < MAX_CLUSTERS); assert(slave_iface3_cluster_ix < MAX_CLUSTERS);
assert(slave_iface4_cluster_ix < MAX_CLUSTERS); assert(slave_iface4_cluster_ix < MAX_CLUSTERS);
assert(slave_iface3_cluster_ix != slave_iface4_cluster_ix); assert(slave_iface3_cluster_ix != slave_iface4_cluster_ix);
assert((slave_iface3_cluster_ix >= 0) || assert((slave_iface3_cluster_ix >= 0) ||
(slave_iface3_cluster_ix >= 0)); (slave_iface4_cluster_ix >= 0));
WARN("Please migrate to common cci driver, This driver will be" \ WARN("Please migrate to common cci driver, This driver will be" \
" deprecated in future\n"); " deprecated in future\n");