Merge "fix(versal2): correct SLCR base for timer interrupt"
diff --git a/smc_fuzz/script/readsmclist.py b/smc_fuzz/script/readsmclist.py
index d351552..2a74030 100755
--- a/smc_fuzz/script/readsmclist.py
+++ b/smc_fuzz/script/readsmclist.py
@@ -31,6 +31,7 @@
sl = sline.strip()
sinstr = re.search(r'^smc:\s*([a-zA-Z0-9_]+)\s*0x([a-fA-F0-9]+)\s*$',sl)
if sinstr:
+ print("in first")
smcname = sinstr.group(1)
arglst[sinstr.group(1)] = []
argnumfield[sinstr.group(1)] = {}
@@ -46,13 +47,14 @@
seq = seq + 1
else:
if seq != 2:
- print("Error: out of sequence for smc call",end=" ")
+ print("1 Error: out of sequence for smc call",end=" ")
print(smcname)
sys.exit()
else:
seq = 1
- sinstr = re.search(r'^smc:\s*([a-zA-Z0-9_]+)\s*([a-zA-Z0-9_]+)\s*$',sl)
+ sinstr = re.search(r'^smc:\s*([a-zA-Z0-9_]+)\s+([a-zA-Z0-9_]+)\s*$',sl)
if sinstr and (svar == 0):
+ print("in second")
smcname = sinstr.group(1)
arglst[sinstr.group(1)] = []
argnumfield[sinstr.group(1)] = {}
@@ -68,7 +70,7 @@
seq = seq + 1
else:
if seq != 2:
- print("Error: out of sequence for smc call",end=" ")
+ print("2 Error: out of sequence for smc call",end=" ")
print(smcname)
sys.exit()
else:
@@ -88,7 +90,7 @@
seq = seq + 1
else:
if seq != 2:
- print("Error: out of sequence for smc call",end=" ")
+ print("3 Error: out of sequence for smc call",end=" ")
print(smcname)
sys.exit()
else:
diff --git a/tftf/tests/runtime_services/arm_arch_svc/smccc_feature_availability.c b/tftf/tests/runtime_services/arm_arch_svc/smccc_feature_availability.c
index 7c7f91b..c897f87 100644
--- a/tftf/tests/runtime_services/arm_arch_svc/smccc_feature_availability.c
+++ b/tftf/tests/runtime_services/arm_arch_svc/smccc_feature_availability.c
@@ -65,7 +65,8 @@
#ifdef __aarch64__
SKIP_TEST_IF_SMCCC_VERSION_LT(1, 1);
- SKIP_TEST_IF_SMCCC_FUNC_NOT_SUPPORTED(SMCCC_ARCH_FEATURE_AVAILABILITY);
+ SKIP_TEST_IF_SMCCC_FUNC_NOT_SUPPORTED(SMCCC_ARCH_FEATURE_AVAILABILITY |
+ (SMC_64 << FUNCID_CC_SHIFT));
u_register_t reg;
bool bad = false;
diff --git a/tftf/tests/runtime_services/secure_service/test_ffa_memory_sharing.c b/tftf/tests/runtime_services/secure_service/test_ffa_memory_sharing.c
index d80a052..aac2de4 100644
--- a/tftf/tests/runtime_services/secure_service/test_ffa_memory_sharing.c
+++ b/tftf/tests/runtime_services/secure_service/test_ffa_memory_sharing.c
@@ -839,10 +839,16 @@
struct ffa_memory_access *retrvd_receivers;
uint32_t expected_flags = 0;
+ /*
+ * Do not expect the security state to be reported given that it has no
+ * meaning in the normal world.
+ * Given the hypervisor retrieve request should only be used for memory
+ * shared/lent/donated from the NWd, hence all memory is non_secure.
+ */
ffa_memory_attributes_t expected_attrs = {
.cacheability = FFA_MEMORY_CACHE_WRITE_BACK,
.shareability = FFA_MEMORY_INNER_SHAREABLE,
- .security = FFA_MEMORY_SECURITY_NON_SECURE,
+ .security = FFA_MEMORY_SECURITY_UNSPECIFIED,
.type = (!multiple_receivers && mem_func != FFA_MEM_SHARE_SMC64)
? FFA_MEMORY_NOT_SPECIFIED_MEM
: FFA_MEMORY_NORMAL_MEM,