fix(plat/host): Fix CBMC errors related to DCZVA patch
The patch 862f96c introduced support for DCZVA but it also introduced
some errors for CBMC analysis. Since the GRANULE_SHIFT is 7 for CBMC
builds, the value of 9 for DCZID_EL0_BS in host platform caused overflow
for one of the calculations. This patch reduces the value for host
platform to 5.
The `cbmc-gcc` build target is also fixed by this patch.
Signed-off-by: Soby Mathew <soby.mathew@arm.com>
Change-Id: I210d54723f36b1aae07caffc3bfa986cf2341e55
diff --git a/plat/host/common/src/host_utils.c b/plat/host/common/src/host_utils.c
index a99c4eb..60f1577 100644
--- a/plat/host/common/src/host_utils.c
+++ b/plat/host/common/src/host_utils.c
@@ -210,10 +210,10 @@
/*
* Set DCZID_EL0 register with DZP = 0 and
- * BS = 0b1001 with the maximum supported block size 2KB.
+ * BS = 0b101 as GRANULE_SIZE on CBMC platform is 7.
*/
(void)host_util_set_default_sysreg_cb("dczid_el0",
- INPLACE(DCZID_EL0_BS, 9UL));
+ INPLACE(DCZID_EL0_BS, 5UL));
/* Set ISR_EL1 to 0 */
ret = host_util_set_default_sysreg_cb("isr_el1", 0UL);