commit a876d433f5afc5a736b6064a9b32c263dbab93d7
author Kevin Peng <kevin.peng@arm.com> Thu Jan 07 16:14:28 2021 +0800
committer Ken Liu <ken.liu@arm.com> Thu Jan 21 01:39:54 2021 +0000
tree 7405e254ea25006283d42e04b2444d22053b364d
parent f3ce22a43e976b1075ab455e19816339a27b52ad

SPM: Update framework_version check for Partitions

With new FF-M v1.1 coming, TF-M will also implement it and v1.1
is compatible with v1.0.
So the version check in SPM needs update.

This patch update the check policy - only requires the Partition
framework version <= the implemented version.

Change-Id: Ibd6f98f69679851e70acd848f7ea40d06804f28f
Signed-off-by: Kevin Peng <kevin.peng@arm.com>

secure_fw/spm/cmsis_psa/spm_ipc.c

diff --git a/secure_fw/spm/cmsis_psa/spm_ipc.c b/secure_fw/spm/cmsis_psa/spm_ipc.c
index 171cc1c..cfc0489 100644
--- a/secure_fw/spm/cmsis_psa/spm_ipc.c
+++ b/secure_fw/spm/cmsis_psa/spm_ipc.c
@@ -661,9 +661,9 @@
         }
 
         /* Check if the PSA framework version matches. */
-        if (partition->p_static->psa_ff_ver !=
+        if (partition->p_static->psa_ff_ver >
             PSA_FRAMEWORK_VERSION) {
-            ERROR_MSG("Warning: PSA Framework Verison does not match!");
+            ERROR_MSG("Warning: Partition requires higher framework version!");
             continue;
         }