Merge changes from topic "rfa-related-fixes"
* changes:
feat(psci): accept v1.2 and v1.3 PSCI versions
fix: correct cntfrq_check log message
diff --git a/lib/psci/psci.c b/lib/psci/psci.c
index 7e15955..42e53b9 100644
--- a/lib/psci/psci.c
+++ b/lib/psci/psci.c
@@ -343,7 +343,9 @@
int tftf_is_valid_psci_version(unsigned int version)
{
- if (version != PSCI_VERSION(1, 1) &&
+ if (version != PSCI_VERSION(1, 3) &&
+ version != PSCI_VERSION(1, 2) &&
+ version != PSCI_VERSION(1, 1) &&
version != PSCI_VERSION(1, 0) &&
version != PSCI_VERSION(0, 2) &&
version != PSCI_VERSION(0, 1)) {
diff --git a/tftf/tests/misc_tests/boot_req_tests/test_cntfrq.c b/tftf/tests/misc_tests/boot_req_tests/test_cntfrq.c
index 78289bb..d885ead 100644
--- a/tftf/tests/misc_tests/boot_req_tests/test_cntfrq.c
+++ b/tftf/tests/misc_tests/boot_req_tests/test_cntfrq.c
@@ -20,7 +20,7 @@
ns_cntfrq = mmio_read_32(SYS_CNT_BASE1 + CNTBASEN_CNTFRQ);
if (cntfrq_el0 != ns_cntfrq) {
- tftf_testcase_printf("CNTFRQ read from sys_reg = %llx and NS timer = %llx differs/n",
+ tftf_testcase_printf("CNTFRQ read from sys_reg = %llx and NS timer = %llx differs\n",
(unsigned long long)cntfrq_el0,
(unsigned long long)ns_cntfrq);
return TEST_RESULT_FAIL;